$ARGV[0] man page

100 Trying

and 
\n";
+      $inpre = 1;
+      }
+    }
+  elsif ($inpre)
+    {
+    print TEMP "
   pcre              this document
+  pcre-config       show PCRE installation configuration information
   pcreapi           details of PCRE's native C API
   pcrebuild         options for building PCRE
   pcrecallout       details of the callout feature
@@ -91,6 +102,7 @@
   pcrematching      discussion of the two matching algorithms
   pcrepartial       details of the partial matching facility
   pcrepattern       syntax and semantics of supported regular expressions
+  pcresyntax        quick syntax reference
   pcreperform       discussion of performance issues
   pcreposix         the POSIX-compatible C API
   pcreprecompile    details of saving and re-using precompiled patterns
@@ -114,21 +126,18 @@
 distribution and the
 pcrebuild
 documentation for details). In these cases the limit is substantially larger.
-However, the speed of execution will be slower.
+However, the speed of execution is slower.
 
 
-All values in repeating quantifiers must be less than 65536. The maximum
-compiled length of subpattern with an explicit repeat count is 30000 bytes. The
-maximum number of capturing subpatterns is 65535.
+All values in repeating quantifiers must be less than 65536.
 
 
-There is no limit to the number of non-capturing subpatterns, but the maximum
-depth of nesting of all kinds of parenthesized subpattern, including capturing
-subpatterns, assertions, and other types of subpattern, is 200.
+There is no limit to the number of parenthesized subpatterns, but there can be
+no more than 65535 capturing subpatterns.
 
 
-The maximum length of name for a named subpattern is 32, and the maximum number
-of named subpatterns is 10000.
+The maximum length of name for a named subpattern is 32 characters, and the
+maximum number of named subpatterns is 10000.
 
 
 The maximum length of a subject string is the largest positive number that an
@@ -151,14 +160,15 @@
 In order process UTF-8 strings, you must build PCRE to include UTF-8 support in
 the code, and, in addition, you must call
 pcre_compile()
-with the PCRE_UTF8 option flag. When you do this, both the pattern and any
-subject strings that are matched against it are treated as UTF-8 strings
-instead of just strings of bytes.
+with the PCRE_UTF8 option flag, or the pattern must start with the sequence
+(*UTF8). When either of these is the case, both the pattern and any subject
+strings that are matched against it are treated as UTF-8 strings instead of
+just strings of bytes.
 
 
 If you compile PCRE with UTF-8 support, but do not use it at run time, the
 library will be a bit bigger, but the additional run time overhead is limited
-to testing the PCRE_UTF8 flag in several places, so should not be very large.
+to testing the PCRE_UTF8 flag occasionally, so should not be very big.
 
 
 If PCRE is built with Unicode character property support (which implies UTF-8
@@ -172,56 +182,95 @@
 \p{L} matches a letter. Its Perl synonym, \p{Letter}, is not supported.
 Furthermore, in Perl, many properties may optionally be prefixed by "Is", for
 compatibility with Perl 5.6. PCRE does not support this.
-
-
-The following comments apply when PCRE is running in UTF-8 mode:
-
-
-1. When you set the PCRE_UTF8 flag, the strings passed as patterns and subjects
-are checked for validity on entry to the relevant functions. If an invalid
-UTF-8 string is passed, an error return is given. In some situations, you may
-already know that your strings are valid, and therefore want to skip these
-checks in order to improve performance. If you set the PCRE_NO_UTF8_CHECK flag
-at compile time or at run time, PCRE assumes that the pattern or subject it
-is given (respectively) contains only valid UTF-8 codes. In this case, it does
-not diagnose an invalid UTF-8 string. If you pass an invalid UTF-8 string to
-PCRE when PCRE_NO_UTF8_CHECK is set, the results are undefined. Your program
-may crash.
-
+
+

+Validity of UTF-8 strings
+

+
+When you set the PCRE_UTF8 flag, the strings passed as patterns and subjects
+are (by default) checked for validity on entry to the relevant functions. From
+release 7.3 of PCRE, the check is according the rules of RFC 3629, which are
+themselves derived from the Unicode specification. Earlier releases of PCRE
+followed the rules of RFC 2279, which allows the full range of 31-bit values (0
+to 0x7FFFFFFF). The current check allows only values in the range U+0 to
+U+10FFFF, excluding U+D800 to U+DFFF.
+
+
+The excluded code points are the "Low Surrogate Area" of Unicode, of which the
+Unicode Standard says this: "The Low Surrogate Area does not contain any
+character assignments, consequently no character code charts or namelists are
+provided for this area. Surrogates are reserved for use with UTF-16 and then
+must be used in pairs." The code points that are encoded by UTF-16 pairs are
+available as independent code points in the UTF-8 encoding. (In other words,
+the whole surrogate thing is a fudge for UTF-16 which unfortunately messes up
+UTF-8.)
+
+
+If an invalid UTF-8 string is passed to PCRE, an error return
+(PCRE_ERROR_BADUTF8) is given. In some situations, you may already know that
+your strings are valid, and therefore want to skip these checks in order to
+improve performance. If you set the PCRE_NO_UTF8_CHECK flag at compile time or
+at run time, PCRE assumes that the pattern or subject it is given
+(respectively) contains only valid UTF-8 codes. In this case, it does not
+diagnose an invalid UTF-8 string.
+
+
+If you pass an invalid UTF-8 string when PCRE_NO_UTF8_CHECK is set, what
+happens depends on why the string is invalid. If the string conforms to the
+"old" definition of UTF-8 (RFC 2279), it is processed as a string of characters
+in the range 0 to 0x7FFFFFFF. In other words, apart from the initial validity
+test, PCRE (when in UTF-8 mode) handles strings according to the more liberal
+rules of RFC 2279. However, if the string does not even conform to RFC 2279,
+the result is undefined. Your program may crash.
+
+
+If you want to process strings of values in the full range 0 to 0x7FFFFFFF,
+encoded in a UTF-8-like manner as per the old RFC, you can set
+PCRE_NO_UTF8_CHECK to bypass the more restrictive test. However, in this
+situation, you will have to apply your own validity check.
+
+

+General comments about UTF-8 mode
+

 
-2. An unbraced hexadecimal escape sequence (such as \xb3) matches a two-byte
+1. An unbraced hexadecimal escape sequence (such as \xb3) matches a two-byte
 UTF-8 character if the value is greater than 127.
 
 
-3. Octal numbers up to \777 are recognized, and match two-byte UTF-8
+2. Octal numbers up to \777 are recognized, and match two-byte UTF-8
 characters for values greater than \177.
 
 
-4. Repeat quantifiers apply to complete UTF-8 characters, not to individual
+3. Repeat quantifiers apply to complete UTF-8 characters, not to individual
 bytes, for example: \x{100}{3}.
 
 
-5. The dot metacharacter matches one UTF-8 character instead of a single byte.
+4. The dot metacharacter matches one UTF-8 character instead of a single byte.
 
 
-6. The escape sequence \C can be used to match a single byte in UTF-8 mode,
+5. The escape sequence \C can be used to match a single byte in UTF-8 mode,
 but its use can lead to some strange effects. This facility is not available in
 the alternative matching function, pcre_dfa_exec().
 
 
-7. The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly
+6. The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly
 test characters of any code value, but the characters that PCRE recognizes as
 digits, spaces, or word characters remain the same set as before, all with
 values less than 256. This remains true even when PCRE includes Unicode
 property support, because to do otherwise would slow down PCRE in many common
 cases. If you really want to test for a wider sense of, say, "digit", you
-must use Unicode property tests such as \p{Nd}.
+must use Unicode property tests such as \p{Nd}. Note that this also applies to
+\b, because it is defined in terms of \w and \W.
 
 
-8. Similarly, characters that match the POSIX named character classes are all
+7. Similarly, characters that match the POSIX named character classes are all
 low-valued characters.
 
 
+8. However, the Perl 5.10 horizontal and vertical whitespace matching escapes
+(\h, \H, \v, and \V) do match all the appropriate Unicode characters.
+
+
 9. Case-insensitive matching applies only to characters whose values are less
 than 128, unless PCRE is built with Unicode property support. Even when Unicode
 property support is available, PCRE still uses its own character tables when
@@ -236,17 +285,22 @@
 

 Philip Hazel
 

-University Computing Service,
+University Computing Service
+

+Cambridge CB2 3QH, England.
 

-Cambridge CB2 3QG, England.
 
 
 Putting an actual email address here seems to have been a spam magnet, so I've
-taken it away. If you want to email me, use my initial and surname, separated
-by a dot, at the domain ucs.cam.ac.uk.
-Last updated: 05 June 2006
+taken it away. If you want to email me, use my two initials, followed by the
+two digits 10, at the domain cam.ac.uk.
+
+
REVISION

+
+Last updated: 11 April 2009
+

+Copyright © 1997-2009 University of Cambridge.
 

-Copyright © 1997-2006 University of Cambridge.
 

 Return to the PCRE index page.
 

Modified: freeswitch/trunk/libs/pcre/doc/html/pcre_compile.html
==============================================================================

--- freeswitch/trunk/libs/pcre/doc/html/pcre_compile.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcre_compile.html	Mon Jun  8 18:51:30 2009
@@ -27,8 +27,9 @@
 DESCRIPTION
 

 
-This function compiles a regular expression into an internal form. Its
-arguments are:
+This function compiles a regular expression into an internal form. It is the
+same as pcre_compile2(), except for the absence of the errorcodeptr
+argument. Its arguments are:
 
   pattern       A zero-terminated string containing the
                   regular expression to be compiled
@@ -40,34 +41,42 @@
 
 The option bits are:
 -  PCRE_ANCHORED         Force pattern anchoring
-  PCRE_AUTO_CALLOUT     Compile automatic callouts
-  PCRE_CASELESS         Do caseless matching
-  PCRE_DOLLAR_ENDONLY   $ not to match newline at end
-  PCRE_DOTALL           . matches anything including NL
-  PCRE_DUPNAMES         Allow duplicate names for subpatterns
-  PCRE_EXTENDED         Ignore whitespace and # comments
-  PCRE_EXTRA            PCRE extra features
-                          (not much use currently)
-  PCRE_FIRSTLINE        Force matching to be before newline
-  PCRE_MULTILINE        ^ and $ match newlines within data
-  PCRE_NEWLINE_CR       Set CR as the newline sequence
-  PCRE_NEWLINE_CRLF     Set CRLF as the newline sequence
-  PCRE_NEWLINE_LF       Set LF as the newline sequence
-  PCRE_NO_AUTO_CAPTURE  Disable numbered capturing paren-
-                          theses (named ones available)
-  PCRE_UNGREEDY         Invert greediness of quantifiers
-  PCRE_UTF8             Run in UTF-8 mode
-  PCRE_NO_UTF8_CHECK    Do not check the pattern for UTF-8
-                          validity (only relevant if
-                          PCRE_UTF8 is set)
+  PCRE_ANCHORED           Force pattern anchoring
+  PCRE_AUTO_CALLOUT       Compile automatic callouts
+  PCRE_BSR_ANYCRLF        \R matches only CR, LF, or CRLF
+  PCRE_BSR_UNICODE        \R matches all Unicode line endings
+  PCRE_CASELESS           Do caseless matching
+  PCRE_DOLLAR_ENDONLY     $ not to match newline at end
+  PCRE_DOTALL             . matches anything including NL
+  PCRE_DUPNAMES           Allow duplicate names for subpatterns
+  PCRE_EXTENDED           Ignore whitespace and # comments
+  PCRE_EXTRA              PCRE extra features
+                            (not much use currently)
+  PCRE_FIRSTLINE          Force matching to be before newline
+  PCRE_JAVASCRIPT_COMPAT  JavaScript compatibility
+  PCRE_MULTILINE          ^ and $ match newlines within data
+  PCRE_NEWLINE_ANY        Recognize any Unicode newline sequence
+  PCRE_NEWLINE_ANYCRLF    Recognize CR, LF, and CRLF as newline
+                            sequences
+  PCRE_NEWLINE_CR         Set CR as the newline sequence
+  PCRE_NEWLINE_CRLF       Set CRLF as the newline sequence
+  PCRE_NEWLINE_LF         Set LF as the newline sequence
+  PCRE_NO_AUTO_CAPTURE    Disable numbered capturing paren-
+                            theses (named ones available)
+  PCRE_UNGREEDY           Invert greediness of quantifiers
+  PCRE_UTF8               Run in UTF-8 mode
+  PCRE_NO_UTF8_CHECK      Do not check the pattern for UTF-8
+                            validity (only relevant if
+                            PCRE_UTF8 is set)
 
 PCRE must be built with UTF-8 support in order to use PCRE_UTF8 and
 PCRE_NO_UTF8_CHECK.
 
 
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected.
+contains the compiled pattern, or NULL if an error was detected. Note that
+compiling regular expressions with one version of PCRE for use with a different
+version is not guaranteed to work and may cause crashes.
 
 
 There is a complete description of the PCRE native API in the

Modified: freeswitch/trunk/libs/pcre/doc/html/pcre_compile2.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcre_compile2.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcre_compile2.html	Mon Jun  8 18:51:30 2009
@@ -56,6 +56,8 @@
                           (not much use currently)
   PCRE_FIRSTLINE        Force matching to be before newline
   PCRE_MULTILINE        ^ and $ match newlines within data
+  PCRE_NEWLINE_ANY      Recognize any Unicode newline sequence
+  PCRE_NEWLINE_ANYCRLF  Recognize CR, LF, and CRLF as newline sequences
   PCRE_NEWLINE_CR       Set CR as the newline sequence
   PCRE_NEWLINE_CRLF     Set CRLF as the newline sequence
   PCRE_NEWLINE_LF       Set LF as the newline sequence
@@ -72,7 +74,9 @@
 
 
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected.
+contains the compiled pattern, or NULL if an error was detected. Note that
+compiling regular expressions with one version of PCRE for use with a different
+version is not guaranteed to work and may cause crashes.
 
 
 There is a complete description of the PCRE native API in the

Modified: freeswitch/trunk/libs/pcre/doc/html/pcre_config.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcre_config.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcre_config.html	Mon Jun  8 18:51:30 2009
@@ -38,7 +38,15 @@
   PCRE_CONFIG_MATCH_LIMIT   Internal resource limit
   PCRE_CONFIG_MATCH_LIMIT_RECURSION
                             Internal recursion depth limit
-  PCRE_CONFIG_NEWLINE       Value of the newline sequence
+  PCRE_CONFIG_NEWLINE       Value of the default newline sequence:
+                                13 (0x000d)    for CR
+                                10 (0x000a)    for LF
+                              3338 (0x0d0a)    for CRLF
+                                -2             for ANYCRLF
+                                -1             for ANY
+  PCRE_CONFIG_BSR           Indicates what \R matches by default:
+                                 0             all Unicode line endings
+                                 1             CR, LF, or CRLF only
   PCRE_CONFIG_POSIX_MALLOC_THRESHOLD
                             Threshold of return slots, above
                               which malloc() is used by

Modified: freeswitch/trunk/libs/pcre/doc/html/pcre_copy_substring.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcre_copy_substring.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcre_copy_substring.html	Mon Jun  8 18:51:30 2009
@@ -37,7 +37,7 @@
   buffer        Buffer to receive the string
   buffersize    Size of buffer
 
   code         Points to the compiled pattern
   extra        Points to an associated pcre_extra structure,
@@ -49,12 +49,17 @@
 The options are:
    PCRE_ANCHORED      Match only at the first position
+  PCRE_BSR_ANYCRLF   \R matches only CR, LF, or CRLF
+  PCRE_BSR_UNICODE   \R matches all Unicode line endings
+  PCRE_NEWLINE_ANY   Recognize any Unicode newline sequence
+  PCRE_NEWLINE_ANYCRLF  Recognize CR, LF, and CRLF as newline sequences
   PCRE_NEWLINE_CR    Set CR as the newline sequence
   PCRE_NEWLINE_CRLF  Set CRLF as the newline sequence
   PCRE_NEWLINE_LF    Set LF as the newline sequence
   PCRE_NOTBOL        Subject is not the beginning of a line
   PCRE_NOTEOL        Subject is not the end of a line
   PCRE_NOTEMPTY      An empty string is not a valid match
+  PCRE_NO_START_OPTIMIZE  Do not do "start-match" optimizations
   PCRE_NO_UTF8_CHECK Do not check the subject for UTF-8
                        validity (only relevant if PCRE_UTF8
                        was set at compile time)
@@ -62,8 +67,8 @@
   PCRE_DFA_SHORTEST  Return only the shortest match
   PCRE_DFA_RESTART   This is a restart after a partial match
 
-There are restrictions on what may appear in a pattern when matching using the
-DFA algorithm is requested. Details are given in the
+There are restrictions on what may appear in a pattern when using this matching
+function. Details are given in the
 pcrematching
 documentation.
 
@@ -79,7 +84,7 @@
 
   PCRE_ANCHORED      Match only at the first position
+  PCRE_BSR_ANYCRLF   \R matches only CR, LF, or CRLF
+  PCRE_BSR_UNICODE   \R matches all Unicode line endings
+  PCRE_NEWLINE_ANY   Recognize any Unicode newline sequence
+  PCRE_NEWLINE_ANYCRLF  Recognize CR, LF, and CRLF as newline sequences
   PCRE_NEWLINE_CR    Set CR as the newline sequence
   PCRE_NEWLINE_CRLF  Set CRLF as the newline sequence
   PCRE_NEWLINE_LF    Set LF as the newline sequence
   PCRE_NOTBOL        Subject is not the beginning of a line
   PCRE_NOTEOL        Subject is not the end of a line
   PCRE_NOTEMPTY      An empty string is not a valid match
+  PCRE_NO_START_OPTIMIZE  Do not do "start-match" optimizations
   PCRE_NO_UTF8_CHECK Do not check the subject for UTF-8
                        validity (only relevant if PCRE_UTF8
                        was set at compile time)
   PCRE_PARTIAL       Return PCRE_ERROR_PARTIAL for a partial match
 
+  PCRE_CONFIG_BSR
+
   PCRE_CONFIG_LINK_SIZE
 
   PCRE_CONFIG_MATCH_LIMIT
 
   PCRE_CONFIG_MATCH_LIMIT_RECURSION
 
@@ -374,16 +414,17 @@
 argument, which is an address (see below).
 
 
-The options argument contains independent bits that affect the
+The options argument contains various bit settings that affect the
 compilation. It should be zero if no options are required. The available
-options are described below. Some of them, in particular, those that are
-compatible with Perl, can also be set and unset from within the pattern (see
-the detailed description in the
+options are described below. Some of them (in particular, those that are
+compatible with Perl, but also some others) can also be set and unset from
+within the pattern (see the detailed description in the
 pcrepattern
-documentation). For these options, the contents of the options argument
-specifies their initial settings at the start of compilation and execution. The
-PCRE_ANCHORED and PCRE_NEWLINE_xxx options can be set at the time of
-matching as well as at compile time.
+documentation). For those options that can be different in different parts of
+the pattern, the contents of the options argument specifies their initial
+settings at the start of compilation and execution. The PCRE_ANCHORED and
+PCRE_NEWLINE_xxx options can be set at the time of matching as well as at
+compile time.
 
 
 If errptr is NULL, pcre_compile() returns NULL immediately.
@@ -440,6 +481,15 @@
 pcrecallout
 documentation.
 
+  PCRE_BSR_ANYCRLF
+  PCRE_BSR_UNICODE
+
+These options (which are mutually exclusive) control what the \R escape
+sequence matches. The choice is either to match only CR, LF, or CRLF, or to
+match any Unicode newline sequence. The default is specified when PCRE is
+built. It can be overridden from within the pattern, or by setting an option
+when a compiled pattern is matched.
+   PCRE_CASELESS
 
 If this bit is set, letters in the pattern match both upper and lower case
@@ -467,8 +517,8 @@
 including those that indicate newline. Without it, a dot does not match when
 the current position is at a newline. This option is equivalent to Perl's /s
 option, and it can be changed within a pattern by a (?s) option setting. A
-negative class such as [^a] always matches newlines, independent of the setting
-of this option.
+negative class such as [^a] always matches newline characters, independent of
+the setting of this option.
    PCRE_DUPNAMES
 
@@ -511,6 +561,22 @@
 the first newline in the subject string, though the matched text may continue
 over the newline.
 +  PCRE_JAVASCRIPT_COMPAT
+
+If this option is set, PCRE's behaviour is changed in some ways so that it is
+compatible with JavaScript rather than Perl. The changes are as follows:
+
+
+(1) A lone closing square bracket in a pattern causes a compile-time error,
+because this is illegal in JavaScript (by default it is treated as a data
+character). Thus, the pattern AB]CD becomes illegal when this option is set.
+
+
+(2) At run time, a back reference to an unset subpattern group matches an empty
+string (by default this causes the current matching alternative to fail). A
+pattern such as (\1)(a) succeeds when this option is set (assuming it can find
+an "a" in the subject), whereas it fails by default, for Perl compatibility.
+
   PCRE_MULTILINE
 
 By default, PCRE treats the subject string as consisting of a single line of
@@ -531,19 +597,40 @@
   PCRE_NEWLINE_CR
   PCRE_NEWLINE_LF
   PCRE_NEWLINE_CRLF
+  PCRE_NEWLINE_ANYCRLF
+  PCRE_NEWLINE_ANY
 
   PCRE_NO_AUTO_CAPTURE
 
    0  no error
    1  \ at end of pattern
@@ -599,17 +690,17 @@
    7  invalid escape sequence in character class
    8  range out of order in character class
    9  nothing to repeat
-  10  operand of unlimited repeat could match the empty string
+  10  [this code is not in use]
   11  internal error: unexpected repeat
-  12  unrecognized character after (?
+  12  unrecognized character after (? or (?-
   13  POSIX named classes are supported only within a class
   14  missing )
   15  reference to non-existent subpattern
   16  erroffset passed as NULL
   17  unknown option bit(s) set
   18  missing ) after comment
-  19  parentheses nested too deeply
-  20  regular expression too large
+  19  [this code is not in use]
+  20  regular expression is too large
   21  failed to get memory
   22  unmatched parentheses
   23  internal error: code overflow
@@ -618,11 +709,11 @@
   26  malformed number or name after (?(
   27  conditional group contains more than two branches
   28  assertion expected after (?(
-  29  (?R or (?digits must be followed by )
+  29  (?R or (?[+-]digits must be followed by )
   30  unknown POSIX class name
   31  POSIX collating elements are not supported
   32  this version of PCRE is not compiled with PCRE_UTF8 support
-  33  spare error
+  33  [this code is not in use]
   34  character value in \x{...} sequence is too large
   35  invalid condition (?(0)
   36  \C not allowed in lookbehind assertion
@@ -631,17 +722,33 @@
   39  closing ) for (?C expected
   40  recursive call could loop indefinitely
   41  unrecognized character after (?P
-  42  syntax error after (?P
+  42  syntax error in subpattern name (missing terminator)
   43  two named subpatterns have the same name
   44  invalid UTF-8 string
   45  support for \P, \p, and \X has not been compiled
   46  malformed \P or \p sequence
   47  unknown property name after \P or \p
   48  subpattern name is too long (maximum 32 characters)
-  49  too many named subpatterns (maximum 10,000)
-  50  repeated subpattern is too long
+  49  too many named subpatterns (maximum 10000)
+  50  [this code is not in use]
   51  octal value is greater than \377 (not in UTF-8 mode)
-
+  PCRE_INFO_HASCRORLF
+
+  PCRE_INFO_JCHANGED
+
   PCRE_INFO_LASTLITERAL
 
-  (?P<date> (?P<year>(\d\d)?\d\d) - (?P<month>\d\d) - (?P<day>\d\d) )
+  (?<date> (?<year>(\d\d)?\d\d) - (?<month>\d\d) - (?<day>\d\d) )
 
+  PCRE_INFO_OKPARTIAL
+
   PCRE_INFO_OPTIONS
 
   PCRE_ANCHORED
 
+  PCRE_BSR_ANYCRLF
+  PCRE_BSR_UNICODE
+
   PCRE_NEWLINE_CR
   PCRE_NEWLINE_LF
   PCRE_NEWLINE_CRLF
+  PCRE_NEWLINE_ANYCRLF
+  PCRE_NEWLINE_ANY
 
   PCRE_NOTBOL
 
+  PCRE_NO_START_OPTIMIZE
+
   PCRE_NO_UTF8_CHECK
 
-  PCRE_ERROR_UNKNOWN_NODE   (-5)
+  PCRE_ERROR_UNKNOWN_OPCODE (-5)
 
-  PCRE_ERROR_RECURSIONLIMIT (-21)
-
   PCRE_ERROR_CALLOUT        (-9)
 
+  PCRE_ERROR_RECURSIONLIMIT (-21)
+
+  PCRE_ERROR_BADNEWLINE     (-23)
+
   PCRE_ERROR_NOMEMORY       (-6)
 
   PCRE_ERROR_NOMEMORY       (-6)
 
-  (a+)b(?P<xxx>\d+)...
+  (a+)b(?<xxx>\d+)...
 
   PCRE_DFA_RESTART
 
   PCRE_ERROR_DFA_UCOND      (-17)
 
   PCRE_ERROR_DFA_UMLIMIT    (-18)
 
   ./configure --help
 
   --enable-utf8
 
   --enable-newline-is-cr
 
   --enable-newline-is-crlf
 
+  --enable-newline-is-anycrlf
+
+  --enable-newline-is-any
+
+  --enable-bsr-anycrlf
+
+  --enable-rebuild-chartables
+
   --enable-ebcdic
 
+  --enable-pcregrep-libz
+  --enable-pcregrep-libbz2
+
+  --enable-pcretest-libreadline
+
+  "Readline uses the termcap functions, but does not link with the
+  termcap or curses library itself, allowing applications which link
+  with readline the to choose an appropriate library."
+
+  LIBS="-ncurses"
+
-  (?C1)\deabc(?C2)def
+  (?C1)abc(?C2)def
 
   ab(?C4)cd
 
+   int number;
+   pcrecpp::RE::FullMatch("abc", "[a-z]+(\\d+)?", &number);
+
+  Example:
+     string quoted = RE::QuoteMeta(unquoted);
+
   pcregrep some-pattern /file1 - /file3
 
+  ^a++\w!
+
     re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
   data> 25jun04\P\D
@@ -134,11 +139,11 @@
 
 When a partial match has been found using pcre_dfa_exec(), it is possible
 to continue the match by providing additional subject data and calling
-pcre_dfa_exec() again with the PCRE_DFA_RESTART option and the same
-working space (where details of the previous partial match are stored). Here is
-an example using pcretest, where the \R escape sequence sets the
-PCRE_DFA_RESTART option and the \D escape sequence requests the use of
-pcre_dfa_exec():
+pcre_dfa_exec() again with the same compiled regular expression, this
+time setting the PCRE_DFA_RESTART option. You must also pass the same working
+space as before, because this is where details of the previous partial match
+are stored. Here is an example using pcretest, using the \R escape
+sequence to set the PCRE_DFA_RESTART option (\P and \D are as above):
 
     re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
   data> 23ja\P\D
@@ -153,9 +158,10 @@
 program to do that if it needs to.
 
 
-This facility can be used to pass very long subject strings to
-pcre_dfa_exec(). However, some care is needed for certain types of
-pattern.
+You can set PCRE_PARTIAL with PCRE_DFA_RESTART to continue partial matching
+over multiple segments. This facility can be used to pass very long subject
+strings to pcre_dfa_exec(). However, some care is needed for certain
+types of pattern.
 
 
 1. If the pattern contains tests for the beginning or end of a line, you need
@@ -165,7 +171,7 @@
 

 2. If the pattern contains backward assertions (including \b or \B), you need
 to arrange for some overlap in the subject strings to allow for this. For
-example, you could pass the subject in chunks that were 500 bytes long, but in
+example, you could pass the subject in chunks that are 500 bytes long, but in
 a buffer of 700 bytes, with the starting offset set to 200 and the previous 200
 bytes at the start of the buffer.
 
@@ -174,7 +180,7 @@
 always produce exactly the same result as matching over one single long string.
 The difference arises when there are multiple matching possibilities, because a
 partial match result is given only when there are no completed matches in a
-call to fBpcre_dfa_exec()\fP. This means that as soon as the shortest match has
+call to pcre_dfa_exec(). This means that as soon as the shortest match has
 been found, continuation to a new subject segment is no longer possible.
 Consider this pcretest example:
 @@ -216,10 +222,21 @@
 
 where no string can be a partial match for both alternatives.
 
+
AUTHOR

 
-Last updated: 16 January 2006
+Philip Hazel
+

+University Computing Service
+

+Cambridge CB2 3QH, England.
+

+
+
REVISION

+
+Last updated: 04 June 2007
+

+Copyright © 1997-2007 University of Cambridge.
 

-Copyright © 1997-2006 University of Cambridge.
 

 Return to the PCRE index page.
 

Modified: freeswitch/trunk/libs/pcre/doc/html/pcrepattern.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcrepattern.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcrepattern.html	Mon Jun  8 18:51:30 2009
@@ -14,41 +14,64 @@
 

 
 PCRE REGULAR EXPRESSION DETAILS
-
BACKSLASH
-
CIRCUMFLEX AND DOLLAR
-
FULL STOP (PERIOD, DOT)
-
MATCHING A SINGLE BYTE
-
SQUARE BRACKETS AND CHARACTER CLASSES
-
POSIX CHARACTER CLASSES
-
VERTICAL BAR
-
INTERNAL OPTION SETTING
-
SUBPATTERNS
-
NAMED SUBPATTERNS
-
REPETITION
-
ATOMIC GROUPING AND POSSESSIVE QUANTIFIERS
-
BACK REFERENCES
-
ASSERTIONS
-
CONDITIONAL SUBPATTERNS
-
COMMENTS
-
RECURSIVE PATTERNS
-
SUBPATTERNS AS SUBROUTINES
-
CALLOUTS
+
NEWLINE CONVENTIONS
+
CHARACTERS AND METACHARACTERS
+
BACKSLASH
+
CIRCUMFLEX AND DOLLAR
+
FULL STOP (PERIOD, DOT)
+
MATCHING A SINGLE BYTE
+
SQUARE BRACKETS AND CHARACTER CLASSES
+
POSIX CHARACTER CLASSES
+
VERTICAL BAR
+
INTERNAL OPTION SETTING
+
SUBPATTERNS
+
DUPLICATE SUBPATTERN NUMBERS
+
NAMED SUBPATTERNS
+
REPETITION
+
ATOMIC GROUPING AND POSSESSIVE QUANTIFIERS
+
BACK REFERENCES
+
ASSERTIONS
+
CONDITIONAL SUBPATTERNS
+
COMMENTS
+
RECURSIVE PATTERNS
+
SUBPATTERNS AS SUBROUTINES
+
ONIGURUMA SUBROUTINE SYNTAX
+
CALLOUTS
+
BACKTRACKING CONTROL
+
SEE ALSO
+
AUTHOR
+
REVISION
 
 
PCRE REGULAR EXPRESSION DETAILS

 
-The syntax and semantics of the regular expressions supported by PCRE are
-described below. Regular expressions are also described in the Perl
-documentation and in a number of books, some of which have copious examples.
-Jeffrey Friedl's "Mastering Regular Expressions", published by O'Reilly, covers
-regular expressions in great detail. This description of PCRE's regular
-expressions is intended as reference material.
+The syntax and semantics of the regular expressions that are supported by PCRE
+are described in detail below. There is a quick-reference syntax summary in the
+pcresyntax
+page. PCRE tries to match Perl syntax and semantics as closely as it can. PCRE
+also supports some alternative regular expression syntax (which does not
+conflict with the Perl syntax) in order to provide some compatibility with
+regular expressions in Python, .NET, and Oniguruma.
+
+
+Perl's regular expressions are described in its own documentation, and
+regular expressions in general are covered in a number of books, some of which
+have copious examples. Jeffrey Friedl's "Mastering Regular Expressions",
+published by O'Reilly, covers regular expressions in great detail. This
+description of PCRE's regular expressions is intended as reference material.
 
 
 The original operation of PCRE was on strings of one-byte characters. However,
 there is now also support for UTF-8 character strings. To use this, you must
 build PCRE to include UTF-8 support, and then call pcre_compile() with
-the PCRE_UTF8 option. How this affects pattern matching is mentioned in several
-places below. There is also a summary of UTF-8 features in the
+the PCRE_UTF8 option. There is also a special sequence that can be given at the
+start of a pattern:
+
+  (*UTF8)
+
+Starting a pattern with this sequence is equivalent to setting the PCRE_UTF8
+option. This feature is not Perl-compatible. How setting UTF-8 mode affects
+pattern matching is mentioned in several places below. There is also a summary
+of UTF-8 features in the
 section on UTF-8 support
 in the main
 pcre
@@ -59,11 +82,55 @@
 PCRE when its main matching function, pcre_exec(), is used.
 From release 6.0, PCRE offers a second matching function,
 pcre_dfa_exec(), which matches using a different algorithm that is not
-Perl-compatible. The advantages and disadvantages of the alternative function,
-and how it differs from the normal function, are discussed in the
+Perl-compatible. Some of the features discussed below are not available when
+pcre_dfa_exec() is used. The advantages and disadvantages of the
+alternative function, and how it differs from the normal function, are
+discussed in the
 pcrematching
 page.
 
+
NEWLINE CONVENTIONS

+
+PCRE supports five different conventions for indicating line breaks in
+strings: a single CR (carriage return) character, a single LF (linefeed)
+character, the two-character sequence CRLF, any of the three preceding, or any
+Unicode newline sequence. The
+pcreapi
+page has
+further discussion
+about newlines, and shows how to set the newline convention in the
+options arguments for the compiling and matching functions.
+
+
+It is also possible to specify a newline convention by starting a pattern
+string with one of the following five sequences:
+
+  (*CR)        carriage return
+  (*LF)        linefeed
+  (*CRLF)      carriage return, followed by linefeed
+  (*ANYCRLF)   any of the three above
+  (*ANY)       all Unicode newline sequences
+
+These override the default and the options given to pcre_compile(). For
+example, on a Unix system where LF is the default newline sequence, the pattern
++  (*CR)a.b
+
+changes the convention to CR. That pattern matches "a\nb" because LF is no
+longer a newline. Note that these special settings, which are not
+Perl-compatible, are recognized only at the very start of a pattern, and that
+they must be in upper case. If more than one of them is present, the last one
+is used.
+
+
+The newline convention does not affect what the \R escape sequence matches. By
+default, this is any Unicode newline sequence, for Perl compatibility. However,
+this can be changed; see the description of \R in the section entitled
+"Newline sequences"
+below. A change of \R setting can be combined with a change of newline
+convention.
+
+
CHARACTERS AND METACHARACTERS

 
 A regular expression is a pattern that is matched against a subject string from
 left to right. Most characters stand for themselves in a pattern, and match the
@@ -90,8 +157,8 @@
 

 There are two different sets of metacharacters: those that are recognized
 anywhere in the pattern except within square brackets, and those that are
-recognized in square brackets. Outside square brackets, the metacharacters are
-as follows:
+recognized within square brackets. Outside square brackets, the metacharacters
+are as follows:
 
   \      general escape character with several uses
   ^      assert start of string (or line, in multiline mode)
@@ -120,7 +187,7 @@
 
 The following sections describe the use of each of the metacharacters.
 
-
BACKSLASH

+
BACKSLASH

 
 The backslash character has several uses. Firstly, if it is followed by a
 non-alphanumeric character, it takes away any special meaning that character
@@ -169,7 +236,7 @@
   \cx       "control-x", where x is any character
   \e        escape (hex 1B)
   \f        formfeed (hex 0C)
-  \n        newline (hex 0A)
+  \n        linefeed (hex 0A)
   \r        carriage return (hex 0D)
   \t        tab (hex 09)
   \ddd      character with octal code ddd, or backreference
@@ -185,11 +252,15 @@
 After \x, from zero to two hexadecimal digits are read (letters can be in
 upper or lower case). Any number of hexadecimal digits may appear between \x{
 and }, but the value of the character code must be less than 256 in non-UTF-8
-mode, and less than 2**31 in UTF-8 mode (that is, the maximum hexadecimal value
-is 7FFFFFFF). If characters other than hexadecimal digits appear between \x{
-and }, or if there is no terminating }, this form of escape is not recognized.
-Instead, the initial \x will be interpreted as a basic hexadecimal escape,
-with no following digits, giving a character whose value is zero.
+mode, and less than 2**31 in UTF-8 mode. That is, the maximum value in
+hexadecimal is 7FFFFFFF. Note that this is bigger than the largest Unicode code
+point, which is 10FFFF.
+
+
+If characters other than hexadecimal digits appear between \x{ and }, or if
+there is no terminating }, this form of escape is not recognized. Instead, the
+initial \x will be interpreted as a basic hexadecimal escape, with no
+following digits, giving a character whose value is zero.
 
 
 Characters whose value is less than 256 can be defined by either of the two
@@ -216,7 +287,7 @@
 

 Inside a character class, or if the decimal number is greater than 9 and there
 have not been that many capturing subpatterns, PCRE re-reads up to three octal
-digits following the backslash, ane uses them to generate a data character. Any
+digits following the backslash, and uses them to generate a data character. Any
 subsequent digits stand for themselves. In non-UTF-8 mode, the value of a
 character specified in octal must be less than \400. In UTF-8 mode, values up
 to \777 are permitted. For example:
@@ -238,21 +309,48 @@
 All the sequences that define a single character value can be used both inside
 and outside character classes. In addition, inside a character class, the
 sequence \b is interpreted as the backspace character (hex 08), and the
-sequence \X is interpreted as the character "X". Outside a character class,
-these sequences have different meanings
+sequences \R and \X are interpreted as the characters "R" and "X",
+respectively. Outside a character class, these sequences have different
+meanings
 (see below).
 
 

+Absolute and relative back references
+

+
+The sequence \g followed by an unsigned or a negative number, optionally
+enclosed in braces, is an absolute or relative back reference. A named back
+reference can be coded as \g{name}. Back references are discussed
+later,
+following the discussion of
+parenthesized subpatterns.
+
+

+Absolute and relative subroutine calls
+

+
+For compatibility with Oniguruma, the non-Perl syntax \g followed by a name or
+a number enclosed either in angle brackets or single quotes, is an alternative
+syntax for referencing a subpattern as a "subroutine". Details are discussed
+later.
+Note that \g{...} (Perl syntax) and \g<...> (Oniguruma syntax) are not
+synonymous. The former is a back reference; the latter is a subroutine call.
+
+

 Generic character types
 

 
-The third use of backslash is for specifying generic character types. The
+Another use of backslash is for specifying generic character types. The
 following are always recognized:
 
   \d     any decimal digit
   \D     any character that is not a decimal digit
+  \h     any horizontal whitespace character
+  \H     any character that is not a horizontal whitespace character
   \s     any whitespace character
   \S     any character that is not a whitespace character
+  \v     any vertical whitespace character
+  \V     any character that is not a vertical whitespace character
   \w     any "word" character
   \W     any "non-word" character
 
@@ -268,9 +366,53 @@
 
 For compatibility with Perl, \s does not match the VT character (code 11).
 This makes it different from the the POSIX "space" class. The \s characters
-are HT (9), LF (10), FF (12), CR (13), and space (32). (If "use locale;" is
+are HT (9), LF (10), FF (12), CR (13), and space (32). If "use locale;" is
 included in a Perl script, \s may match the VT character. In PCRE, it never
-does.)
+does.
+
+
+In UTF-8 mode, characters with values greater than 128 never match \d, \s, or
+\w, and always match \D, \S, and \W. This is true even when Unicode
+character property support is available. These sequences retain their original
+meanings from before UTF-8 support was available, mainly for efficiency
+reasons. Note that this also affects \b, because it is defined in terms of \w
+and \W.
+
+
+The sequences \h, \H, \v, and \V are Perl 5.10 features. In contrast to the
+other sequences, these do match certain high-valued codepoints in UTF-8 mode.
+The horizontal space characters are:
+
+  U+0009     Horizontal tab
+  U+0020     Space
+  U+00A0     Non-break space
+  U+1680     Ogham space mark
+  U+180E     Mongolian vowel separator
+  U+2000     En quad
+  U+2001     Em quad
+  U+2002     En space
+  U+2003     Em space
+  U+2004     Three-per-em space
+  U+2005     Four-per-em space
+  U+2006     Six-per-em space
+  U+2007     Figure space
+  U+2008     Punctuation space
+  U+2009     Thin space
+  U+200A     Hair space
+  U+202F     Narrow no-break space
+  U+205F     Medium mathematical space
+  U+3000     Ideographic space
+
+The vertical space characters are:
++  U+000A     Linefeed
+  U+000B     Vertical tab
+  U+000C     Formfeed
+  U+000D     Carriage return
+  U+0085     Next line
+  U+2028     Line separator
+  U+2029     Paragraph separator
+
 
 
 A "word" character is an underscore or any character less than 256 that is a
@@ -280,22 +422,67 @@
 "Locale support"
 in the
 pcreapi
-page). For example, in the "fr_FR" (French) locale, some character codes
-greater than 128 are used for accented letters, and these are matched by \w.
-
+page). For example, in a French locale such as "fr_FR" in Unix-like systems,
+or "french" in Windows, some character codes greater than 128 are used for
+accented letters, and these are matched by \w. The use of locales with Unicode
+is discouraged.
+
+

+Newline sequences
+

 
-In UTF-8 mode, characters with values greater than 128 never match \d, \s, or
-\w, and always match \D, \S, and \W. This is true even when Unicode
-character property support is available. The use of locales with Unicode is
-discouraged.
+Outside a character class, by default, the escape sequence \R matches any
+Unicode newline sequence. This is a Perl 5.10 feature. In non-UTF-8 mode \R is
+equivalent to the following:
+
+  (?>\r\n|\n|\x0b|\f|\r|\x85)
+
+This is an example of an "atomic group", details of which are given
+below.
+This particular group matches either the two-character sequence CR followed by
+LF, or one of the single characters LF (linefeed, U+000A), VT (vertical tab,
+U+000B), FF (formfeed, U+000C), CR (carriage return, U+000D), or NEL (next
+line, U+0085). The two-character sequence is treated as a single unit that
+cannot be split.
+
+
+In UTF-8 mode, two additional characters whose codepoints are greater than 255
+are added: LS (line separator, U+2028) and PS (paragraph separator, U+2029).
+Unicode character property support is not needed for these characters to be
+recognized.
+
+
+It is possible to restrict \R to match only CR, LF, or CRLF (instead of the
+complete set of Unicode line endings) by setting the option PCRE_BSR_ANYCRLF
+either at compile time or when the pattern is matched. (BSR is an abbrevation
+for "backslash R".) This can be made the default when PCRE is built; if this is
+the case, the other behaviour can be requested via the PCRE_BSR_UNICODE option.
+It is also possible to specify these settings by starting a pattern string with
+one of the following sequences:
+
+  (*BSR_ANYCRLF)   CR, LF, or CRLF only
+  (*BSR_UNICODE)   any Unicode newline sequence
+
+These override the default and the options given to pcre_compile(), but
+they can be overridden by options given to pcre_exec(). Note that these
+special settings, which are not Perl-compatible, are recognized only at the
+very start of a pattern, and that they must be in upper case. If more than one
+of them is present, the last one is used. They can be combined with a change of
+newline convention, for example, a pattern can start with:
++  (*ANY)(*BSR_ANYCRLF)
+
+Inside a character class, \R matches the letter "R".
 
 

 Unicode character properties
 

 
 When PCRE is built with Unicode character property support, three additional
-escape sequences to match character properties are available when UTF-8 mode
-is selected. They are:
+escape sequences that match characters with specific properties are available.
+When not in UTF-8 mode, these sequences are of course limited to testing
+characters whose codepoints are less than 256, but they do work in this mode.
+The extra escape sequences are:
 
   \p{xx}   a character with the xx property
   \P{xx}   a character without the xx property
@@ -321,6 +508,7 @@
 
 Arabic,
 Armenian,
+Balinese,
 Bengali,
 Bopomofo,
 Braille,
@@ -330,6 +518,7 @@
 Cherokee,
 Common,
 Coptic,
+Cuneiform,
 Cypriot,
 Cyrillic,
 Deseret,
@@ -359,11 +548,14 @@
 Mongolian,
 Myanmar,
 New_Tai_Lue,
+Nko,
 Ogham,
 Old_Italic,
 Old_Persian,
 Oriya,
 Osmanya,
+Phags_Pa,
+Phoenician,
 Runic,
 Shavian,
 Sinhala,
@@ -447,6 +639,14 @@
 a modifier or "other".
 
 
+The Cs (Surrogate) property applies only to characters in the range U+D800 to
+U+DFFF. Such characters are not valid in UTF-8 strings (see RFC 3629) and so
+cannot be tested by PCRE, unless UTF-8 validity checking has been turned off
+(see the discussion of PCRE_NO_UTF8_CHECK in the
+pcreapi
+page).
+
+
 The long synonyms for these properties that Perl supports (such as \p{Letter})
 are not supported by PCRE, nor is it permitted to prefix any of these
 properties with "Is".
@@ -471,19 +671,43 @@
 atomic group
 (see below).
 Characters with the "mark" property are typically accents that affect the
-preceding character.
+preceding character. None of them have codepoints less than 256, so in
+non-UTF-8 mode \X matches any one character.
 
 
 Matching characters by Unicode property is not fast, because PCRE has to search
 a structure that contains data for over fifteen thousand characters. That is
 why the traditional escape sequences such as \d and \w do not use Unicode
 properties in PCRE.
+
+

+Resetting the match start
+

+
+The escape sequence \K, which is a Perl 5.10 feature, causes any previously
+matched characters not to be included in the final matched sequence. For
+example, the pattern:
+
+  foo\Kbar
+
+matches "foobar", but reports that it has matched "bar". This feature is
+similar to a lookbehind assertion
+(described below).
+However, in this case, the part of the subject before the real match does not
+have to be of fixed length, as lookbehind assertions do. The use of \K does
+not interfere with the setting of
+captured substrings.
+For example, when the pattern
++  (foo)\Kbar
+
+matches "foobar", the first substring is still set to "foo".
 
 

 Simple assertions
 

 
-The fourth use of backslash is for certain simple assertions. An assertion
+The final use of backslash is for certain simple assertions. An assertion
 specifies a condition that has to be met at a particular point in a match,
 without consuming any characters from the subject string. The use of
 subpatterns for more complicated assertions is described
@@ -492,10 +716,11 @@
 
   \b     matches at a word boundary
   \B     matches when not at a word boundary
-  \A     matches at start of subject
-  \Z     matches at end of subject or before newline at end
-  \z     matches at end of subject
-  \G     matches at first matching position in subject
+  \A     matches at the start of the subject
+  \Z     matches at the end of the subject
+          also matches before a newline at the end of the subject
+  \z     matches only at the end of the subject
+  \G     matches at the first matching position in the subject
 
 These assertions may not appear in character classes (but note that \b has a
 different meaning, namely the backspace character, inside a character class).
@@ -538,7 +763,7 @@
 to the starting match position, and the "anchored" flag is set in the compiled
 regular expression.
 
-
CIRCUMFLEX AND DOLLAR

+
CIRCUMFLEX AND DOLLAR

 
 Outside a character class, in the default matching mode, the circumflex
 character is an assertion that is true only if the current matching point is
@@ -592,34 +817,39 @@
 end of the subject in both modes, and if all branches of a pattern start with
 \A it is always anchored, whether or not PCRE_MULTILINE is set.
 
-
FULL STOP (PERIOD, DOT)

+
FULL STOP (PERIOD, DOT)

 
 Outside a character class, a dot in the pattern matches any one character in
 the subject string except (by default) a character that signifies the end of a
-line. In UTF-8 mode, the matched character may be more than one byte long. When
-a line ending is defined as a single character (CR or LF), dot never matches
-that character; when the two-character sequence CRLF is used, dot does not
-match CR if it is immediately followed by LF, but otherwise it matches all
-characters (including isolated CRs and LFs).
+line. In UTF-8 mode, the matched character may be more than one byte long.
+
+
+When a line ending is defined as a single character, dot never matches that
+character; when the two-character sequence CRLF is used, dot does not match CR
+if it is immediately followed by LF, but otherwise it matches all characters
+(including isolated CRs and LFs). When any Unicode line endings are being
+recognized, dot does not match CR or LF or any of the other line ending
+characters.
 
 
 The behaviour of dot with regard to newlines can be changed. If the PCRE_DOTALL
-option is set, a dot matches any one character, without exception. If newline
-is defined as the two-character sequence CRLF, it takes two dots to match it.
+option is set, a dot matches any one character, without exception. If the
+two-character sequence CRLF is present in the subject string, it takes two dots
+to match it.
 
 
 The handling of dot is entirely independent of the handling of circumflex and
 dollar, the only relationship being that they both involve newlines. Dot has no
 special meaning in a character class.
 
-
MATCHING A SINGLE BYTE

+
MATCHING A SINGLE BYTE

 
 Outside a character class, the escape sequence \C matches any one byte, both
-in and out of UTF-8 mode. Unlike a dot, it always matches CR and LF. The
-feature is provided in Perl in order to match individual bytes in UTF-8 mode.
-Because it breaks up UTF-8 characters into individual bytes, what remains in
-the string may be a malformed UTF-8 string. For this reason, the \C escape
-sequence is best avoided.
+in and out of UTF-8 mode. Unlike a dot, it always matches any line-ending
+characters. The feature is provided in Perl in order to match individual bytes
+in UTF-8 mode. Because it breaks up UTF-8 characters into individual bytes,
+what remains in the string may be a malformed UTF-8 string. For this reason,
+the \C escape sequence is best avoided.
 
 
 PCRE does not allow \C to appear in lookbehind assertions
@@ -627,7 +857,7 @@
 because in UTF-8 mode this would make it impossible to calculate the length of
 the lookbehind.
 
-
SQUARE BRACKETS AND CHARACTER CLASSES

+
SQUARE BRACKETS AND CHARACTER CLASSES

 
 An opening square bracket introduces a character class, terminated by a closing
 square bracket. A closing square bracket on its own is not special. If a
@@ -670,10 +900,10 @@
 UTF-8 support.
 
 
-Characters that might indicate line breaks (CR and LF) are never treated in any
-special way when matching character classes, whatever line-ending sequence is
-in use, and whatever setting of the PCRE_DOTALL and PCRE_MULTILINE options is
-used. A class such as [^a] always matches one of these characters.
+Characters that might indicate line breaks are never treated in any special way
+when matching character classes, whatever line-ending sequence is in use, and
+whatever setting of the PCRE_DOTALL and PCRE_MULTILINE options is used. A class
+such as [^a] always matches one of these characters.
 
 
 The minus (hyphen) character can be used to specify a range of characters in a
@@ -701,7 +931,7 @@
 If a range that includes letters is used when caseless matching is set, it
 matches the letters in either case. For example, [W-c] is equivalent to
 [][\\^_`wxyzabc], matched caselessly, and in non-UTF-8 mode, if character
-tables for the "fr_FR" locale are in use, [\xc8-\xcb] matches accented E
+tables for a French locale are in use, [\xc8-\xcb] matches accented E
 characters in both cases. In UTF-8 mode, PCRE supports the concept of case for
 characters with values greater than 128 only when it is compiled with Unicode
 property support.
@@ -722,7 +952,7 @@
 closing square bracket. However, escaping other non-alphanumeric characters
 does no harm.
 
-
POSIX CHARACTER CLASSES

+
POSIX CHARACTER CLASSES

 
 Perl supports the POSIX notation for character classes. This uses names
 enclosed by [: and :] within the enclosing square brackets. PCRE also supports
@@ -768,7 +998,7 @@
 In UTF-8 mode, characters with values greater than 128 do not match any of
 the POSIX character classes.
 
-
VERTICAL BAR

+
VERTICAL BAR

 
 Vertical bar characters are used to separate alternative patterns. For example,
 the pattern
@@ -783,11 +1013,12 @@
 "succeeds" means matching the rest of the main pattern as well as the
 alternative in the subpattern.
 
-
INTERNAL OPTION SETTING

+
INTERNAL OPTION SETTING

 
 The settings of the PCRE_CASELESS, PCRE_MULTILINE, PCRE_DOTALL, and
-PCRE_EXTENDED options can be changed from within the pattern by a sequence of
-Perl option letters enclosed between "(?" and ")". The option letters are
+PCRE_EXTENDED options (which are Perl-compatible) can be changed from within
+the pattern by a sequence of Perl option letters enclosed between "(?" and ")".
+The option letters are
 
   i  for PCRE_CASELESS
   m  for PCRE_MULTILINE
@@ -802,15 +1033,20 @@
 unset.
 
 
-When an option change occurs at top level (that is, not inside subpattern
-parentheses), the change applies to the remainder of the pattern that follows.
-If the change is placed right at the start of a pattern, PCRE extracts it into
-the global options (and it will therefore show up in data extracted by the
-pcre_fullinfo() function).
+The PCRE-specific options PCRE_DUPNAMES, PCRE_UNGREEDY, and PCRE_EXTRA can be
+changed in the same way as the Perl-compatible options by using the characters
+J, U and X respectively.
 
 
-An option change within a subpattern affects only that part of the current
-pattern that follows it, so
+When one of these option changes occurs at top level (that is, not inside
+subpattern parentheses), the change applies to the remainder of the pattern
+that follows. If the change is placed right at the start of a pattern, PCRE
+extracts it into the global options (and it will therefore show up in data
+extracted by the pcre_fullinfo() function).
+
+
+An option change within a subpattern (see below for a description of
+subpatterns) affects only that part of the current pattern that follows it, so
 
   (a(?i)b)c
 
@@ -827,11 +1063,16 @@
 behaviour otherwise.
 
 
-The PCRE-specific options PCRE_DUPNAMES, PCRE_UNGREEDY, and PCRE_EXTRA can be
-changed in the same way as the Perl-compatible options by using the characters
-J, U and X respectively.
+Note: There are other PCRE-specific options that can be set by the
+application when the compile or match functions are called. In some cases the
+pattern can contain special leading sequences such as (*CRLF) to override what
+the application has set or what has been defaulted. Details are given in the
+section entitled
+"Newline sequences"
+above. There is also the (*UTF8) leading sequence that can be used to set UTF-8
+mode; this is equivalent to setting the PCRE_UTF8 option.
 
-
SUBPATTERNS

+
SUBPATTERNS

 
 Subpatterns are delimited by parentheses (round brackets), which can be nested.
 Turning part of a pattern into a subpattern does two things:
@@ -842,7 +1083,7 @@
   cat(aract|erpillar|)
 
 matches one of the words "cat", "cataract", or "caterpillar". Without the
-parentheses, it would match "cataract", "erpillar" or the empty string.
+parentheses, it would match "cataract", "erpillar" or an empty string.
 

 

 2. It sets up the subpattern as a capturing subpattern. This means that, when
@@ -870,8 +1111,7 @@
   the ((?:red|white) (king|queen))
 
 the captured substrings are "white queen" and "queen", and are numbered 1 and
-2. The maximum number of capturing subpatterns is 65535, and the maximum depth
-of nesting of all subpatterns, both capturing and non-capturing, is 200.
+2. The maximum number of capturing subpatterns is 65535.
 
 
 As a convenient shorthand, if any option settings are required at the start of
@@ -886,13 +1126,50 @@
 is reached, an option setting in one branch does affect subsequent branches, so
 the above patterns match "SUNDAY" as well as "Saturday".
 
-
NAMED SUBPATTERNS

+
DUPLICATE SUBPATTERN NUMBERS

+
+Perl 5.10 introduced a feature whereby each alternative in a subpattern uses
+the same numbers for its capturing parentheses. Such a subpattern starts with
+(?| and is itself a non-capturing subpattern. For example, consider this
+pattern:
+
+  (?|(Sat)ur|(Sun))day
+
+Because the two alternatives are inside a (?| group, both sets of capturing
+parentheses are numbered one. Thus, when the pattern matches, you can look
+at captured substring number one, whichever alternative matched. This construct
+is useful when you want to capture part, but not all, of one of a number of
+alternatives. Inside a (?| group, parentheses are numbered as usual, but the
+number is reset at the start of each branch. The numbers of any capturing
+buffers that follow the subpattern start after the highest number used in any
+branch. The following example is taken from the Perl documentation.
+The numbers underneath show in which buffer the captured content will be
+stored.
++  # before  ---------------branch-reset----------- after
+  / ( a )  (?| x ( y ) z | (p (q) r) | (t) u (v) ) ( z ) /x
+  # 1            2         2  3        2     3     4
+
+A backreference or a recursive call to a numbered subpattern always refers to
+the first one in the pattern with the given number.
+
+
+An alternative approach to using this "branch reset" feature is to use
+duplicate named subpatterns, as described in the next section.
+
+
NAMED SUBPATTERNS

 
 Identifying capturing parentheses by number is simple, but it can be very hard
 to keep track of the numbers in complicated regular expressions. Furthermore,
 if an expression is modified, the numbers may change. To help with this
-difficulty, PCRE supports the naming of subpatterns, something that Perl does
-not provide. The Python syntax (?P<name>...) is used. References to capturing
+difficulty, PCRE supports the naming of subpatterns. This feature was not
+added to Perl until release 5.10. Python had the feature earlier, and PCRE
+introduced it at release 4.0, using the Python syntax. PCRE now supports both
+the Perl and the Python syntax.
+
+
+In PCRE, a subpattern can be named in one of three ways: (?<name>...) or
+(?'name'...) as in Perl, or (?P<name>...) as in Python. References to capturing
 parentheses from other parts of the pattern, such as
 backreferences,
 recursion,
@@ -902,10 +1179,10 @@
 
 
 Names consist of up to 32 alphanumeric characters and underscores. Named
-capturing parentheses are still allocated numbers as well as names. The PCRE
-API provides function calls for extracting the name-to-number translation table
-from a compiled pattern. There is also a convenience function for extracting a
-captured substring by name.
+capturing parentheses are still allocated numbers as well as names, exactly as
+if the names were not present. The PCRE API provides function calls for
+extracting the name-to-number translation table from a compiled pattern. There
+is also a convenience function for extracting a captured substring by name.
 
 
 By default, a name must be unique within a pattern, but it is possible to relax
@@ -915,15 +1192,19 @@
 abbreviation or as the full name, and in both cases you want to extract the
 abbreviation. This pattern (ignoring the line breaks) does the job:
 
-  (?P<DN>Mon|Fri|Sun)(?:day)?|
-  (?P<DN>Tue)(?:sday)?|
-  (?P<DN>Wed)(?:nesday)?|
-  (?P<DN>Thu)(?:rsday)?|
-  (?P<DN>Sat)(?:urday)?
+  (?<DN>Mon|Fri|Sun)(?:day)?|
+  (?<DN>Tue)(?:sday)?|
+  (?<DN>Wed)(?:nesday)?|
+  (?<DN>Thu)(?:rsday)?|
+  (?<DN>Sat)(?:urday)?
 
 There are five capturing substrings, but only one is ever set after a match.
+(An alternative way of solving this problem is to use a "branch reset"
+subpattern, as described in the previous section.)
+
+
 The convenience function for extracting the data by name returns the substring
-for the first, and in this example, the only, subpattern of that name that
+for the first (and in this example, the only) subpattern of that name that
 matched. This saves searching to find which numbered subpattern it was. If you
 make a reference to a non-unique named subpattern from elsewhere in the
 pattern, the one that corresponds to the lowest number is used. For further
@@ -931,15 +1212,21 @@
 pcreapi
 documentation.
 
-
REPETITION

+
+Warning: You cannot use different names to distinguish between two
+subpatterns with the same number (see the previous section) because PCRE uses
+only the numbers when matching.
+
+
REPETITION

 
 Repetition is specified by quantifiers, which can follow any of the following
 items:
 
   a literal data character
-  the . metacharacter
+  the dot metacharacter
   the \C escape sequence
   the \X escape sequence (in UTF-8 mode with Unicode properties)
+  the \R escape sequence
   an escape such as \d that matches a single character
   a character class
   a back reference (see next section)
@@ -977,11 +1264,15 @@
 
 
 The quantifier {0} is permitted, causing the expression to behave as if the
-previous item and the quantifier were not present.
+previous item and the quantifier were not present. This may be useful for
+subpatterns that are referenced as
+subroutines
+from elsewhere in the pattern. Items other than subpatterns that have a {0}
+quantifier are omitted from the compiled pattern.
 
 
-For convenience (and historical compatibility) the three most common
-quantifiers have single-character abbreviations:
+For convenience, the three most common quantifiers have single-character
+abbreviations:
 
   *    is equivalent to {0,}
   +    is equivalent to {1,}
@@ -1032,7 +1323,7 @@
 way the rest of the pattern matches.
 
 
-If the PCRE_UNGREEDY option is set (an option which is not available in Perl),
+If the PCRE_UNGREEDY option is set (an option that is not available in Perl),
 the quantifiers are not greedy by default, but individual ones can be made
 greedy by following them with a question mark. In other words, it inverts the
 default behaviour.
@@ -1044,7 +1335,7 @@
 
 
 If a pattern starts with .* or .{0,} and the PCRE_DOTALL option (equivalent
-to Perl's /s) is set, thus allowing the . to match newlines, the pattern is
+to Perl's /s) is set, thus allowing the dot to match newlines, the pattern is
 implicitly anchored, because whatever follows will be tried against every
 character position in the subject string, so there is no point in retrying the
 overall match at any position after the first. PCRE normally treats such a
@@ -1058,8 +1349,8 @@
 

 However, there is one situation where the optimization cannot be used. When .*
 is inside capturing parentheses that are the subject of a backreference
-elsewhere in the pattern, a match at the start may fail, and a later one
-succeed. Consider, for example:
+elsewhere in the pattern, a match at the start may fail where a later one
+succeeds. Consider, for example:
 
   (.*)abc\1
 
@@ -1081,14 +1372,14 @@
 
 matches "aba" the value of the second captured substring is "b".
 
-
ATOMIC GROUPING AND POSSESSIVE QUANTIFIERS

+
ATOMIC GROUPING AND POSSESSIVE QUANTIFIERS

 
-With both maximizing and minimizing repetition, failure of what follows
-normally causes the repeated item to be re-evaluated to see if a different
-number of repeats allows the rest of the pattern to match. Sometimes it is
-useful to prevent this, either to change the nature of the match, or to cause
-it fail earlier than it otherwise might, when the author of the pattern knows
-there is no point in carrying on.
+With both maximizing ("greedy") and minimizing ("ungreedy" or "lazy")
+repetition, failure of what follows normally causes the repeated item to be
+re-evaluated to see if a different number of repeats allows the rest of the
+pattern to match. Sometimes it is useful to prevent this, either to change the
+nature of the match, or to cause it fail earlier than it otherwise might, when
+the author of the pattern knows there is no point in carrying on.
 
 
 Consider, for example, the pattern \d+foo when applied to the subject line
@@ -1102,7 +1393,7 @@
 that once a subpattern has matched, it is not to be re-evaluated in this way.
 
 
-If we use atomic grouping for the previous example, the matcher would give up
+If we use atomic grouping for the previous example, the matcher gives up
 immediately on failing to match "foo" the first time. The notation is a kind of
 special parenthesis, starting with (?> as in this example:
 
@@ -1135,16 +1426,28 @@
    \d++foo
 
+Note that a possessive quantifier can be used with an entire group, for
+example:
++  (abc|xyz){2,3}+
+
 Possessive quantifiers are always greedy; the setting of the PCRE_UNGREEDY
 option is ignored. They are a convenient notation for the simpler forms of
-atomic group. However, there is no difference in the meaning or processing of a
-possessive quantifier and the equivalent atomic group.
+atomic group. However, there is no difference in the meaning of a possessive
+quantifier and the equivalent atomic group, though there may be a performance
+difference; possessive quantifiers should be slightly faster.
 
 
-The possessive quantifier syntax is an extension to the Perl syntax. Jeffrey
-Friedl originated the idea (and the name) in the first edition of his book.
-Mike McCloskey liked it, so implemented it when he built Sun's Java package,
-and PCRE copied it from there.
+The possessive quantifier syntax is an extension to the Perl 5.8 syntax.
+Jeffrey Friedl originated the idea (and the name) in the first edition of his
+book. Mike McCloskey liked it, so implemented it when he built Sun's Java
+package, and PCRE copied it from there. It ultimately found its way into Perl
+at release 5.10.
+
+
+PCRE has an optimization that automatically "possessifies" certain simple
+pattern constructs. For example, the sequence A+B is treated as A++B because
+there is no point in backtracking into a sequence of A's when B must follow.
 
 
 When a pattern contains an unlimited repeat inside a subpattern that can itself
@@ -1173,7 +1476,7 @@
 
 sequences of non-digits cannot be broken, and failure happens quickly.
 
-
BACK REFERENCES

+
BACK REFERENCES

 
 Outside a character class, a backslash followed by a digit greater than 0 (and
 possibly further digits) is a back reference to a capturing subpattern earlier
@@ -1190,12 +1493,37 @@
 in an earlier iteration.
 
 
-It is not possible to have a numerical "forward back reference" to subpattern
-whose number is 10 or more. However, a back reference to any subpattern is
-possible using named parentheses (see below). See also the subsection entitled
+It is not possible to have a numerical "forward back reference" to a subpattern
+whose number is 10 or more using this syntax because a sequence such as \50 is
+interpreted as a character defined in octal. See the subsection entitled
 "Non-printing characters"
 above
-for further details of the handling of digits following a backslash.
+for further details of the handling of digits following a backslash. There is
+no such problem when named parentheses are used. A back reference to any
+subpattern is possible using named parentheses (see below).
+
+
+Another way of avoiding the ambiguity inherent in the use of digits following a
+backslash is to use the \g escape sequence, which is a feature introduced in
+Perl 5.10. This escape must be followed by an unsigned number or a negative
+number, optionally enclosed in braces. These examples are all identical:
+
+  (ring), \1
+  (ring), \g1
+  (ring), \g{1}
+
+An unsigned number specifies an absolute reference without the ambiguity that
+is present in the older syntax. It is also useful when literal digits follow
+the reference. A negative number is a relative reference. Consider this
+example:
++  (abc(def)ghi)\g{-1}
+
+The sequence \g{-1} is a reference to the most recently started capturing
+subpattern before \g, that is, is it equivalent to \2. Similarly, \g{-2}
+would be equivalent to \1. The use of relative references can be helpful in
+long patterns, and also in patterns that are created by joining together
+fragments that contain references within themselves.
 
 
 A back reference matches whatever actually matched the capturing subpattern in
@@ -1216,10 +1544,17 @@
 capturing subpattern is matched caselessly.
 
 
-Back references to named subpatterns use the Python syntax (?P=name). We could
-rewrite the above example as follows:
+There are several different ways of writing back references to named
+subpatterns. The .NET syntax \k{name} and the Perl syntax \k<name> or
+\k'name' are supported, as is the Python syntax (?P=name). Perl 5.10's unified
+back reference syntax, in which \g can be used for both numeric and named
+references, is also supported. We could rewrite the above example in any of
+the following ways:
 
+  (?<p1>(?i)rah)\s+\k<p1>
+  (?'p1'(?i)rah)\s+\k{p1}
   (?P<p1>(?i)rah)\s+(?P=p1)
+  (?<p1>(?i)rah)\s+\g{p1}
 
 A subpattern that is referenced by name may appear in the pattern before or
 after the reference.
@@ -1255,7 +1590,7 @@
 done using alternation, as in the example above, or by a quantifier with a
 minimum of zero.
 
-
ASSERTIONS

+
ASSERTIONS

 
 An assertion is a test on the characters following or preceding the current
 matching point that does not actually consume any characters. The simple
@@ -1337,21 +1672,27 @@
 
   (?<=abc|abde)
 
+In some cases, the Perl 5.10 escape sequence \K
+(see above)
+can be used instead of a lookbehind assertion; this is not restricted to a
+fixed-length.
+
+
 The implementation of lookbehind assertions is, for each alternative, to
-temporarily move the current position back by the fixed width and then try to
+temporarily move the current position back by the fixed length and then try to
 match. If there are insufficient characters before the current position, the
-match is deemed to fail.
+assertion fails.
 
 
 PCRE does not allow the \C escape (which matches a single byte in UTF-8 mode)
 to appear in lookbehind assertions, because it makes it impossible to calculate
-the length of the lookbehind. The \X escape, which can match different numbers
-of bytes, is also not permitted.
+the length of the lookbehind. The \X and \R escapes, which can match
+different numbers of bytes, are also not permitted.
 
 
-Atomic groups can be used in conjunction with lookbehind assertions to specify
-efficient matching at the end of the subject string. Consider a simple pattern
-such as
+Possessive quantifiers can be used in conjunction with lookbehind assertions to
+specify efficient matching at the end of the subject string. Consider a simple
+pattern such as
 
   abcd$
 
@@ -1367,13 +1708,9 @@
 covers the entire string, from right to left, so we are no better off. However,
 if the pattern is written as
 -  ^(?>.*)(?<=abcd)
-
-or, equivalently, using the possessive quantifier syntax,
-   ^.*+(?<=abcd)
 
-there can be no backtracking for the .* item; it can match only the entire
+there can be no backtracking for the .*+ item; it can match only the entire
 string. The subsequent lookbehind assertion does a single test on the last four
 characters. If it fails, the match fails immediately. For long strings, this
 approach makes a significant difference to the processing time.
@@ -1413,7 +1750,7 @@
 is another pattern that matches "foo" preceded by three digits and any three
 characters that are not "999".
 
-
CONDITIONAL SUBPATTERNS

+
CONDITIONAL SUBPATTERNS

 
 It is possible to cause the matching process to obey a subpattern
 conditionally or to choose between two alternative subpatterns, depending on
@@ -1428,15 +1765,20 @@
 subpattern, a compile-time error occurs.
 
 
-There are three kinds of condition. If the text between the parentheses
-consists of a sequence of digits, or a sequence of alphanumeric characters and
-underscores, the condition is satisfied if the capturing subpattern of that
-number or name has previously matched. There is a possible ambiguity here,
-because subpattern names may consist entirely of digits. PCRE looks first for a
-named subpattern; if it cannot find one and the text consists entirely of
-digits, it looks for a subpattern of that number, which must be greater than
-zero. Using subpattern names that consist entirely of digits is not
-recommended.
+There are four kinds of condition: references to subpatterns, references to
+recursion, a pseudo-condition called DEFINE, and assertions.
+
+

+Checking for a used subpattern by number
+

+
+If the text between the parentheses consists of a sequence of digits, the
+condition is true if the capturing subpattern of that number has previously
+matched. An alternative notation is to precede the digits with a plus or minus
+sign. In this case, the subpattern number is relative rather than absolute.
+The most recently opened parentheses can be referenced by (?(-1), the next most
+recent by (?(-2), and so on. In looping constructs it can also make sense to
+refer to subsequent groups with constructs such as (?(+2).
 
 
 Consider the following pattern, which contains non-significant white space to
@@ -1453,18 +1795,85 @@
 the condition is true, and so the yes-pattern is executed and a closing
 parenthesis is required. Otherwise, since no-pattern is not present, the
 subpattern matches nothing. In other words, this pattern matches a sequence of
-non-parentheses, optionally enclosed in parentheses. Rewriting it to use a
-named subpattern gives this:
+non-parentheses, optionally enclosed in parentheses.
+
+
+If you were embedding this pattern in a larger one, you could use a relative
+reference:
 
-  (?P<OPEN> \( )?    [^()]+    (?(OPEN) \) )
+  ...other stuff... ( \( )?    [^()]+    (?(-1) \) ) ...
 
+This makes the fragment independent of the parentheses in the larger pattern.
+
+

+Checking for a used subpattern by name
+

+
+Perl uses the syntax (?(<name>)...) or (?('name')...) to test for a used
+subpattern by name. For compatibility with earlier versions of PCRE, which had
+this facility before Perl, the syntax (?(name)...) is also recognized. However,
+there is a possible ambiguity with this syntax, because subpattern names may
+consist entirely of digits. PCRE looks first for a named subpattern; if it
+cannot find one and the name consists entirely of digits, PCRE looks for a
+subpattern of that number, which must be greater than zero. Using subpattern
+names that consist entirely of digits is not recommended.
+
+
+Rewriting the above example to use a named subpattern gives this:
+
+  (?<OPEN> \( )?    [^()]+    (?(<OPEN>) \) )
+
+
+
+

+Checking for pattern recursion
+

+
 If the condition is the string (R), and there is no subpattern with the name R,
-the condition is satisfied if a recursive call to the pattern or subpattern has
-been made. At "top level", the condition is false. This is a PCRE extension.
-Recursive patterns are described in the next section.
+the condition is true if a recursive call to the whole pattern or any
+subpattern has been made. If digits or a name preceded by ampersand follow the
+letter R, for example:
+
+  (?(R3)...) or (?(R&name)...)
+
+the condition is true if the most recent recursion is into the subpattern whose
+number or name is given. This condition does not check the entire recursion
+stack.
+
+
+At "top level", all these recursion test conditions are false. Recursive
+patterns are described below.
 
+

+Defining subpatterns for use by reference only
+

 
-If the condition is not a sequence of digits or (R), it must be an assertion.
+If the condition is the string (DEFINE), and there is no subpattern with the
+name DEFINE, the condition is always false. In this case, there may be only one
+alternative in the subpattern. It is always skipped if control reaches this
+point in the pattern; the idea of DEFINE is that it can be used to define
+"subroutines" that can be referenced from elsewhere. (The use of "subroutines"
+is described below.) For example, a pattern to match an IPv4 address could be
+written like this (ignore whitespace and line breaks):
+
+  (?(DEFINE) (?<byte> 2[0-4]\d | 25[0-5] | 1\d\d | [1-9]?\d) )
+  \b (?&byte) (\.(?&byte)){3} \b
+
+The first part of the pattern is a DEFINE group inside which a another group
+named "byte" is defined. This matches an individual component of an IPv4
+address (a number less than 256). When matching takes place, this part of the
+pattern is skipped because DEFINE acts like a false condition.
+
+
+The rest of the pattern uses references to the named group to match the four
+dot-separated components of an IPv4 address, insisting on a word boundary at
+each end.
+
+

+Assertion conditions
+

+
+If the condition is not in any of the above formats, it must be an assertion.
 This may be a positive or negative lookahead or lookbehind assertion. Consider
 this pattern, again containing non-significant white space, and with the two
 alternatives on the second line:
@@ -1479,7 +1888,7 @@
 against the second. This pattern matches strings in one of the two forms
 dd-aaa-dd or dd-dd-dd, where aaa are letters and dd are digits.
 
-
COMMENTS

+
COMMENTS

 
 The sequence (?# marks the start of a comment that continues up to the next
 closing parenthesis. Nested parentheses are not permitted. The characters
@@ -1490,35 +1899,43 @@
 character class introduces a comment that continues to immediately after the
 next newline in the pattern.
 
-
RECURSIVE PATTERNS

+
RECURSIVE PATTERNS

 
 Consider the problem of matching a string in parentheses, allowing for
 unlimited nested parentheses. Without the use of recursion, the best that can
 be done is to use a pattern that matches up to some fixed depth of nesting. It
-is not possible to handle an arbitrary nesting depth. Perl provides a facility
-that allows regular expressions to recurse (amongst other things). It does this
-by interpolating Perl code in the expression at run time, and the code can
-refer to the expression itself. A Perl pattern to solve the parentheses problem
-can be created like this:
+is not possible to handle an arbitrary nesting depth.
+
+
+For some time, Perl has provided a facility that allows regular expressions to
+recurse (amongst other things). It does this by interpolating Perl code in the
+expression at run time, and the code can refer to the expression itself. A Perl
+pattern using code interpolation to solve the parentheses problem can be
+created like this:
 
   $re = qr{\( (?: (?>[^()]+) | (?p{$re}) )* \)}x;
 
 The (?p{...}) item interpolates Perl code at run time, and in this case refers
-recursively to the pattern in which it appears. Obviously, PCRE cannot support
-the interpolation of Perl code. Instead, it supports some special syntax for
-recursion of the entire pattern, and also for individual subpattern recursion.
+recursively to the pattern in which it appears.
+
+
+Obviously, PCRE cannot support the interpolation of Perl code. Instead, it
+supports special syntax for recursion of the entire pattern, and also for
+individual subpattern recursion. After its introduction in PCRE and Python,
+this kind of recursion was introduced into Perl at release 5.10.
 
 
-The special item that consists of (? followed by a number greater than zero and
-a closing parenthesis is a recursive call of the subpattern of the given
-number, provided that it occurs inside that subpattern. (If not, it is a
-"subroutine" call, which is described in the next section.) The special item
-(?R) is a recursive call of the entire regular expression.
+A special item that consists of (? followed by a number greater than zero and a
+closing parenthesis is a recursive call of the subpattern of the given number,
+provided that it occurs inside that subpattern. (If not, it is a "subroutine"
+call, which is described in the next section.) The special item (?R) or (?0) is
+a recursive call of the entire regular expression.
 
 
-A recursive subpattern call is always treated as an atomic group. That is, once
-it has matched some of the subject string, it is never re-entered, even if
-it contains untried alternatives and there is a subsequent matching failure.
+In PCRE (like Python, but unlike Perl), a recursive subpattern call is always
+treated as an atomic group. That is, once it has matched some of the subject
+string, it is never re-entered, even if it contains untried alternatives and
+there is a subsequent matching failure.
 
 
 This PCRE pattern solves the nested parentheses problem (assume the
@@ -1538,18 +1955,37 @@
   ( \( ( (?>[^()]+) | (?1) )* \) )
 
 We have put the pattern into parentheses, and caused the recursion to refer to
-them instead of the whole pattern. In a larger pattern, keeping track of
-parenthesis numbers can be tricky. It may be more convenient to use named
-parentheses instead. For this, PCRE uses (?P>name), which is an extension to
-the Python syntax that PCRE uses for named parentheses (Perl does not provide
-named parentheses). We could rewrite the above example as follows:
--  (?P<pn> \( ( (?>[^()]+) | (?P>pn) )* \) )
-
-This particular example pattern contains nested unlimited repeats, and so the
-use of atomic grouping for matching strings of non-parentheses is important
-when applying the pattern to strings that do not match. For example, when this
-pattern is applied to
+them instead of the whole pattern.
+
+
+In a larger pattern, keeping track of parenthesis numbers can be tricky. This
+is made easier by the use of relative references. (A Perl 5.10 feature.)
+Instead of (?1) in the pattern above you can write (?-2) to refer to the second
+most recently opened parentheses preceding the recursion. In other words, a
+negative number counts capturing parentheses leftwards from the point at which
+it is encountered.
+
+
+It is also possible to refer to subsequently opened parentheses, by writing
+references such as (?+2). However, these cannot be recursive because the
+reference is not inside the parentheses that are referenced. They are always
+"subroutine" calls, as described in the next section.
+
+
+An alternative approach is to use named parentheses instead. The Perl syntax
+for this is (?&name); PCRE's earlier syntax (?P>name) is also supported. We
+could rewrite the above example as follows:
+
+  (?<pn> \( ( (?>[^()]+) | (?&pn) )* \) )
+
+If there is more than one subpattern with the same name, the earliest one is
+used.
+
+
+This particular example pattern that we have been looking at contains nested
+unlimited repeats, and so the use of atomic grouping for matching strings of
+non-parentheses is important when applying the pattern to strings that do not
+match. For example, when this pattern is applied to
 
   (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()
 
@@ -1562,7 +1998,7 @@
 At the end of a match, the values set for any capturing subpatterns are those
 from the outermost level of the recursion at which the subpattern value is set.
 If you want to obtain intermediate values, a callout function can be used (see
-the next section and the
+below and the
 pcrecallout
 documentation). If the pattern above is matched against
 @@ -1593,12 +2029,19 @@
 different alternatives for the recursive and non-recursive cases. The (?R) item
 is the actual recursive call.
 
-
SUBPATTERNS AS SUBROUTINES

+
SUBPATTERNS AS SUBROUTINES

 
 If the syntax for a recursive subpattern reference (either by number or by
 name) is used outside the parentheses to which it refers, it operates like a
-subroutine in a programming language. An earlier example pointed out that the
-pattern
+subroutine in a programming language. The "called" subpattern may be defined
+before or after the reference. A numbered reference can be absolute or
+relative, as in these examples:
+
+  (...(absolute)...)...(?2)...
+  (...(relative)...)...(?-1)...
+  (...(?+1)...(relative)...
+
+An earlier example pointed out that the pattern
    (sens|respons)e and \1ibility
 
@@ -1608,8 +2051,7 @@
   (sens|respons)e and (?1)ibility
 
 is used, it does match "sense and responsibility" as well as the other two
-strings. Such references, if given numerically, must follow the subpattern to
-which they refer. However, named references can refer to later subpatterns.
+strings. Another example is given in the discussion of DEFINE above.
 
 
 Like recursive subpatterns, a "subroutine" call is always treated as an atomic
@@ -1617,7 +2059,35 @@
 re-entered, even if it contains untried alternatives and there is a subsequent
 matching failure.
 
-
CALLOUTS

+
+When a subpattern is used as a subroutine, processing options such as
+case-independence are fixed when the subpattern is defined. They cannot be
+changed for different calls. For example, consider this pattern:
+
+  (abc)(?i:(?-1))
+
+It matches "abcabc". It does not match "abcABC" because the change of
+processing option does not affect the called subpattern.
+
+
ONIGURUMA SUBROUTINE SYNTAX

+
+For compatibility with Oniguruma, the non-Perl syntax \g followed by a name or
+a number enclosed either in angle brackets or single quotes, is an alternative
+syntax for referencing a subpattern as a subroutine, possibly recursively. Here
+are two of the examples used above, rewritten using this syntax:
+
+  (?<pn> \( ( (?>[^()]+) | \g<pn> )* \) )
+  (sens|respons)e and \g'1'ibility
+
+PCRE supports an extension to Oniguruma: if a number is preceded by a
+plus or a minus sign it is taken as a relative reference. For example:
++  (abc)(?i:\g<-1>)
+
+Note that \g{...} (Perl syntax) and \g<...> (Oniguruma syntax) are not
+synonymous. The former is a back reference; the latter is a subroutine call.
+
+
CALLOUTS

 
 Perl has a feature whereby using the sequence (?{...}) causes arbitrary Perl
 code to be obeyed in the middle of matching a regular expression. This makes it
@@ -1636,7 +2106,7 @@
 can put a number less than 256 after the letter C. The default value is zero.
 For example, this pattern has two callout points:
 
-  (?C1)\dabc(?C2)def
+  (?C1)abc(?C2)def
 
 If the PCRE_AUTO_CALLOUT flag is passed to pcre_compile(), callouts are
 automatically installed before each item in the pattern. They are all numbered
@@ -1652,10 +2122,141 @@
 pcrecallout
 documentation.
 
+
BACKTRACKING CONTROL

+
+Perl 5.10 introduced a number of "Special Backtracking Control Verbs", which
+are described in the Perl documentation as "experimental and subject to change
+or removal in a future version of Perl". It goes on to say: "Their usage in
+production code should be noted to avoid problems during upgrades." The same
+remarks apply to the PCRE features described in this section.
+
+
+Since these verbs are specifically related to backtracking, most of them can be
+used only when the pattern is to be matched using pcre_exec(), which uses
+a backtracking algorithm. With the exception of (*FAIL), which behaves like a
+failing negative assertion, they cause an error if encountered by
+pcre_dfa_exec().
+
+
+The new verbs make use of what was previously invalid syntax: an opening
+parenthesis followed by an asterisk. In Perl, they are generally of the form
+(*VERB:ARG) but PCRE does not support the use of arguments, so its general
+form is just (*VERB). Any number of these verbs may occur in a pattern. There
+are two kinds:
+
+

+Verbs that act immediately
+

+
+The following verbs act as soon as they are encountered:
+
+   (*ACCEPT)
+
+This verb causes the match to end successfully, skipping the remainder of the
+pattern. When inside a recursion, only the innermost pattern is ended
+immediately. PCRE differs from Perl in what happens if the (*ACCEPT) is inside
+capturing parentheses. In Perl, the data so far is captured: in PCRE no data is
+captured. For example:
++  A(A|B(*ACCEPT)|C)D
+
+This matches "AB", "AAD", or "ACD", but when it matches "AB", no data is
+captured.
++  (*FAIL) or (*F)
+
+This verb causes the match to fail, forcing backtracking to occur. It is
+equivalent to (?!) but easier to read. The Perl documentation notes that it is
+probably useful only when combined with (?{}) or (??{}). Those are, of course,
+Perl features that are not present in PCRE. The nearest equivalent is the
+callout feature, as for example in this pattern:
++  a+(?C)(*FAIL)
+
+A match with the string "aaaa" always fails, but the callout is taken before
+each backtrack happens (in this example, 10 times).
+
+

+Verbs that act after backtracking
+

 
-Last updated: 06 June 2006
+The following verbs do nothing when they are encountered. Matching continues
+with what follows, but if there is no subsequent match, a failure is forced.
+The verbs differ in exactly what kind of failure occurs.
+
+  (*COMMIT)
+
+This verb causes the whole match to fail outright if the rest of the pattern
+does not match. Even if the pattern is unanchored, no further attempts to find
+a match by advancing the start point take place. Once (*COMMIT) has been
+passed, pcre_exec() is committed to finding a match at the current
+starting point, or not at all. For example:
++  a+(*COMMIT)b
+
+This matches "xxaab" but not "aacaab". It can be thought of as a kind of
+dynamic anchor, or "I've started, so I must finish."
++  (*PRUNE)
+
+This verb causes the match to fail at the current position if the rest of the
+pattern does not match. If the pattern is unanchored, the normal "bumpalong"
+advance to the next starting character then happens. Backtracking can occur as
+usual to the left of (*PRUNE), or when matching to the right of (*PRUNE), but
+if there is no match to the right, backtracking cannot cross (*PRUNE).
+In simple cases, the use of (*PRUNE) is just an alternative to an atomic
+group or possessive quantifier, but there are some uses of (*PRUNE) that cannot
+be expressed in any other way.
++  (*SKIP)
+
+This verb is like (*PRUNE), except that if the pattern is unanchored, the
+"bumpalong" advance is not to the next character, but to the position in the
+subject where (*SKIP) was encountered. (*SKIP) signifies that whatever text
+was matched leading up to it cannot be part of a successful match. Consider:
++  a+(*SKIP)b
+
+If the subject is "aaaac...", after the first match attempt fails (starting at
+the first character in the string), the starting point skips on to start the
+next attempt at "c". Note that a possessive quantifer does not have the same
+effect in this example; although it would suppress backtracking during the
+first match attempt, the second attempt would start at the second character
+instead of skipping on to "c".
++  (*THEN)
+
+This verb causes a skip to the next alternation if the rest of the pattern does
+not match. That is, it cancels pending backtracking, but only within the
+current alternation. Its name comes from the observation that it can be used
+for a pattern-based if-then-else block:
++  ( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ...
+
+If the COND1 pattern matches, FOO is tried (and possibly further items after
+the end of the group if FOO succeeds); on failure the matcher skips to the
+second alternative and tries COND2, without backtracking into COND1. If (*THEN)
+is used outside of any alternation, it acts exactly like (*PRUNE).
+
+
SEE ALSO

+
+pcreapi(3), pcrecallout(3), pcrematching(3), pcre(3).
+
+
AUTHOR

+
+Philip Hazel
+

+University Computing Service
+

+Cambridge CB2 3QH, England.
+

+
+
REVISION

+
+Last updated: 11 April 2009
+

+Copyright © 1997-2009 University of Cambridge.
 

-Copyright © 1997-2006 University of Cambridge.
 

 Return to the PCRE index page.
 

Modified: freeswitch/trunk/libs/pcre/doc/html/pcreperform.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcreperform.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcreperform.html	Mon Jun  8 18:51:30 2009
@@ -16,13 +16,73 @@
 PCRE PERFORMANCE
 

 
-Certain items that may appear in regular expression patterns are more efficient
+Two aspects of performance are discussed below: memory usage and processing
+time. The way you express your pattern as a regular expression can affect both
+of them.
+
+

+MEMORY USAGE
+

+
+Patterns are compiled by PCRE into a reasonably efficient byte code, so that
+most simple patterns do not use much memory. However, there is one case where
+memory usage can be unexpectedly large. When a parenthesized subpattern has a
+quantifier with a minimum greater than 1 and/or a limited maximum, the whole
+subpattern is repeated in the compiled code. For example, the pattern
+
+  (abc|def){2,4}
+
+is compiled as if it were
++  (abc|def)(abc|def)((abc|def)(abc|def)?)?
+
+(Technical aside: It is done this way so that backtrack points within each of
+the repetitions can be independently maintained.)
+
+
+For regular expressions whose quantifiers use only small numbers, this is not
+usually a problem. However, if the numbers are large, and particularly if such
+repetitions are nested, the memory usage can become an embarrassment. For
+example, the very simple pattern
+
+  ((ab){1,1000}c){1,3}
+
+uses 51K bytes when compiled. When PCRE is compiled with its default internal
+pointer size of two bytes, the size limit on a compiled pattern is 64K, and
+this is reached with the above pattern if the outer repetition is increased
+from 3 to 4. PCRE can be compiled to use larger internal pointers and thus
+handle larger compiled patterns, but it is better to try to rewrite your
+pattern to use less memory if you can.
+
+
+One way of reducing the memory usage for such patterns is to make use of PCRE's
+"subroutine"
+facility. Re-writing the above pattern as
+
+  ((ab)(?2){0,999}c)(?1){0,2}
+
+reduces the memory requirements to 18K, and indeed it remains under 20K even
+with the outer repetition increased to 100. However, this pattern is not
+exactly equivalent, because the "subroutine" calls are treated as
+atomic groups
+into which there can be no backtracking if there is a subsequent matching
+failure. Therefore, PCRE cannot do this kind of rewriting automatically.
+Furthermore, there is a noticeable loss of speed when executing the modified
+pattern. Nevertheless, if the atomic grouping is not a problem and the loss of
+speed is acceptable, this kind of rewriting will allow you to process patterns
+that PCRE cannot otherwise handle.
+
+

+PROCESSING TIME
+

+
+Certain items in regular expression patterns are processed more efficiently
 than others. It is more efficient to use a character class like [aeiou] than a
-set of alternatives such as (a|e|i|o|u). In general, the simplest construction
-that provides the required behaviour is usually the most efficient. Jeffrey
-Friedl's book contains a lot of useful general discussion about optimizing
-regular expressions for efficient performance. This document contains a few
-observations about PCRE.
+set of single-character alternatives such as (a|e|i|o|u). In general, the
+simplest construction that provides the required behaviour is usually the most
+efficient. Jeffrey Friedl's book contains a lot of useful general discussion
+about optimizing regular expressions for efficient performance. This document
+contains a few observations about PCRE.
 
 
 Using Unicode character properties (the \p, \P, and \X escapes) is slow,
@@ -58,14 +118,15 @@
 long time to run when applied to a string that does not match. Consider the
 pattern fragment
 
-  (a+)*
+  ^(a+)*
 
-This can match "aaaa" in 33 different ways, and this number increases very
+This can match "aaaa" in 16 different ways, and this number increases very
 rapidly as the string gets longer. (The * repeat can match 0, 1, 2, 3, or 4
-times, and for each of those cases other than 0, the + repeats can match
+times, and for each of those cases other than 0 or 4, the + repeats can match
 different numbers of times.) When the remainder of the pattern is such that the
 entire match is going to fail, PCRE has in principle to try every possible
-variation, and this can take an extremely long time.
+variation, and this can take an extremely long time, even for relatively short
+strings.
 
 
 An optimization catches some of the more simple cases such as
@@ -88,10 +149,25 @@
 In many cases, the solution to this kind of performance issue is to use an
 atomic group or a possessive quantifier.
 
+

+AUTHOR
+

 
-Last updated: 28 February 2005
+Philip Hazel
+

+University Computing Service
+

+Cambridge CB2 3QH, England.
+

+
+

+REVISION
+

+
+Last updated: 06 March 2007
+

+Copyright © 1997-2007 University of Cambridge.
 

-Copyright © 1997-2005 University of Cambridge.
 

 Return to the PCRE index page.
 

Modified: freeswitch/trunk/libs/pcre/doc/html/pcreposix.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcreposix.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcreposix.html	Mon Jun  8 18:51:30 2009
@@ -21,6 +21,7 @@
 ERROR MESSAGES
 
MEMORY USAGE
 
AUTHOR
+
REVISION
 
 
SYNOPSIS OF POSIX API

 
@@ -58,11 +59,11 @@
 call the native ones, it is also necessary to add -lpcre.
 
 
-I have implemented only those option bits that can be reasonably mapped to PCRE
-native options. In addition, the option REG_EXTENDED is defined with the value
-zero. This has no effect, but since programs that are written to the POSIX
-interface often use it, this makes it easier to slot in PCRE as a replacement
-library. Other POSIX options are not even defined.
+I have implemented only those POSIX option bits that can be reasonably mapped
+to PCRE native options. In addition, the option REG_EXTENDED is defined with
+the value zero. This has no effect, but since programs that are written to the
+POSIX interface often use it, this makes it easier to slot in PCRE as a
+replacement library. Other POSIX options are not even defined.
 
 
 When PCRE is called via these functions, it is only the API that is POSIX-like
@@ -179,18 +180,36 @@
 
MATCHING A PATTERN

 

 The function regexec() is called to match a compiled pattern preg
-against a given string, which is terminated by a zero byte, subject to
-the options in eflags. These can be:
+against a given string, which is by default terminated by a zero byte
+(but see REG_STARTEND below), subject to the options in eflags. These can
+be:
 
   REG_NOTBOL
 
 The PCRE_NOTBOL option is set when calling the underlying PCRE matching
 function.
 +  REG_NOTEMPTY
+
+The PCRE_NOTEMPTY option is set when calling the underlying PCRE matching
+function. Note that REG_NOTEMPTY is not part of the POSIX standard. However,
+setting this option can give more POSIX-like behaviour in some situations.
+   REG_NOTEOL
 
 The PCRE_NOTEOL option is set when calling the underlying PCRE matching
 function.
++  REG_STARTEND
+
+The string is considered to start at string + pmatch[0].rm_so and
+to have a terminating NUL located at string + pmatch[0].rm_eo
+(there need not actually be a NUL at that location), regardless of the value of
+nmatch. This is a BSD extension, compatible with but not specified by
+IEEE Standard 1003.2 (POSIX.2), and should be used with caution in software
+intended to be portable to other systems. Note that a non-zero rm_so does
+not imply REG_NOTBOL; REG_STARTEND affects only the location of the string, not
+how it is matched.
 
 
 If the pattern was compiled with the REG_NOSUB flag, no data about any matched
@@ -231,14 +250,17 @@
 

 Philip Hazel
 

-University Computing Service,
+University Computing Service
+

+Cambridge CB2 3QH, England.
 

-Cambridge CB2 3QG, England.
 
+
REVISION

 
-Last updated: 16 January 2006
+Last updated: 11 March 2009
+

+Copyright © 1997-2009 University of Cambridge.
 

-Copyright © 1997-2006 University of Cambridge.
 

 Return to the PCRE index page.
 

Modified: freeswitch/trunk/libs/pcre/doc/html/pcreprecompile.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcreprecompile.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcreprecompile.html	Mon Jun  8 18:51:30 2009
@@ -17,6 +17,8 @@
 
SAVING A COMPILED PATTERN
 
RE-USING A PRECOMPILED PATTERN
 
COMPATIBILITY WITH DIFFERENT PCRE RELEASES
+
AUTHOR
+
REVISION
 
 
SAVING AND RE-USING PRECOMPILED PCRE PATTERNS

 
@@ -32,7 +34,9 @@
 If you save compiled patterns to a file, you can copy them to a different host
 and run them there. This works even if the new host has the opposite endianness
 to the one on which the patterns were compiled. There may be a small
-performance penalty, but it should be insignificant.
+performance penalty, but it should be insignificant. However, compiling regular
+expressions with one version of PCRE for use with a different version is not
+guaranteed to work and may cause crashes.
 
 
SAVING A COMPILED PATTERN

 
@@ -120,21 +124,25 @@
 
 
COMPATIBILITY WITH DIFFERENT PCRE RELEASES

 
-The layout of the control block that is at the start of the data that makes up
-a compiled pattern was changed for release 5.0. If you have any saved patterns
-that were compiled with previous releases (not a facility that was previously
-advertised), you will have to recompile them for release 5.0. However, from now
-on, it should be possible to make changes in a compatible manner.
+In general, it is safest to recompile all saved patterns when you update to a
+new PCRE release, though not all updates actually require this. Recompiling is
+definitely needed for release 7.2.
 
+
AUTHOR

 
-Notwithstanding the above, if you have any saved patterns in UTF-8 mode that
-use \p or \P that were compiled with any release up to and including 6.4, you
-will have to recompile them for release 6.5 and above.
+Philip Hazel
+

+University Computing Service
+

+Cambridge CB2 3QH, England.
+

 
+
REVISION

 
-Last updated: 01 February 2006
+Last updated: 13 June 2007
+

+Copyright © 1997-2007 University of Cambridge.
 

-Copyright © 1997-2006 University of Cambridge.
 

 Return to the PCRE index page.
 

Modified: freeswitch/trunk/libs/pcre/doc/html/pcresample.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcresample.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcresample.html	Mon Jun  8 18:51:30 2009
@@ -72,10 +72,25 @@
 
 (for example) to the compile command to get round this problem.
 
+

+AUTHOR
+

 
-Last updated: 09 September 2004
+Philip Hazel
+

+University Computing Service
+

+Cambridge CB2 3QH, England.
+

+
+

+REVISION
+

+
+Last updated: 23 January 2008
+

+Copyright © 1997-2008 University of Cambridge.
 

-Copyright © 1997-2004 University of Cambridge.
 

 Return to the PCRE index page.
 

Modified: freeswitch/trunk/libs/pcre/doc/html/pcrestack.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcrestack.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcrestack.html	Mon Jun  8 18:51:30 2009
@@ -63,7 +63,7 @@
 required. Consider now this rewritten pattern, which matches exactly the same
 strings:
 -  ([^<]++|<(?!inet))
+  ([^<]++|<(?!inet))+
 
 This uses very much less stack, because runs of characters that do not contain
 "<" are "swallowed" in one item inside the parentheses. Recursion happens only
@@ -73,23 +73,62 @@
 stack usage.
 
 
+This example shows that one way of avoiding stack problems when matching long
+subject strings is to write repeated parenthesized subpatterns to match more
+than one character whenever possible.
+
+

+Compiling PCRE to use heap instead of stack
+

+
 In environments where stack memory is constrained, you might want to compile
 PCRE to use heap memory instead of stack for remembering back-up points. This
 makes it run a lot more slowly, however. Details of how to do this are given in
 the
 pcrebuild
+documentation. When built in this way, instead of using the stack, PCRE obtains
+and frees memory by calling the functions that are pointed to by the
+pcre_stack_malloc and pcre_stack_free variables. By default, these
+point to malloc() and free(), but you can replace the pointers to
+cause PCRE to use your own functions. Since the block sizes are always the
+same, and are always freed in reverse order, it may be possible to implement
+customized memory handlers that are more efficient than the standard functions.
+
+

+Limiting PCRE's stack usage
+

+
+PCRE has an internal counter that can be used to limit the depth of recursion,
+and thus cause pcre_exec() to give an error code before it runs out of
+stack. By default, the limit is very large, and unlikely ever to operate. It
+can be changed when PCRE is built, and it can also be set when
+pcre_exec() is called. For details of these interfaces, see the
+pcrebuild
+and
+pcreapi
 documentation.
 
 
-In Unix-like environments, there is not often a problem with the stack, though
-the default limit on stack size varies from system to system. Values from 8Mb
-to 64Mb are common. You can find your default limit by running the command:
+As a very rough rule of thumb, you should reckon on about 500 bytes per
+recursion. Thus, if you want to limit your stack usage to 8Mb, you
+should set the limit at 16000 recursions. A 64Mb stack, on the other hand, can
+support around 128000 recursions. The pcretest test program has a command
+line option (-S) that can be used to increase the size of its stack.
+
+

+Changing stack size in Unix-like systems
+

+
+In Unix-like environments, there is not often a problem with the stack unless
+very long strings are involved, though the default limit on stack size varies
+from system to system. Values from 8Mb to 64Mb are common. You can find your
+default limit by running the command:
 
   ulimit -s
 
-The effect of running out of stack is often SIGSEGV, though sometimes an error
-message is given. You can normally increase the limit on stack size by code
-such as this:
+Unfortunately, the effect of running out of stack is often SIGSEGV, though
+sometimes a more explicit error message is given. You can normally increase the
+limit on stack size by code such as this:
    struct rlimit rlim;
   getrlimit(RLIMIT_STACK, &rlim);
@@ -100,28 +139,34 @@
 attempts to increase the soft limit to 100Mb using setrlimit(). You must
 do this before calling pcre_exec().
 
+

+Changing stack size in Mac OS X
+

 
-PCRE has an internal counter that can be used to limit the depth of recursion,
-and thus cause pcre_exec() to give an error code before it runs out of
-stack. By default, the limit is very large, and unlikely ever to operate. It
-can be changed when PCRE is built, and it can also be set when
-pcre_exec() is called. For details of these interfaces, see the
-pcrebuild
-and
-pcreapi
-documentation.
+Using setrlimit(), as described above, should also work on Mac OS X. It
+is also possible to set a stack size when linking a program. There is a
+discussion about stack sizes in Mac OS X at this web site:
+http://developer.apple.com/qa/qa2005/qa1419.html.
 
+

+AUTHOR
+

 
-As a very rough rule of thumb, you should reckon on about 500 bytes per
-recursion. Thus, if you want to limit your stack usage to 8Mb, you
-should set the limit at 16000 recursions. A 64Mb stack, on the other hand, can
-support around 128000 recursions. The pcretest test program has a command
-line option (-S) that can be used to increase its stack.
+Philip Hazel
+

+University Computing Service
+

+Cambridge CB2 3QH, England.
+

 
+

+REVISION
+

 
-Last updated: 29 June 2006
+Last updated: 09 July 2008
+

+Copyright © 1997-2008 University of Cambridge.
 

-Copyright © 1997-2006 University of Cambridge.
 

 Return to the PCRE index page.
 

Added: freeswitch/trunk/libs/pcre/doc/html/pcresyntax.html
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/doc/html/pcresyntax.html	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,473 @@
+
+
+pcresyntax specification
+
+
+pcresyntax man page
+
+Return to the PCRE index page.
+
+
+This page is part of the PCRE HTML documentation. It was generated automatically
+from the original man page. If there is any nonsense in it, please consult the
+man page, in case the conversion went wrong.
+

+

+PCRE REGULAR EXPRESSION SYNTAX SUMMARY
+
QUOTING
+
CHARACTERS
+
CHARACTER TYPES
+
GENERAL CATEGORY PROPERTY CODES FOR \p and \P
+
SCRIPT NAMES FOR \p AND \P
+
CHARACTER CLASSES
+
QUANTIFIERS
+
ANCHORS AND SIMPLE ASSERTIONS
+
MATCH POINT RESET
+
ALTERNATION
+
CAPTURING
+
ATOMIC GROUPS
+
COMMENT
+
OPTION SETTING
+
LOOKAHEAD AND LOOKBEHIND ASSERTIONS
+
BACKREFERENCES
+
SUBROUTINE REFERENCES (POSSIBLY RECURSIVE)
+
CONDITIONAL PATTERNS
+
BACKTRACKING CONTROL
+
NEWLINE CONVENTIONS
+
WHAT \R MATCHES
+
CALLOUTS
+
SEE ALSO
+
AUTHOR
+
REVISION
+
+
PCRE REGULAR EXPRESSION SYNTAX SUMMARY

+
+The full syntax and semantics of the regular expressions that are supported by
+PCRE are described in the
+pcrepattern
+documentation. This document contains just a quick-reference summary of the
+syntax.
+
+
QUOTING

+
+
+  \x         where x is non-alphanumeric is a literal x
+  \Q...\E    treat enclosed characters as literal
+
+
+
CHARACTERS

+
+
+  \a         alarm, that is, the BEL character (hex 07)
+  \cx        "control-x", where x is any character
+  \e         escape (hex 1B)
+  \f         formfeed (hex 0C)
+  \n         newline (hex 0A)
+  \r         carriage return (hex 0D)
+  \t         tab (hex 09)
+  \ddd       character with octal code ddd, or backreference
+  \xhh       character with hex code hh
+  \x{hhh..}  character with hex code hhh..
+
+
+
CHARACTER TYPES

+
+
+  .          any character except newline;
+               in dotall mode, any character whatsoever
+  \C         one byte, even in UTF-8 mode (best avoided)
+  \d         a decimal digit
+  \D         a character that is not a decimal digit
+  \h         a horizontal whitespace character
+  \H         a character that is not a horizontal whitespace character
+  \p{xx}     a character with the xx property
+  \P{xx}     a character without the xx property
+  \R         a newline sequence
+  \s         a whitespace character
+  \S         a character that is not a whitespace character
+  \v         a vertical whitespace character
+  \V         a character that is not a vertical whitespace character
+  \w         a "word" character
+  \W         a "non-word" character
+  \X         an extended Unicode sequence
+
+In PCRE, \d, \D, \s, \S, \w, and \W recognize only ASCII characters.
+
+
GENERAL CATEGORY PROPERTY CODES FOR \p and \P

+
+
+  C          Other
+  Cc         Control
+  Cf         Format
+  Cn         Unassigned
+  Co         Private use
+  Cs         Surrogate
+
+  L          Letter
+  Ll         Lower case letter
+  Lm         Modifier letter
+  Lo         Other letter
+  Lt         Title case letter
+  Lu         Upper case letter
+  L&         Ll, Lu, or Lt
+
+  M          Mark
+  Mc         Spacing mark
+  Me         Enclosing mark
+  Mn         Non-spacing mark
+
+  N          Number
+  Nd         Decimal number
+  Nl         Letter number
+  No         Other number
+
+  P          Punctuation
+  Pc         Connector punctuation
+  Pd         Dash punctuation
+  Pe         Close punctuation
+  Pf         Final punctuation
+  Pi         Initial punctuation
+  Po         Other punctuation
+  Ps         Open punctuation
+
+  S          Symbol
+  Sc         Currency symbol
+  Sk         Modifier symbol
+  Sm         Mathematical symbol
+  So         Other symbol
+
+  Z          Separator
+  Zl         Line separator
+  Zp         Paragraph separator
+  Zs         Space separator
+
+
+
SCRIPT NAMES FOR \p AND \P

+
+Arabic,
+Armenian,
+Balinese,
+Bengali,
+Bopomofo,
+Braille,
+Buginese,
+Buhid,
+Canadian_Aboriginal,
+Carian,
+Cham,
+Cherokee,
+Common,
+Coptic,
+Cuneiform,
+Cypriot,
+Cyrillic,
+Deseret,
+Devanagari,
+Ethiopic,
+Georgian,
+Glagolitic,
+Gothic,
+Greek,
+Gujarati,
+Gurmukhi,
+Han,
+Hangul,
+Hanunoo,
+Hebrew,
+Hiragana,
+Inherited,
+Kannada,
+Katakana,
+Kayah_Li,
+Kharoshthi,
+Khmer,
+Lao,
+Latin,
+Lepcha,
+Limbu,
+Linear_B,
+Lycian,
+Lydian,
+Malayalam,
+Mongolian,
+Myanmar,
+New_Tai_Lue,
+Nko,
+Ogham,
+Old_Italic,
+Old_Persian,
+Ol_Chiki,
+Oriya,
+Osmanya,
+Phags_Pa,
+Phoenician,
+Rejang,
+Runic,
+Saurashtra,
+Shavian,
+Sinhala,
+Sudanese,
+Syloti_Nagri,
+Syriac,
+Tagalog,
+Tagbanwa,
+Tai_Le,
+Tamil,
+Telugu,
+Thaana,
+Thai,
+Tibetan,
+Tifinagh,
+Ugaritic,
+Vai,
+Yi.
+
+
CHARACTER CLASSES

+
+
+  [...]       positive character class
+  [^...]      negative character class
+  [x-y]       range (can be used for hex characters)
+  [[:xxx:]]   positive POSIX named set
+  [[:^xxx:]]  negative POSIX named set
+
+  alnum       alphanumeric
+  alpha       alphabetic
+  ascii       0-127
+  blank       space or tab
+  cntrl       control character
+  digit       decimal digit
+  graph       printing, excluding space
+  lower       lower case letter
+  print       printing, including space
+  punct       printing, excluding alphanumeric
+  space       whitespace
+  upper       upper case letter
+  word        same as \w
+  xdigit      hexadecimal digit
+
+In PCRE, POSIX character set names recognize only ASCII characters. You can use
+\Q...\E inside a character class.
+
+
QUANTIFIERS

+
+
+  ?           0 or 1, greedy
+  ?+          0 or 1, possessive
+  ??          0 or 1, lazy
+  *           0 or more, greedy
+  *+          0 or more, possessive
+  *?          0 or more, lazy
+  +           1 or more, greedy
+  ++          1 or more, possessive
+  +?          1 or more, lazy
+  {n}         exactly n
+  {n,m}       at least n, no more than m, greedy
+  {n,m}+      at least n, no more than m, possessive
+  {n,m}?      at least n, no more than m, lazy
+  {n,}        n or more, greedy
+  {n,}+       n or more, possessive
+  {n,}?       n or more, lazy
+
+
+
ANCHORS AND SIMPLE ASSERTIONS

+
+
+  \b          word boundary (only ASCII letters recognized)
+  \B          not a word boundary
+  ^           start of subject
+               also after internal newline in multiline mode
+  \A          start of subject
+  $           end of subject
+               also before newline at end of subject
+               also before internal newline in multiline mode
+  \Z          end of subject
+               also before newline at end of subject
+  \z          end of subject
+  \G          first matching position in subject
+
+
+
MATCH POINT RESET

+
+
+  \K          reset start of match
+
+
+
ALTERNATION

+
+
+  expr|expr|expr...
+
+
+
CAPTURING

+
+
+  (...)           capturing group
+  (?<name>...)    named capturing group (Perl)
+  (?'name'...)    named capturing group (Perl)
+  (?P<name>...)   named capturing group (Python)
+  (?:...)         non-capturing group
+  (?|...)         non-capturing group; reset group numbers for
+                   capturing groups in each alternative
+
+
+
ATOMIC GROUPS

+
+
+  (?>...)         atomic, non-capturing group
+
+
+
COMMENT

+
+
+  (?#....)        comment (not nestable)
+
+
+
OPTION SETTING

+
+
+  (?i)            caseless
+  (?J)            allow duplicate names
+  (?m)            multiline
+  (?s)            single line (dotall)
+  (?U)            default ungreedy (lazy)
+  (?x)            extended (ignore white space)
+  (?-...)         unset option(s)
+
+The following is recognized only at the start of a pattern or after one of the
+newline-setting options with similar syntax:
++  (*UTF8)         set UTF-8 mode
+
+
+
LOOKAHEAD AND LOOKBEHIND ASSERTIONS

+
+
+  (?=...)         positive look ahead
+  (?!...)         negative look ahead
+  (?<=...)        positive look behind
+  (?<!...)        negative look behind
+
+Each top-level branch of a look behind must be of a fixed length.
+
+
BACKREFERENCES

+
+
+  \n              reference by number (can be ambiguous)
+  \gn             reference by number
+  \g{n}           reference by number
+  \g{-n}          relative reference by number
+  \k<name>        reference by name (Perl)
+  \k'name'        reference by name (Perl)
+  \g{name}        reference by name (Perl)
+  \k{name}        reference by name (.NET)
+  (?P=name)       reference by name (Python)
+
+
+
SUBROUTINE REFERENCES (POSSIBLY RECURSIVE)

+
+
+  (?R)            recurse whole pattern
+  (?n)            call subpattern by absolute number
+  (?+n)           call subpattern by relative number
+  (?-n)           call subpattern by relative number
+  (?&name)        call subpattern by name (Perl)
+  (?P>name)       call subpattern by name (Python)
+  \g<name>        call subpattern by name (Oniguruma)
+  \g'name'        call subpattern by name (Oniguruma)
+  \g<n>           call subpattern by absolute number (Oniguruma)
+  \g'n'           call subpattern by absolute number (Oniguruma)
+  \g<+n>          call subpattern by relative number (PCRE extension)
+  \g'+n'          call subpattern by relative number (PCRE extension)
+  \g<-n>          call subpattern by relative number (PCRE extension)
+  \g'-n'          call subpattern by relative number (PCRE extension)
+
+
+
CONDITIONAL PATTERNS

+
+
+  (?(condition)yes-pattern)
+  (?(condition)yes-pattern|no-pattern)
+
+  (?(n)...        absolute reference condition
+  (?(+n)...       relative reference condition
+  (?(-n)...       relative reference condition
+  (?(<name>)...   named reference condition (Perl)
+  (?('name')...   named reference condition (Perl)
+  (?(name)...     named reference condition (PCRE)
+  (?(R)...        overall recursion condition
+  (?(Rn)...       specific group recursion condition
+  (?(R&name)...   specific recursion condition
+  (?(DEFINE)...   define subpattern for reference
+  (?(assert)...   assertion condition
+
+
+
BACKTRACKING CONTROL

+
+The following act immediately they are reached:
+
+  (*ACCEPT)       force successful match
+  (*FAIL)         force backtrack; synonym (*F)
+
+The following act only when a subsequent match failure causes a backtrack to
+reach them. They all force a match failure, but they differ in what happens
+afterwards. Those that advance the start-of-match point do so only if the
+pattern is not anchored.
++  (*COMMIT)       overall failure, no advance of starting point
+  (*PRUNE)        advance to next starting character
+  (*SKIP)         advance start to current matching position
+  (*THEN)         local failure, backtrack to next alternation
+
+
+
NEWLINE CONVENTIONS

+
+These are recognized only at the very start of the pattern or after a
+(*BSR_...) or (*UTF8) option.
+
+  (*CR)           carriage return only
+  (*LF)           linefeed only
+  (*CRLF)         carriage return followed by linefeed
+  (*ANYCRLF)      all three of the above
+  (*ANY)          any Unicode newline sequence
+
+
+
WHAT \R MATCHES

+
+These are recognized only at the very start of the pattern or after a
+(*...) option that sets the newline convention or UTF-8 mode.
+
+  (*BSR_ANYCRLF)  CR, LF, or CRLF
+  (*BSR_UNICODE)  any Unicode newline sequence
+
+
+
CALLOUTS

+
+
+  (?C)      callout
+  (?Cn)     callout with data n
+
+
+
SEE ALSO

+
+pcrepattern(3), pcreapi(3), pcrecallout(3),
+pcrematching(3), pcre(3).
+
+
AUTHOR

+
+Philip Hazel
+

+University Computing Service
+

+Cambridge CB2 3QH, England.
+

+
+
REVISION

+
+Last updated: 11 April 2009
+

+Copyright © 1997-2009 University of Cambridge.
+

+

+Return to the PCRE index page.
+

Modified: freeswitch/trunk/libs/pcre/doc/html/pcretest.html
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/html/pcretest.html	(original)
+++ freeswitch/trunk/libs/pcre/doc/html/pcretest.html	Mon Jun  8 18:51:30 2009
@@ -23,8 +23,11 @@
 OUTPUT FROM THE ALTERNATIVE MATCHING FUNCTION
 
RESTARTING AFTER A PARTIAL MATCH
 
CALLOUTS
-
SAVING AND RELOADING COMPILED PATTERNS
-
AUTHOR
+
NON-PRINTING CHARACTERS
+
SAVING AND RELOADING COMPILED PATTERNS
+
SEE ALSO
+
AUTHOR
+
REVISION
 
 
SYNOPSIS

 
@@ -43,6 +46,11 @@
 
 
OPTIONS

 
+-b
+Behave as if each regex has the /B (show bytecode) modifier; the internal
+form is output after compilation.
+
+
 -C
 Output the version number of the PCRE library, and all available information
 about the optional features that are included, and then exit.
@@ -50,7 +58,8 @@
 

 -d
 Behave as if each regex has the /D (debug) modifier; the internal
-form is output after compilation.
+form and information about the compiled pattern is output after compilation;
+-d is equivalent to -b -i.
 
 
 -dfa
@@ -59,11 +68,21 @@
 standard pcre_exec() function (more detail is given below).
 
 
+-help
+Output a brief summary these options and then exit.
+
+
 -i
 Behave as if each regex has the /I modifier; information about the
 compiled pattern is given after compilation.
 
 
+-M
+Behave as if each data line contains the \M escape sequence; this causes
+PCRE to discover the minimum MATCH_LIMIT and MATCH_LIMIT_RECURSION settings by
+calling pcre_exec() repeatedly with different limits.
+
+
 -m
 Output the size of each compiled pattern after it has been compiled. This is
 equivalent to adding /M to each regular expression. For compatibility
@@ -72,9 +91,11 @@
 

 -o osize
 Set the number of elements in the output vector that is used when calling
-pcre_exec() to be osize. The default value is 45, which is enough
-for 14 capturing subexpressions. The vector size can be changed for individual
-matching calls by including \O in the data line (see below).
+pcre_exec() or pcre_dfa_exec() to be osize. The default value
+is 45, which is enough for 14 capturing subexpressions for pcre_exec() or
+22 different matches for pcre_dfa_exec(). The vector size can be
+changed for individual matching calls by including \O in the data line (see
+below).
 
 
 -p
@@ -96,7 +117,15 @@
 Run each compile, study, and match many times with a timer, and output
 resulting time per compile or match (in milliseconds). Do not set -m with
 -t, because you will then get the size output a zillion times, and the
-timing will be distorted.
+timing will be distorted. You can control the number of iterations that are
+used for timing by following -t with a number (as a separate item on the
+command line). For example, "-t 1000" would iterate 1000 times. The default is
+to iterate 500000 times.
+
+
+-tm
+This is like -t except that it times only the matching phase, not the
+compile or study phases.
 
 
DESCRIPTION

 
@@ -107,6 +136,13 @@
 expressions, and "data>" to prompt for data lines.
 
 
+When pcretest is built, a configuration option can specify that it should
+be linked with the libreadline library. When this is done, if the input
+is from a terminal, it is read using the readline() function. This
+provides line-editing and history facilities. The output from the -help
+option states whether or not readline() will be used.
+
+
 The program handles any number of sets of input on a single input file. Each
 set starts with a regular expression, and continues with any number of data
 lines to be matched against the pattern.
@@ -114,8 +150,8 @@
 

 Each data line is matched separately and independently. If you want to do
 multi-line matches, you have to use the \n escape sequence (or \r or \r\n,
-depending on the newline setting) in a single line of input to encode the
-newline characters. There is no limit on the length of data lines; the input
+etc., depending on the newline setting) in a single line of input to encode the
+newline sequences. There is no limit on the length of data lines; the input
 buffer is automatically extended if it is too small.
 
 
@@ -168,20 +204,30 @@
 The following table shows additional modifiers for setting PCRE options that do
 not correspond to anything in Perl:
 
-  /A       PCRE_ANCHORED
-  /C       PCRE_AUTO_CALLOUT
-  /E       PCRE_DOLLAR_ENDONLY
-  /f       PCRE_FIRSTLINE
-  /J       PCRE_DUPNAMES
-  /N       PCRE_NO_AUTO_CAPTURE
-  /U       PCRE_UNGREEDY
-  /X       PCRE_EXTRA
-  /<cr>    PCRE_NEWLINE_CR
-  /<lf>    PCRE_NEWLINE_LF
-  /<crlf>  PCRE_NEWLINE_CRLF
+  /A              PCRE_ANCHORED
+  /C              PCRE_AUTO_CALLOUT
+  /E              PCRE_DOLLAR_ENDONLY
+  /f              PCRE_FIRSTLINE
+  /J              PCRE_DUPNAMES
+  /N              PCRE_NO_AUTO_CAPTURE
+  /U              PCRE_UNGREEDY
+  /X              PCRE_EXTRA
+  /<JS>           PCRE_JAVASCRIPT_COMPAT
+  /<cr>           PCRE_NEWLINE_CR
+  /<lf>           PCRE_NEWLINE_LF
+  /<crlf>         PCRE_NEWLINE_CRLF
+  /<anycrlf>      PCRE_NEWLINE_ANYCRLF
+  /<any>          PCRE_NEWLINE_ANY
+  /<bsr_anycrlf>  PCRE_BSR_ANYCRLF
+  /<bsr_unicode>  PCRE_BSR_UNICODE
+
+Those specifying line ending sequences are literal strings as shown, but the
+letters can be in either case. This example sets multiline matching with CRLF
+as the line ending sequence:
++  /^abc/m<crlf>
 
-Those specifying line endings are literal strings as shown. Details of the
-meanings of these PCRE options are given in the
+Details of the meanings of these PCRE options are given in the
 pcreapi
 documentation.
 
@@ -220,6 +266,14 @@
 multiple copies of the same substring.
 
 
+The /B modifier is a debugging feature. It requests that pcretest
+output a representation of the compiled byte code after compilation. Normally
+this information contains length and offset values; however, if /Z is
+also present, this data is replaced by spaces. This is a special feature for
+use in the automatic test scripts; it ensures that the same output is generated
+for different internal link sizes.
+
+
 The /L modifier must be followed directly by the name of a locale, for
 example,
 
@@ -238,10 +292,8 @@
 pattern. If the pattern is studied, the results of that are also output.
 
 
-The /D modifier is a PCRE debugging feature, which also assumes /I.
-It causes the internal form of compiled regular expressions to be output after
-compilation. If the pattern was studied, the information returned is also
-output.
+The /D modifier is a PCRE debugging feature, and is equivalent to
+/BI, that is, both the /B and the /I modifiers.
 
 
 The /F modifier causes pcretest to flip the byte order of the
@@ -289,15 +341,15 @@
 expressions, you probably don't need any of these. The following escapes are
 recognized:
 
-  \a         alarm (= BEL)
-  \b         backspace
-  \e         escape
-  \f         formfeed
-  \n         newline
+  \a         alarm (BEL, \x07)
+  \b         backspace (\x08)
+  \e         escape (\x27)
+  \f         formfeed (\x0c)
+  \n         newline (\x0a)
   \qdd       set the PCRE_MATCH_LIMIT limit to dd (any number of digits)
-  \r         carriage return
-  \t         tab
-  \v         vertical tab
+  \r         carriage return (\x0d)
+  \t         tab (\x09)
+  \v         vertical tab (\x0b)
   \nnn       octal character (up to 3 octal digits)
   \xhh       hexadecimal character (up to 2 hex digits)
   \x{hh...}  hexadecimal character, any number of digits in UTF-8 mode
@@ -331,11 +383,17 @@
   \<cr>      pass the PCRE_NEWLINE_CR option to pcre_exec() or pcre_dfa_exec()
   \<lf>      pass the PCRE_NEWLINE_LF option to pcre_exec() or pcre_dfa_exec()
   \<crlf>    pass the PCRE_NEWLINE_CRLF option to pcre_exec() or pcre_dfa_exec()
+  \<anycrlf> pass the PCRE_NEWLINE_ANYCRLF option to pcre_exec() or pcre_dfa_exec()
+  \<any>     pass the PCRE_NEWLINE_ANY option to pcre_exec() or pcre_dfa_exec()
 
-The escapes that specify line endings are literal strings, exactly as shown.
-A backslash followed by anything else just escapes the anything else. If the
-very last character is a backslash, it is ignored. This gives a way of passing
-an empty line as data, since a real empty line terminates the data input.
+The escapes that specify line ending sequences are literal strings, exactly as
+shown. No more than one newline setting should be present in any data line.
+
+
+A backslash followed by anything else just escapes the anything else. If
+the very last character is a backslash, it is ignored. This gives a way of
+passing an empty line as data, since a real empty line terminates the data
+input.
 
 
 If \M is present, pcretest calls pcre_exec() several times, with
@@ -365,7 +423,10 @@
 The use of \x{hh...} to represent UTF-8 characters is not dependent on the use
 of the /8 modifier on the pattern. It is recognized always. There may be
 any number of hexadecimal digits inside the braces. The result is from one to
-six bytes, encoded according to the UTF-8 rules.
+six bytes, encoded according to the original UTF-8 rules of RFC 2279. This
+allows for values in the range 0 to 0x7FFFFFFF. Note that not all of those are
+valid Unicode code points, or indeed valid UTF-8 characters according to the
+later rules in RFC 3629.
 
 
THE ALTERNATIVE MATCHING FUNCTION

 
@@ -398,7 +459,7 @@
 of an interactive pcretest run.
 
   $ pcretest
-  PCRE version 5.00 07-Sep-2004
+  PCRE version 7.0 30-Nov-2006
 
     re> /^abc(\d+)/
   data> abc123
@@ -407,11 +468,26 @@
   data> xyz
   No match
 
+Note that unset capturing substrings that are not followed by one that is set
+are not returned by pcre_exec(), and are not shown by pcretest. In
+the following example, there are two capturing substrings, but when the first
+data line is matched, the second, unset substring is not shown. An "internal"
+unset substring is shown as "<unset>", as for the second data line.
++    re> /(a)|(b)/
+  data> a
+   0: a
+   1: a
+  data> b
+   0: b
+   1: <unset>
+   2: b
+
 If the strings contain any non-printing characters, they are output as \0x
 escapes, or as \x{...} escapes if the /8 modifier was present on the
-pattern. If the pattern has the /+ modifier, the output for substring 0
-is followed by the the rest of the subject string, identified by "0+" like
-this:
+pattern. See below for the definition of non-printing characters. If the
+pattern has the /+ modifier, the output for substring 0 is followed by
+the the rest of the subject string, identified by "0+" like this:
      re> /cat/+
   data> cataract
@@ -441,10 +517,10 @@
 parentheses after each string for \C and \G.
 
 
-Note that while patterns can be continued over several lines (a plain ">"
+Note that whereas patterns can be continued over several lines (a plain ">"
 prompt is used for continuations), data lines may not. However newlines can be
-included in data by means of the \n escape (or \r or \r\n for those newline
-settings).
+included in data by means of the \n escape (or \r, \r\n, etc., depending on
+the newline sequence setting).
 
 
OUTPUT FROM THE ALTERNATIVE MATCHING FUNCTION

 
@@ -463,7 +539,7 @@
 longest matching string is always given first (and numbered zero).
 
 
-If \fB/g\P is present on the pattern, the search for further matches resumes
+If /g is present on the pattern, the search for further matches resumes
 at the end of the longest match. For example:
 
     re> /(tang|tangerine|tan)/g
@@ -537,7 +613,19 @@
 pcrecallout
 documentation.
 
-
SAVING AND RELOADING COMPILED PATTERNS

+
NON-PRINTING CHARACTERS

+
+When pcretest is outputting text in the compiled version of a pattern,
+bytes other than 32-126 are always treated as non-printing characters are are
+therefore shown as hex escapes.
+
+
+When pcretest is outputting text that is a matched part of a subject
+string, it behaves in the same way, unless a different locale has been set for
+the pattern (using the /L modifier). In this case, the isprint()
+function to distinguish printing and non-printing characters.
+
+
SAVING AND RELOADING COMPILED PATTERNS

 
 The facilities described in this section are not available when the POSIX
 inteface to PCRE is being used, that is, when the /P pattern modifier is
@@ -599,18 +687,26 @@
 Finally, if you attempt to load a file that is not in the correct format, the
 result is undefined.
 
-
AUTHOR

+
SEE ALSO

+
+pcre(3), pcreapi(3), pcrecallout(3), pcrematching(3),
+pcrepartial(d), pcrepattern(3), pcreprecompile(3).
+
+
AUTHOR

 
 Philip Hazel
 

-University Computing Service,
+University Computing Service
+

+Cambridge CB2 3QH, England.
 

-Cambridge CB2 3QG, England.
 
+
REVISION

 
-Last updated: 29 June 2006
+Last updated: 10 March 2009
+

+Copyright © 1997-2009 University of Cambridge.
 

-Copyright © 1997-2006 University of Cambridge.
 

 Return to the PCRE index page.
 

Added: freeswitch/trunk/libs/pcre/doc/index.html.src
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/doc/index.html.src	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,140 @@
+
+      
+
+PCRE specification
+
+
+Perl-compatible Regular Expressions (PCRE)
+
+The HTML documentation for PCRE comprises the following pages:
+
+
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+pcre   Introductory page
pcre-config   Information about the installation configuration
pcreapi   PCRE's native API
pcrebuild   Options for building PCRE
pcrecallout   The callout facility
pcrecompat   Compability with Perl
pcrecpp   The C++ wrapper for the PCRE library
pcregrep   The pcregrep command
pcrematching   Discussion of the two matching algorithms
pcrepartial   Using PCRE for partial matching
pcrepattern   Specification of the regular expressions supported by PCRE
pcreperform   Some comments on performance
pcreposix   The POSIX API to the PCRE library
pcreprecompile   How to save and re-use compiled patterns
pcresample   Description of the sample program
pcrestack   Discussion of PCRE's stack usage
pcresyntax   Syntax quick-reference summary
pcretest   The pcretest command for testing PCRE
+
+
+There are also individual pages that summarize the interface for each function 
+in the library:
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+    
+
+    
+
+
+    
+
+
+    
+pcre_compile   Compile a regular expression
pcre_compile2   Compile a regular expression (alternate interface)
pcre_config   Show build-time configuration options
pcre_copy_named_substring   Extract named substring into given buffer
pcre_copy_substring   Extract numbered substring into given buffer
pcre_dfa_exec   Match a compiled pattern to a subject string
+    (DFA algorithm; not Perl compatible)
pcre_exec   Match a compiled pattern to a subject string
+    (Perl compatible)
pcre_free_substring   Free extracted substring
pcre_free_substring_list   Free list of extracted substrings
pcre_fullinfo   Extract information about a pattern
pcre_get_named_substring   Extract named substring into new memory
pcre_get_stringnumber   Convert captured string name to number
pcre_get_substring   Extract numbered substring into new memory
pcre_get_substring_list   Extract all substrings into new memory
pcre_info   Obsolete information extraction function
pcre_maketables   Build character tables in current locale
pcre_refcount   Maintain reference count in compiled pattern
pcre_study   Study a compiled pattern
pcre_version   Return PCRE version and release date
+
+

Added: freeswitch/trunk/libs/pcre/doc/pcre-config.1
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/doc/pcre-config.1	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,73 @@
+.TH PCRE-CONFIG 1
+.SH NAME
+pcre-config - program to return PCRE configuration
+.SH SYNOPSIS
+.rs
+.sp
+.B pcre-config  [--prefix] [--exec-prefix] [--version] [--libs]
+.ti +5n
+.B              [--libs-posix] [--cflags] [--cflags-posix]
+.
+.
+.SH DESCRIPTION
+.rs
+.sp
+\fBpcre-config\fP returns the configuration of the installed PCRE
+libraries and the options required to compile a program to use them.
+.
+.
+.SH OPTIONS
+.rs
+.TP 10
+\fB--prefix\fP
+Writes the directory prefix used in the PCRE installation for architecture
+independent files (\fI/usr\fP on many systems, \fI/usr/local\fP on some
+systems) to the standard output.
+.TP 10
+\fB--exec-prefix\fP
+Writes the directory prefix used in the PCRE installation for architecture
+dependent files (normally the same as \fB--prefix\fP) to the standard output.
+.TP 10
+\fB--version\fP
+Writes the version number of the installed PCRE libraries to the standard
+output.
+.TP 10
+\fB--libs\fP
+Writes to the standard output the command line options required to link
+with PCRE (\fB-lpcre\fP on many systems).
+.TP 10
+\fB--libs-posix\fP
+Writes to the standard output the command line options required to link with
+the PCRE posix emulation library (\fB-lpcreposix\fP \fB-lpcre\fP on many
+systems).
+.TP 10
+\fB--cflags\fP
+Writes to the standard output the command line options required to compile
+files that use PCRE (this may include some \fB-I\fP options, but is blank on
+many systems).
+.TP 10
+\fB--cflags-posix\fP
+Writes to the standard output the command line options required to compile
+files that use the PCRE posix emulation library (this may include some \fB-I\fP
+options, but is blank on many systems).
+.
+.
+.SH "SEE ALSO"
+.rs
+.sp
+\fBpcre(3)\fP
+.
+.
+.SH AUTHOR
+.rs
+.sp
+This manual page was originally written by Mark Baker for the Debian GNU/Linux
+system. It has been slightly revised as a generic PCRE man page.
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 18 April 2007
+.fi

Added: freeswitch/trunk/libs/pcre/doc/pcre-config.txt
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/doc/pcre-config.txt	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,67 @@
+PCRE-CONFIG(1)                                                  PCRE-CONFIG(1)
+
+
+
+NAME
+       pcre-config - program to return PCRE configuration
+
+SYNOPSIS
+
+       pcre-config [--prefix] [--exec-prefix] [--version] [--libs]
+            [--libs-posix] [--cflags] [--cflags-posix]
+
+
+DESCRIPTION
+
+       pcre-config  returns  the configuration of the installed PCRE libraries
+       and the options required to compile a program to use them.
+
+
+OPTIONS
+
+       --prefix  Writes the directory prefix used in the PCRE installation for
+                 architecture   independent   files  (/usr  on  many  systems,
+                 /usr/local on some systems) to the standard output.
+
+       --exec-prefix
+                 Writes the directory prefix used in the PCRE installation for
+                 architecture  dependent files (normally the same as --prefix)
+                 to the standard output.
+
+       --version Writes the version number of the installed PCRE libraries  to
+                 the standard output.
+
+       --libs    Writes  to  the  standard  output  the  command  line options
+                 required to link with PCRE (-lpcre on many systems).
+
+       --libs-posix
+                 Writes to  the  standard  output  the  command  line  options
+                 required  to  link  with  the  PCRE  posix  emulation library
+                 (-lpcreposix -lpcre on many systems).
+
+       --cflags  Writes to  the  standard  output  the  command  line  options
+                 required  to  compile  files  that use PCRE (this may include
+                 some -I options, but is blank on many systems).
+
+       --cflags-posix
+                 Writes to  the  standard  output  the  command  line  options
+                 required  to  compile files that use the PCRE posix emulation
+                 library (this may include some -I options, but  is  blank  on
+                 many systems).
+
+
+SEE ALSO
+
+       pcre(3)
+
+
+AUTHOR
+
+       This  manual  page  was originally written by Mark Baker for the Debian
+       GNU/Linux system. It has been slightly revised as a  generic  PCRE  man
+       page.
+
+
+REVISION
+
+       Last updated: 18 April 2007

Modified: freeswitch/trunk/libs/pcre/doc/pcre.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre.3	Mon Jun  8 18:51:30 2009
@@ -6,12 +6,18 @@
 .sp
 The PCRE library is a set of functions that implement regular expression
 pattern matching using the same syntax and semantics as Perl, with just a few
-differences. The current implementation of PCRE (release 6.x) corresponds
-approximately with Perl 5.8, including support for UTF-8 encoded strings and
-Unicode general category properties. However, this support has to be explicitly
-enabled; it is not the default.
+differences. Certain features that appeared in Python and PCRE before they
+appeared in Perl are also available using the Python syntax. There is also some
+support for certain .NET and Oniguruma syntax items, and there is an option for
+requesting some minor changes that give better JavaScript compatibility.
+.P
+The current implementation of PCRE (release 7.x) corresponds approximately with
+Perl 5.10, including support for UTF-8 encoded strings and Unicode general
+category properties. However, UTF-8 and Unicode support has to be explicitly
+enabled; it is not the default. The Unicode tables correspond to Unicode
+release 5.1.
 .P
-In addition to the Perl-compatible matching function, PCRE also contains an
+In addition to the Perl-compatible matching function, PCRE contains an
 alternative matching function that matches the same compiled patterns in a
 different way. In certain circumstances, the alternative function has some
 advantages. For a discussion of the two matching algorithms, see the
@@ -43,7 +49,11 @@
 .\" HREF
 \fBpcrecompat\fR
 .\"
-pages.
+pages. There is a syntax summary in the
+.\" HREF
+\fBpcresyntax\fR
+.\"
+page.
 .P
 Some features of PCRE can be included, excluded, or changed when the library is
 built. The
@@ -77,6 +87,7 @@
 follows:
 .sp
   pcre              this document
+  pcre-config       show PCRE installation configuration information
   pcreapi           details of PCRE's native C API
   pcrebuild         options for building PCRE
   pcrecallout       details of the callout feature
@@ -88,6 +99,7 @@
 .\" JOIN
   pcrepattern       syntax and semantics of supported
                       regular expressions
+  pcresyntax        quick syntax reference
   pcreperform       discussion of performance issues
   pcreposix         the POSIX-compatible C API
   pcreprecompile    details of saving and re-using precompiled patterns
@@ -114,18 +126,15 @@
 \fBpcrebuild\fP
 .\"
 documentation for details). In these cases the limit is substantially larger.
-However, the speed of execution will be slower.
+However, the speed of execution is slower.
 .P
-All values in repeating quantifiers must be less than 65536. The maximum
-compiled length of subpattern with an explicit repeat count is 30000 bytes. The
-maximum number of capturing subpatterns is 65535.
-.P
-There is no limit to the number of non-capturing subpatterns, but the maximum
-depth of nesting of all kinds of parenthesized subpattern, including capturing
-subpatterns, assertions, and other types of subpattern, is 200.
+All values in repeating quantifiers must be less than 65536.
 .P
-The maximum length of name for a named subpattern is 32, and the maximum number
-of named subpatterns is 10000.
+There is no limit to the number of parenthesized subpatterns, but there can be
+no more than 65535 capturing subpatterns.
+.P
+The maximum length of name for a named subpattern is 32 characters, and the
+maximum number of named subpatterns is 10000.
 .P
 The maximum length of a subject string is the largest positive number that an
 integer variable can hold. However, when using the traditional matching
@@ -137,7 +146,7 @@
 \fBpcrestack\fP
 .\"
 documentation.
-.sp
+.
 .\" HTML 
 .
 .
@@ -154,13 +163,14 @@
 .\" HREF
 \fBpcre_compile()\fP
 .\"
-with the PCRE_UTF8 option flag. When you do this, both the pattern and any
-subject strings that are matched against it are treated as UTF-8 strings
-instead of just strings of bytes.
+with the PCRE_UTF8 option flag, or the pattern must start with the sequence
+(*UTF8). When either of these is the case, both the pattern and any subject
+strings that are matched against it are treated as UTF-8 strings instead of
+just strings of bytes.
 .P
 If you compile PCRE with UTF-8 support, but do not use it at run time, the
 library will be a bit bigger, but the additional run time overhead is limited
-to testing the PCRE_UTF8 flag in several places, so should not be very large.
+to testing the PCRE_UTF8 flag occasionally, so should not be very big.
 .P
 If PCRE is built with Unicode character property support (which implies UTF-8
 support), the escape sequences \ep{..}, \eP{..}, and \eX are supported.
@@ -175,46 +185,83 @@
 \ep{L} matches a letter. Its Perl synonym, \ep{Letter}, is not supported.
 Furthermore, in Perl, many properties may optionally be prefixed by "Is", for
 compatibility with Perl 5.6. PCRE does not support this.
-.P
-The following comments apply when PCRE is running in UTF-8 mode:
-.P
-1. When you set the PCRE_UTF8 flag, the strings passed as patterns and subjects
-are checked for validity on entry to the relevant functions. If an invalid
-UTF-8 string is passed, an error return is given. In some situations, you may
-already know that your strings are valid, and therefore want to skip these
-checks in order to improve performance. If you set the PCRE_NO_UTF8_CHECK flag
-at compile time or at run time, PCRE assumes that the pattern or subject it
-is given (respectively) contains only valid UTF-8 codes. In this case, it does
-not diagnose an invalid UTF-8 string. If you pass an invalid UTF-8 string to
-PCRE when PCRE_NO_UTF8_CHECK is set, the results are undefined. Your program
-may crash.
-.P
-2. An unbraced hexadecimal escape sequence (such as \exb3) matches a two-byte
+.
+.\" HTML 
+.
+.SS "Validity of UTF-8 strings"
+.rs
+.sp
+When you set the PCRE_UTF8 flag, the strings passed as patterns and subjects
+are (by default) checked for validity on entry to the relevant functions. From
+release 7.3 of PCRE, the check is according the rules of RFC 3629, which are
+themselves derived from the Unicode specification. Earlier releases of PCRE
+followed the rules of RFC 2279, which allows the full range of 31-bit values (0
+to 0x7FFFFFFF). The current check allows only values in the range U+0 to
+U+10FFFF, excluding U+D800 to U+DFFF.
+.P
+The excluded code points are the "Low Surrogate Area" of Unicode, of which the
+Unicode Standard says this: "The Low Surrogate Area does not contain any
+character assignments, consequently no character code charts or namelists are
+provided for this area. Surrogates are reserved for use with UTF-16 and then
+must be used in pairs." The code points that are encoded by UTF-16 pairs are
+available as independent code points in the UTF-8 encoding. (In other words,
+the whole surrogate thing is a fudge for UTF-16 which unfortunately messes up
+UTF-8.)
+.P
+If an invalid UTF-8 string is passed to PCRE, an error return
+(PCRE_ERROR_BADUTF8) is given. In some situations, you may already know that
+your strings are valid, and therefore want to skip these checks in order to
+improve performance. If you set the PCRE_NO_UTF8_CHECK flag at compile time or
+at run time, PCRE assumes that the pattern or subject it is given
+(respectively) contains only valid UTF-8 codes. In this case, it does not
+diagnose an invalid UTF-8 string.
+.P
+If you pass an invalid UTF-8 string when PCRE_NO_UTF8_CHECK is set, what
+happens depends on why the string is invalid. If the string conforms to the
+"old" definition of UTF-8 (RFC 2279), it is processed as a string of characters
+in the range 0 to 0x7FFFFFFF. In other words, apart from the initial validity
+test, PCRE (when in UTF-8 mode) handles strings according to the more liberal
+rules of RFC 2279. However, if the string does not even conform to RFC 2279,
+the result is undefined. Your program may crash.
+.P
+If you want to process strings of values in the full range 0 to 0x7FFFFFFF,
+encoded in a UTF-8-like manner as per the old RFC, you can set
+PCRE_NO_UTF8_CHECK to bypass the more restrictive test. However, in this
+situation, you will have to apply your own validity check.
+.
+.SS "General comments about UTF-8 mode"
+.rs
+.sp
+1. An unbraced hexadecimal escape sequence (such as \exb3) matches a two-byte
 UTF-8 character if the value is greater than 127.
 .P
-3. Octal numbers up to \e777 are recognized, and match two-byte UTF-8
+2. Octal numbers up to \e777 are recognized, and match two-byte UTF-8
 characters for values greater than \e177.
 .P
-4. Repeat quantifiers apply to complete UTF-8 characters, not to individual
+3. Repeat quantifiers apply to complete UTF-8 characters, not to individual
 bytes, for example: \ex{100}{3}.
 .P
-5. The dot metacharacter matches one UTF-8 character instead of a single byte.
+4. The dot metacharacter matches one UTF-8 character instead of a single byte.
 .P
-6. The escape sequence \eC can be used to match a single byte in UTF-8 mode,
+5. The escape sequence \eC can be used to match a single byte in UTF-8 mode,
 but its use can lead to some strange effects. This facility is not available in
 the alternative matching function, \fBpcre_dfa_exec()\fP.
 .P
-7. The character escapes \eb, \eB, \ed, \eD, \es, \eS, \ew, and \eW correctly
+6. The character escapes \eb, \eB, \ed, \eD, \es, \eS, \ew, and \eW correctly
 test characters of any code value, but the characters that PCRE recognizes as
 digits, spaces, or word characters remain the same set as before, all with
 values less than 256. This remains true even when PCRE includes Unicode
 property support, because to do otherwise would slow down PCRE in many common
 cases. If you really want to test for a wider sense of, say, "digit", you
-must use Unicode property tests such as \ep{Nd}.
+must use Unicode property tests such as \ep{Nd}. Note that this also applies to
+\eb, because it is defined in terms of \ew and \eW.
 .P
-8. Similarly, characters that match the POSIX named character classes are all
+7. Similarly, characters that match the POSIX named character classes are all
 low-valued characters.
 .P
+8. However, the Perl 5.10 horizontal and vertical whitespace matching escapes
+(\eh, \eH, \ev, and \eV) do match all the appropriate Unicode characters.
+.P
 9. Case-insensitive matching applies only to characters whose values are less
 than 128, unless PCRE is built with Unicode property support. Even when Unicode
 property support is available, PCRE still uses its own character tables when
@@ -225,20 +272,25 @@
 letter's cases. There are a small number of many-to-one mappings in Unicode;
 these are not supported by PCRE.
 .
+.
 .SH AUTHOR
 .rs
 .sp
+.nf
 Philip Hazel
-.br
-University Computing Service,
-.br
-Cambridge CB2 3QG, England.
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
 .P
 Putting an actual email address here seems to have been a spam magnet, so I've
-taken it away. If you want to email me, use my initial and surname, separated
-by a dot, at the domain ucs.cam.ac.uk.
+taken it away. If you want to email me, use my two initials, followed by the
+two digits 10, at the domain cam.ac.uk.
+.
+.
+.SH REVISION
+.rs
 .sp
-.in 0
-Last updated: 05 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+.nf
+Last updated: 11 April 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcre.txt
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre.txt	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre.txt	Mon Jun  8 18:51:30 2009
@@ -18,29 +18,37 @@
 
        The  PCRE  library is a set of functions that implement regular expres-
        sion pattern matching using the same syntax and semantics as Perl, with
-       just  a  few  differences.  The current implementation of PCRE (release
-       6.x) corresponds approximately with Perl  5.8,  including  support  for
-       UTF-8 encoded strings and Unicode general category properties. However,
-       this support has to be explicitly enabled; it is not the default.
-
-       In addition to the Perl-compatible matching function,  PCRE  also  con-
-       tains  an  alternative matching function that matches the same compiled
-       patterns in a different way. In certain circumstances, the  alternative
-       function  has  some  advantages.  For  a discussion of the two matching
-       algorithms, see the pcrematching page.
-
-       PCRE is written in C and released as a C library. A  number  of  people
-       have  written  wrappers and interfaces of various kinds. In particular,
-       Google Inc.  have provided a comprehensive C++  wrapper.  This  is  now
+       just  a  few  differences. Certain features that appeared in Python and
+       PCRE before they appeared in Perl are also available using  the  Python
+       syntax.  There is also some support for certain .NET and Oniguruma syn-
+       tax items, and there is an option for  requesting  some  minor  changes
+       that give better JavaScript compatibility.
+
+       The  current  implementation of PCRE (release 7.x) corresponds approxi-
+       mately with Perl 5.10, including support for UTF-8 encoded strings  and
+       Unicode general category properties. However, UTF-8 and Unicode support
+       has to be explicitly enabled; it is not the default. The Unicode tables
+       correspond to Unicode release 5.1.
+
+       In  addition to the Perl-compatible matching function, PCRE contains an
+       alternative matching function that matches the same  compiled  patterns
+       in  a different way. In certain circumstances, the alternative function
+       has some advantages. For a discussion of the two  matching  algorithms,
+       see the pcrematching page.
+
+       PCRE  is  written  in C and released as a C library. A number of people
+       have written wrappers and interfaces of various kinds.  In  particular,
+       Google  Inc.   have  provided  a comprehensive C++ wrapper. This is now
        included as part of the PCRE distribution. The pcrecpp page has details
-       of this interface. Other people's contributions can  be  found  in  the
+       of  this  interface.  Other  people's contributions can be found in the
        Contrib directory at the primary FTP site, which is:
 
        ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
 
-       Details  of  exactly which Perl regular expression features are and are
+       Details of exactly which Perl regular expression features are  and  are
        not supported by PCRE are given in separate documents. See the pcrepat-
-       tern and pcrecompat pages.
+       tern and pcrecompat pages. There is a syntax summary in the  pcresyntax
+       page.
 
        Some  features  of  PCRE can be included, excluded, or changed when the
        library is built. The pcre_config() function makes it  possible  for  a
@@ -67,6 +75,7 @@
        of searching. The sections are as follows:
 
          pcre              this document
+         pcre-config       show PCRE installation configuration information
          pcreapi           details of PCRE's native C API
          pcrebuild         options for building PCRE
          pcrecallout       details of the callout feature
@@ -77,6 +86,7 @@
          pcrepartial       details of the partial matching facility
          pcrepattern       syntax and semantics of supported
                              regular expressions
+         pcresyntax        quick syntax reference
          pcreperform       discussion of performance issues
          pcreposix         the POSIX-compatible C API
          pcreprecompile    details of saving and re-using precompiled patterns
@@ -84,60 +94,57 @@
          pcrestack         discussion of stack usage
          pcretest          description of the pcretest testing command
 
-       In  addition,  in the "man" and HTML formats, there is a short page for
+       In addition, in the "man" and HTML formats, there is a short  page  for
        each C library function, listing its arguments and results.
 
 
 LIMITATIONS
 
-       There are some size limitations in PCRE but it is hoped that they  will
+       There  are some size limitations in PCRE but it is hoped that they will
        never in practice be relevant.
 
-       The  maximum  length of a compiled pattern is 65539 (sic) bytes if PCRE
+       The maximum length of a compiled pattern is 65539 (sic) bytes  if  PCRE
        is compiled with the default internal linkage size of 2. If you want to
-       process  regular  expressions  that are truly enormous, you can compile
-       PCRE with an internal linkage size of 3 or 4 (see the  README  file  in
-       the  source  distribution and the pcrebuild documentation for details).
-       In these cases the limit is substantially larger.  However,  the  speed
-       of execution will be slower.
-
-       All  values in repeating quantifiers must be less than 65536. The maxi-
-       mum compiled length of subpattern with  an  explicit  repeat  count  is
-       30000 bytes. The maximum number of capturing subpatterns is 65535.
-
-       There  is  no limit to the number of non-capturing subpatterns, but the
-       maximum depth of nesting of  all  kinds  of  parenthesized  subpattern,
-       including capturing subpatterns, assertions, and other types of subpat-
-       tern, is 200.
+       process regular expressions that are truly enormous,  you  can  compile
+       PCRE  with  an  internal linkage size of 3 or 4 (see the README file in
+       the source distribution and the pcrebuild documentation  for  details).
+       In  these  cases the limit is substantially larger.  However, the speed
+       of execution is slower.
+
+       All values in repeating quantifiers must be less than 65536.
+
+       There is no limit to the number of parenthesized subpatterns, but there
+       can be no more than 65535 capturing subpatterns.
 
-       The maximum length of name for a named subpattern is 32, and the  maxi-
-       mum number of named subpatterns is 10000.
+       The maximum length of name for a named subpattern is 32 characters, and
+       the maximum number of named subpatterns is 10000.
 
-       The  maximum  length of a subject string is the largest positive number
-       that an integer variable can hold. However, when using the  traditional
+       The maximum length of a subject string is the largest  positive  number
+       that  an integer variable can hold. However, when using the traditional
        matching function, PCRE uses recursion to handle subpatterns and indef-
-       inite repetition.  This means that the available stack space may  limit
+       inite  repetition.  This means that the available stack space may limit
        the size of a subject string that can be processed by certain patterns.
        For a discussion of stack issues, see the pcrestack documentation.
 
 
 UTF-8 AND UNICODE PROPERTY SUPPORT
 
-       From release 3.3, PCRE has  had  some  support  for  character  strings
-       encoded  in the UTF-8 format. For release 4.0 this was greatly extended
-       to cover most common requirements, and in release 5.0  additional  sup-
+       From  release  3.3,  PCRE  has  had  some support for character strings
+       encoded in the UTF-8 format. For release 4.0 this was greatly  extended
+       to  cover  most common requirements, and in release 5.0 additional sup-
        port for Unicode general category properties was added.
 
-       In  order  process  UTF-8 strings, you must build PCRE to include UTF-8
-       support in the code, and, in addition,  you  must  call  pcre_compile()
-       with  the PCRE_UTF8 option flag. When you do this, both the pattern and
-       any subject strings that are matched against it are  treated  as  UTF-8
-       strings instead of just strings of bytes.
+       In order process UTF-8 strings, you must build PCRE  to  include  UTF-8
+       support  in  the  code,  and, in addition, you must call pcre_compile()
+       with the PCRE_UTF8 option flag, or the  pattern  must  start  with  the
+       sequence  (*UTF8).  When  either of these is the case, both the pattern
+       and any subject strings that are matched  against  it  are  treated  as
+       UTF-8 strings instead of just strings of bytes.
 
        If  you compile PCRE with UTF-8 support, but do not use it at run time,
        the library will be a bit bigger, but the additional run time  overhead
-       is  limited  to testing the PCRE_UTF8 flag in several places, so should
-       not be very large.
+       is limited to testing the PCRE_UTF8 flag occasionally, so should not be
+       very big.
 
        If PCRE is built with Unicode character property support (which implies
        UTF-8  support),  the  escape sequences \p{..}, \P{..}, and \X are sup-
@@ -151,72 +158,110 @@
        optionally  be  prefixed by "Is", for compatibility with Perl 5.6. PCRE
        does not support this.
 
-       The following comments apply when PCRE is running in UTF-8 mode:
+   Validity of UTF-8 strings
 
-       1. When you set the PCRE_UTF8 flag, the strings passed as patterns  and
-       subjects  are  checked for validity on entry to the relevant functions.
-       If an invalid UTF-8 string is passed, an error return is given. In some
-       situations,  you  may  already  know  that  your strings are valid, and
-       therefore want to skip these checks in order to improve performance. If
-       you  set  the  PCRE_NO_UTF8_CHECK  flag at compile time or at run time,
-       PCRE assumes that the pattern or subject  it  is  given  (respectively)
-       contains  only valid UTF-8 codes. In this case, it does not diagnose an
-       invalid UTF-8 string. If you pass an invalid UTF-8 string to PCRE  when
-       PCRE_NO_UTF8_CHECK  is set, the results are undefined. Your program may
-       crash.
+       When you set the PCRE_UTF8 flag, the strings  passed  as  patterns  and
+       subjects are (by default) checked for validity on entry to the relevant
+       functions. From release 7.3 of PCRE, the check is according  the  rules
+       of  RFC  3629, which are themselves derived from the Unicode specifica-
+       tion. Earlier releases of PCRE followed the rules of  RFC  2279,  which
+       allows  the  full range of 31-bit values (0 to 0x7FFFFFFF). The current
+       check allows only values in the range U+0 to U+10FFFF, excluding U+D800
+       to U+DFFF.
+
+       The  excluded  code  points are the "Low Surrogate Area" of Unicode, of
+       which the Unicode Standard says this: "The Low Surrogate Area does  not
+       contain  any  character  assignments,  consequently  no  character code
+       charts or namelists are provided for this area. Surrogates are reserved
+       for  use  with  UTF-16 and then must be used in pairs." The code points
+       that are encoded by UTF-16 pairs  are  available  as  independent  code
+       points  in  the  UTF-8  encoding.  (In other words, the whole surrogate
+       thing is a fudge for UTF-16 which unfortunately messes up UTF-8.)
+
+       If an  invalid  UTF-8  string  is  passed  to  PCRE,  an  error  return
+       (PCRE_ERROR_BADUTF8) is given. In some situations, you may already know
+       that your strings are valid, and therefore want to skip these checks in
+       order to improve performance. If you set the PCRE_NO_UTF8_CHECK flag at
+       compile time or at run time, PCRE assumes that the pattern  or  subject
+       it  is  given  (respectively)  contains only valid UTF-8 codes. In this
+       case, it does not diagnose an invalid UTF-8 string.
+
+       If you pass an invalid UTF-8 string  when  PCRE_NO_UTF8_CHECK  is  set,
+       what  happens  depends on why the string is invalid. If the string con-
+       forms to the "old" definition of UTF-8 (RFC 2279), it is processed as a
+       string  of  characters  in  the  range 0 to 0x7FFFFFFF. In other words,
+       apart from the initial validity test, PCRE (when in UTF-8 mode) handles
+       strings  according  to  the more liberal rules of RFC 2279. However, if
+       the string does not even conform to RFC 2279, the result is  undefined.
+       Your program may crash.
+
+       If  you  want  to  process  strings  of  values  in the full range 0 to
+       0x7FFFFFFF, encoded in a UTF-8-like manner as per the old RFC, you  can
+       set PCRE_NO_UTF8_CHECK to bypass the more restrictive test. However, in
+       this situation, you will have to apply your own validity check.
 
-       2. An unbraced hexadecimal escape sequence (such  as  \xb3)  matches  a
+   General comments about UTF-8 mode
+
+       1. An unbraced hexadecimal escape sequence (such  as  \xb3)  matches  a
        two-byte UTF-8 character if the value is greater than 127.
 
-       3.  Octal  numbers  up to \777 are recognized, and match two-byte UTF-8
+       2.  Octal  numbers  up to \777 are recognized, and match two-byte UTF-8
        characters for values greater than \177.
 
-       4. Repeat quantifiers apply to complete UTF-8 characters, not to  indi-
+       3. Repeat quantifiers apply to complete UTF-8 characters, not to  indi-
        vidual bytes, for example: \x{100}{3}.
 
-       5.  The dot metacharacter matches one UTF-8 character instead of a sin-
+       4.  The dot metacharacter matches one UTF-8 character instead of a sin-
        gle byte.
 
-       6. The escape sequence \C can be used to match a single byte  in  UTF-8
+       5. The escape sequence \C can be used to match a single byte  in  UTF-8
        mode,  but  its  use can lead to some strange effects. This facility is
        not available in the alternative matching function, pcre_dfa_exec().
 
-       7. The character escapes \b, \B, \d, \D, \s, \S, \w, and  \W  correctly
+       6. The character escapes \b, \B, \d, \D, \s, \S, \w, and  \W  correctly
        test  characters of any code value, but the characters that PCRE recog-
        nizes as digits, spaces, or word characters  remain  the  same  set  as
        before, all with values less than 256. This remains true even when PCRE
        includes Unicode property support, because to do otherwise  would  slow
        down  PCRE in many common cases. If you really want to test for a wider
        sense of, say, "digit", you must use Unicode  property  tests  such  as
-       \p{Nd}.
+       \p{Nd}.  Note  that  this  also applies to \b, because it is defined in
+       terms of \w and \W.
 
-       8.  Similarly,  characters that match the POSIX named character classes
+       7. Similarly, characters that match the POSIX named  character  classes
        are all low-valued characters.
 
-       9. Case-insensitive matching applies only to  characters  whose  values
-       are  less than 128, unless PCRE is built with Unicode property support.
-       Even when Unicode property support is available, PCRE  still  uses  its
-       own  character  tables when checking the case of low-valued characters,
-       so as not to degrade performance.  The Unicode property information  is
+       8.  However,  the Perl 5.10 horizontal and vertical whitespace matching
+       escapes (\h, \H, \v, and \V) do match all the appropriate Unicode char-
+       acters.
+
+       9.  Case-insensitive  matching  applies only to characters whose values
+       are less than 128, unless PCRE is built with Unicode property  support.
+       Even  when  Unicode  property support is available, PCRE still uses its
+       own character tables when checking the case of  low-valued  characters,
+       so  as not to degrade performance.  The Unicode property information is
        used only for characters with higher values. Even when Unicode property
        support is available, PCRE supports case-insensitive matching only when
-       there  is  a  one-to-one  mapping between a letter's cases. There are a
-       small number of many-to-one mappings in Unicode;  these  are  not  sup-
+       there is a one-to-one mapping between a letter's  cases.  There  are  a
+       small  number  of  many-to-one  mappings in Unicode; these are not sup-
        ported by PCRE.
 
 
 AUTHOR
 
        Philip Hazel
-       University Computing Service,
-       Cambridge CB2 3QG, England.
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+       Putting an actual email address here seems to have been a spam  magnet,
+       so  I've  taken  it away. If you want to email me, use my two initials,
+       followed by the two digits 10, at the domain cam.ac.uk.
 
-       Putting  an actual email address here seems to have been a spam magnet,
-       so I've taken it away. If you want to email me, use my initial and sur-
-       name, separated by a dot, at the domain ucs.cam.ac.uk.
 
-Last updated: 05 June 2006
-Copyright (c) 1997-2006 University of Cambridge.
+REVISION
+
+       Last updated: 11 April 2009
+       Copyright (c) 1997-2009 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -230,20 +275,25 @@
 PCRE BUILD-TIME OPTIONS
 
        This  document  describes  the  optional  features  of PCRE that can be
-       selected when the library is compiled. They are all selected, or  dese-
-       lected, by providing options to the configure script that is run before
-       the make command. The complete list of  options  for  configure  (which
-       includes  the  standard  ones such as the selection of the installation
-       directory) can be obtained by running
+       selected when the library is compiled. It assumes use of the  configure
+       script,  where the optional features are selected or deselected by pro-
+       viding options to configure before running the make  command.  However,
+       the  same  options  can be selected in both Unix-like and non-Unix-like
+       environments using the GUI facility of  CMakeSetup  if  you  are  using
+       CMake instead of configure to build PCRE.
+
+       The complete list of options for configure (which includes the standard
+       ones such as the  selection  of  the  installation  directory)  can  be
+       obtained by running
 
          ./configure --help
 
-       The following sections describe certain options whose names begin  with
-       --enable  or  --disable. These settings specify changes to the defaults
-       for the configure command. Because of the  way  that  configure  works,
-       --enable  and  --disable  always  come  in  pairs, so the complementary
-       option always exists as well, but as it specifies the  default,  it  is
-       not described.
+       The  following  sections  include  descriptions  of options whose names
+       begin with --enable or --disable. These settings specify changes to the
+       defaults  for  the configure command. Because of the way that configure
+       works, --enable and --disable always come in pairs, so  the  complemen-
+       tary  option always exists as well, but as it specifies the default, it
+       is not described.
 
 
 C++ SUPPORT
@@ -259,41 +309,46 @@
 
 UTF-8 SUPPORT
 
-       To build PCRE with support for UTF-8 character strings, add
+       To build PCRE with support for UTF-8 Unicode character strings, add
 
          --enable-utf8
 
-       to  the  configure  command.  Of  itself, this does not make PCRE treat
-       strings as UTF-8. As well as compiling PCRE with this option, you  also
-       have  have to set the PCRE_UTF8 option when you call the pcre_compile()
+       to the configure command. Of itself, this  does  not  make  PCRE  treat
+       strings  as UTF-8. As well as compiling PCRE with this option, you also
+       have have to set the PCRE_UTF8 option when you call the  pcre_compile()
        function.
 
+       If  you set --enable-utf8 when compiling in an EBCDIC environment, PCRE
+       expects its input to be either ASCII or UTF-8 (depending on the runtime
+       option).  It  is not possible to support both EBCDIC and UTF-8 codes in
+       the same  version  of  the  library.  Consequently,  --enable-utf8  and
+       --enable-ebcdic are mutually exclusive.
+
 
 UNICODE CHARACTER PROPERTY SUPPORT
 
-       UTF-8 support allows PCRE to process character values greater than  255
-       in  the  strings that it handles. On its own, however, it does not pro-
+       UTF-8  support allows PCRE to process character values greater than 255
+       in the strings that it handles. On its own, however, it does  not  pro-
        vide any facilities for accessing the properties of such characters. If
-       you  want  to  be able to use the pattern escapes \P, \p, and \X, which
+       you want to be able to use the pattern escapes \P, \p,  and  \X,  which
        refer to Unicode character properties, you must add
 
          --enable-unicode-properties
 
-       to the configure command. This implies UTF-8 support, even if you  have
+       to  the configure command. This implies UTF-8 support, even if you have
        not explicitly requested it.
 
-       Including  Unicode  property  support  adds around 90K of tables to the
-       PCRE library, approximately doubling its size. Only the  general  cate-
-       gory  properties  such as Lu and Nd are supported. Details are given in
-       the pcrepattern documentation.
+       Including Unicode property support adds around 30K  of  tables  to  the
+       PCRE  library.  Only  the general category properties such as Lu and Nd
+       are supported. Details are given in the pcrepattern documentation.
 
 
 CODE VALUE OF NEWLINE
 
-       By default, PCRE interprets character 10 (linefeed, LF)  as  indicating
+       By default, PCRE interprets the linefeed (LF) character  as  indicating
        the  end  of  a line. This is the normal newline character on Unix-like
-       systems. You can compile PCRE to use character 13 (carriage return, CR)
-       instead, by adding
+       systems. You can compile PCRE to use carriage return (CR)  instead,  by
+       adding
 
          --enable-newline-is-cr
 
@@ -305,10 +360,33 @@
 
          --enable-newline-is-crlf
 
-       to  the  configure command. Whatever line ending convention is selected
-       when PCRE is built can be overridden when  the  library  functions  are
-       called.  At  build time it is conventional to use the standard for your
-       operating system.
+       to the configure command. There is a fourth option, specified by
+
+         --enable-newline-is-anycrlf
+
+       which  causes  PCRE  to recognize any of the three sequences CR, LF, or
+       CRLF as indicating a line ending. Finally, a fifth option, specified by
+
+         --enable-newline-is-any
+
+       causes PCRE to recognize any Unicode newline sequence.
+
+       Whatever line ending convention is selected when PCRE is built  can  be
+       overridden  when  the library functions are called. At build time it is
+       conventional to use the standard for your operating system.
+
+
+WHAT \R MATCHES
+
+       By default, the sequence \R in a pattern matches  any  Unicode  newline
+       sequence,  whatever  has  been selected as the line ending sequence. If
+       you specify
+
+         --enable-bsr-anycrlf
+
+       the default is changed so that \R matches only CR, LF, or  CRLF.  What-
+       ever  is selected when PCRE is built can be overridden when the library
+       functions are called.
 
 
 BUILDING SHARED AND STATIC LIBRARIES
@@ -356,81 +434,161 @@
        longer  offsets slows down the operation of PCRE because it has to load
        additional bytes when handling them.
 
-       If you build PCRE with an increased link size, test 2 (and  test  5  if
-       you  are using UTF-8) will fail. Part of the output of these tests is a
-       representation of the compiled pattern, and this changes with the  link
-       size.
-
 
 AVOIDING EXCESSIVE STACK USAGE
 
        When matching with the pcre_exec() function, PCRE implements backtrack-
-       ing by making recursive calls to an internal function  called  match().
-       In  environments  where  the size of the stack is limited, this can se-
-       verely limit PCRE's operation. (The Unix environment does  not  usually
+       ing  by  making recursive calls to an internal function called match().
+       In environments where the size of the stack is limited,  this  can  se-
+       verely  limit  PCRE's operation. (The Unix environment does not usually
        suffer from this problem, but it may sometimes be necessary to increase
-       the maximum stack size.  There is a discussion in the  pcrestack  docu-
-       mentation.)  An alternative approach to recursion that uses memory from
-       the heap to remember data, instead of using recursive  function  calls,
-       has  been  implemented to work round the problem of limited stack size.
+       the  maximum  stack size.  There is a discussion in the pcrestack docu-
+       mentation.) An alternative approach to recursion that uses memory  from
+       the  heap  to remember data, instead of using recursive function calls,
+       has been implemented to work round the problem of limited  stack  size.
        If you want to build a version of PCRE that works this way, add
 
          --disable-stack-for-recursion
 
-       to the configure command. With this configuration, PCRE  will  use  the
-       pcre_stack_malloc  and pcre_stack_free variables to call memory manage-
-       ment functions. Separate functions are provided because  the  usage  is
-       very  predictable:  the  block sizes requested are always the same, and
-       the blocks are always freed in reverse order. A calling  program  might
-       be  able  to implement optimized functions that perform better than the
-       standard malloc() and  free()  functions.  PCRE  runs  noticeably  more
-       slowly when built in this way. This option affects only the pcre_exec()
-       function; it is not relevant for the the pcre_dfa_exec() function.
+       to  the  configure  command. With this configuration, PCRE will use the
+       pcre_stack_malloc and pcre_stack_free variables to call memory  manage-
+       ment  functions. By default these point to malloc() and free(), but you
+       can replace the pointers so that your own functions are used.
+
+       Separate functions are  provided  rather  than  using  pcre_malloc  and
+       pcre_free  because  the  usage  is  very  predictable:  the block sizes
+       requested are always the same, and  the  blocks  are  always  freed  in
+       reverse  order.  A calling program might be able to implement optimized
+       functions that perform better  than  malloc()  and  free().  PCRE  runs
+       noticeably more slowly when built in this way. This option affects only
+       the  pcre_exec()  function;  it   is   not   relevant   for   the   the
+       pcre_dfa_exec() function.
 
 
 LIMITING PCRE RESOURCE USAGE
 
-       Internally, PCRE has a function called match(), which it calls  repeat-
-       edly   (sometimes   recursively)  when  matching  a  pattern  with  the
-       pcre_exec() function. By controlling the maximum number of  times  this
-       function  may be called during a single matching operation, a limit can
-       be placed on the resources used by a single call  to  pcre_exec().  The
-       limit  can be changed at run time, as described in the pcreapi documen-
-       tation. The default is 10 million, but this can be changed by adding  a
+       Internally,  PCRE has a function called match(), which it calls repeat-
+       edly  (sometimes  recursively)  when  matching  a  pattern   with   the
+       pcre_exec()  function.  By controlling the maximum number of times this
+       function may be called during a single matching operation, a limit  can
+       be  placed  on  the resources used by a single call to pcre_exec(). The
+       limit can be changed at run time, as described in the pcreapi  documen-
+       tation.  The default is 10 million, but this can be changed by adding a
        setting such as
 
          --with-match-limit=500000
 
-       to   the   configure  command.  This  setting  has  no  effect  on  the
+       to  the  configure  command.  This  setting  has  no  effect   on   the
        pcre_dfa_exec() matching function.
 
-       In some environments it is desirable to limit the  depth  of  recursive
+       In  some  environments  it is desirable to limit the depth of recursive
        calls of match() more strictly than the total number of calls, in order
-       to restrict the maximum amount of stack (or heap,  if  --disable-stack-
+       to  restrict  the maximum amount of stack (or heap, if --disable-stack-
        for-recursion is specified) that is used. A second limit controls this;
-       it defaults to the value that  is  set  for  --with-match-limit,  which
-       imposes  no  additional constraints. However, you can set a lower limit
+       it  defaults  to  the  value  that is set for --with-match-limit, which
+       imposes no additional constraints. However, you can set a  lower  limit
        by adding, for example,
 
          --with-match-limit-recursion=10000
 
-       to the configure command. This value can  also  be  overridden  at  run
+       to  the  configure  command.  This  value can also be overridden at run
        time.
 
 
+CREATING CHARACTER TABLES AT BUILD TIME
+
+       PCRE uses fixed tables for processing characters whose code values  are
+       less  than 256. By default, PCRE is built with a set of tables that are
+       distributed in the file pcre_chartables.c.dist. These  tables  are  for
+       ASCII codes only. If you add
+
+         --enable-rebuild-chartables
+
+       to  the  configure  command, the distributed tables are no longer used.
+       Instead, a program called dftables is compiled and  run.  This  outputs
+       the source for new set of tables, created in the default locale of your
+       C runtime system. (This method of replacing the tables does not work if
+       you  are cross compiling, because dftables is run on the local host. If
+       you need to create alternative tables when cross  compiling,  you  will
+       have to do so "by hand".)
+
+
 USING EBCDIC CODE
 
        PCRE  assumes  by  default that it will run in an environment where the
        character code is ASCII (or Unicode, which is  a  superset  of  ASCII).
-       PCRE  can,  however,  be  compiled  to  run in an EBCDIC environment by
-       adding
+       This  is  the  case for most computer operating systems. PCRE can, how-
+       ever, be compiled to run in an EBCDIC environment by adding
 
          --enable-ebcdic
 
-       to the configure command.
+       to the configure command. This setting implies --enable-rebuild-charta-
+       bles.  You  should  only  use  it if you know that you are in an EBCDIC
+       environment (for example,  an  IBM  mainframe  operating  system).  The
+       --enable-ebcdic option is incompatible with --enable-utf8.
+
+
+PCREGREP OPTIONS FOR COMPRESSED FILE SUPPORT
 
-Last updated: 06 June 2006
-Copyright (c) 1997-2006 University of Cambridge.
+       By default, pcregrep reads all files as plain text. You can build it so
+       that it recognizes files whose names end in .gz or .bz2, and reads them
+       with libz or libbz2, respectively, by adding one or both of
+
+         --enable-pcregrep-libz
+         --enable-pcregrep-libbz2
+
+       to the configure command. These options naturally require that the rel-
+       evant libraries are installed on your system. Configuration  will  fail
+       if they are not.
+
+
+PCRETEST OPTION FOR LIBREADLINE SUPPORT
+
+       If you add
+
+         --enable-pcretest-libreadline
+
+       to  the  configure  command,  pcretest  is  linked with the libreadline
+       library, and when its input is from a terminal, it reads it  using  the
+       readline() function. This provides line-editing and history facilities.
+       Note that libreadline is GPL-licenced, so if you distribute a binary of
+       pcretest linked in this way, there may be licensing issues.
+
+       Setting  this  option  causes  the -lreadline option to be added to the
+       pcretest build. In many operating environments with  a  sytem-installed
+       libreadline this is sufficient. However, in some environments (e.g.  if
+       an unmodified distribution version of readline is in use),  some  extra
+       configuration  may  be necessary. The INSTALL file for libreadline says
+       this:
+
+         "Readline uses the termcap functions, but does not link with the
+         termcap or curses library itself, allowing applications which link
+         with readline the to choose an appropriate library."
+
+       If your environment has not been set up so that an appropriate  library
+       is automatically included, you may need to add something like
+
+         LIBS="-ncurses"
+
+       immediately before the configure command.
+
+
+SEE ALSO
+
+       pcreapi(3), pcre_config(3).
+
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 17 March 2009
+       Copyright (c) 1997-2009 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -466,7 +624,7 @@
            
 
        there are three possible answers. The standard algorithm finds only one
-       of them, whereas the DFA algorithm finds all three.
+       of them, whereas the alternative algorithm finds all three.
 
 
 REGULAR EXPRESSIONS AS TREES
@@ -482,8 +640,8 @@
 
 THE STANDARD MATCHING ALGORITHM
 
-       In the terminology of Jeffrey Friedl's book Mastering  Regular  Expres-
-       sions,  the  standard  algorithm  is  an "NFA algorithm". It conducts a
+       In the terminology of Jeffrey Friedl's book "Mastering Regular  Expres-
+       sions",  the  standard  algorithm  is an "NFA algorithm". It conducts a
        depth-first search of the pattern tree. That is, it  proceeds  along  a
        single path through the tree, checking that the subject matches what is
        required. When there is a mismatch, the algorithm  tries  any  alterna-
@@ -507,21 +665,22 @@
        This provides support for capturing parentheses and back references.
 
 
-THE DFA MATCHING ALGORITHM
+THE ALTERNATIVE MATCHING ALGORITHM
 
-       DFA stands for "deterministic finite automaton", but you do not need to
-       understand the origins of that name. This algorithm conducts a breadth-
-       first search of the tree. Starting from the first matching point in the
-       subject,  it scans the subject string from left to right, once, charac-
-       ter by character, and as it does  this,  it  remembers  all  the  paths
-       through the tree that represent valid matches.
-
-       The  scan  continues until either the end of the subject is reached, or
-       there are no more unterminated paths. At this point,  terminated  paths
-       represent  the different matching possibilities (if there are none, the
-       match has failed).  Thus, if there is more  than  one  possible  match,
+       This algorithm conducts a breadth-first search of  the  tree.  Starting
+       from  the  first  matching  point  in the subject, it scans the subject
+       string from left to right, once, character by character, and as it does
+       this,  it remembers all the paths through the tree that represent valid
+       matches. In Friedl's terminology, this is a kind  of  "DFA  algorithm",
+       though  it is not implemented as a traditional finite state machine (it
+       keeps multiple states active simultaneously).
+
+       The scan continues until either the end of the subject is  reached,  or
+       there  are  no more unterminated paths. At this point, terminated paths
+       represent the different matching possibilities (if there are none,  the
+       match  has  failed).   Thus,  if there is more than one possible match,
        this algorithm finds all of them, and in particular, it finds the long-
-       est. In PCRE, there is an option to stop the algorithm after the  first
+       est.  In PCRE, there is an option to stop the algorithm after the first
        match (which is necessarily the shortest) has been found.
 
        Note that all the matches that are found start at the same point in the
@@ -529,42 +688,63 @@
 
          cat(er(pillar)?)
 
-       is matched against the string "the caterpillar catchment",  the  result
-       will  be the three strings "cat", "cater", and "caterpillar" that start
+       is  matched  against the string "the caterpillar catchment", the result
+       will be the three strings "cat", "cater", and "caterpillar" that  start
        at the fourth character of the subject. The algorithm does not automat-
        ically move on to find matches that start at later positions.
 
        There are a number of features of PCRE regular expressions that are not
-       supported by the DFA matching algorithm. They are as follows:
+       supported by the alternative matching algorithm. They are as follows:
 
-       1. Because the algorithm finds all  possible  matches,  the  greedy  or
-       ungreedy  nature  of repetition quantifiers is not relevant. Greedy and
-       ungreedy quantifiers are treated in exactly the same way.
+       1.  Because  the  algorithm  finds  all possible matches, the greedy or
+       ungreedy nature of repetition quantifiers is not relevant.  Greedy  and
+       ungreedy quantifiers are treated in exactly the same way. However, pos-
+       sessive quantifiers can make a difference when what follows could  also
+       match what is quantified, for example in a pattern like this:
+
+         ^a++\w!
+
+       This  pattern matches "aaab!" but not "aaa!", which would be matched by
+       a non-possessive quantifier. Similarly, if an atomic group is  present,
+       it  is matched as if it were a standalone pattern at the current point,
+       and the longest match is then "locked in" for the rest of  the  overall
+       pattern.
 
        2. When dealing with multiple paths through the tree simultaneously, it
-       is  not  straightforward  to  keep track of captured substrings for the
-       different matching possibilities, and  PCRE's  implementation  of  this
+       is not straightforward to keep track of  captured  substrings  for  the
+       different  matching  possibilities,  and  PCRE's implementation of this
        algorithm does not attempt to do this. This means that no captured sub-
        strings are available.
 
-       3. Because no substrings are captured, back references within the  pat-
+       3.  Because no substrings are captured, back references within the pat-
        tern are not supported, and cause errors if encountered.
 
-       4.  For  the same reason, conditional expressions that use a backrefer-
-       ence as the condition are not supported.
+       4. For the same reason, conditional expressions that use  a  backrefer-
+       ence  as  the  condition or test for a specific group recursion are not
+       supported.
+
+       5. Because many paths through the tree may be  active,  the  \K  escape
+       sequence, which resets the start of the match when encountered (but may
+       be on some paths and not on others), is not  supported.  It  causes  an
+       error if encountered.
 
-       5. Callouts are supported, but the value of the  capture_top  field  is
+       6.  Callouts  are  supported, but the value of the capture_top field is
        always 1, and the value of the capture_last field is always -1.
 
-       6.  The \C escape sequence, which (in the standard algorithm) matches a
-       single byte, even in UTF-8 mode, is not supported because the DFA algo-
-       rithm moves through the subject string one character at a time, for all
-       active paths through the tree.
+       7. The \C escape sequence, which (in the standard algorithm) matches  a
+       single  byte, even in UTF-8 mode, is not supported because the alterna-
+       tive algorithm moves through the subject  string  one  character  at  a
+       time, for all active paths through the tree.
 
+       8.  Except for (*FAIL), the backtracking control verbs such as (*PRUNE)
+       are not supported. (*FAIL) is supported, and  behaves  like  a  failing
+       negative assertion.
 
-ADVANTAGES OF THE DFA ALGORITHM
 
-       Using the DFA matching algorithm provides the following advantages:
+ADVANTAGES OF THE ALTERNATIVE ALGORITHM
+
+       Using  the alternative matching algorithm provides the following advan-
+       tages:
 
        1. All possible matches (at a single point in the subject) are automat-
        ically  found,  and  in particular, the longest match is found. To find
@@ -573,19 +753,19 @@
 
        2.  There is much better support for partial matching. The restrictions
        on the content of the pattern that apply when using the standard  algo-
-       rithm  for partial matching do not apply to the DFA algorithm. For non-
-       anchored patterns, the starting position of a partial match  is  avail-
-       able.
+       rithm  for  partial matching do not apply to the alternative algorithm.
+       For non-anchored patterns, the starting position of a partial match  is
+       available.
 
-       3.  Because  the  DFA algorithm scans the subject string just once, and
-       never needs to backtrack, it is possible  to  pass  very  long  subject
-       strings  to  the matching function in several pieces, checking for par-
-       tial matching each time.
+       3.  Because  the  alternative  algorithm  scans the subject string just
+       once, and never needs to backtrack, it is possible to  pass  very  long
+       subject  strings  to  the matching function in several pieces, checking
+       for partial matching each time.
 
 
-DISADVANTAGES OF THE DFA ALGORITHM
+DISADVANTAGES OF THE ALTERNATIVE ALGORITHM
 
-       The DFA algorithm suffers from a number of disadvantages:
+       The alternative algorithm suffers from a number of disadvantages:
 
        1. It is substantially slower than  the  standard  algorithm.  This  is
        partly  because  it has to search for all possible matches, but is also
@@ -593,12 +773,21 @@
 
        2. Capturing parentheses and back references are not supported.
 
-       3. The "atomic group" feature of PCRE regular expressions is supported,
-       but  does not provide the advantage that it does for the standard algo-
-       rithm.
+       3. Although atomic groups are supported, their use does not provide the
+       performance advantage that it does for the standard algorithm.
+
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
 
-Last updated: 06 June 2006
-Copyright (c) 1997-2006 University of Cambridge.
+
+REVISION
+
+       Last updated: 19 April 2008
+       Copyright (c) 1997-2008 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -692,7 +881,7 @@
 PCRE API OVERVIEW
 
        PCRE has its own native API, which is described in this document. There
-       is also a set of wrapper functions that correspond to the POSIX regular
+       are also some wrapper functions that correspond to  the  POSIX  regular
        expression  API.  These  are  described in the pcreposix documentation.
        Both of these APIs define a set of C function calls. A C++  wrapper  is
        distributed with PCRE. It is documented in the pcrecpp page.
@@ -710,15 +899,15 @@
        a  Perl-compatible  manner. A sample program that demonstrates the sim-
        plest way of using them is provided in the file  called  pcredemo.c  in
        the  source distribution. The pcresample documentation describes how to
-       run it.
+       compile and run it.
 
        A second matching function, pcre_dfa_exec(), which is not Perl-compati-
        ble,  is  also provided. This uses a different algorithm for the match-
        ing. The alternative algorithm finds all possible matches (at  a  given
-       point in the subject). However, this algorithm does not return captured
-       substrings. A description of the  two  matching  algorithms  and  their
-       advantages  and  disadvantages  is given in the pcrematching documenta-
-       tion.
+       point  in  the subject), and scans the subject just once. However, this
+       algorithm does not return captured substrings. A description of the two
+       matching  algorithms and their advantages and disadvantages is given in
+       the pcrematching documentation.
 
        In addition to the main compiling and  matching  functions,  there  are
        convenience functions for extracting captured substrings from a subject
@@ -779,16 +968,37 @@
 
 
 NEWLINES
-       PCRE supports three different conventions for indicating line breaks in
-       strings: a single CR character, a single LF character, or the two-char-
-       acter  sequence  CRLF.  All  three  are used as "standard" by different
-       operating systems.  When PCRE is built, a default can be specified. The
-       default  default  is  LF, which is the Unix standard. When PCRE is run,
-       the default can be overridden, either when a pattern  is  compiled,  or
-       when it is matched.
+
+       PCRE  supports five different conventions for indicating line breaks in
+       strings: a single CR (carriage return) character, a  single  LF  (line-
+       feed) character, the two-character sequence CRLF, any of the three pre-
+       ceding, or any Unicode newline sequence. The Unicode newline  sequences
+       are  the  three just mentioned, plus the single characters VT (vertical
+       tab, U+000B), FF (formfeed, U+000C), NEL (next line, U+0085), LS  (line
+       separator, U+2028), and PS (paragraph separator, U+2029).
+
+       Each  of  the first three conventions is used by at least one operating
+       system as its standard newline sequence. When PCRE is built, a  default
+       can  be  specified.  The default default is LF, which is the Unix stan-
+       dard. When PCRE is run, the default can be overridden,  either  when  a
+       pattern is compiled, or when it is matched.
+
+       At compile time, the newline convention can be specified by the options
+       argument of pcre_compile(), or it can be specified by special  text  at
+       the start of the pattern itself; this overrides any other settings. See
+       the pcrepattern page for details of the special character sequences.
 
        In the PCRE documentation the word "newline" is used to mean "the char-
-       acter or pair of characters that indicate a line break".
+       acter  or pair of characters that indicate a line break". The choice of
+       newline convention affects the handling of  the  dot,  circumflex,  and
+       dollar metacharacters, the handling of #-comments in /x mode, and, when
+       CRLF is a recognized line ending sequence, the match position  advance-
+       ment for a non-anchored pattern. There is more detail about this in the
+       section on pcre_exec() options below.
+
+       The choice of newline convention does not affect the interpretation  of
+       the  \n  or  \r  escape  sequences, nor does it affect what \R matches,
+       which is controlled in a similar way, but by separate options.
 
 
 MULTITHREADING
@@ -798,7 +1008,7 @@
        pcre_malloc, pcre_free, pcre_stack_malloc, and pcre_stack_free, and the
        callout function pointed to by pcre_callout, are shared by all threads.
 
-       The compiled form of a regular expression is not altered during  match-
+       The  compiled form of a regular expression is not altered during match-
        ing, so the same compiled pattern can safely be used by several threads
        at once.
 
@@ -806,68 +1016,81 @@
 SAVING PRECOMPILED PATTERNS FOR LATER USE
 
        The compiled form of a regular expression can be saved and re-used at a
-       later  time,  possibly by a different program, and even on a host other
-       than the one on which  it  was  compiled.  Details  are  given  in  the
-       pcreprecompile documentation.
+       later time, possibly by a different program, and even on a  host  other
+       than  the  one  on  which  it  was  compiled.  Details are given in the
+       pcreprecompile documentation. However, compiling a  regular  expression
+       with  one version of PCRE for use with a different version is not guar-
+       anteed to work and may cause crashes.
 
 
 CHECKING BUILD-TIME OPTIONS
 
        int pcre_config(int what, void *where);
 
-       The  function pcre_config() makes it possible for a PCRE client to dis-
+       The function pcre_config() makes it possible for a PCRE client to  dis-
        cover which optional features have been compiled into the PCRE library.
-       The  pcrebuild documentation has more details about these optional fea-
+       The pcrebuild documentation has more details about these optional  fea-
        tures.
 
-       The first argument for pcre_config() is an  integer,  specifying  which
+       The  first  argument  for pcre_config() is an integer, specifying which
        information is required; the second argument is a pointer to a variable
-       into which the information is  placed.  The  following  information  is
+       into  which  the  information  is  placed. The following information is
        available:
 
          PCRE_CONFIG_UTF8
 
-       The  output is an integer that is set to one if UTF-8 support is avail-
+       The output is an integer that is set to one if UTF-8 support is  avail-
        able; otherwise it is set to zero.
 
          PCRE_CONFIG_UNICODE_PROPERTIES
 
-       The output is an integer that is set to  one  if  support  for  Unicode
+       The  output  is  an  integer  that is set to one if support for Unicode
        character properties is available; otherwise it is set to zero.
 
          PCRE_CONFIG_NEWLINE
 
-       The  output  is  an integer whose value specifies the default character
-       sequence that is recognized as meaning "newline". The three values that
-       are supported are: 10 for LF, 13 for CR, and 3338 for CRLF. The default
-       should normally be the standard sequence for your operating system.
+       The output is an integer whose value specifies  the  default  character
+       sequence  that is recognized as meaning "newline". The four values that
+       are supported are: 10 for LF, 13 for CR, 3338 for CRLF, -2 for ANYCRLF,
+       and  -1  for  ANY.  Though they are derived from ASCII, the same values
+       are returned in EBCDIC environments. The default should normally corre-
+       spond to the standard sequence for your operating system.
+
+         PCRE_CONFIG_BSR
+
+       The output is an integer whose value indicates what character sequences
+       the \R escape sequence matches by default. A value of 0 means  that  \R
+       matches  any  Unicode  line ending sequence; a value of 1 means that \R
+       matches only CR, LF, or CRLF. The default can be overridden when a pat-
+       tern is compiled or matched.
 
          PCRE_CONFIG_LINK_SIZE
 
-       The output is an integer that contains the number  of  bytes  used  for
+       The  output  is  an  integer that contains the number of bytes used for
        internal linkage in compiled regular expressions. The value is 2, 3, or
-       4. Larger values allow larger regular expressions to  be  compiled,  at
-       the  expense  of  slower matching. The default value of 2 is sufficient
-       for all but the most massive patterns, since  it  allows  the  compiled
+       4.  Larger  values  allow larger regular expressions to be compiled, at
+       the expense of slower matching. The default value of  2  is  sufficient
+       for  all  but  the  most massive patterns, since it allows the compiled
        pattern to be up to 64K in size.
 
          PCRE_CONFIG_POSIX_MALLOC_THRESHOLD
 
-       The  output  is  an integer that contains the threshold above which the
-       POSIX interface uses malloc() for output vectors. Further  details  are
+       The output is an integer that contains the threshold  above  which  the
+       POSIX  interface  uses malloc() for output vectors. Further details are
        given in the pcreposix documentation.
 
          PCRE_CONFIG_MATCH_LIMIT
 
-       The output is an integer that gives the default limit for the number of
-       internal matching function calls in a  pcre_exec()  execution.  Further
-       details are given with pcre_exec() below.
+       The output is a long integer that gives the default limit for the  num-
+       ber  of  internal  matching  function calls in a pcre_exec() execution.
+       Further details are given with pcre_exec() below.
 
          PCRE_CONFIG_MATCH_LIMIT_RECURSION
 
-       The  output is an integer that gives the default limit for the depth of
-       recursion when calling the internal matching function in a  pcre_exec()
-       execution. Further details are given with pcre_exec() below.
+       The output is a long integer that gives the default limit for the depth
+       of   recursion  when  calling  the  internal  matching  function  in  a
+       pcre_exec() execution.  Further  details  are  given  with  pcre_exec()
+       below.
 
          PCRE_CONFIG_STACKRECURSE
 
@@ -909,39 +1132,40 @@
        fully relocatable, because it may contain a copy of the tableptr  argu-
        ment, which is an address (see below).
 
-       The options argument contains independent bits that affect the compila-
-       tion. It should be zero if  no  options  are  required.  The  available
-       options  are  described  below. Some of them, in particular, those that
-       are compatible with Perl, can also be set and  unset  from  within  the
-       pattern  (see  the  detailed  description in the pcrepattern documenta-
-       tion). For these options, the contents of the options  argument  speci-
-       fies  their initial settings at the start of compilation and execution.
-       The PCRE_ANCHORED and PCRE_NEWLINE_xxx options can be set at  the  time
-       of matching as well as at compile time.
+       The options argument contains various bit settings that affect the com-
+       pilation. It should be zero if no options are required.  The  available
+       options  are  described  below. Some of them (in particular, those that
+       are compatible with Perl, but also some others) can  also  be  set  and
+       unset  from  within  the  pattern  (see the detailed description in the
+       pcrepattern documentation). For those options that can be different  in
+       different  parts  of  the pattern, the contents of the options argument
+       specifies their initial settings at the start of compilation and execu-
+       tion.  The PCRE_ANCHORED and PCRE_NEWLINE_xxx options can be set at the
+       time of matching as well as at compile time.
 
        If errptr is NULL, pcre_compile() returns NULL immediately.  Otherwise,
-       if compilation of a pattern fails,  pcre_compile()  returns  NULL,  and
+       if  compilation  of  a  pattern fails, pcre_compile() returns NULL, and
        sets the variable pointed to by errptr to point to a textual error mes-
        sage. This is a static string that is part of the library. You must not
        try to free it. The offset from the start of the pattern to the charac-
        ter where the error was discovered is placed in the variable pointed to
-       by  erroffset,  which must not be NULL. If it is, an immediate error is
+       by erroffset, which must not be NULL. If it is, an immediate  error  is
        given.
 
-       If pcre_compile2() is used instead of pcre_compile(),  and  the  error-
-       codeptr  argument is not NULL, a non-zero error code number is returned
-       via this argument in the event of an error. This is in addition to  the
+       If  pcre_compile2()  is  used instead of pcre_compile(), and the error-
+       codeptr argument is not NULL, a non-zero error code number is  returned
+       via  this argument in the event of an error. This is in addition to the
        textual error message. Error codes and messages are listed below.
 
-       If  the  final  argument, tableptr, is NULL, PCRE uses a default set of
-       character tables that are  built  when  PCRE  is  compiled,  using  the
-       default  C  locale.  Otherwise, tableptr must be an address that is the
-       result of a call to pcre_maketables(). This value is  stored  with  the
-       compiled  pattern,  and used again by pcre_exec(), unless another table
+       If the final argument, tableptr, is NULL, PCRE uses a  default  set  of
+       character  tables  that  are  built  when  PCRE  is compiled, using the
+       default C locale. Otherwise, tableptr must be an address  that  is  the
+       result  of  a  call to pcre_maketables(). This value is stored with the
+       compiled pattern, and used again by pcre_exec(), unless  another  table
        pointer is passed to it. For more discussion, see the section on locale
        support below.
 
-       This  code  fragment  shows a typical straightforward call to pcre_com-
+       This code fragment shows a typical straightforward  call  to  pcre_com-
        pile():
 
          pcre *re;
@@ -954,96 +1178,122 @@
            &erroffset,       /* for error offset */
            NULL);            /* use default character tables */
 
-       The following names for option bits are defined in  the  pcre.h  header
+       The  following  names  for option bits are defined in the pcre.h header
        file:
 
          PCRE_ANCHORED
 
        If this bit is set, the pattern is forced to be "anchored", that is, it
-       is constrained to match only at the first matching point in the  string
-       that  is being searched (the "subject string"). This effect can also be
-       achieved by appropriate constructs in the pattern itself, which is  the
+       is  constrained to match only at the first matching point in the string
+       that is being searched (the "subject string"). This effect can also  be
+       achieved  by appropriate constructs in the pattern itself, which is the
        only way to do it in Perl.
 
          PCRE_AUTO_CALLOUT
 
        If this bit is set, pcre_compile() automatically inserts callout items,
-       all with number 255, before each pattern item. For  discussion  of  the
+       all  with  number  255, before each pattern item. For discussion of the
        callout facility, see the pcrecallout documentation.
 
+         PCRE_BSR_ANYCRLF
+         PCRE_BSR_UNICODE
+
+       These options (which are mutually exclusive) control what the \R escape
+       sequence  matches.  The choice is either to match only CR, LF, or CRLF,
+       or to match any Unicode newline sequence. The default is specified when
+       PCRE is built. It can be overridden from within the pattern, or by set-
+       ting an option when a compiled pattern is matched.
+
          PCRE_CASELESS
 
-       If  this  bit is set, letters in the pattern match both upper and lower
-       case letters. It is equivalent to Perl's  /i  option,  and  it  can  be
-       changed  within a pattern by a (?i) option setting. In UTF-8 mode, PCRE
-       always understands the concept of case for characters whose values  are
-       less  than 128, so caseless matching is always possible. For characters
-       with higher values, the concept of case is supported if  PCRE  is  com-
-       piled  with Unicode property support, but not otherwise. If you want to
-       use caseless matching for characters 128 and  above,  you  must  ensure
-       that  PCRE  is  compiled  with Unicode property support as well as with
+       If this bit is set, letters in the pattern match both upper  and  lower
+       case  letters.  It  is  equivalent  to  Perl's /i option, and it can be
+       changed within a pattern by a (?i) option setting. In UTF-8 mode,  PCRE
+       always  understands the concept of case for characters whose values are
+       less than 128, so caseless matching is always possible. For  characters
+       with  higher  values,  the concept of case is supported if PCRE is com-
+       piled with Unicode property support, but not otherwise. If you want  to
+       use  caseless  matching  for  characters 128 and above, you must ensure
+       that PCRE is compiled with Unicode property support  as  well  as  with
        UTF-8 support.
 
          PCRE_DOLLAR_ENDONLY
 
-       If this bit is set, a dollar metacharacter in the pattern matches  only
-       at  the  end  of the subject string. Without this option, a dollar also
-       matches immediately before a newline at the end of the string (but  not
-       before  any  other newlines). The PCRE_DOLLAR_ENDONLY option is ignored
-       if PCRE_MULTILINE is set.  There is no equivalent  to  this  option  in
+       If  this bit is set, a dollar metacharacter in the pattern matches only
+       at the end of the subject string. Without this option,  a  dollar  also
+       matches  immediately before a newline at the end of the string (but not
+       before any other newlines). The PCRE_DOLLAR_ENDONLY option  is  ignored
+       if  PCRE_MULTILINE  is  set.   There is no equivalent to this option in
        Perl, and no way to set it within a pattern.
 
          PCRE_DOTALL
 
        If this bit is set, a dot metacharater in the pattern matches all char-
-       acters, including those that indicate newline. Without it, a  dot  does
-       not  match  when  the  current position is at a newline. This option is
-       equivalent to Perl's /s option, and it can be changed within a  pattern
-       by  a (?s) option setting. A negative class such as [^a] always matches
-       newlines, independent of the setting of this option.
+       acters,  including  those that indicate newline. Without it, a dot does
+       not match when the current position is at a  newline.  This  option  is
+       equivalent  to Perl's /s option, and it can be changed within a pattern
+       by a (?s) option setting. A negative class such as [^a] always  matches
+       newline characters, independent of the setting of this option.
 
          PCRE_DUPNAMES
 
-       If this bit is set, names used to identify capturing  subpatterns  need
+       If  this  bit is set, names used to identify capturing subpatterns need
        not be unique. This can be helpful for certain types of pattern when it
-       is known that only one instance of the named  subpattern  can  ever  be
-       matched.  There  are  more details of named subpatterns below; see also
+       is  known  that  only  one instance of the named subpattern can ever be
+       matched. There are more details of named subpatterns  below;  see  also
        the pcrepattern documentation.
 
          PCRE_EXTENDED
 
-       If this bit is set, whitespace  data  characters  in  the  pattern  are
+       If  this  bit  is  set,  whitespace  data characters in the pattern are
        totally ignored except when escaped or inside a character class. White-
        space does not include the VT character (code 11). In addition, charac-
        ters between an unescaped # outside a character class and the next new-
-       line, inclusive, are also ignored. This  is  equivalent  to  Perl's  /x
-       option,  and  it  can be changed within a pattern by a (?x) option set-
+       line,  inclusive,  are  also  ignored.  This is equivalent to Perl's /x
+       option, and it can be changed within a pattern by a  (?x)  option  set-
        ting.
 
-       This option makes it possible to include  comments  inside  complicated
-       patterns.   Note,  however,  that this applies only to data characters.
-       Whitespace  characters  may  never  appear  within  special   character
-       sequences  in  a  pattern,  for  example  within the sequence (?( which
+       This  option  makes  it possible to include comments inside complicated
+       patterns.  Note, however, that this applies only  to  data  characters.
+       Whitespace   characters  may  never  appear  within  special  character
+       sequences in a pattern, for  example  within  the  sequence  (?(  which
        introduces a conditional subpattern.
 
          PCRE_EXTRA
 
-       This option was invented in order to turn on  additional  functionality
-       of  PCRE  that  is  incompatible with Perl, but it is currently of very
-       little use. When set, any backslash in a pattern that is followed by  a
-       letter  that  has  no  special  meaning causes an error, thus reserving
-       these combinations for future expansion. By  default,  as  in  Perl,  a
-       backslash  followed by a letter with no special meaning is treated as a
-       literal. (Perl can, however, be persuaded to give a warning for  this.)
-       There  are  at  present no other features controlled by this option. It
+       This  option  was invented in order to turn on additional functionality
+       of PCRE that is incompatible with Perl, but it  is  currently  of  very
+       little  use. When set, any backslash in a pattern that is followed by a
+       letter that has no special meaning  causes  an  error,  thus  reserving
+       these  combinations  for  future  expansion.  By default, as in Perl, a
+       backslash followed by a letter with no special meaning is treated as  a
+       literal.  (Perl can, however, be persuaded to give a warning for this.)
+       There are at present no other features controlled by  this  option.  It
        can also be set by a (?X) option setting within a pattern.
 
          PCRE_FIRSTLINE
 
-       If this option is set, an  unanchored  pattern  is  required  to  match
-       before  or  at  the  first  newline  in  the subject string, though the
+       If  this  option  is  set,  an  unanchored pattern is required to match
+       before or at the first  newline  in  the  subject  string,  though  the
        matched text may continue over the newline.
 
+         PCRE_JAVASCRIPT_COMPAT
+
+       If this option is set, PCRE's behaviour is changed in some ways so that
+       it is compatible with JavaScript rather than Perl. The changes  are  as
+       follows:
+
+       (1)  A  lone  closing square bracket in a pattern causes a compile-time
+       error, because this is illegal in JavaScript (by default it is  treated
+       as a data character). Thus, the pattern AB]CD becomes illegal when this
+       option is set.
+
+       (2) At run time, a back reference to an unset subpattern group  matches
+       an  empty  string (by default this causes the current matching alterna-
+       tive to fail). A pattern such as (\1)(a) succeeds when this  option  is
+       set  (assuming  it can find an "a" in the subject), whereas it fails by
+       default, for Perl compatibility.
+
          PCRE_MULTILINE
 
        By default, PCRE treats the subject string as consisting  of  a  single
@@ -1064,62 +1314,85 @@
          PCRE_NEWLINE_CR
          PCRE_NEWLINE_LF
          PCRE_NEWLINE_CRLF
+         PCRE_NEWLINE_ANYCRLF
+         PCRE_NEWLINE_ANY
 
        These  options  override the default newline definition that was chosen
        when PCRE was built. Setting the first or the second specifies  that  a
        newline  is  indicated  by a single character (CR or LF, respectively).
-       Setting both of them specifies that a newline is indicated by the  two-
-       character  CRLF sequence. For convenience, PCRE_NEWLINE_CRLF is defined
-       to contain both bits. The only time that a line break is relevant  when
-       compiling a pattern is if PCRE_EXTENDED is set, and an unescaped # out-
-       side a character class is encountered. This indicates  a  comment  that
-       lasts until after the next newline.
+       Setting PCRE_NEWLINE_CRLF specifies that a newline is indicated by  the
+       two-character  CRLF  sequence.  Setting  PCRE_NEWLINE_ANYCRLF specifies
+       that any of the three preceding sequences should be recognized. Setting
+       PCRE_NEWLINE_ANY  specifies that any Unicode newline sequence should be
+       recognized. The Unicode newline sequences are the three just mentioned,
+       plus  the  single  characters  VT (vertical tab, U+000B), FF (formfeed,
+       U+000C), NEL (next line, U+0085), LS (line separator, U+2028),  and  PS
+       (paragraph  separator,  U+2029).  The  last  two are recognized only in
+       UTF-8 mode.
+
+       The newline setting in the  options  word  uses  three  bits  that  are
+       treated as a number, giving eight possibilities. Currently only six are
+       used (default plus the five values above). This means that if  you  set
+       more  than one newline option, the combination may or may not be sensi-
+       ble. For example, PCRE_NEWLINE_CR with PCRE_NEWLINE_LF is equivalent to
+       PCRE_NEWLINE_CRLF,  but other combinations may yield unused numbers and
+       cause an error.
+
+       The only time that a line break is specially recognized when  compiling
+       a  pattern  is  if  PCRE_EXTENDED  is set, and an unescaped # outside a
+       character class is encountered. This indicates  a  comment  that  lasts
+       until  after the next line break sequence. In other circumstances, line
+       break  sequences  are  treated  as  literal  data,   except   that   in
+       PCRE_EXTENDED mode, both CR and LF are treated as whitespace characters
+       and are therefore ignored.
 
-       The newline option set at compile time becomes the default that is used
-       for pcre_exec() and pcre_dfa_exec(), but it can be overridden.
+       The newline option that is set at compile time becomes the default that
+       is used for pcre_exec() and pcre_dfa_exec(), but it can be overridden.
 
          PCRE_NO_AUTO_CAPTURE
 
        If this option is set, it disables the use of numbered capturing paren-
-       theses  in the pattern. Any opening parenthesis that is not followed by
-       ? behaves as if it were followed by ?: but named parentheses can  still
-       be  used  for  capturing  (and  they acquire numbers in the usual way).
+       theses in the pattern. Any opening parenthesis that is not followed  by
+       ?  behaves as if it were followed by ?: but named parentheses can still
+       be used for capturing (and they acquire  numbers  in  the  usual  way).
        There is no equivalent of this option in Perl.
 
          PCRE_UNGREEDY
 
-       This option inverts the "greediness" of the quantifiers  so  that  they
-       are  not greedy by default, but become greedy if followed by "?". It is
-       not compatible with Perl. It can also be set by a (?U)  option  setting
+       This  option  inverts  the "greediness" of the quantifiers so that they
+       are not greedy by default, but become greedy if followed by "?". It  is
+       not  compatible  with Perl. It can also be set by a (?U) option setting
        within the pattern.
 
          PCRE_UTF8
 
-       This  option  causes PCRE to regard both the pattern and the subject as
-       strings of UTF-8 characters instead of single-byte  character  strings.
-       However,  it is available only when PCRE is built to include UTF-8 sup-
-       port. If not, the use of this option provokes an error. Details of  how
-       this  option  changes the behaviour of PCRE are given in the section on
+       This option causes PCRE to regard both the pattern and the  subject  as
+       strings  of  UTF-8 characters instead of single-byte character strings.
+       However, it is available only when PCRE is built to include UTF-8  sup-
+       port.  If not, the use of this option provokes an error. Details of how
+       this option changes the behaviour of PCRE are given in the  section  on
        UTF-8 support in the main pcre page.
 
          PCRE_NO_UTF8_CHECK
 
        When PCRE_UTF8 is set, the validity of the pattern as a UTF-8 string is
-       automatically  checked. If an invalid UTF-8 sequence of bytes is found,
-       pcre_compile() returns an error. If you already know that your  pattern
-       is  valid, and you want to skip this check for performance reasons, you
-       can set the PCRE_NO_UTF8_CHECK option. When it is set,  the  effect  of
-       passing an invalid UTF-8 string as a pattern is undefined. It may cause
-       your program to crash.  Note that this option can  also  be  passed  to
-       pcre_exec()  and pcre_dfa_exec(), to suppress the UTF-8 validity check-
-       ing of subject strings.
+       automatically checked. There is a  discussion  about  the  validity  of
+       UTF-8  strings  in  the main pcre page. If an invalid UTF-8 sequence of
+       bytes is found, pcre_compile() returns an error. If  you  already  know
+       that your pattern is valid, and you want to skip this check for perfor-
+       mance reasons, you can set the PCRE_NO_UTF8_CHECK option.  When  it  is
+       set,  the  effect  of  passing  an invalid UTF-8 string as a pattern is
+       undefined. It may cause your program to crash. Note  that  this  option
+       can  also be passed to pcre_exec() and pcre_dfa_exec(), to suppress the
+       UTF-8 validity checking of subject strings.
 
 
 COMPILATION ERROR CODES
 
        The following table lists the error  codes  than  may  be  returned  by
        pcre_compile2(),  along with the error messages that may be returned by
-       both compiling functions.
+       both compiling functions. As PCRE has developed, some error codes  have
+       fallen out of use. To avoid confusion, they have not been re-used.
 
           0  no error
           1  \ at end of pattern
@@ -1131,17 +1404,17 @@
           7  invalid escape sequence in character class
           8  range out of order in character class
           9  nothing to repeat
-         10  operand of unlimited repeat could match the empty string
+         10  [this code is not in use]
          11  internal error: unexpected repeat
-         12  unrecognized character after (?
+         12  unrecognized character after (? or (?-
          13  POSIX named classes are supported only within a class
          14  missing )
          15  reference to non-existent subpattern
          16  erroffset passed as NULL
          17  unknown option bit(s) set
          18  missing ) after comment
-         19  parentheses nested too deeply
-         20  regular expression too large
+         19  [this code is not in use]
+         20  regular expression is too large
          21  failed to get memory
          22  unmatched parentheses
          23  internal error: code overflow
@@ -1150,11 +1423,11 @@
          26  malformed number or name after (?(
          27  conditional group contains more than two branches
          28  assertion expected after (?(
-         29  (?R or (?digits must be followed by )
+         29  (?R or (?[+-]digits must be followed by )
          30  unknown POSIX class name
          31  POSIX collating elements are not supported
          32  this version of PCRE is not compiled with PCRE_UTF8 support
-         33  spare error
+         33  [this code is not in use]
          34  character value in \x{...} sequence is too large
          35  invalid condition (?(0)
          36  \C not allowed in lookbehind assertion
@@ -1163,16 +1436,34 @@
          39  closing ) for (?C expected
          40  recursive call could loop indefinitely
          41  unrecognized character after (?P
-         42  syntax error after (?P
+         42  syntax error in subpattern name (missing terminator)
          43  two named subpatterns have the same name
          44  invalid UTF-8 string
          45  support for \P, \p, and \X has not been compiled
          46  malformed \P or \p sequence
          47  unknown property name after \P or \p
          48  subpattern name is too long (maximum 32 characters)
-         49  too many named subpatterns (maximum 10,000)
-         50  repeated subpattern is too long
+         49  too many named subpatterns (maximum 10000)
+         50  [this code is not in use]
          51  octal value is greater than \377 (not in UTF-8 mode)
+         52  internal error: overran compiling workspace
+         53   internal  error:  previously-checked  referenced  subpattern not
+       found
+         54  DEFINE group contains more than one branch
+         55  repeating a DEFINE group is not allowed
+         56  inconsistent NEWLINE options
+         57  \g is not followed by a braced, angle-bracketed, or quoted
+               name/number or by a plain number
+         58  a numbered reference must not be zero
+         59  (*VERB) with an argument is not supported
+         60  (*VERB) not recognized
+         61  number is too big
+         62  subpattern name expected
+         63  digit expected after (?+
+         64  ] is an invalid data character in JavaScript compatibility mode
+
+       The numbers 32 and 10000 in errors 48 and 49  are  defaults;  different
+       values may be used if the limits were changed when PCRE was built.
 
 
 STUDYING A PATTERN
@@ -1180,32 +1471,32 @@
        pcre_extra *pcre_study(const pcre *code, int options
             const char **errptr);
 
-       If a compiled pattern is going to be used several times,  it  is  worth
+       If  a  compiled  pattern is going to be used several times, it is worth
        spending more time analyzing it in order to speed up the time taken for
-       matching. The function pcre_study() takes a pointer to a compiled  pat-
+       matching.  The function pcre_study() takes a pointer to a compiled pat-
        tern as its first argument. If studying the pattern produces additional
-       information that will help speed up matching,  pcre_study()  returns  a
-       pointer  to a pcre_extra block, in which the study_data field points to
+       information  that  will  help speed up matching, pcre_study() returns a
+       pointer to a pcre_extra block, in which the study_data field points  to
        the results of the study.
 
        The  returned  value  from  pcre_study()  can  be  passed  directly  to
-       pcre_exec().  However,  a  pcre_extra  block also contains other fields
-       that can be set by the caller before the block  is  passed;  these  are
+       pcre_exec(). However, a pcre_extra block  also  contains  other  fields
+       that  can  be  set  by the caller before the block is passed; these are
        described below in the section on matching a pattern.
 
-       If  studying  the  pattern  does not produce any additional information
+       If studying the pattern does not  produce  any  additional  information
        pcre_study() returns NULL. In that circumstance, if the calling program
-       wants  to  pass  any of the other fields to pcre_exec(), it must set up
+       wants to pass any of the other fields to pcre_exec(), it  must  set  up
        its own pcre_extra block.
 
-       The second argument of pcre_study() contains option bits.  At  present,
+       The  second  argument of pcre_study() contains option bits. At present,
        no options are defined, and this argument should always be zero.
 
-       The  third argument for pcre_study() is a pointer for an error message.
-       If studying succeeds (even if no data is  returned),  the  variable  it
-       points  to  is  set  to NULL. Otherwise it is set to point to a textual
+       The third argument for pcre_study() is a pointer for an error  message.
+       If  studying  succeeds  (even  if no data is returned), the variable it
+       points to is set to NULL. Otherwise it is set to  point  to  a  textual
        error message. This is a static string that is part of the library. You
-       must  not  try  to  free it. You should test the error pointer for NULL
+       must not try to free it. You should test the  error  pointer  for  NULL
        after calling pcre_study(), to be sure that it has run successfully.
 
        This is a typical call to pcre_study():
@@ -1217,26 +1508,33 @@
            &error);        /* set to NULL or points to a message */
 
        At present, studying a pattern is useful only for non-anchored patterns
-       that  do not have a single fixed starting character. A bitmap of possi-
+       that do not have a single fixed starting character. A bitmap of  possi-
        ble starting bytes is created.
 
 
 LOCALE SUPPORT
 
-       PCRE handles caseless matching, and determines whether  characters  are
-       letters  digits,  or whatever, by reference to a set of tables, indexed
-       by character value. When running in UTF-8 mode, this  applies  only  to
-       characters  with  codes  less than 128. Higher-valued codes never match
-       escapes such as \w or \d, but can be tested with \p if  PCRE  is  built
-       with  Unicode  character property support. The use of locales with Uni-
-       code is discouraged.
-
-       An internal set of tables is created in the default C locale when  PCRE
-       is  built.  This  is  used when the final argument of pcre_compile() is
-       NULL, and is sufficient for many applications. An  alternative  set  of
-       tables  can,  however, be supplied. These may be created in a different
-       locale from the default. As more and more applications change to  using
-       Unicode, the need for this locale support is expected to die away.
+       PCRE  handles  caseless matching, and determines whether characters are
+       letters, digits, or whatever, by reference to a set of tables,  indexed
+       by  character  value.  When running in UTF-8 mode, this applies only to
+       characters with codes less than 128. Higher-valued  codes  never  match
+       escapes  such  as  \w or \d, but can be tested with \p if PCRE is built
+       with Unicode character property support. The use of locales  with  Uni-
+       code  is discouraged. If you are handling characters with codes greater
+       than 128, you should either use UTF-8 and Unicode, or use locales,  but
+       not try to mix the two.
+
+       PCRE  contains  an  internal set of tables that are used when the final
+       argument of pcre_compile() is  NULL.  These  are  sufficient  for  many
+       applications.  Normally, the internal tables recognize only ASCII char-
+       acters. However, when PCRE is built, it is possible to cause the inter-
+       nal tables to be rebuilt in the default "C" locale of the local system,
+       which may cause them to be different.
+
+       The internal tables can always be overridden by tables supplied by  the
+       application that calls PCRE. These may be created in a different locale
+       from the default. As more and more applications change  to  using  Uni-
+       code, the need for this locale support is expected to die away.
 
        External  tables  are  built by calling the pcre_maketables() function,
        which has no arguments, in the relevant locale. The result can then  be
@@ -1249,20 +1547,23 @@
          tables = pcre_maketables();
          re = pcre_compile(..., tables);
 
-       When pcre_maketables() runs, the tables are built  in  memory  that  is
-       obtained  via  pcre_malloc. It is the caller's responsibility to ensure
-       that the memory containing the tables remains available for as long  as
+       The locale name "fr_FR" is used on Linux and other  Unix-like  systems;
+       if you are using Windows, the name for the French locale is "french".
+
+       When  pcre_maketables()  runs,  the  tables are built in memory that is
+       obtained via pcre_malloc. It is the caller's responsibility  to  ensure
+       that  the memory containing the tables remains available for as long as
        it is needed.
 
        The pointer that is passed to pcre_compile() is saved with the compiled
-       pattern, and the same tables are used via this pointer by  pcre_study()
+       pattern,  and the same tables are used via this pointer by pcre_study()
        and normally also by pcre_exec(). Thus, by default, for any single pat-
        tern, compilation, studying and matching all happen in the same locale,
        but different patterns can be compiled in different locales.
 
-       It  is  possible to pass a table pointer or NULL (indicating the use of
-       the internal tables) to pcre_exec(). Although  not  intended  for  this
-       purpose,  this facility could be used to match a pattern in a different
+       It is possible to pass a table pointer or NULL (indicating the  use  of
+       the  internal  tables)  to  pcre_exec(). Although not intended for this
+       purpose, this facility could be used to match a pattern in a  different
        locale from the one in which it was compiled. Passing table pointers at
        run time is discussed below in the section on matching a pattern.
 
@@ -1272,15 +1573,15 @@
        int pcre_fullinfo(const pcre *code, const pcre_extra *extra,
             int what, void *where);
 
-       The  pcre_fullinfo() function returns information about a compiled pat-
+       The pcre_fullinfo() function returns information about a compiled  pat-
        tern. It replaces the obsolete pcre_info() function, which is neverthe-
        less retained for backwards compability (and is documented below).
 
-       The  first  argument  for  pcre_fullinfo() is a pointer to the compiled
-       pattern. The second argument is the result of pcre_study(), or NULL  if
-       the  pattern  was not studied. The third argument specifies which piece
-       of information is required, and the fourth argument is a pointer  to  a
-       variable  to  receive  the  data. The yield of the function is zero for
+       The first argument for pcre_fullinfo() is a  pointer  to  the  compiled
+       pattern.  The second argument is the result of pcre_study(), or NULL if
+       the pattern was not studied. The third argument specifies  which  piece
+       of  information  is required, and the fourth argument is a pointer to a
+       variable to receive the data. The yield of the  function  is  zero  for
        success, or one of the following negative numbers:
 
          PCRE_ERROR_NULL       the argument code was NULL
@@ -1288,9 +1589,9 @@
          PCRE_ERROR_BADMAGIC   the "magic number" was not found
          PCRE_ERROR_BADOPTION  the value of what was invalid
 
-       The "magic number" is placed at the start of each compiled  pattern  as
-       an  simple check against passing an arbitrary memory pointer. Here is a
-       typical call of pcre_fullinfo(), to obtain the length of  the  compiled
+       The  "magic  number" is placed at the start of each compiled pattern as
+       an simple check against passing an arbitrary memory pointer. Here is  a
+       typical  call  of pcre_fullinfo(), to obtain the length of the compiled
        pattern:
 
          int rc;
@@ -1301,56 +1602,69 @@
            PCRE_INFO_SIZE,   /* what is required */
            &length);         /* where to put the data */
 
-       The  possible  values for the third argument are defined in pcre.h, and
+       The possible values for the third argument are defined in  pcre.h,  and
        are as follows:
 
          PCRE_INFO_BACKREFMAX
 
-       Return the number of the highest back reference  in  the  pattern.  The
-       fourth  argument  should  point to an int variable. Zero is returned if
+       Return  the  number  of  the highest back reference in the pattern. The
+       fourth argument should point to an int variable. Zero  is  returned  if
        there are no back references.
 
          PCRE_INFO_CAPTURECOUNT
 
-       Return the number of capturing subpatterns in the pattern.  The  fourth
+       Return  the  number of capturing subpatterns in the pattern. The fourth
        argument should point to an int variable.
 
          PCRE_INFO_DEFAULT_TABLES
 
-       Return  a pointer to the internal default character tables within PCRE.
-       The fourth argument should point to an unsigned char *  variable.  This
+       Return a pointer to the internal default character tables within  PCRE.
+       The  fourth  argument should point to an unsigned char * variable. This
        information call is provided for internal use by the pcre_study() func-
-       tion. External callers can cause PCRE to use  its  internal  tables  by
+       tion.  External  callers  can  cause PCRE to use its internal tables by
        passing a NULL table pointer.
 
          PCRE_INFO_FIRSTBYTE
 
-       Return  information  about  the first byte of any matched string, for a
-       non-anchored pattern. The fourth argument should point to an int  vari-
-       able.  (This option used to be called PCRE_INFO_FIRSTCHAR; the old name
+       Return information about the first byte of any matched  string,  for  a
+       non-anchored  pattern. The fourth argument should point to an int vari-
+       able. (This option used to be called PCRE_INFO_FIRSTCHAR; the old  name
        is still recognized for backwards compatibility.)
 
-       If there is a fixed first byte, for example, from  a  pattern  such  as
-       (cat|cow|coyote). Otherwise, if either
+       If  there  is  a  fixed first byte, for example, from a pattern such as
+       (cat|cow|coyote), its value is returned. Otherwise, if either
 
-       (a)  the pattern was compiled with the PCRE_MULTILINE option, and every
+       (a) the pattern was compiled with the PCRE_MULTILINE option, and  every
        branch starts with "^", or
 
        (b) every branch of the pattern starts with ".*" and PCRE_DOTALL is not
        set (if it were set, the pattern would be anchored),
 
-       -1  is  returned, indicating that the pattern matches only at the start
-       of a subject string or after any newline within the  string.  Otherwise
+       -1 is returned, indicating that the pattern matches only at  the  start
+       of  a  subject string or after any newline within the string. Otherwise
        -2 is returned. For anchored patterns, -2 is returned.
 
          PCRE_INFO_FIRSTTABLE
 
-       If  the pattern was studied, and this resulted in the construction of a
+       If the pattern was studied, and this resulted in the construction of  a
        256-bit table indicating a fixed set of bytes for the first byte in any
-       matching  string, a pointer to the table is returned. Otherwise NULL is
-       returned. The fourth argument should point to an unsigned char *  vari-
+       matching string, a pointer to the table is returned. Otherwise NULL  is
+       returned.  The fourth argument should point to an unsigned char * vari-
        able.
 
+         PCRE_INFO_HASCRORLF
+
+       Return 1 if the pattern contains any explicit  matches  for  CR  or  LF
+       characters,  otherwise  0.  The  fourth argument should point to an int
+       variable. An explicit match is either a literal CR or LF character,  or
+       \r or \n.
+
+         PCRE_INFO_JCHANGED
+
+       Return  1  if  the (?J) or (?-J) option setting is used in the pattern,
+       otherwise 0. The fourth argument should point to an int variable.  (?J)
+       and (?-J) set and unset the local PCRE_DUPNAMES option, respectively.
+
          PCRE_INFO_LASTLITERAL
 
        Return  the  value of the rightmost literal byte that must exist in any
@@ -1388,8 +1702,8 @@
        PCRE_EXTENDED  is  set,  so  white  space  -  including  newlines  - is
        ignored):
 
-         (?P (?P(\d\d)?\d\d) -
-         (?P\d\d) - (?P\d\d) )
+         (? (?(\d\d)?\d\d) -
+         (?\d\d) - (?\d\d) )
 
        There are four named subpatterns, so the table has  four  entries,  and
        each  entry  in the table is eight bytes long. The table is as follows,
@@ -1405,14 +1719,25 @@
        name-to-number map, remember that the length of the entries  is  likely
        to be different for each compiled pattern.
 
+         PCRE_INFO_OKPARTIAL
+
+       Return  1 if the pattern can be used for partial matching, otherwise 0.
+       The fourth argument should point to an int  variable.  The  pcrepartial
+       documentation  lists  the restrictions that apply to patterns when par-
+       tial matching is used.
+
          PCRE_INFO_OPTIONS
 
-       Return  a  copy of the options with which the pattern was compiled. The
-       fourth argument should point to an unsigned long  int  variable.  These
+       Return a copy of the options with which the pattern was  compiled.  The
+       fourth  argument  should  point to an unsigned long int variable. These
        option bits are those specified in the call to pcre_compile(), modified
-       by any top-level option settings within the pattern itself.
+       by any top-level option settings at the start of the pattern itself. In
+       other words, they are the options that will be in force  when  matching
+       starts.  For  example, if the pattern /(?im)abc(?-i)d/ is compiled with
+       the PCRE_EXTENDED option, the result is PCRE_CASELESS,  PCRE_MULTILINE,
+       and PCRE_EXTENDED.
 
-       A pattern is automatically anchored by PCRE if  all  of  its  top-level
+       A  pattern  is  automatically  anchored by PCRE if all of its top-level
        alternatives begin with one of the following:
 
          ^     unless PCRE_MULTILINE is set
@@ -1426,7 +1751,7 @@
 
          PCRE_INFO_SIZE
 
-       Return the size of the compiled pattern, that is, the  value  that  was
+       Return  the  size  of the compiled pattern, that is, the value that was
        passed as the argument to pcre_malloc() when PCRE was getting memory in
        which to place the compiled data. The fourth argument should point to a
        size_t variable.
@@ -1434,9 +1759,9 @@
          PCRE_INFO_STUDYSIZE
 
        Return the size of the data block pointed to by the study_data field in
-       a pcre_extra block. That is,  it  is  the  value  that  was  passed  to
+       a  pcre_extra  block.  That  is,  it  is  the  value that was passed to
        pcre_malloc() when PCRE was getting memory into which to place the data
-       created by pcre_study(). The fourth argument should point to  a  size_t
+       created  by  pcre_study(). The fourth argument should point to a size_t
        variable.
 
 
@@ -1444,21 +1769,21 @@
 
        int pcre_info(const pcre *code, int *optptr, int *firstcharptr);
 
-       The  pcre_info()  function is now obsolete because its interface is too
-       restrictive to return all the available data about a compiled  pattern.
-       New   programs   should  use  pcre_fullinfo()  instead.  The  yield  of
-       pcre_info() is the number of capturing subpatterns, or one of the  fol-
+       The pcre_info() function is now obsolete because its interface  is  too
+       restrictive  to return all the available data about a compiled pattern.
+       New  programs  should  use  pcre_fullinfo()  instead.  The   yield   of
+       pcre_info()  is the number of capturing subpatterns, or one of the fol-
        lowing negative numbers:
 
          PCRE_ERROR_NULL       the argument code was NULL
          PCRE_ERROR_BADMAGIC   the "magic number" was not found
 
-       If  the  optptr  argument is not NULL, a copy of the options with which
-       the pattern was compiled is placed in the integer  it  points  to  (see
+       If the optptr argument is not NULL, a copy of the  options  with  which
+       the  pattern  was  compiled  is placed in the integer it points to (see
        PCRE_INFO_OPTIONS above).
 
-       If  the  pattern  is  not anchored and the firstcharptr argument is not
-       NULL, it is used to pass back information about the first character  of
+       If the pattern is not anchored and the  firstcharptr  argument  is  not
+       NULL,  it is used to pass back information about the first character of
        any matched string (see PCRE_INFO_FIRSTBYTE above).
 
 
@@ -1466,21 +1791,21 @@
 
        int pcre_refcount(pcre *code, int adjust);
 
-       The  pcre_refcount()  function is used to maintain a reference count in
+       The pcre_refcount() function is used to maintain a reference  count  in
        the data block that contains a compiled pattern. It is provided for the
-       benefit  of  applications  that  operate  in an object-oriented manner,
+       benefit of applications that  operate  in  an  object-oriented  manner,
        where different parts of the application may be using the same compiled
        pattern, but you want to free the block when they are all done.
 
        When a pattern is compiled, the reference count field is initialized to
-       zero.  It is changed only by calling this function, whose action is  to
-       add  the  adjust  value  (which may be positive or negative) to it. The
+       zero.   It is changed only by calling this function, whose action is to
+       add the adjust value (which may be positive or  negative)  to  it.  The
        yield of the function is the new value. However, the value of the count
-       is  constrained to lie between 0 and 65535, inclusive. If the new value
+       is constrained to lie between 0 and 65535, inclusive. If the new  value
        is outside these limits, it is forced to the appropriate limit value.
 
-       Except when it is zero, the reference count is not correctly  preserved
-       if  a  pattern  is  compiled on one host and then transferred to a host
+       Except  when it is zero, the reference count is not correctly preserved
+       if a pattern is compiled on one host and then  transferred  to  a  host
        whose byte-order is different. (This seems a highly unlikely scenario.)
 
 
@@ -1574,53 +1899,89 @@
        the  total number of calls, because not all calls to match() are recur-
        sive.  This limit is of use only if it is set smaller than match_limit.
 
-       Limiting  the  recursion  depth  limits the amount of stack that can be
+       Limiting the recursion depth limits the amount of  stack  that  can  be
        used, or, when PCRE has been compiled to use memory on the heap instead
        of the stack, the amount of heap memory that can be used.
 
-       The  default  value  for  match_limit_recursion can be set when PCRE is
-       built; the default default  is  the  same  value  as  the  default  for
-       match_limit.  You can override the default by suppling pcre_exec() with
-       a  pcre_extra  block  in  which  match_limit_recursion  is   set,   and
-       PCRE_EXTRA_MATCH_LIMIT_RECURSION  is  set  in  the  flags field. If the
+       The default value for match_limit_recursion can be  set  when  PCRE  is
+       built;  the  default  default  is  the  same  value  as the default for
+       match_limit. You can override the default by suppling pcre_exec()  with
+       a   pcre_extra   block  in  which  match_limit_recursion  is  set,  and
+       PCRE_EXTRA_MATCH_LIMIT_RECURSION is set in  the  flags  field.  If  the
        limit is exceeded, pcre_exec() returns PCRE_ERROR_RECURSIONLIMIT.
 
-       The pcre_callout field is used in conjunction with the  "callout"  fea-
+       The  pcre_callout  field is used in conjunction with the "callout" fea-
        ture, which is described in the pcrecallout documentation.
 
-       The  tables  field  is  used  to  pass  a  character  tables pointer to
-       pcre_exec(); this overrides the value that is stored with the  compiled
-       pattern.  A  non-NULL value is stored with the compiled pattern only if
-       custom tables were supplied to pcre_compile() via  its  tableptr  argu-
+       The tables field  is  used  to  pass  a  character  tables  pointer  to
+       pcre_exec();  this overrides the value that is stored with the compiled
+       pattern. A non-NULL value is stored with the compiled pattern  only  if
+       custom  tables  were  supplied to pcre_compile() via its tableptr argu-
        ment.  If NULL is passed to pcre_exec() using this mechanism, it forces
-       PCRE's internal tables to be used. This facility is  helpful  when  re-
-       using  patterns  that  have been saved after compiling with an external
-       set of tables, because the external tables  might  be  at  a  different
-       address  when  pcre_exec() is called. See the pcreprecompile documenta-
+       PCRE's  internal  tables  to be used. This facility is helpful when re-
+       using patterns that have been saved after compiling  with  an  external
+       set  of  tables,  because  the  external tables might be at a different
+       address when pcre_exec() is called. See the  pcreprecompile  documenta-
        tion for a discussion of saving compiled patterns for later use.
 
    Option bits for pcre_exec()
 
-       The unused bits of the options argument for pcre_exec() must  be  zero.
-       The  only  bits  that  may  be set are PCRE_ANCHORED, PCRE_NEWLINE_xxx,
-       PCRE_NOTBOL,   PCRE_NOTEOL,   PCRE_NOTEMPTY,   PCRE_NO_UTF8_CHECK   and
-       PCRE_PARTIAL.
+       The  unused  bits of the options argument for pcre_exec() must be zero.
+       The only bits that may  be  set  are  PCRE_ANCHORED,  PCRE_NEWLINE_xxx,
+       PCRE_NOTBOL,    PCRE_NOTEOL,   PCRE_NOTEMPTY,   PCRE_NO_START_OPTIMIZE,
+       PCRE_NO_UTF8_CHECK and PCRE_PARTIAL.
 
          PCRE_ANCHORED
 
-       The  PCRE_ANCHORED  option  limits pcre_exec() to matching at the first
-       matching position. If a pattern was  compiled  with  PCRE_ANCHORED,  or
-       turned  out to be anchored by virtue of its contents, it cannot be made
+       The PCRE_ANCHORED option limits pcre_exec() to matching  at  the  first
+       matching  position.  If  a  pattern was compiled with PCRE_ANCHORED, or
+       turned out to be anchored by virtue of its contents, it cannot be  made
        unachored at matching time.
 
+         PCRE_BSR_ANYCRLF
+         PCRE_BSR_UNICODE
+
+       These options (which are mutually exclusive) control what the \R escape
+       sequence matches. The choice is either to match only CR, LF,  or  CRLF,
+       or  to  match  any Unicode newline sequence. These options override the
+       choice that was made or defaulted when the pattern was compiled.
+
          PCRE_NEWLINE_CR
          PCRE_NEWLINE_LF
          PCRE_NEWLINE_CRLF
+         PCRE_NEWLINE_ANYCRLF
+         PCRE_NEWLINE_ANY
 
        These options override  the  newline  definition  that  was  chosen  or
        defaulted  when the pattern was compiled. For details, see the descrip-
-       tion pcre_compile() above. During matching, the newline choice  affects
-       the behaviour of the dot, circumflex, and dollar metacharacters.
+       tion of pcre_compile()  above.  During  matching,  the  newline  choice
+       affects  the  behaviour  of the dot, circumflex, and dollar metacharac-
+       ters. It may also alter the way the match position is advanced after  a
+       match failure for an unanchored pattern.
+
+       When  PCRE_NEWLINE_CRLF,  PCRE_NEWLINE_ANYCRLF,  or PCRE_NEWLINE_ANY is
+       set, and a match attempt for an unanchored pattern fails when the  cur-
+       rent  position  is  at  a  CRLF  sequence,  and the pattern contains no
+       explicit matches for  CR  or  LF  characters,  the  match  position  is
+       advanced by two characters instead of one, in other words, to after the
+       CRLF.
+
+       The above rule is a compromise that makes the most common cases work as
+       expected.  For  example,  if  the  pattern  is .+A (and the PCRE_DOTALL
+       option is not set), it does not match the string "\r\nA" because, after
+       failing  at the start, it skips both the CR and the LF before retrying.
+       However, the pattern [\r\n]A does match that string,  because  it  con-
+       tains an explicit CR or LF reference, and so advances only by one char-
+       acter after the first failure.
+
+       An explicit match for CR of LF is either a literal appearance of one of
+       those  characters,  or  one  of the \r or \n escape sequences. Implicit
+       matches such as [^X] do not count, nor does \s (which includes  CR  and
+       LF in the characters that it matches).
+
+       Notwithstanding  the above, anomalous effects may still occur when CRLF
+       is a valid newline sequence and explicit \r or \n escapes appear in the
+       pattern.
 
          PCRE_NOTBOL
 
@@ -1662,15 +2023,27 @@
        an ordinary match again. There is some code that demonstrates how to do
        this in the pcredemo.c sample program.
 
+         PCRE_NO_START_OPTIMIZE
+
+       There  are a number of optimizations that pcre_exec() uses at the start
+       of a match, in order to speed up the process. For  example,  if  it  is
+       known  that  a  match must start with a specific character, it searches
+       the subject for that character, and fails immediately if it cannot find
+       it,  without actually running the main matching function. When callouts
+       are in use, these optimizations can cause  them  to  be  skipped.  This
+       option  disables  the  "start-up" optimizations, causing performance to
+       suffer, but ensuring that the callouts do occur.
+
          PCRE_NO_UTF8_CHECK
 
        When PCRE_UTF8 is set at compile time, the validity of the subject as a
-       UTF-8 string is automatically checked when pcre_exec() is  subsequently
-       called.   The  value  of  startoffset is also checked to ensure that it
-       points to the start of a UTF-8 character. If an invalid UTF-8  sequence
-       of bytes is found, pcre_exec() returns the error PCRE_ERROR_BADUTF8. If
-       startoffset contains an  invalid  value,  PCRE_ERROR_BADUTF8_OFFSET  is
-       returned.
+       UTF-8  string is automatically checked when pcre_exec() is subsequently
+       called.  The value of startoffset is also checked  to  ensure  that  it
+       points  to  the start of a UTF-8 character. There is a discussion about
+       the validity of UTF-8 strings in the section on UTF-8  support  in  the
+       main  pcre  page.  If  an  invalid  UTF-8  sequence  of bytes is found,
+       pcre_exec() returns the error PCRE_ERROR_BADUTF8. If  startoffset  con-
+       tains an invalid value, PCRE_ERROR_BADUTF8_OFFSET is returned.
 
        If  you  already  know that your subject is valid, and you want to skip
        these   checks   for   performance   reasons,   you   can    set    the
@@ -1697,83 +2070,87 @@
    The string to be matched by pcre_exec()
 
        The  subject string is passed to pcre_exec() as a pointer in subject, a
-       length in length, and a starting byte offset in startoffset.  In  UTF-8
-       mode,  the  byte  offset  must point to the start of a UTF-8 character.
-       Unlike the pattern string, the subject may contain binary  zero  bytes.
-       When  the starting offset is zero, the search for a match starts at the
-       beginning of the subject, and this is by far the most common case.
-
-       A non-zero starting offset is useful when searching for  another  match
-       in  the same subject by calling pcre_exec() again after a previous suc-
-       cess.  Setting startoffset differs from just passing over  a  shortened
-       string  and  setting  PCRE_NOTBOL  in the case of a pattern that begins
+       length (in bytes) in length, and a starting byte offset in startoffset.
+       In UTF-8 mode, the byte offset must point to the start of a UTF-8 char-
+       acter. Unlike the pattern string, the subject may contain  binary  zero
+       bytes.  When the starting offset is zero, the search for a match starts
+       at the beginning of the subject, and this is by  far  the  most  common
+       case.
+
+       A  non-zero  starting offset is useful when searching for another match
+       in the same subject by calling pcre_exec() again after a previous  suc-
+       cess.   Setting  startoffset differs from just passing over a shortened
+       string and setting PCRE_NOTBOL in the case of  a  pattern  that  begins
        with any kind of lookbehind. For example, consider the pattern
 
          \Biss\B
 
-       which finds occurrences of "iss" in the middle of  words.  (\B  matches
-       only  if  the  current position in the subject is not a word boundary.)
-       When applied to the string "Mississipi" the first call  to  pcre_exec()
-       finds  the  first  occurrence. If pcre_exec() is called again with just
-       the remainder of the subject,  namely  "issipi",  it  does  not  match,
+       which  finds  occurrences  of "iss" in the middle of words. (\B matches
+       only if the current position in the subject is not  a  word  boundary.)
+       When  applied  to the string "Mississipi" the first call to pcre_exec()
+       finds the first occurrence. If pcre_exec() is called  again  with  just
+       the  remainder  of  the  subject,  namely  "issipi", it does not match,
        because \B is always false at the start of the subject, which is deemed
-       to be a word boundary. However, if pcre_exec()  is  passed  the  entire
+       to  be  a  word  boundary. However, if pcre_exec() is passed the entire
        string again, but with startoffset set to 4, it finds the second occur-
-       rence of "iss" because it is able to look behind the starting point  to
+       rence  of "iss" because it is able to look behind the starting point to
        discover that it is preceded by a letter.
 
-       If  a  non-zero starting offset is passed when the pattern is anchored,
+       If a non-zero starting offset is passed when the pattern  is  anchored,
        one attempt to match at the given offset is made. This can only succeed
-       if  the  pattern  does  not require the match to be at the start of the
+       if the pattern does not require the match to be at  the  start  of  the
        subject.
 
    How pcre_exec() returns captured substrings
 
-       In general, a pattern matches a certain portion of the subject, and  in
-       addition,  further  substrings  from  the  subject may be picked out by
-       parts of the pattern. Following the usage  in  Jeffrey  Friedl's  book,
-       this  is  called "capturing" in what follows, and the phrase "capturing
-       subpattern" is used for a fragment of a pattern that picks out  a  sub-
-       string.  PCRE  supports several other kinds of parenthesized subpattern
+       In  general, a pattern matches a certain portion of the subject, and in
+       addition, further substrings from the subject  may  be  picked  out  by
+       parts  of  the  pattern.  Following the usage in Jeffrey Friedl's book,
+       this is called "capturing" in what follows, and the  phrase  "capturing
+       subpattern"  is  used for a fragment of a pattern that picks out a sub-
+       string. PCRE supports several other kinds of  parenthesized  subpattern
        that do not cause substrings to be captured.
 
-       Captured substrings are returned to the caller via a vector of  integer
-       offsets  whose  address is passed in ovector. The number of elements in
-       the vector is passed in ovecsize, which must be a non-negative  number.
-       Note: this argument is NOT the size of ovector in bytes.
-
-       The  first  two-thirds of the vector is used to pass back captured sub-
-       strings, each substring using a pair of integers. The  remaining  third
-       of  the  vector is used as workspace by pcre_exec() while matching cap-
-       turing subpatterns, and is not available for passing back  information.
-       The  length passed in ovecsize should always be a multiple of three. If
+       Captured substrings are returned to the caller via a vector of integers
+       whose address is passed in ovector. The number of elements in the  vec-
+       tor  is  passed in ovecsize, which must be a non-negative number. Note:
+       this argument is NOT the size of ovector in bytes.
+
+       The first two-thirds of the vector is used to pass back  captured  sub-
+       strings,  each  substring using a pair of integers. The remaining third
+       of the vector is used as workspace by pcre_exec() while  matching  cap-
+       turing  subpatterns, and is not available for passing back information.
+       The number passed in ovecsize should always be a multiple of three.  If
        it is not, it is rounded down.
 
-       When a match is successful, information about  captured  substrings  is
-       returned  in  pairs  of integers, starting at the beginning of ovector,
-       and continuing up to two-thirds of its length at the  most.  The  first
-       element of a pair is set to the offset of the first character in a sub-
-       string, and the second is set to the  offset  of  the  first  character
-       after  the  end  of  a  substring. The first pair, ovector[0] and ovec-
-       tor[1], identify the portion of  the  subject  string  matched  by  the
-       entire  pattern.  The next pair is used for the first capturing subpat-
-       tern, and so on. The value returned by pcre_exec() is one more than the
-       highest numbered pair that has been set. For example, if two substrings
-       have been captured, the returned value is 3. If there are no  capturing
-       subpatterns,  the return value from a successful match is 1, indicating
-       that just the first pair of offsets has been set.
+       When  a  match  is successful, information about captured substrings is
+       returned in pairs of integers, starting at the  beginning  of  ovector,
+       and  continuing  up  to two-thirds of its length at the most. The first
+       element of each pair is set to the byte offset of the  first  character
+       in  a  substring, and the second is set to the byte offset of the first
+       character after the end of a substring. Note: these values  are  always
+       byte offsets, even in UTF-8 mode. They are not character counts.
+
+       The  first  pair  of  integers, ovector[0] and ovector[1], identify the
+       portion of the subject string matched by the entire pattern.  The  next
+       pair  is  used for the first capturing subpattern, and so on. The value
+       returned by pcre_exec() is one more than the highest numbered pair that
+       has  been  set.  For example, if two substrings have been captured, the
+       returned value is 3. If there are no capturing subpatterns, the  return
+       value from a successful match is 1, indicating that just the first pair
+       of offsets has been set.
 
        If a capturing subpattern is matched repeatedly, it is the last portion
        of the string that it matched that is returned.
 
        If  the vector is too small to hold all the captured substring offsets,
        it is used as far as possible (up to two-thirds of its length), and the
-       function  returns a value of zero. In particular, if the substring off-
-       sets are not of interest, pcre_exec() may be called with ovector passed
-       as  NULL  and  ovecsize  as zero. However, if the pattern contains back
-       references and the ovector is not big enough to  remember  the  related
-       substrings,  PCRE has to get additional memory for use during matching.
-       Thus it is usually advisable to supply an ovector.
+       function  returns  a value of zero. If the substring offsets are not of
+       interest, pcre_exec() may be called with ovector  passed  as  NULL  and
+       ovecsize  as zero. However, if the pattern contains back references and
+       the ovector is not big enough to remember the related substrings,  PCRE
+       has  to  get additional memory for use during matching. Thus it is usu-
+       ally advisable to supply an ovector.
 
        The pcre_info() function can be used to find  out  how  many  capturing
        subpatterns  there  are  in  a  compiled pattern. The smallest size for
@@ -1824,7 +2201,7 @@
        an environment with the other endianness. This is the error  that  PCRE
        gives when the magic number is not present.
 
-         PCRE_ERROR_UNKNOWN_NODE   (-5)
+         PCRE_ERROR_UNKNOWN_OPCODE (-5)
 
        While running the pattern match, an unknown item was encountered in the
        compiled pattern. This error could be caused by a bug  in  PCRE  or  by
@@ -1850,12 +2227,6 @@
        pcre_extra structure (or defaulted) was reached.  See  the  description
        above.
 
-         PCRE_ERROR_RECURSIONLIMIT (-21)
-
-       The internal recursion limit, as specified by the match_limit_recursion
-       field in a pcre_extra structure (or defaulted)  was  reached.  See  the
-       description above.
-
          PCRE_ERROR_CALLOUT        (-9)
 
        This error is never generated by pcre_exec() itself. It is provided for
@@ -1891,7 +2262,19 @@
 
          PCRE_ERROR_BADCOUNT       (-15)
 
-       This error is given if the value of the ovecsize argument is  negative.
+       This error is given if the value of the ovecsize argument is negative.
+
+         PCRE_ERROR_RECURSIONLIMIT (-21)
+
+       The internal recursion limit, as specified by the match_limit_recursion
+       field  in  a  pcre_extra  structure (or defaulted) was reached. See the
+       description above.
+
+         PCRE_ERROR_BADNEWLINE     (-23)
+
+       An invalid combination of PCRE_NEWLINE_xxx options was given.
+
+       Error numbers -16 to -20 and -22 are not used by pcre_exec().
 
 
 EXTRACTING CAPTURED SUBSTRINGS BY NUMBER
@@ -1907,57 +2290,58 @@
        int pcre_get_substring_list(const char *subject,
             int *ovector, int stringcount, const char ***listptr);
 
-       Captured  substrings  can  be  accessed  directly  by using the offsets
-       returned by pcre_exec() in  ovector.  For  convenience,  the  functions
+       Captured substrings can be  accessed  directly  by  using  the  offsets
+       returned  by  pcre_exec()  in  ovector.  For convenience, the functions
        pcre_copy_substring(),    pcre_get_substring(),    and    pcre_get_sub-
-       string_list() are provided for extracting captured substrings  as  new,
-       separate,  zero-terminated strings. These functions identify substrings
-       by number. The next section describes functions  for  extracting  named
+       string_list()  are  provided for extracting captured substrings as new,
+       separate, zero-terminated strings. These functions identify  substrings
+       by  number.  The  next section describes functions for extracting named
        substrings.
 
-       A  substring that contains a binary zero is correctly extracted and has
-       a further zero added on the end, but the result is not, of course, a  C
-       string.   However,  you  can  process such a string by referring to the
-       length that is  returned  by  pcre_copy_substring()  and  pcre_get_sub-
+       A substring that contains a binary zero is correctly extracted and  has
+       a  further zero added on the end, but the result is not, of course, a C
+       string.  However, you can process such a string  by  referring  to  the
+       length  that  is  returned  by  pcre_copy_substring() and pcre_get_sub-
        string().  Unfortunately, the interface to pcre_get_substring_list() is
-       not adequate for handling strings containing binary zeros, because  the
+       not  adequate for handling strings containing binary zeros, because the
        end of the final string is not independently indicated.
 
-       The  first  three  arguments  are the same for all three of these func-
-       tions: subject is the subject string that has  just  been  successfully
+       The first three arguments are the same for all  three  of  these  func-
+       tions:  subject  is  the subject string that has just been successfully
        matched, ovector is a pointer to the vector of integer offsets that was
        passed to pcre_exec(), and stringcount is the number of substrings that
-       were  captured  by  the match, including the substring that matched the
+       were captured by the match, including the substring  that  matched  the
        entire regular expression. This is the value returned by pcre_exec() if
-       it  is greater than zero. If pcre_exec() returned zero, indicating that
-       it ran out of space in ovector, the value passed as stringcount  should
+       it is greater than zero. If pcre_exec() returned zero, indicating  that
+       it  ran out of space in ovector, the value passed as stringcount should
        be the number of elements in the vector divided by three.
 
-       The  functions pcre_copy_substring() and pcre_get_substring() extract a
-       single substring, whose number is given as  stringnumber.  A  value  of
-       zero  extracts  the  substring that matched the entire pattern, whereas
-       higher values  extract  the  captured  substrings.  For  pcre_copy_sub-
-       string(),  the  string  is  placed  in buffer, whose length is given by
-       buffersize, while for pcre_get_substring() a new  block  of  memory  is
-       obtained  via  pcre_malloc,  and its address is returned via stringptr.
-       The yield of the function is the length of the  string,  not  including
-       the terminating zero, or one of
+       The functions pcre_copy_substring() and pcre_get_substring() extract  a
+       single  substring,  whose  number  is given as stringnumber. A value of
+       zero extracts the substring that matched the  entire  pattern,  whereas
+       higher  values  extract  the  captured  substrings.  For pcre_copy_sub-
+       string(), the string is placed in buffer,  whose  length  is  given  by
+       buffersize,  while  for  pcre_get_substring()  a new block of memory is
+       obtained via pcre_malloc, and its address is  returned  via  stringptr.
+       The  yield  of  the function is the length of the string, not including
+       the terminating zero, or one of these error codes:
 
          PCRE_ERROR_NOMEMORY       (-6)
 
-       The  buffer  was too small for pcre_copy_substring(), or the attempt to
+       The buffer was too small for pcre_copy_substring(), or the  attempt  to
        get memory failed for pcre_get_substring().
 
          PCRE_ERROR_NOSUBSTRING    (-7)
 
        There is no substring whose number is stringnumber.
 
-       The pcre_get_substring_list()  function  extracts  all  available  sub-
-       strings  and  builds  a list of pointers to them. All this is done in a
+       The  pcre_get_substring_list()  function  extracts  all  available sub-
+       strings and builds a list of pointers to them. All this is  done  in  a
        single block of memory that is obtained via pcre_malloc. The address of
-       the  memory  block  is returned via listptr, which is also the start of
-       the list of string pointers. The end of the list is marked  by  a  NULL
-       pointer. The yield of the function is zero if all went well, or
+       the memory block is returned via listptr, which is also  the  start  of
+       the  list  of  string pointers. The end of the list is marked by a NULL
+       pointer. The yield of the function is zero if all  went  well,  or  the
+       error code
 
          PCRE_ERROR_NOMEMORY       (-6)
 
@@ -1999,7 +2383,7 @@
        To extract a substring by name, you first have to find associated  num-
        ber.  For example, for this pattern
 
-         (a+)b(?P\d+)...
+         (a+)b(?\d+)...
 
        the number of the subpattern called "xxx" is 2. If the name is known to
        be unique (PCRE_DUPNAMES was not set), you can find the number from the
@@ -2025,7 +2409,13 @@
 
        These  functions call pcre_get_stringnumber(), and if it succeeds, they
        then call pcre_copy_substring() or pcre_get_substring(),  as  appropri-
-       ate.
+       ate.  NOTE:  If PCRE_DUPNAMES is set and there are duplicate names, the
+       behaviour may not be what you want (see the next section).
+
+       Warning: If the pattern uses the "(?|" feature to set up multiple  sub-
+       patterns  with  the  same  number,  you cannot use names to distinguish
+       them, because names are not included in the compiled code. The matching
+       process uses only numbers.
 
 
 DUPLICATE SUBPATTERN NAMES
@@ -2037,12 +2427,14 @@
        subpatterns are not required to  be  unique.  Normally,  patterns  with
        duplicate  names  are such that in any one match, only one of the named
        subpatterns participates. An example is shown in the pcrepattern  docu-
-       mentation. When duplicates are present, pcre_copy_named_substring() and
+       mentation.
+
+       When    duplicates   are   present,   pcre_copy_named_substring()   and
        pcre_get_named_substring() return the first substring corresponding  to
-       the  given  name  that  is  set.  If  none  are set, an empty string is
-       returned.  The pcre_get_stringnumber() function returns one of the num-
-       bers  that are associated with the name, but it is not defined which it
-       is.
+       the  given  name  that  is set. If none are set, PCRE_ERROR_NOSUBSTRING
+       (-7) is returned; no  data  is  returned.  The  pcre_get_stringnumber()
+       function  returns one of the numbers that are associated with the name,
+       but it is not defined which it is.
 
        If you want to get full details of all captured substrings for a  given
        name,  you  must  use  the pcre_get_stringtable_entries() function. The
@@ -2050,11 +2442,11 @@
        third  and  fourth  are  pointers to variables which are updated by the
        function. After it has run, they point to the first and last entries in
        the  name-to-number  table  for  the  given  name.  The function itself
-       returns the length of each entry, or  PCRE_ERROR_NOSUBSTRING  if  there
-       are  none.  The  format  of the table is described above in the section
-       entitled Information about a pattern. Given all  the  relevant  entries
-       for the name, you can extract each of their numbers, and hence the cap-
-       tured data, if any.
+       returns the length of each entry,  or  PCRE_ERROR_NOSUBSTRING  (-7)  if
+       there  are none. The format of the table is described above in the sec-
+       tion entitled Information about a  pattern.   Given  all  the  relevant
+       entries  for the name, you can extract each of their numbers, and hence
+       the captured data, if any.
 
 
 FINDING ALL POSSIBLE MATCHES
@@ -2083,23 +2475,24 @@
             int *workspace, int wscount);
 
        The  function  pcre_dfa_exec()  is  called  to  match  a subject string
-       against a compiled pattern, using a "DFA" matching algorithm. This  has
-       different  characteristics to the normal algorithm, and is not compati-
-       ble with Perl. Some of the features of PCRE patterns are not supported.
-       Nevertheless, there are times when this kind of matching can be useful.
-       For a discussion of the two matching algorithms, see  the  pcrematching
-       documentation.
+       against a compiled pattern, using a matching algorithm that  scans  the
+       subject  string  just  once, and does not backtrack. This has different
+       characteristics to the normal algorithm, and  is  not  compatible  with
+       Perl.  Some  of the features of PCRE patterns are not supported. Never-
+       theless, there are times when this kind of matching can be useful.  For
+       a discussion of the two matching algorithms, see the pcrematching docu-
+       mentation.
 
-       The  arguments  for  the  pcre_dfa_exec()  function are the same as for
+       The arguments for the pcre_dfa_exec() function  are  the  same  as  for
        pcre_exec(), plus two extras. The ovector argument is used in a differ-
-       ent  way,  and  this is described below. The other common arguments are
-       used in the same way as for pcre_exec(), so their  description  is  not
+       ent way, and this is described below. The other  common  arguments  are
+       used  in  the  same way as for pcre_exec(), so their description is not
        repeated here.
 
-       The  two  additional  arguments provide workspace for the function. The
-       workspace vector should contain at least 20 elements. It  is  used  for
+       The two additional arguments provide workspace for  the  function.  The
+       workspace  vector  should  contain at least 20 elements. It is used for
        keeping  track  of  multiple  paths  through  the  pattern  tree.  More
-       workspace will be needed for patterns and subjects where  there  are  a
+       workspace  will  be  needed for patterns and subjects where there are a
        lot of potential matches.
 
        Here is an example of a simple call to pcre_dfa_exec():
@@ -2121,47 +2514,47 @@
 
    Option bits for pcre_dfa_exec()
 
-       The  unused  bits  of  the options argument for pcre_dfa_exec() must be
-       zero. The only bits  that  may  be  set  are  PCRE_ANCHORED,  PCRE_NEW-
-       LINE_xxx,  PCRE_NOTBOL, PCRE_NOTEOL, PCRE_NOTEMPTY, PCRE_NO_UTF8_CHECK,
+       The unused bits of the options argument  for  pcre_dfa_exec()  must  be
+       zero.  The  only  bits  that  may  be  set are PCRE_ANCHORED, PCRE_NEW-
+       LINE_xxx, PCRE_NOTBOL, PCRE_NOTEOL, PCRE_NOTEMPTY,  PCRE_NO_UTF8_CHECK,
        PCRE_PARTIAL, PCRE_DFA_SHORTEST, and PCRE_DFA_RESTART. All but the last
        three of these are the same as for pcre_exec(), so their description is
        not repeated here.
 
          PCRE_PARTIAL
 
-       This has the same general effect as it does for  pcre_exec(),  but  the
-       details   are   slightly   different.  When  PCRE_PARTIAL  is  set  for
-       pcre_dfa_exec(), the return code PCRE_ERROR_NOMATCH is  converted  into
-       PCRE_ERROR_PARTIAL  if  the  end  of the subject is reached, there have
+       This  has  the  same general effect as it does for pcre_exec(), but the
+       details  are  slightly  different.  When  PCRE_PARTIAL   is   set   for
+       pcre_dfa_exec(),  the  return code PCRE_ERROR_NOMATCH is converted into
+       PCRE_ERROR_PARTIAL if the end of the subject  is  reached,  there  have
        been no complete matches, but there is still at least one matching pos-
-       sibility.  The portion of the string that provided the partial match is
+       sibility. The portion of the string that provided the partial match  is
        set as the first matching string.
 
          PCRE_DFA_SHORTEST
 
-       Setting the PCRE_DFA_SHORTEST option causes the matching  algorithm  to
-       stop  as  soon  as  it  has found one match. Because of the way the DFA
-       algorithm works, this is necessarily the shortest possible match at the
-       first possible matching point in the subject string.
+       Setting  the  PCRE_DFA_SHORTEST option causes the matching algorithm to
+       stop as soon as it has found one match. Because of the way the alterna-
+       tive  algorithm  works, this is necessarily the shortest possible match
+       at the first possible matching point in the subject string.
 
          PCRE_DFA_RESTART
 
-       When  pcre_dfa_exec()  is  called  with  the  PCRE_PARTIAL  option, and
-       returns a partial match, it is possible to call it  again,  with  addi-
-       tional  subject  characters,  and have it continue with the same match.
-       The PCRE_DFA_RESTART option requests this action; when it is  set,  the
-       workspace  and wscount options must reference the same vector as before
-       because data about the match so far is left in  them  after  a  partial
-       match.  There  is  more  discussion of this facility in the pcrepartial
+       When pcre_dfa_exec()  is  called  with  the  PCRE_PARTIAL  option,  and
+       returns  a  partial  match, it is possible to call it again, with addi-
+       tional subject characters, and have it continue with  the  same  match.
+       The  PCRE_DFA_RESTART  option requests this action; when it is set, the
+       workspace and wscount options must reference the same vector as  before
+       because  data  about  the  match so far is left in them after a partial
+       match. There is more discussion of this  facility  in  the  pcrepartial
        documentation.
 
    Successful returns from pcre_dfa_exec()
 
-       When pcre_dfa_exec() succeeds, it may have matched more than  one  sub-
+       When  pcre_dfa_exec()  succeeds, it may have matched more than one sub-
        string in the subject. Note, however, that all the matches from one run
-       of the function start at the same point in  the  subject.  The  shorter
-       matches  are all initial substrings of the longer matches. For example,
+       of  the  function  start  at the same point in the subject. The shorter
+       matches are all initial substrings of the longer matches. For  example,
        if the pattern
 
          <.*>
@@ -2176,59 +2569,75 @@
           
            
 
-       On success, the yield of the function is a number  greater  than  zero,
-       which  is  the  number of matched substrings. The substrings themselves
-       are returned in ovector. Each string uses two elements;  the  first  is
-       the  offset  to the start, and the second is the offset to the end. All
-       the strings have the same start offset. (Space could have been saved by
-       giving  this only once, but it was decided to retain some compatibility
-       with the way pcre_exec() returns data, even though the meaning  of  the
-       strings is different.)
+       On  success,  the  yield of the function is a number greater than zero,
+       which is the number of matched substrings.  The  substrings  themselves
+       are  returned  in  ovector. Each string uses two elements; the first is
+       the offset to the start, and the second is the offset to  the  end.  In
+       fact,  all  the  strings  have the same start offset. (Space could have
+       been saved by giving this only once, but it was decided to retain  some
+       compatibility  with  the  way pcre_exec() returns data, even though the
+       meaning of the strings is different.)
 
        The strings are returned in reverse order of length; that is, the long-
-       est matching string is given first. If there were too many  matches  to
-       fit  into ovector, the yield of the function is zero, and the vector is
+       est  matching  string is given first. If there were too many matches to
+       fit into ovector, the yield of the function is zero, and the vector  is
        filled with the longest matches.
 
    Error returns from pcre_dfa_exec()
 
-       The pcre_dfa_exec() function returns a negative number when  it  fails.
-       Many  of  the  errors  are  the  same as for pcre_exec(), and these are
-       described above.  There are in addition the following errors  that  are
+       The  pcre_dfa_exec()  function returns a negative number when it fails.
+       Many of the errors are the same  as  for  pcre_exec(),  and  these  are
+       described  above.   There are in addition the following errors that are
        specific to pcre_dfa_exec():
 
          PCRE_ERROR_DFA_UITEM      (-16)
 
-       This  return is given if pcre_dfa_exec() encounters an item in the pat-
-       tern that it does not support, for instance, the use of \C  or  a  back
+       This return is given if pcre_dfa_exec() encounters an item in the  pat-
+       tern  that  it  does not support, for instance, the use of \C or a back
        reference.
 
          PCRE_ERROR_DFA_UCOND      (-17)
 
-       This  return is given if pcre_dfa_exec() encounters a condition item in
-       a pattern that uses a back reference for the  condition.  This  is  not
-       supported.
+       This return is given if pcre_dfa_exec()  encounters  a  condition  item
+       that  uses  a back reference for the condition, or a test for recursion
+       in a specific group. These are not supported.
 
          PCRE_ERROR_DFA_UMLIMIT    (-18)
 
-       This  return  is given if pcre_dfa_exec() is called with an extra block
+       This return is given if pcre_dfa_exec() is called with an  extra  block
        that contains a setting of the match_limit field. This is not supported
        (it is meaningless).
 
          PCRE_ERROR_DFA_WSSIZE     (-19)
 
-       This  return  is  given  if  pcre_dfa_exec()  runs  out of space in the
+       This return is given if  pcre_dfa_exec()  runs  out  of  space  in  the
        workspace vector.
 
          PCRE_ERROR_DFA_RECURSE    (-20)
 
-       When a recursive subpattern is processed, the matching  function  calls
-       itself  recursively,  using  private vectors for ovector and workspace.
-       This error is given if the output vector  is  not  large  enough.  This
+       When  a  recursive subpattern is processed, the matching function calls
+       itself recursively, using private vectors for  ovector  and  workspace.
+       This  error  is  given  if  the output vector is not large enough. This
        should be extremely rare, as a vector of size 1000 is used.
 
-Last updated: 08 June 2006
-Copyright (c) 1997-2006 University of Cambridge.
+
+SEE ALSO
+
+       pcrebuild(3), pcrecallout(3), pcrecpp(3)(3), pcrematching(3),  pcrepar-
+       tial(3), pcreposix(3), pcreprecompile(3), pcresample(3), pcrestack(3).
+
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 11 April 2009
+       Copyright (c) 1997-2009 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -2255,7 +2664,7 @@
        default value is zero.  For  example,  this  pattern  has  two  callout
        points:
 
-         (?C1)eabc(?C2)def
+         (?C1)abc(?C2)def
 
        If  the  PCRE_AUTO_CALLOUT  option  bit  is  set when pcre_compile() is
        called, PCRE automatically  inserts  callouts,  all  with  number  255,
@@ -2279,8 +2688,8 @@
 MISSING CALLOUTS
 
        You  should  be  aware  that,  because of optimizations in the way PCRE
-       matches patterns, callouts sometimes do not happen. For example, if the
-       pattern is
+       matches patterns by default, callouts  sometimes  do  not  happen.  For
+       example, if the pattern is
 
          ab(?C4)cd
 
@@ -2289,13 +2698,18 @@
        ever  start,  and  the  callout is never reached. However, with "abyd",
        though the result is still no match, the callout is obeyed.
 
+       You can disable these optimizations by passing the  PCRE_NO_START_OPTI-
+       MIZE  option  to  pcre_exec()  or  pcre_dfa_exec(). This slows down the
+       matching process, but does ensure that callouts  such  as  the  example
+       above are obeyed.
+
 
 THE CALLOUT INTERFACE
 
-       During matching, when PCRE reaches a callout point, the external  func-
-       tion  defined by pcre_callout is called (if it is set). This applies to
-       both the pcre_exec() and the pcre_dfa_exec()  matching  functions.  The
-       only  argument  to  the callout function is a pointer to a pcre_callout
+       During  matching, when PCRE reaches a callout point, the external func-
+       tion defined by pcre_callout is called (if it is set). This applies  to
+       both  the  pcre_exec()  and the pcre_dfa_exec() matching functions. The
+       only argument to the callout function is a pointer  to  a  pcre_callout
        block. This structure contains the following fields:
 
          int          version;
@@ -2311,9 +2725,9 @@
          int          pattern_position;
          int          next_item_length;
 
-       The version field is an integer containing the version  number  of  the
-       block  format. The initial version was 0; the current version is 1. The
-       version number will change again in future  if  additional  fields  are
+       The  version  field  is an integer containing the version number of the
+       block format. The initial version was 0; the current version is 1.  The
+       version  number  will  change  again in future if additional fields are
        added, but the intention is never to remove any of the existing fields.
 
        The callout_number field contains the number of the  callout,  as  com-
@@ -2330,10 +2744,12 @@
        The subject and subject_length fields contain copies of the values that
        were passed to pcre_exec().
 
-       The start_match field contains the offset within the subject  at  which
-       the  current match attempt started. If the pattern is not anchored, the
-       callout function may be called several times from the same point in the
-       pattern for different starting points in the subject.
+       The start_match field normally contains the offset within  the  subject
+       at  which  the  current  match  attempt started. However, if the escape
+       sequence \K has been encountered, this value is changed to reflect  the
+       modified  starting  point.  If the pattern is not anchored, the callout
+       function may be called several times from the same point in the pattern
+       for different starting points in the subject.
 
        The  current_position  field  contains the offset within the subject of
        the current match pointer.
@@ -2386,8 +2802,18 @@
        reserved for use by callout functions; it will never be  used  by  PCRE
        itself.
 
-Last updated: 28 February 2005
-Copyright (c) 1997-2005 University of Cambridge.
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 15 March 2009
+       Copyright (c) 1997-2009 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -2401,45 +2827,46 @@
 DIFFERENCES BETWEEN PCRE AND PERL
 
        This  document describes the differences in the ways that PCRE and Perl
-       handle regular expressions. The differences  described  here  are  with
-       respect to Perl 5.8.
+       handle regular expressions. The differences described here  are  mainly
+       with  respect  to  Perl 5.8, though PCRE versions 7.0 and later contain
+       some features that are expected to be in the forthcoming Perl 5.10.
 
-       1.  PCRE has only a subset of Perl's UTF-8 and Unicode support. Details
-       of what it does have are given in the section on UTF-8 support  in  the
+       1. PCRE has only a subset of Perl's UTF-8 and Unicode support.  Details
+       of  what  it does have are given in the section on UTF-8 support in the
        main pcre page.
 
        2. PCRE does not allow repeat quantifiers on lookahead assertions. Perl
-       permits them, but they do not mean what you might think.  For  example,
+       permits  them,  but they do not mean what you might think. For example,
        (?!a){3} does not assert that the next three characters are not "a". It
        just asserts that the next character is not "a" three times.
 
-       3. Capturing subpatterns that occur inside  negative  lookahead  asser-
-       tions  are  counted,  but their entries in the offsets vector are never
-       set. Perl sets its numerical variables from any such patterns that  are
+       3.  Capturing  subpatterns  that occur inside negative lookahead asser-
+       tions are counted, but their entries in the offsets  vector  are  never
+       set.  Perl sets its numerical variables from any such patterns that are
        matched before the assertion fails to match something (thereby succeed-
-       ing), but only if the negative lookahead assertion  contains  just  one
+       ing),  but  only  if the negative lookahead assertion contains just one
        branch.
 
-       4.  Though  binary zero characters are supported in the subject string,
+       4. Though binary zero characters are supported in the  subject  string,
        they are not allowed in a pattern string because it is passed as a nor-
        mal C string, terminated by zero. The escape sequence \0 can be used in
        the pattern to represent a binary zero.
 
-       5. The following Perl escape sequences are not supported: \l,  \u,  \L,
+       5.  The  following Perl escape sequences are not supported: \l, \u, \L,
        \U, and \N. In fact these are implemented by Perl's general string-han-
-       dling and are not part of its pattern matching engine. If any of  these
+       dling  and are not part of its pattern matching engine. If any of these
        are encountered by PCRE, an error is generated.
 
-       6.  The Perl escape sequences \p, \P, and \X are supported only if PCRE
-       is built with Unicode character property support. The  properties  that
-       can  be tested with \p and \P are limited to the general category prop-
-       erties such as Lu and Nd, script names such as Greek or  Han,  and  the
+       6. The Perl escape sequences \p, \P, and \X are supported only if  PCRE
+       is  built  with Unicode character property support. The properties that
+       can be tested with \p and \P are limited to the general category  prop-
+       erties  such  as  Lu and Nd, script names such as Greek or Han, and the
        derived properties Any and L&.
 
        7. PCRE does support the \Q...\E escape for quoting substrings. Charac-
-       ters in between are treated as literals.  This  is  slightly  different
-       from  Perl  in  that  $  and  @ are also handled as literals inside the
-       quotes. In Perl, they cause variable interpolation (but of course  PCRE
+       ters  in  between  are  treated as literals. This is slightly different
+       from Perl in that $ and @ are  also  handled  as  literals  inside  the
+       quotes.  In Perl, they cause variable interpolation (but of course PCRE
        does not have variables). Note the following examples:
 
            Pattern            PCRE matches      Perl matches
@@ -2449,67 +2876,85 @@
            \Qabc\$xyz\E       abc\$xyz          abc\$xyz
            \Qabc\E\$\Qxyz\E   abc$xyz           abc$xyz
 
-       The  \Q...\E  sequence  is recognized both inside and outside character
+       The \Q...\E sequence is recognized both inside  and  outside  character
        classes.
 
-       8. Fairly obviously, PCRE does not support the (?{code}) and (?p{code})
-       constructions.  However,  there is support for recursive patterns using
-       the non-Perl items (?R),  (?number),  and  (?P>name).  Also,  the  PCRE
-       "callout"  feature allows an external function to be called during pat-
+       8. Fairly obviously, PCRE does not support the (?{code}) and (??{code})
+       constructions. However, there is support for recursive  patterns.  This
+       is  not available in Perl 5.8, but will be in Perl 5.10. Also, the PCRE
+       "callout" feature allows an external function to be called during  pat-
        tern matching. See the pcrecallout documentation for details.
 
-       9. There are some differences that are concerned with the  settings  of
-       captured  strings  when  part  of  a  pattern is repeated. For example,
-       matching "aba" against the  pattern  /^(a(b)?)+$/  in  Perl  leaves  $2
+       9.  Subpatterns  that  are  called  recursively or as "subroutines" are
+       always treated as atomic groups in  PCRE.  This  is  like  Python,  but
+       unlike Perl.
+
+       10.  There are some differences that are concerned with the settings of
+       captured strings when part of  a  pattern  is  repeated.  For  example,
+       matching  "aba"  against  the  pattern  /^(a(b)?)+$/  in Perl leaves $2
        unset, but in PCRE it is set to "b".
 
-       10. PCRE provides some extensions to the Perl regular expression facil-
-       ities:
+       11.  PCRE  does  support  Perl  5.10's  backtracking  verbs  (*ACCEPT),
+       (*FAIL),  (*F),  (*COMMIT), (*PRUNE), (*SKIP), and (*THEN), but only in
+       the forms without an  argument.  PCRE  does  not  support  (*MARK).  If
+       (*ACCEPT)  is within capturing parentheses, PCRE does not set that cap-
+       ture group; this is different to Perl.
+
+       12. PCRE provides some extensions to the Perl regular expression facil-
+       ities.   Perl  5.10  will  include new features that are not in earlier
+       versions, some of which (such as named parentheses) have been  in  PCRE
+       for some time. This list is with respect to Perl 5.10:
 
-       (a) Although lookbehind assertions must  match  fixed  length  strings,
+       (a)  Although  lookbehind  assertions  must match fixed length strings,
        each alternative branch of a lookbehind assertion can match a different
        length of string. Perl requires them all to have the same length.
 
-       (b) If PCRE_DOLLAR_ENDONLY is set and PCRE_MULTILINE is not set, the  $
+       (b)  If PCRE_DOLLAR_ENDONLY is set and PCRE_MULTILINE is not set, the $
        meta-character matches only at the very end of the string.
 
        (c) If PCRE_EXTRA is set, a backslash followed by a letter with no spe-
-       cial meaning  is  faulted.  Otherwise,  like  Perl,  the  backslash  is
-       ignored. (Perl can be made to issue a warning.)
+       cial meaning is faulted. Otherwise, like Perl, the backslash is quietly
+       ignored.  (Perl can be made to issue a warning.)
 
-       (d)  If  PCRE_UNGREEDY is set, the greediness of the repetition quanti-
+       (d) If PCRE_UNGREEDY is set, the greediness of the  repetition  quanti-
        fiers is inverted, that is, by default they are not greedy, but if fol-
        lowed by a question mark they are.
 
        (e) PCRE_ANCHORED can be used at matching time to force a pattern to be
        tried only at the first matching position in the subject string.
 
-       (f) The PCRE_NOTBOL, PCRE_NOTEOL, PCRE_NOTEMPTY, and  PCRE_NO_AUTO_CAP-
+       (f)  The PCRE_NOTBOL, PCRE_NOTEOL, PCRE_NOTEMPTY, and PCRE_NO_AUTO_CAP-
        TURE options for pcre_exec() have no Perl equivalents.
 
-       (g)  The (?R), (?number), and (?P>name) constructs allows for recursive
-       pattern matching (Perl can do  this  using  the  (?p{code})  construct,
-       which PCRE cannot support.)
+       (g) The \R escape sequence can be restricted to match only CR,  LF,  or
+       CRLF by the PCRE_BSR_ANYCRLF option.
 
-       (h)  PCRE supports named capturing substrings, using the Python syntax.
+       (h) The callout facility is PCRE-specific.
 
-       (i) PCRE supports the possessive quantifier  "++"  syntax,  taken  from
-       Sun's Java package.
+       (i) The partial matching facility is PCRE-specific.
 
-       (j) The (R) condition, for testing recursion, is a PCRE extension.
+       (j) Patterns compiled by PCRE can be saved and re-used at a later time,
+       even on different hosts that have the other endianness.
 
-       (k) The callout facility is PCRE-specific.
+       (k) The alternative matching function (pcre_dfa_exec())  matches  in  a
+       different way and is not Perl-compatible.
 
-       (l) The partial matching facility is PCRE-specific.
+       (l)  PCRE  recognizes some special sequences such as (*CR) at the start
+       of a pattern that set overall options that cannot be changed within the
+       pattern.
 
-       (m) Patterns compiled by PCRE can be saved and re-used at a later time,
-       even on different hosts that have the other endianness.
 
-       (n) The alternative matching function (pcre_dfa_exec())  matches  in  a
-       different way and is not Perl-compatible.
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
 
-Last updated: 06 June 2006
-Copyright (c) 1997-2006 University of Cambridge.
+
+REVISION
+
+       Last updated: 11 September 2007
+       Copyright (c) 1997-2007 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -2522,55 +2967,110 @@
 
 PCRE REGULAR EXPRESSION DETAILS
 
-       The  syntax  and semantics of the regular expressions supported by PCRE
-       are described below. Regular expressions are also described in the Perl
-       documentation  and  in  a  number  of books, some of which have copious
-       examples.  Jeffrey Friedl's "Mastering Regular Expressions",  published
-       by  O'Reilly, covers regular expressions in great detail. This descrip-
-       tion of PCRE's regular expressions is intended as reference material.
+       The  syntax and semantics of the regular expressions that are supported
+       by PCRE are described in detail below. There is a quick-reference  syn-
+       tax summary in the pcresyntax page. PCRE tries to match Perl syntax and
+       semantics as closely as it can. PCRE  also  supports  some  alternative
+       regular  expression  syntax (which does not conflict with the Perl syn-
+       tax) in order to provide some compatibility with regular expressions in
+       Python, .NET, and Oniguruma.
+
+       Perl's  regular expressions are described in its own documentation, and
+       regular expressions in general are covered in a number of  books,  some
+       of  which  have  copious  examples. Jeffrey Friedl's "Mastering Regular
+       Expressions", published by  O'Reilly,  covers  regular  expressions  in
+       great  detail.  This  description  of  PCRE's  regular  expressions  is
+       intended as reference material.
 
        The original operation of PCRE was on strings of  one-byte  characters.
        However,  there is now also support for UTF-8 character strings. To use
        this, you must build PCRE to  include  UTF-8  support,  and  then  call
-       pcre_compile()  with  the  PCRE_UTF8  option.  How this affects pattern
-       matching is mentioned in several places below. There is also a  summary
-       of  UTF-8  features  in  the  section on UTF-8 support in the main pcre
-       page.
+       pcre_compile()  with  the  PCRE_UTF8  option.  There  is also a special
+       sequence that can be given at the start of a pattern:
+
+         (*UTF8)
+
+       Starting a pattern with this sequence  is  equivalent  to  setting  the
+       PCRE_UTF8  option.  This  feature  is  not Perl-compatible. How setting
+       UTF-8 mode affects pattern matching  is  mentioned  in  several  places
+       below.  There  is  also  a  summary of UTF-8 features in the section on
+       UTF-8 support in the main pcre page.
 
        The remainder of this document discusses the  patterns  that  are  sup-
        ported  by  PCRE when its main matching function, pcre_exec(), is used.
        From  release  6.0,   PCRE   offers   a   second   matching   function,
        pcre_dfa_exec(),  which matches using a different algorithm that is not
-       Perl-compatible. The advantages and disadvantages  of  the  alternative
-       function, and how it differs from the normal function, are discussed in
-       the pcrematching page.
-
-       A regular expression is a pattern that is  matched  against  a  subject
-       string  from  left  to right. Most characters stand for themselves in a
-       pattern, and match the corresponding characters in the  subject.  As  a
+       Perl-compatible. Some of the features discussed below are not available
+       when  pcre_dfa_exec()  is used. The advantages and disadvantages of the
+       alternative function, and how it differs from the normal function,  are
+       discussed in the pcrematching page.
+
+
+NEWLINE CONVENTIONS
+
+       PCRE  supports five different conventions for indicating line breaks in
+       strings: a single CR (carriage return) character, a  single  LF  (line-
+       feed) character, the two-character sequence CRLF, any of the three pre-
+       ceding, or any Unicode newline sequence. The pcreapi page  has  further
+       discussion  about newlines, and shows how to set the newline convention
+       in the options arguments for the compiling and matching functions.
+
+       It is also possible to specify a newline convention by starting a  pat-
+       tern string with one of the following five sequences:
+
+         (*CR)        carriage return
+         (*LF)        linefeed
+         (*CRLF)      carriage return, followed by linefeed
+         (*ANYCRLF)   any of the three above
+         (*ANY)       all Unicode newline sequences
+
+       These override the default and the options given to pcre_compile(). For
+       example, on a Unix system where LF is the default newline sequence, the
+       pattern
+
+         (*CR)a.b
+
+       changes the convention to CR. That pattern matches "a\nb" because LF is
+       no longer a newline. Note that these special settings,  which  are  not
+       Perl-compatible,  are  recognized  only at the very start of a pattern,
+       and that they must be in upper case.  If  more  than  one  of  them  is
+       present, the last one is used.
+
+       The  newline  convention  does  not  affect what the \R escape sequence
+       matches. By default, this is any Unicode  newline  sequence,  for  Perl
+       compatibility.  However, this can be changed; see the description of \R
+       in the section entitled "Newline sequences" below. A change of \R  set-
+       ting can be combined with a change of newline convention.
+
+
+CHARACTERS AND METACHARACTERS
+
+       A  regular  expression  is  a pattern that is matched against a subject
+       string from left to right. Most characters stand for  themselves  in  a
+       pattern,  and  match  the corresponding characters in the subject. As a
        trivial example, the pattern
 
          The quick brown fox
 
        matches a portion of a subject string that is identical to itself. When
-       caseless matching is specified (the PCRE_CASELESS option), letters  are
-       matched  independently  of case. In UTF-8 mode, PCRE always understands
-       the concept of case for characters whose values are less than  128,  so
-       caseless  matching  is always possible. For characters with higher val-
-       ues, the concept of case is supported if PCRE is compiled with  Unicode
-       property  support,  but  not  otherwise.   If  you want to use caseless
-       matching for characters 128 and above, you must  ensure  that  PCRE  is
+       caseless  matching is specified (the PCRE_CASELESS option), letters are
+       matched independently of case. In UTF-8 mode, PCRE  always  understands
+       the  concept  of case for characters whose values are less than 128, so
+       caseless matching is always possible. For characters with  higher  val-
+       ues,  the concept of case is supported if PCRE is compiled with Unicode
+       property support, but not otherwise.   If  you  want  to  use  caseless
+       matching  for  characters  128  and above, you must ensure that PCRE is
        compiled with Unicode property support as well as with UTF-8 support.
 
-       The  power  of  regular  expressions  comes from the ability to include
-       alternatives and repetitions in the pattern. These are encoded  in  the
+       The power of regular expressions comes  from  the  ability  to  include
+       alternatives  and  repetitions in the pattern. These are encoded in the
        pattern by the use of metacharacters, which do not stand for themselves
        but instead are interpreted in some special way.
 
-       There are two different sets of metacharacters: those that  are  recog-
-       nized  anywhere in the pattern except within square brackets, and those
-       that are recognized in square brackets. Outside  square  brackets,  the
-       metacharacters are as follows:
+       There  are  two different sets of metacharacters: those that are recog-
+       nized anywhere in the pattern except within square brackets, and  those
+       that  are  recognized  within square brackets. Outside square brackets,
+       the metacharacters are as follows:
 
          \      general escape character with several uses
          ^      assert start of string (or line, in multiline mode)
@@ -2588,7 +3088,7 @@
                 also "possessive quantifier"
          {      start min/max quantifier
 
-       Part  of  a  pattern  that is in square brackets is called a "character
+       Part of a pattern that is in square brackets  is  called  a  "character
        class". In a character class the only metacharacters are:
 
          \      general escape character
@@ -2598,7 +3098,7 @@
                   syntax)
          ]      terminates the character class
 
-       The following sections describe the use of each of the  metacharacters.
+       The following sections describe the use of each of the metacharacters.
 
 
 BACKSLASH
@@ -2650,7 +3150,7 @@
          \cx       "control-x", where x is any character
          \e        escape (hex 1B)
          \f        formfeed (hex 0C)
-         \n        newline (hex 0A)
+         \n        linefeed (hex 0A)
          \r        carriage return (hex 0D)
          \t        tab (hex 09)
          \ddd      character with octal code ddd, or backreference
@@ -2665,37 +3165,40 @@
        After \x, from zero to two hexadecimal digits are read (letters can  be
        in  upper  or  lower case). Any number of hexadecimal digits may appear
        between \x{ and }, but the value of the character  code  must  be  less
-       than 256 in non-UTF-8 mode, and less than 2**31 in UTF-8 mode (that is,
-       the maximum hexadecimal value is 7FFFFFFF). If  characters  other  than
-       hexadecimal  digits  appear between \x{ and }, or if there is no termi-
-       nating }, this form of escape is not recognized.  Instead, the  initial
-       \x will be interpreted as a basic hexadecimal escape, with no following
-       digits, giving a character whose value is zero.
+       than 256 in non-UTF-8 mode, and less than 2**31 in UTF-8 mode. That is,
+       the maximum value in hexadecimal is 7FFFFFFF. Note that this is  bigger
+       than the largest Unicode code point, which is 10FFFF.
+
+       If  characters  other than hexadecimal digits appear between \x{ and },
+       or if there is no terminating }, this form of escape is not recognized.
+       Instead,  the  initial  \x  will  be interpreted as a basic hexadecimal
+       escape, with no following digits, giving a  character  whose  value  is
+       zero.
 
        Characters whose value is less than 256 can be defined by either of the
-       two  syntaxes  for  \x. There is no difference in the way they are han-
+       two syntaxes for \x. There is no difference in the way  they  are  han-
        dled. For example, \xdc is exactly the same as \x{dc}.
 
-       After \0 up to two further octal digits are read. If  there  are  fewer
-       than  two  digits,  just  those  that  are  present  are used. Thus the
+       After  \0  up  to two further octal digits are read. If there are fewer
+       than two digits, just  those  that  are  present  are  used.  Thus  the
        sequence \0\x\07 specifies two binary zeros followed by a BEL character
-       (code  value 7). Make sure you supply two digits after the initial zero
+       (code value 7). Make sure you supply two digits after the initial  zero
        if the pattern character that follows is itself an octal digit.
 
        The handling of a backslash followed by a digit other than 0 is compli-
        cated.  Outside a character class, PCRE reads it and any following dig-
-       its as a decimal number. If the number is less than  10,  or  if  there
+       its  as  a  decimal  number. If the number is less than 10, or if there
        have been at least that many previous capturing left parentheses in the
-       expression, the entire  sequence  is  taken  as  a  back  reference.  A
-       description  of how this works is given later, following the discussion
+       expression,  the  entire  sequence  is  taken  as  a  back reference. A
+       description of how this works is given later, following the  discussion
        of parenthesized subpatterns.
 
-       Inside a character class, or if the decimal number is  greater  than  9
-       and  there have not been that many capturing subpatterns, PCRE re-reads
-       up to three octal digits following the backslash, ane uses them to gen-
-       erate  a data character. Any subsequent digits stand for themselves. In
-       non-UTF-8 mode, the value of a character specified  in  octal  must  be
-       less  than  \400.  In  UTF-8 mode, values up to \777 are permitted. For
+       Inside  a  character  class, or if the decimal number is greater than 9
+       and there have not been that many capturing subpatterns, PCRE  re-reads
+       up to three octal digits following the backslash, and uses them to gen-
+       erate a data character. Any subsequent digits stand for themselves.  In
+       non-UTF-8  mode,  the  value  of a character specified in octal must be
+       less than \400. In UTF-8 mode, values up to  \777  are  permitted.  For
        example:
 
          \040   is another way of writing a space
@@ -2713,24 +3216,45 @@
          \81    is either a back reference, or a binary zero
                    followed by the two characters "8" and "1"
 
-       Note that octal values of 100 or greater must not be  introduced  by  a
+       Note  that  octal  values of 100 or greater must not be introduced by a
        leading zero, because no more than three octal digits are ever read.
 
        All the sequences that define a single character value can be used both
-       inside and outside character classes. In addition, inside  a  character
-       class,  the  sequence \b is interpreted as the backspace character (hex
-       08), and the sequence \X is interpreted as the character "X". Outside a
-       character class, these sequences have different meanings (see below).
+       inside  and  outside character classes. In addition, inside a character
+       class, the sequence \b is interpreted as the backspace  character  (hex
+       08),  and the sequences \R and \X are interpreted as the characters "R"
+       and "X", respectively. Outside a character class, these sequences  have
+       different meanings (see below).
+
+   Absolute and relative back references
+
+       The  sequence  \g followed by an unsigned or a negative number, option-
+       ally enclosed in braces, is an absolute or relative back  reference.  A
+       named back reference can be coded as \g{name}. Back references are dis-
+       cussed later, following the discussion of parenthesized subpatterns.
+
+   Absolute and relative subroutine calls
+
+       For compatibility with Oniguruma, the non-Perl syntax \g followed by  a
+       name or a number enclosed either in angle brackets or single quotes, is
+       an alternative syntax for referencing a subpattern as  a  "subroutine".
+       Details  are  discussed  later.   Note  that  \g{...} (Perl syntax) and
+       \g<...> (Oniguruma syntax) are not synonymous. The  former  is  a  back
+       reference; the latter is a subroutine call.
 
    Generic character types
 
-       The  third  use of backslash is for specifying generic character types.
-       The following are always recognized:
+       Another use of backslash is for specifying generic character types. The
+       following are always recognized:
 
          \d     any decimal digit
          \D     any character that is not a decimal digit
+         \h     any horizontal whitespace character
+         \H     any character that is not a horizontal whitespace character
          \s     any whitespace character
          \S     any character that is not a whitespace character
+         \v     any vertical whitespace character
+         \V     any character that is not a vertical whitespace character
          \w     any "word" character
          \W     any "non-word" character
 
@@ -2745,28 +3269,111 @@
 
        For  compatibility  with Perl, \s does not match the VT character (code
        11).  This makes it different from the the POSIX "space" class. The  \s
-       characters  are  HT (9), LF (10), FF (12), CR (13), and space (32). (If
+       characters  are  HT  (9), LF (10), FF (12), CR (13), and space (32). If
        "use locale;" is included in a Perl script, \s may match the VT charac-
-       ter. In PCRE, it never does.)
-
-       A "word" character is an underscore or any character less than 256 that
-       is a letter or digit. The definition of  letters  and  digits  is  con-
-       trolled  by PCRE's low-valued character tables, and may vary if locale-
-       specific matching is taking place (see "Locale support" in the  pcreapi
-       page).  For  example,  in  the  "fr_FR" (French) locale, some character
-       codes greater than 128 are used for accented  letters,  and  these  are
-       matched by \w.
+       ter. In PCRE, it never does.
 
        In  UTF-8 mode, characters with values greater than 128 never match \d,
        \s, or \w, and always match \D, \S, and \W. This is true even when Uni-
-       code  character  property support is available. The use of locales with
-       Unicode is discouraged.
+       code  character  property  support is available. These sequences retain
+       their original meanings from before UTF-8 support was available, mainly
+       for  efficiency  reasons. Note that this also affects \b, because it is
+       defined in terms of \w and \W.
+
+       The sequences \h, \H, \v, and \V are Perl 5.10 features. In contrast to
+       the  other  sequences, these do match certain high-valued codepoints in
+       UTF-8 mode.  The horizontal space characters are:
+
+         U+0009     Horizontal tab
+         U+0020     Space
+         U+00A0     Non-break space
+         U+1680     Ogham space mark
+         U+180E     Mongolian vowel separator
+         U+2000     En quad
+         U+2001     Em quad
+         U+2002     En space
+         U+2003     Em space
+         U+2004     Three-per-em space
+         U+2005     Four-per-em space
+         U+2006     Six-per-em space
+         U+2007     Figure space
+         U+2008     Punctuation space
+         U+2009     Thin space
+         U+200A     Hair space
+         U+202F     Narrow no-break space
+         U+205F     Medium mathematical space
+         U+3000     Ideographic space
+
+       The vertical space characters are:
+
+         U+000A     Linefeed
+         U+000B     Vertical tab
+         U+000C     Formfeed
+         U+000D     Carriage return
+         U+0085     Next line
+         U+2028     Line separator
+         U+2029     Paragraph separator
+
+       A "word" character is an underscore or any character less than 256 that
+       is  a  letter  or  digit.  The definition of letters and digits is con-
+       trolled by PCRE's low-valued character tables, and may vary if  locale-
+       specific  matching is taking place (see "Locale support" in the pcreapi
+       page). For example, in a French locale such  as  "fr_FR"  in  Unix-like
+       systems,  or "french" in Windows, some character codes greater than 128
+       are used for accented letters, and these are matched by \w. The use  of
+       locales with Unicode is discouraged.
+
+   Newline sequences
+
+       Outside  a  character class, by default, the escape sequence \R matches
+       any Unicode newline sequence. This is a Perl 5.10 feature. In non-UTF-8
+       mode \R is equivalent to the following:
+
+         (?>\r\n|\n|\x0b|\f|\r|\x85)
+
+       This  is  an  example  of an "atomic group", details of which are given
+       below.  This particular group matches either the two-character sequence
+       CR  followed  by  LF,  or  one  of  the single characters LF (linefeed,
+       U+000A), VT (vertical tab, U+000B), FF (formfeed, U+000C), CR (carriage
+       return, U+000D), or NEL (next line, U+0085). The two-character sequence
+       is treated as a single unit that cannot be split.
+
+       In UTF-8 mode, two additional characters whose codepoints  are  greater
+       than 255 are added: LS (line separator, U+2028) and PS (paragraph sepa-
+       rator, U+2029).  Unicode character property support is not  needed  for
+       these characters to be recognized.
+
+       It is possible to restrict \R to match only CR, LF, or CRLF (instead of
+       the complete set  of  Unicode  line  endings)  by  setting  the  option
+       PCRE_BSR_ANYCRLF either at compile time or when the pattern is matched.
+       (BSR is an abbrevation for "backslash R".) This can be made the default
+       when  PCRE  is  built;  if this is the case, the other behaviour can be
+       requested via the PCRE_BSR_UNICODE option.   It  is  also  possible  to
+       specify  these  settings  by  starting a pattern string with one of the
+       following sequences:
+
+         (*BSR_ANYCRLF)   CR, LF, or CRLF only
+         (*BSR_UNICODE)   any Unicode newline sequence
+
+       These override the default and the options given to pcre_compile(), but
+       they can be overridden by options given to pcre_exec(). Note that these
+       special settings, which are not Perl-compatible, are recognized only at
+       the  very  start  of a pattern, and that they must be in upper case. If
+       more than one of them is present, the last one is  used.  They  can  be
+       combined  with  a  change of newline convention, for example, a pattern
+       can start with:
+
+         (*ANY)(*BSR_ANYCRLF)
+
+       Inside a character class, \R matches the letter "R".
 
    Unicode character properties
 
        When PCRE is built with Unicode character property support, three addi-
-       tional  escape  sequences  to  match character properties are available
-       when UTF-8 mode is selected. They are:
+       tional  escape sequences that match characters with specific properties
+       are available.  When not in UTF-8 mode, these sequences are  of  course
+       limited  to  testing characters whose codepoints are less than 256, but
+       they do work in this mode.  The extra escape sequences are:
 
          \p{xx}   a character with the xx property
          \P{xx}   a character without the xx property
@@ -2788,15 +3395,15 @@
        Those that are not part of an identified script are lumped together  as
        "Common". The current list of scripts is:
 
-       Arabic,  Armenian,  Bengali,  Bopomofo, Braille, Buginese, Buhid, Cana-
-       dian_Aboriginal, Cherokee, Common, Coptic, Cypriot, Cyrillic,  Deseret,
-       Devanagari,  Ethiopic,  Georgian,  Glagolitic, Gothic, Greek, Gujarati,
-       Gurmukhi, Han, Hangul, Hanunoo, Hebrew, Hiragana,  Inherited,  Kannada,
-       Katakana,  Kharoshthi,  Khmer,  Lao, Latin, Limbu, Linear_B, Malayalam,
-       Mongolian, Myanmar, New_Tai_Lue, Ogham, Old_Italic, Old_Persian, Oriya,
-       Osmanya,  Runic,  Shavian, Sinhala, Syloti_Nagri, Syriac, Tagalog, Tag-
-       banwa,  Tai_Le,  Tamil,  Telugu,  Thaana,  Thai,   Tibetan,   Tifinagh,
-       Ugaritic, Yi.
+       Arabic,  Armenian,  Balinese,  Bengali,  Bopomofo,  Braille,  Buginese,
+       Buhid,  Canadian_Aboriginal,  Cherokee,  Common,   Coptic,   Cuneiform,
+       Cypriot, Cyrillic, Deseret, Devanagari, Ethiopic, Georgian, Glagolitic,
+       Gothic, Greek, Gujarati, Gurmukhi, Han, Hangul, Hanunoo, Hebrew,  Hira-
+       gana,  Inherited,  Kannada,  Katakana,  Kharoshthi,  Khmer, Lao, Latin,
+       Limbu,  Linear_B,  Malayalam,  Mongolian,  Myanmar,  New_Tai_Lue,  Nko,
+       Ogham,  Old_Italic,  Old_Persian, Oriya, Osmanya, Phags_Pa, Phoenician,
+       Runic,  Shavian,  Sinhala,  Syloti_Nagri,  Syriac,  Tagalog,  Tagbanwa,
+       Tai_Le, Tamil, Telugu, Thaana, Thai, Tibetan, Tifinagh, Ugaritic, Yi.
 
        Each  character has exactly one general category property, specified by
        a two-letter abbreviation. For compatibility with Perl, negation can be
@@ -2861,6 +3468,12 @@
        has the Lu, Ll, or Lt property, in other words, a letter  that  is  not
        classified as a modifier or "other".
 
+       The  Cs  (Surrogate)  property  applies only to characters in the range
+       U+D800 to U+DFFF. Such characters are not valid in UTF-8  strings  (see
+       RFC 3629) and so cannot be tested by PCRE, unless UTF-8 validity check-
+       ing has been turned off (see the discussion  of  PCRE_NO_UTF8_CHECK  in
+       the pcreapi page).
+
        The  long  synonyms  for  these  properties that Perl supports (such as
        \p{Letter}) are not supported by PCRE, nor is it  permitted  to  prefix
        any of these properties with "Is".
@@ -2880,63 +3493,85 @@
        That  is,  it matches a character without the "mark" property, followed
        by zero or more characters with the "mark"  property,  and  treats  the
        sequence  as  an  atomic group (see below).  Characters with the "mark"
-       property are typically accents that affect the preceding character.
+       property are typically accents that  affect  the  preceding  character.
+       None  of  them  have  codepoints less than 256, so in non-UTF-8 mode \X
+       matches any one character.
 
        Matching characters by Unicode property is not fast, because  PCRE  has
        to  search  a  structure  that  contains data for over fifteen thousand
        characters. That is why the traditional escape sequences such as \d and
        \w do not use Unicode properties in PCRE.
 
+   Resetting the match start
+
+       The escape sequence \K, which is a Perl 5.10 feature, causes any previ-
+       ously matched characters not  to  be  included  in  the  final  matched
+       sequence. For example, the pattern:
+
+         foo\Kbar
+
+       matches  "foobar",  but reports that it has matched "bar". This feature
+       is similar to a lookbehind assertion (described  below).   However,  in
+       this  case, the part of the subject before the real match does not have
+       to be of fixed length, as lookbehind assertions do. The use of \K  does
+       not  interfere  with  the setting of captured substrings.  For example,
+       when the pattern
+
+         (foo)\Kbar
+
+       matches "foobar", the first substring is still set to "foo".
+
    Simple assertions
 
-       The fourth use of backslash is for certain simple assertions. An asser-
-       tion specifies a condition that has to be met at a particular point  in
-       a  match, without consuming any characters from the subject string. The
-       use of subpatterns for more complicated assertions is described  below.
+       The final use of backslash is for certain simple assertions. An  asser-
+       tion  specifies a condition that has to be met at a particular point in
+       a match, without consuming any characters from the subject string.  The
+       use  of subpatterns for more complicated assertions is described below.
        The backslashed assertions are:
 
          \b     matches at a word boundary
          \B     matches when not at a word boundary
-         \A     matches at start of subject
-         \Z     matches at end of subject or before newline at end
-         \z     matches at end of subject
-         \G     matches at first matching position in subject
+         \A     matches at the start of the subject
+         \Z     matches at the end of the subject
+                 also matches before a newline at the end of the subject
+         \z     matches only at the end of the subject
+         \G     matches at the first matching position in the subject
 
-       These  assertions may not appear in character classes (but note that \b
+       These assertions may not appear in character classes (but note that  \b
        has a different meaning, namely the backspace character, inside a char-
        acter class).
 
-       A  word  boundary is a position in the subject string where the current
-       character and the previous character do not both match \w or  \W  (i.e.
-       one  matches  \w  and the other matches \W), or the start or end of the
+       A word boundary is a position in the subject string where  the  current
+       character  and  the previous character do not both match \w or \W (i.e.
+       one matches \w and the other matches \W), or the start or  end  of  the
        string if the first or last character matches \w, respectively.
 
-       The \A, \Z, and \z assertions differ from  the  traditional  circumflex
+       The  \A,  \Z,  and \z assertions differ from the traditional circumflex
        and dollar (described in the next section) in that they only ever match
-       at the very start and end of the subject string, whatever  options  are
-       set.  Thus,  they are independent of multiline mode. These three asser-
+       at  the  very start and end of the subject string, whatever options are
+       set. Thus, they are independent of multiline mode. These  three  asser-
        tions are not affected by the PCRE_NOTBOL or PCRE_NOTEOL options, which
-       affect  only the behaviour of the circumflex and dollar metacharacters.
-       However, if the startoffset argument of pcre_exec() is non-zero,  indi-
+       affect only the behaviour of the circumflex and dollar  metacharacters.
+       However,  if the startoffset argument of pcre_exec() is non-zero, indi-
        cating that matching is to start at a point other than the beginning of
-       the subject, \A can never match. The difference between \Z  and  \z  is
+       the  subject,  \A  can never match. The difference between \Z and \z is
        that \Z matches before a newline at the end of the string as well as at
        the very end, whereas \z matches only at the end.
 
-       The \G assertion is true only when the current matching position is  at
-       the  start point of the match, as specified by the startoffset argument
-       of pcre_exec(). It differs from \A when the  value  of  startoffset  is
-       non-zero.  By calling pcre_exec() multiple times with appropriate argu-
+       The  \G assertion is true only when the current matching position is at
+       the start point of the match, as specified by the startoffset  argument
+       of  pcre_exec().  It  differs  from \A when the value of startoffset is
+       non-zero. By calling pcre_exec() multiple times with appropriate  argu-
        ments, you can mimic Perl's /g option, and it is in this kind of imple-
        mentation where \G can be useful.
 
-       Note,  however,  that  PCRE's interpretation of \G, as the start of the
+       Note, however, that PCRE's interpretation of \G, as the  start  of  the
        current match, is subtly different from Perl's, which defines it as the
-       end  of  the  previous  match. In Perl, these can be different when the
-       previously matched string was empty. Because PCRE does just  one  match
+       end of the previous match. In Perl, these can  be  different  when  the
+       previously  matched  string was empty. Because PCRE does just one match
        at a time, it cannot reproduce this behaviour.
 
-       If  all  the alternatives of a pattern begin with \G, the expression is
+       If all the alternatives of a pattern begin with \G, the  expression  is
        anchored to the starting match position, and the "anchored" flag is set
        in the compiled regular expression.
 
@@ -2944,69 +3579,72 @@
 CIRCUMFLEX AND DOLLAR
 
        Outside a character class, in the default matching mode, the circumflex
-       character is an assertion that is true only  if  the  current  matching
-       point  is  at the start of the subject string. If the startoffset argu-
-       ment of pcre_exec() is non-zero, circumflex  can  never  match  if  the
-       PCRE_MULTILINE  option  is  unset. Inside a character class, circumflex
+       character  is  an  assertion  that is true only if the current matching
+       point is at the start of the subject string. If the  startoffset  argu-
+       ment  of  pcre_exec()  is  non-zero,  circumflex can never match if the
+       PCRE_MULTILINE option is unset. Inside a  character  class,  circumflex
        has an entirely different meaning (see below).
 
-       Circumflex need not be the first character of the pattern if  a  number
-       of  alternatives are involved, but it should be the first thing in each
-       alternative in which it appears if the pattern is ever  to  match  that
-       branch.  If all possible alternatives start with a circumflex, that is,
-       if the pattern is constrained to match only at the start  of  the  sub-
-       ject,  it  is  said  to be an "anchored" pattern. (There are also other
+       Circumflex  need  not be the first character of the pattern if a number
+       of alternatives are involved, but it should be the first thing in  each
+       alternative  in  which  it appears if the pattern is ever to match that
+       branch. If all possible alternatives start with a circumflex, that  is,
+       if  the  pattern  is constrained to match only at the start of the sub-
+       ject, it is said to be an "anchored" pattern.  (There  are  also  other
        constructs that can cause a pattern to be anchored.)
 
-       A dollar character is an assertion that is true  only  if  the  current
-       matching  point  is  at  the  end of the subject string, or immediately
+       A  dollar  character  is  an assertion that is true only if the current
+       matching point is at the end of  the  subject  string,  or  immediately
        before a newline at the end of the string (by default). Dollar need not
-       be  the  last  character of the pattern if a number of alternatives are
-       involved, but it should be the last item in  any  branch  in  which  it
+       be the last character of the pattern if a number  of  alternatives  are
+       involved,  but  it  should  be  the last item in any branch in which it
        appears. Dollar has no special meaning in a character class.
 
-       The  meaning  of  dollar  can be changed so that it matches only at the
-       very end of the string, by setting the  PCRE_DOLLAR_ENDONLY  option  at
+       The meaning of dollar can be changed so that it  matches  only  at  the
+       very  end  of  the string, by setting the PCRE_DOLLAR_ENDONLY option at
        compile time. This does not affect the \Z assertion.
 
        The meanings of the circumflex and dollar characters are changed if the
-       PCRE_MULTILINE option is set. When  this  is  the  case,  a  circumflex
-       matches  immediately after internal newlines as well as at the start of
-       the subject string. It does not match after a  newline  that  ends  the
-       string.  A dollar matches before any newlines in the string, as well as
-       at the very end, when PCRE_MULTILINE is set. When newline is  specified
-       as  the  two-character  sequence CRLF, isolated CR and LF characters do
+       PCRE_MULTILINE  option  is  set.  When  this  is the case, a circumflex
+       matches immediately after internal newlines as well as at the start  of
+       the  subject  string.  It  does not match after a newline that ends the
+       string. A dollar matches before any newlines in the string, as well  as
+       at  the very end, when PCRE_MULTILINE is set. When newline is specified
+       as the two-character sequence CRLF, isolated CR and  LF  characters  do
        not indicate newlines.
 
-       For example, the pattern /^abc$/ matches the subject string  "def\nabc"
-       (where  \n  represents a newline) in multiline mode, but not otherwise.
-       Consequently, patterns that are anchored in single  line  mode  because
-       all  branches  start  with  ^ are not anchored in multiline mode, and a
-       match for circumflex is  possible  when  the  startoffset  argument  of
-       pcre_exec()  is  non-zero. The PCRE_DOLLAR_ENDONLY option is ignored if
+       For  example, the pattern /^abc$/ matches the subject string "def\nabc"
+       (where \n represents a newline) in multiline mode, but  not  otherwise.
+       Consequently,  patterns  that  are anchored in single line mode because
+       all branches start with ^ are not anchored in  multiline  mode,  and  a
+       match  for  circumflex  is  possible  when  the startoffset argument of
+       pcre_exec() is non-zero. The PCRE_DOLLAR_ENDONLY option is  ignored  if
        PCRE_MULTILINE is set.
 
-       Note that the sequences \A, \Z, and \z can be used to match  the  start
-       and  end of the subject in both modes, and if all branches of a pattern
-       start with \A it is always anchored, whether or not  PCRE_MULTILINE  is
+       Note  that  the sequences \A, \Z, and \z can be used to match the start
+       and end of the subject in both modes, and if all branches of a  pattern
+       start  with  \A it is always anchored, whether or not PCRE_MULTILINE is
        set.
 
 
 FULL STOP (PERIOD, DOT)
 
        Outside a character class, a dot in the pattern matches any one charac-
-       ter in the subject string except (by default) a character  that  signi-
-       fies  the  end  of  a line. In UTF-8 mode, the matched character may be
-       more than one byte long. When a line ending  is  defined  as  a  single
-       character  (CR  or LF), dot never matches that character; when the two-
-       character sequence CRLF is used, dot does not match CR if it is immedi-
-       ately  followed by LF, but otherwise it matches all characters (includ-
-       ing isolated CRs and LFs).
+       ter  in  the subject string except (by default) a character that signi-
+       fies the end of a line. In UTF-8 mode, the  matched  character  may  be
+       more than one byte long.
+
+       When  a line ending is defined as a single character, dot never matches
+       that character; when the two-character sequence CRLF is used, dot  does
+       not  match  CR  if  it  is immediately followed by LF, but otherwise it
+       matches all characters (including isolated CRs and LFs). When any  Uni-
+       code  line endings are being recognized, dot does not match CR or LF or
+       any of the other line ending characters.
 
        The behaviour of dot with regard to newlines can  be  changed.  If  the
        PCRE_DOTALL  option  is  set,  a dot matches any one character, without
-       exception. If newline is defined as the two-character sequence CRLF, it
-       takes two dots to match it.
+       exception. If the two-character sequence CRLF is present in the subject
+       string, it takes two dots to match it.
 
        The  handling of dot is entirely independent of the handling of circum-
        flex and dollar, the only relationship being  that  they  both  involve
@@ -3016,14 +3654,15 @@
 MATCHING A SINGLE BYTE
 
        Outside a character class, the escape sequence \C matches any one byte,
-       both in and out of UTF-8 mode. Unlike a dot, it always matches  CR  and
-       LF.  The feature is provided in Perl in order to match individual bytes
-       in UTF-8 mode.  Because it breaks up UTF-8 characters  into  individual
-       bytes,  what remains in the string may be a malformed UTF-8 string. For
-       this reason, the \C escape sequence is best avoided.
+       both in and out of UTF-8 mode. Unlike a  dot,  it  always  matches  any
+       line-ending  characters.  The  feature  is provided in Perl in order to
+       match individual bytes in UTF-8 mode. Because it breaks up UTF-8  char-
+       acters  into individual bytes, what remains in the string may be a mal-
+       formed UTF-8 string. For this reason, the \C escape  sequence  is  best
+       avoided.
 
-       PCRE does not allow \C to appear in  lookbehind  assertions  (described
-       below),  because  in UTF-8 mode this would make it impossible to calcu-
+       PCRE  does  not  allow \C to appear in lookbehind assertions (described
+       below), because in UTF-8 mode this would make it impossible  to  calcu-
        late the length of the lookbehind.
 
 
@@ -3032,96 +3671,96 @@
        An opening square bracket introduces a character class, terminated by a
        closing square bracket. A closing square bracket on its own is not spe-
        cial. If a closing square bracket is required as a member of the class,
-       it  should  be  the first data character in the class (after an initial
+       it should be the first data character in the class  (after  an  initial
        circumflex, if present) or escaped with a backslash.
 
-       A character class matches a single character in the subject.  In  UTF-8
-       mode,  the character may occupy more than one byte. A matched character
+       A  character  class matches a single character in the subject. In UTF-8
+       mode, the character may occupy more than one byte. A matched  character
        must be in the set of characters defined by the class, unless the first
-       character  in  the  class definition is a circumflex, in which case the
-       subject character must not be in the set defined by  the  class.  If  a
-       circumflex  is actually required as a member of the class, ensure it is
+       character in the class definition is a circumflex, in  which  case  the
+       subject  character  must  not  be in the set defined by the class. If a
+       circumflex is actually required as a member of the class, ensure it  is
        not the first character, or escape it with a backslash.
 
-       For example, the character class [aeiou] matches any lower case  vowel,
-       while  [^aeiou]  matches  any character that is not a lower case vowel.
+       For  example, the character class [aeiou] matches any lower case vowel,
+       while [^aeiou] matches any character that is not a  lower  case  vowel.
        Note that a circumflex is just a convenient notation for specifying the
-       characters  that  are in the class by enumerating those that are not. A
-       class that starts with a circumflex is not an assertion: it still  con-
-       sumes  a  character  from the subject string, and therefore it fails if
+       characters that are in the class by enumerating those that are  not.  A
+       class  that starts with a circumflex is not an assertion: it still con-
+       sumes a character from the subject string, and therefore  it  fails  if
        the current pointer is at the end of the string.
 
-       In UTF-8 mode, characters with values greater than 255 can be  included
-       in  a  class as a literal string of bytes, or by using the \x{ escaping
+       In  UTF-8 mode, characters with values greater than 255 can be included
+       in a class as a literal string of bytes, or by using the  \x{  escaping
        mechanism.
 
-       When caseless matching is set, any letters in a  class  represent  both
-       their  upper  case  and lower case versions, so for example, a caseless
-       [aeiou] matches "A" as well as "a", and a caseless  [^aeiou]  does  not
-       match  "A", whereas a caseful version would. In UTF-8 mode, PCRE always
-       understands the concept of case for characters whose  values  are  less
-       than  128, so caseless matching is always possible. For characters with
-       higher values, the concept of case is supported  if  PCRE  is  compiled
-       with  Unicode  property support, but not otherwise.  If you want to use
-       caseless matching for characters 128 and above, you  must  ensure  that
-       PCRE  is  compiled  with Unicode property support as well as with UTF-8
+       When  caseless  matching  is set, any letters in a class represent both
+       their upper case and lower case versions, so for  example,  a  caseless
+       [aeiou]  matches  "A"  as well as "a", and a caseless [^aeiou] does not
+       match "A", whereas a caseful version would. In UTF-8 mode, PCRE  always
+       understands  the  concept  of case for characters whose values are less
+       than 128, so caseless matching is always possible. For characters  with
+       higher  values,  the  concept  of case is supported if PCRE is compiled
+       with Unicode property support, but not otherwise.  If you want  to  use
+       caseless  matching  for  characters 128 and above, you must ensure that
+       PCRE is compiled with Unicode property support as well  as  with  UTF-8
        support.
 
-       Characters that might indicate  line  breaks  (CR  and  LF)  are  never
-       treated  in  any  special way when matching character classes, whatever
-       line-ending sequence is in use, and whatever setting of the PCRE_DOTALL
-       and PCRE_MULTILINE options is used. A class such as [^a] always matches
-       one of these characters.
-
-       The minus (hyphen) character can be used to specify a range of  charac-
-       ters  in  a  character  class.  For  example,  [d-m] matches any letter
-       between d and m, inclusive. If a  minus  character  is  required  in  a
-       class,  it  must  be  escaped  with a backslash or appear in a position
-       where it cannot be interpreted as indicating a range, typically as  the
+       Characters  that  might  indicate  line breaks are never treated in any
+       special way  when  matching  character  classes,  whatever  line-ending
+       sequence  is  in  use,  and  whatever  setting  of  the PCRE_DOTALL and
+       PCRE_MULTILINE options is used. A class such as [^a] always matches one
+       of these characters.
+
+       The  minus (hyphen) character can be used to specify a range of charac-
+       ters in a character  class.  For  example,  [d-m]  matches  any  letter
+       between  d  and  m,  inclusive.  If  a minus character is required in a
+       class, it must be escaped with a backslash  or  appear  in  a  position
+       where  it cannot be interpreted as indicating a range, typically as the
        first or last character in the class.
 
        It is not possible to have the literal character "]" as the end charac-
-       ter of a range. A pattern such as [W-]46] is interpreted as a class  of
-       two  characters ("W" and "-") followed by a literal string "46]", so it
-       would match "W46]" or "-46]". However, if the "]"  is  escaped  with  a
-       backslash  it is interpreted as the end of range, so [W-\]46] is inter-
-       preted as a class containing a range followed by two other  characters.
-       The  octal or hexadecimal representation of "]" can also be used to end
+       ter  of a range. A pattern such as [W-]46] is interpreted as a class of
+       two characters ("W" and "-") followed by a literal string "46]", so  it
+       would  match  "W46]"  or  "-46]". However, if the "]" is escaped with a
+       backslash it is interpreted as the end of range, so [W-\]46] is  inter-
+       preted  as a class containing a range followed by two other characters.
+       The octal or hexadecimal representation of "]" can also be used to  end
        a range.
 
-       Ranges operate in the collating sequence of character values. They  can
-       also   be  used  for  characters  specified  numerically,  for  example
-       [\000-\037]. In UTF-8 mode, ranges can include characters whose  values
+       Ranges  operate in the collating sequence of character values. They can
+       also  be  used  for  characters  specified  numerically,  for   example
+       [\000-\037].  In UTF-8 mode, ranges can include characters whose values
        are greater than 255, for example [\x{100}-\x{2ff}].
 
        If a range that includes letters is used when caseless matching is set,
        it matches the letters in either case. For example, [W-c] is equivalent
-       to  [][\\^_`wxyzabc],  matched  caselessly,  and  in non-UTF-8 mode, if
-       character tables for the "fr_FR" locale are in use, [\xc8-\xcb] matches
-       accented  E  characters in both cases. In UTF-8 mode, PCRE supports the
-       concept of case for characters with values greater than 128  only  when
+       to [][\\^_`wxyzabc], matched caselessly,  and  in  non-UTF-8  mode,  if
+       character  tables  for  a French locale are in use, [\xc8-\xcb] matches
+       accented E characters in both cases. In UTF-8 mode, PCRE  supports  the
+       concept  of  case for characters with values greater than 128 only when
        it is compiled with Unicode property support.
 
-       The  character types \d, \D, \p, \P, \s, \S, \w, and \W may also appear
-       in a character class, and add the characters that  they  match  to  the
+       The character types \d, \D, \p, \P, \s, \S, \w, and \W may also  appear
+       in  a  character  class,  and add the characters that they match to the
        class. For example, [\dABCDEF] matches any hexadecimal digit. A circum-
-       flex can conveniently be used with the upper case  character  types  to
-       specify  a  more  restricted  set of characters than the matching lower
-       case type. For example, the class [^\W_] matches any letter  or  digit,
+       flex  can  conveniently  be used with the upper case character types to
+       specify a more restricted set of characters  than  the  matching  lower
+       case  type.  For example, the class [^\W_] matches any letter or digit,
        but not underscore.
 
-       The  only  metacharacters  that are recognized in character classes are
-       backslash, hyphen (only where it can be  interpreted  as  specifying  a
-       range),  circumflex  (only  at the start), opening square bracket (only
-       when it can be interpreted as introducing a POSIX class name - see  the
-       next  section),  and  the  terminating closing square bracket. However,
+       The only metacharacters that are recognized in  character  classes  are
+       backslash,  hyphen  (only  where  it can be interpreted as specifying a
+       range), circumflex (only at the start), opening  square  bracket  (only
+       when  it can be interpreted as introducing a POSIX class name - see the
+       next section), and the terminating  closing  square  bracket.  However,
        escaping other non-alphanumeric characters does no harm.
 
 
 POSIX CHARACTER CLASSES
 
        Perl supports the POSIX notation for character classes. This uses names
-       enclosed  by  [: and :] within the enclosing square brackets. PCRE also
+       enclosed by [: and :] within the enclosing square brackets.  PCRE  also
        supports this notation. For example,
 
          [01[:alpha:]%]
@@ -3144,18 +3783,18 @@
          word     "word" characters (same as \w)
          xdigit   hexadecimal digits
 
-       The  "space" characters are HT (9), LF (10), VT (11), FF (12), CR (13),
-       and space (32). Notice that this list includes the VT  character  (code
+       The "space" characters are HT (9), LF (10), VT (11), FF (12), CR  (13),
+       and  space  (32). Notice that this list includes the VT character (code
        11). This makes "space" different to \s, which does not include VT (for
        Perl compatibility).
 
-       The name "word" is a Perl extension, and "blank"  is  a  GNU  extension
-       from  Perl  5.8. Another Perl extension is negation, which is indicated
+       The  name  "word"  is  a Perl extension, and "blank" is a GNU extension
+       from Perl 5.8. Another Perl extension is negation, which  is  indicated
        by a ^ character after the colon. For example,
 
          [12[:^digit:]]
 
-       matches "1", "2", or any non-digit. PCRE (and Perl) also recognize  the
+       matches  "1", "2", or any non-digit. PCRE (and Perl) also recognize the
        POSIX syntax [.ch.] and [=ch=] where "ch" is a "collating element", but
        these are not supported, and an error is given if they are encountered.
 
@@ -3175,15 +3814,15 @@
        string). The matching process tries each alternative in turn, from left
        to right, and the first one that succeeds is used. If the  alternatives
        are  within a subpattern (defined below), "succeeds" means matching the
-       rest of the main pattern as well as the alternative in the  subpattern.
+       rest of the main pattern as well as the alternative in the subpattern.
 
 
 INTERNAL OPTION SETTING
 
-       The  settings  of  the  PCRE_CASELESS, PCRE_MULTILINE, PCRE_DOTALL, and
-       PCRE_EXTENDED options can be changed  from  within  the  pattern  by  a
-       sequence  of  Perl  option  letters  enclosed between "(?" and ")". The
-       option letters are
+       The settings of the  PCRE_CASELESS,  PCRE_MULTILINE,  PCRE_DOTALL,  and
+       PCRE_EXTENDED  options  (which are Perl-compatible) can be changed from
+       within the pattern by  a  sequence  of  Perl  option  letters  enclosed
+       between "(?" and ")".  The option letters are
 
          i  for PCRE_CASELESS
          m  for PCRE_MULTILINE
@@ -3192,19 +3831,24 @@
 
        For example, (?im) sets caseless, multiline matching. It is also possi-
        ble to unset these options by preceding the letter with a hyphen, and a
-       combined setting and unsetting such as (?im-sx), which sets  PCRE_CASE-
-       LESS  and PCRE_MULTILINE while unsetting PCRE_DOTALL and PCRE_EXTENDED,
-       is also permitted. If a  letter  appears  both  before  and  after  the
+       combined  setting and unsetting such as (?im-sx), which sets PCRE_CASE-
+       LESS and PCRE_MULTILINE while unsetting PCRE_DOTALL and  PCRE_EXTENDED,
+       is  also  permitted.  If  a  letter  appears  both before and after the
        hyphen, the option is unset.
 
-       When  an option change occurs at top level (that is, not inside subpat-
-       tern parentheses), the change applies to the remainder of  the  pattern
-       that follows.  If the change is placed right at the start of a pattern,
-       PCRE extracts it into the global options (and it will therefore show up
-       in data extracted by the pcre_fullinfo() function).
+       The PCRE-specific options PCRE_DUPNAMES, PCRE_UNGREEDY, and  PCRE_EXTRA
+       can  be changed in the same way as the Perl-compatible options by using
+       the characters J, U and X respectively.
 
-       An option change within a subpattern affects only that part of the cur-
-       rent pattern that follows it, so
+       When one of these option changes occurs at  top  level  (that  is,  not
+       inside  subpattern parentheses), the change applies to the remainder of
+       the pattern that follows. If the change is placed right at the start of
+       a pattern, PCRE extracts it into the global options (and it will there-
+       fore show up in data extracted by the pcre_fullinfo() function).
+
+       An option change within a subpattern (see below for  a  description  of
+       subpatterns) affects only that part of the current pattern that follows
+       it, so
 
          (a(?i)b)c
 
@@ -3221,9 +3865,13 @@
        the effects of option settings happen at compile time. There  would  be
        some very weird behaviour otherwise.
 
-       The  PCRE-specific options PCRE_DUPNAMES, PCRE_UNGREEDY, and PCRE_EXTRA
-       can be changed in the same way as the Perl-compatible options by  using
-       the characters J, U and X respectively.
+       Note:  There  are  other  PCRE-specific  options that can be set by the
+       application when the compile or match functions  are  called.  In  some
+       cases the pattern can contain special leading sequences such as (*CRLF)
+       to override what the application has set or what  has  been  defaulted.
+       Details  are  given  in the section entitled "Newline sequences" above.
+       There is also the (*UTF8) leading sequence that  can  be  used  to  set
+       UTF-8 mode; this is equivalent to setting the PCRE_UTF8 option.
 
 
 SUBPATTERNS
@@ -3236,7 +3884,7 @@
          cat(aract|erpillar|)
 
        matches one of the words "cat", "cataract", or  "caterpillar".  Without
-       the  parentheses,  it  would  match "cataract", "erpillar" or the empty
+       the  parentheses,  it  would  match  "cataract", "erpillar" or an empty
        string.
 
        2. It sets up the subpattern as  a  capturing  subpattern.  This  means
@@ -3265,9 +3913,7 @@
          the ((?:red|white) (king|queen))
 
        the captured substrings are "white queen" and "queen", and are numbered
-       1 and 2. The maximum number of capturing subpatterns is 65535, and  the
-       maximum  depth  of  nesting of all subpatterns, both capturing and non-
-       capturing, is 200.
+       1 and 2. The maximum number of capturing subpatterns is 65535.
 
        As a convenient shorthand, if any option settings are required  at  the
        start  of  a  non-capturing  subpattern,  the option letters may appear
@@ -3283,73 +3929,118 @@
        "Saturday".
 
 
+DUPLICATE SUBPATTERN NUMBERS
+
+       Perl 5.10 introduced a feature whereby each alternative in a subpattern
+       uses  the same numbers for its capturing parentheses. Such a subpattern
+       starts with (?| and is itself a non-capturing subpattern. For  example,
+       consider this pattern:
+
+         (?|(Sat)ur|(Sun))day
+
+       Because  the two alternatives are inside a (?| group, both sets of cap-
+       turing parentheses are numbered one. Thus, when  the  pattern  matches,
+       you  can  look  at captured substring number one, whichever alternative
+       matched. This construct is useful when you want to  capture  part,  but
+       not all, of one of a number of alternatives. Inside a (?| group, paren-
+       theses are numbered as usual, but the number is reset at the  start  of
+       each  branch. The numbers of any capturing buffers that follow the sub-
+       pattern start after the highest number used in any branch. The  follow-
+       ing  example  is taken from the Perl documentation.  The numbers under-
+       neath show in which buffer the captured content will be stored.
+
+         # before  ---------------branch-reset----------- after
+         / ( a )  (?| x ( y ) z | (p (q) r) | (t) u (v) ) ( z ) /x
+         # 1            2         2  3        2     3     4
+
+       A backreference or a recursive call to  a  numbered  subpattern  always
+       refers to the first one in the pattern with the given number.
+
+       An  alternative approach to using this "branch reset" feature is to use
+       duplicate named subpatterns, as described in the next section.
+
+
 NAMED SUBPATTERNS
 
        Identifying capturing parentheses by number is simple, but  it  can  be
        very  hard  to keep track of the numbers in complicated regular expres-
        sions. Furthermore, if an  expression  is  modified,  the  numbers  may
        change.  To help with this difficulty, PCRE supports the naming of sub-
-       patterns, something that Perl  does  not  provide.  The  Python  syntax
-       (?P...)  is  used. References to capturing parentheses from other
-       parts of the pattern, such as  backreferences,  recursion,  and  condi-
-       tions, can be made by name as well as by number.
+       patterns. This feature was not added to Perl until release 5.10. Python
+       had  the  feature earlier, and PCRE introduced it at release 4.0, using
+       the Python syntax. PCRE now supports both the Perl and the Python  syn-
+       tax.
+
+       In  PCRE,  a subpattern can be named in one of three ways: (?...)
+       or (?'name'...) as in Perl, or (?P...) as in  Python.  References
+       to capturing parentheses from other parts of the pattern, such as back-
+       references, recursion, and conditions, can be made by name as  well  as
+       by number.
 
        Names  consist  of  up  to  32 alphanumeric characters and underscores.
        Named capturing parentheses are still  allocated  numbers  as  well  as
-       names. The PCRE API provides function calls for extracting the name-to-
-       number translation table from a compiled pattern. There is also a  con-
-       venience function for extracting a captured substring by name.
+       names,  exactly as if the names were not present. The PCRE API provides
+       function calls for extracting the name-to-number translation table from
+       a compiled pattern. There is also a convenience function for extracting
+       a captured substring by name.
 
-       By  default, a name must be unique within a pattern, but it is possible
+       By default, a name must be unique within a pattern, but it is  possible
        to relax this constraint by setting the PCRE_DUPNAMES option at compile
-       time.  This  can  be useful for patterns where only one instance of the
-       named parentheses can match. Suppose you want to match the  name  of  a
-       weekday,  either as a 3-letter abbreviation or as the full name, and in
+       time. This can be useful for patterns where only one  instance  of  the
+       named  parentheses  can  match. Suppose you want to match the name of a
+       weekday, either as a 3-letter abbreviation or as the full name, and  in
        both cases you want to extract the abbreviation. This pattern (ignoring
        the line breaks) does the job:
 
-         (?PMon|Fri|Sun)(?:day)?|
-         (?PTue)(?:sday)?|
-         (?PWed)(?:nesday)?|
-         (?PThu)(?:rsday)?|
-         (?PSat)(?:urday)?
-
-       There  are  five capturing substrings, but only one is ever set after a
-       match.  The convenience  function  for  extracting  the  data  by  name
-       returns  the  substring  for  the first, and in this example, the only,
-       subpattern of that name that matched.  This  saves  searching  to  find
-       which  numbered  subpattern  it  was. If you make a reference to a non-
-       unique named subpattern from elsewhere in the  pattern,  the  one  that
-       corresponds  to  the  lowest number is used. For further details of the
-       interfaces for handling named subpatterns, see the  pcreapi  documenta-
-       tion.
+         (?Mon|Fri|Sun)(?:day)?|
+         (?Tue)(?:sday)?|
+         (?Wed)(?:nesday)?|
+         (?Thu)(?:rsday)?|
+         (?Sat)(?:urday)?
+
+       There are five capturing substrings, but only one is ever set  after  a
+       match.  (An alternative way of solving this problem is to use a "branch
+       reset" subpattern, as described in the previous section.)
+
+       The convenience function for extracting the data by  name  returns  the
+       substring  for  the first (and in this example, the only) subpattern of
+       that name that matched. This saves searching  to  find  which  numbered
+       subpattern  it  was. If you make a reference to a non-unique named sub-
+       pattern from elsewhere in the pattern, the one that corresponds to  the
+       lowest  number  is used. For further details of the interfaces for han-
+       dling named subpatterns, see the pcreapi documentation.
+
+       Warning: You cannot use different names to distinguish between two sub-
+       patterns  with  the same number (see the previous section) because PCRE
+       uses only the numbers when matching.
 
 
 REPETITION
 
-       Repetition  is  specified  by  quantifiers, which can follow any of the
+       Repetition is specified by quantifiers, which can  follow  any  of  the
        following items:
 
          a literal data character
-         the . metacharacter
+         the dot metacharacter
          the \C escape sequence
          the \X escape sequence (in UTF-8 mode with Unicode properties)
+         the \R escape sequence
          an escape such as \d that matches a single character
          a character class
          a back reference (see next section)
          a parenthesized subpattern (unless it is an assertion)
 
-       The general repetition quantifier specifies a minimum and maximum  num-
-       ber  of  permitted matches, by giving the two numbers in curly brackets
-       (braces), separated by a comma. The numbers must be  less  than  65536,
+       The  general repetition quantifier specifies a minimum and maximum num-
+       ber of permitted matches, by giving the two numbers in  curly  brackets
+       (braces),  separated  by  a comma. The numbers must be less than 65536,
        and the first must be less than or equal to the second. For example:
 
          z{2,4}
 
-       matches  "zz",  "zzz",  or  "zzzz". A closing brace on its own is not a
-       special character. If the second number is omitted, but  the  comma  is
-       present,  there  is  no upper limit; if the second number and the comma
-       are both omitted, the quantifier specifies an exact number of  required
+       matches "zz", "zzz", or "zzzz". A closing brace on its  own  is  not  a
+       special  character.  If  the second number is omitted, but the comma is
+       present, there is no upper limit; if the second number  and  the  comma
+       are  both omitted, the quantifier specifies an exact number of required
        matches. Thus
 
          [aeiou]{3,}
@@ -3358,9 +4049,9 @@
 
          \d{8}
 
-       matches  exactly  8  digits. An opening curly bracket that appears in a
-       position where a quantifier is not allowed, or one that does not  match
-       the  syntax of a quantifier, is taken as a literal character. For exam-
+       matches exactly 8 digits. An opening curly bracket that  appears  in  a
+       position  where a quantifier is not allowed, or one that does not match
+       the syntax of a quantifier, is taken as a literal character. For  exam-
        ple, {,6} is not a quantifier, but a literal string of four characters.
 
        In  UTF-8  mode,  quantifiers  apply to UTF-8 characters rather than to
@@ -3371,33 +4062,36 @@
        may be of different lengths).
 
        The quantifier {0} is permitted, causing the expression to behave as if
-       the previous item and the quantifier were not present.
+       the previous item and the quantifier were not present. This may be use-
+       ful for subpatterns that are referenced as subroutines  from  elsewhere
+       in the pattern. Items other than subpatterns that have a {0} quantifier
+       are omitted from the compiled pattern.
 
-       For  convenience  (and  historical compatibility) the three most common
-       quantifiers have single-character abbreviations:
+       For convenience, the three most common quantifiers have  single-charac-
+       ter abbreviations:
 
          *    is equivalent to {0,}
          +    is equivalent to {1,}
          ?    is equivalent to {0,1}
 
-       It is possible to construct infinite loops by  following  a  subpattern
+       It  is  possible  to construct infinite loops by following a subpattern
        that can match no characters with a quantifier that has no upper limit,
        for example:
 
          (a?)*
 
        Earlier versions of Perl and PCRE used to give an error at compile time
-       for  such  patterns. However, because there are cases where this can be
-       useful, such patterns are now accepted, but if any  repetition  of  the
-       subpattern  does in fact match no characters, the loop is forcibly bro-
+       for such patterns. However, because there are cases where this  can  be
+       useful,  such  patterns  are now accepted, but if any repetition of the
+       subpattern does in fact match no characters, the loop is forcibly  bro-
        ken.
 
-       By default, the quantifiers are "greedy", that is, they match  as  much
-       as  possible  (up  to  the  maximum number of permitted times), without
-       causing the rest of the pattern to fail. The classic example  of  where
+       By  default,  the quantifiers are "greedy", that is, they match as much
+       as possible (up to the maximum  number  of  permitted  times),  without
+       causing  the  rest of the pattern to fail. The classic example of where
        this gives problems is in trying to match comments in C programs. These
-       appear between /* and */ and within the comment,  individual  *  and  /
-       characters  may  appear. An attempt to match C comments by applying the
+       appear  between  /*  and  */ and within the comment, individual * and /
+       characters may appear. An attempt to match C comments by  applying  the
        pattern
 
          /\*.*\*/
@@ -3406,19 +4100,19 @@
 
          /* first comment */  not comment  /* second comment */
 
-       fails, because it matches the entire string owing to the greediness  of
+       fails,  because it matches the entire string owing to the greediness of
        the .*  item.
 
-       However,  if  a quantifier is followed by a question mark, it ceases to
+       However, if a quantifier is followed by a question mark, it  ceases  to
        be greedy, and instead matches the minimum number of times possible, so
        the pattern
 
          /\*.*?\*/
 
-       does  the  right  thing with the C comments. The meaning of the various
-       quantifiers is not otherwise changed,  just  the  preferred  number  of
-       matches.   Do  not  confuse this use of question mark with its use as a
-       quantifier in its own right. Because it has two uses, it can  sometimes
+       does the right thing with the C comments. The meaning  of  the  various
+       quantifiers  is  not  otherwise  changed,  just the preferred number of
+       matches.  Do not confuse this use of question mark with its  use  as  a
+       quantifier  in its own right. Because it has two uses, it can sometimes
        appear doubled, as in
 
          \d??\d
@@ -3426,22 +4120,23 @@
        which matches one digit by preference, but can match two if that is the
        only way the rest of the pattern matches.
 
-       If the PCRE_UNGREEDY option is set (an option which is not available in
-       Perl),  the  quantifiers are not greedy by default, but individual ones
-       can be made greedy by following them with a  question  mark.  In  other
+       If  the PCRE_UNGREEDY option is set (an option that is not available in
+       Perl), the quantifiers are not greedy by default, but  individual  ones
+       can  be  made  greedy  by following them with a question mark. In other
        words, it inverts the default behaviour.
 
-       When  a  parenthesized  subpattern  is quantified with a minimum repeat
-       count that is greater than 1 or with a limited maximum, more memory  is
-       required  for  the  compiled  pattern, in proportion to the size of the
+       When a parenthesized subpattern is quantified  with  a  minimum  repeat
+       count  that is greater than 1 or with a limited maximum, more memory is
+       required for the compiled pattern, in proportion to  the  size  of  the
        minimum or maximum.
 
        If a pattern starts with .* or .{0,} and the PCRE_DOTALL option (equiv-
-       alent  to Perl's /s) is set, thus allowing the . to match newlines, the
-       pattern is implicitly anchored, because whatever follows will be  tried
-       against  every character position in the subject string, so there is no
-       point in retrying the overall match at any position  after  the  first.
-       PCRE normally treats such a pattern as though it were preceded by \A.
+       alent to Perl's /s) is set, thus allowing the dot  to  match  newlines,
+       the  pattern  is  implicitly anchored, because whatever follows will be
+       tried against every character position in the subject string, so  there
+       is  no  point  in  retrying the overall match at any position after the
+       first. PCRE normally treats such a pattern as though it  were  preceded
+       by \A.
 
        In  cases  where  it  is known that the subject string contains no new-
        lines, it is worth setting PCRE_DOTALL in order to  obtain  this  opti-
@@ -3449,8 +4144,8 @@
 
        However,  there is one situation where the optimization cannot be used.
        When .*  is inside capturing parentheses that  are  the  subject  of  a
-       backreference  elsewhere in the pattern, a match at the start may fail,
-       and a later one succeed. Consider, for example:
+       backreference  elsewhere  in the pattern, a match at the start may fail
+       where a later one succeeds. Consider, for example:
 
          (.*)abc\1
 
@@ -3474,29 +4169,29 @@
 
 ATOMIC GROUPING AND POSSESSIVE QUANTIFIERS
 
-       With both maximizing and minimizing repetition, failure of what follows
-       normally causes the repeated item to be re-evaluated to see if  a  dif-
-       ferent number of repeats allows the rest of the pattern to match. Some-
-       times it is useful to prevent this, either to change the nature of  the
-       match,  or  to  cause it fail earlier than it otherwise might, when the
-       author of the pattern knows there is no point in carrying on.
+       With  both  maximizing ("greedy") and minimizing ("ungreedy" or "lazy")
+       repetition, failure of what follows normally causes the  repeated  item
+       to  be  re-evaluated to see if a different number of repeats allows the
+       rest of the pattern to match. Sometimes it is useful to  prevent  this,
+       either  to  change the nature of the match, or to cause it fail earlier
+       than it otherwise might, when the author of the pattern knows there  is
+       no point in carrying on.
 
-       Consider, for example, the pattern \d+foo when applied to  the  subject
+       Consider,  for  example, the pattern \d+foo when applied to the subject
        line
 
          123456bar
 
        After matching all 6 digits and then failing to match "foo", the normal
-       action of the matcher is to try again with only 5 digits  matching  the
-       \d+  item,  and  then  with  4,  and  so on, before ultimately failing.
-       "Atomic grouping" (a term taken from Jeffrey  Friedl's  book)  provides
-       the  means for specifying that once a subpattern has matched, it is not
+       action  of  the matcher is to try again with only 5 digits matching the
+       \d+ item, and then with  4,  and  so  on,  before  ultimately  failing.
+       "Atomic  grouping"  (a  term taken from Jeffrey Friedl's book) provides
+       the means for specifying that once a subpattern has matched, it is  not
        to be re-evaluated in this way.
 
-       If we use atomic grouping for the previous example, the  matcher  would
-       give up immediately on failing to match "foo" the first time. The nota-
-       tion is a kind of special parenthesis, starting with  (?>  as  in  this
-       example:
+       If  we  use atomic grouping for the previous example, the matcher gives
+       up immediately on failing to match "foo" the first time.  The  notation
+       is a kind of special parenthesis, starting with (?> as in this example:
 
          (?>\d+)foo
 
@@ -3525,16 +4220,28 @@
 
          \d++foo
 
-       Possessive  quantifiers  are  always  greedy;  the   setting   of   the
+       Note that a possessive quantifier can be used with an entire group, for
+       example:
+
+         (abc|xyz){2,3}+
+
+       Possessive   quantifiers   are   always  greedy;  the  setting  of  the
        PCRE_UNGREEDY option is ignored. They are a convenient notation for the
-       simpler forms of atomic group. However, there is no difference  in  the
-       meaning  or  processing  of  a possessive quantifier and the equivalent
-       atomic group.
-
-       The possessive quantifier syntax is an extension to  the  Perl  syntax.
-       Jeffrey  Friedl originated the idea (and the name) in the first edition
-       of his book.  Mike McCloskey liked it, so implemented it when he  built
-       Sun's Java package, and PCRE copied it from there.
+       simpler  forms  of atomic group. However, there is no difference in the
+       meaning of a possessive quantifier and  the  equivalent  atomic  group,
+       though  there  may  be a performance difference; possessive quantifiers
+       should be slightly faster.
+
+       The possessive quantifier syntax is an extension to the Perl  5.8  syn-
+       tax.   Jeffrey  Friedl  originated the idea (and the name) in the first
+       edition of his book. Mike McCloskey liked it, so implemented it when he
+       built  Sun's Java package, and PCRE copied it from there. It ultimately
+       found its way into Perl at release 5.10.
+
+       PCRE has an optimization that automatically "possessifies" certain sim-
+       ple  pattern  constructs.  For  example, the sequence A+B is treated as
+       A++B because there is no point in backtracking into a sequence  of  A's
+       when B must follow.
 
        When  a  pattern  contains an unlimited repeat inside a subpattern that
        can itself be repeated an unlimited number of  times,  the  use  of  an
@@ -3561,30 +4268,55 @@
 
          ((?>\D+)|<\d+>)*[!?]
 
-       sequences of non-digits cannot be broken, and failure happens  quickly.
+       sequences of non-digits cannot be broken, and failure happens quickly.
 
 
 BACK REFERENCES
 
        Outside a character class, a backslash followed by a digit greater than
        0 (and possibly further digits) is a back reference to a capturing sub-
-       pattern  earlier  (that is, to its left) in the pattern, provided there
+       pattern earlier (that is, to its left) in the pattern,  provided  there
        have been that many previous capturing left parentheses.
 
        However, if the decimal number following the backslash is less than 10,
-       it  is  always  taken  as a back reference, and causes an error only if
-       there are not that many capturing left parentheses in the  entire  pat-
-       tern.  In  other words, the parentheses that are referenced need not be
-       to the left of the reference for numbers less than 10. A "forward  back
-       reference"  of  this  type can make sense when a repetition is involved
-       and the subpattern to the right has participated in an  earlier  itera-
+       it is always taken as a back reference, and causes  an  error  only  if
+       there  are  not that many capturing left parentheses in the entire pat-
+       tern. In other words, the parentheses that are referenced need  not  be
+       to  the left of the reference for numbers less than 10. A "forward back
+       reference" of this type can make sense when a  repetition  is  involved
+       and  the  subpattern to the right has participated in an earlier itera-
        tion.
 
-       It is not possible to have a numerical "forward back reference" to sub-
-       pattern whose number is 10 or more. However, a back  reference  to  any
-       subpattern  is  possible  using named parentheses (see below). See also
-       the subsection entitled "Non-printing  characters"  above  for  further
-       details of the handling of digits following a backslash.
+       It is not possible to have a numerical "forward back  reference"  to  a
+       subpattern  whose  number  is  10  or  more using this syntax because a
+       sequence such as \50 is interpreted as a character  defined  in  octal.
+       See the subsection entitled "Non-printing characters" above for further
+       details of the handling of digits following a backslash.  There  is  no
+       such  problem  when named parentheses are used. A back reference to any
+       subpattern is possible using named parentheses (see below).
+
+       Another way of avoiding the ambiguity inherent in  the  use  of  digits
+       following a backslash is to use the \g escape sequence, which is a fea-
+       ture introduced in Perl 5.10.  This  escape  must  be  followed  by  an
+       unsigned  number  or  a negative number, optionally enclosed in braces.
+       These examples are all identical:
+
+         (ring), \1
+         (ring), \g1
+         (ring), \g{1}
+
+       An unsigned number specifies an absolute reference without the  ambigu-
+       ity that is present in the older syntax. It is also useful when literal
+       digits follow the reference. A negative number is a relative reference.
+       Consider this example:
+
+         (abc(def)ghi)\g{-1}
+
+       The sequence \g{-1} is a reference to the most recently started captur-
+       ing subpattern before \g, that is, is it equivalent to  \2.  Similarly,
+       \g{-2} would be equivalent to \1. The use of relative references can be
+       helpful in long patterns, and also in  patterns  that  are  created  by
+       joining together fragments that contain references within themselves.
 
        A  back  reference matches whatever actually matched the capturing sub-
        pattern in the current subject string, rather  than  anything  matching
@@ -3603,10 +4335,17 @@
        matches  "rah  rah"  and  "RAH RAH", but not "RAH rah", even though the
        original capturing subpattern is matched caselessly.
 
-       Back references to named subpatterns use the Python  syntax  (?P=name).
-       We could rewrite the above example as follows:
+       There are several different ways of writing back  references  to  named
+       subpatterns.  The  .NET syntax \k{name} and the Perl syntax \k or
+       \k'name' are supported, as is the Python syntax (?P=name). Perl  5.10's
+       unified back reference syntax, in which \g can be used for both numeric
+       and named references, is also supported. We  could  rewrite  the  above
+       example in any of the following ways:
 
+         (?(?i)rah)\s+\k
+         (?'p1'(?i)rah)\s+\k{p1}
          (?P(?i)rah)\s+(?P=p1)
+         (?(?i)rah)\s+\g{p1}
 
        A  subpattern  that  is  referenced  by  name may appear in the pattern
        before or after the reference.
@@ -3721,19 +4460,23 @@
 
          (?<=abc|abde)
 
+       In some cases, the Perl 5.10 escape sequence \K (see above) can be used
+       instead of a lookbehind assertion; this is not restricted to  a  fixed-
+       length.
+
        The  implementation  of lookbehind assertions is, for each alternative,
-       to temporarily move the current position back by the  fixed  width  and
+       to temporarily move the current position back by the fixed  length  and
        then try to match. If there are insufficient characters before the cur-
-       rent position, the match is deemed to fail.
+       rent position, the assertion fails.
 
        PCRE does not allow the \C escape (which matches a single byte in UTF-8
        mode)  to appear in lookbehind assertions, because it makes it impossi-
-       ble to calculate the length of the lookbehind. The \X escape, which can
-       match different numbers of bytes, is also not permitted.
+       ble to calculate the length of the lookbehind. The \X and  \R  escapes,
+       which can match different numbers of bytes, are also not permitted.
 
-       Atomic  groups can be used in conjunction with lookbehind assertions to
-       specify efficient matching at the end of the subject string. Consider a
-       simple pattern such as
+       Possessive  quantifiers  can  be  used  in  conjunction with lookbehind
+       assertions to specify efficient matching at  the  end  of  the  subject
+       string. Consider a simple pattern such as
 
          abcd$
 
@@ -3750,13 +4493,9 @@
        again  the search for "a" covers the entire string, from right to left,
        so we are no better off. However, if the pattern is written as
 
-         ^(?>.*)(?<=abcd)
-
-       or, equivalently, using the possessive quantifier syntax,
-
          ^.*+(?<=abcd)
 
-       there can be no backtracking for the .* item; it  can  match  only  the
+       there can be no backtracking for the .*+ item; it can  match  only  the
        entire  string.  The subsequent lookbehind assertion does a single test
        on the last four characters. If it fails, the match fails  immediately.
        For  long  strings, this approach makes a significant difference to the
@@ -3811,15 +4550,19 @@
        no-pattern (if present) is used. If there are more  than  two  alterna-
        tives in the subpattern, a compile-time error occurs.
 
-       There are three kinds of condition. If the text between the parentheses
-       consists of a sequence of digits, or a sequence of alphanumeric charac-
-       ters  and underscores, the condition is satisfied if the capturing sub-
-       pattern of that number or name has previously matched. There is a  pos-
-       sible  ambiguity here, because subpattern names may consist entirely of
-       digits. PCRE looks first for a named subpattern; if it cannot find  one
-       and  the text consists entirely of digits, it looks for a subpattern of
-       that number, which must be greater than zero.  Using  subpattern  names
-       that consist entirely of digits is not recommended.
+       There  are  four  kinds of condition: references to subpatterns, refer-
+       ences to recursion, a pseudo-condition called DEFINE, and assertions.
+
+   Checking for a used subpattern by number
+
+       If the text between the parentheses consists of a sequence  of  digits,
+       the  condition  is  true if the capturing subpattern of that number has
+       previously matched. An alternative notation is to  precede  the  digits
+       with a plus or minus sign. In this case, the subpattern number is rela-
+       tive rather than absolute.  The most recently opened parentheses can be
+       referenced  by  (?(-1),  the  next most recent by (?(-2), and so on. In
+       looping constructs it can also make sense to refer to subsequent groups
+       with constructs such as (?(+2).
 
        Consider  the  following  pattern, which contains non-significant white
        space to make it more readable (assume the PCRE_EXTENDED option) and to
@@ -3836,18 +4579,76 @@
        tern  is  executed  and  a  closing parenthesis is required. Otherwise,
        since no-pattern is not present, the  subpattern  matches  nothing.  In
        other  words,  this  pattern  matches  a  sequence  of non-parentheses,
-       optionally enclosed in parentheses. Rewriting it to use a named subpat-
-       tern gives this:
+       optionally enclosed in parentheses.
 
-         (?P \( )?    [^()]+    (?(OPEN) \) )
+       If you were embedding this pattern in a larger one,  you  could  use  a
+       relative reference:
+
+         ...other stuff... ( \( )?    [^()]+    (?(-1) \) ) ...
+
+       This  makes  the  fragment independent of the parentheses in the larger
+       pattern.
+
+   Checking for a used subpattern by name
+
+       Perl uses the syntax (?()...) or (?('name')...)  to  test  for  a
+       used  subpattern  by  name.  For compatibility with earlier versions of
+       PCRE, which had this facility before Perl, the syntax  (?(name)...)  is
+       also  recognized. However, there is a possible ambiguity with this syn-
+       tax, because subpattern names may  consist  entirely  of  digits.  PCRE
+       looks  first for a named subpattern; if it cannot find one and the name
+       consists entirely of digits, PCRE looks for a subpattern of  that  num-
+       ber,  which must be greater than zero. Using subpattern names that con-
+       sist entirely of digits is not recommended.
+
+       Rewriting the above example to use a named subpattern gives this:
+
+         (? \( )?    [^()]+    (?() \) )
+
+
+   Checking for pattern recursion
 
        If the condition is the string (R), and there is no subpattern with the
-       name R, the condition is satisfied if a recursive call to  the  pattern
-       or  subpattern  has  been made. At "top level", the condition is false.
-       This is a PCRE extension.  Recursive patterns are described in the next
-       section.
+       name  R, the condition is true if a recursive call to the whole pattern
+       or any subpattern has been made. If digits or a name preceded by amper-
+       sand follow the letter R, for example:
+
+         (?(R3)...) or (?(R&name)...)
+
+       the  condition is true if the most recent recursion is into the subpat-
+       tern whose number or name is given. This condition does not  check  the
+       entire recursion stack.
+
+       At  "top  level", all these recursion test conditions are false. Recur-
+       sive patterns are described below.
+
+   Defining subpatterns for use by reference only
+
+       If the condition is the string (DEFINE), and  there  is  no  subpattern
+       with  the  name  DEFINE,  the  condition is always false. In this case,
+       there may be only one alternative  in  the  subpattern.  It  is  always
+       skipped  if  control  reaches  this  point  in the pattern; the idea of
+       DEFINE is that it can be used to define "subroutines" that can be  ref-
+       erenced  from elsewhere. (The use of "subroutines" is described below.)
+       For example, a pattern to match an IPv4 address could be  written  like
+       this (ignore whitespace and line breaks):
+
+         (?(DEFINE) (? 2[0-4]\d | 25[0-5] | 1\d\d | [1-9]?\d) )
+         \b (?&byte) (\.(?&byte)){3} \b
+
+       The  first part of the pattern is a DEFINE group inside which a another
+       group named "byte" is defined. This matches an individual component  of
+       an  IPv4  address  (a number less than 256). When matching takes place,
+       this part of the pattern is skipped because DEFINE acts  like  a  false
+       condition.
+
+       The rest of the pattern uses references to the named group to match the
+       four dot-separated components of an IPv4 address, insisting on  a  word
+       boundary at each end.
+
+   Assertion conditions
 
-       If  the  condition  is  not  a sequence of digits or (R), it must be an
+       If  the  condition  is  not  in any of the above formats, it must be an
        assertion.  This may be a positive or negative lookahead or  lookbehind
        assertion.  Consider  this  pattern,  again  containing non-significant
        white space, and with the two alternatives on the second line:
@@ -3882,111 +4683,139 @@
        unlimited nested parentheses. Without the use of  recursion,  the  best
        that  can  be  done  is  to use a pattern that matches up to some fixed
        depth of nesting. It is not possible to  handle  an  arbitrary  nesting
-       depth.  Perl  provides  a  facility  that allows regular expressions to
-       recurse (amongst other things). It does this by interpolating Perl code
-       in the expression at run time, and the code can refer to the expression
-       itself. A Perl pattern to solve the parentheses problem can be  created
-       like this:
+       depth.
+
+       For some time, Perl has provided a facility that allows regular expres-
+       sions to recurse (amongst other things). It does this by  interpolating
+       Perl  code in the expression at run time, and the code can refer to the
+       expression itself. A Perl pattern using code interpolation to solve the
+       parentheses problem can be created like this:
 
          $re = qr{\( (?: (?>[^()]+) | (?p{$re}) )* \)}x;
 
        The (?p{...}) item interpolates Perl code at run time, and in this case
-       refers recursively to the pattern in which it appears. Obviously,  PCRE
-       cannot  support  the  interpolation  of Perl code. Instead, it supports
-       some special syntax for recursion of the entire pattern, and  also  for
-       individual subpattern recursion.
+       refers recursively to the pattern in which it appears.
+
+       Obviously, PCRE cannot support the interpolation of Perl code. Instead,
+       it  supports  special  syntax  for recursion of the entire pattern, and
+       also for individual subpattern recursion.  After  its  introduction  in
+       PCRE  and  Python,  this  kind of recursion was introduced into Perl at
+       release 5.10.
 
-       The  special item that consists of (? followed by a number greater than
+       A special item that consists of (? followed by a  number  greater  than
        zero and a closing parenthesis is a recursive call of the subpattern of
-       the  given  number, provided that it occurs inside that subpattern. (If
-       not, it is a "subroutine" call, which is described  in  the  next  sec-
-       tion.)  The special item (?R) is a recursive call of the entire regular
-       expression.
-
-       A recursive subpattern call is always treated as an atomic group.  That
-       is,  once  it  has  matched some of the subject string, it is never re-
-       entered, even if it contains untried alternatives and there is a subse-
-       quent matching failure.
+       the given number, provided that it occurs inside that  subpattern.  (If
+       not,  it  is  a  "subroutine" call, which is described in the next sec-
+       tion.) The special item (?R) or (?0) is a recursive call of the  entire
+       regular expression.
+
+       In  PCRE (like Python, but unlike Perl), a recursive subpattern call is
+       always treated as an atomic group. That is, once it has matched some of
+       the subject string, it is never re-entered, even if it contains untried
+       alternatives and there is a subsequent matching failure.
 
-       This  PCRE  pattern  solves  the nested parentheses problem (assume the
+       This PCRE pattern solves the nested  parentheses  problem  (assume  the
        PCRE_EXTENDED option is set so that white space is ignored):
 
          \( ( (?>[^()]+) | (?R) )* \)
 
-       First it matches an opening parenthesis. Then it matches any number  of
-       substrings  which  can  either  be  a sequence of non-parentheses, or a
-       recursive match of the pattern itself (that is, a  correctly  parenthe-
+       First  it matches an opening parenthesis. Then it matches any number of
+       substrings which can either be a  sequence  of  non-parentheses,  or  a
+       recursive  match  of the pattern itself (that is, a correctly parenthe-
        sized substring).  Finally there is a closing parenthesis.
 
-       If  this  were  part of a larger pattern, you would not want to recurse
+       If this were part of a larger pattern, you would not  want  to  recurse
        the entire pattern, so instead you could use this:
 
          ( \( ( (?>[^()]+) | (?1) )* \) )
 
-       We have put the pattern into parentheses, and caused the  recursion  to
-       refer  to them instead of the whole pattern. In a larger pattern, keep-
-       ing track of parenthesis numbers can be tricky. It may be  more  conve-
-       nient  to use named parentheses instead. For this, PCRE uses (?P>name),
-       which is an extension to the Python syntax that  PCRE  uses  for  named
-       parentheses (Perl does not provide named parentheses). We could rewrite
-       the above example as follows:
-
-         (?P \( ( (?>[^()]+) | (?P>pn) )* \) )
-
-       This particular example pattern contains nested unlimited repeats,  and
-       so  the  use of atomic grouping for matching strings of non-parentheses
-       is important when applying the pattern to strings that  do  not  match.
-       For example, when this pattern is applied to
+       We  have  put the pattern into parentheses, and caused the recursion to
+       refer to them instead of the whole pattern.
+
+       In a larger pattern,  keeping  track  of  parenthesis  numbers  can  be
+       tricky.  This is made easier by the use of relative references. (A Perl
+       5.10 feature.)  Instead of (?1) in the  pattern  above  you  can  write
+       (?-2) to refer to the second most recently opened parentheses preceding
+       the recursion. In other  words,  a  negative  number  counts  capturing
+       parentheses leftwards from the point at which it is encountered.
+
+       It  is  also  possible  to refer to subsequently opened parentheses, by
+       writing references such as (?+2). However, these  cannot  be  recursive
+       because  the  reference  is  not inside the parentheses that are refer-
+       enced. They are always "subroutine" calls, as  described  in  the  next
+       section.
+
+       An  alternative  approach is to use named parentheses instead. The Perl
+       syntax for this is (?&name); PCRE's earlier syntax  (?P>name)  is  also
+       supported. We could rewrite the above example as follows:
+
+         (? \( ( (?>[^()]+) | (?&pn) )* \) )
+
+       If  there  is more than one subpattern with the same name, the earliest
+       one is used.
+
+       This particular example pattern that we have been looking  at  contains
+       nested  unlimited repeats, and so the use of atomic grouping for match-
+       ing strings of non-parentheses is important when applying  the  pattern
+       to strings that do not match. For example, when this pattern is applied
+       to
 
          (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()
 
-       it  yields "no match" quickly. However, if atomic grouping is not used,
-       the match runs for a very long time indeed because there  are  so  many
-       different  ways  the  + and * repeats can carve up the subject, and all
+       it yields "no match" quickly. However, if atomic grouping is not  used,
+       the  match  runs  for a very long time indeed because there are so many
+       different ways the + and * repeats can carve up the  subject,  and  all
        have to be tested before failure can be reported.
 
        At the end of a match, the values set for any capturing subpatterns are
        those from the outermost level of the recursion at which the subpattern
-       value is set.  If you want to obtain  intermediate  values,  a  callout
-       function can be used (see the next section and the pcrecallout documen-
-       tation). If the pattern above is matched against
+       value  is  set.   If  you want to obtain intermediate values, a callout
+       function can be used (see below and the pcrecallout documentation).  If
+       the pattern above is matched against
 
          (ab(cd)ef)
 
-       the value for the capturing parentheses is  "ef",  which  is  the  last
-       value  taken  on at the top level. If additional parentheses are added,
+       the  value  for  the  capturing  parentheses is "ef", which is the last
+       value taken on at the top level. If additional parentheses  are  added,
        giving
 
          \( ( ( (?>[^()]+) | (?R) )* ) \)
             ^                        ^
             ^                        ^
 
-       the string they capture is "ab(cd)ef", the contents of  the  top  level
-       parentheses.  If there are more than 15 capturing parentheses in a pat-
+       the  string  they  capture is "ab(cd)ef", the contents of the top level
+       parentheses. If there are more than 15 capturing parentheses in a  pat-
        tern, PCRE has to obtain extra memory to store data during a recursion,
-       which  it  does  by  using pcre_malloc, freeing it via pcre_free after-
-       wards. If  no  memory  can  be  obtained,  the  match  fails  with  the
+       which it does by using pcre_malloc, freeing  it  via  pcre_free  after-
+       wards.  If  no  memory  can  be  obtained,  the  match  fails  with the
        PCRE_ERROR_NOMEMORY error.
 
-       Do  not  confuse  the (?R) item with the condition (R), which tests for
-       recursion.  Consider this pattern, which matches text in  angle  brack-
-       ets,  allowing for arbitrary nesting. Only digits are allowed in nested
-       brackets (that is, when recursing), whereas any characters are  permit-
+       Do not confuse the (?R) item with the condition (R),  which  tests  for
+       recursion.   Consider  this pattern, which matches text in angle brack-
+       ets, allowing for arbitrary nesting. Only digits are allowed in  nested
+       brackets  (that is, when recursing), whereas any characters are permit-
        ted at the outer level.
 
          < (?: (?(R) \d++  | [^<>]*+) | (?R)) * >
 
-       In  this  pattern, (?(R) is the start of a conditional subpattern, with
-       two different alternatives for the recursive and  non-recursive  cases.
+       In this pattern, (?(R) is the start of a conditional  subpattern,  with
+       two  different  alternatives for the recursive and non-recursive cases.
        The (?R) item is the actual recursive call.
 
 
 SUBPATTERNS AS SUBROUTINES
 
        If the syntax for a recursive subpattern reference (either by number or
-       by name) is used outside the parentheses to which it refers,  it  oper-
-       ates  like  a  subroutine in a programming language. An earlier example
-       pointed out that the pattern
+       by  name)  is used outside the parentheses to which it refers, it oper-
+       ates like a subroutine in a programming language. The "called"  subpat-
+       tern may be defined before or after the reference. A numbered reference
+       can be absolute or relative, as in these examples:
+
+         (...(absolute)...)...(?2)...
+         (...(relative)...)...(?-1)...
+         (...(?+1)...(relative)...
+
+       An earlier example pointed out that the pattern
 
          (sens|respons)e and \1ibility
 
@@ -3996,52 +4825,567 @@
          (sens|respons)e and (?1)ibility
 
        is  used, it does match "sense and responsibility" as well as the other
-       two strings. Such references, if given  numerically,  must  follow  the
-       subpattern  to which they refer. However, named references can refer to
-       later subpatterns.
+       two strings. Another example is  given  in  the  discussion  of  DEFINE
+       above.
 
        Like recursive subpatterns, a "subroutine" call is always treated as an
-       atomic  group. That is, once it has matched some of the subject string,
-       it is never re-entered, even if it contains  untried  alternatives  and
+       atomic group. That is, once it has matched some of the subject  string,
+       it  is  never  re-entered, even if it contains untried alternatives and
        there is a subsequent matching failure.
 
+       When a subpattern is used as a subroutine, processing options  such  as
+       case-independence are fixed when the subpattern is defined. They cannot
+       be changed for different calls. For example, consider this pattern:
+
+         (abc)(?i:(?-1))
+
+       It matches "abcabc". It does not match "abcABC" because the  change  of
+       processing option does not affect the called subpattern.
+
+
+ONIGURUMA SUBROUTINE SYNTAX
+
+       For  compatibility with Oniguruma, the non-Perl syntax \g followed by a
+       name or a number enclosed either in angle brackets or single quotes, is
+       an  alternative  syntax  for  referencing a subpattern as a subroutine,
+       possibly recursively. Here are two of the examples used above,  rewrit-
+       ten using this syntax:
+
+         (? \( ( (?>[^()]+) | \g )* \) )
+         (sens|respons)e and \g'1'ibility
+
+       PCRE  supports  an extension to Oniguruma: if a number is preceded by a
+       plus or a minus sign it is taken as a relative reference. For example:
+
+         (abc)(?i:\g<-1>)
+
+       Note that \g{...} (Perl syntax) and \g<...> (Oniguruma syntax) are  not
+       synonymous.  The former is a back reference; the latter is a subroutine
+       call.
+
 
 CALLOUTS
 
        Perl has a feature whereby using the sequence (?{...}) causes arbitrary
-       Perl code to be obeyed in the middle of matching a regular  expression.
+       Perl  code to be obeyed in the middle of matching a regular expression.
        This makes it possible, amongst other things, to extract different sub-
        strings that match the same pair of parentheses when there is a repeti-
        tion.
 
        PCRE provides a similar feature, but of course it cannot obey arbitrary
        Perl code. The feature is called "callout". The caller of PCRE provides
-       an  external function by putting its entry point in the global variable
-       pcre_callout.  By default, this variable contains NULL, which  disables
+       an external function by putting its entry point in the global  variable
+       pcre_callout.   By default, this variable contains NULL, which disables
        all calling out.
 
-       Within  a  regular  expression,  (?C) indicates the points at which the
-       external function is to be called. If you want  to  identify  different
-       callout  points, you can put a number less than 256 after the letter C.
-       The default value is zero.  For example, this pattern has  two  callout
+       Within a regular expression, (?C) indicates the  points  at  which  the
+       external  function  is  to be called. If you want to identify different
+       callout points, you can put a number less than 256 after the letter  C.
+       The  default  value is zero.  For example, this pattern has two callout
        points:
 
          (?C1)abc(?C2)def
 
        If the PCRE_AUTO_CALLOUT flag is passed to pcre_compile(), callouts are
-       automatically installed before each item in the pattern. They  are  all
+       automatically  installed  before each item in the pattern. They are all
        numbered 255.
 
        During matching, when PCRE reaches a callout point (and pcre_callout is
-       set), the external function is called. It is provided with  the  number
-       of  the callout, the position in the pattern, and, optionally, one item
-       of data originally supplied by the caller of pcre_exec().  The  callout
-       function  may cause matching to proceed, to backtrack, or to fail alto-
+       set),  the  external function is called. It is provided with the number
+       of the callout, the position in the pattern, and, optionally, one  item
+       of  data  originally supplied by the caller of pcre_exec(). The callout
+       function may cause matching to proceed, to backtrack, or to fail  alto-
        gether. A complete description of the interface to the callout function
        is given in the pcrecallout documentation.
 
-Last updated: 06 June 2006
-Copyright (c) 1997-2006 University of Cambridge.
+
+BACKTRACKING CONTROL
+
+       Perl 5.10 introduced a number of "Special Backtracking Control  Verbs",
+       which are described in the Perl documentation as "experimental and sub-
+       ject to change or removal in a future version of Perl". It goes  on  to
+       say:  "Their usage in production code should be noted to avoid problems
+       during upgrades." The same remarks apply to the PCRE features described
+       in this section.
+
+       Since  these  verbs  are  specifically related to backtracking, most of
+       them can be  used  only  when  the  pattern  is  to  be  matched  using
+       pcre_exec(), which uses a backtracking algorithm. With the exception of
+       (*FAIL), which behaves like a failing negative assertion, they cause an
+       error if encountered by pcre_dfa_exec().
+
+       The  new verbs make use of what was previously invalid syntax: an open-
+       ing parenthesis followed by an asterisk. In Perl, they are generally of
+       the form (*VERB:ARG) but PCRE does not support the use of arguments, so
+       its general form is just (*VERB). Any number of these verbs  may  occur
+       in a pattern. There are two kinds:
+
+   Verbs that act immediately
+
+       The following verbs act as soon as they are encountered:
+
+          (*ACCEPT)
+
+       This  verb causes the match to end successfully, skipping the remainder
+       of the pattern. When inside a recursion, only the innermost pattern  is
+       ended  immediately.  PCRE  differs  from  Perl  in  what happens if the
+       (*ACCEPT) is inside capturing parentheses. In Perl, the data so far  is
+       captured: in PCRE no data is captured. For example:
+
+         A(A|B(*ACCEPT)|C)D
+
+       This  matches  "AB", "AAD", or "ACD", but when it matches "AB", no data
+       is captured.
+
+         (*FAIL) or (*F)
+
+       This verb causes the match to fail, forcing backtracking to  occur.  It
+       is  equivalent to (?!) but easier to read. The Perl documentation notes
+       that it is probably useful only when combined  with  (?{})  or  (??{}).
+       Those  are,  of course, Perl features that are not present in PCRE. The
+       nearest equivalent is the callout feature, as for example in this  pat-
+       tern:
+
+         a+(?C)(*FAIL)
+
+       A  match  with the string "aaaa" always fails, but the callout is taken
+       before each backtrack happens (in this example, 10 times).
+
+   Verbs that act after backtracking
+
+       The following verbs do nothing when they are encountered. Matching con-
+       tinues  with what follows, but if there is no subsequent match, a fail-
+       ure is forced.  The verbs  differ  in  exactly  what  kind  of  failure
+       occurs.
+
+         (*COMMIT)
+
+       This  verb  causes  the whole match to fail outright if the rest of the
+       pattern does not match. Even if the pattern is unanchored,  no  further
+       attempts  to find a match by advancing the start point take place. Once
+       (*COMMIT) has been passed, pcre_exec() is committed to finding a  match
+       at the current starting point, or not at all. For example:
+
+         a+(*COMMIT)b
+
+       This  matches  "xxaab" but not "aacaab". It can be thought of as a kind
+       of dynamic anchor, or "I've started, so I must finish."
+
+         (*PRUNE)
+
+       This verb causes the match to fail at the current position if the  rest
+       of the pattern does not match. If the pattern is unanchored, the normal
+       "bumpalong" advance to the next starting character then happens.  Back-
+       tracking  can  occur as usual to the left of (*PRUNE), or when matching
+       to the right of (*PRUNE), but if there is no match to the right,  back-
+       tracking  cannot  cross (*PRUNE).  In simple cases, the use of (*PRUNE)
+       is just an alternative to an atomic group or possessive quantifier, but
+       there  are  some uses of (*PRUNE) that cannot be expressed in any other
+       way.
+
+         (*SKIP)
+
+       This verb is like (*PRUNE), except that if the pattern  is  unanchored,
+       the  "bumpalong" advance is not to the next character, but to the posi-
+       tion in the subject where (*SKIP) was  encountered.  (*SKIP)  signifies
+       that  whatever  text  was  matched leading up to it cannot be part of a
+       successful match. Consider:
+
+         a+(*SKIP)b
+
+       If the subject is "aaaac...",  after  the  first  match  attempt  fails
+       (starting  at  the  first  character in the string), the starting point
+       skips on to start the next attempt at "c". Note that a possessive quan-
+       tifer  does not have the same effect in this example; although it would
+       suppress backtracking  during  the  first  match  attempt,  the  second
+       attempt  would  start at the second character instead of skipping on to
+       "c".
+
+         (*THEN)
+
+       This verb causes a skip to the next alternation if the rest of the pat-
+       tern does not match. That is, it cancels pending backtracking, but only
+       within the current alternation. Its name  comes  from  the  observation
+       that it can be used for a pattern-based if-then-else block:
+
+         ( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ...
+
+       If  the COND1 pattern matches, FOO is tried (and possibly further items
+       after the end of the group if FOO succeeds);  on  failure  the  matcher
+       skips  to  the second alternative and tries COND2, without backtracking
+       into COND1. If (*THEN) is used outside  of  any  alternation,  it  acts
+       exactly like (*PRUNE).
+
+
+SEE ALSO
+
+       pcreapi(3), pcrecallout(3), pcrematching(3), pcre(3).
+
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 11 April 2009
+       Copyright (c) 1997-2009 University of Cambridge.
+------------------------------------------------------------------------------
+
+
+PCRESYNTAX(3)                                                    PCRESYNTAX(3)
+
+
+NAME
+       PCRE - Perl-compatible regular expressions
+
+
+PCRE REGULAR EXPRESSION SYNTAX SUMMARY
+
+       The  full syntax and semantics of the regular expressions that are sup-
+       ported by PCRE are described in  the  pcrepattern  documentation.  This
+       document contains just a quick-reference summary of the syntax.
+
+
+QUOTING
+
+         \x         where x is non-alphanumeric is a literal x
+         \Q...\E    treat enclosed characters as literal
+
+
+CHARACTERS
+
+         \a         alarm, that is, the BEL character (hex 07)
+         \cx        "control-x", where x is any character
+         \e         escape (hex 1B)
+         \f         formfeed (hex 0C)
+         \n         newline (hex 0A)
+         \r         carriage return (hex 0D)
+         \t         tab (hex 09)
+         \ddd       character with octal code ddd, or backreference
+         \xhh       character with hex code hh
+         \x{hhh..}  character with hex code hhh..
+
+
+CHARACTER TYPES
+
+         .          any character except newline;
+                      in dotall mode, any character whatsoever
+         \C         one byte, even in UTF-8 mode (best avoided)
+         \d         a decimal digit
+         \D         a character that is not a decimal digit
+         \h         a horizontal whitespace character
+         \H         a character that is not a horizontal whitespace character
+         \p{xx}     a character with the xx property
+         \P{xx}     a character without the xx property
+         \R         a newline sequence
+         \s         a whitespace character
+         \S         a character that is not a whitespace character
+         \v         a vertical whitespace character
+         \V         a character that is not a vertical whitespace character
+         \w         a "word" character
+         \W         a "non-word" character
+         \X         an extended Unicode sequence
+
+       In PCRE, \d, \D, \s, \S, \w, and \W recognize only ASCII characters.
+
+
+GENERAL CATEGORY PROPERTY CODES FOR \p and \P
+
+         C          Other
+         Cc         Control
+         Cf         Format
+         Cn         Unassigned
+         Co         Private use
+         Cs         Surrogate
+
+         L          Letter
+         Ll         Lower case letter
+         Lm         Modifier letter
+         Lo         Other letter
+         Lt         Title case letter
+         Lu         Upper case letter
+         L&         Ll, Lu, or Lt
+
+         M          Mark
+         Mc         Spacing mark
+         Me         Enclosing mark
+         Mn         Non-spacing mark
+
+         N          Number
+         Nd         Decimal number
+         Nl         Letter number
+         No         Other number
+
+         P          Punctuation
+         Pc         Connector punctuation
+         Pd         Dash punctuation
+         Pe         Close punctuation
+         Pf         Final punctuation
+         Pi         Initial punctuation
+         Po         Other punctuation
+         Ps         Open punctuation
+
+         S          Symbol
+         Sc         Currency symbol
+         Sk         Modifier symbol
+         Sm         Mathematical symbol
+         So         Other symbol
+
+         Z          Separator
+         Zl         Line separator
+         Zp         Paragraph separator
+         Zs         Space separator
+
+
+SCRIPT NAMES FOR \p AND \P
+
+       Arabic,  Armenian,  Balinese,  Bengali,  Bopomofo,  Braille,  Buginese,
+       Buhid, Canadian_Aboriginal, Carian, Cham, Cherokee, Common, Coptic, Cu-
+       neiform,  Cypriot,  Cyrillic,  Deseret, Devanagari, Ethiopic, Georgian,
+       Glagolitic, Gothic, Greek, Gujarati, Gurmukhi,  Han,  Hangul,  Hanunoo,
+       Hebrew,  Hiragana,  Inherited, Kannada, Katakana, Kayah_Li, Kharoshthi,
+       Khmer, Lao, Latin, Lepcha, Limbu, Linear_B, Lycian, Lydian,  Malayalam,
+       Mongolian,  Myanmar,  New_Tai_Lue, Nko, Ogham, Old_Italic, Old_Persian,
+       Ol_Chiki, Oriya, Osmanya, Phags_Pa, Phoenician, Rejang, Runic, Saurash-
+       tra,  Shavian,  Sinhala,  Sudanese, Syloti_Nagri, Syriac, Tagalog, Tag-
+       banwa,  Tai_Le,  Tamil,  Telugu,  Thaana,  Thai,   Tibetan,   Tifinagh,
+       Ugaritic, Vai, Yi.
+
+
+CHARACTER CLASSES
+
+         [...]       positive character class
+         [^...]      negative character class
+         [x-y]       range (can be used for hex characters)
+         [[:xxx:]]   positive POSIX named set
+         [[:^xxx:]]  negative POSIX named set
+
+         alnum       alphanumeric
+         alpha       alphabetic
+         ascii       0-127
+         blank       space or tab
+         cntrl       control character
+         digit       decimal digit
+         graph       printing, excluding space
+         lower       lower case letter
+         print       printing, including space
+         punct       printing, excluding alphanumeric
+         space       whitespace
+         upper       upper case letter
+         word        same as \w
+         xdigit      hexadecimal digit
+
+       In PCRE, POSIX character set names recognize only ASCII characters. You
+       can use \Q...\E inside a character class.
+
+
+QUANTIFIERS
+
+         ?           0 or 1, greedy
+         ?+          0 or 1, possessive
+         ??          0 or 1, lazy
+         *           0 or more, greedy
+         *+          0 or more, possessive
+         *?          0 or more, lazy
+         +           1 or more, greedy
+         ++          1 or more, possessive
+         +?          1 or more, lazy
+         {n}         exactly n
+         {n,m}       at least n, no more than m, greedy
+         {n,m}+      at least n, no more than m, possessive
+         {n,m}?      at least n, no more than m, lazy
+         {n,}        n or more, greedy
+         {n,}+       n or more, possessive
+         {n,}?       n or more, lazy
+
+
+ANCHORS AND SIMPLE ASSERTIONS
+
+         \b          word boundary (only ASCII letters recognized)
+         \B          not a word boundary
+         ^           start of subject
+                      also after internal newline in multiline mode
+         \A          start of subject
+         $           end of subject
+                      also before newline at end of subject
+                      also before internal newline in multiline mode
+         \Z          end of subject
+                      also before newline at end of subject
+         \z          end of subject
+         \G          first matching position in subject
+
+
+MATCH POINT RESET
+
+         \K          reset start of match
+
+
+ALTERNATION
+
+         expr|expr|expr...
+
+
+CAPTURING
+
+         (...)           capturing group
+         (?...)    named capturing group (Perl)
+         (?'name'...)    named capturing group (Perl)
+         (?P...)   named capturing group (Python)
+         (?:...)         non-capturing group
+         (?|...)         non-capturing group; reset group numbers for
+                          capturing groups in each alternative
+
+
+ATOMIC GROUPS
+
+         (?>...)         atomic, non-capturing group
+
+
+COMMENT
+
+         (?#....)        comment (not nestable)
+
+
+OPTION SETTING
+
+         (?i)            caseless
+         (?J)            allow duplicate names
+         (?m)            multiline
+         (?s)            single line (dotall)
+         (?U)            default ungreedy (lazy)
+         (?x)            extended (ignore white space)
+         (?-...)         unset option(s)
+
+       The following is recognized only at the start of a pattern or after one
+       of the newline-setting options with similar syntax:
+
+         (*UTF8)         set UTF-8 mode
+
+
+LOOKAHEAD AND LOOKBEHIND ASSERTIONS
+
+         (?=...)         positive look ahead
+         (?!...)         negative look ahead
+         (?<=...)        positive look behind
+         (?        reference by name (Perl)
+         \k'name'        reference by name (Perl)
+         \g{name}        reference by name (Perl)
+         \k{name}        reference by name (.NET)
+         (?P=name)       reference by name (Python)
+
+
+SUBROUTINE REFERENCES (POSSIBLY RECURSIVE)
+
+         (?R)            recurse whole pattern
+         (?n)            call subpattern by absolute number
+         (?+n)           call subpattern by relative number
+         (?-n)           call subpattern by relative number
+         (?&name)        call subpattern by name (Perl)
+         (?P>name)       call subpattern by name (Python)
+         \g        call subpattern by name (Oniguruma)
+         \g'name'        call subpattern by name (Oniguruma)
+         \g           call subpattern by absolute number (Oniguruma)
+         \g'n'           call subpattern by absolute number (Oniguruma)
+         \g<+n>          call subpattern by relative number (PCRE extension)
+         \g'+n'          call subpattern by relative number (PCRE extension)
+         \g<-n>          call subpattern by relative number (PCRE extension)
+         \g'-n'          call subpattern by relative number (PCRE extension)
+
+
+CONDITIONAL PATTERNS
+
+         (?(condition)yes-pattern)
+         (?(condition)yes-pattern|no-pattern)
+
+         (?(n)...        absolute reference condition
+         (?(+n)...       relative reference condition
+         (?(-n)...       relative reference condition
+         (?()...   named reference condition (Perl)
+         (?('name')...   named reference condition (Perl)
+         (?(name)...     named reference condition (PCRE)
+         (?(R)...        overall recursion condition
+         (?(Rn)...       specific group recursion condition
+         (?(R&name)...   specific recursion condition
+         (?(DEFINE)...   define subpattern for reference
+         (?(assert)...   assertion condition
+
+
+BACKTRACKING CONTROL
+
+       The following act immediately they are reached:
+
+         (*ACCEPT)       force successful match
+         (*FAIL)         force backtrack; synonym (*F)
+
+       The  following  act only when a subsequent match failure causes a back-
+       track to reach them. They all force a match failure, but they differ in
+       what happens afterwards. Those that advance the start-of-match point do
+       so only if the pattern is not anchored.
+
+         (*COMMIT)       overall failure, no advance of starting point
+         (*PRUNE)        advance to next starting character
+         (*SKIP)         advance start to current matching position
+         (*THEN)         local failure, backtrack to next alternation
+
+
+NEWLINE CONVENTIONS
+
+       These are recognized only at the very start of the pattern or  after  a
+       (*BSR_...) or (*UTF8) option.
+
+         (*CR)           carriage return only
+         (*LF)           linefeed only
+         (*CRLF)         carriage return followed by linefeed
+         (*ANYCRLF)      all three of the above
+         (*ANY)          any Unicode newline sequence
+
+
+WHAT \R MATCHES
+
+       These  are  recognized only at the very start of the pattern or after a
+       (*...) option that sets the newline convention or UTF-8 mode.
+
+         (*BSR_ANYCRLF)  CR, LF, or CRLF
+         (*BSR_UNICODE)  any Unicode newline sequence
+
+
+CALLOUTS
+
+         (?C)      callout
+         (?Cn)     callout with data n
+
+
+SEE ALSO
+
+       pcrepattern(3), pcreapi(3), pcrecallout(3), pcrematching(3), pcre(3).
+
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 11 April 2009
+       Copyright (c) 1997-2009 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -4121,12 +5465,13 @@
 
        If PCRE_PARTIAL is set for a pattern  that  does  not  conform  to  the
        restrictions,  pcre_exec() returns the error code PCRE_ERROR_BADPARTIAL
-       (-13).
+       (-13).  You can use the PCRE_INFO_OKPARTIAL call to pcre_fullinfo()  to
+       find out if a compiled pattern can be used for partial matching.
 
 
 EXAMPLE OF PARTIAL MATCHING USING PCRETEST
 
-       If the escape sequence \P is present  in  a  pcretest  data  line,  the
+       If  the  escape  sequence  \P  is  present in a pcretest data line, the
        PCRE_PARTIAL flag is used for the match. Here is a run of pcretest that
        uses the date example quoted above:
 
@@ -4143,13 +5488,13 @@
          data> j\P
          No match
 
-       The first data string is matched  completely,  so  pcretest  shows  the
-       matched  substrings.  The  remaining four strings do not match the com-
-       plete pattern, but the first two are partial matches.  The  same  test,
-       using  DFA  matching (by means of the \D escape sequence), produces the
-       following output:
+       The  first  data  string  is  matched completely, so pcretest shows the
+       matched substrings. The remaining four strings do not  match  the  com-
+       plete  pattern,  but  the first two are partial matches. The same test,
+       using pcre_dfa_exec() matching (by means of the  \D  escape  sequence),
+       produces the following output:
 
-           re> /^?(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)$/
+           re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
          data> 25jun04\P\D
           0: 25jun04
          data> 23dec3\P\D
@@ -4161,21 +5506,22 @@
          data> j\P\D
          No match
 
-       Notice that in this case the portion of the string that was matched  is
+       Notice  that in this case the portion of the string that was matched is
        made available.
 
 
 MULTI-SEGMENT MATCHING WITH pcre_dfa_exec()
 
        When a partial match has been found using pcre_dfa_exec(), it is possi-
-       ble to continue the match by  providing  additional  subject  data  and
-       calling  pcre_dfa_exec() again with the PCRE_DFA_RESTART option and the
-       same working space (where details of the  previous  partial  match  are
-       stored).  Here  is  an  example  using  pcretest,  where  the \R escape
-       sequence sets the PCRE_DFA_RESTART option and the  \D  escape  sequence
-       requests the use of pcre_dfa_exec():
+       ble  to  continue  the  match  by providing additional subject data and
+       calling pcre_dfa_exec() again with the same  compiled  regular  expres-
+       sion, this time setting the PCRE_DFA_RESTART option. You must also pass
+       the same working space as before, because this is where details of  the
+       previous  partial  match are stored. Here is an example using pcretest,
+       using the \R escape sequence to set the PCRE_DFA_RESTART option (\P and
+       \D are as above):
 
-           re> /^?(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)$/
+           re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
          data> 23ja\P\D
          Partial match: 23ja
          data> n05\R\D
@@ -4188,29 +5534,29 @@
        matched  string. It is up to the calling program to do that if it needs
        to.
 
-       This facility can  be  used  to  pass  very  long  subject  strings  to
-       pcre_dfa_exec(). However, some care is needed for certain types of pat-
-       tern.
-
-       1. If the pattern contains tests for the beginning or end  of  a  line,
-       you  need  to pass the PCRE_NOTBOL or PCRE_NOTEOL options, as appropri-
-       ate, when the subject string for any call does not contain  the  begin-
+       You can set PCRE_PARTIAL  with  PCRE_DFA_RESTART  to  continue  partial
+       matching over multiple segments. This facility can be used to pass very
+       long subject strings to pcre_dfa_exec(). However, some care  is  needed
+       for certain types of pattern.
+
+       1.  If  the  pattern contains tests for the beginning or end of a line,
+       you need to pass the PCRE_NOTBOL or PCRE_NOTEOL options,  as  appropri-
+       ate,  when  the subject string for any call does not contain the begin-
        ning or end of a line.
 
-       2.  If  the  pattern contains backward assertions (including \b or \B),
-       you need to arrange for some overlap in the subject  strings  to  allow
-       for  this.  For example, you could pass the subject in chunks that were
-       500 bytes long, but in a buffer of 700 bytes, with the starting  offset
+       2. If the pattern contains backward assertions (including  \b  or  \B),
+       you  need  to  arrange for some overlap in the subject strings to allow
+       for this. For example, you could pass the subject in  chunks  that  are
+       500  bytes long, but in a buffer of 700 bytes, with the starting offset
        set to 200 and the previous 200 bytes at the start of the buffer.
 
-       3.  Matching a subject string that is split into multiple segments does
-       not always produce exactly the same result as matching over one  single
-       long  string.   The  difference arises when there are multiple matching
-       possibilities, because a partial match result is given only when  there
-       are  no  completed  matches  in a call to fBpcre_dfa_exec(). This means
-       that as soon as the shortest match has been found,  continuation  to  a
-       new  subject  segment  is  no  longer possible.  Consider this pcretest
-       example:
+       3. Matching a subject string that is split into multiple segments  does
+       not  always produce exactly the same result as matching over one single
+       long string.  The difference arises when there  are  multiple  matching
+       possibilities,  because a partial match result is given only when there
+       are no completed matches in a call to pcre_dfa_exec(). This means  that
+       as  soon  as  the  shortest match has been found, continuation to a new
+       subject segment is no longer possible.  Consider this pcretest example:
 
            re> /dog(sbody)?/
          data> do\P\D
@@ -4236,21 +5582,31 @@
 
          1234|3789
 
-       If the first part of the subject is "ABC123", a partial  match  of  the
-       first  alternative  is found at offset 3. There is no partial match for
+       If  the  first  part of the subject is "ABC123", a partial match of the
+       first alternative is found at offset 3. There is no partial  match  for
        the second alternative, because such a match does not start at the same
-       point  in  the  subject  string. Attempting to continue with the string
+       point in the subject string. Attempting to  continue  with  the  string
        "789" does not yield a match because only those alternatives that match
-       at  one point in the subject are remembered. The problem arises because
-       the start of the second alternative matches within the  first  alterna-
+       at one point in the subject are remembered. The problem arises  because
+       the  start  of the second alternative matches within the first alterna-
        tive. There is no problem with anchored patterns or patterns such as:
 
          1234|ABCD
 
        where no string can be a partial match for both alternatives.
 
-Last updated: 16 January 2006
-Copyright (c) 1997-2006 University of Cambridge.
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 04 June 2007
+       Copyright (c) 1997-2007 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -4274,7 +5630,9 @@
        ent  host  and  run them there. This works even if the new host has the
        opposite endianness to the one on which  the  patterns  were  compiled.
        There  may  be a small performance penalty, but it should be insignifi-
-       cant.
+       cant. However, compiling regular expressions with one version  of  PCRE
+       for  use  with  a  different  version is not guaranteed to work and may
+       cause crashes.
 
 
 SAVING A COMPILED PATTERN
@@ -4357,19 +5715,22 @@
 
 COMPATIBILITY WITH DIFFERENT PCRE RELEASES
 
-       The layout of the control block that is at the start of the  data  that
-       makes  up  a  compiled pattern was changed for release 5.0. If you have
-       any saved patterns that were compiled with  previous  releases  (not  a
-       facility  that  was  previously advertised), you will have to recompile
-       them for release 5.0. However, from now on, it should  be  possible  to
-       make changes in a compatible manner.
-
-       Notwithstanding the above, if you have any saved patterns in UTF-8 mode
-       that use \p or \P that were compiled with any release up to and includ-
-       ing 6.4, you will have to recompile them for release 6.5 and above.
+       In general, it is safest to  recompile  all  saved  patterns  when  you
+       update  to  a new PCRE release, though not all updates actually require
+       this. Recompiling is definitely needed for release 7.2.
 
-Last updated: 01 February 2006
-Copyright (c) 1997-2006 University of Cambridge.
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 13 June 2007
+       Copyright (c) 1997-2007 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -4382,14 +5743,70 @@
 
 PCRE PERFORMANCE
 
-       Certain  items  that may appear in regular expression patterns are more
-       efficient than others. It is more efficient to use  a  character  class
-       like  [aeiou]  than  a set of alternatives such as (a|e|i|o|u). In gen-
-       eral, the simplest construction that provides the required behaviour is
-       usually  the  most  efficient.  Jeffrey Friedl's book contains a lot of
-       useful general discussion  about  optimizing  regular  expressions  for
-       efficient  performance. This document contains a few observations about
-       PCRE.
+       Two  aspects  of performance are discussed below: memory usage and pro-
+       cessing time. The way you express your pattern as a regular  expression
+       can affect both of them.
+
+
+MEMORY USAGE
+
+       Patterns are compiled by PCRE into a reasonably efficient byte code, so
+       that most simple patterns do not use much memory. However, there is one
+       case where memory usage can be unexpectedly large. When a parenthesized
+       subpattern has a quantifier with a minimum greater than 1 and/or a lim-
+       ited  maximum,  the  whole subpattern is repeated in the compiled code.
+       For example, the pattern
+
+         (abc|def){2,4}
+
+       is compiled as if it were
+
+         (abc|def)(abc|def)((abc|def)(abc|def)?)?
+
+       (Technical aside: It is done this way so that backtrack  points  within
+       each of the repetitions can be independently maintained.)
+
+       For  regular expressions whose quantifiers use only small numbers, this
+       is not usually a problem. However, if the numbers are large,  and  par-
+       ticularly  if  such repetitions are nested, the memory usage can become
+       an embarrassment. For example, the very simple pattern
+
+         ((ab){1,1000}c){1,3}
+
+       uses 51K bytes when compiled. When PCRE is compiled  with  its  default
+       internal  pointer  size of two bytes, the size limit on a compiled pat-
+       tern is 64K, and this is reached with the above pattern  if  the  outer
+       repetition is increased from 3 to 4. PCRE can be compiled to use larger
+       internal pointers and thus handle larger compiled patterns, but  it  is
+       better to try to rewrite your pattern to use less memory if you can.
+
+       One  way  of reducing the memory usage for such patterns is to make use
+       of PCRE's "subroutine" facility. Re-writing the above pattern as
+
+         ((ab)(?2){0,999}c)(?1){0,2}
+
+       reduces the memory requirements to 18K, and indeed it remains under 20K
+       even  with the outer repetition increased to 100. However, this pattern
+       is not exactly equivalent, because the "subroutine" calls  are  treated
+       as  atomic groups into which there can be no backtracking if there is a
+       subsequent matching failure. Therefore, PCRE cannot  do  this  kind  of
+       rewriting  automatically.   Furthermore,  there is a noticeable loss of
+       speed when executing the modified pattern. Nevertheless, if the  atomic
+       grouping  is  not  a  problem and the loss of speed is acceptable, this
+       kind of rewriting will allow you to process patterns that  PCRE  cannot
+       otherwise handle.
+
+
+PROCESSING TIME
+
+       Certain  items  in regular expression patterns are processed more effi-
+       ciently than others. It is more efficient to use a character class like
+       [aeiou]   than   a   set   of  single-character  alternatives  such  as
+       (a|e|i|o|u). In general, the simplest construction  that  provides  the
+       required behaviour is usually the most efficient. Jeffrey Friedl's book
+       contains a lot of useful general discussion  about  optimizing  regular
+       expressions  for  efficient  performance.  This document contains a few
+       observations about PCRE.
 
        Using Unicode character properties (the \p,  \P,  and  \X  escapes)  is
        slow,  because PCRE has to scan a structure that contains data for over
@@ -4423,15 +5840,15 @@
        take  a  long time to run when applied to a string that does not match.
        Consider the pattern fragment
 
-         (a+)*
+         ^(a+)*
 
-       This can match "aaaa" in 33 different ways, and this  number  increases
+       This can match "aaaa" in 16 different ways, and this  number  increases
        very  rapidly  as the string gets longer. (The * repeat can match 0, 1,
-       2, 3, or 4 times, and for each of those  cases  other  than  0,  the  +
+       2, 3, or 4 times, and for each of those cases other than 0 or 4, the  +
        repeats  can  match  different numbers of times.) When the remainder of
        the pattern is such that the entire match is going to fail, PCRE has in
        principle  to  try  every  possible  variation,  and  this  can take an
-       extremely long time.
+       extremely long time, even for relatively short strings.
 
        An optimization catches some of the more simple cases such as
 
@@ -4452,8 +5869,18 @@
        In many cases, the solution to this kind of performance issue is to use
        an atomic group or a possessive quantifier.
 
-Last updated: 28 February 2005
-Copyright (c) 1997-2005 University of Cambridge.
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 06 March 2007
+       Copyright (c) 1997-2007 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -4493,12 +5920,12 @@
        command  for  linking  an application that uses them. Because the POSIX
        functions call the native ones, it is also necessary to add -lpcre.
 
-       I have implemented only those option bits that can be reasonably mapped
-       to PCRE native options. In addition, the option REG_EXTENDED is defined
-       with the value zero. This has no effect, but since  programs  that  are
-       written  to  the  POSIX interface often use it, this makes it easier to
-       slot in PCRE as a replacement library. Other POSIX options are not even
-       defined.
+       I have implemented only those POSIX option bits that can be  reasonably
+       mapped  to PCRE native options. In addition, the option REG_EXTENDED is
+       defined with the value zero. This has no  effect,  but  since  programs
+       that  are  written  to  the POSIX interface often use it, this makes it
+       easier to slot in PCRE as a replacement library.  Other  POSIX  options
+       are not even defined.
 
        When  PCRE  is  called  via these functions, it is only the API that is
        POSIX-like in style. The syntax and semantics of  the  regular  expres-
@@ -4578,9 +6005,9 @@
 MATCHING NEWLINE CHARACTERS
 
        This area is not simple, because POSIX and Perl take different views of
-       things.  It is not possible to get PCRE to obey  POSIX  semantics,  but
-       then  PCRE was never intended to be a POSIX engine. The following table
-       lists the different possibilities for matching  newline  characters  in
+       things.   It  is  not possible to get PCRE to obey POSIX semantics, but
+       then PCRE was never intended to be a POSIX engine. The following  table
+       lists  the  different  possibilities for matching newline characters in
        PCRE:
 
                                  Default   Change with
@@ -4602,30 +6029,49 @@
          ^ matches \n in middle     no     REG_NEWLINE
 
        PCRE's behaviour is the same as Perl's, except that there is no equiva-
-       lent for PCRE_DOLLAR_ENDONLY in Perl. In both PCRE and Perl,  there  is
+       lent  for  PCRE_DOLLAR_ENDONLY in Perl. In both PCRE and Perl, there is
        no way to stop newline from matching [^a].
 
-       The   default  POSIX  newline  handling  can  be  obtained  by  setting
-       PCRE_DOTALL and PCRE_DOLLAR_ENDONLY, but there is no way to  make  PCRE
+       The  default  POSIX  newline  handling  can  be  obtained  by   setting
+       PCRE_DOTALL  and  PCRE_DOLLAR_ENDONLY, but there is no way to make PCRE
        behave exactly as for the REG_NEWLINE action.
 
 
 MATCHING A PATTERN
 
-       The  function  regexec()  is  called  to  match a compiled pattern preg
-       against a given string, which is terminated by a zero byte, subject  to
-       the options in eflags. These can be:
+       The function regexec() is called  to  match  a  compiled  pattern  preg
+       against  a  given string, which is by default terminated by a zero byte
+       (but see REG_STARTEND below), subject to the options in  eflags.  These
+       can be:
 
          REG_NOTBOL
 
        The PCRE_NOTBOL option is set when calling the underlying PCRE matching
        function.
 
+         REG_NOTEMPTY
+
+       The PCRE_NOTEMPTY option is set when calling the underlying PCRE match-
+       ing function. Note that REG_NOTEMPTY is not part of the POSIX standard.
+       However, setting this option can give more POSIX-like behaviour in some
+       situations.
+
          REG_NOTEOL
 
        The PCRE_NOTEOL option is set when calling the underlying PCRE matching
        function.
 
+         REG_STARTEND
+
+       The string is considered to start at string +  pmatch[0].rm_so  and  to
+       have  a terminating NUL located at string + pmatch[0].rm_eo (there need
+       not actually be a NUL at that location), regardless  of  the  value  of
+       nmatch.  This  is a BSD extension, compatible with but not specified by
+       IEEE Standard 1003.2 (POSIX.2), and should  be  used  with  caution  in
+       software intended to be portable to other systems. Note that a non-zero
+       rm_so does not imply REG_NOTBOL; REG_STARTEND affects only the location
+       of the string, not how it is matched.
+
        If  the pattern was compiled with the REG_NOSUB flag, no data about any
        matched strings  is  returned.  The  nmatch  and  pmatch  arguments  of
        regexec() are ignored.
@@ -4666,11 +6112,14 @@
 AUTHOR
 
        Philip Hazel
-       University Computing Service,
-       Cambridge CB2 3QG, England.
+       University Computing Service
+       Cambridge CB2 3QH, England.
 
-Last updated: 16 January 2006
-Copyright (c) 1997-2006 University of Cambridge.
+
+REVISION
+
+       Last updated: 11 March 2009
+       Copyright (c) 1997-2009 University of Cambridge.
 ------------------------------------------------------------------------------
 
 
@@ -4758,14 +6207,42 @@
 
          c. The "i"th argument has a suitable type for holding the
             string captured as the "i"th sub-pattern. If you pass in
-            NULL for the "i"th argument, or pass fewer arguments than
+            void * NULL for the "i"th argument, or a non-void * NULL
+            of the correct type, or pass fewer arguments than the
             number of sub-patterns, "i"th captured sub-pattern is
             ignored.
 
+       CAVEAT: An optional sub-pattern that does  not  exist  in  the  matched
+       string  is  assigned  the  empty  string. Therefore, the following will
+       return false (because the empty string is not a valid number):
+
+          int number;
+          pcrecpp::RE::FullMatch("abc", "[a-z]+(\\d+)?", &number);
+
        The matching interface supports at most 16 arguments per call.  If  you
        need    more,    consider    using    the    more   general   interface
        pcrecpp::RE::DoMatch. See pcrecpp.h for the signature for DoMatch.
 
+       NOTE: Do not use no_arg, which is used internally to mark the end of  a
+       list  of optional arguments, as a placeholder for missing arguments, as
+       this can lead to segfaults.
+
+
+QUOTING METACHARACTERS
+
+       You can use the "QuoteMeta" operation to insert backslashes before  all
+       potentially  meaningful  characters  in  a string. The returned string,
+       used as a regular expression, will exactly match the original string.
+
+         Example:
+            string quoted = RE::QuoteMeta(unquoted);
+
+       Note that it's legal to escape a character even if it  has  no  special
+       meaning  in  a  regular expression -- so this function does that. (This
+       also makes it identical to the perl function  of  the  same  name;  see
+       "perldoc    -f    quotemeta".)    For   example,   "1.5-2.0?"   becomes
+       "1\.5\-2\.0\?".
+
 
 PARTIAL MATCHES
 
@@ -4978,7 +6455,12 @@
 AUTHOR
 
        The C++ wrapper was contributed by Google Inc.
-       Copyright (c) 2005 Google Inc.
+       Copyright (c) 2007 Google Inc.
+
+
+REVISION
+
+       Last updated: 17 March 2009
 ------------------------------------------------------------------------------
 
 
@@ -5045,8 +6527,18 @@
 
        (for example) to the compile command to get round this problem.
 
-Last updated: 09 September 2004
-Copyright (c) 1997-2004 University of Cambridge.
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
+
+       Last updated: 23 January 2008
+       Copyright (c) 1997-2008 University of Cambridge.
 ------------------------------------------------------------------------------
 PCRESTACK(3)                                                      PCRESTACK(3)
 
@@ -5099,7 +6591,7 @@
        ter. For a long string, a lot of stack is required. Consider  now  this
        rewritten pattern, which matches exactly the same strings:
 
-         ([^<]++|<(?!inet))
+         ([^<]++|<(?!inet))+
 
        This  uses very much less stack, because runs of characters that do not
        contain "<" are "swallowed" in one item inside the parentheses.  Recur-
@@ -5108,30 +6600,25 @@
        quantifier  is  used  to stop any backtracking into the runs of non-"<"
        characters, but that is not related to stack usage.
 
+       This example shows that one way of avoiding stack problems when  match-
+       ing long subject strings is to write repeated parenthesized subpatterns
+       to match more than one character whenever possible.
+
+   Compiling PCRE to use heap instead of stack
+
        In environments where stack memory is constrained, you  might  want  to
        compile  PCRE to use heap memory instead of stack for remembering back-
        up points. This makes it run a lot more slowly, however. Details of how
-       to do this are given in the pcrebuild documentation.
+       to do this are given in the pcrebuild documentation. When built in this
+       way, instead of using the stack, PCRE obtains and frees memory by call-
+       ing  the  functions  that  are  pointed to by the pcre_stack_malloc and
+       pcre_stack_free variables. By default,  these  point  to  malloc()  and
+       free(),  but you can replace the pointers to cause PCRE to use your own
+       functions. Since the block sizes are always the same,  and  are  always
+       freed in reverse order, it may be possible to implement customized mem-
+       ory handlers that are more efficient than the standard functions.
 
-       In Unix-like environments, there is not often a problem with the stack,
-       though the default limit on stack size varies from  system  to  system.
-       Values  from 8Mb to 64Mb are common. You can find your default limit by
-       running the command:
-
-         ulimit -s
-
-       The effect of running out of stack is often SIGSEGV,  though  sometimes
-       an error message is given. You can normally increase the limit on stack
-       size by code such as this:
-
-         struct rlimit rlim;
-         getrlimit(RLIMIT_STACK, &rlim);
-         rlim.rlim_cur = 100*1024*1024;
-         setrlimit(RLIMIT_STACK, &rlim);
-
-       This reads the current limits (soft and hard) using  getrlimit(),  then
-       attempts  to  increase  the  soft limit to 100Mb using setrlimit(). You
-       must do this before calling pcre_exec().
+   Limiting PCRE's stack usage
 
        PCRE has an internal counter that can be used to  limit  the  depth  of
        recursion,  and  thus cause pcre_exec() to give an error code before it
@@ -5144,10 +6631,50 @@
        recursion. Thus, if you want to limit your  stack  usage  to  8Mb,  you
        should  set  the  limit at 16000 recursions. A 64Mb stack, on the other
        hand, can support around 128000 recursions. The pcretest  test  program
-       has  a command line option (-S) that can be used to increase its stack.
+       has a command line option (-S) that can be used to increase the size of
+       its stack.
+
+   Changing stack size in Unix-like systems
+
+       In Unix-like environments, there is not often a problem with the  stack
+       unless  very  long  strings  are  involved, though the default limit on
+       stack size varies from system to system. Values from 8Mb  to  64Mb  are
+       common. You can find your default limit by running the command:
+
+         ulimit -s
+
+       Unfortunately,  the  effect  of  running out of stack is often SIGSEGV,
+       though sometimes a more explicit error message is given. You  can  nor-
+       mally increase the limit on stack size by code such as this:
+
+         struct rlimit rlim;
+         getrlimit(RLIMIT_STACK, &rlim);
+         rlim.rlim_cur = 100*1024*1024;
+         setrlimit(RLIMIT_STACK, &rlim);
+
+       This  reads  the current limits (soft and hard) using getrlimit(), then
+       attempts to increase the soft limit to  100Mb  using  setrlimit().  You
+       must do this before calling pcre_exec().
+
+   Changing stack size in Mac OS X
+
+       Using setrlimit(), as described above, should also work on Mac OS X. It
+       is also possible to set a stack size when linking a program. There is a
+       discussion   about   stack  sizes  in  Mac  OS  X  at  this  web  site:
+       http://developer.apple.com/qa/qa2005/qa1419.html.
+
+
+AUTHOR
+
+       Philip Hazel
+       University Computing Service
+       Cambridge CB2 3QH, England.
+
+
+REVISION
 
-Last updated: 29 June 2006
-Copyright (c) 1997-2006 University of Cambridge.
+       Last updated: 09 July 2008
+       Copyright (c) 1997-2008 University of Cambridge.
 ------------------------------------------------------------------------------
 
 

Modified: freeswitch/trunk/libs/pcre/doc/pcre_compile.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_compile.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_compile.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B pcre *pcre_compile(const char *\fIpattern\fP, int \fIoptions\fP,
 .ti +5n
 .B const char **\fIerrptr\fP, int *\fIerroffset\fP,
@@ -17,8 +16,9 @@
 .SH DESCRIPTION
 .rs
 .sp
-This function compiles a regular expression into an internal form. Its
-arguments are:
+This function compiles a regular expression into an internal form. It is the
+same as \fBpcre_compile2()\fP, except for the absence of the \fIerrorcodeptr\fP
+argument. Its arguments are:
 .sp
   \fIpattern\fR       A zero-terminated string containing the
                   regular expression to be compiled
@@ -30,33 +30,41 @@
 .sp
 The option bits are:
 .sp
-  PCRE_ANCHORED         Force pattern anchoring
-  PCRE_AUTO_CALLOUT     Compile automatic callouts
-  PCRE_CASELESS         Do caseless matching
-  PCRE_DOLLAR_ENDONLY   $ not to match newline at end
-  PCRE_DOTALL           . matches anything including NL
-  PCRE_DUPNAMES         Allow duplicate names for subpatterns
-  PCRE_EXTENDED         Ignore whitespace and # comments
-  PCRE_EXTRA            PCRE extra features
-                          (not much use currently)
-  PCRE_FIRSTLINE        Force matching to be before newline
-  PCRE_MULTILINE        ^ and $ match newlines within data
-  PCRE_NEWLINE_CR       Set CR as the newline sequence
-  PCRE_NEWLINE_CRLF     Set CRLF as the newline sequence
-  PCRE_NEWLINE_LF       Set LF as the newline sequence
-  PCRE_NO_AUTO_CAPTURE  Disable numbered capturing paren-
-                          theses (named ones available)
-  PCRE_UNGREEDY         Invert greediness of quantifiers
-  PCRE_UTF8             Run in UTF-8 mode
-  PCRE_NO_UTF8_CHECK    Do not check the pattern for UTF-8
-                          validity (only relevant if
-                          PCRE_UTF8 is set)
+  PCRE_ANCHORED           Force pattern anchoring
+  PCRE_AUTO_CALLOUT       Compile automatic callouts
+  PCRE_BSR_ANYCRLF        \eR matches only CR, LF, or CRLF
+  PCRE_BSR_UNICODE        \eR matches all Unicode line endings
+  PCRE_CASELESS           Do caseless matching
+  PCRE_DOLLAR_ENDONLY     $ not to match newline at end
+  PCRE_DOTALL             . matches anything including NL
+  PCRE_DUPNAMES           Allow duplicate names for subpatterns
+  PCRE_EXTENDED           Ignore whitespace and # comments
+  PCRE_EXTRA              PCRE extra features
+                            (not much use currently)
+  PCRE_FIRSTLINE          Force matching to be before newline
+  PCRE_JAVASCRIPT_COMPAT  JavaScript compatibility
+  PCRE_MULTILINE          ^ and $ match newlines within data
+  PCRE_NEWLINE_ANY        Recognize any Unicode newline sequence
+  PCRE_NEWLINE_ANYCRLF    Recognize CR, LF, and CRLF as newline
+                            sequences
+  PCRE_NEWLINE_CR         Set CR as the newline sequence
+  PCRE_NEWLINE_CRLF       Set CRLF as the newline sequence
+  PCRE_NEWLINE_LF         Set LF as the newline sequence
+  PCRE_NO_AUTO_CAPTURE    Disable numbered capturing paren-
+                            theses (named ones available)
+  PCRE_UNGREEDY           Invert greediness of quantifiers
+  PCRE_UTF8               Run in UTF-8 mode
+  PCRE_NO_UTF8_CHECK      Do not check the pattern for UTF-8
+                            validity (only relevant if
+                            PCRE_UTF8 is set)
 .sp
 PCRE must be built with UTF-8 support in order to use PCRE_UTF8 and
 PCRE_NO_UTF8_CHECK.
 .P
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected.
+contains the compiled pattern, or NULL if an error was detected. Note that
+compiling regular expressions with one version of PCRE for use with a different
+version is not guaranteed to work and may cause crashes.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF

Modified: freeswitch/trunk/libs/pcre/doc/pcre_compile2.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_compile2.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_compile2.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B pcre *pcre_compile2(const char *\fIpattern\fP, int \fIoptions\fP,
 .ti +5n
 .B int *\fIerrorcodeptr\fP,
@@ -46,6 +45,8 @@
                           (not much use currently)
   PCRE_FIRSTLINE        Force matching to be before newline
   PCRE_MULTILINE        ^ and $ match newlines within data
+  PCRE_NEWLINE_ANY      Recognize any Unicode newline sequence
+  PCRE_NEWLINE_ANYCRLF  Recognize CR, LF, and CRLF as newline sequences
   PCRE_NEWLINE_CR       Set CR as the newline sequence
   PCRE_NEWLINE_CRLF     Set CRLF as the newline sequence
   PCRE_NEWLINE_LF       Set LF as the newline sequence
@@ -61,7 +62,9 @@
 PCRE_NO_UTF8_CHECK.
 .P
 The yield of the function is a pointer to a private data structure that
-contains the compiled pattern, or NULL if an error was detected.
+contains the compiled pattern, or NULL if an error was detected. Note that
+compiling regular expressions with one version of PCRE for use with a different
+version is not guaranteed to work and may cause crashes.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF

Modified: freeswitch/trunk/libs/pcre/doc/pcre_config.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_config.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_config.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_config(int \fIwhat\fP, void *\fIwhere\fP);
 .
 .SH DESCRIPTION
@@ -26,7 +25,15 @@
   PCRE_CONFIG_MATCH_LIMIT   Internal resource limit
   PCRE_CONFIG_MATCH_LIMIT_RECURSION
                             Internal recursion depth limit
-  PCRE_CONFIG_NEWLINE       Value of the newline sequence
+  PCRE_CONFIG_NEWLINE       Value of the default newline sequence:
+                                13 (0x000d)    for CR
+                                10 (0x000a)    for LF
+                              3338 (0x0d0a)    for CRLF
+                                -2             for ANYCRLF
+                                -1             for ANY
+  PCRE_CONFIG_BSR           Indicates what \eR matches by default:
+                                 0             all Unicode line endings
+                                 1             CR, LF, or CRLF only
   PCRE_CONFIG_POSIX_MALLOC_THRESHOLD
                             Threshold of return slots, above
                               which \fBmalloc()\fR is used by

Modified: freeswitch/trunk/libs/pcre/doc/pcre_copy_named_substring.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_copy_named_substring.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_copy_named_substring.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_copy_named_substring(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIsubject\fP, int *\fIovector\fP,

Modified: freeswitch/trunk/libs/pcre/doc/pcre_copy_substring.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_copy_substring.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_copy_substring.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_copy_substring(const char *\fIsubject\fP, int *\fIovector\fP,
 .ti +5n
 .B int \fIstringcount\fP, int \fIstringnumber\fP, char *\fIbuffer\fP,
@@ -27,7 +26,7 @@
   \fIbuffer\fP        Buffer to receive the string
   \fIbuffersize\fP    Size of buffer
 .sp
-The yield is the legnth of the string, PCRE_ERROR_NOMEMORY if the buffer was
+The yield is the length of the string, PCRE_ERROR_NOMEMORY if the buffer was
 too small, or PCRE_ERROR_NOSUBSTRING if the string number is invalid.
 .P
 There is a complete description of the PCRE native API in the

Modified: freeswitch/trunk/libs/pcre/doc/pcre_dfa_exec.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_dfa_exec.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_dfa_exec.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_dfa_exec(const pcre *\fIcode\fP, "const pcre_extra *\fIextra\fP,"
 .ti +5n
 .B "const char *\fIsubject\fP," int \fIlength\fP, int \fIstartoffset\fP,
@@ -20,9 +19,9 @@
 .rs
 .sp
 This function matches a compiled regular expression against a given subject
-string, using a DFA matching algorithm (\fInot\fP Perl-compatible). Note that
-the main, Perl-compatible, matching function is \fBpcre_exec()\fP. The
-arguments for this function are:
+string, using an alternative matching algorithm that scans the subject string
+just once (\fInot\fP Perl-compatible). Note that the main, Perl-compatible,
+matching function is \fBpcre_exec()\fP. The arguments for this function are:
 .sp
   \fIcode\fP         Points to the compiled pattern
   \fIextra\fP        Points to an associated \fBpcre_extra\fP structure,
@@ -40,12 +39,17 @@
 The options are:
 .sp
   PCRE_ANCHORED      Match only at the first position
+  PCRE_BSR_ANYCRLF   \eR matches only CR, LF, or CRLF
+  PCRE_BSR_UNICODE   \eR matches all Unicode line endings
+  PCRE_NEWLINE_ANY   Recognize any Unicode newline sequence
+  PCRE_NEWLINE_ANYCRLF  Recognize CR, LF, and CRLF as newline sequences
   PCRE_NEWLINE_CR    Set CR as the newline sequence
   PCRE_NEWLINE_CRLF  Set CRLF as the newline sequence
   PCRE_NEWLINE_LF    Set LF as the newline sequence
   PCRE_NOTBOL        Subject is not the beginning of a line
   PCRE_NOTEOL        Subject is not the end of a line
   PCRE_NOTEMPTY      An empty string is not a valid match
+  PCRE_NO_START_OPTIMIZE  Do not do "start-match" optimizations
   PCRE_NO_UTF8_CHECK Do not check the subject for UTF-8
                        validity (only relevant if PCRE_UTF8
                        was set at compile time)
@@ -53,8 +57,8 @@
   PCRE_DFA_SHORTEST  Return only the shortest match
   PCRE_DFA_RESTART   This is a restart after a partial match
 .sp
-There are restrictions on what may appear in a pattern when matching using the
-DFA algorithm is requested. Details are given in the
+There are restrictions on what may appear in a pattern when using this matching
+function. Details are given in the
 .\" HREF
 \fBpcrematching\fP
 .\"
@@ -71,7 +75,7 @@
 .sp
 The flag bits are PCRE_EXTRA_STUDY_DATA, PCRE_EXTRA_MATCH_LIMIT,
 PCRE_EXTRA_MATCH_LIMIT_RECURSION, PCRE_EXTRA_CALLOUT_DATA, and
-PCRE_EXTRA_TABLES. For DFA matching, the \fImatch_limit\fP and
+PCRE_EXTRA_TABLES. For this matching function, the \fImatch_limit\fP and
 \fImatch_limit_recursion\fP fields are not used, and must not be set.
 .P
 There is a complete description of the PCRE native API in the

Modified: freeswitch/trunk/libs/pcre/doc/pcre_exec.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_exec.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_exec.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_exec(const pcre *\fIcode\fP, "const pcre_extra *\fIextra\fP,"
 .ti +5n
 .B "const char *\fIsubject\fP," int \fIlength\fP, int \fIstartoffset\fP,
@@ -35,19 +34,28 @@
 The options are:
 .sp
   PCRE_ANCHORED      Match only at the first position
+  PCRE_BSR_ANYCRLF   \eR matches only CR, LF, or CRLF
+  PCRE_BSR_UNICODE   \eR matches all Unicode line endings
+  PCRE_NEWLINE_ANY   Recognize any Unicode newline sequence
+  PCRE_NEWLINE_ANYCRLF  Recognize CR, LF, and CRLF as newline sequences
   PCRE_NEWLINE_CR    Set CR as the newline sequence
   PCRE_NEWLINE_CRLF  Set CRLF as the newline sequence
   PCRE_NEWLINE_LF    Set LF as the newline sequence
   PCRE_NOTBOL        Subject is not the beginning of a line
   PCRE_NOTEOL        Subject is not the end of a line
   PCRE_NOTEMPTY      An empty string is not a valid match
+  PCRE_NO_START_OPTIMIZE  Do not do "start-match" optimizations
   PCRE_NO_UTF8_CHECK Do not check the subject for UTF-8
                        validity (only relevant if PCRE_UTF8
                        was set at compile time)
   PCRE_PARTIAL       Return PCRE_ERROR_PARTIAL for a partial match
 .sp
 There are restrictions on what may appear in a pattern when partial matching is
-requested.
+requested. For details, see the
+.\" HREF
+\fBpcrepartial\fP
+.\"
+page.
 .P
 A \fBpcre_extra\fP structure contains the following fields:
 .sp

Modified: freeswitch/trunk/libs/pcre/doc/pcre_free_substring.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_free_substring.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_free_substring.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B void pcre_free_substring(const char *\fIstringptr\fP);
 .
 .SH DESCRIPTION

Modified: freeswitch/trunk/libs/pcre/doc/pcre_free_substring_list.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_free_substring_list.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_free_substring_list.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B void pcre_free_substring_list(const char **\fIstringptr\fP);
 .
 .SH DESCRIPTION

Modified: freeswitch/trunk/libs/pcre/doc/pcre_fullinfo.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_fullinfo.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_fullinfo.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_fullinfo(const pcre *\fIcode\fP, "const pcre_extra *\fIextra\fP,"
 .ti +5n
 .B int \fIwhat\fP, void *\fIwhere\fP);
@@ -31,13 +30,14 @@
                               -1 for start of string
                                  or after newline, or
                               -2 otherwise
-  PCRE_INFO_FIRSTTABLE      Table of first bytes
-                              (after studying)
+  PCRE_INFO_FIRSTTABLE      Table of first bytes (after studying)
+  PCRE_INFO_JCHANGED        Return 1 if (?J) or (?-J) was used
   PCRE_INFO_LASTLITERAL     Literal last byte required
   PCRE_INFO_NAMECOUNT       Number of named subpatterns
   PCRE_INFO_NAMEENTRYSIZE   Size of name table entry
   PCRE_INFO_NAMETABLE       Pointer to name table
-  PCRE_INFO_OPTIONS         Options used for compilation
+  PCRE_INFO_OKPARTIAL       Return 1 if partial matching can be tried
+  PCRE_INFO_OPTIONS         Option bits used for compilation
   PCRE_INFO_SIZE            Size of compiled pattern
   PCRE_INFO_STUDYSIZE       Size of study data
 .sp

Modified: freeswitch/trunk/libs/pcre/doc/pcre_get_named_substring.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_get_named_substring.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_get_named_substring.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_get_named_substring(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIsubject\fP, int *\fIovector\fP,
@@ -30,9 +29,10 @@
   \fIstringptr\fP     Where to put the string pointer
 .sp
 The memory in which the substring is placed is obtained by calling
-\fBpcre_malloc()\fP. The yield of the function is the length of the extracted
-substring, PCRE_ERROR_NOMEMORY if sufficient memory could not be obtained, or
-PCRE_ERROR_NOSUBSTRING if the string name is invalid.
+\fBpcre_malloc()\fP. The convenience function \fBpcre_free_substring()\fP can
+be used to free it when it is no longer needed. The yield of the function is
+the length of the extracted substring, PCRE_ERROR_NOMEMORY if sufficient memory
+could not be obtained, or PCRE_ERROR_NOSUBSTRING if the string name is invalid.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF

Modified: freeswitch/trunk/libs/pcre/doc/pcre_get_stringnumber.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_get_stringnumber.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_get_stringnumber.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_get_stringnumber(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIname\fP);
@@ -22,7 +21,10 @@
   \fIname\fP    Name whose number is required
 .sp
 The yield of the function is the number of the parenthesis if the name is
-found, or PCRE_ERROR_NOSUBSTRING otherwise.
+found, or PCRE_ERROR_NOSUBSTRING otherwise. When duplicate names are allowed
+(PCRE_DUPNAMES is set), it is not defined which of the numbers is returned by
+\fBpcre_get_stringnumber()\fP. You can obtain the complete list by calling
+\fBpcre_get_stringtable_entries()\fP.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF

Modified: freeswitch/trunk/libs/pcre/doc/pcre_get_stringtable_entries.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_get_stringtable_entries.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_get_stringtable_entries.3	Mon Jun  8 18:51:30 2009
@@ -1,4 +1,4 @@
-.TH PCRE_GET_STRINGNUMBER 3
+.TH PCRE_GET_STRINGTABLE_ENTRIES 3
 .SH NAME
 PCRE - Perl-compatible regular expressions
 .SH SYNOPSIS
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_get_stringtable_entries(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIname\fP, char **\fIfirst\fP, char **\fIlast\fP);
@@ -34,7 +33,7 @@
 .\" HREF
 \fBpcreapi\fP
 .\"
-page and a description of the POSIX API in the
+page, and a description of the POSIX API in the
 .\" HREF
 \fBpcreposix\fP
 .\"

Modified: freeswitch/trunk/libs/pcre/doc/pcre_get_substring.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_get_substring.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_get_substring.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_get_substring(const char *\fIsubject\fP, int *\fIovector\fP,
 .ti +5n
 .B int \fIstringcount\fP, int \fIstringnumber\fP,
@@ -27,9 +26,10 @@
   \fIstringptr\fP     Where to put the string pointer
 .sp
 The memory in which the substring is placed is obtained by calling
-\fBpcre_malloc()\fP. The yield of the function is the length of the substring,
-PCRE_ERROR_NOMEMORY if sufficient memory could not be obtained, or
-PCRE_ERROR_NOSUBSTRING if the string number is invalid.
+\fBpcre_malloc()\fP. The convenience function \fBpcre_free_substring()\fP can
+be used to free it when it is no longer needed. The yield of the function is
+the length of the substring, PCRE_ERROR_NOMEMORY if sufficient memory could not
+be obtained, or PCRE_ERROR_NOSUBSTRING if the string number is invalid.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF

Modified: freeswitch/trunk/libs/pcre/doc/pcre_get_substring_list.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_get_substring_list.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_get_substring_list.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_get_substring_list(const char *\fIsubject\fP,
 .ti +5n
 .B int *\fIovector\fP, int \fIstringcount\fP, "const char ***\fIlistptr\fP);"
@@ -24,10 +23,12 @@
   \fIlistptr\fP       Where to put a pointer to the list
 .sp
 The memory in which the substrings and the list are placed is obtained by
-calling \fBpcre_malloc()\fP. A pointer to a list of pointers is put in
-the variable whose address is in \fIlistptr\fP. The list is terminated by a
-NULL pointer. The yield of the function is zero on success or
-PCRE_ERROR_NOMEMORY if sufficient memory could not be obtained.
+calling \fBpcre_malloc()\fP. The convenience function
+\fBpcre_free_substring_list()\fP can be used to free it when it is no longer
+needed. A pointer to a list of pointers is put in the variable whose address is
+in \fIlistptr\fP. The list is terminated by a NULL pointer. The yield of the
+function is zero on success or PCRE_ERROR_NOMEMORY if sufficient memory could
+not be obtained.
 .P
 There is a complete description of the PCRE native API in the
 .\" HREF

Modified: freeswitch/trunk/libs/pcre/doc/pcre_info.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_info.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_info.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_info(const pcre *\fIcode\fP, int *\fIoptptr\fP, int
 .B *\fIfirstcharptr\fP);
 .

Modified: freeswitch/trunk/libs/pcre/doc/pcre_maketables.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_maketables.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_maketables.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B const unsigned char *pcre_maketables(void);
 .
 .SH DESCRIPTION

Modified: freeswitch/trunk/libs/pcre/doc/pcre_refcount.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_refcount.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_refcount.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B int pcre_refcount(pcre *\fIcode\fP, int \fIadjust\fP);
 .
 .SH DESCRIPTION

Modified: freeswitch/trunk/libs/pcre/doc/pcre_study.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_study.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_study.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B pcre_extra *pcre_study(const pcre *\fIcode\fP, int \fIoptions\fP,
 .ti +5n
 .B const char **\fIerrptr\fP);

Modified: freeswitch/trunk/libs/pcre/doc/pcre_version.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcre_version.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcre_version.3	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,6 @@
 .B #include 
 .PP
 .SM
-.br
 .B char *pcre_version(void);
 .
 .SH DESCRIPTION

Modified: freeswitch/trunk/libs/pcre/doc/pcreapi.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcreapi.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcreapi.3	Mon Jun  8 18:51:30 2009
@@ -7,14 +7,12 @@
 .B #include 
 .PP
 .SM
-.br
 .B pcre *pcre_compile(const char *\fIpattern\fP, int \fIoptions\fP,
 .ti +5n
 .B const char **\fIerrptr\fP, int *\fIerroffset\fP,
 .ti +5n
 .B const unsigned char *\fItableptr\fP);
 .PP
-.br
 .B pcre *pcre_compile2(const char *\fIpattern\fP, int \fIoptions\fP,
 .ti +5n
 .B int *\fIerrorcodeptr\fP,
@@ -23,19 +21,16 @@
 .ti +5n
 .B const unsigned char *\fItableptr\fP);
 .PP
-.br
 .B pcre_extra *pcre_study(const pcre *\fIcode\fP, int \fIoptions\fP,
 .ti +5n
 .B const char **\fIerrptr\fP);
 .PP
-.br
 .B int pcre_exec(const pcre *\fIcode\fP, "const pcre_extra *\fIextra\fP,"
 .ti +5n
 .B "const char *\fIsubject\fP," int \fIlength\fP, int \fIstartoffset\fP,
 .ti +5n
 .B int \fIoptions\fP, int *\fIovector\fP, int \fIovecsize\fP);
 .PP
-.br
 .B int pcre_dfa_exec(const pcre *\fIcode\fP, "const pcre_extra *\fIextra\fP,"
 .ti +5n
 .B "const char *\fIsubject\fP," int \fIlength\fP, int \fIstartoffset\fP,
@@ -44,7 +39,6 @@
 .ti +5n
 .B int *\fIworkspace\fP, int \fIwscount\fP);
 .PP
-.br
 .B int pcre_copy_named_substring(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIsubject\fP, int *\fIovector\fP,
@@ -53,14 +47,12 @@
 .ti +5n
 .B char *\fIbuffer\fP, int \fIbuffersize\fP);
 .PP
-.br
 .B int pcre_copy_substring(const char *\fIsubject\fP, int *\fIovector\fP,
 .ti +5n
 .B int \fIstringcount\fP, int \fIstringnumber\fP, char *\fIbuffer\fP,
 .ti +5n
 .B int \fIbuffersize\fP);
 .PP
-.br
 .B int pcre_get_named_substring(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIsubject\fP, int *\fIovector\fP,
@@ -69,76 +61,59 @@
 .ti +5n
 .B const char **\fIstringptr\fP);
 .PP
-.br
 .B int pcre_get_stringnumber(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIname\fP);
 .PP
-.br
 .B int pcre_get_stringtable_entries(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIname\fP, char **\fIfirst\fP, char **\fIlast\fP);
 .PP
-.br
 .B int pcre_get_substring(const char *\fIsubject\fP, int *\fIovector\fP,
 .ti +5n
 .B int \fIstringcount\fP, int \fIstringnumber\fP,
 .ti +5n
 .B const char **\fIstringptr\fP);
 .PP
-.br
 .B int pcre_get_substring_list(const char *\fIsubject\fP,
 .ti +5n
 .B int *\fIovector\fP, int \fIstringcount\fP, "const char ***\fIlistptr\fP);"
 .PP
-.br
 .B void pcre_free_substring(const char *\fIstringptr\fP);
 .PP
-.br
 .B void pcre_free_substring_list(const char **\fIstringptr\fP);
 .PP
-.br
 .B const unsigned char *pcre_maketables(void);
 .PP
-.br
 .B int pcre_fullinfo(const pcre *\fIcode\fP, "const pcre_extra *\fIextra\fP,"
 .ti +5n
 .B int \fIwhat\fP, void *\fIwhere\fP);
 .PP
-.br
 .B int pcre_info(const pcre *\fIcode\fP, int *\fIoptptr\fP, int
 .B *\fIfirstcharptr\fP);
 .PP
-.br
 .B int pcre_refcount(pcre *\fIcode\fP, int \fIadjust\fP);
 .PP
-.br
 .B int pcre_config(int \fIwhat\fP, void *\fIwhere\fP);
 .PP
-.br
 .B char *pcre_version(void);
 .PP
-.br
 .B void *(*pcre_malloc)(size_t);
 .PP
-.br
 .B void (*pcre_free)(void *);
 .PP
-.br
 .B void *(*pcre_stack_malloc)(size_t);
 .PP
-.br
 .B void (*pcre_stack_free)(void *);
 .PP
-.br
 .B int (*pcre_callout)(pcre_callout_block *);
 .
 .
 .SH "PCRE API OVERVIEW"
 .rs
 .sp
-PCRE has its own native API, which is described in this document. There is
-also a set of wrapper functions that correspond to the POSIX regular expression
+PCRE has its own native API, which is described in this document. There are
+also some wrapper functions that correspond to the POSIX regular expression
 API. These are described in the
 .\" HREF
 \fBpcreposix\fP
@@ -165,14 +140,14 @@
 .\" HREF
 \fBpcresample\fP
 .\"
-documentation describes how to run it.
+documentation describes how to compile and run it.
 .P
 A second matching function, \fBpcre_dfa_exec()\fP, which is not
 Perl-compatible, is also provided. This uses a different algorithm for the
 matching. The alternative algorithm finds all possible matches (at a given
-point in the subject). However, this algorithm does not return captured
-substrings. A description of the two matching algorithms and their advantages
-and disadvantages is given in the
+point in the subject), and scans the subject just once. However, this algorithm
+does not return captured substrings. A description of the two matching
+algorithms and their advantages and disadvantages is given in the
 .\" HREF
 \fBpcrematching\fP
 .\"
@@ -243,16 +218,47 @@
 documentation.
 .
 .
+.\" HTML 
 .SH NEWLINES
-PCRE supports three different conventions for indicating line breaks in
-strings: a single CR character, a single LF character, or the two-character
-sequence CRLF. All three are used as "standard" by different operating systems.
-When PCRE is built, a default can be specified. The default default is LF,
-which is the Unix standard. When PCRE is run, the default can be overridden,
-either when a pattern is compiled, or when it is matched.
+.rs
 .sp
+PCRE supports five different conventions for indicating line breaks in
+strings: a single CR (carriage return) character, a single LF (linefeed)
+character, the two-character sequence CRLF, any of the three preceding, or any
+Unicode newline sequence. The Unicode newline sequences are the three just
+mentioned, plus the single characters VT (vertical tab, U+000B), FF (formfeed,
+U+000C), NEL (next line, U+0085), LS (line separator, U+2028), and PS
+(paragraph separator, U+2029).
+.P
+Each of the first three conventions is used by at least one operating system as
+its standard newline sequence. When PCRE is built, a default can be specified.
+The default default is LF, which is the Unix standard. When PCRE is run, the
+default can be overridden, either when a pattern is compiled, or when it is
+matched.
+.P
+At compile time, the newline convention can be specified by the \fIoptions\fP
+argument of \fBpcre_compile()\fP, or it can be specified by special text at the
+start of the pattern itself; this overrides any other settings. See the
+.\" HREF
+\fBpcrepattern\fP
+.\"
+page for details of the special character sequences.
+.P
 In the PCRE documentation the word "newline" is used to mean "the character or
-pair of characters that indicate a line break".
+pair of characters that indicate a line break". The choice of newline
+convention affects the handling of the dot, circumflex, and dollar
+metacharacters, the handling of #-comments in /x mode, and, when CRLF is a
+recognized line ending sequence, the match position advancement for a
+non-anchored pattern. There is more detail about this in the
+.\" HTML 
+.\" 
+section on \fBpcre_exec()\fP options
+.\"
+below.
+.P
+The choice of newline convention does not affect the interpretation of
+the \en or \er escape sequences, nor does it affect what \eR matches, which is
+controlled in a similar way, but by separate options.
 .
 .
 .SH MULTITHREADING
@@ -276,7 +282,9 @@
 .\" HREF
 \fBpcreprecompile\fP
 .\"
-documentation.
+documentation. However, compiling a regular expression with one version of PCRE
+for use with a different version is not guaranteed to work and may cause
+crashes.
 .
 .
 .SH "CHECKING BUILD-TIME OPTIONS"
@@ -308,9 +316,18 @@
   PCRE_CONFIG_NEWLINE
 .sp
 The output is an integer whose value specifies the default character sequence
-that is recognized as meaning "newline". The three values that are supported
-are: 10 for LF, 13 for CR, and 3338 for CRLF. The default should normally be
-the standard sequence for your operating system.
+that is recognized as meaning "newline". The four values that are supported
+are: 10 for LF, 13 for CR, 3338 for CRLF, -2 for ANYCRLF, and -1 for ANY.
+Though they are derived from ASCII, the same values are returned in EBCDIC
+environments. The default should normally correspond to the standard sequence
+for your operating system.
+.sp
+  PCRE_CONFIG_BSR
+.sp
+The output is an integer whose value indicates what character sequences the \eR
+escape sequence matches by default. A value of 0 means that \eR matches any
+Unicode line ending sequence; a value of 1 means that \eR matches only CR, LF,
+or CRLF. The default can be overridden when a pattern is compiled or matched.
 .sp
   PCRE_CONFIG_LINK_SIZE
 .sp
@@ -332,13 +349,13 @@
 .sp
   PCRE_CONFIG_MATCH_LIMIT
 .sp
-The output is an integer that gives the default limit for the number of
+The output is a long integer that gives the default limit for the number of
 internal matching function calls in a \fBpcre_exec()\fP execution. Further
 details are given with \fBpcre_exec()\fP below.
 .sp
   PCRE_CONFIG_MATCH_LIMIT_RECURSION
 .sp
-The output is an integer that gives the default limit for the depth of
+The output is a long integer that gives the default limit for the depth of
 recursion when calling the internal matching function in a \fBpcre_exec()\fP
 execution. Further details are given with \fBpcre_exec()\fP below.
 .sp
@@ -387,18 +404,19 @@
 fully relocatable, because it may contain a copy of the \fItableptr\fP
 argument, which is an address (see below).
 .P
-The \fIoptions\fP argument contains independent bits that affect the
+The \fIoptions\fP argument contains various bit settings that affect the
 compilation. It should be zero if no options are required. The available
-options are described below. Some of them, in particular, those that are
-compatible with Perl, can also be set and unset from within the pattern (see
-the detailed description in the
+options are described below. Some of them (in particular, those that are
+compatible with Perl, but also some others) can also be set and unset from
+within the pattern (see the detailed description in the
 .\" HREF
 \fBpcrepattern\fP
 .\"
-documentation). For these options, the contents of the \fIoptions\fP argument
-specifies their initial settings at the start of compilation and execution. The
-PCRE_ANCHORED and PCRE_NEWLINE_\fIxxx\fP options can be set at the time of
-matching as well as at compile time.
+documentation). For those options that can be different in different parts of
+the pattern, the contents of the \fIoptions\fP argument specifies their initial
+settings at the start of compilation and execution. The PCRE_ANCHORED and
+PCRE_NEWLINE_\fIxxx\fP options can be set at the time of matching as well as at
+compile time.
 .P
 If \fIerrptr\fP is NULL, \fBpcre_compile()\fP returns NULL immediately.
 Otherwise, if compilation of a pattern fails, \fBpcre_compile()\fP returns
@@ -453,6 +471,15 @@
 .\"
 documentation.
 .sp
+  PCRE_BSR_ANYCRLF
+  PCRE_BSR_UNICODE
+.sp
+These options (which are mutually exclusive) control what the \eR escape
+sequence matches. The choice is either to match only CR, LF, or CRLF, or to
+match any Unicode newline sequence. The default is specified when PCRE is
+built. It can be overridden from within the pattern, or by setting an option
+when a compiled pattern is matched.
+.sp
   PCRE_CASELESS
 .sp
 If this bit is set, letters in the pattern match both upper and lower case
@@ -480,8 +507,8 @@
 including those that indicate newline. Without it, a dot does not match when
 the current position is at a newline. This option is equivalent to Perl's /s
 option, and it can be changed within a pattern by a (?s) option setting. A
-negative class such as [^a] always matches newlines, independent of the setting
-of this option.
+negative class such as [^a] always matches newline characters, independent of
+the setting of this option.
 .sp
   PCRE_DUPNAMES
 .sp
@@ -525,6 +552,20 @@
 the first newline in the subject string, though the matched text may continue
 over the newline.
 .sp
+  PCRE_JAVASCRIPT_COMPAT
+.sp
+If this option is set, PCRE's behaviour is changed in some ways so that it is
+compatible with JavaScript rather than Perl. The changes are as follows:
+.P
+(1) A lone closing square bracket in a pattern causes a compile-time error,
+because this is illegal in JavaScript (by default it is treated as a data
+character). Thus, the pattern AB]CD becomes illegal when this option is set.
+.P
+(2) At run time, a back reference to an unset subpattern group matches an empty
+string (by default this causes the current matching alternative to fail). A
+pattern such as (\e1)(a) succeeds when this option is set (assuming it can find
+an "a" in the subject), whereas it fails by default, for Perl compatibility.
+.sp
   PCRE_MULTILINE
 .sp
 By default, PCRE treats the subject string as consisting of a single line of
@@ -544,18 +585,37 @@
   PCRE_NEWLINE_CR
   PCRE_NEWLINE_LF
   PCRE_NEWLINE_CRLF
+  PCRE_NEWLINE_ANYCRLF
+  PCRE_NEWLINE_ANY
 .sp
 These options override the default newline definition that was chosen when PCRE
 was built. Setting the first or the second specifies that a newline is
-indicated by a single character (CR or LF, respectively). Setting both of them
-specifies that a newline is indicated by the two-character CRLF sequence. For
-convenience, PCRE_NEWLINE_CRLF is defined to contain both bits. The only time
-that a line break is relevant when compiling a pattern is if PCRE_EXTENDED is
-set, and an unescaped # outside a character class is encountered. This
-indicates a comment that lasts until after the next newline.
+indicated by a single character (CR or LF, respectively). Setting
+PCRE_NEWLINE_CRLF specifies that a newline is indicated by the two-character
+CRLF sequence. Setting PCRE_NEWLINE_ANYCRLF specifies that any of the three
+preceding sequences should be recognized. Setting PCRE_NEWLINE_ANY specifies
+that any Unicode newline sequence should be recognized. The Unicode newline
+sequences are the three just mentioned, plus the single characters VT (vertical
+tab, U+000B), FF (formfeed, U+000C), NEL (next line, U+0085), LS (line
+separator, U+2028), and PS (paragraph separator, U+2029). The last two are
+recognized only in UTF-8 mode.
+.P
+The newline setting in the options word uses three bits that are treated
+as a number, giving eight possibilities. Currently only six are used (default
+plus the five values above). This means that if you set more than one newline
+option, the combination may or may not be sensible. For example,
+PCRE_NEWLINE_CR with PCRE_NEWLINE_LF is equivalent to PCRE_NEWLINE_CRLF, but
+other combinations may yield unused numbers and cause an error.
+.P
+The only time that a line break is specially recognized when compiling a
+pattern is if PCRE_EXTENDED is set, and an unescaped # outside a character
+class is encountered. This indicates a comment that lasts until after the next
+line break sequence. In other circumstances, line break sequences are treated
+as literal data, except that in PCRE_EXTENDED mode, both CR and LF are treated
+as whitespace characters and are therefore ignored.
 .P
-The newline option set at compile time becomes the default that is used for
-\fBpcre_exec()\fP and \fBpcre_dfa_exec()\fP, but it can be overridden.
+The newline option that is set at compile time becomes the default that is used
+for \fBpcre_exec()\fP and \fBpcre_dfa_exec()\fP, but it can be overridden.
 .sp
   PCRE_NO_AUTO_CAPTURE
 .sp
@@ -591,14 +651,22 @@
   PCRE_NO_UTF8_CHECK
 .sp
 When PCRE_UTF8 is set, the validity of the pattern as a UTF-8 string is
-automatically checked. If an invalid UTF-8 sequence of bytes is found,
-\fBpcre_compile()\fP returns an error. If you already know that your pattern is
-valid, and you want to skip this check for performance reasons, you can set the
-PCRE_NO_UTF8_CHECK option. When it is set, the effect of passing an invalid
-UTF-8 string as a pattern is undefined. It may cause your program to crash.
-Note that this option can also be passed to \fBpcre_exec()\fP and
-\fBpcre_dfa_exec()\fP, to suppress the UTF-8 validity checking of subject
-strings.
+automatically checked. There is a discussion about the
+.\" HTML 
+.\" 
+validity of UTF-8 strings
+.\"
+in the main
+.\" HREF
+\fBpcre\fP
+.\"
+page. If an invalid UTF-8 sequence of bytes is found, \fBpcre_compile()\fP
+returns an error. If you already know that your pattern is valid, and you want
+to skip this check for performance reasons, you can set the PCRE_NO_UTF8_CHECK
+option. When it is set, the effect of passing an invalid UTF-8 string as a
+pattern is undefined. It may cause your program to crash. Note that this option
+can also be passed to \fBpcre_exec()\fP and \fBpcre_dfa_exec()\fP, to suppress
+the UTF-8 validity checking of subject strings.
 .
 .
 .SH "COMPILATION ERROR CODES"
@@ -606,7 +674,8 @@
 .sp
 The following table lists the error codes than may be returned by
 \fBpcre_compile2()\fP, along with the error messages that may be returned by
-both compiling functions.
+both compiling functions. As PCRE has developed, some error codes have fallen
+out of use. To avoid confusion, they have not been re-used.
 .sp
    0  no error
    1  \e at end of pattern
@@ -618,17 +687,17 @@
    7  invalid escape sequence in character class
    8  range out of order in character class
    9  nothing to repeat
-  10  operand of unlimited repeat could match the empty string
+  10  [this code is not in use]
   11  internal error: unexpected repeat
-  12  unrecognized character after (?
+  12  unrecognized character after (? or (?-
   13  POSIX named classes are supported only within a class
   14  missing )
   15  reference to non-existent subpattern
   16  erroffset passed as NULL
   17  unknown option bit(s) set
   18  missing ) after comment
-  19  parentheses nested too deeply
-  20  regular expression too large
+  19  [this code is not in use]
+  20  regular expression is too large
   21  failed to get memory
   22  unmatched parentheses
   23  internal error: code overflow
@@ -637,11 +706,11 @@
   26  malformed number or name after (?(
   27  conditional group contains more than two branches
   28  assertion expected after (?(
-  29  (?R or (?digits must be followed by )
+  29  (?R or (?[+-]digits must be followed by )
   30  unknown POSIX class name
   31  POSIX collating elements are not supported
   32  this version of PCRE is not compiled with PCRE_UTF8 support
-  33  spare error
+  33  [this code is not in use]
   34  character value in \ex{...} sequence is too large
   35  invalid condition (?(0)
   36  \eC not allowed in lookbehind assertion
@@ -650,16 +719,33 @@
   39  closing ) for (?C expected
   40  recursive call could loop indefinitely
   41  unrecognized character after (?P
-  42  syntax error after (?P
+  42  syntax error in subpattern name (missing terminator)
   43  two named subpatterns have the same name
   44  invalid UTF-8 string
   45  support for \eP, \ep, and \eX has not been compiled
   46  malformed \eP or \ep sequence
   47  unknown property name after \eP or \ep
   48  subpattern name is too long (maximum 32 characters)
-  49  too many named subpatterns (maximum 10,000)
-  50  repeated subpattern is too long
+  49  too many named subpatterns (maximum 10000)
+  50  [this code is not in use]
   51  octal value is greater than \e377 (not in UTF-8 mode)
+  52  internal error: overran compiling workspace
+  53  internal error: previously-checked referenced subpattern not found
+  54  DEFINE group contains more than one branch
+  55  repeating a DEFINE group is not allowed
+  56  inconsistent NEWLINE options
+  57  \eg is not followed by a braced, angle-bracketed, or quoted
+        name/number or by a plain number
+  58  a numbered reference must not be zero
+  59  (*VERB) with an argument is not supported
+  60  (*VERB) not recognized
+  61  number is too big
+  62  subpattern name expected
+  63  digit expected after (?+
+  64  ] is an invalid data character in JavaScript compatibility mode
+.sp
+The numbers 32 and 10000 in errors 48 and 49 are defaults; different values may
+be used if the limits were changed when PCRE was built.
 .
 .
 .SH "STUDYING A PATTERN"
@@ -719,19 +805,25 @@
 .SH "LOCALE SUPPORT"
 .rs
 .sp
-PCRE handles caseless matching, and determines whether characters are letters
+PCRE handles caseless matching, and determines whether characters are letters,
 digits, or whatever, by reference to a set of tables, indexed by character
 value. When running in UTF-8 mode, this applies only to characters with codes
 less than 128. Higher-valued codes never match escapes such as \ew or \ed, but
 can be tested with \ep if PCRE is built with Unicode character property
-support. The use of locales with Unicode is discouraged.
-.P
-An internal set of tables is created in the default C locale when PCRE is
-built. This is used when the final argument of \fBpcre_compile()\fP is NULL,
-and is sufficient for many applications. An alternative set of tables can,
-however, be supplied. These may be created in a different locale from the
-default. As more and more applications change to using Unicode, the need for
-this locale support is expected to die away.
+support. The use of locales with Unicode is discouraged. If you are handling
+characters with codes greater than 128, you should either use UTF-8 and
+Unicode, or use locales, but not try to mix the two.
+.P
+PCRE contains an internal set of tables that are used when the final argument
+of \fBpcre_compile()\fP is NULL. These are sufficient for many applications.
+Normally, the internal tables recognize only ASCII characters. However, when
+PCRE is built, it is possible to cause the internal tables to be rebuilt in the
+default "C" locale of the local system, which may cause them to be different.
+.P
+The internal tables can always be overridden by tables supplied by the
+application that calls PCRE. These may be created in a different locale from
+the default. As more and more applications change to using Unicode, the need
+for this locale support is expected to die away.
 .P
 External tables are built by calling the \fBpcre_maketables()\fP function,
 which has no arguments, in the relevant locale. The result can then be passed
@@ -744,6 +836,9 @@
   tables = pcre_maketables();
   re = pcre_compile(..., tables);
 .sp
+The locale name "fr_FR" is used on Linux and other Unix-like systems; if you
+are using Windows, the name for the French locale is "french".
+.P
 When \fBpcre_maketables()\fP runs, the tables are built in memory that is
 obtained via \fBpcre_malloc\fP. It is the caller's responsibility to ensure
 that the memory containing the tables remains available for as long as it is
@@ -827,7 +922,7 @@
 still recognized for backwards compatibility.)
 .P
 If there is a fixed first byte, for example, from a pattern such as
-(cat|cow|coyote). Otherwise, if either
+(cat|cow|coyote), its value is returned. Otherwise, if either
 .sp
 (a) the pattern was compiled with the PCRE_MULTILINE option, and every branch
 starts with "^", or
@@ -846,6 +941,18 @@
 string, a pointer to the table is returned. Otherwise NULL is returned. The
 fourth argument should point to an \fBunsigned char *\fP variable.
 .sp
+  PCRE_INFO_HASCRORLF
+.sp
+Return 1 if the pattern contains any explicit matches for CR or LF characters,
+otherwise 0. The fourth argument should point to an \fBint\fP variable. An
+explicit match is either a literal CR or LF character, or \er or \en.
+.sp
+  PCRE_INFO_JCHANGED
+.sp
+Return 1 if the (?J) or (?-J) option setting is used in the pattern, otherwise
+0. The fourth argument should point to an \fBint\fP variable. (?J) and
+(?-J) set and unset the local PCRE_DUPNAMES option, respectively.
+.sp
   PCRE_INFO_LASTLITERAL
 .sp
 Return the value of the rightmost literal byte that must exist in any matched
@@ -882,8 +989,8 @@
 PCRE_EXTENDED is set, so white space - including newlines - is ignored):
 .sp
 .\" JOIN
-  (?P (?P(\ed\ed)?\ed\ed) -
-  (?P\ed\ed) - (?P\ed\ed) )
+  (? (?(\ed\ed)?\ed\ed) -
+  (?\ed\ed) - (?\ed\ed) )
 .sp
 There are four named subpatterns, so the table has four entries, and each entry
 in the table is eight bytes long. The table is as follows, with non-printing
@@ -898,12 +1005,25 @@
 name-to-number map, remember that the length of the entries is likely to be
 different for each compiled pattern.
 .sp
+  PCRE_INFO_OKPARTIAL
+.sp
+Return 1 if the pattern can be used for partial matching, otherwise 0. The
+fourth argument should point to an \fBint\fP variable. The
+.\" HREF
+\fBpcrepartial\fP
+.\"
+documentation lists the restrictions that apply to patterns when partial
+matching is used.
+.sp
   PCRE_INFO_OPTIONS
 .sp
 Return a copy of the options with which the pattern was compiled. The fourth
 argument should point to an \fBunsigned long int\fP variable. These option bits
 are those specified in the call to \fBpcre_compile()\fP, modified by any
-top-level option settings within the pattern itself.
+top-level option settings at the start of the pattern itself. In other words,
+they are the options that will be in force when matching starts. For example,
+if the pattern /(?im)abc(?-i)d/ is compiled with the PCRE_EXTENDED option, the
+result is PCRE_CASELESS, PCRE_MULTILINE, and PCRE_EXTENDED.
 .P
 A pattern is automatically anchored by PCRE if all of its top-level
 alternatives begin with one of the following:
@@ -1114,12 +1234,14 @@
 .\"
 documentation for a discussion of saving compiled patterns for later use.
 .
+.\" HTML 
 .SS "Option bits for \fBpcre_exec()\fP"
 .rs
 .sp
 The unused bits of the \fIoptions\fP argument for \fBpcre_exec()\fP must be
 zero. The only bits that may be set are PCRE_ANCHORED, PCRE_NEWLINE_\fIxxx\fP,
-PCRE_NOTBOL, PCRE_NOTEOL, PCRE_NOTEMPTY, PCRE_NO_UTF8_CHECK and PCRE_PARTIAL.
+PCRE_NOTBOL, PCRE_NOTEOL, PCRE_NOTEMPTY, PCRE_NO_START_OPTIMIZE,
+PCRE_NO_UTF8_CHECK and PCRE_PARTIAL.
 .sp
   PCRE_ANCHORED
 .sp
@@ -1128,14 +1250,47 @@
 to be anchored by virtue of its contents, it cannot be made unachored at
 matching time.
 .sp
+  PCRE_BSR_ANYCRLF
+  PCRE_BSR_UNICODE
+.sp
+These options (which are mutually exclusive) control what the \eR escape
+sequence matches. The choice is either to match only CR, LF, or CRLF, or to
+match any Unicode newline sequence. These options override the choice that was
+made or defaulted when the pattern was compiled.
+.sp
   PCRE_NEWLINE_CR
   PCRE_NEWLINE_LF
   PCRE_NEWLINE_CRLF
+  PCRE_NEWLINE_ANYCRLF
+  PCRE_NEWLINE_ANY
 .sp
 These options override the newline definition that was chosen or defaulted when
-the pattern was compiled. For details, see the description \fBpcre_compile()\fP
-above. During matching, the newline choice affects the behaviour of the dot,
-circumflex, and dollar metacharacters.
+the pattern was compiled. For details, see the description of
+\fBpcre_compile()\fP above. During matching, the newline choice affects the
+behaviour of the dot, circumflex, and dollar metacharacters. It may also alter
+the way the match position is advanced after a match failure for an unanchored
+pattern.
+.P
+When PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANYCRLF, or PCRE_NEWLINE_ANY is set, and a
+match attempt for an unanchored pattern fails when the current position is at a
+CRLF sequence, and the pattern contains no explicit matches for CR or LF
+characters, the match position is advanced by two characters instead of one, in
+other words, to after the CRLF.
+.P
+The above rule is a compromise that makes the most common cases work as
+expected. For example, if the pattern is .+A (and the PCRE_DOTALL option is not
+set), it does not match the string "\er\enA" because, after failing at the
+start, it skips both the CR and the LF before retrying. However, the pattern
+[\er\en]A does match that string, because it contains an explicit CR or LF
+reference, and so advances only by one character after the first failure.
+.P
+An explicit match for CR of LF is either a literal appearance of one of those
+characters, or one of the \er or \en escape sequences. Implicit matches such as
+[^X] do not count, nor does \es (which includes CR and LF in the characters
+that it matches).
+.P
+Notwithstanding the above, anomalous effects may still occur when CRLF is a
+valid newline sequence and explicit \er or \en escapes appear in the pattern.
 .sp
   PCRE_NOTBOL
 .sp
@@ -1173,14 +1328,34 @@
 starting offset (see below) and trying an ordinary match again. There is some
 code that demonstrates how to do this in the \fIpcredemo.c\fP sample program.
 .sp
+  PCRE_NO_START_OPTIMIZE
+.sp
+There are a number of optimizations that \fBpcre_exec()\fP uses at the start of
+a match, in order to speed up the process. For example, if it is known that a
+match must start with a specific character, it searches the subject for that
+character, and fails immediately if it cannot find it, without actually running
+the main matching function. When callouts are in use, these optimizations can
+cause them to be skipped. This option disables the "start-up" optimizations,
+causing performance to suffer, but ensuring that the callouts do occur.
+.sp
   PCRE_NO_UTF8_CHECK
 .sp
 When PCRE_UTF8 is set at compile time, the validity of the subject as a UTF-8
 string is automatically checked when \fBpcre_exec()\fP is subsequently called.
 The value of \fIstartoffset\fP is also checked to ensure that it points to the
-start of a UTF-8 character. If an invalid UTF-8 sequence of bytes is found,
-\fBpcre_exec()\fP returns the error PCRE_ERROR_BADUTF8. If \fIstartoffset\fP
-contains an invalid value, PCRE_ERROR_BADUTF8_OFFSET is returned.
+start of a UTF-8 character. There is a discussion about the validity of UTF-8
+strings in the
+.\" HTML 
+.\" 
+section on UTF-8 support
+.\"
+in the main
+.\" HREF
+\fBpcre\fP
+.\"
+page. If an invalid UTF-8 sequence of bytes is found, \fBpcre_exec()\fP returns
+the error PCRE_ERROR_BADUTF8. If \fIstartoffset\fP contains an invalid value,
+PCRE_ERROR_BADUTF8_OFFSET is returned.
 .P
 If you already know that your subject is valid, and you want to skip these
 checks for performance reasons, you can set the PCRE_NO_UTF8_CHECK option when
@@ -1210,11 +1385,11 @@
 .rs
 .sp
 The subject string is passed to \fBpcre_exec()\fP as a pointer in
-\fIsubject\fP, a length in \fIlength\fP, and a starting byte offset in
-\fIstartoffset\fP. In UTF-8 mode, the byte offset must point to the start of a
-UTF-8 character. Unlike the pattern string, the subject may contain binary zero
-bytes. When the starting offset is zero, the search for a match starts at the
-beginning of the subject, and this is by far the most common case.
+\fIsubject\fP, a length (in bytes) in \fIlength\fP, and a starting byte offset
+in \fIstartoffset\fP. In UTF-8 mode, the byte offset must point to the start of
+a UTF-8 character. Unlike the pattern string, the subject may contain binary
+zero bytes. When the starting offset is zero, the search for a match starts at
+the beginning of the subject, and this is by far the most common case.
 .P
 A non-zero starting offset is useful when searching for another match in the
 same subject by calling \fBpcre_exec()\fP again after a previous success.
@@ -1248,38 +1423,41 @@
 a fragment of a pattern that picks out a substring. PCRE supports several other
 kinds of parenthesized subpattern that do not cause substrings to be captured.
 .P
-Captured substrings are returned to the caller via a vector of integer offsets
-whose address is passed in \fIovector\fP. The number of elements in the vector
-is passed in \fIovecsize\fP, which must be a non-negative number. \fBNote\fP:
-this argument is NOT the size of \fIovector\fP in bytes.
+Captured substrings are returned to the caller via a vector of integers whose
+address is passed in \fIovector\fP. The number of elements in the vector is
+passed in \fIovecsize\fP, which must be a non-negative number. \fBNote\fP: this
+argument is NOT the size of \fIovector\fP in bytes.
 .P
 The first two-thirds of the vector is used to pass back captured substrings,
 each substring using a pair of integers. The remaining third of the vector is
 used as workspace by \fBpcre_exec()\fP while matching capturing subpatterns,
-and is not available for passing back information. The length passed in
+and is not available for passing back information. The number passed in
 \fIovecsize\fP should always be a multiple of three. If it is not, it is
 rounded down.
 .P
 When a match is successful, information about captured substrings is returned
 in pairs of integers, starting at the beginning of \fIovector\fP, and
-continuing up to two-thirds of its length at the most. The first element of a
-pair is set to the offset of the first character in a substring, and the second
-is set to the offset of the first character after the end of a substring. The
-first pair, \fIovector[0]\fP and \fIovector[1]\fP, identify the portion of the
-subject string matched by the entire pattern. The next pair is used for the
-first capturing subpattern, and so on. The value returned by \fBpcre_exec()\fP
-is one more than the highest numbered pair that has been set. For example, if
-two substrings have been captured, the returned value is 3. If there are no
-capturing subpatterns, the return value from a successful match is 1,
-indicating that just the first pair of offsets has been set.
+continuing up to two-thirds of its length at the most. The first element of
+each pair is set to the byte offset of the first character in a substring, and
+the second is set to the byte offset of the first character after the end of a
+substring. \fBNote\fP: these values are always byte offsets, even in UTF-8
+mode. They are not character counts.
+.P
+The first pair of integers, \fIovector[0]\fP and \fIovector[1]\fP, identify the
+portion of the subject string matched by the entire pattern. The next pair is
+used for the first capturing subpattern, and so on. The value returned by
+\fBpcre_exec()\fP is one more than the highest numbered pair that has been set.
+For example, if two substrings have been captured, the returned value is 3. If
+there are no capturing subpatterns, the return value from a successful match is
+1, indicating that just the first pair of offsets has been set.
 .P
 If a capturing subpattern is matched repeatedly, it is the last portion of the
 string that it matched that is returned.
 .P
 If the vector is too small to hold all the captured substring offsets, it is
 used as far as possible (up to two-thirds of its length), and the function
-returns a value of zero. In particular, if the substring offsets are not of
-interest, \fBpcre_exec()\fP may be called with \fIovector\fP passed as NULL and
+returns a value of zero. If the substring offsets are not of interest,
+\fBpcre_exec()\fP may be called with \fIovector\fP passed as NULL and
 \fIovecsize\fP as zero. However, if the pattern contains back references and
 the \fIovector\fP is not big enough to remember the related substrings, PCRE
 has to get additional memory for use during matching. Thus it is usually
@@ -1336,7 +1514,7 @@
 other endianness. This is the error that PCRE gives when the magic number is
 not present.
 .sp
-  PCRE_ERROR_UNKNOWN_NODE   (-5)
+  PCRE_ERROR_UNKNOWN_OPCODE (-5)
 .sp
 While running the pattern match, an unknown item was encountered in the
 compiled pattern. This error could be caused by a bug in PCRE or by overwriting
@@ -1362,12 +1540,6 @@
 \fBpcre_extra\fP structure (or defaulted) was reached. See the description
 above.
 .sp
-  PCRE_ERROR_RECURSIONLIMIT (-21)
-.sp
-The internal recursion limit, as specified by the \fImatch_limit_recursion\fP
-field in a \fBpcre_extra\fP structure (or defaulted) was reached. See the
-description above.
-.sp
   PCRE_ERROR_CALLOUT        (-9)
 .sp
 This error is never generated by \fBpcre_exec()\fP itself. It is provided for
@@ -1411,6 +1583,18 @@
   PCRE_ERROR_BADCOUNT       (-15)
 .sp
 This error is given if the value of the \fIovecsize\fP argument is negative.
+.sp
+  PCRE_ERROR_RECURSIONLIMIT (-21)
+.sp
+The internal recursion limit, as specified by the \fImatch_limit_recursion\fP
+field in a \fBpcre_extra\fP structure (or defaulted) was reached. See the
+description above.
+.sp
+  PCRE_ERROR_BADNEWLINE     (-23)
+.sp
+An invalid combination of PCRE_NEWLINE_\fIxxx\fP options was given.
+.P
+Error numbers -16 to -20 and -22 are not used by \fBpcre_exec()\fP.
 .
 .
 .SH "EXTRACTING CAPTURED SUBSTRINGS BY NUMBER"
@@ -1422,14 +1606,12 @@
 .ti +5n
 .B int \fIbuffersize\fP);
 .PP
-.br
 .B int pcre_get_substring(const char *\fIsubject\fP, int *\fIovector\fP,
 .ti +5n
 .B int \fIstringcount\fP, int \fIstringnumber\fP,
 .ti +5n
 .B const char **\fIstringptr\fP);
 .PP
-.br
 .B int pcre_get_substring_list(const char *\fIsubject\fP,
 .ti +5n
 .B int *\fIovector\fP, int \fIstringcount\fP, "const char ***\fIlistptr\fP);"
@@ -1468,7 +1650,7 @@
 \fIbuffersize\fP, while for \fBpcre_get_substring()\fP a new block of memory is
 obtained via \fBpcre_malloc\fP, and its address is returned via
 \fIstringptr\fP. The yield of the function is the length of the string, not
-including the terminating zero, or one of
+including the terminating zero, or one of these error codes:
 .sp
   PCRE_ERROR_NOMEMORY       (-6)
 .sp
@@ -1484,7 +1666,7 @@
 memory that is obtained via \fBpcre_malloc\fP. The address of the memory block
 is returned via \fIlistptr\fP, which is also the start of the list of string
 pointers. The end of the list is marked by a NULL pointer. The yield of the
-function is zero if all went well, or
+function is zero if all went well, or the error code
 .sp
   PCRE_ERROR_NOMEMORY       (-6)
 .sp
@@ -1515,7 +1697,6 @@
 .ti +5n
 .B const char *\fIname\fP);
 .PP
-.br
 .B int pcre_copy_named_substring(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIsubject\fP, int *\fIovector\fP,
@@ -1524,7 +1705,6 @@
 .ti +5n
 .B char *\fIbuffer\fP, int \fIbuffersize\fP);
 .PP
-.br
 .B int pcre_get_named_substring(const pcre *\fIcode\fP,
 .ti +5n
 .B const char *\fIsubject\fP, int *\fIovector\fP,
@@ -1536,7 +1716,7 @@
 To extract a substring by name, you first have to find associated number.
 For example, for this pattern
 .sp
-  (a+)b(?P\ed+)...
+  (a+)b(?\ed+)...
 .sp
 the number of the subpattern called "xxx" is 2. If the name is known to be
 unique (PCRE_DUPNAMES was not set), you can find the number from the name by
@@ -1560,9 +1740,14 @@
 translation table.
 .P
 These functions call \fBpcre_get_stringnumber()\fP, and if it succeeds, they
-then call \fIpcre_copy_substring()\fP or \fIpcre_get_substring()\fP, as
-appropriate.
-.
+then call \fBpcre_copy_substring()\fP or \fBpcre_get_substring()\fP, as
+appropriate. \fBNOTE:\fP If PCRE_DUPNAMES is set and there are duplicate names,
+the behaviour may not be what you want (see the next section).
+.P
+\fBWarning:\fP If the pattern uses the "(?|" feature to set up multiple
+subpatterns with the same number, you cannot use names to distinguish them,
+because names are not included in the compiled code. The matching process uses
+only numbers.
 .
 .SH "DUPLICATE SUBPATTERN NAMES"
 .rs
@@ -1578,22 +1763,25 @@
 .\" HREF
 \fBpcrepattern\fP
 .\"
-documentation. When duplicates are present, \fBpcre_copy_named_substring()\fP
-and \fBpcre_get_named_substring()\fP return the first substring corresponding
-to the given name that is set. If none are set, an empty string is returned.
-The \fBpcre_get_stringnumber()\fP function returns one of the numbers that are
-associated with the name, but it is not defined which it is.
-.sp
+documentation.
+.P
+When duplicates are present, \fBpcre_copy_named_substring()\fP and
+\fBpcre_get_named_substring()\fP return the first substring corresponding to
+the given name that is set. If none are set, PCRE_ERROR_NOSUBSTRING (-7) is
+returned; no data is returned. The \fBpcre_get_stringnumber()\fP function
+returns one of the numbers that are associated with the name, but it is not
+defined which it is.
+.P
 If you want to get full details of all captured substrings for a given name,
 you must use the \fBpcre_get_stringtable_entries()\fP function. The first
 argument is the compiled pattern, and the second is the name. The third and
 fourth are pointers to variables which are updated by the function. After it
 has run, they point to the first and last entries in the name-to-number table
 for the given name. The function itself returns the length of each entry, or
-PCRE_ERROR_NOSUBSTRING if there are none. The format of the table is described
-above in the section entitled \fIInformation about a pattern\fP. Given all the
-relevant entries for the name, you can extract each of their numbers, and hence
-the captured data, if any.
+PCRE_ERROR_NOSUBSTRING (-7) if there are none. The format of the table is
+described above in the section entitled \fIInformation about a pattern\fP.
+Given all the relevant entries for the name, you can extract each of their
+numbers, and hence the captured data, if any.
 .
 .
 .SH "FINDING ALL POSSIBLE MATCHES"
@@ -1631,11 +1819,12 @@
 .B int *\fIworkspace\fP, int \fIwscount\fP);
 .P
 The function \fBpcre_dfa_exec()\fP is called to match a subject string against
-a compiled pattern, using a "DFA" matching algorithm. This has different
-characteristics to the normal algorithm, and is not compatible with Perl. Some
-of the features of PCRE patterns are not supported. Nevertheless, there are
-times when this kind of matching can be useful. For a discussion of the two
-matching algorithms, see the
+a compiled pattern, using a matching algorithm that scans the subject string
+just once, and does not backtrack. This has different characteristics to the
+normal algorithm, and is not compatible with Perl. Some of the features of PCRE
+patterns are not supported. Nevertheless, there are times when this kind of
+matching can be useful. For a discussion of the two matching algorithms, see
+the
 .\" HREF
 \fBpcrematching\fP
 .\"
@@ -1691,9 +1880,9 @@
   PCRE_DFA_SHORTEST
 .sp
 Setting the PCRE_DFA_SHORTEST option causes the matching algorithm to stop as
-soon as it has found one match. Because of the way the DFA algorithm works,
-this is necessarily the shortest possible match at the first possible matching
-point in the subject string.
+soon as it has found one match. Because of the way the alternative algorithm
+works, this is necessarily the shortest possible match at the first possible
+matching point in the subject string.
 .sp
   PCRE_DFA_RESTART
 .sp
@@ -1732,10 +1921,10 @@
 On success, the yield of the function is a number greater than zero, which is
 the number of matched substrings. The substrings themselves are returned in
 \fIovector\fP. Each string uses two elements; the first is the offset to the
-start, and the second is the offset to the end. All the strings have the same
-start offset. (Space could have been saved by giving this only once, but it was
-decided to retain some compatibility with the way \fBpcre_exec()\fP returns
-data, even though the meaning of the strings is different.)
+start, and the second is the offset to the end. In fact, all the strings have
+the same start offset. (Space could have been saved by giving this only once,
+but it was decided to retain some compatibility with the way \fBpcre_exec()\fP
+returns data, even though the meaning of the strings is different.)
 .P
 The strings are returned in reverse order of length; that is, the longest
 matching string is given first. If there were too many matches to fit into
@@ -1762,8 +1951,9 @@
 .sp
   PCRE_ERROR_DFA_UCOND      (-17)
 .sp
-This return is given if \fBpcre_dfa_exec()\fP encounters a condition item in a
-pattern that uses a back reference for the condition. This is not supported.
+This return is given if \fBpcre_dfa_exec()\fP encounters a condition item that
+uses a back reference for the condition, or a test for recursion in a specific
+group. These are not supported.
 .sp
   PCRE_ERROR_DFA_UMLIMIT    (-18)
 .sp
@@ -1782,8 +1972,30 @@
 recursively, using private vectors for \fIovector\fP and \fIworkspace\fP. This
 error is given if the output vector is not large enough. This should be
 extremely rare, as a vector of size 1000 is used.
-.P
-.in 0
-Last updated: 08 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+.
+.
+.SH "SEE ALSO"
+.rs
+.sp
+\fBpcrebuild\fP(3), \fBpcrecallout\fP(3), \fBpcrecpp(3)\fP(3),
+\fBpcrematching\fP(3), \fBpcrepartial\fP(3), \fBpcreposix\fP(3),
+\fBpcreprecompile\fP(3), \fBpcresample\fP(3), \fBpcrestack\fP(3).
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 11 April 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcrebuild.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcrebuild.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcrebuild.3	Mon Jun  8 18:51:30 2009
@@ -5,16 +5,21 @@
 .rs
 .sp
 This document describes the optional features of PCRE that can be selected when
-the library is compiled. They are all selected, or deselected, by providing
-options to the \fBconfigure\fP script that is run before the \fBmake\fP
-command. The complete list of options for \fBconfigure\fP (which includes the
-standard ones such as the selection of the installation directory) can be
-obtained by running
+the library is compiled. It assumes use of the \fBconfigure\fP script, where
+the optional features are selected or deselected by providing options to
+\fBconfigure\fP before running the \fBmake\fP command. However, the same
+options can be selected in both Unix-like and non-Unix-like environments using
+the GUI facility of \fBCMakeSetup\fP if you are using \fBCMake\fP instead of
+\fBconfigure\fP to build PCRE.
+.P
+The complete list of options for \fBconfigure\fP (which includes the standard
+ones such as the selection of the installation directory) can be obtained by
+running
 .sp
   ./configure --help
 .sp
-The following sections describe certain options whose names begin with --enable
-or --disable. These settings specify changes to the defaults for the
+The following sections include descriptions of options whose names begin with
+--enable or --disable. These settings specify changes to the defaults for the
 \fBconfigure\fP command. Because of the way that \fBconfigure\fP works,
 --enable and --disable always come in pairs, so the complementary option always
 exists as well, but as it specifies the default, it is not described.
@@ -33,7 +38,7 @@
 .SH "UTF-8 SUPPORT"
 .rs
 .sp
-To build PCRE with support for UTF-8 character strings, add
+To build PCRE with support for UTF-8 Unicode character strings, add
 .sp
   --enable-utf8
 .sp
@@ -41,6 +46,12 @@
 strings as UTF-8. As well as compiling PCRE with this option, you also have
 have to set the PCRE_UTF8 option when you call the \fBpcre_compile()\fP
 function.
+.P
+If you set --enable-utf8 when compiling in an EBCDIC environment, PCRE expects
+its input to be either ASCII or UTF-8 (depending on the runtime option). It is
+not possible to support both EBCDIC and UTF-8 codes in the same version of the
+library. Consequently, --enable-utf8 and --enable-ebcdic are mutually
+exclusive.
 .
 .SH "UNICODE CHARACTER PROPERTY SUPPORT"
 .rs
@@ -56,9 +67,9 @@
 to the \fBconfigure\fP command. This implies UTF-8 support, even if you have
 not explicitly requested it.
 .P
-Including Unicode property support adds around 90K of tables to the PCRE
-library, approximately doubling its size. Only the general category properties
-such as \fILu\fP and \fINd\fP are supported. Details are given in the
+Including Unicode property support adds around 30K of tables to the PCRE
+library. Only the general category properties such as \fILu\fP and \fINd\fP are
+supported. Details are given in the
 .\" HREF
 \fBpcrepattern\fP
 .\"
@@ -67,9 +78,9 @@
 .SH "CODE VALUE OF NEWLINE"
 .rs
 .sp
-By default, PCRE interprets character 10 (linefeed, LF) as indicating the end
+By default, PCRE interprets the linefeed (LF) character as indicating the end
 of a line. This is the normal newline character on Unix-like systems. You can
-compile PCRE to use character 13 (carriage return, CR) instead, by adding
+compile PCRE to use carriage return (CR) instead, by adding
 .sp
   --enable-newline-is-cr
 .sp
@@ -81,9 +92,32 @@
 .sp
   --enable-newline-is-crlf
 .sp
-to the \fBconfigure\fP command. Whatever line ending convention is selected
-when PCRE is built can be overridden when the library functions are called. At
-build time it is conventional to use the standard for your operating system.
+to the \fBconfigure\fP command. There is a fourth option, specified by
+.sp
+  --enable-newline-is-anycrlf
+.sp
+which causes PCRE to recognize any of the three sequences CR, LF, or CRLF as
+indicating a line ending. Finally, a fifth option, specified by
+.sp
+  --enable-newline-is-any
+.sp
+causes PCRE to recognize any Unicode newline sequence.
+.P
+Whatever line ending convention is selected when PCRE is built can be
+overridden when the library functions are called. At build time it is
+conventional to use the standard for your operating system.
+.
+.SH "WHAT \eR MATCHES"
+.rs
+.sp
+By default, the sequence \eR in a pattern matches any Unicode newline sequence,
+whatever has been selected as the line ending sequence. If you specify
+.sp
+  --enable-bsr-anycrlf
+.sp
+the default is changed so that \eR matches only CR, LF, or CRLF. Whatever is
+selected when PCRE is built can be overridden when the library functions are
+called.
 .
 .SH "BUILDING SHARED AND STATIC LIBRARIES"
 .rs
@@ -131,10 +165,6 @@
 to the \fBconfigure\fP command. The value given must be 2, 3, or 4. Using
 longer offsets slows down the operation of PCRE because it has to load
 additional bytes when handling them.
-.P
-If you build PCRE with an increased link size, test 2 (and test 5 if you are
-using UTF-8) will fail. Part of the output of these tests is a representation
-of the compiled pattern, and this changes with the link size.
 .
 .SH "AVOIDING EXCESSIVE STACK USAGE"
 .rs
@@ -157,13 +187,17 @@
 .sp
 to the \fBconfigure\fP command. With this configuration, PCRE will use the
 \fBpcre_stack_malloc\fP and \fBpcre_stack_free\fP variables to call memory
-management functions. Separate functions are provided because the usage is very
-predictable: the block sizes requested are always the same, and the blocks are
-always freed in reverse order. A calling program might be able to implement
-optimized functions that perform better than the standard \fBmalloc()\fP and
-\fBfree()\fP functions. PCRE runs noticeably more slowly when built in this
-way. This option affects only the \fBpcre_exec()\fP function; it is not
-relevant for the the \fBpcre_dfa_exec()\fP function.
+management functions. By default these point to \fBmalloc()\fP and
+\fBfree()\fP, but you can replace the pointers so that your own functions are
+used.
+.P
+Separate functions are provided rather than using \fBpcre_malloc\fP and
+\fBpcre_free\fP because the usage is very predictable: the block sizes
+requested are always the same, and the blocks are always freed in reverse
+order. A calling program might be able to implement optimized functions that
+perform better than \fBmalloc()\fP and \fBfree()\fP. PCRE runs noticeably more
+slowly when built in this way. This option affects only the \fBpcre_exec()\fP
+function; it is not relevant for the the \fBpcre_dfa_exec()\fP function.
 .
 .SH "LIMITING PCRE RESOURCE USAGE"
 .rs
@@ -196,18 +230,105 @@
 .sp
 to the \fBconfigure\fP command. This value can also be overridden at run time.
 .
+.SH "CREATING CHARACTER TABLES AT BUILD TIME"
+.rs
+.sp
+PCRE uses fixed tables for processing characters whose code values are less
+than 256. By default, PCRE is built with a set of tables that are distributed
+in the file \fIpcre_chartables.c.dist\fP. These tables are for ASCII codes
+only. If you add
+.sp
+  --enable-rebuild-chartables
+.sp
+to the \fBconfigure\fP command, the distributed tables are no longer used.
+Instead, a program called \fBdftables\fP is compiled and run. This outputs the
+source for new set of tables, created in the default locale of your C runtime
+system. (This method of replacing the tables does not work if you are cross
+compiling, because \fBdftables\fP is run on the local host. If you need to
+create alternative tables when cross compiling, you will have to do so "by
+hand".)
+.
 .SH "USING EBCDIC CODE"
 .rs
 .sp
 PCRE assumes by default that it will run in an environment where the character
-code is ASCII (or Unicode, which is a superset of ASCII). PCRE can, however, be
-compiled to run in an EBCDIC environment by adding
+code is ASCII (or Unicode, which is a superset of ASCII). This is the case for
+most computer operating systems. PCRE can, however, be compiled to run in an
+EBCDIC environment by adding
 .sp
   --enable-ebcdic
 .sp
-to the \fBconfigure\fP command.
+to the \fBconfigure\fP command. This setting implies
+--enable-rebuild-chartables. You should only use it if you know that you are in
+an EBCDIC environment (for example, an IBM mainframe operating system). The
+--enable-ebcdic option is incompatible with --enable-utf8.
+.
+.SH "PCREGREP OPTIONS FOR COMPRESSED FILE SUPPORT"
+.rs
+.sp
+By default, \fBpcregrep\fP reads all files as plain text. You can build it so
+that it recognizes files whose names end in \fB.gz\fP or \fB.bz2\fP, and reads
+them with \fBlibz\fP or \fBlibbz2\fP, respectively, by adding one or both of
+.sp
+  --enable-pcregrep-libz
+  --enable-pcregrep-libbz2
+.sp
+to the \fBconfigure\fP command. These options naturally require that the
+relevant libraries are installed on your system. Configuration will fail if
+they are not.
+.
+.SH "PCRETEST OPTION FOR LIBREADLINE SUPPORT"
+.rs
+.sp
+If you add
+.sp
+  --enable-pcretest-libreadline
+.sp
+to the \fBconfigure\fP command, \fBpcretest\fP is linked with the
+\fBlibreadline\fP library, and when its input is from a terminal, it reads it
+using the \fBreadline()\fP function. This provides line-editing and history
+facilities. Note that \fBlibreadline\fP is GPL-licenced, so if you distribute a
+binary of \fBpcretest\fP linked in this way, there may be licensing issues.
 .P
-.in 0
-Last updated: 06 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+Setting this option causes the \fB-lreadline\fP option to be added to the
+\fBpcretest\fP build. In many operating environments with a sytem-installed
+\fBlibreadline\fP this is sufficient. However, in some environments (e.g.
+if an unmodified distribution version of readline is in use), some extra
+configuration may be necessary. The INSTALL file for \fBlibreadline\fP says
+this:
+.sp
+  "Readline uses the termcap functions, but does not link with the
+  termcap or curses library itself, allowing applications which link
+  with readline the to choose an appropriate library."
+.sp
+If your environment has not been set up so that an appropriate library is
+automatically included, you may need to add something like
+.sp
+  LIBS="-ncurses"
+.sp
+immediately before the \fBconfigure\fP command.
+.
+.
+.SH "SEE ALSO"
+.rs
+.sp
+\fBpcreapi\fP(3), \fBpcre_config\fP(3).
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 17 March 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcrecallout.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcrecallout.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcrecallout.3	Mon Jun  8 18:51:30 2009
@@ -17,7 +17,7 @@
 a number less than 256 after the letter C. The default value is zero.
 For example, this pattern has two callout points:
 .sp
-  (?C1)\deabc(?C2)def
+  (?C1)abc(?C2)def
 .sp
 If the PCRE_AUTO_CALLOUT option bit is set when \fBpcre_compile()\fP is called,
 PCRE automatically inserts callouts, all with number 255, before each item in
@@ -44,7 +44,8 @@
 .rs
 .sp
 You should be aware that, because of optimizations in the way PCRE matches
-patterns, callouts sometimes do not happen. For example, if the pattern is
+patterns by default, callouts sometimes do not happen. For example, if the
+pattern is
 .sp
   ab(?C4)cd
 .sp
@@ -52,6 +53,11 @@
 string is "abyz", the lack of "d" means that matching doesn't ever start, and
 the callout is never reached. However, with "abyd", though the result is still
 no match, the callout is obeyed.
+.P
+You can disable these optimizations by passing the PCRE_NO_START_OPTIMIZE
+option to \fBpcre_exec()\fP or \fBpcre_dfa_exec()\fP. This slows down the
+matching process, but does ensure that callouts such as the example above are
+obeyed.
 .
 .
 .SH "THE CALLOUT INTERFACE"
@@ -95,10 +101,12 @@
 The \fIsubject\fP and \fIsubject_length\fP fields contain copies of the values
 that were passed to \fBpcre_exec()\fP.
 .P
-The \fIstart_match\fP field contains the offset within the subject at which the
-current match attempt started. If the pattern is not anchored, the callout
-function may be called several times from the same point in the pattern for
-different starting points in the subject.
+The \fIstart_match\fP field normally contains the offset within the subject at
+which the current match attempt started. However, if the escape sequence \eK
+has been encountered, this value is changed to reflect the modified starting
+point. If the pattern is not anchored, the callout function may be called
+several times from the same point in the pattern for different starting points
+in the subject.
 .P
 The \fIcurrent_position\fP field contains the offset within the subject of the
 current match pointer.
@@ -154,8 +162,22 @@
 values. In particular, PCRE_ERROR_NOMATCH forces a standard "no match" failure.
 The error number PCRE_ERROR_CALLOUT is reserved for use by callout functions;
 it will never be used by PCRE itself.
-.P
-.in 0
-Last updated: 28 February 2005
-.br
-Copyright (c) 1997-2005 University of Cambridge.
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 15 March 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcrecompat.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcrecompat.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcrecompat.3	Mon Jun  8 18:51:30 2009
@@ -5,8 +5,9 @@
 .rs
 .sp
 This document describes the differences in the ways that PCRE and Perl handle
-regular expressions. The differences described here are with respect to Perl
-5.8.
+regular expressions. The differences described here are mainly with respect to
+Perl 5.8, though PCRE versions 7.0 and later contain some features that are
+expected to be in the forthcoming Perl 5.10.
 .P
 1. PCRE has only a subset of Perl's UTF-8 and Unicode support. Details of what
 it does have are given in the
@@ -63,20 +64,32 @@
 .sp
 The \eQ...\eE sequence is recognized both inside and outside character classes.
 .P
-8. Fairly obviously, PCRE does not support the (?{code}) and (?p{code})
-constructions. However, there is support for recursive patterns using the
-non-Perl items (?R), (?number), and (?P>name). Also, the PCRE "callout" feature
-allows an external function to be called during pattern matching. See the
+8. Fairly obviously, PCRE does not support the (?{code}) and (??{code})
+constructions. However, there is support for recursive patterns. This is not
+available in Perl 5.8, but will be in Perl 5.10. Also, the PCRE "callout"
+feature allows an external function to be called during pattern matching. See
+the
 .\" HREF
 \fBpcrecallout\fP
 .\"
 documentation for details.
 .P
-9. There are some differences that are concerned with the settings of captured
+9. Subpatterns that are called recursively or as "subroutines" are always
+treated as atomic groups in PCRE. This is like Python, but unlike Perl.
+.P
+10. There are some differences that are concerned with the settings of captured
 strings when part of a pattern is repeated. For example, matching "aba" against
 the pattern /^(a(b)?)+$/ in Perl leaves $2 unset, but in PCRE it is set to "b".
 .P
-10. PCRE provides some extensions to the Perl regular expression facilities:
+11. PCRE does support Perl 5.10's backtracking verbs (*ACCEPT), (*FAIL), (*F),
+(*COMMIT), (*PRUNE), (*SKIP), and (*THEN), but only in the forms without an
+argument. PCRE does not support (*MARK). If (*ACCEPT) is within capturing
+parentheses, PCRE does not set that capture group; this is different to Perl.
+.P
+12. PCRE provides some extensions to the Perl regular expression facilities.
+Perl 5.10 will include new features that are not in earlier versions, some of
+which (such as named parentheses) have been in PCRE for some time. This list is
+with respect to Perl 5.10:
 .sp
 (a) Although lookbehind assertions must match fixed length strings, each
 alternative branch of a lookbehind assertion can match a different length of
@@ -86,8 +99,8 @@
 meta-character matches only at the very end of the string.
 .sp
 (c) If PCRE_EXTRA is set, a backslash followed by a letter with no special
-meaning is faulted. Otherwise, like Perl, the backslash is ignored. (Perl can
-be made to issue a warning.)
+meaning is faulted. Otherwise, like Perl, the backslash is quietly ignored.
+(Perl can be made to issue a warning.)
 .sp
 (d) If PCRE_UNGREEDY is set, the greediness of the repetition quantifiers is
 inverted, that is, by default they are not greedy, but if followed by a
@@ -99,28 +112,37 @@
 (f) The PCRE_NOTBOL, PCRE_NOTEOL, PCRE_NOTEMPTY, and PCRE_NO_AUTO_CAPTURE
 options for \fBpcre_exec()\fP have no Perl equivalents.
 .sp
-(g) The (?R), (?number), and (?P>name) constructs allows for recursive pattern
-matching (Perl can do this using the (?p{code}) construct, which PCRE cannot
-support.)
+(g) The \eR escape sequence can be restricted to match only CR, LF, or CRLF
+by the PCRE_BSR_ANYCRLF option.
 .sp
-(h) PCRE supports named capturing substrings, using the Python syntax.
+(h) The callout facility is PCRE-specific.
 .sp
-(i) PCRE supports the possessive quantifier "++" syntax, taken from Sun's Java
-package.
+(i) The partial matching facility is PCRE-specific.
 .sp
-(j) The (R) condition, for testing recursion, is a PCRE extension.
+(j) Patterns compiled by PCRE can be saved and re-used at a later time, even on
+different hosts that have the other endianness.
 .sp
-(k) The callout facility is PCRE-specific.
+(k) The alternative matching function (\fBpcre_dfa_exec()\fP) matches in a
+different way and is not Perl-compatible.
 .sp
-(l) The partial matching facility is PCRE-specific.
+(l) PCRE recognizes some special sequences such as (*CR) at the start of
+a pattern that set overall options that cannot be changed within the pattern.
+.
+.
+.SH AUTHOR
+.rs
 .sp
-(m) Patterns compiled by PCRE can be saved and re-used at a later time, even on
-different hosts that have the other endianness.
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
 .sp
-(n) The alternative matching function (\fBpcre_dfa_exec()\fP) matches in a
-different way and is not Perl-compatible.
-.P
-.in 0
-Last updated: 06 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+.nf
+Last updated: 11 September 2007
+Copyright (c) 1997-2007 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcrecpp.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcrecpp.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcrecpp.3	Mon Jun  8 18:51:30 2009
@@ -5,9 +5,7 @@
 .rs
 .sp
 .B #include 
-.PP
-.SM
-.br
+.
 .SH DESCRIPTION
 .rs
 .sp
@@ -81,14 +79,42 @@
 .sp
   c. The "i"th argument has a suitable type for holding the
      string captured as the "i"th sub-pattern. If you pass in
-     NULL for the "i"th argument, or pass fewer arguments than
+     void * NULL for the "i"th argument, or a non-void * NULL
+     of the correct type, or pass fewer arguments than the
      number of sub-patterns, "i"th captured sub-pattern is
      ignored.
 .sp
+CAVEAT: An optional sub-pattern that does not exist in the matched
+string is assigned the empty string. Therefore, the following will
+return false (because the empty string is not a valid number):
+.sp
+   int number;
+   pcrecpp::RE::FullMatch("abc", "[a-z]+(\e\ed+)?", &number);
+.sp
 The matching interface supports at most 16 arguments per call.
 If you need more, consider using the more general interface
 \fBpcrecpp::RE::DoMatch\fP. See \fBpcrecpp.h\fP for the signature for
 \fBDoMatch\fP.
+.P
+NOTE: Do not use \fBno_arg\fP, which is used internally to mark the end of a
+list of optional arguments, as a placeholder for missing arguments, as this can
+lead to segfaults.
+.
+.
+.SH "QUOTING METACHARACTERS"
+.rs
+.sp
+You can use the "QuoteMeta" operation to insert backslashes before all
+potentially meaningful characters in a string. The returned string, used as a
+regular expression, will exactly match the original string.
+.sp
+  Example:
+     string quoted = RE::QuoteMeta(unquoted);
+.sp
+Note that it's legal to escape a character even if it has no special meaning in
+a regular expression -- so this function does that. (This also makes it
+identical to the perl function of the same name; see "perldoc -f quotemeta".)
+For example, "1.5-2.0?" becomes "1\e.5\e-2\e.0\e?".
 .
 .SH "PARTIAL MATCHES"
 .rs
@@ -307,6 +333,15 @@
 .SH AUTHOR
 .rs
 .sp
+.nf
 The C++ wrapper was contributed by Google Inc.
-.br
-Copyright (c) 2005 Google Inc.
+Copyright (c) 2007 Google Inc.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 17 March 2009
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcregrep.1
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcregrep.1	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcregrep.1	Mon Jun  8 18:51:30 2009
@@ -11,10 +11,10 @@
 grep commands do, but it uses the PCRE regular expression library to support
 patterns that are compatible with the regular expressions of Perl 5. See
 .\" HREF
-\fBpcrepattern\fP
+\fBpcrepattern\fP(3)
 .\"
-for a full description of syntax and semantics of the regular expressions that
-PCRE supports.
+for a full description of syntax and semantics of the regular expressions
+that PCRE supports.
 .P
 Patterns, whether supplied on the command line or in a separate file, are given
 without delimiters. For example:
@@ -23,9 +23,9 @@
 .sp
 If you attempt to use delimiters (for example, by surrounding a pattern with
 slashes, as is common in Perl scripts), they are interpreted as part of the
-pattern. Quotes can of course be used on the command line because they are
-interpreted by the shell, and indeed they are required if a pattern contains
-white space or shell metacharacters.
+pattern. Quotes can of course be used to delimit patterns on the command line
+because they are interpreted by the shell, and indeed they are required if a
+pattern contains white space or shell metacharacters.
 .P
 The first argument that follows any option settings is treated as the single
 pattern to be matched when neither \fB-e\fP nor \fB-f\fP is present.
@@ -39,20 +39,53 @@
 .sp
   pcregrep some-pattern /file1 - /file3
 .sp
-By default, each line that matches the pattern is copied to the standard
+By default, each line that matches a pattern is copied to the standard
 output, and if there is more than one file, the file name is output at the
-start of each line. However, there are options that can change how
-\fBpcregrep\fP behaves. In particular, the \fB-M\fP option makes it possible to
-search for patterns that span line boundaries. What defines a line boundary is
-controlled by the \fB-N\fP (\fB--newline\fP) option.
+start of each line, followed by a colon. However, there are options that can
+change how \fBpcregrep\fP behaves. In particular, the \fB-M\fP option makes it
+possible to search for patterns that span line boundaries. What defines a line
+boundary is controlled by the \fB-N\fP (\fB--newline\fP) option.
 .P
 Patterns are limited to 8K or BUFSIZ characters, whichever is the greater.
-BUFSIZ is defined in \fB\fP.
+BUFSIZ is defined in \fB\fP. When there is more than one pattern
+(specified by the use of \fB-e\fP and/or \fB-f\fP), each pattern is applied to
+each line in the order in which they are defined, except that all the \fB-e\fP
+patterns are tried before the \fB-f\fP patterns.
+.P
+By default, as soon as one pattern matches (or fails to match when \fB-v\fP is
+used), no further patterns are considered. However, if \fB--colour\fP (or
+\fB--color\fP) is used to colour the matching substrings, or if
+\fB--only-matching\fP, \fB--file-offsets\fP, or \fB--line-offsets\fP is used to
+output only the part of the line that matched (either shown literally, or as an
+offset), scanning resumes immediately following the match, so that further
+matches on the same line can be found. If there are multiple patterns, they are
+all tried on the remainder of the line, but patterns that follow the one that
+matched are not tried on the earlier part of the line.
+.P
+This is the same behaviour as GNU grep, but it does mean that the order in
+which multiple patterns are specified can affect the output when one of the
+above options is used.
+.P
+Patterns that can match an empty string are accepted, but empty string
+matches are not recognized. An example is the pattern "(super)?(man)?", in
+which all components are optional. This pattern finds all occurrences of both
+"super" and "man"; the output differs from matching with "super|man" when only
+the matching substrings are being shown.
 .P
 If the \fBLC_ALL\fP or \fBLC_CTYPE\fP environment variable is set,
 \fBpcregrep\fP uses the value to set a locale when calling the PCRE library.
 The \fB--locale\fP option can be used to override this.
 .
+.SH "SUPPORT FOR COMPRESSED FILES"
+.rs
+.sp
+It is possible to compile \fBpcregrep\fP so that it uses \fBlibz\fP or
+\fBlibbz2\fP to read files whose names end in \fB.gz\fP or \fB.bz2\fP,
+respectively. You can find out whether your binary has support for one or both
+of these file types by running it with the \fB--help\fP option. If the
+appropriate support is not present, files are treated as plain text. The
+standard input is always so treated.
+.
 .SH OPTIONS
 .rs
 .TP 10
@@ -93,16 +126,20 @@
 equals sign.
 .TP
 \fB--colour=\fP\fIvalue\fP, \fB--color=\fP\fIvalue\fP
-This option specifies under what circumstances the part of a line that matched
-a pattern should be coloured in the output. The value may be "never" (the
-default), "always", or "auto". In the latter case, colouring happens only if
-the standard output is connected to a terminal. The colour can be specified by
-setting the environment variable PCREGREP_COLOUR or PCREGREP_COLOR. The value
-of this variable should be a string of two numbers, separated by a semicolon.
-They are copied directly into the control string for setting colour on a
-terminal, so it is your responsibility to ensure that they make sense. If
-neither of the environment variables is set, the default is "1;31", which gives
-red.
+This option specifies under what circumstances the parts of a line that matched
+a pattern should be coloured in the output. By default, the output is not
+coloured. The value (which is optional, see above) may be "never", "always", or
+"auto". In the latter case, colouring happens only if the standard output is
+connected to a terminal. More resources are used when colouring is enabled,
+because \fBpcregrep\fP has to search for all possible matches in a line, not
+just one, in order to colour them all.
+
+The colour that is used can be specified by setting the environment variable
+PCREGREP_COLOUR or PCREGREP_COLOR. The value of this variable should be a
+string of two numbers, separated by a semicolon. They are copied directly into
+the control string for setting colour on a terminal, so it is your
+responsibility to ensure that they make sense. If neither of the environment
+variables is set, the default is "1;31", which gives red.
 .TP
 \fB-D\fP \fIaction\fP, \fB--devices=\fP\fIaction\fP
 If an input path is not a regular file or a directory, "action" specifies how
@@ -116,29 +153,41 @@
 are read as if they were ordinary files. In some operating systems the effect
 of reading a directory like this is an immediate end-of-file.
 .TP
-\fB-e\fP \fIpattern\fP, \fB--regex=\fP\fIpattern\fP,
-\fB--regexp=\fP\fIpattern\fP Specify a pattern to be matched. This option can
-be used multiple times in order to specify several patterns. It can also be
-used as a way of specifying a single pattern that starts with a hyphen. When
-\fB-e\fP is used, no argument pattern is taken from the command line; all
-arguments are treated as file names. There is an overall maximum of 100
-patterns. They are applied to each line in the order in which they are defined
-until one matches (or fails to match if \fB-v\fP is used). If \fB-f\fP is used
-with \fB-e\fP, the command line patterns are matched first, followed by the
-patterns from the file, independent of the order in which these options are
-specified. Note that multiple use of \fB-e\fP is not the same as a single
-pattern with alternatives. For example, X|Y finds the first character in a line
-that is X or Y, whereas if the two patterns are given separately,
-\fBpcregrep\fP finds X if it is present, even if it follows Y in the line. It
-finds Y only if there is no X in the line. This really matters only if you are
-using \fB-o\fP to show the portion of the line that matched.
+\fB-e\fP \fIpattern\fP, \fB--regex=\fP\fIpattern\fP, \fB--regexp=\fP\fIpattern\fP
+Specify a pattern to be matched. This option can be used multiple times in
+order to specify several patterns. It can also be used as a way of specifying a
+single pattern that starts with a hyphen. When \fB-e\fP is used, no argument
+pattern is taken from the command line; all arguments are treated as file
+names. There is an overall maximum of 100 patterns. They are applied to each
+line in the order in which they are defined until one matches (or fails to
+match if \fB-v\fP is used). If \fB-f\fP is used with \fB-e\fP, the command line
+patterns are matched first, followed by the patterns from the file, independent
+of the order in which these options are specified. Note that multiple use of
+\fB-e\fP is not the same as a single pattern with alternatives. For example,
+X|Y finds the first character in a line that is X or Y, whereas if the two
+patterns are given separately, \fBpcregrep\fP finds X if it is present, even if
+it follows Y in the line. It finds Y only if there is no X in the line. This
+really matters only if you are using \fB-o\fP to show the part(s) of the line
+that matched.
 .TP
 \fB--exclude\fP=\fIpattern\fP
 When \fBpcregrep\fP is searching the files in a directory as a consequence of
-the \fB-r\fP (recursive search) option, any files whose names match the pattern
-are excluded. The pattern is a PCRE regular expression. If a file name matches
-both \fB--include\fP and \fB--exclude\fP, it is excluded. There is no short
-form for this option.
+the \fB-r\fP (recursive search) option, any regular files whose names match the
+pattern are excluded. Subdirectories are not excluded by this option; they are
+searched recursively, subject to the \fB--exclude_dir\fP and
+\fB--include_dir\fP options. The pattern is a PCRE regular expression, and is
+matched against the final component of the file name (not the entire path). If
+a file name matches both \fB--include\fP and \fB--exclude\fP, it is excluded.
+There is no short form for this option.
+.TP
+\fB--exclude_dir\fP=\fIpattern\fP
+When \fBpcregrep\fP is searching the contents of a directory as a consequence
+of the \fB-r\fP (recursive search) option, any subdirectories whose names match
+the pattern are excluded. (Note that the \fP--exclude\fP option does not affect
+subdirectories.) The pattern is a PCRE regular expression, and is matched
+against the final component of the name (not the entire path). If a
+subdirectory name matches both \fB--include_dir\fP and \fB--exclude_dir\fP, it
+is excluded. There is no short form for this option.
 .TP
 \fB-F\fP, \fB--fixed-strings\fP
 Interpret each pattern as a list of fixed strings, separated by newlines,
@@ -156,34 +205,55 @@
 is taken from the command line; all arguments are treated as file names. There
 is an overall maximum of 100 patterns. Trailing white space is removed from
 each line, and blank lines are ignored. An empty file contains no patterns and
-therefore matches nothing.
+therefore matches nothing. See also the comments about multiple patterns versus
+a single pattern with alternatives in the description of \fB-e\fP above.
+.TP
+\fB--file-offsets\fP
+Instead of showing lines or parts of lines that match, show each match as an
+offset from the start of the file and a length, separated by a comma. In this
+mode, no context is shown. That is, the \fB-A\fP, \fB-B\fP, and \fB-C\fP
+options are ignored. If there is more than one match in a line, each of them is
+shown separately. This option is mutually exclusive with \fB--line-offsets\fP
+and \fB--only-matching\fP.
 .TP
 \fB-H\fP, \fB--with-filename\fP
 Force the inclusion of the filename at the start of output lines when searching
 a single file. By default, the filename is not shown in this case. For matching
-lines, the filename is followed by a colon and a space; for context lines, a
-hyphen separator is used. If a line number is also being output, it follows the
-file name without a space.
+lines, the filename is followed by a colon; for context lines, a hyphen
+separator is used. If a line number is also being output, it follows the file
+name.
 .TP
 \fB-h\fP, \fB--no-filename\fP
 Suppress the output filenames when searching multiple files. By default,
 filenames are shown when multiple files are searched. For matching lines, the
-filename is followed by a colon and a space; for context lines, a hyphen
-separator is used. If a line number is also being output, it follows the file
-name without a space.
+filename is followed by a colon; for context lines, a hyphen separator is used.
+If a line number is also being output, it follows the file name.
 .TP
 \fB--help\fP
-Output a brief help message and exit.
+Output a help message, giving brief details of the command options and file
+type support, and then exit.
 .TP
 \fB-i\fP, \fB--ignore-case\fP
 Ignore upper/lower case distinctions during comparisons.
 .TP
 \fB--include\fP=\fIpattern\fP
 When \fBpcregrep\fP is searching the files in a directory as a consequence of
-the \fB-r\fP (recursive search) option, only those files whose names match the
-pattern are included. The pattern is a PCRE regular expression. If a file name
-matches both \fB--include\fP and \fB--exclude\fP, it is excluded. There is no
-short form for this option.
+the \fB-r\fP (recursive search) option, only those regular files whose names
+match the pattern are included. Subdirectories are always included and searched
+recursively, subject to the \fP--include_dir\fP and \fB--exclude_dir\fP
+options. The pattern is a PCRE regular expression, and is matched against the
+final component of the file name (not the entire path). If a file name matches
+both \fB--include\fP and \fB--exclude\fP, it is excluded. There is no short
+form for this option.
+.TP
+\fB--include_dir\fP=\fIpattern\fP
+When \fBpcregrep\fP is searching the contents of a directory as a consequence
+of the \fB-r\fP (recursive search) option, only those subdirectories whose
+names match the pattern are included. (Note that the \fB--include\fP option
+does not affect subdirectories.) The pattern is a PCRE regular expression, and
+is matched against the final component of the name (not the entire path). If a
+subdirectory name matches both \fB--include_dir\fP and \fB--exclude_dir\fP, it
+is excluded. There is no short form for this option.
 .TP
 \fB-L\fP, \fB--files-without-match\fP
 Instead of outputting lines from the files, just output the names of the files
@@ -201,6 +271,15 @@
 are being output. If not supplied, "(standard input)" is used. There is no
 short form for this option.
 .TP
+\fB--line-offsets\fP
+Instead of showing lines or parts of lines that match, show each match as a
+line number, the offset from the start of the line, and a length. The line
+number is terminated by a colon (as usual; see the \fB-n\fP option), and the
+offset and length are separated by a comma. In this mode, no context is shown.
+That is, the \fB-A\fP, \fB-B\fP, and \fB-C\fP options are ignored. If there is
+more than one match in a line, each of them is shown separately. This option is
+mutually exclusive with \fB--file-offsets\fP and \fB--only-matching\fP.
+.TP
 \fB--locale\fP=\fIlocale-name\fP
 This option specifies a locale to be used for pattern matching. It overrides
 the value in the \fBLC_ALL\fP or \fBLC_CTYPE\fP environment variables. If no
@@ -220,26 +299,38 @@
 are guaranteed to be available for lookbehind assertions.
 .TP
 \fB-N\fP \fInewline-type\fP, \fB--newline=\fP\fInewline-type\fP
-The PCRE library supports three different character sequences for indicating
+The PCRE library supports five different conventions for indicating
 the ends of lines. They are the single-character sequences CR (carriage return)
-and LF (linefeed), and the two-character sequence CR, LF. When the library is
-built, a default line-ending sequence is specified. This is normally the
-standard sequence for the operating system. Unless otherwise specified by this
-option, \fBpcregrep\fP uses the default. The possible values for this option
-are CR, LF, or CRLF. This makes it possible to use \fBpcregrep\fP on files that
-have come from other environments without having to modify their line endings.
-If the data that is being scanned does not agree with the convention set by
-this option, \fBpcregrep\fP may behave in strange ways.
+and LF (linefeed), the two-character sequence CRLF, an "anycrlf" convention,
+which recognizes any of the preceding three types, and an "any" convention, in
+which any Unicode line ending sequence is assumed to end a line. The Unicode
+sequences are the three just mentioned, plus VT (vertical tab, U+000B), FF
+(formfeed, U+000C), NEL (next line, U+0085), LS (line separator, U+2028), and
+PS (paragraph separator, U+2029).
+.sp
+When the PCRE library is built, a default line-ending sequence is specified.
+This is normally the standard sequence for the operating system. Unless
+otherwise specified by this option, \fBpcregrep\fP uses the library's default.
+The possible values for this option are CR, LF, CRLF, ANYCRLF, or ANY. This
+makes it possible to use \fBpcregrep\fP on files that have come from other
+environments without having to modify their line endings. If the data that is
+being scanned does not agree with the convention set by this option,
+\fBpcregrep\fP may behave in strange ways.
 .TP
 \fB-n\fP, \fB--line-number\fP
 Precede each output line by its line number in the file, followed by a colon
-and a space for matching lines or a hyphen and a space for context lines. If
-the filename is also being output, it precedes the line number.
+for matching lines or a hyphen for context lines. If the filename is also being
+output, it precedes the line number. This option is forced if
+\fB--line-offsets\fP is used.
 .TP
 \fB-o\fP, \fB--only-matching\fP
 Show only the part of the line that matched a pattern. In this mode, no
 context is shown. That is, the \fB-A\fP, \fB-B\fP, and \fB-C\fP options are
-ignored.
+ignored. If there is more than one match in a line, each of them is shown
+separately. If \fB-o\fP is combined with \fB-v\fP (invert the sense of the
+match to find non-matching lines), no output is generated, but the return code
+is set appropriately. This option is mutually exclusive with
+\fB--file-offsets\fP and \fB--line-offsets\fP.
 .TP
 \fB-q\fP, \fB--quiet\fP
 Work quietly, that is, display nothing except error messages. The exit
@@ -274,7 +365,7 @@
 Force the patterns to match only whole words. This is equivalent to having \eb
 at the start and end of the pattern.
 .TP
-\fB-x\fP, \fB--line-regex\fP, \fP--line-regexp\fP
+\fB-x\fP, \fB--line-regex\fP, \fB--line-regexp\fP
 Force the patterns to be anchored (each must start matching at the beginning of
 a line) and in addition, require them to match entire lines. This is
 equivalent to having ^ and $ characters at the start and end of each
@@ -339,7 +430,7 @@
 it has no data.
 .
 .
-.SH MATCHING ERRORS
+.SH "MATCHING ERRORS"
 .rs
 .sp
 It is possible to supply a regular expression that takes a very long time to
@@ -361,16 +452,26 @@
 code.
 .
 .
+.SH "SEE ALSO"
+.rs
+.sp
+\fBpcrepattern\fP(3), \fBpcretest\fP(1).
+.
+.
 .SH AUTHOR
 .rs
 .sp
+.nf
 Philip Hazel
-.br
 University Computing Service
-.br
-Cambridge CB2 3QG, England.
-.P
-.in 0
-Last updated: 06 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 01 March 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcregrep.txt
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcregrep.txt	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcregrep.txt	Mon Jun  8 18:51:30 2009
@@ -14,8 +14,8 @@
        pcregrep  searches  files  for  character  patterns, in the same way as
        other grep commands do, but it uses the PCRE regular expression library
        to support patterns that are compatible with the regular expressions of
-       Perl 5. See pcrepattern for a full description of syntax and  semantics
-       of the regular expressions that PCRE supports.
+       Perl 5. See pcrepattern(3) for a full description of syntax and  seman-
+       tics of the regular expressions that PCRE supports.
 
        Patterns,  whether  supplied on the command line or in a separate file,
        are given without delimiters. For example:
@@ -24,37 +24,72 @@
 
        If you attempt to use delimiters (for example, by surrounding a pattern
        with  slashes,  as  is common in Perl scripts), they are interpreted as
-       part of the pattern. Quotes can of course be used on the  command  line
-       because they are interpreted by the shell, and indeed they are required
-       if a pattern contains white space or shell metacharacters.
-
-       The first argument that follows any option settings is treated  as  the
-       single  pattern  to be matched when neither -e nor -f is present.  Con-
-       versely, when one or both of these options are  used  to  specify  pat-
+       part of the pattern. Quotes can of course be used to  delimit  patterns
+       on  the  command  line  because  they are interpreted by the shell, and
+       indeed they are required if a pattern contains  white  space  or  shell
+       metacharacters.
+
+       The  first  argument that follows any option settings is treated as the
+       single pattern to be matched when neither -e nor -f is  present.   Con-
+       versely,  when  one  or  both of these options are used to specify pat-
        terns, all arguments are treated as path names. At least one of -e, -f,
        or an argument pattern must be provided.
 
        If no files are specified, pcregrep reads the standard input. The stan-
-       dard  input  can  also  be  referenced by a name consisting of a single
+       dard input can also be referenced by a  name  consisting  of  a  single
        hyphen.  For example:
 
          pcregrep some-pattern /file1 - /file3
 
-       By default, each line that matches the pattern is copied to  the  stan-
-       dard  output, and if there is more than one file, the file name is out-
-       put at the start of each line. However,  there  are  options  that  can
-       change how pcregrep behaves. In particular, the -M option makes it pos-
-       sible to search for patterns that span line boundaries. What defines  a
-       line boundary is controlled by the -N (--newline) option.
+       By  default, each line that matches a pattern is copied to the standard
+       output, and if there is more than one file, the file name is output  at
+       the start of each line, followed by a colon. However, there are options
+       that can change how pcregrep behaves.  In  particular,  the  -M  option
+       makes  it  possible  to  search for patterns that span line boundaries.
+       What defines a line  boundary  is  controlled  by  the  -N  (--newline)
+       option.
 
        Patterns  are  limited  to  8K  or  BUFSIZ characters, whichever is the
-       greater.  BUFSIZ is defined in .
+       greater.  BUFSIZ is defined in . When there is more  than  one
+       pattern (specified by the use of -e and/or -f), each pattern is applied
+       to each line in the order in which they are defined,  except  that  all
+       the -e patterns are tried before the -f patterns.
+
+       By  default,  as soon as one pattern matches (or fails to match when -v
+       is used), no further patterns are considered. However, if --colour  (or
+       --color) is used to colour the matching substrings, or if --only-match-
+       ing, --file-offsets, or --line-offsets is used to output only the  part
+       of  the  line  that  matched (either shown literally, or as an offset),
+       scanning resumes immediately  following  the  match,  so  that  further
+       matches  on the same line can be found. If there are multiple patterns,
+       they are all tried on the remainder of the line, but patterns that fol-
+       low the one that matched are not tried on the earlier part of the line.
+
+       This is the same behaviour as GNU grep, but it does mean that the order
+       in which multiple patterns are specified can affect the output when one
+       of the above options is used.
+
+       Patterns  that can match an empty string are accepted, but empty string
+       matches are not recognized. An example is the pattern "(super)?(man)?",
+       in  which  all  components  are optional. This pattern finds all occur-
+       rences of both "super" and "man"; the output differs from matching with
+       "super|man" when only the matching substrings are being shown.
 
-       If the LC_ALL or LC_CTYPE environment variable is  set,  pcregrep  uses
-       the  value to set a locale when calling the PCRE library.  The --locale
+       If  the  LC_ALL  or LC_CTYPE environment variable is set, pcregrep uses
+       the value to set a locale when calling the PCRE library.  The  --locale
        option can be used to override this.
 
 
+SUPPORT FOR COMPRESSED FILES
+
+       It  is  possible  to compile pcregrep so that it uses libz or libbz2 to
+       read files whose names end in .gz or .bz2, respectively. You  can  find
+       out whether your binary has support for one or both of these file types
+       by running it with the --help option. If the appropriate support is not
+       present,  files are treated as plain text. The standard input is always
+       so treated.
+
+
 OPTIONS
 
        --        This terminate the list of options. It is useful if the  next
@@ -99,110 +134,156 @@
                  the same shell item, separated by an equals sign.
 
        --colour=value, --color=value
-                 This option specifies under what circumstances the part of  a
+                 This option specifies under what circumstances the parts of a
                  line that matched a pattern should be coloured in the output.
-                 The value may be "never" (the default), "always", or  "auto".
-                 In  the  latter  case, colouring happens only if the standard
-                 output is connected to a terminal. The colour can  be  speci-
-                 fied  by  setting the environment variable PCREGREP_COLOUR or
-                 PCREGREP_COLOR. The value of this variable should be a string
-                 of  two  numbers,  separated by a semicolon.  They are copied
-                 directly into the control string for setting colour on a ter-
-                 minal,  so it is your responsibility to ensure that they make
-                 sense. If neither of the environment variables  is  set,  the
-                 default is "1;31", which gives red.
+                 By default, the output is not coloured. The value  (which  is
+                 optional,  see above) may be "never", "always", or "auto". In
+                 the latter case, colouring happens only if the standard  out-
+                 put  is connected to a terminal. More resources are used when
+                 colouring is enabled, because pcregrep has to search for  all
+                 possible  matches in a line, not just one, in order to colour
+                 them all.
+
+                 The colour that is used can be specified by setting the envi-
+                 ronment variable PCREGREP_COLOUR or PCREGREP_COLOR. The value
+                 of this variable should be a string of two numbers, separated
+                 by  a  semicolon.  They  are copied directly into the control
+                 string for setting colour  on  a  terminal,  so  it  is  your
+                 responsibility  to ensure that they make sense. If neither of
+                 the environment variables is  set,  the  default  is  "1;31",
+                 which gives red.
 
        -D action, --devices=action
                  If  an  input  path  is  not  a  regular file or a directory,
                  "action" specifies how it is to be  processed.  Valid  values
-                 are  "read" (the default) or "skip" (silently skip the path).
+                 are "read" (the default) or "skip" (silently skip the path).
 
        -d action, --directories=action
                  If an input path is a directory, "action" specifies how it is
-                 to  be  processed.   Valid  values  are "read" (the default),
-                 "recurse" (equivalent to the -r option), or "skip"  (silently
-                 skip  the path). In the default case, directories are read as
-                 if they were ordinary files. In some  operating  systems  the
-                 effect  of reading a directory like this is an immediate end-
+                 to be processed.  Valid  values  are  "read"  (the  default),
+                 "recurse"  (equivalent to the -r option), or "skip" (silently
+                 skip the path). In the default case, directories are read  as
+                 if  they  were  ordinary files. In some operating systems the
+                 effect of reading a directory like this is an immediate  end-
                  of-file.
 
-       -e pattern, --regex=pattern,
-                 --regexp=pattern Specify a pattern to be matched. This option
-                 can  be  used multiple times in order to specify several pat-
-                 terns. It can also be used as a way of  specifying  a  single
-                 pattern  that starts with a hyphen. When -e is used, no argu-
-                 ment pattern is taken from the command  line;  all  arguments
-                 are treated as file names. There is an overall maximum of 100
-                 patterns. They are applied to each line in the order in which
-                 they  are  defined until one matches (or fails to match if -v
-                 is used). If -f is used with -e, the  command  line  patterns
-                 are  matched  first,  followed by the patterns from the file,
-                 independent of the order in which these  options  are  speci-
-                 fied.  Note that multiple use of -e is not the same as a sin-
-                 gle pattern with alternatives. For  example,  X|Y  finds  the
-                 first  character in a line that is X or Y, whereas if the two
-                 patterns are given separately, pcregrep  finds  X  if  it  is
-                 present, even if it follows Y in the line. It finds Y only if
-                 there is no X in the line. This really matters  only  if  you
-                 are using -o to show the portion of the line that matched.
+       -e pattern, --regex=pattern, --regexp=pattern
+                 Specify a pattern to be matched. This option can be used mul-
+                 tiple times in order to specify several patterns. It can also
+                 be  used  as a way of specifying a single pattern that starts
+                 with a hyphen. When -e is used, no argument pattern is  taken
+                 from  the  command  line;  all  arguments are treated as file
+                 names. There is an overall maximum of 100 patterns. They  are
+                 applied  to  each line in the order in which they are defined
+                 until one matches (or fails to match if -v is used). If -f is
+                 used  with  -e,  the command line patterns are matched first,
+                 followed by the patterns from the file,  independent  of  the
+                 order  in which these options are specified. Note that multi-
+                 ple use of -e is not the same as a single pattern with alter-
+                 natives. For example, X|Y finds the first character in a line
+                 that is X or Y, whereas if the two patterns are  given  sepa-
+                 rately, pcregrep finds X if it is present, even if it follows
+                 Y in the line. It finds Y only if there is no X in the  line.
+                 This  really  matters  only  if  you are using -o to show the
+                 part(s) of the line that matched.
 
        --exclude=pattern
                  When pcregrep is searching the files in a directory as a con-
-                 sequence of the -r (recursive search) option, any files whose
-                 names  match  the pattern are excluded. The pattern is a PCRE
-                 regular expression. If a file name matches both --include and
-                 --exclude,  it  is  excluded. There is no short form for this
+                 sequence  of  the  -r  (recursive search) option, any regular
+                 files whose names match the pattern are excluded. Subdirecto-
+                 ries  are  not  excluded  by  this  option; they are searched
+                 recursively, subject to the --exclude_dir  and  --include_dir
+                 options.  The  pattern  is  a PCRE regular expression, and is
+                 matched against the final component of the file name (not the
+                 entire  path).  If  a  file  name  matches both --include and
+                 --exclude, it is excluded.  There is no short form  for  this
                  option.
 
+       --exclude_dir=pattern
+                 When  pcregrep  is searching the contents of a directory as a
+                 consequence of the -r (recursive search) option,  any  subdi-
+                 rectories  whose  names match the pattern are excluded. (Note
+                 that the --exclude option does  not  affect  subdirectories.)
+                 The  pattern  is  a  PCRE  regular expression, and is matched
+                 against the final component  of  the  name  (not  the  entire
+                 path).  If a subdirectory name matches both --include_dir and
+                 --exclude_dir, it is excluded. There is  no  short  form  for
+                 this option.
+
        -F, --fixed-strings
-                 Interpret each pattern as a list of fixed strings,  separated
-                 by  newlines,  instead  of  as  a  regular expression. The -w
-                 (match as a word) and -x (match whole line)  options  can  be
+                 Interpret  each pattern as a list of fixed strings, separated
+                 by newlines, instead of  as  a  regular  expression.  The  -w
+                 (match  as  a  word) and -x (match whole line) options can be
                  used with -F. They apply to each of the fixed strings. A line
                  is selected if any of the fixed strings are found in it (sub-
                  ject to -w or -x, if present).
 
        -f filename, --file=filename
-                 Read  a  number  of patterns from the file, one per line, and
-                 match them against each line of input. A data line is  output
+                 Read a number of patterns from the file, one  per  line,  and
+                 match  them against each line of input. A data line is output
                  if any of the patterns match it. The filename can be given as
                  "-" to refer to the standard input. When -f is used, patterns
-                 specified  on  the command line using -e may also be present;
+                 specified on the command line using -e may also  be  present;
                  they are tested before the file's patterns. However, no other
-                 pattern  is  taken  from  the command line; all arguments are
-                 treated as file names. There is an  overall  maximum  of  100
+                 pattern is taken from the command  line;  all  arguments  are
+                 treated  as  file  names.  There is an overall maximum of 100
                  patterns. Trailing white space is removed from each line, and
-                 blank lines are ignored. An empty file contains  no  patterns
-                 and therefore matches nothing.
+                 blank  lines  are ignored. An empty file contains no patterns
+                 and therefore matches nothing. See also  the  comments  about
+                 multiple  patterns  versus a single pattern with alternatives
+                 in the description of -e above.
+
+       --file-offsets
+                 Instead of showing lines or parts of lines that  match,  show
+                 each  match  as  an  offset  from the start of the file and a
+                 length, separated by a comma. In this  mode,  no  context  is
+                 shown.  That  is,  the -A, -B, and -C options are ignored. If
+                 there is more than one match in a line, each of them is shown
+                 separately.  This  option  is mutually exclusive with --line-
+                 offsets and --only-matching.
 
        -H, --with-filename
-                 Force  the  inclusion  of the filename at the start of output
-                 lines when searching a single file. By default, the  filename
-                 is  not  shown in this case. For matching lines, the filename
-                 is followed by a colon and a  space;  for  context  lines,  a
-                 hyphen separator is used. If a line number is also being out-
-                 put, it follows the file name without a space.
+                 Force the inclusion of the filename at the  start  of  output
+                 lines  when searching a single file. By default, the filename
+                 is not shown in this case. For matching lines,  the  filename
+                 is followed by a colon; for context lines, a hyphen separator
+                 is used. If a line number is also being  output,  it  follows
+                 the file name.
 
        -h, --no-filename
-                 Suppress the output filenames when searching multiple  files.
-                 By  default,  filenames  are  shown  when  multiple files are
-                 searched. For matching lines, the filename is followed  by  a
-                 colon  and  a space; for context lines, a hyphen separator is
-                 used. If a line number is also being output, it  follows  the
-                 file name without a space.
+                 Suppress  the output filenames when searching multiple files.
+                 By default, filenames  are  shown  when  multiple  files  are
+                 searched.  For  matching lines, the filename is followed by a
+                 colon; for context lines, a hyphen separator is used.   If  a
+                 line number is also being output, it follows the file name.
 
-       --help    Output a brief help message and exit.
+       --help    Output  a  help  message, giving brief details of the command
+                 options and file type support, and then exit.
 
        -i, --ignore-case
                  Ignore upper/lower case distinctions during comparisons.
 
        --include=pattern
                  When pcregrep is searching the files in a directory as a con-
-                 sequence of the -r  (recursive  search)  option,  only  those
-                 files whose names match the pattern are included. The pattern
-                 is a PCRE regular expression. If a  file  name  matches  both
-                 --include  and  --exclude,  it is excluded. There is no short
-                 form for this option.
+                 sequence of the -r (recursive search) option, only those reg-
+                 ular files whose names match the pattern are included. Subdi-
+                 rectories  are always included and searched recursively, sub-
+                 ject to the --include_dir and --exclude_dir options. The pat-
+                 tern is a PCRE regular expression, and is matched against the
+                 final component of the file name (not the entire path). If  a
+                 file  name  matches  both  --include  and  --exclude,  it  is
+                 excluded. There is no short form for this option.
+
+       --include_dir=pattern
+                 When pcregrep is searching the contents of a directory  as  a
+                 consequence  of  the -r (recursive search) option, only those
+                 subdirectories whose names match the  pattern  are  included.
+                 (Note  that  the --include option does not affect subdirecto-
+                 ries.) The pattern is  a  PCRE  regular  expression,  and  is
+                 matched  against  the  final  component  of the name (not the
+                 entire  path).  If   a   subdirectory   name   matches   both
+                 --include_dir  and --exclude_dir, it is excluded. There is no
+                 short form for this option.
 
        -L, --files-without-match
                  Instead of outputting lines from the files, just  output  the
@@ -222,6 +303,17 @@
                  when file names are being output. If not supplied, "(standard
                  input)" is used. There is no short form for this option.
 
+       --line-offsets
+                 Instead  of  showing lines or parts of lines that match, show
+                 each match as a line number, the offset from the start of the
+                 line,  and a length. The line number is terminated by a colon
+                 (as usual; see the -n option), and the offset and length  are
+                 separated  by  a  comma.  In  this mode, no context is shown.
+                 That is, the -A, -B, and -C options are ignored. If there  is
+                 more  than  one  match in a line, each of them is shown sepa-
+                 rately. This option is mutually exclusive with --file-offsets
+                 and --only-matching.
+
        --locale=locale-name
                  This  option specifies a locale to be used for pattern match-
                  ing. It overrides the value in the LC_ALL or  LC_CTYPE  envi-
@@ -245,60 +337,73 @@
                  lookbehind assertions.
 
        -N newline-type, --newline=newline-type
-                 The PCRE library supports three different character sequences
-                 for indicating the ends of lines. They are the single-charac-
-                 ter sequences CR (carriage return) and LF (linefeed), and the
-                 two-character sequence CR, LF. When the library is  built,  a
-                 default  line-ending  sequence is specified. This is normally
-                 the standard sequence for the operating system. Unless other-
-                 wise specified by this option, pcregrep uses the default. The
-                 possible values for this option are CR,  LF,  or  CRLF.  This
-                 makes  it  possible  to  use pcregrep on files that have come
-                 from other environments without having to modify  their  line
-                 endings.   If  the  data that is being scanned does not agree
-                 with the convention set by this option, pcregrep  may  behave
-                 in strange ways.
+                 The  PCRE  library  supports  five  different conventions for
+                 indicating the ends of lines. They are  the  single-character
+                 sequences  CR  (carriage  return) and LF (linefeed), the two-
+                 character sequence CRLF, an "anycrlf" convention, which  rec-
+                 ognizes  any  of the preceding three types, and an "any" con-
+                 vention, in which any Unicode line ending sequence is assumed
+                 to  end a line. The Unicode sequences are the three just men-
+                 tioned,  plus  VT  (vertical  tab,  U+000B),  FF   (formfeed,
+                 U+000C),   NEL  (next  line,  U+0085),  LS  (line  separator,
+                 U+2028), and PS (paragraph separator, U+2029).
+
+                 When  the  PCRE  library  is  built,  a  default  line-ending
+                 sequence   is  specified.   This  is  normally  the  standard
+                 sequence for the operating system. Unless otherwise specified
+                 by  this  option,  pcregrep  uses the library's default.  The
+                 possible values for this option are CR, LF, CRLF, ANYCRLF, or
+                 ANY.  This  makes  it  possible to use pcregrep on files that
+                 have come from other environments without  having  to  modify
+                 their  line  endings.  If the data that is being scanned does
+                 not agree with the convention set by  this  option,  pcregrep
+                 may behave in strange ways.
 
        -n, --line-number
                  Precede each output line by its line number in the file, fol-
-                 lowed by a colon and a space for matching lines or  a  hyphen
-                 and  a space for context lines. If the filename is also being
-                 output, it precedes the line number.
+                 lowed by a colon for matching lines or a hyphen  for  context
+                 lines.  If the filename is also being output, it precedes the
+                 line number. This option is forced if --line-offsets is used.
 
        -o, --only-matching
                  Show only the part of the line that  matched  a  pattern.  In
                  this  mode,  no context is shown. That is, the -A, -B, and -C
-                 options are ignored.
+                 options are ignored. If there is more than  one  match  in  a
+                 line,  each  of  them  is shown separately. If -o is combined
+                 with -v (invert the sense of the match to  find  non-matching
+                 lines),  no  output  is generated, but the return code is set
+                 appropriately. This option is mutually exclusive with --file-
+                 offsets and --line-offsets.
 
        -q, --quiet
                  Work quietly, that is, display nothing except error messages.
-                 The  exit  status  indicates  whether or not any matches were
+                 The exit status indicates whether or  not  any  matches  were
                  found.
 
        -r, --recursive
-                 If any given path is a directory, recursively scan the  files
-                 it  contains, taking note of any --include and --exclude set-
-                 tings. By default, a directory is read as a normal  file;  in
-                 some  operating  systems this gives an immediate end-of-file.
-                 This option is a shorthand  for  setting  the  -d  option  to
+                 If  any given path is a directory, recursively scan the files
+                 it contains, taking note of any --include and --exclude  set-
+                 tings.  By  default, a directory is read as a normal file; in
+                 some operating systems this gives an  immediate  end-of-file.
+                 This  option  is  a  shorthand  for  setting the -d option to
                  "recurse".
 
        -s, --no-messages
-                 Suppress  error  messages  about  non-existent  or unreadable
-                 files. Such files are quietly skipped.  However,  the  return
+                 Suppress error  messages  about  non-existent  or  unreadable
+                 files.  Such  files  are quietly skipped. However, the return
                  code is still 2, even if matches were found in other files.
 
        -u, --utf-8
-                 Operate  in UTF-8 mode. This option is available only if PCRE
-                 has been compiled with UTF-8 support. Both patterns and  sub-
+                 Operate in UTF-8 mode. This option is available only if  PCRE
+                 has  been compiled with UTF-8 support. Both patterns and sub-
                  ject lines must be valid strings of UTF-8 characters.
 
        -V, --version
-                 Write  the  version  numbers of pcregrep and the PCRE library
+                 Write the version numbers of pcregrep and  the  PCRE  library
                  that is being used to the standard error stream.
 
        -v, --invert-match
-                 Invert the sense of the match, so that  lines  which  do  not
+                 Invert  the  sense  of  the match, so that lines which do not
                  match any of the patterns are the ones that are found.
 
        -w, --word-regex, --word-regexp
@@ -306,61 +411,61 @@
                  lent to having \b at the start and end of the pattern.
 
        -x, --line-regex, --line-regexp
-                 Force the patterns to be anchored (each must  start  matching
-                 at  the beginning of a line) and in addition, require them to
-                 match entire lines. This is equivalent  to  having  ^  and  $
+                 Force  the  patterns to be anchored (each must start matching
+                 at the beginning of a line) and in addition, require them  to
+                 match  entire  lines.  This  is  equivalent to having ^ and $
                  characters at the start and end of each alternative branch in
                  every pattern.
 
 
 ENVIRONMENT VARIABLES
 
-       The environment variables LC_ALL and LC_CTYPE  are  examined,  in  that
-       order,  for  a  locale.  The first one that is set is used. This can be
-       overridden by the --locale option.  If  no  locale  is  set,  the  PCRE
+       The  environment  variables  LC_ALL  and LC_CTYPE are examined, in that
+       order, for a locale. The first one that is set is  used.  This  can  be
+       overridden  by  the  --locale  option.  If  no  locale is set, the PCRE
        library's default (usually the "C" locale) is used.
 
 
 NEWLINES
 
-       The  -N (--newline) option allows pcregrep to scan files with different
-       newline conventions from the default.  However,  the  setting  of  this
-       option  does not affect the way in which pcregrep writes information to
-       the standard error and output streams. It uses the  string  "\n"  in  C
-       printf()  calls  to  indicate newlines, relying on the C I/O library to
-       convert this to an appropriate sequence if the  output  is  sent  to  a
+       The -N (--newline) option allows pcregrep to scan files with  different
+       newline  conventions  from  the  default.  However, the setting of this
+       option does not affect the way in which pcregrep writes information  to
+       the  standard  error  and  output streams. It uses the string "\n" in C
+       printf() calls to indicate newlines, relying on the C  I/O  library  to
+       convert  this  to  an  appropriate  sequence if the output is sent to a
        file.
 
 
 OPTIONS COMPATIBILITY
 
        The majority of short and long forms of pcregrep's options are the same
-       as in the GNU grep program. Any long option of  the  form  --xxx-regexp
-       (GNU  terminology) is also available as --xxx-regex (PCRE terminology).
-       However, the --locale, -M, --multiline, -u,  and  --utf-8  options  are
+       as  in  the  GNU grep program. Any long option of the form --xxx-regexp
+       (GNU terminology) is also available as --xxx-regex (PCRE  terminology).
+       However,  the  --locale,  -M,  --multiline, -u, and --utf-8 options are
        specific to pcregrep.
 
 
 OPTIONS WITH DATA
 
        There are four different ways in which an option with data can be spec-
-       ified.  If a short form option is used, the  data  may  follow  immedi-
+       ified.   If  a  short  form option is used, the data may follow immedi-
        ately, or in the next command line item. For example:
 
          -f/some/file
          -f /some/file
 
-       If  a long form option is used, the data may appear in the same command
+       If a long form option is used, the data may appear in the same  command
        line item, separated by an equals character, or (with one exception) it
        may appear in the next command line item. For example:
 
          --file=/some/file
          --file /some/file
 
-       Note,  however, that if you want to supply a file name beginning with ~
-       as data in a shell command, and have the  shell  expand  ~  to  a  home
+       Note, however, that if you want to supply a file name beginning with  ~
+       as  data  in  a  shell  command,  and have the shell expand ~ to a home
        directory, you must separate the file name from the option, because the
-       shell does not treat ~ specially unless it is at the start of an  item.
+       shell does not treat ~ specially unless it is at the start of an item.
 
        The  exception  to  the  above is the --colour (or --color) option, for
        which the data is optional. If this option does have data, it  must  be
@@ -389,11 +494,19 @@
        not affect the return code.
 
 
+SEE ALSO
+
+       pcrepattern(3), pcretest(1).
+
+
 AUTHOR
 
        Philip Hazel
        University Computing Service
-       Cambridge CB2 3QG, England.
+       Cambridge CB2 3QH, England.
+
+
+REVISION
 
-Last updated: 06 June 2006
-Copyright (c) 1997-2006 University of Cambridge.
+       Last updated: 01 March 2009
+       Copyright (c) 1997-2009 University of Cambridge.

Modified: freeswitch/trunk/libs/pcre/doc/pcrematching.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcrematching.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcrematching.3	Mon Jun  8 18:51:30 2009
@@ -26,7 +26,7 @@
     
 .sp
 there are three possible answers. The standard algorithm finds only one of
-them, whereas the DFA algorithm finds all three.
+them, whereas the alternative algorithm finds all three.
 .
 .SH "REGULAR EXPRESSIONS AS TREES"
 .rs
@@ -41,8 +41,8 @@
 .SH "THE STANDARD MATCHING ALGORITHM"
 .rs
 .sp
-In the terminology of Jeffrey Friedl's book \fIMastering Regular
-Expressions\fP, the standard algorithm is an "NFA algorithm". It conducts a
+In the terminology of Jeffrey Friedl's book "Mastering Regular
+Expressions", the standard algorithm is an "NFA algorithm". It conducts a
 depth-first search of the pattern tree. That is, it proceeds along a single
 path through the tree, checking that the subject matches what is required. When
 there is a mismatch, the algorithm tries any alternatives at the current point,
@@ -63,15 +63,16 @@
 matched by portions of the pattern in parentheses. This provides support for
 capturing parentheses and back references.
 .
-.SH "THE DFA MATCHING ALGORITHM"
+.SH "THE ALTERNATIVE MATCHING ALGORITHM"
 .rs
 .sp
-DFA stands for "deterministic finite automaton", but you do not need to
-understand the origins of that name. This algorithm conducts a breadth-first
-search of the tree. Starting from the first matching point in the subject, it
-scans the subject string from left to right, once, character by character, and
-as it does this, it remembers all the paths through the tree that represent
-valid matches.
+This algorithm conducts a breadth-first search of the tree. Starting from the
+first matching point in the subject, it scans the subject string from left to
+right, once, character by character, and as it does this, it remembers all the
+paths through the tree that represent valid matches. In Friedl's terminology,
+this is a kind of "DFA algorithm", though it is not implemented as a
+traditional finite state machine (it keeps multiple states active
+simultaneously).
 .P
 The scan continues until either the end of the subject is reached, or there are
 no more unterminated paths. At this point, terminated paths represent the
@@ -92,11 +93,20 @@
 matches that start at later positions.
 .P
 There are a number of features of PCRE regular expressions that are not
-supported by the DFA matching algorithm. They are as follows:
+supported by the alternative matching algorithm. They are as follows:
 .P
 1. Because the algorithm finds all possible matches, the greedy or ungreedy
 nature of repetition quantifiers is not relevant. Greedy and ungreedy
-quantifiers are treated in exactly the same way.
+quantifiers are treated in exactly the same way. However, possessive
+quantifiers can make a difference when what follows could also match what is
+quantified, for example in a pattern like this:
+.sp
+  ^a++\ew!
+.sp
+This pattern matches "aaab!" but not "aaa!", which would be matched by a
+non-possessive quantifier. Similarly, if an atomic group is present, it is
+matched as if it were a standalone pattern at the current point, and the
+longest match is then "locked in" for the rest of the overall pattern.
 .P
 2. When dealing with multiple paths through the tree simultaneously, it is not
 straightforward to keep track of captured substrings for the different matching
@@ -107,21 +117,27 @@
 not supported, and cause errors if encountered.
 .P
 4. For the same reason, conditional expressions that use a backreference as the
-condition are not supported.
+condition or test for a specific group recursion are not supported.
 .P
-5. Callouts are supported, but the value of the \fIcapture_top\fP field is
+5. Because many paths through the tree may be active, the \eK escape sequence,
+which resets the start of the match when encountered (but may be on some paths
+and not on others), is not supported. It causes an error if encountered.
+.P
+6. Callouts are supported, but the value of the \fIcapture_top\fP field is
 always 1, and the value of the \fIcapture_last\fP field is always -1.
 .P
-6.
-The \eC escape sequence, which (in the standard algorithm) matches a single
-byte, even in UTF-8 mode, is not supported because the DFA algorithm moves
-through the subject string one character at a time, for all active paths
+7. The \eC escape sequence, which (in the standard algorithm) matches a single
+byte, even in UTF-8 mode, is not supported because the alternative algorithm
+moves through the subject string one character at a time, for all active paths
 through the tree.
+.P
+8. Except for (*FAIL), the backtracking control verbs such as (*PRUNE) are not
+supported. (*FAIL) is supported, and behaves like a failing negative assertion.
 .
-.SH "ADVANTAGES OF THE DFA ALGORITHM"
+.SH "ADVANTAGES OF THE ALTERNATIVE ALGORITHM"
 .rs
 .sp
-Using the DFA matching algorithm provides the following advantages:
+Using the alternative matching algorithm provides the following advantages:
 .P
 1. All possible matches (at a single point in the subject) are automatically
 found, and in particular, the longest match is found. To find more than one
@@ -130,17 +146,18 @@
 .P
 2. There is much better support for partial matching. The restrictions on the
 content of the pattern that apply when using the standard algorithm for partial
-matching do not apply to the DFA algorithm. For non-anchored patterns, the
-starting position of a partial match is available.
+matching do not apply to the alternative algorithm. For non-anchored patterns,
+the starting position of a partial match is available.
 .P
-3. Because the DFA algorithm scans the subject string just once, and never
-needs to backtrack, it is possible to pass very long subject strings to the
-matching function in several pieces, checking for partial matching each time.
+3. Because the alternative algorithm scans the subject string just once, and
+never needs to backtrack, it is possible to pass very long subject strings to
+the matching function in several pieces, checking for partial matching each
+time.
 .
-.SH "DISADVANTAGES OF THE DFA ALGORITHM"
+.SH "DISADVANTAGES OF THE ALTERNATIVE ALGORITHM"
 .rs
 .sp
-The DFA algorithm suffers from a number of disadvantages:
+The alternative algorithm suffers from a number of disadvantages:
 .P
 1. It is substantially slower than the standard algorithm. This is partly
 because it has to search for all possible matches, but is also because it is
@@ -148,10 +165,24 @@
 .P
 2. Capturing parentheses and back references are not supported.
 .P
-3. The "atomic group" feature of PCRE regular expressions is supported, but
-does not provide the advantage that it does for the standard algorithm.
-.P
-.in 0
-Last updated: 06 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+3. Although atomic groups are supported, their use does not provide the
+performance advantage that it does for the standard algorithm.
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 19 April 2008
+Copyright (c) 1997-2008 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcrepartial.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcrepartial.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcrepartial.3	Mon Jun  8 18:51:30 2009
@@ -71,6 +71,8 @@
 .P
 If PCRE_PARTIAL is set for a pattern that does not conform to the restrictions,
 \fBpcre_exec()\fP returns the error code PCRE_ERROR_BADPARTIAL (-13).
+You can use the PCRE_INFO_OKPARTIAL call to \fBpcre_fullinfo()\fP to find out
+if a compiled pattern can be used for partial matching.
 .
 .
 .SH "EXAMPLE OF PARTIAL MATCHING USING PCRETEST"
@@ -95,10 +97,11 @@
 .sp
 The first data string is matched completely, so \fBpcretest\fP shows the
 matched substrings. The remaining four strings do not match the complete
-pattern, but the first two are partial matches. The same test, using DFA
-matching (by means of the \eD escape sequence), produces the following output:
+pattern, but the first two are partial matches. The same test, using
+\fBpcre_dfa_exec()\fP matching (by means of the \eD escape sequence), produces
+the following output:
 .sp
-    re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
+    re> /^\ed?\ed(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\ed\ed$/
   data> 25jun04\eP\eD
    0: 25jun04
   data> 23dec3\eP\eD
@@ -119,13 +122,13 @@
 .sp
 When a partial match has been found using \fBpcre_dfa_exec()\fP, it is possible
 to continue the match by providing additional subject data and calling
-\fBpcre_dfa_exec()\fP again with the PCRE_DFA_RESTART option and the same
-working space (where details of the previous partial match are stored). Here is
-an example using \fBpcretest\fP, where the \eR escape sequence sets the
-PCRE_DFA_RESTART option and the \eD escape sequence requests the use of
-\fBpcre_dfa_exec()\fP:
+\fBpcre_dfa_exec()\fP again with the same compiled regular expression, this
+time setting the PCRE_DFA_RESTART option. You must also pass the same working
+space as before, because this is where details of the previous partial match
+are stored. Here is an example using \fBpcretest\fP, using the \eR escape
+sequence to set the PCRE_DFA_RESTART option (\eP and \eD are as above):
 .sp
-    re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
+    re> /^\ed?\ed(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\ed\ed$/
   data> 23ja\eP\eD
   Partial match: 23ja
   data> n05\eR\eD
@@ -137,9 +140,10 @@
 not retain the previously partially-matched string. It is up to the calling
 program to do that if it needs to.
 .P
-This facility can be used to pass very long subject strings to
-\fBpcre_dfa_exec()\fP. However, some care is needed for certain types of
-pattern.
+You can set PCRE_PARTIAL with PCRE_DFA_RESTART to continue partial matching
+over multiple segments. This facility can be used to pass very long subject
+strings to \fBpcre_dfa_exec()\fP. However, some care is needed for certain
+types of pattern.
 .P
 1. If the pattern contains tests for the beginning or end of a line, you need
 to pass the PCRE_NOTBOL or PCRE_NOTEOL options, as appropriate, when the
@@ -147,7 +151,7 @@
 .P
 2. If the pattern contains backward assertions (including \eb or \eB), you need
 to arrange for some overlap in the subject strings to allow for this. For
-example, you could pass the subject in chunks that were 500 bytes long, but in
+example, you could pass the subject in chunks that are 500 bytes long, but in
 a buffer of 700 bytes, with the starting offset set to 200 and the previous 200
 bytes at the start of the buffer.
 .P
@@ -155,7 +159,7 @@
 always produce exactly the same result as matching over one single long string.
 The difference arises when there are multiple matching possibilities, because a
 partial match result is given only when there are no completed matches in a
-call to fBpcre_dfa_exec()\fP. This means that as soon as the shortest match has
+call to \fBpcre_dfa_exec()\fP. This means that as soon as the shortest match has
 been found, continuation to a new subject segment is no longer possible.
 Consider this \fBpcretest\fP example:
 .sp
@@ -196,8 +200,20 @@
 where no string can be a partial match for both alternatives.
 .
 .
-.P
-.in 0
-Last updated: 16 January 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 04 June 2007
+Copyright (c) 1997-2007 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcrepattern.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcrepattern.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcrepattern.3	Mon Jun  8 18:51:30 2009
@@ -4,18 +4,34 @@
 .SH "PCRE REGULAR EXPRESSION DETAILS"
 .rs
 .sp
-The syntax and semantics of the regular expressions supported by PCRE are
-described below. Regular expressions are also described in the Perl
-documentation and in a number of books, some of which have copious examples.
-Jeffrey Friedl's "Mastering Regular Expressions", published by O'Reilly, covers
-regular expressions in great detail. This description of PCRE's regular
-expressions is intended as reference material.
+The syntax and semantics of the regular expressions that are supported by PCRE
+are described in detail below. There is a quick-reference syntax summary in the
+.\" HREF
+\fBpcresyntax\fP
+.\"
+page. PCRE tries to match Perl syntax and semantics as closely as it can. PCRE
+also supports some alternative regular expression syntax (which does not
+conflict with the Perl syntax) in order to provide some compatibility with
+regular expressions in Python, .NET, and Oniguruma.
+.P
+Perl's regular expressions are described in its own documentation, and
+regular expressions in general are covered in a number of books, some of which
+have copious examples. Jeffrey Friedl's "Mastering Regular Expressions",
+published by O'Reilly, covers regular expressions in great detail. This
+description of PCRE's regular expressions is intended as reference material.
 .P
 The original operation of PCRE was on strings of one-byte characters. However,
 there is now also support for UTF-8 character strings. To use this, you must
 build PCRE to include UTF-8 support, and then call \fBpcre_compile()\fP with
-the PCRE_UTF8 option. How this affects pattern matching is mentioned in several
-places below. There is also a summary of UTF-8 features in the
+the PCRE_UTF8 option. There is also a special sequence that can be given at the
+start of a pattern:
+.sp
+  (*UTF8)
+.sp
+Starting a pattern with this sequence is equivalent to setting the PCRE_UTF8
+option. This feature is not Perl-compatible. How setting UTF-8 mode affects
+pattern matching is mentioned in several places below. There is also a summary
+of UTF-8 features in the
 .\" HTML 
 .\" 
 section on UTF-8 support
@@ -30,13 +46,68 @@
 PCRE when its main matching function, \fBpcre_exec()\fP, is used.
 From release 6.0, PCRE offers a second matching function,
 \fBpcre_dfa_exec()\fP, which matches using a different algorithm that is not
-Perl-compatible. The advantages and disadvantages of the alternative function,
-and how it differs from the normal function, are discussed in the
+Perl-compatible. Some of the features discussed below are not available when
+\fBpcre_dfa_exec()\fP is used. The advantages and disadvantages of the
+alternative function, and how it differs from the normal function, are
+discussed in the
 .\" HREF
 \fBpcrematching\fP
 .\"
 page.
+.
+.
+.SH "NEWLINE CONVENTIONS"
+.rs
+.sp
+PCRE supports five different conventions for indicating line breaks in
+strings: a single CR (carriage return) character, a single LF (linefeed)
+character, the two-character sequence CRLF, any of the three preceding, or any
+Unicode newline sequence. The
+.\" HREF
+\fBpcreapi\fP
+.\"
+page has
+.\" HTML 
+.\" 
+further discussion
+.\"
+about newlines, and shows how to set the newline convention in the
+\fIoptions\fP arguments for the compiling and matching functions.
 .P
+It is also possible to specify a newline convention by starting a pattern
+string with one of the following five sequences:
+.sp
+  (*CR)        carriage return
+  (*LF)        linefeed
+  (*CRLF)      carriage return, followed by linefeed
+  (*ANYCRLF)   any of the three above
+  (*ANY)       all Unicode newline sequences
+.sp
+These override the default and the options given to \fBpcre_compile()\fP. For
+example, on a Unix system where LF is the default newline sequence, the pattern
+.sp
+  (*CR)a.b
+.sp
+changes the convention to CR. That pattern matches "a\enb" because LF is no
+longer a newline. Note that these special settings, which are not
+Perl-compatible, are recognized only at the very start of a pattern, and that
+they must be in upper case. If more than one of them is present, the last one
+is used.
+.P
+The newline convention does not affect what the \eR escape sequence matches. By
+default, this is any Unicode newline sequence, for Perl compatibility. However,
+this can be changed; see the description of \eR in the section entitled
+.\" HTML 
+.\" 
+"Newline sequences"
+.\"
+below. A change of \eR setting can be combined with a change of newline
+convention.
+.
+.
+.SH "CHARACTERS AND METACHARACTERS"
+.rs
+.sp
 A regular expression is a pattern that is matched against a subject string from
 left to right. Most characters stand for themselves in a pattern, and match the
 corresponding characters in the subject. As a trivial example, the pattern
@@ -60,8 +131,8 @@
 .P
 There are two different sets of metacharacters: those that are recognized
 anywhere in the pattern except within square brackets, and those that are
-recognized in square brackets. Outside square brackets, the metacharacters are
-as follows:
+recognized within square brackets. Outside square brackets, the metacharacters
+are as follows:
 .sp
   \e      general escape character with several uses
   ^      assert start of string (or line, in multiline mode)
@@ -92,6 +163,7 @@
 .sp
 The following sections describe the use of each of the metacharacters.
 .
+.
 .SH BACKSLASH
 .rs
 .sp
@@ -142,7 +214,7 @@
   \ecx       "control-x", where x is any character
   \ee        escape (hex 1B)
   \ef        formfeed (hex 0C)
-  \en        newline (hex 0A)
+  \en        linefeed (hex 0A)
   \er        carriage return (hex 0D)
   \et        tab (hex 09)
   \eddd      character with octal code ddd, or backreference
@@ -157,11 +229,14 @@
 After \ex, from zero to two hexadecimal digits are read (letters can be in
 upper or lower case). Any number of hexadecimal digits may appear between \ex{
 and }, but the value of the character code must be less than 256 in non-UTF-8
-mode, and less than 2**31 in UTF-8 mode (that is, the maximum hexadecimal value
-is 7FFFFFFF). If characters other than hexadecimal digits appear between \ex{
-and }, or if there is no terminating }, this form of escape is not recognized.
-Instead, the initial \ex will be interpreted as a basic hexadecimal escape,
-with no following digits, giving a character whose value is zero.
+mode, and less than 2**31 in UTF-8 mode. That is, the maximum value in
+hexadecimal is 7FFFFFFF. Note that this is bigger than the largest Unicode code
+point, which is 10FFFF.
+.P
+If characters other than hexadecimal digits appear between \ex{ and }, or if
+there is no terminating }, this form of escape is not recognized. Instead, the
+initial \ex will be interpreted as a basic hexadecimal escape, with no
+following digits, giving a character whose value is zero.
 .P
 Characters whose value is less than 256 can be defined by either of the two
 syntaxes for \ex. There is no difference in the way they are handled. For
@@ -190,7 +265,7 @@
 .P
 Inside a character class, or if the decimal number is greater than 9 and there
 have not been that many capturing subpatterns, PCRE re-reads up to three octal
-digits following the backslash, ane uses them to generate a data character. Any
+digits following the backslash, and uses them to generate a data character. Any
 subsequent digits stand for themselves. In non-UTF-8 mode, the value of a
 character specified in octal must be less than \e400. In UTF-8 mode, values up
 to \e777 are permitted. For example:
@@ -221,24 +296,60 @@
 All the sequences that define a single character value can be used both inside
 and outside character classes. In addition, inside a character class, the
 sequence \eb is interpreted as the backspace character (hex 08), and the
-sequence \eX is interpreted as the character "X". Outside a character class,
-these sequences have different meanings
+sequences \eR and \eX are interpreted as the characters "R" and "X",
+respectively. Outside a character class, these sequences have different
+meanings
 .\" HTML 
 .\" 
 (see below).
 .\"
 .
 .
+.SS "Absolute and relative back references"
+.rs
+.sp
+The sequence \eg followed by an unsigned or a negative number, optionally
+enclosed in braces, is an absolute or relative back reference. A named back
+reference can be coded as \eg{name}. Back references are discussed
+.\" HTML 
+.\" 
+later,
+.\"
+following the discussion of
+.\" HTML 
+.\" 
+parenthesized subpatterns.
+.\"
+.
+.
+.SS "Absolute and relative subroutine calls"
+.rs
+.sp
+For compatibility with Oniguruma, the non-Perl syntax \eg followed by a name or
+a number enclosed either in angle brackets or single quotes, is an alternative
+syntax for referencing a subpattern as a "subroutine". Details are discussed
+.\" HTML 
+.\" 
+later.
+.\"
+Note that \eg{...} (Perl syntax) and \eg<...> (Oniguruma syntax) are \fInot\fP
+synonymous. The former is a back reference; the latter is a subroutine call.
+.
+.
 .SS "Generic character types"
 .rs
 .sp
-The third use of backslash is for specifying generic character types. The
+Another use of backslash is for specifying generic character types. The
 following are always recognized:
 .sp
   \ed     any decimal digit
   \eD     any character that is not a decimal digit
+  \eh     any horizontal whitespace character
+  \eH     any character that is not a horizontal whitespace character
   \es     any whitespace character
   \eS     any character that is not a whitespace character
+  \ev     any vertical whitespace character
+  \eV     any character that is not a vertical whitespace character
   \ew     any "word" character
   \eW     any "non-word" character
 .sp
@@ -252,9 +363,50 @@
 .P
 For compatibility with Perl, \es does not match the VT character (code 11).
 This makes it different from the the POSIX "space" class. The \es characters
-are HT (9), LF (10), FF (12), CR (13), and space (32). (If "use locale;" is
+are HT (9), LF (10), FF (12), CR (13), and space (32). If "use locale;" is
 included in a Perl script, \es may match the VT character. In PCRE, it never
-does.)
+does.
+.P
+In UTF-8 mode, characters with values greater than 128 never match \ed, \es, or
+\ew, and always match \eD, \eS, and \eW. This is true even when Unicode
+character property support is available. These sequences retain their original
+meanings from before UTF-8 support was available, mainly for efficiency
+reasons. Note that this also affects \eb, because it is defined in terms of \ew
+and \eW.
+.P
+The sequences \eh, \eH, \ev, and \eV are Perl 5.10 features. In contrast to the
+other sequences, these do match certain high-valued codepoints in UTF-8 mode.
+The horizontal space characters are:
+.sp
+  U+0009     Horizontal tab
+  U+0020     Space
+  U+00A0     Non-break space
+  U+1680     Ogham space mark
+  U+180E     Mongolian vowel separator
+  U+2000     En quad
+  U+2001     Em quad
+  U+2002     En space
+  U+2003     Em space
+  U+2004     Three-per-em space
+  U+2005     Four-per-em space
+  U+2006     Six-per-em space
+  U+2007     Figure space
+  U+2008     Punctuation space
+  U+2009     Thin space
+  U+200A     Hair space
+  U+202F     Narrow no-break space
+  U+205F     Medium mathematical space
+  U+3000     Ideographic space
+.sp
+The vertical space characters are:
+.sp
+  U+000A     Linefeed
+  U+000B     Vertical tab
+  U+000C     Formfeed
+  U+000D     Carriage return
+  U+0085     Next line
+  U+2028     Line separator
+  U+2029     Paragraph separator
 .P
 A "word" character is an underscore or any character less than 256 that is a
 letter or digit. The definition of letters and digits is controlled by PCRE's
@@ -268,13 +420,59 @@
 .\" HREF
 \fBpcreapi\fP
 .\"
-page). For example, in the "fr_FR" (French) locale, some character codes
-greater than 128 are used for accented letters, and these are matched by \ew.
-.P
-In UTF-8 mode, characters with values greater than 128 never match \ed, \es, or
-\ew, and always match \eD, \eS, and \eW. This is true even when Unicode
-character property support is available. The use of locales with Unicode is
-discouraged.
+page). For example, in a French locale such as "fr_FR" in Unix-like systems,
+or "french" in Windows, some character codes greater than 128 are used for
+accented letters, and these are matched by \ew. The use of locales with Unicode
+is discouraged.
+.
+.
+.\" HTML 
+.SS "Newline sequences"
+.rs
+.sp
+Outside a character class, by default, the escape sequence \eR matches any
+Unicode newline sequence. This is a Perl 5.10 feature. In non-UTF-8 mode \eR is
+equivalent to the following:
+.sp
+  (?>\er\en|\en|\ex0b|\ef|\er|\ex85)
+.sp
+This is an example of an "atomic group", details of which are given
+.\" HTML 
+.\" 
+below.
+.\"
+This particular group matches either the two-character sequence CR followed by
+LF, or one of the single characters LF (linefeed, U+000A), VT (vertical tab,
+U+000B), FF (formfeed, U+000C), CR (carriage return, U+000D), or NEL (next
+line, U+0085). The two-character sequence is treated as a single unit that
+cannot be split.
+.P
+In UTF-8 mode, two additional characters whose codepoints are greater than 255
+are added: LS (line separator, U+2028) and PS (paragraph separator, U+2029).
+Unicode character property support is not needed for these characters to be
+recognized.
+.P
+It is possible to restrict \eR to match only CR, LF, or CRLF (instead of the
+complete set of Unicode line endings) by setting the option PCRE_BSR_ANYCRLF
+either at compile time or when the pattern is matched. (BSR is an abbrevation
+for "backslash R".) This can be made the default when PCRE is built; if this is
+the case, the other behaviour can be requested via the PCRE_BSR_UNICODE option.
+It is also possible to specify these settings by starting a pattern string with
+one of the following sequences:
+.sp
+  (*BSR_ANYCRLF)   CR, LF, or CRLF only
+  (*BSR_UNICODE)   any Unicode newline sequence
+.sp
+These override the default and the options given to \fBpcre_compile()\fP, but
+they can be overridden by options given to \fBpcre_exec()\fP. Note that these
+special settings, which are not Perl-compatible, are recognized only at the
+very start of a pattern, and that they must be in upper case. If more than one
+of them is present, the last one is used. They can be combined with a change of
+newline convention, for example, a pattern can start with:
+.sp
+  (*ANY)(*BSR_ANYCRLF)
+.sp
+Inside a character class, \eR matches the letter "R".
 .
 .
 .\" HTML 
@@ -282,8 +480,10 @@
 .rs
 .sp
 When PCRE is built with Unicode character property support, three additional
-escape sequences to match character properties are available when UTF-8 mode
-is selected. They are:
+escape sequences that match characters with specific properties are available.
+When not in UTF-8 mode, these sequences are of course limited to testing
+characters whose codepoints are less than 256, but they do work in this mode.
+The extra escape sequences are:
 .sp
   \ep{\fIxx\fP}   a character with the \fIxx\fP property
   \eP{\fIxx\fP}   a character without the \fIxx\fP property
@@ -307,6 +507,7 @@
 .P
 Arabic,
 Armenian,
+Balinese,
 Bengali,
 Bopomofo,
 Braille,
@@ -316,6 +517,7 @@
 Cherokee,
 Common,
 Coptic,
+Cuneiform,
 Cypriot,
 Cyrillic,
 Deseret,
@@ -345,11 +547,14 @@
 Mongolian,
 Myanmar,
 New_Tai_Lue,
+Nko,
 Ogham,
 Old_Italic,
 Old_Persian,
 Oriya,
 Osmanya,
+Phags_Pa,
+Phoenician,
 Runic,
 Shavian,
 Sinhala,
@@ -430,6 +635,15 @@
 the Lu, Ll, or Lt property, in other words, a letter that is not classified as
 a modifier or "other".
 .P
+The Cs (Surrogate) property applies only to characters in the range U+D800 to
+U+DFFF. Such characters are not valid in UTF-8 strings (see RFC 3629) and so
+cannot be tested by PCRE, unless UTF-8 validity checking has been turned off
+(see the discussion of PCRE_NO_UTF8_CHECK in the
+.\" HREF
+\fBpcreapi\fP
+.\"
+page).
+.P
 The long synonyms for these properties that Perl supports (such as \ep{Letter})
 are not supported by PCRE, nor is it permitted to prefix any of these
 properties with "Is".
@@ -454,7 +668,8 @@
 (see below).
 .\"
 Characters with the "mark" property are typically accents that affect the
-preceding character.
+preceding character. None of them have codepoints less than 256, so in
+non-UTF-8 mode \eX matches any one character.
 .P
 Matching characters by Unicode property is not fast, because PCRE has to search
 a structure that contains data for over fifteen thousand characters. That is
@@ -462,11 +677,41 @@
 properties in PCRE.
 .
 .
+.\" HTML 
+.SS "Resetting the match start"
+.rs
+.sp
+The escape sequence \eK, which is a Perl 5.10 feature, causes any previously
+matched characters not to be included in the final matched sequence. For
+example, the pattern:
+.sp
+  foo\eKbar
+.sp
+matches "foobar", but reports that it has matched "bar". This feature is
+similar to a lookbehind assertion
+.\" HTML 
+.\" 
+(described below).
+.\"
+However, in this case, the part of the subject before the real match does not
+have to be of fixed length, as lookbehind assertions do. The use of \eK does
+not interfere with the setting of
+.\" HTML 
+.\" 
+captured substrings.
+.\"
+For example, when the pattern
+.sp
+  (foo)\eKbar
+.sp
+matches "foobar", the first substring is still set to "foo".
+.
+.
 .\" HTML 
 .SS "Simple assertions"
 .rs
 .sp
-The fourth use of backslash is for certain simple assertions. An assertion
+The final use of backslash is for certain simple assertions. An assertion
 specifies a condition that has to be met at a particular point in a match,
 without consuming any characters from the subject string. The use of
 subpatterns for more complicated assertions is described
@@ -478,10 +723,11 @@
 .sp
   \eb     matches at a word boundary
   \eB     matches when not at a word boundary
-  \eA     matches at start of subject
-  \eZ     matches at end of subject or before newline at end
-  \ez     matches at end of subject
-  \eG     matches at first matching position in subject
+  \eA     matches at the start of the subject
+  \eZ     matches at the end of the subject
+          also matches before a newline at the end of the subject
+  \ez     matches only at the end of the subject
+  \eG     matches at the first matching position in the subject
 .sp
 These assertions may not appear in character classes (but note that \eb has a
 different meaning, namely the backspace character, inside a character class).
@@ -578,15 +824,19 @@
 .sp
 Outside a character class, a dot in the pattern matches any one character in
 the subject string except (by default) a character that signifies the end of a
-line. In UTF-8 mode, the matched character may be more than one byte long. When
-a line ending is defined as a single character (CR or LF), dot never matches
-that character; when the two-character sequence CRLF is used, dot does not
-match CR if it is immediately followed by LF, but otherwise it matches all
-characters (including isolated CRs and LFs).
+line. In UTF-8 mode, the matched character may be more than one byte long.
+.P
+When a line ending is defined as a single character, dot never matches that
+character; when the two-character sequence CRLF is used, dot does not match CR
+if it is immediately followed by LF, but otherwise it matches all characters
+(including isolated CRs and LFs). When any Unicode line endings are being
+recognized, dot does not match CR or LF or any of the other line ending
+characters.
 .P
 The behaviour of dot with regard to newlines can be changed. If the PCRE_DOTALL
-option is set, a dot matches any one character, without exception. If newline
-is defined as the two-character sequence CRLF, it takes two dots to match it.
+option is set, a dot matches any one character, without exception. If the
+two-character sequence CRLF is present in the subject string, it takes two dots
+to match it.
 .P
 The handling of dot is entirely independent of the handling of circumflex and
 dollar, the only relationship being that they both involve newlines. Dot has no
@@ -597,11 +847,11 @@
 .rs
 .sp
 Outside a character class, the escape sequence \eC matches any one byte, both
-in and out of UTF-8 mode. Unlike a dot, it always matches CR and LF. The
-feature is provided in Perl in order to match individual bytes in UTF-8 mode.
-Because it breaks up UTF-8 characters into individual bytes, what remains in
-the string may be a malformed UTF-8 string. For this reason, the \eC escape
-sequence is best avoided.
+in and out of UTF-8 mode. Unlike a dot, it always matches any line-ending
+characters. The feature is provided in Perl in order to match individual bytes
+in UTF-8 mode. Because it breaks up UTF-8 characters into individual bytes,
+what remains in the string may be a malformed UTF-8 string. For this reason,
+the \eC escape sequence is best avoided.
 .P
 PCRE does not allow \eC to appear in lookbehind assertions
 .\" HTML 
@@ -652,10 +902,10 @@
 ensure that PCRE is compiled with Unicode property support as well as with
 UTF-8 support.
 .P
-Characters that might indicate line breaks (CR and LF) are never treated in any
-special way when matching character classes, whatever line-ending sequence is
-in use, and whatever setting of the PCRE_DOTALL and PCRE_MULTILINE options is
-used. A class such as [^a] always matches one of these characters.
+Characters that might indicate line breaks are never treated in any special way
+when matching character classes, whatever line-ending sequence is in use, and
+whatever setting of the PCRE_DOTALL and PCRE_MULTILINE options is used. A class
+such as [^a] always matches one of these characters.
 .P
 The minus (hyphen) character can be used to specify a range of characters in a
 character class. For example, [d-m] matches any letter between d and m,
@@ -679,7 +929,7 @@
 If a range that includes letters is used when caseless matching is set, it
 matches the letters in either case. For example, [W-c] is equivalent to
 [][\e\e^_`wxyzabc], matched caselessly, and in non-UTF-8 mode, if character
-tables for the "fr_FR" locale are in use, [\exc8-\excb] matches accented E
+tables for a French locale are in use, [\exc8-\excb] matches accented E
 characters in both cases. In UTF-8 mode, PCRE supports the concept of case for
 characters with values greater than 128 only when it is compiled with Unicode
 property support.
@@ -769,8 +1019,9 @@
 .rs
 .sp
 The settings of the PCRE_CASELESS, PCRE_MULTILINE, PCRE_DOTALL, and
-PCRE_EXTENDED options can be changed from within the pattern by a sequence of
-Perl option letters enclosed between "(?" and ")". The option letters are
+PCRE_EXTENDED options (which are Perl-compatible) can be changed from within
+the pattern by a sequence of Perl option letters enclosed between "(?" and ")".
+The option letters are
 .sp
   i  for PCRE_CASELESS
   m  for PCRE_MULTILINE
@@ -784,14 +1035,18 @@
 permitted. If a letter appears both before and after the hyphen, the option is
 unset.
 .P
-When an option change occurs at top level (that is, not inside subpattern
-parentheses), the change applies to the remainder of the pattern that follows.
-If the change is placed right at the start of a pattern, PCRE extracts it into
-the global options (and it will therefore show up in data extracted by the
-\fBpcre_fullinfo()\fP function).
+The PCRE-specific options PCRE_DUPNAMES, PCRE_UNGREEDY, and PCRE_EXTRA can be
+changed in the same way as the Perl-compatible options by using the characters
+J, U and X respectively.
+.P
+When one of these option changes occurs at top level (that is, not inside
+subpattern parentheses), the change applies to the remainder of the pattern
+that follows. If the change is placed right at the start of a pattern, PCRE
+extracts it into the global options (and it will therefore show up in data
+extracted by the \fBpcre_fullinfo()\fP function).
 .P
-An option change within a subpattern affects only that part of the current
-pattern that follows it, so
+An option change within a subpattern (see below for a description of
+subpatterns) affects only that part of the current pattern that follows it, so
 .sp
   (a(?i)b)c
 .sp
@@ -807,9 +1062,17 @@
 option settings happen at compile time. There would be some very weird
 behaviour otherwise.
 .P
-The PCRE-specific options PCRE_DUPNAMES, PCRE_UNGREEDY, and PCRE_EXTRA can be
-changed in the same way as the Perl-compatible options by using the characters
-J, U and X respectively.
+\fBNote:\fP There are other PCRE-specific options that can be set by the
+application when the compile or match functions are called. In some cases the
+pattern can contain special leading sequences such as (*CRLF) to override what
+the application has set or what has been defaulted. Details are given in the
+section entitled
+.\" HTML 
+.\" 
+"Newline sequences"
+.\"
+above. There is also the (*UTF8) leading sequence that can be used to set UTF-8
+mode; this is equivalent to setting the PCRE_UTF8 option.
 .
 .
 .\" HTML 
@@ -824,7 +1087,7 @@
   cat(aract|erpillar|)
 .sp
 matches one of the words "cat", "cataract", or "caterpillar". Without the
-parentheses, it would match "cataract", "erpillar" or the empty string.
+parentheses, it would match "cataract", "erpillar" or an empty string.
 .sp
 2. It sets up the subpattern as a capturing subpattern. This means that, when
 the whole pattern matches, that portion of the subject string that matched the
@@ -849,8 +1112,7 @@
   the ((?:red|white) (king|queen))
 .sp
 the captured substrings are "white queen" and "queen", and are numbered 1 and
-2. The maximum number of capturing subpatterns is 65535, and the maximum depth
-of nesting of all subpatterns, both capturing and non-capturing, is 200.
+2. The maximum number of capturing subpatterns is 65535.
 .P
 As a convenient shorthand, if any option settings are required at the start of
 a non-capturing subpattern, the option letters may appear between the "?" and
@@ -865,14 +1127,51 @@
 the above patterns match "SUNDAY" as well as "Saturday".
 .
 .
+.SH "DUPLICATE SUBPATTERN NUMBERS"
+.rs
+.sp
+Perl 5.10 introduced a feature whereby each alternative in a subpattern uses
+the same numbers for its capturing parentheses. Such a subpattern starts with
+(?| and is itself a non-capturing subpattern. For example, consider this
+pattern:
+.sp
+  (?|(Sat)ur|(Sun))day
+.sp
+Because the two alternatives are inside a (?| group, both sets of capturing
+parentheses are numbered one. Thus, when the pattern matches, you can look
+at captured substring number one, whichever alternative matched. This construct
+is useful when you want to capture part, but not all, of one of a number of
+alternatives. Inside a (?| group, parentheses are numbered as usual, but the
+number is reset at the start of each branch. The numbers of any capturing
+buffers that follow the subpattern start after the highest number used in any
+branch. The following example is taken from the Perl documentation.
+The numbers underneath show in which buffer the captured content will be
+stored.
+.sp
+  # before  ---------------branch-reset----------- after
+  / ( a )  (?| x ( y ) z | (p (q) r) | (t) u (v) ) ( z ) /x
+  # 1            2         2  3        2     3     4
+.sp
+A backreference or a recursive call to a numbered subpattern always refers to
+the first one in the pattern with the given number.
+.P
+An alternative approach to using this "branch reset" feature is to use
+duplicate named subpatterns, as described in the next section.
+.
+.
 .SH "NAMED SUBPATTERNS"
 .rs
 .sp
 Identifying capturing parentheses by number is simple, but it can be very hard
 to keep track of the numbers in complicated regular expressions. Furthermore,
 if an expression is modified, the numbers may change. To help with this
-difficulty, PCRE supports the naming of subpatterns, something that Perl does
-not provide. The Python syntax (?P...) is used. References to capturing
+difficulty, PCRE supports the naming of subpatterns. This feature was not
+added to Perl until release 5.10. Python had the feature earlier, and PCRE
+introduced it at release 4.0, using the Python syntax. PCRE now supports both
+the Perl and the Python syntax.
+.P
+In PCRE, a subpattern can be named in one of three ways: (?...) or
+(?'name'...) as in Perl, or (?P...) as in Python. References to capturing
 parentheses from other parts of the pattern, such as
 .\" HTML 
 .\" 
@@ -890,10 +1189,10 @@
 can be made by name as well as by number.
 .P
 Names consist of up to 32 alphanumeric characters and underscores. Named
-capturing parentheses are still allocated numbers as well as names. The PCRE
-API provides function calls for extracting the name-to-number translation table
-from a compiled pattern. There is also a convenience function for extracting a
-captured substring by name.
+capturing parentheses are still allocated numbers as well as names, exactly as
+if the names were not present. The PCRE API provides function calls for
+extracting the name-to-number translation table from a compiled pattern. There
+is also a convenience function for extracting a captured substring by name.
 .P
 By default, a name must be unique within a pattern, but it is possible to relax
 this constraint by setting the PCRE_DUPNAMES option at compile time. This can
@@ -902,15 +1201,18 @@
 abbreviation or as the full name, and in both cases you want to extract the
 abbreviation. This pattern (ignoring the line breaks) does the job:
 .sp
-  (?PMon|Fri|Sun)(?:day)?|
-  (?PTue)(?:sday)?|
-  (?PWed)(?:nesday)?|
-  (?PThu)(?:rsday)?|
-  (?PSat)(?:urday)?
+  (?Mon|Fri|Sun)(?:day)?|
+  (?Tue)(?:sday)?|
+  (?Wed)(?:nesday)?|
+  (?Thu)(?:rsday)?|
+  (?Sat)(?:urday)?
 .sp
 There are five capturing substrings, but only one is ever set after a match.
+(An alternative way of solving this problem is to use a "branch reset"
+subpattern, as described in the previous section.)
+.P
 The convenience function for extracting the data by name returns the substring
-for the first, and in this example, the only, subpattern of that name that
+for the first (and in this example, the only) subpattern of that name that
 matched. This saves searching to find which numbered subpattern it was. If you
 make a reference to a non-unique named subpattern from elsewhere in the
 pattern, the one that corresponds to the lowest number is used. For further
@@ -919,6 +1221,10 @@
 \fBpcreapi\fP
 .\"
 documentation.
+.P
+\fBWarning:\fP You cannot use different names to distinguish between two
+subpatterns with the same number (see the previous section) because PCRE uses
+only the numbers when matching.
 .
 .
 .SH REPETITION
@@ -928,9 +1234,10 @@
 items:
 .sp
   a literal data character
-  the . metacharacter
+  the dot metacharacter
   the \eC escape sequence
   the \eX escape sequence (in UTF-8 mode with Unicode properties)
+  the \eR escape sequence
   an escape such as \ed that matches a single character
   a character class
   a back reference (see next section)
@@ -966,10 +1273,17 @@
 which may be several bytes long (and they may be of different lengths).
 .P
 The quantifier {0} is permitted, causing the expression to behave as if the
-previous item and the quantifier were not present.
+previous item and the quantifier were not present. This may be useful for
+subpatterns that are referenced as
+.\" HTML 
+.\" 
+subroutines
+.\"
+from elsewhere in the pattern. Items other than subpatterns that have a {0}
+quantifier are omitted from the compiled pattern.
 .P
-For convenience (and historical compatibility) the three most common
-quantifiers have single-character abbreviations:
+For convenience, the three most common quantifiers have single-character
+abbreviations:
 .sp
   *    is equivalent to {0,}
   +    is equivalent to {1,}
@@ -1017,7 +1331,7 @@
 which matches one digit by preference, but can match two if that is the only
 way the rest of the pattern matches.
 .P
-If the PCRE_UNGREEDY option is set (an option which is not available in Perl),
+If the PCRE_UNGREEDY option is set (an option that is not available in Perl),
 the quantifiers are not greedy by default, but individual ones can be made
 greedy by following them with a question mark. In other words, it inverts the
 default behaviour.
@@ -1027,7 +1341,7 @@
 compiled pattern, in proportion to the size of the minimum or maximum.
 .P
 If a pattern starts with .* or .{0,} and the PCRE_DOTALL option (equivalent
-to Perl's /s) is set, thus allowing the . to match newlines, the pattern is
+to Perl's /s) is set, thus allowing the dot to match newlines, the pattern is
 implicitly anchored, because whatever follows will be tried against every
 character position in the subject string, so there is no point in retrying the
 overall match at any position after the first. PCRE normally treats such a
@@ -1039,8 +1353,8 @@
 .P
 However, there is one situation where the optimization cannot be used. When .*
 is inside capturing parentheses that are the subject of a backreference
-elsewhere in the pattern, a match at the start may fail, and a later one
-succeed. Consider, for example:
+elsewhere in the pattern, a match at the start may fail where a later one
+succeeds. Consider, for example:
 .sp
   (.*)abc\e1
 .sp
@@ -1066,12 +1380,12 @@
 .SH "ATOMIC GROUPING AND POSSESSIVE QUANTIFIERS"
 .rs
 .sp
-With both maximizing and minimizing repetition, failure of what follows
-normally causes the repeated item to be re-evaluated to see if a different
-number of repeats allows the rest of the pattern to match. Sometimes it is
-useful to prevent this, either to change the nature of the match, or to cause
-it fail earlier than it otherwise might, when the author of the pattern knows
-there is no point in carrying on.
+With both maximizing ("greedy") and minimizing ("ungreedy" or "lazy")
+repetition, failure of what follows normally causes the repeated item to be
+re-evaluated to see if a different number of repeats allows the rest of the
+pattern to match. Sometimes it is useful to prevent this, either to change the
+nature of the match, or to cause it fail earlier than it otherwise might, when
+the author of the pattern knows there is no point in carrying on.
 .P
 Consider, for example, the pattern \ed+foo when applied to the subject line
 .sp
@@ -1083,7 +1397,7 @@
 (a term taken from Jeffrey Friedl's book) provides the means for specifying
 that once a subpattern has matched, it is not to be re-evaluated in this way.
 .P
-If we use atomic grouping for the previous example, the matcher would give up
+If we use atomic grouping for the previous example, the matcher gives up
 immediately on failing to match "foo" the first time. The notation is a kind of
 special parenthesis, starting with (?> as in this example:
 .sp
@@ -1113,15 +1427,26 @@
 .sp
   \ed++foo
 .sp
+Note that a possessive quantifier can be used with an entire group, for
+example:
+.sp
+  (abc|xyz){2,3}+
+.sp
 Possessive quantifiers are always greedy; the setting of the PCRE_UNGREEDY
 option is ignored. They are a convenient notation for the simpler forms of
-atomic group. However, there is no difference in the meaning or processing of a
-possessive quantifier and the equivalent atomic group.
-.P
-The possessive quantifier syntax is an extension to the Perl syntax. Jeffrey
-Friedl originated the idea (and the name) in the first edition of his book.
-Mike McCloskey liked it, so implemented it when he built Sun's Java package,
-and PCRE copied it from there.
+atomic group. However, there is no difference in the meaning of a possessive
+quantifier and the equivalent atomic group, though there may be a performance
+difference; possessive quantifiers should be slightly faster.
+.P
+The possessive quantifier syntax is an extension to the Perl 5.8 syntax.
+Jeffrey Friedl originated the idea (and the name) in the first edition of his
+book. Mike McCloskey liked it, so implemented it when he built Sun's Java
+package, and PCRE copied it from there. It ultimately found its way into Perl
+at release 5.10.
+.P
+PCRE has an optimization that automatically "possessifies" certain simple
+pattern constructs. For example, the sequence A+B is treated as A++B because
+there is no point in backtracking into a sequence of A's when B must follow.
 .P
 When a pattern contains an unlimited repeat inside a subpattern that can itself
 be repeated an unlimited number of times, the use of an atomic group is the
@@ -1167,15 +1492,39 @@
 when a repetition is involved and the subpattern to the right has participated
 in an earlier iteration.
 .P
-It is not possible to have a numerical "forward back reference" to subpattern
-whose number is 10 or more. However, a back reference to any subpattern is
-possible using named parentheses (see below). See also the subsection entitled
+It is not possible to have a numerical "forward back reference" to a subpattern
+whose number is 10 or more using this syntax because a sequence such as \e50 is
+interpreted as a character defined in octal. See the subsection entitled
 "Non-printing characters"
 .\" HTML 
 .\" 
 above
 .\"
-for further details of the handling of digits following a backslash.
+for further details of the handling of digits following a backslash. There is
+no such problem when named parentheses are used. A back reference to any
+subpattern is possible using named parentheses (see below).
+.P
+Another way of avoiding the ambiguity inherent in the use of digits following a
+backslash is to use the \eg escape sequence, which is a feature introduced in
+Perl 5.10. This escape must be followed by an unsigned number or a negative
+number, optionally enclosed in braces. These examples are all identical:
+.sp
+  (ring), \e1
+  (ring), \eg1
+  (ring), \eg{1}
+.sp
+An unsigned number specifies an absolute reference without the ambiguity that
+is present in the older syntax. It is also useful when literal digits follow
+the reference. A negative number is a relative reference. Consider this
+example:
+.sp
+  (abc(def)ghi)\eg{-1}
+.sp
+The sequence \eg{-1} is a reference to the most recently started capturing
+subpattern before \eg, that is, is it equivalent to \e2. Similarly, \eg{-2}
+would be equivalent to \e1. The use of relative references can be helpful in
+long patterns, and also in patterns that are created by joining together
+fragments that contain references within themselves.
 .P
 A back reference matches whatever actually matched the capturing subpattern in
 the current subject string, rather than anything matching the subpattern
@@ -1197,10 +1546,17 @@
 matches "rah rah" and "RAH RAH", but not "RAH rah", even though the original
 capturing subpattern is matched caselessly.
 .P
-Back references to named subpatterns use the Python syntax (?P=name). We could
-rewrite the above example as follows:
+There are several different ways of writing back references to named
+subpatterns. The .NET syntax \ek{name} and the Perl syntax \ek or
+\ek'name' are supported, as is the Python syntax (?P=name). Perl 5.10's unified
+back reference syntax, in which \eg can be used for both numeric and named
+references, is also supported. We could rewrite the above example in any of
+the following ways:
 .sp
+  (?(?i)rah)\es+\ek
+  (?'p1'(?i)rah)\es+\ek{p1}
   (?P(?i)rah)\es+(?P=p1)
+  (?(?i)rah)\es+\eg{p1}
 .sp
 A subpattern that is referenced by name may appear in the pattern before or
 after the reference.
@@ -1323,19 +1679,27 @@
 .sp
   (?<=abc|abde)
 .sp
+In some cases, the Perl 5.10 escape sequence \eK
+.\" HTML 
+.\" 
+(see above)
+.\"
+can be used instead of a lookbehind assertion; this is not restricted to a
+fixed-length.
+.P
 The implementation of lookbehind assertions is, for each alternative, to
-temporarily move the current position back by the fixed width and then try to
+temporarily move the current position back by the fixed length and then try to
 match. If there are insufficient characters before the current position, the
-match is deemed to fail.
+assertion fails.
 .P
 PCRE does not allow the \eC escape (which matches a single byte in UTF-8 mode)
 to appear in lookbehind assertions, because it makes it impossible to calculate
-the length of the lookbehind. The \eX escape, which can match different numbers
-of bytes, is also not permitted.
+the length of the lookbehind. The \eX and \eR escapes, which can match
+different numbers of bytes, are also not permitted.
 .P
-Atomic groups can be used in conjunction with lookbehind assertions to specify
-efficient matching at the end of the subject string. Consider a simple pattern
-such as
+Possessive quantifiers can be used in conjunction with lookbehind assertions to
+specify efficient matching at the end of the subject string. Consider a simple
+pattern such as
 .sp
   abcd$
 .sp
@@ -1351,13 +1715,9 @@
 covers the entire string, from right to left, so we are no better off. However,
 if the pattern is written as
 .sp
-  ^(?>.*)(?<=abcd)
-.sp
-or, equivalently, using the possessive quantifier syntax,
-.sp
   ^.*+(?<=abcd)
 .sp
-there can be no backtracking for the .* item; it can match only the entire
+there can be no backtracking for the .*+ item; it can match only the entire
 string. The subsequent lookbehind assertion does a single test on the last four
 characters. If it fails, the match fails immediately. For long strings, this
 approach makes a significant difference to the processing time.
@@ -1413,15 +1773,19 @@
 no-pattern (if present) is used. If there are more than two alternatives in the
 subpattern, a compile-time error occurs.
 .P
-There are three kinds of condition. If the text between the parentheses
-consists of a sequence of digits, or a sequence of alphanumeric characters and
-underscores, the condition is satisfied if the capturing subpattern of that
-number or name has previously matched. There is a possible ambiguity here,
-because subpattern names may consist entirely of digits. PCRE looks first for a
-named subpattern; if it cannot find one and the text consists entirely of
-digits, it looks for a subpattern of that number, which must be greater than
-zero. Using subpattern names that consist entirely of digits is not
-recommended.
+There are four kinds of condition: references to subpatterns, references to
+recursion, a pseudo-condition called DEFINE, and assertions.
+.
+.SS "Checking for a used subpattern by number"
+.rs
+.sp
+If the text between the parentheses consists of a sequence of digits, the
+condition is true if the capturing subpattern of that number has previously
+matched. An alternative notation is to precede the digits with a plus or minus
+sign. In this case, the subpattern number is relative rather than absolute.
+The most recently opened parentheses can be referenced by (?(-1), the next most
+recent by (?(-2), and so on. In looping constructs it can also make sense to
+refer to subsequent groups with constructs such as (?(+2).
 .P
 Consider the following pattern, which contains non-significant white space to
 make it more readable (assume the PCRE_EXTENDED option) and to divide it into
@@ -1437,17 +1801,76 @@
 the condition is true, and so the yes-pattern is executed and a closing
 parenthesis is required. Otherwise, since no-pattern is not present, the
 subpattern matches nothing. In other words, this pattern matches a sequence of
-non-parentheses, optionally enclosed in parentheses. Rewriting it to use a
-named subpattern gives this:
+non-parentheses, optionally enclosed in parentheses.
+.P
+If you were embedding this pattern in a larger one, you could use a relative
+reference:
+.sp
+  ...other stuff... ( \e( )?    [^()]+    (?(-1) \e) ) ...
+.sp
+This makes the fragment independent of the parentheses in the larger pattern.
+.
+.SS "Checking for a used subpattern by name"
+.rs
+.sp
+Perl uses the syntax (?()...) or (?('name')...) to test for a used
+subpattern by name. For compatibility with earlier versions of PCRE, which had
+this facility before Perl, the syntax (?(name)...) is also recognized. However,
+there is a possible ambiguity with this syntax, because subpattern names may
+consist entirely of digits. PCRE looks first for a named subpattern; if it
+cannot find one and the name consists entirely of digits, PCRE looks for a
+subpattern of that number, which must be greater than zero. Using subpattern
+names that consist entirely of digits is not recommended.
+.P
+Rewriting the above example to use a named subpattern gives this:
 .sp
-  (?P \e( )?    [^()]+    (?(OPEN) \e) )
+  (? \e( )?    [^()]+    (?() \e) )
+.sp
+.
+.SS "Checking for pattern recursion"
+.rs
 .sp
 If the condition is the string (R), and there is no subpattern with the name R,
-the condition is satisfied if a recursive call to the pattern or subpattern has
-been made. At "top level", the condition is false. This is a PCRE extension.
-Recursive patterns are described in the next section.
+the condition is true if a recursive call to the whole pattern or any
+subpattern has been made. If digits or a name preceded by ampersand follow the
+letter R, for example:
+.sp
+  (?(R3)...) or (?(R&name)...)
+.sp
+the condition is true if the most recent recursion is into the subpattern whose
+number or name is given. This condition does not check the entire recursion
+stack.
+.P
+At "top level", all these recursion test conditions are false. Recursive
+patterns are described below.
+.
+.SS "Defining subpatterns for use by reference only"
+.rs
+.sp
+If the condition is the string (DEFINE), and there is no subpattern with the
+name DEFINE, the condition is always false. In this case, there may be only one
+alternative in the subpattern. It is always skipped if control reaches this
+point in the pattern; the idea of DEFINE is that it can be used to define
+"subroutines" that can be referenced from elsewhere. (The use of "subroutines"
+is described below.) For example, a pattern to match an IPv4 address could be
+written like this (ignore whitespace and line breaks):
+.sp
+  (?(DEFINE) (? 2[0-4]\ed | 25[0-5] | 1\ed\ed | [1-9]?\ed) )
+  \eb (?&byte) (\e.(?&byte)){3} \eb
+.sp
+The first part of the pattern is a DEFINE group inside which a another group
+named "byte" is defined. This matches an individual component of an IPv4
+address (a number less than 256). When matching takes place, this part of the
+pattern is skipped because DEFINE acts like a false condition.
 .P
-If the condition is not a sequence of digits or (R), it must be an assertion.
+The rest of the pattern uses references to the named group to match the four
+dot-separated components of an IPv4 address, insisting on a word boundary at
+each end.
+.
+.SS "Assertion conditions"
+.rs
+.sp
+If the condition is not in any of the above formats, it must be an assertion.
 This may be a positive or negative lookahead or lookbehind assertion. Consider
 this pattern, again containing non-significant white space, and with the two
 alternatives on the second line:
@@ -1483,28 +1906,34 @@
 Consider the problem of matching a string in parentheses, allowing for
 unlimited nested parentheses. Without the use of recursion, the best that can
 be done is to use a pattern that matches up to some fixed depth of nesting. It
-is not possible to handle an arbitrary nesting depth. Perl provides a facility
-that allows regular expressions to recurse (amongst other things). It does this
-by interpolating Perl code in the expression at run time, and the code can
-refer to the expression itself. A Perl pattern to solve the parentheses problem
-can be created like this:
+is not possible to handle an arbitrary nesting depth.
+.P
+For some time, Perl has provided a facility that allows regular expressions to
+recurse (amongst other things). It does this by interpolating Perl code in the
+expression at run time, and the code can refer to the expression itself. A Perl
+pattern using code interpolation to solve the parentheses problem can be
+created like this:
 .sp
   $re = qr{\e( (?: (?>[^()]+) | (?p{$re}) )* \e)}x;
 .sp
 The (?p{...}) item interpolates Perl code at run time, and in this case refers
-recursively to the pattern in which it appears. Obviously, PCRE cannot support
-the interpolation of Perl code. Instead, it supports some special syntax for
-recursion of the entire pattern, and also for individual subpattern recursion.
-.P
-The special item that consists of (? followed by a number greater than zero and
-a closing parenthesis is a recursive call of the subpattern of the given
-number, provided that it occurs inside that subpattern. (If not, it is a
-"subroutine" call, which is described in the next section.) The special item
-(?R) is a recursive call of the entire regular expression.
-.P
-A recursive subpattern call is always treated as an atomic group. That is, once
-it has matched some of the subject string, it is never re-entered, even if
-it contains untried alternatives and there is a subsequent matching failure.
+recursively to the pattern in which it appears.
+.P
+Obviously, PCRE cannot support the interpolation of Perl code. Instead, it
+supports special syntax for recursion of the entire pattern, and also for
+individual subpattern recursion. After its introduction in PCRE and Python,
+this kind of recursion was introduced into Perl at release 5.10.
+.P
+A special item that consists of (? followed by a number greater than zero and a
+closing parenthesis is a recursive call of the subpattern of the given number,
+provided that it occurs inside that subpattern. (If not, it is a "subroutine"
+call, which is described in the next section.) The special item (?R) or (?0) is
+a recursive call of the entire regular expression.
+.P
+In PCRE (like Python, but unlike Perl), a recursive subpattern call is always
+treated as an atomic group. That is, once it has matched some of the subject
+string, it is never re-entered, even if it contains untried alternatives and
+there is a subsequent matching failure.
 .P
 This PCRE pattern solves the nested parentheses problem (assume the
 PCRE_EXTENDED option is set so that white space is ignored):
@@ -1522,18 +1951,33 @@
   ( \e( ( (?>[^()]+) | (?1) )* \e) )
 .sp
 We have put the pattern into parentheses, and caused the recursion to refer to
-them instead of the whole pattern. In a larger pattern, keeping track of
-parenthesis numbers can be tricky. It may be more convenient to use named
-parentheses instead. For this, PCRE uses (?P>name), which is an extension to
-the Python syntax that PCRE uses for named parentheses (Perl does not provide
-named parentheses). We could rewrite the above example as follows:
-.sp
-  (?P \e( ( (?>[^()]+) | (?P>pn) )* \e) )
-.sp
-This particular example pattern contains nested unlimited repeats, and so the
-use of atomic grouping for matching strings of non-parentheses is important
-when applying the pattern to strings that do not match. For example, when this
-pattern is applied to
+them instead of the whole pattern.
+.P
+In a larger pattern, keeping track of parenthesis numbers can be tricky. This
+is made easier by the use of relative references. (A Perl 5.10 feature.)
+Instead of (?1) in the pattern above you can write (?-2) to refer to the second
+most recently opened parentheses preceding the recursion. In other words, a
+negative number counts capturing parentheses leftwards from the point at which
+it is encountered.
+.P
+It is also possible to refer to subsequently opened parentheses, by writing
+references such as (?+2). However, these cannot be recursive because the
+reference is not inside the parentheses that are referenced. They are always
+"subroutine" calls, as described in the next section.
+.P
+An alternative approach is to use named parentheses instead. The Perl syntax
+for this is (?&name); PCRE's earlier syntax (?P>name) is also supported. We
+could rewrite the above example as follows:
+.sp
+  (? \e( ( (?>[^()]+) | (?&pn) )* \e) )
+.sp
+If there is more than one subpattern with the same name, the earliest one is
+used.
+.P
+This particular example pattern that we have been looking at contains nested
+unlimited repeats, and so the use of atomic grouping for matching strings of
+non-parentheses is important when applying the pattern to strings that do not
+match. For example, when this pattern is applied to
 .sp
   (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()
 .sp
@@ -1545,7 +1989,7 @@
 At the end of a match, the values set for any capturing subpatterns are those
 from the outermost level of the recursion at which the subpattern value is set.
 If you want to obtain intermediate values, a callout function can be used (see
-the next section and the
+below and the
 .\" HREF
 \fBpcrecallout\fP
 .\"
@@ -1584,8 +2028,15 @@
 .sp
 If the syntax for a recursive subpattern reference (either by number or by
 name) is used outside the parentheses to which it refers, it operates like a
-subroutine in a programming language. An earlier example pointed out that the
-pattern
+subroutine in a programming language. The "called" subpattern may be defined
+before or after the reference. A numbered reference can be absolute or
+relative, as in these examples:
+.sp
+  (...(absolute)...)...(?2)...
+  (...(relative)...)...(?-1)...
+  (...(?+1)...(relative)...
+.sp
+An earlier example pointed out that the pattern
 .sp
   (sens|respons)e and \e1ibility
 .sp
@@ -1595,13 +2046,42 @@
   (sens|respons)e and (?1)ibility
 .sp
 is used, it does match "sense and responsibility" as well as the other two
-strings. Such references, if given numerically, must follow the subpattern to
-which they refer. However, named references can refer to later subpatterns.
+strings. Another example is given in the discussion of DEFINE above.
 .P
 Like recursive subpatterns, a "subroutine" call is always treated as an atomic
 group. That is, once it has matched some of the subject string, it is never
 re-entered, even if it contains untried alternatives and there is a subsequent
 matching failure.
+.P
+When a subpattern is used as a subroutine, processing options such as
+case-independence are fixed when the subpattern is defined. They cannot be
+changed for different calls. For example, consider this pattern:
+.sp
+  (abc)(?i:(?-1))
+.sp
+It matches "abcabc". It does not match "abcABC" because the change of
+processing option does not affect the called subpattern.
+.
+.
+.\" HTML 
+.SH "ONIGURUMA SUBROUTINE SYNTAX"
+.rs
+.sp
+For compatibility with Oniguruma, the non-Perl syntax \eg followed by a name or
+a number enclosed either in angle brackets or single quotes, is an alternative
+syntax for referencing a subpattern as a subroutine, possibly recursively. Here
+are two of the examples used above, rewritten using this syntax:
+.sp
+  (? \e( ( (?>[^()]+) | \eg )* \e) )
+  (sens|respons)e and \eg'1'ibility
+.sp
+PCRE supports an extension to Oniguruma: if a number is preceded by a
+plus or a minus sign it is taken as a relative reference. For example:
+.sp
+  (abc)(?i:\eg<-1>)
+.sp
+Note that \eg{...} (Perl syntax) and \eg<...> (Oniguruma syntax) are \fInot\fP
+synonymous. The former is a back reference; the latter is a subroutine call.
 .
 .
 .SH CALLOUTS
@@ -1622,7 +2102,7 @@
 can put a number less than 256 after the letter C. The default value is zero.
 For example, this pattern has two callout points:
 .sp
-  (?C1)\dabc(?C2)def
+  (?C1)abc(?C2)def
 .sp
 If the PCRE_AUTO_CALLOUT flag is passed to \fBpcre_compile()\fP, callouts are
 automatically installed before each item in the pattern. They are all numbered
@@ -1638,8 +2118,142 @@
 \fBpcrecallout\fP
 .\"
 documentation.
+.
+.
+.SH "BACKTRACKING CONTROL"
+.rs
+.sp
+Perl 5.10 introduced a number of "Special Backtracking Control Verbs", which
+are described in the Perl documentation as "experimental and subject to change
+or removal in a future version of Perl". It goes on to say: "Their usage in
+production code should be noted to avoid problems during upgrades." The same
+remarks apply to the PCRE features described in this section.
+.P
+Since these verbs are specifically related to backtracking, most of them can be
+used only when the pattern is to be matched using \fBpcre_exec()\fP, which uses
+a backtracking algorithm. With the exception of (*FAIL), which behaves like a
+failing negative assertion, they cause an error if encountered by
+\fBpcre_dfa_exec()\fP.
 .P
-.in 0
-Last updated: 06 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+The new verbs make use of what was previously invalid syntax: an opening
+parenthesis followed by an asterisk. In Perl, they are generally of the form
+(*VERB:ARG) but PCRE does not support the use of arguments, so its general
+form is just (*VERB). Any number of these verbs may occur in a pattern. There
+are two kinds:
+.
+.SS "Verbs that act immediately"
+.rs
+.sp
+The following verbs act as soon as they are encountered:
+.sp
+   (*ACCEPT)
+.sp
+This verb causes the match to end successfully, skipping the remainder of the
+pattern. When inside a recursion, only the innermost pattern is ended
+immediately. PCRE differs from Perl in what happens if the (*ACCEPT) is inside
+capturing parentheses. In Perl, the data so far is captured: in PCRE no data is
+captured. For example:
+.sp
+  A(A|B(*ACCEPT)|C)D
+.sp
+This matches "AB", "AAD", or "ACD", but when it matches "AB", no data is
+captured.
+.sp
+  (*FAIL) or (*F)
+.sp
+This verb causes the match to fail, forcing backtracking to occur. It is
+equivalent to (?!) but easier to read. The Perl documentation notes that it is
+probably useful only when combined with (?{}) or (??{}). Those are, of course,
+Perl features that are not present in PCRE. The nearest equivalent is the
+callout feature, as for example in this pattern:
+.sp
+  a+(?C)(*FAIL)
+.sp
+A match with the string "aaaa" always fails, but the callout is taken before
+each backtrack happens (in this example, 10 times).
+.
+.SS "Verbs that act after backtracking"
+.rs
+.sp
+The following verbs do nothing when they are encountered. Matching continues
+with what follows, but if there is no subsequent match, a failure is forced.
+The verbs differ in exactly what kind of failure occurs.
+.sp
+  (*COMMIT)
+.sp
+This verb causes the whole match to fail outright if the rest of the pattern
+does not match. Even if the pattern is unanchored, no further attempts to find
+a match by advancing the start point take place. Once (*COMMIT) has been
+passed, \fBpcre_exec()\fP is committed to finding a match at the current
+starting point, or not at all. For example:
+.sp
+  a+(*COMMIT)b
+.sp
+This matches "xxaab" but not "aacaab". It can be thought of as a kind of
+dynamic anchor, or "I've started, so I must finish."
+.sp
+  (*PRUNE)
+.sp
+This verb causes the match to fail at the current position if the rest of the
+pattern does not match. If the pattern is unanchored, the normal "bumpalong"
+advance to the next starting character then happens. Backtracking can occur as
+usual to the left of (*PRUNE), or when matching to the right of (*PRUNE), but
+if there is no match to the right, backtracking cannot cross (*PRUNE).
+In simple cases, the use of (*PRUNE) is just an alternative to an atomic
+group or possessive quantifier, but there are some uses of (*PRUNE) that cannot
+be expressed in any other way.
+.sp
+  (*SKIP)
+.sp
+This verb is like (*PRUNE), except that if the pattern is unanchored, the
+"bumpalong" advance is not to the next character, but to the position in the
+subject where (*SKIP) was encountered. (*SKIP) signifies that whatever text
+was matched leading up to it cannot be part of a successful match. Consider:
+.sp
+  a+(*SKIP)b
+.sp
+If the subject is "aaaac...", after the first match attempt fails (starting at
+the first character in the string), the starting point skips on to start the
+next attempt at "c". Note that a possessive quantifer does not have the same
+effect in this example; although it would suppress backtracking during the
+first match attempt, the second attempt would start at the second character
+instead of skipping on to "c".
+.sp
+  (*THEN)
+.sp
+This verb causes a skip to the next alternation if the rest of the pattern does
+not match. That is, it cancels pending backtracking, but only within the
+current alternation. Its name comes from the observation that it can be used
+for a pattern-based if-then-else block:
+.sp
+  ( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ...
+.sp
+If the COND1 pattern matches, FOO is tried (and possibly further items after
+the end of the group if FOO succeeds); on failure the matcher skips to the
+second alternative and tries COND2, without backtracking into COND1. If (*THEN)
+is used outside of any alternation, it acts exactly like (*PRUNE).
+.
+.
+.SH "SEE ALSO"
+.rs
+.sp
+\fBpcreapi\fP(3), \fBpcrecallout\fP(3), \fBpcrematching\fP(3), \fBpcre\fP(3).
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 11 April 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcreperform.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcreperform.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcreperform.3	Mon Jun  8 18:51:30 2009
@@ -4,13 +4,75 @@
 .SH "PCRE PERFORMANCE"
 .rs
 .sp
-Certain items that may appear in regular expression patterns are more efficient
+Two aspects of performance are discussed below: memory usage and processing
+time. The way you express your pattern as a regular expression can affect both
+of them.
+.
+.SH "MEMORY USAGE"
+.rs
+.sp
+Patterns are compiled by PCRE into a reasonably efficient byte code, so that
+most simple patterns do not use much memory. However, there is one case where
+memory usage can be unexpectedly large. When a parenthesized subpattern has a
+quantifier with a minimum greater than 1 and/or a limited maximum, the whole
+subpattern is repeated in the compiled code. For example, the pattern
+.sp
+  (abc|def){2,4}
+.sp
+is compiled as if it were
+.sp
+  (abc|def)(abc|def)((abc|def)(abc|def)?)?
+.sp
+(Technical aside: It is done this way so that backtrack points within each of
+the repetitions can be independently maintained.)
+.P
+For regular expressions whose quantifiers use only small numbers, this is not
+usually a problem. However, if the numbers are large, and particularly if such
+repetitions are nested, the memory usage can become an embarrassment. For
+example, the very simple pattern
+.sp
+  ((ab){1,1000}c){1,3}
+.sp
+uses 51K bytes when compiled. When PCRE is compiled with its default internal
+pointer size of two bytes, the size limit on a compiled pattern is 64K, and
+this is reached with the above pattern if the outer repetition is increased
+from 3 to 4. PCRE can be compiled to use larger internal pointers and thus
+handle larger compiled patterns, but it is better to try to rewrite your
+pattern to use less memory if you can.
+.P
+One way of reducing the memory usage for such patterns is to make use of PCRE's
+.\" HTML 
+.\" 
+"subroutine"
+.\"
+facility. Re-writing the above pattern as
+.sp
+  ((ab)(?2){0,999}c)(?1){0,2}
+.sp
+reduces the memory requirements to 18K, and indeed it remains under 20K even
+with the outer repetition increased to 100. However, this pattern is not
+exactly equivalent, because the "subroutine" calls are treated as
+.\" HTML 
+.\" 
+atomic groups
+.\"
+into which there can be no backtracking if there is a subsequent matching
+failure. Therefore, PCRE cannot do this kind of rewriting automatically.
+Furthermore, there is a noticeable loss of speed when executing the modified
+pattern. Nevertheless, if the atomic grouping is not a problem and the loss of
+speed is acceptable, this kind of rewriting will allow you to process patterns
+that PCRE cannot otherwise handle.
+.
+.SH "PROCESSING TIME"
+.rs
+.sp
+Certain items in regular expression patterns are processed more efficiently
 than others. It is more efficient to use a character class like [aeiou] than a
-set of alternatives such as (a|e|i|o|u). In general, the simplest construction
-that provides the required behaviour is usually the most efficient. Jeffrey
-Friedl's book contains a lot of useful general discussion about optimizing
-regular expressions for efficient performance. This document contains a few
-observations about PCRE.
+set of single-character alternatives such as (a|e|i|o|u). In general, the
+simplest construction that provides the required behaviour is usually the most
+efficient. Jeffrey Friedl's book contains a lot of useful general discussion
+about optimizing regular expressions for efficient performance. This document
+contains a few observations about PCRE.
 .P
 Using Unicode character properties (the \ep, \eP, and \eX escapes) is slow,
 because PCRE has to scan a structure that contains data for over fifteen
@@ -42,14 +104,15 @@
 long time to run when applied to a string that does not match. Consider the
 pattern fragment
 .sp
-  (a+)*
+  ^(a+)*
 .sp
-This can match "aaaa" in 33 different ways, and this number increases very
+This can match "aaaa" in 16 different ways, and this number increases very
 rapidly as the string gets longer. (The * repeat can match 0, 1, 2, 3, or 4
-times, and for each of those cases other than 0, the + repeats can match
+times, and for each of those cases other than 0 or 4, the + repeats can match
 different numbers of times.) When the remainder of the pattern is such that the
 entire match is going to fail, PCRE has in principle to try every possible
-variation, and this can take an extremely long time.
+variation, and this can take an extremely long time, even for relatively short
+strings.
 .P
 An optimization catches some of the more simple cases such as
 .sp
@@ -69,8 +132,22 @@
 .P
 In many cases, the solution to this kind of performance issue is to use an
 atomic group or a possessive quantifier.
-.P
-.in 0
-Last updated: 28 February 2005
-.br
-Copyright (c) 1997-2005 University of Cambridge.
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 06 March 2007
+Copyright (c) 1997-2007 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcreposix.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcreposix.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcreposix.3	Mon Jun  8 18:51:30 2009
@@ -7,22 +7,18 @@
 .B #include 
 .PP
 .SM
-.br
 .B int regcomp(regex_t *\fIpreg\fP, const char *\fIpattern\fP,
 .ti +5n
 .B int \fIcflags\fP);
 .PP
-.br
 .B int regexec(regex_t *\fIpreg\fP, const char *\fIstring\fP,
 .ti +5n
 .B size_t \fInmatch\fP, regmatch_t \fIpmatch\fP[], int \fIeflags\fP);
 .PP
-.br
 .B size_t regerror(int \fIerrcode\fP, const regex_t *\fIpreg\fP,
 .ti +5n
 .B char *\fIerrbuf\fP, size_t \fIerrbuf_size\fP);
 .PP
-.br
 .B void regfree(regex_t *\fIpreg\fP);
 .
 .SH DESCRIPTION
@@ -43,11 +39,11 @@
 command for linking an application that uses them. Because the POSIX functions
 call the native ones, it is also necessary to add \fB-lpcre\fP.
 .P
-I have implemented only those option bits that can be reasonably mapped to PCRE
-native options. In addition, the option REG_EXTENDED is defined with the value
-zero. This has no effect, but since programs that are written to the POSIX
-interface often use it, this makes it easier to slot in PCRE as a replacement
-library. Other POSIX options are not even defined.
+I have implemented only those POSIX option bits that can be reasonably mapped
+to PCRE native options. In addition, the option REG_EXTENDED is defined with
+the value zero. This has no effect, but since programs that are written to the
+POSIX interface often use it, this makes it easier to slot in PCRE as a
+replacement library. Other POSIX options are not even defined.
 .P
 When PCRE is called via these functions, it is only the API that is POSIX-like
 in style. The syntax and semantics of the regular expressions themselves are
@@ -161,18 +157,36 @@
 .rs
 .sp
 The function \fBregexec()\fP is called to match a compiled pattern \fIpreg\fP
-against a given \fIstring\fP, which is terminated by a zero byte, subject to
-the options in \fIeflags\fP. These can be:
+against a given \fIstring\fP, which is by default terminated by a zero byte
+(but see REG_STARTEND below), subject to the options in \fIeflags\fP. These can
+be:
 .sp
   REG_NOTBOL
 .sp
 The PCRE_NOTBOL option is set when calling the underlying PCRE matching
 function.
 .sp
+  REG_NOTEMPTY
+.sp
+The PCRE_NOTEMPTY option is set when calling the underlying PCRE matching
+function. Note that REG_NOTEMPTY is not part of the POSIX standard. However,
+setting this option can give more POSIX-like behaviour in some situations.
+.sp
   REG_NOTEOL
 .sp
 The PCRE_NOTEOL option is set when calling the underlying PCRE matching
 function.
+.sp
+  REG_STARTEND
+.sp
+The string is considered to start at \fIstring\fP + \fIpmatch[0].rm_so\fP and
+to have a terminating NUL located at \fIstring\fP + \fIpmatch[0].rm_eo\fP
+(there need not actually be a NUL at that location), regardless of the value of
+\fInmatch\fP. This is a BSD extension, compatible with but not specified by
+IEEE Standard 1003.2 (POSIX.2), and should be used with caution in software
+intended to be portable to other systems. Note that a non-zero \fIrm_so\fP does
+not imply REG_NOTBOL; REG_STARTEND affects only the location of the string, not
+how it is matched.
 .P
 If the pattern was compiled with the REG_NOSUB flag, no data about any matched
 strings is returned. The \fInmatch\fP and \fIpmatch\fP arguments of
@@ -214,13 +228,17 @@
 .SH AUTHOR
 .rs
 .sp
+.nf
 Philip Hazel
-.br
-University Computing Service,
-.br
-Cambridge CB2 3QG, England.
-.P
-.in 0
-Last updated: 16 January 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 11 March 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcreprecompile.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcreprecompile.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcreprecompile.3	Mon Jun  8 18:51:30 2009
@@ -17,7 +17,9 @@
 If you save compiled patterns to a file, you can copy them to a different host
 and run them there. This works even if the new host has the opposite endianness
 to the one on which the patterns were compiled. There may be a small
-performance penalty, but it should be insignificant.
+performance penalty, but it should be insignificant. However, compiling regular
+expressions with one version of PCRE for use with a different version is not
+guaranteed to work and may cause crashes.
 .
 .
 .SH "SAVING A COMPILED PATTERN"
@@ -115,17 +117,26 @@
 .SH "COMPATIBILITY WITH DIFFERENT PCRE RELEASES"
 .rs
 .sp
-The layout of the control block that is at the start of the data that makes up
-a compiled pattern was changed for release 5.0. If you have any saved patterns
-that were compiled with previous releases (not a facility that was previously
-advertised), you will have to recompile them for release 5.0. However, from now
-on, it should be possible to make changes in a compatible manner.
-.P
-Notwithstanding the above, if you have any saved patterns in UTF-8 mode that
-use \ep or \eP that were compiled with any release up to and including 6.4, you
-will have to recompile them for release 6.5 and above.
-.P
-.in 0
-Last updated: 01 February 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+In general, it is safest to recompile all saved patterns when you update to a
+new PCRE release, though not all updates actually require this. Recompiling is
+definitely needed for release 7.2.
+.
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 13 June 2007
+Copyright (c) 1997-2007 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcresample.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcresample.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcresample.3	Mon Jun  8 18:51:30 2009
@@ -59,8 +59,22 @@
   -R/usr/local/lib
 .sp
 (for example) to the compile command to get round this problem.
-.P
-.in 0
-Last updated: 09 September 2004
-.br
-Copyright (c) 1997-2004 University of Cambridge.
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 23 January 2008
+Copyright (c) 1997-2008 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcrestack.3
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcrestack.3	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcrestack.3	Mon Jun  8 18:51:30 2009
@@ -52,7 +52,7 @@
 required. Consider now this rewritten pattern, which matches exactly the same
 strings:
 .sp
-  ([^<]++|<(?!inet))
+  ([^<]++|<(?!inet))+
 .sp
 This uses very much less stack, because runs of characters that do not contain
 "<" are "swallowed" in one item inside the parentheses. Recursion happens only
@@ -61,6 +61,13 @@
 backtracking into the runs of non-"<" characters, but that is not related to
 stack usage.
 .P
+This example shows that one way of avoiding stack problems when matching long
+subject strings is to write repeated parenthesized subpatterns to match more
+than one character whenever possible.
+.
+.SS "Compiling PCRE to use heap instead of stack"
+.rs
+.sp
 In environments where stack memory is constrained, you might want to compile
 PCRE to use heap memory instead of stack for remembering back-up points. This
 makes it run a lot more slowly, however. Details of how to do this are given in
@@ -68,27 +75,17 @@
 .\" HREF
 \fBpcrebuild\fP
 .\"
-documentation.
-.P
-In Unix-like environments, there is not often a problem with the stack, though
-the default limit on stack size varies from system to system. Values from 8Mb
-to 64Mb are common. You can find your default limit by running the command:
-.sp
-  ulimit -s
-.sp
-The effect of running out of stack is often SIGSEGV, though sometimes an error
-message is given. You can normally increase the limit on stack size by code
-such as this:
+documentation. When built in this way, instead of using the stack, PCRE obtains
+and frees memory by calling the functions that are pointed to by the
+\fBpcre_stack_malloc\fP and \fBpcre_stack_free\fP variables. By default, these
+point to \fBmalloc()\fP and \fBfree()\fP, but you can replace the pointers to
+cause PCRE to use your own functions. Since the block sizes are always the
+same, and are always freed in reverse order, it may be possible to implement
+customized memory handlers that are more efficient than the standard functions.
+.
+.SS "Limiting PCRE's stack usage"
+.rs
 .sp
-  struct rlimit rlim;
-  getrlimit(RLIMIT_STACK, &rlim);
-  rlim.rlim_cur = 100*1024*1024;
-  setrlimit(RLIMIT_STACK, &rlim);
-.sp
-This reads the current limits (soft and hard) using \fBgetrlimit()\fP, then
-attempts to increase the soft limit to 100Mb using \fBsetrlimit()\fP. You must
-do this before calling \fBpcre_exec()\fP.
-.P
 PCRE has an internal counter that can be used to limit the depth of recursion,
 and thus cause \fBpcre_exec()\fP to give an error code before it runs out of
 stack. By default, the limit is very large, and unlikely ever to operate. It
@@ -107,9 +104,57 @@
 recursion. Thus, if you want to limit your stack usage to 8Mb, you
 should set the limit at 16000 recursions. A 64Mb stack, on the other hand, can
 support around 128000 recursions. The \fBpcretest\fP test program has a command
-line option (\fB-S\fP) that can be used to increase its stack.
-.P
-.in 0
-Last updated: 29 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+line option (\fB-S\fP) that can be used to increase the size of its stack.
+.
+.SS "Changing stack size in Unix-like systems"
+.rs
+.sp
+In Unix-like environments, there is not often a problem with the stack unless
+very long strings are involved, though the default limit on stack size varies
+from system to system. Values from 8Mb to 64Mb are common. You can find your
+default limit by running the command:
+.sp
+  ulimit -s
+.sp
+Unfortunately, the effect of running out of stack is often SIGSEGV, though
+sometimes a more explicit error message is given. You can normally increase the
+limit on stack size by code such as this:
+.sp
+  struct rlimit rlim;
+  getrlimit(RLIMIT_STACK, &rlim);
+  rlim.rlim_cur = 100*1024*1024;
+  setrlimit(RLIMIT_STACK, &rlim);
+.sp
+This reads the current limits (soft and hard) using \fBgetrlimit()\fP, then
+attempts to increase the soft limit to 100Mb using \fBsetrlimit()\fP. You must
+do this before calling \fBpcre_exec()\fP.
+.
+.SS "Changing stack size in Mac OS X"
+.rs
+.sp
+Using \fBsetrlimit()\fP, as described above, should also work on Mac OS X. It
+is also possible to set a stack size when linking a program. There is a
+discussion about stack sizes in Mac OS X at this web site:
+.\" HTML 
+.\" 
+http://developer.apple.com/qa/qa2005/qa1419.html.
+.\"
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 09 July 2008
+Copyright (c) 1997-2008 University of Cambridge.
+.fi

Added: freeswitch/trunk/libs/pcre/doc/pcresyntax.3
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/doc/pcresyntax.3	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,449 @@
+.TH PCRESYNTAX 3
+.SH NAME
+PCRE - Perl-compatible regular expressions
+.SH "PCRE REGULAR EXPRESSION SYNTAX SUMMARY"
+.rs
+.sp
+The full syntax and semantics of the regular expressions that are supported by
+PCRE are described in the
+.\" HREF
+\fBpcrepattern\fP
+.\"
+documentation. This document contains just a quick-reference summary of the
+syntax.
+.
+.
+.SH "QUOTING"
+.rs
+.sp
+  \ex         where x is non-alphanumeric is a literal x
+  \eQ...\eE    treat enclosed characters as literal
+.
+.
+.SH "CHARACTERS"
+.rs
+.sp
+  \ea         alarm, that is, the BEL character (hex 07)
+  \ecx        "control-x", where x is any character
+  \ee         escape (hex 1B)
+  \ef         formfeed (hex 0C)
+  \en         newline (hex 0A)
+  \er         carriage return (hex 0D)
+  \et         tab (hex 09)
+  \eddd       character with octal code ddd, or backreference
+  \exhh       character with hex code hh
+  \ex{hhh..}  character with hex code hhh..
+.
+.
+.SH "CHARACTER TYPES"
+.rs
+.sp
+  .          any character except newline;
+               in dotall mode, any character whatsoever
+  \eC         one byte, even in UTF-8 mode (best avoided)
+  \ed         a decimal digit
+  \eD         a character that is not a decimal digit
+  \eh         a horizontal whitespace character
+  \eH         a character that is not a horizontal whitespace character
+  \ep{\fIxx\fP}     a character with the \fIxx\fP property
+  \eP{\fIxx\fP}     a character without the \fIxx\fP property
+  \eR         a newline sequence
+  \es         a whitespace character
+  \eS         a character that is not a whitespace character
+  \ev         a vertical whitespace character
+  \eV         a character that is not a vertical whitespace character
+  \ew         a "word" character
+  \eW         a "non-word" character
+  \eX         an extended Unicode sequence
+.sp
+In PCRE, \ed, \eD, \es, \eS, \ew, and \eW recognize only ASCII characters.
+.
+.
+.SH "GENERAL CATEGORY PROPERTY CODES FOR \ep and \eP"
+.rs
+.sp
+  C          Other
+  Cc         Control
+  Cf         Format
+  Cn         Unassigned
+  Co         Private use
+  Cs         Surrogate
+.sp
+  L          Letter
+  Ll         Lower case letter
+  Lm         Modifier letter
+  Lo         Other letter
+  Lt         Title case letter
+  Lu         Upper case letter
+  L&         Ll, Lu, or Lt
+.sp
+  M          Mark
+  Mc         Spacing mark
+  Me         Enclosing mark
+  Mn         Non-spacing mark
+.sp
+  N          Number
+  Nd         Decimal number
+  Nl         Letter number
+  No         Other number
+.sp
+  P          Punctuation
+  Pc         Connector punctuation
+  Pd         Dash punctuation
+  Pe         Close punctuation
+  Pf         Final punctuation
+  Pi         Initial punctuation
+  Po         Other punctuation
+  Ps         Open punctuation
+.sp
+  S          Symbol
+  Sc         Currency symbol
+  Sk         Modifier symbol
+  Sm         Mathematical symbol
+  So         Other symbol
+.sp
+  Z          Separator
+  Zl         Line separator
+  Zp         Paragraph separator
+  Zs         Space separator
+.
+.
+.SH "SCRIPT NAMES FOR \ep AND \eP"
+.rs
+.sp
+Arabic,
+Armenian,
+Balinese,
+Bengali,
+Bopomofo,
+Braille,
+Buginese,
+Buhid,
+Canadian_Aboriginal,
+Carian,
+Cham,
+Cherokee,
+Common,
+Coptic,
+Cuneiform,
+Cypriot,
+Cyrillic,
+Deseret,
+Devanagari,
+Ethiopic,
+Georgian,
+Glagolitic,
+Gothic,
+Greek,
+Gujarati,
+Gurmukhi,
+Han,
+Hangul,
+Hanunoo,
+Hebrew,
+Hiragana,
+Inherited,
+Kannada,
+Katakana,
+Kayah_Li,
+Kharoshthi,
+Khmer,
+Lao,
+Latin,
+Lepcha,
+Limbu,
+Linear_B,
+Lycian,
+Lydian,
+Malayalam,
+Mongolian,
+Myanmar,
+New_Tai_Lue,
+Nko,
+Ogham,
+Old_Italic,
+Old_Persian,
+Ol_Chiki,
+Oriya,
+Osmanya,
+Phags_Pa,
+Phoenician,
+Rejang,
+Runic,
+Saurashtra,
+Shavian,
+Sinhala,
+Sudanese,
+Syloti_Nagri,
+Syriac,
+Tagalog,
+Tagbanwa,
+Tai_Le,
+Tamil,
+Telugu,
+Thaana,
+Thai,
+Tibetan,
+Tifinagh,
+Ugaritic,
+Vai,
+Yi.
+.
+.
+.SH "CHARACTER CLASSES"
+.rs
+.sp
+  [...]       positive character class
+  [^...]      negative character class
+  [x-y]       range (can be used for hex characters)
+  [[:xxx:]]   positive POSIX named set
+  [[:^xxx:]]  negative POSIX named set
+.sp
+  alnum       alphanumeric
+  alpha       alphabetic
+  ascii       0-127
+  blank       space or tab
+  cntrl       control character
+  digit       decimal digit
+  graph       printing, excluding space
+  lower       lower case letter
+  print       printing, including space
+  punct       printing, excluding alphanumeric
+  space       whitespace
+  upper       upper case letter
+  word        same as \ew
+  xdigit      hexadecimal digit
+.sp
+In PCRE, POSIX character set names recognize only ASCII characters. You can use
+\eQ...\eE inside a character class.
+.
+.
+.SH "QUANTIFIERS"
+.rs
+.sp
+  ?           0 or 1, greedy
+  ?+          0 or 1, possessive
+  ??          0 or 1, lazy
+  *           0 or more, greedy
+  *+          0 or more, possessive
+  *?          0 or more, lazy
+  +           1 or more, greedy
+  ++          1 or more, possessive
+  +?          1 or more, lazy
+  {n}         exactly n
+  {n,m}       at least n, no more than m, greedy
+  {n,m}+      at least n, no more than m, possessive
+  {n,m}?      at least n, no more than m, lazy
+  {n,}        n or more, greedy
+  {n,}+       n or more, possessive
+  {n,}?       n or more, lazy
+.
+.
+.SH "ANCHORS AND SIMPLE ASSERTIONS"
+.rs
+.sp
+  \eb          word boundary (only ASCII letters recognized)
+  \eB          not a word boundary
+  ^           start of subject
+               also after internal newline in multiline mode
+  \eA          start of subject
+  $           end of subject
+               also before newline at end of subject
+               also before internal newline in multiline mode
+  \eZ          end of subject
+               also before newline at end of subject
+  \ez          end of subject
+  \eG          first matching position in subject
+.
+.
+.SH "MATCH POINT RESET"
+.rs
+.sp
+  \eK          reset start of match
+.
+.
+.SH "ALTERNATION"
+.rs
+.sp
+  expr|expr|expr...
+.
+.
+.SH "CAPTURING"
+.rs
+.sp
+  (...)           capturing group
+  (?...)    named capturing group (Perl)
+  (?'name'...)    named capturing group (Perl)
+  (?P...)   named capturing group (Python)
+  (?:...)         non-capturing group
+  (?|...)         non-capturing group; reset group numbers for
+                   capturing groups in each alternative
+.
+.
+.SH "ATOMIC GROUPS"
+.rs
+.sp
+  (?>...)         atomic, non-capturing group
+.
+.
+.
+.
+.SH "COMMENT"
+.rs
+.sp
+  (?#....)        comment (not nestable)
+.
+.
+.SH "OPTION SETTING"
+.rs
+.sp
+  (?i)            caseless
+  (?J)            allow duplicate names
+  (?m)            multiline
+  (?s)            single line (dotall)
+  (?U)            default ungreedy (lazy)
+  (?x)            extended (ignore white space)
+  (?-...)         unset option(s)
+.sp
+The following is recognized only at the start of a pattern or after one of the
+newline-setting options with similar syntax:
+.sp
+  (*UTF8)         set UTF-8 mode
+.
+.
+.SH "LOOKAHEAD AND LOOKBEHIND ASSERTIONS"
+.rs
+.sp
+  (?=...)         positive look ahead
+  (?!...)         negative look ahead
+  (?<=...)        positive look behind
+  (?        reference by name (Perl)
+  \ek'name'        reference by name (Perl)
+  \eg{name}        reference by name (Perl)
+  \ek{name}        reference by name (.NET)
+  (?P=name)       reference by name (Python)
+.
+.
+.SH "SUBROUTINE REFERENCES (POSSIBLY RECURSIVE)"
+.rs
+.sp
+  (?R)            recurse whole pattern
+  (?n)            call subpattern by absolute number
+  (?+n)           call subpattern by relative number
+  (?-n)           call subpattern by relative number
+  (?&name)        call subpattern by name (Perl)
+  (?P>name)       call subpattern by name (Python)
+  \eg        call subpattern by name (Oniguruma)
+  \eg'name'        call subpattern by name (Oniguruma)
+  \eg           call subpattern by absolute number (Oniguruma)
+  \eg'n'           call subpattern by absolute number (Oniguruma)
+  \eg<+n>          call subpattern by relative number (PCRE extension)
+  \eg'+n'          call subpattern by relative number (PCRE extension)
+  \eg<-n>          call subpattern by relative number (PCRE extension)
+  \eg'-n'          call subpattern by relative number (PCRE extension)
+.
+.
+.SH "CONDITIONAL PATTERNS"
+.rs
+.sp
+  (?(condition)yes-pattern)
+  (?(condition)yes-pattern|no-pattern)
+.sp
+  (?(n)...        absolute reference condition
+  (?(+n)...       relative reference condition
+  (?(-n)...       relative reference condition
+  (?()...   named reference condition (Perl)
+  (?('name')...   named reference condition (Perl)
+  (?(name)...     named reference condition (PCRE)
+  (?(R)...        overall recursion condition
+  (?(Rn)...       specific group recursion condition
+  (?(R&name)...   specific recursion condition
+  (?(DEFINE)...   define subpattern for reference
+  (?(assert)...   assertion condition
+.
+.
+.SH "BACKTRACKING CONTROL"
+.rs
+.sp
+The following act immediately they are reached:
+.sp
+  (*ACCEPT)       force successful match
+  (*FAIL)         force backtrack; synonym (*F)
+.sp
+The following act only when a subsequent match failure causes a backtrack to
+reach them. They all force a match failure, but they differ in what happens
+afterwards. Those that advance the start-of-match point do so only if the
+pattern is not anchored.
+.sp
+  (*COMMIT)       overall failure, no advance of starting point
+  (*PRUNE)        advance to next starting character
+  (*SKIP)         advance start to current matching position
+  (*THEN)         local failure, backtrack to next alternation
+.
+.
+.SH "NEWLINE CONVENTIONS"
+.rs
+.sp
+These are recognized only at the very start of the pattern or after a
+(*BSR_...) or (*UTF8) option.
+.sp
+  (*CR)           carriage return only
+  (*LF)           linefeed only
+  (*CRLF)         carriage return followed by linefeed
+  (*ANYCRLF)      all three of the above
+  (*ANY)          any Unicode newline sequence
+.
+.
+.SH "WHAT \eR MATCHES"
+.rs
+.sp
+These are recognized only at the very start of the pattern or after a
+(*...) option that sets the newline convention or UTF-8 mode.
+.sp
+  (*BSR_ANYCRLF)  CR, LF, or CRLF
+  (*BSR_UNICODE)  any Unicode newline sequence
+.
+.
+.SH "CALLOUTS"
+.rs
+.sp
+  (?C)      callout
+  (?Cn)     callout with data n
+.
+.
+.SH "SEE ALSO"
+.rs
+.sp
+\fBpcrepattern\fP(3), \fBpcreapi\fP(3), \fBpcrecallout\fP(3),
+\fBpcrematching\fP(3), \fBpcre\fP(3).
+.
+.
+.SH AUTHOR
+.rs
+.sp
+.nf
+Philip Hazel
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 11 April 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcretest.1
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcretest.1	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcretest.1	Mon Jun  8 18:51:30 2009
@@ -24,23 +24,36 @@
 .SH OPTIONS
 .rs
 .TP 10
+\fB-b\fP
+Behave as if each regex has the \fB/B\fP (show bytecode) modifier; the internal
+form is output after compilation.
+.TP 10
 \fB-C\fP
 Output the version number of the PCRE library, and all available information
 about the optional features that are included, and then exit.
 .TP 10
 \fB-d\fP
 Behave as if each regex has the \fB/D\fP (debug) modifier; the internal
-form is output after compilation.
+form and information about the compiled pattern is output after compilation;
+\fB-d\fP is equivalent to \fB-b -i\fP.
 .TP 10
 \fB-dfa\fP
 Behave as if each data line contains the \eD escape sequence; this causes the
 alternative matching function, \fBpcre_dfa_exec()\fP, to be used instead of the
 standard \fBpcre_exec()\fP function (more detail is given below).
 .TP 10
+\fB-help\fP
+Output a brief summary these options and then exit.
+.TP 10
 \fB-i\fP
 Behave as if each regex has the \fB/I\fP modifier; information about the
 compiled pattern is given after compilation.
 .TP 10
+\fB-M\fP
+Behave as if each data line contains the \eM escape sequence; this causes
+PCRE to discover the minimum MATCH_LIMIT and MATCH_LIMIT_RECURSION settings by
+calling \fBpcre_exec()\fP repeatedly with different limits.
+.TP 10
 \fB-m\fP
 Output the size of each compiled pattern after it has been compiled. This is
 equivalent to adding \fB/M\fP to each regular expression. For compatibility
@@ -48,9 +61,11 @@
 .TP 10
 \fB-o\fP \fIosize\fP
 Set the number of elements in the output vector that is used when calling
-\fBpcre_exec()\fP to be \fIosize\fP. The default value is 45, which is enough
-for 14 capturing subexpressions. The vector size can be changed for individual
-matching calls by including \eO in the data line (see below).
+\fBpcre_exec()\fP or \fBpcre_dfa_exec()\fP to be \fIosize\fP. The default value
+is 45, which is enough for 14 capturing subexpressions for \fBpcre_exec()\fP or
+22 different matches for \fBpcre_dfa_exec()\fP. The vector size can be
+changed for individual matching calls by including \eO in the data line (see
+below).
 .TP 10
 \fB-p\fP
 Behave as if each regex has the \fB/P\fP modifier; the POSIX wrapper API is
@@ -68,7 +83,14 @@
 Run each compile, study, and match many times with a timer, and output
 resulting time per compile or match (in milliseconds). Do not set \fB-m\fP with
 \fB-t\fP, because you will then get the size output a zillion times, and the
-timing will be distorted.
+timing will be distorted. You can control the number of iterations that are
+used for timing by following \fB-t\fP with a number (as a separate item on the
+command line). For example, "-t 1000" would iterate 1000 times. The default is
+to iterate 500000 times.
+.TP 10
+\fB-tm\fP
+This is like \fB-t\fP except that it times only the matching phase, not the
+compile or study phases.
 .
 .
 .SH DESCRIPTION
@@ -80,14 +102,20 @@
 stdout, and prompts for each line of input, using "re>" to prompt for regular
 expressions, and "data>" to prompt for data lines.
 .P
+When \fBpcretest\fP is built, a configuration option can specify that it should
+be linked with the \fBlibreadline\fP library. When this is done, if the input
+is from a terminal, it is read using the \fBreadline()\fP function. This
+provides line-editing and history facilities. The output from the \fB-help\fP
+option states whether or not \fBreadline()\fP will be used.
+.P
 The program handles any number of sets of input on a single input file. Each
 set starts with a regular expression, and continues with any number of data
 lines to be matched against the pattern.
 .P
 Each data line is matched separately and independently. If you want to do
 multi-line matches, you have to use the \en escape sequence (or \er or \er\en,
-depending on the newline setting) in a single line of input to encode the
-newline characters. There is no limit on the length of data lines; the input
+etc., depending on the newline setting) in a single line of input to encode the
+newline sequences. There is no limit on the length of data lines; the input
 buffer is automatically extended if it is too small.
 .P
 An empty line signals the end of the data lines, at which point a new regular
@@ -140,20 +168,30 @@
 The following table shows additional modifiers for setting PCRE options that do
 not correspond to anything in Perl:
 .sp
-  \fB/A\fP       PCRE_ANCHORED
-  \fB/C\fP       PCRE_AUTO_CALLOUT
-  \fB/E\fP       PCRE_DOLLAR_ENDONLY
-  \fB/f\fP       PCRE_FIRSTLINE
-  \fB/J\fP       PCRE_DUPNAMES
-  \fB/N\fP       PCRE_NO_AUTO_CAPTURE
-  \fB/U\fP       PCRE_UNGREEDY
-  \fB/X\fP       PCRE_EXTRA
-  \fB/\fP    PCRE_NEWLINE_CR
-  \fB/\fP    PCRE_NEWLINE_LF
-  \fB/\fP  PCRE_NEWLINE_CRLF
+  \fB/A\fP              PCRE_ANCHORED
+  \fB/C\fP              PCRE_AUTO_CALLOUT
+  \fB/E\fP              PCRE_DOLLAR_ENDONLY
+  \fB/f\fP              PCRE_FIRSTLINE
+  \fB/J\fP              PCRE_DUPNAMES
+  \fB/N\fP              PCRE_NO_AUTO_CAPTURE
+  \fB/U\fP              PCRE_UNGREEDY
+  \fB/X\fP              PCRE_EXTRA
+  \fB/\fP           PCRE_JAVASCRIPT_COMPAT
+  \fB/\fP           PCRE_NEWLINE_CR
+  \fB/\fP           PCRE_NEWLINE_LF
+  \fB/\fP         PCRE_NEWLINE_CRLF
+  \fB/\fP      PCRE_NEWLINE_ANYCRLF
+  \fB/\fP          PCRE_NEWLINE_ANY
+  \fB/\fP  PCRE_BSR_ANYCRLF
+  \fB/\fP  PCRE_BSR_UNICODE
+.sp
+Those specifying line ending sequences are literal strings as shown, but the
+letters can be in either case. This example sets multiline matching with CRLF
+as the line ending sequence:
+.sp
+  /^abc/m
 .sp
-Those specifying line endings are literal strings as shown. Details of the
-meanings of these PCRE options are given in the
+Details of the meanings of these PCRE options are given in the
 .\" HREF
 \fBpcreapi\fP
 .\"
@@ -191,6 +229,13 @@
 the subject string. This is useful for tests where the subject contains
 multiple copies of the same substring.
 .P
+The \fB/B\fP modifier is a debugging feature. It requests that \fBpcretest\fP
+output a representation of the compiled byte code after compilation. Normally
+this information contains length and offset values; however, if \fB/Z\fP is
+also present, this data is replaced by spaces. This is a special feature for
+use in the automatic test scripts; it ensures that the same output is generated
+for different internal link sizes.
+.P
 The \fB/L\fP modifier must be followed directly by the name of a locale, for
 example,
 .sp
@@ -207,10 +252,8 @@
 so on). It does this by calling \fBpcre_fullinfo()\fP after compiling a
 pattern. If the pattern is studied, the results of that are also output.
 .P
-The \fB/D\fP modifier is a PCRE debugging feature, which also assumes \fB/I\fP.
-It causes the internal form of compiled regular expressions to be output after
-compilation. If the pattern was studied, the information returned is also
-output.
+The \fB/D\fP modifier is a PCRE debugging feature, and is equivalent to
+\fB/BI\fP, that is, both the \fB/B\fP and the \fB/I\fP modifiers.
 .P
 The \fB/F\fP modifier causes \fBpcretest\fP to flip the byte order of the
 fields in the compiled pattern that contain 2-byte and 4-byte numbers. This
@@ -254,17 +297,17 @@
 expressions, you probably don't need any of these. The following escapes are
 recognized:
 .sp
-  \ea         alarm (= BEL)
-  \eb         backspace
-  \ee         escape
-  \ef         formfeed
-  \en         newline
+  \ea         alarm (BEL, \ex07)
+  \eb         backspace (\ex08)
+  \ee         escape (\ex27)
+  \ef         formfeed (\ex0c)
+  \en         newline (\ex0a)
 .\" JOIN
   \eqdd       set the PCRE_MATCH_LIMIT limit to dd
                (any number of digits)
-  \er         carriage return
-  \et         tab
-  \ev         vertical tab
+  \er         carriage return (\ex0d)
+  \et         tab (\ex09)
+  \ev         vertical tab (\ex0b)
   \ennn       octal character (up to 3 octal digits)
   \exhh       hexadecimal character (up to 2 hex digits)
 .\" JOIN
@@ -344,11 +387,20 @@
 .\" JOIN
   \e    pass the PCRE_NEWLINE_CRLF option to \fBpcre_exec()\fP
                or \fBpcre_dfa_exec()\fP
+.\" JOIN
+  \e pass the PCRE_NEWLINE_ANYCRLF option to \fBpcre_exec()\fP
+               or \fBpcre_dfa_exec()\fP
+.\" JOIN
+  \e     pass the PCRE_NEWLINE_ANY option to \fBpcre_exec()\fP
+               or \fBpcre_dfa_exec()\fP
 .sp
-The escapes that specify line endings are literal strings, exactly as shown.
-A backslash followed by anything else just escapes the anything else. If the
-very last character is a backslash, it is ignored. This gives a way of passing
-an empty line as data, since a real empty line terminates the data input.
+The escapes that specify line ending sequences are literal strings, exactly as
+shown. No more than one newline setting should be present in any data line.
+.P
+A backslash followed by anything else just escapes the anything else. If
+the very last character is a backslash, it is ignored. This gives a way of
+passing an empty line as data, since a real empty line terminates the data
+input.
 .P
 If \eM is present, \fBpcretest\fP calls \fBpcre_exec()\fP several times, with
 different values in the \fImatch_limit\fP and \fImatch_limit_recursion\fP
@@ -374,7 +426,10 @@
 The use of \ex{hh...} to represent UTF-8 characters is not dependent on the use
 of the \fB/8\fP modifier on the pattern. It is recognized always. There may be
 any number of hexadecimal digits inside the braces. The result is from one to
-six bytes, encoded according to the UTF-8 rules.
+six bytes, encoded according to the original UTF-8 rules of RFC 2279. This
+allows for values in the range 0 to 0x7FFFFFFF. Note that not all of those are
+valid Unicode code points, or indeed valid UTF-8 characters according to the
+later rules in RFC 3629.
 .
 .
 .SH "THE ALTERNATIVE MATCHING FUNCTION"
@@ -411,7 +466,7 @@
 of an interactive \fBpcretest\fP run.
 .sp
   $ pcretest
-  PCRE version 5.00 07-Sep-2004
+  PCRE version 7.0 30-Nov-2006
 .sp
     re> /^abc(\ed+)/
   data> abc123
@@ -420,11 +475,26 @@
   data> xyz
   No match
 .sp
+Note that unset capturing substrings that are not followed by one that is set
+are not returned by \fBpcre_exec()\fP, and are not shown by \fBpcretest\fP. In
+the following example, there are two capturing substrings, but when the first
+data line is matched, the second, unset substring is not shown. An "internal"
+unset substring is shown as "", as for the second data line.
+.sp
+    re> /(a)|(b)/
+  data> a
+   0: a
+   1: a
+  data> b
+   0: b
+   1: 
+   2: b
+.sp
 If the strings contain any non-printing characters, they are output as \e0x
 escapes, or as \ex{...} escapes if the \fB/8\fP modifier was present on the
-pattern. If the pattern has the \fB/+\fP modifier, the output for substring 0
-is followed by the the rest of the subject string, identified by "0+" like
-this:
+pattern. See below for the definition of non-printing characters. If the
+pattern has the \fB/+\fP modifier, the output for substring 0 is followed by
+the the rest of the subject string, identified by "0+" like this:
 .sp
     re> /cat/+
   data> cataract
@@ -452,10 +522,11 @@
 length (that is, the return from the extraction function) is given in
 parentheses after each string for \fB\eC\fP and \fB\eG\fP.
 .P
-Note that while patterns can be continued over several lines (a plain ">"
+Note that whereas patterns can be continued over several lines (a plain ">"
 prompt is used for continuations), data lines may not. However newlines can be
-included in data by means of the \en escape (or \er or \er\en for those newline
-settings).
+included in data by means of the \en escape (or \er, \er\en, etc., depending on
+the newline sequence setting).
+.
 .
 .
 .SH "OUTPUT FROM THE ALTERNATIVE MATCHING FUNCTION"
@@ -475,7 +546,7 @@
 (Using the normal matching function on this data finds only "tang".) The
 longest matching string is always given first (and numbered zero).
 .P
-If \fB/g\P is present on the pattern, the search for further matches resumes
+If \fB/g\fP is present on the pattern, the search for further matches resumes
 at the end of the longest match. For example:
 .sp
     re> /(tang|tangerine|tan)/g
@@ -499,7 +570,7 @@
 match with additional subject data by means of the \eR escape sequence. For
 example:
 .sp
-    re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
+    re> /^\ed?\ed(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\ed\ed$/
   data> 23ja\eP\eD
   Partial match: 23ja
   data> n05\eR\eD
@@ -556,6 +627,21 @@
 documentation.
 .
 .
+.
+.SH "NON-PRINTING CHARACTERS"
+.rs
+.sp
+When \fBpcretest\fP is outputting text in the compiled version of a pattern,
+bytes other than 32-126 are always treated as non-printing characters are are
+therefore shown as hex escapes.
+.P
+When \fBpcretest\fP is outputting text that is a matched part of a subject
+string, it behaves in the same way, unless a different locale has been set for
+the pattern (using the \fB/L\fP modifier). In this case, the \fBisprint()\fP
+function to distinguish printing and non-printing characters.
+.
+.
+.
 .SH "SAVING AND RELOADING COMPILED PATTERNS"
 .rs
 .sp
@@ -616,16 +702,27 @@
 result is undefined.
 .
 .
+.SH "SEE ALSO"
+.rs
+.sp
+\fBpcre\fP(3), \fBpcreapi\fP(3), \fBpcrecallout\fP(3), \fBpcrematching\fP(3),
+\fBpcrepartial\fP(d), \fBpcrepattern\fP(3), \fBpcreprecompile\fP(3).
+.
+.
 .SH AUTHOR
 .rs
 .sp
+.nf
 Philip Hazel
-.br
-University Computing Service,
-.br
-Cambridge CB2 3QG, England.
-.P
-.in 0
-Last updated: 29 June 2006
-.br
-Copyright (c) 1997-2006 University of Cambridge.
+University Computing Service
+Cambridge CB2 3QH, England.
+.fi
+.
+.
+.SH REVISION
+.rs
+.sp
+.nf
+Last updated: 10 March 2009
+Copyright (c) 1997-2009 University of Cambridge.
+.fi

Modified: freeswitch/trunk/libs/pcre/doc/pcretest.txt
==============================================================================
--- freeswitch/trunk/libs/pcre/doc/pcretest.txt	(original)
+++ freeswitch/trunk/libs/pcre/doc/pcretest.txt	Mon Jun  8 18:51:30 2009
@@ -19,67 +19,93 @@
 
 OPTIONS
 
+       -b        Behave as if each regex has the /B (show bytecode)  modifier;
+                 the internal form is output after compilation.
+
        -C        Output the version number of the PCRE library, and all avail-
-                 able   information  about  the  optional  features  that  are
+                 able  information  about  the  optional  features  that   are
                  included, and then exit.
 
-       -d        Behave as if each regex has  the  /D  (debug)  modifier;  the
-                 internal form is output after compilation.
+       -d        Behave  as  if  each  regex  has the /D (debug) modifier; the
+                 internal form and information about the compiled  pattern  is
+                 output after compilation; -d is equivalent to -b -i.
 
        -dfa      Behave  as if each data line contains the \D escape sequence;
                  this    causes    the    alternative    matching    function,
                  pcre_dfa_exec(),   to   be   used  instead  of  the  standard
                  pcre_exec() function (more detail is given below).
 
+       -help     Output a brief summary these options and then exit.
+
        -i        Behave as if each regex  has  the  /I  modifier;  information
                  about the compiled pattern is given after compilation.
 
-       -m        Output  the  size  of each compiled pattern after it has been
-                 compiled. This is equivalent to adding  /M  to  each  regular
-                 expression.   For  compatibility  with  earlier  versions  of
+       -M        Behave  as if each data line contains the \M escape sequence;
+                 this causes PCRE to  discover  the  minimum  MATCH_LIMIT  and
+                 MATCH_LIMIT_RECURSION settings by calling pcre_exec() repeat-
+                 edly with different limits.
+
+       -m        Output the size of each compiled pattern after  it  has  been
+                 compiled.  This  is  equivalent  to adding /M to each regular
+                 expression.  For  compatibility  with  earlier  versions   of
                  pcretest, -s is a synonym for -m.
 
-       -o osize  Set the number of elements in the output vector that is  used
-                 when  calling  pcre_exec()  to be osize. The default value is
-                 45, which is enough for 14 capturing subexpressions. The vec-
-                 tor  size  can  be  changed  for individual matching calls by
-                 including \O in the data line (see below).
+       -o osize  Set  the number of elements in the output vector that is used
+                 when calling pcre_exec() or pcre_dfa_exec() to be osize.  The
+                 default  value is 45, which is enough for 14 capturing subex-
+                 pressions  for  pcre_exec()  or  22  different  matches   for
+                 pcre_dfa_exec().  The vector size can be changed for individ-
+                 ual matching calls by including \O  in  the  data  line  (see
+                 below).
 
-       -p        Behave as if each regex has the /P modifier; the POSIX  wrap-
-                 per  API  is used to call PCRE. None of the other options has
+       -p        Behave  as if each regex has the /P modifier; the POSIX wrap-
+                 per API is used to call PCRE. None of the other  options  has
                  any effect when -p is set.
 
-       -q        Do not output the version number of pcretest at the start  of
+       -q        Do  not output the version number of pcretest at the start of
                  execution.
 
-       -S size   On  Unix-like  systems,  set the size of the runtime stack to
+       -S size   On Unix-like systems, set the size of the  runtime  stack  to
                  size megabytes.
 
-       -t        Run each compile, study, and match many times with  a  timer,
-                 and  output resulting time per compile or match (in millisec-
-                 onds). Do not set -m with -t, because you will then  get  the
-                 size  output  a  zillion  times,  and the timing will be dis-
-                 torted.
+       -t        Run  each  compile, study, and match many times with a timer,
+                 and output resulting time per compile or match (in  millisec-
+                 onds).  Do  not set -m with -t, because you will then get the
+                 size output a zillion times, and  the  timing  will  be  dis-
+                 torted.  You  can  control  the number of iterations that are
+                 used for timing by following -t with a number (as a  separate
+                 item on the command line). For example, "-t 1000" would iter-
+                 ate 1000 times. The default is to iterate 500000 times.
+
+       -tm       This is like -t except that it times only the matching phase,
+                 not the compile or study phases.
 
 
 DESCRIPTION
 
-       If pcretest is given two filename arguments, it reads  from  the  first
+       If  pcretest  is  given two filename arguments, it reads from the first
        and writes to the second. If it is given only one filename argument, it
-       reads from that file and writes to stdout.  Otherwise,  it  reads  from
-       stdin  and  writes to stdout, and prompts for each line of input, using
+       reads  from  that  file  and writes to stdout. Otherwise, it reads from
+       stdin and writes to stdout, and prompts for each line of  input,  using
        "re>" to prompt for regular expressions, and "data>" to prompt for data
        lines.
 
+       When pcretest is built, a configuration  option  can  specify  that  it
+       should  be  linked  with the libreadline library. When this is done, if
+       the input is from a terminal, it is read using the readline() function.
+       This  provides line-editing and history facilities. The output from the
+       -help option states whether or not readline() will be used.
+
        The program handles any number of sets of input on a single input file.
-       Each set starts with a regular expression, and continues with any  num-
+       Each  set starts with a regular expression, and continues with any num-
        ber of data lines to be matched against the pattern.
 
-       Each  data line is matched separately and independently. If you want to
+       Each data line is matched separately and independently. If you want  to
        do multi-line matches, you have to use the \n escape sequence (or \r or
-       \r\n,  depending  on  the newline setting) in a single line of input to
-       encode the newline characters. There is no limit on the length of  data
-       lines; the input buffer is automatically extended if it is too small.
+       \r\n, etc., depending on the newline setting) in a single line of input
+       to  encode  the  newline  sequences. There is no limit on the length of
+       data lines; the input buffer is automatically extended  if  it  is  too
+       small.
 
        An  empty  line signals the end of the data lines, at which point a new
        regular expression is read. The regular expressions are given  enclosed
@@ -131,39 +157,49 @@
        The following table shows additional modifiers for setting PCRE options
        that do not correspond to anything in Perl:
 
-         /A       PCRE_ANCHORED
-         /C       PCRE_AUTO_CALLOUT
-         /E       PCRE_DOLLAR_ENDONLY
-         /f       PCRE_FIRSTLINE
-         /J       PCRE_DUPNAMES
-         /N       PCRE_NO_AUTO_CAPTURE
-         /U       PCRE_UNGREEDY
-         /X       PCRE_EXTRA
-         /    PCRE_NEWLINE_CR
-         /    PCRE_NEWLINE_LF
-         /  PCRE_NEWLINE_CRLF
-
-       Those specifying line endings are literal strings as shown. Details  of
-       the  meanings of these PCRE options are given in the pcreapi documenta-
-       tion.
+         /A              PCRE_ANCHORED
+         /C              PCRE_AUTO_CALLOUT
+         /E              PCRE_DOLLAR_ENDONLY
+         /f              PCRE_FIRSTLINE
+         /J              PCRE_DUPNAMES
+         /N              PCRE_NO_AUTO_CAPTURE
+         /U              PCRE_UNGREEDY
+         /X              PCRE_EXTRA
+         /           PCRE_JAVASCRIPT_COMPAT
+         /           PCRE_NEWLINE_CR
+         /           PCRE_NEWLINE_LF
+         /         PCRE_NEWLINE_CRLF
+         /      PCRE_NEWLINE_ANYCRLF
+         /          PCRE_NEWLINE_ANY
+         /  PCRE_BSR_ANYCRLF
+         /  PCRE_BSR_UNICODE
+
+       Those specifying line ending sequences are literal  strings  as  shown,
+       but  the  letters  can  be  in either case. This example sets multiline
+       matching with CRLF as the line ending sequence:
+
+         /^abc/m
+
+       Details of the meanings of these PCRE options are given in the  pcreapi
+       documentation.
 
    Finding all matches in a string
 
-       Searching for all possible matches within each subject  string  can  be
-       requested  by  the  /g  or  /G modifier. After finding a match, PCRE is
+       Searching  for  all  possible matches within each subject string can be
+       requested by the /g or /G modifier. After  finding  a  match,  PCRE  is
        called again to search the remainder of the subject string. The differ-
        ence between /g and /G is that the former uses the startoffset argument
-       to pcre_exec() to start searching at a  new  point  within  the  entire
-       string  (which  is in effect what Perl does), whereas the latter passes
-       over a shortened substring. This makes a  difference  to  the  matching
+       to  pcre_exec()  to  start  searching  at a new point within the entire
+       string (which is in effect what Perl does), whereas the  latter  passes
+       over  a  shortened  substring.  This makes a difference to the matching
        process if the pattern begins with a lookbehind assertion (including \b
        or \B).
 
-       If any call to pcre_exec() in a /g or  /G  sequence  matches  an  empty
-       string,  the next call is done with the PCRE_NOTEMPTY and PCRE_ANCHORED
-       flags set in order to search for another, non-empty, match at the  same
-       point.   If  this  second  match fails, the start offset is advanced by
-       one, and the normal match is retried. This imitates the way  Perl  han-
+       If  any  call  to  pcre_exec()  in a /g or /G sequence matches an empty
+       string, the next call is done with the PCRE_NOTEMPTY and  PCRE_ANCHORED
+       flags  set in order to search for another, non-empty, match at the same
+       point.  If this second match fails, the start  offset  is  advanced  by
+       one,  and  the normal match is retried. This imitates the way Perl han-
        dles such cases when using the /g modifier or the split() function.
 
    Other modifiers
@@ -175,38 +211,43 @@
        remainder of the subject string. This is useful  for  tests  where  the
        subject contains multiple copies of the same substring.
 
-       The  /L modifier must be followed directly by the name of a locale, for
+       The  /B modifier is a debugging feature. It requests that pcretest out-
+       put a representation of the compiled byte code after compilation.  Nor-
+       mally  this  information contains length and offset values; however, if
+       /Z is also present, this data is replaced by spaces. This is a  special
+       feature for use in the automatic test scripts; it ensures that the same
+       output is generated for different internal link sizes.
+
+       The /L modifier must be followed directly by the name of a locale,  for
        example,
 
          /pattern/Lfr_FR
 
        For this reason, it must be the last modifier. The given locale is set,
-       pcre_maketables()  is called to build a set of character tables for the
-       locale, and this is then passed to pcre_compile()  when  compiling  the
-       regular  expression.  Without  an  /L  modifier,  NULL is passed as the
-       tables pointer; that is, /L applies only to the expression on which  it
+       pcre_maketables() is called to build a set of character tables for  the
+       locale,  and  this  is then passed to pcre_compile() when compiling the
+       regular expression. Without an /L  modifier,  NULL  is  passed  as  the
+       tables  pointer; that is, /L applies only to the expression on which it
        appears.
 
-       The  /I  modifier  requests  that pcretest output information about the
-       compiled pattern (whether it is anchored, has a fixed first  character,
-       and  so  on). It does this by calling pcre_fullinfo() after compiling a
-       pattern. If the pattern is studied, the results of that are  also  out-
+       The /I modifier requests that pcretest  output  information  about  the
+       compiled  pattern (whether it is anchored, has a fixed first character,
+       and so on). It does this by calling pcre_fullinfo() after  compiling  a
+       pattern.  If  the pattern is studied, the results of that are also out-
        put.
 
-       The /D modifier is a PCRE debugging feature, which also assumes /I.  It
-       causes the internal form of compiled regular expressions to  be  output
-       after compilation. If the pattern was studied, the information returned
-       is also output.
+       The /D modifier is a PCRE debugging feature, and is equivalent to  /BI,
+       that is, both the /B and the /I modifiers.
 
        The /F modifier causes pcretest to flip the byte order of the fields in
-       the  compiled  pattern  that  contain  2-byte  and 4-byte numbers. This
-       facility is for testing the feature in PCRE that allows it  to  execute
+       the compiled pattern that  contain  2-byte  and  4-byte  numbers.  This
+       facility  is  for testing the feature in PCRE that allows it to execute
        patterns that were compiled on a host with a different endianness. This
-       feature is not available when the POSIX  interface  to  PCRE  is  being
-       used,  that is, when the /P pattern modifier is specified. See also the
+       feature  is  not  available  when  the POSIX interface to PCRE is being
+       used, that is, when the /P pattern modifier is specified. See also  the
        section about saving and reloading compiled patterns below.
 
-       The /S modifier causes pcre_study() to be called after  the  expression
+       The  /S  modifier causes pcre_study() to be called after the expression
        has been compiled, and the results used when the expression is matched.
 
        The /M modifier causes the size of memory block used to hold  the  com-
@@ -216,38 +257,38 @@
        rather than its native API. When this  is  done,  all  other  modifiers
        except  /i,  /m, and /+ are ignored. REG_ICASE is set if /i is present,
        and REG_NEWLINE is set if /m is present. The  wrapper  functions  force
-       PCRE_DOLLAR_ENDONLY  always, and PCRE_DOTALL unless REG_NEWLINE is set.
+       PCRE_DOLLAR_ENDONLY always, and PCRE_DOTALL unless REG_NEWLINE is set.
 
-       The /8 modifier causes pcretest to call PCRE with the PCRE_UTF8  option
-       set.  This  turns on support for UTF-8 character handling in PCRE, pro-
-       vided that it was compiled with this  support  enabled.  This  modifier
+       The  /8 modifier causes pcretest to call PCRE with the PCRE_UTF8 option
+       set. This turns on support for UTF-8 character handling in  PCRE,  pro-
+       vided  that  it  was  compiled with this support enabled. This modifier
        also causes any non-printing characters in output strings to be printed
        using the \x{hh...} notation if they are valid UTF-8 sequences.
 
-       If the /? modifier  is  used  with  /8,  it  causes  pcretest  to  call
-       pcre_compile()  with  the  PCRE_NO_UTF8_CHECK  option,  to suppress the
+       If  the  /?  modifier  is  used  with  /8,  it  causes pcretest to call
+       pcre_compile() with the  PCRE_NO_UTF8_CHECK  option,  to  suppress  the
        checking of the string for UTF-8 validity.
 
 
 DATA LINES
 
-       Before each data line is passed to pcre_exec(),  leading  and  trailing
-       whitespace  is  removed,  and it is then scanned for \ escapes. Some of
-       these are pretty esoteric features, intended for checking out  some  of
-       the  more  complicated features of PCRE. If you are just testing "ordi-
-       nary" regular expressions, you probably don't need any  of  these.  The
+       Before  each  data  line is passed to pcre_exec(), leading and trailing
+       whitespace is removed, and it is then scanned for \  escapes.  Some  of
+       these  are  pretty esoteric features, intended for checking out some of
+       the more complicated features of PCRE. If you are just  testing  "ordi-
+       nary"  regular  expressions,  you probably don't need any of these. The
        following escapes are recognized:
 
-         \a         alarm (= BEL)
-         \b         backspace
-         \e         escape
-         \f         formfeed
-         \n         newline
+         \a         alarm (BEL, \x07)
+         \b         backspace (\x08)
+         \e         escape (\x27)
+         \f         formfeed (\x0c)
+         \n         newline (\x0a)
          \qdd       set the PCRE_MATCH_LIMIT limit to dd
                       (any number of digits)
-         \r         carriage return
-         \t         tab
-         \v         vertical tab
+         \r         carriage return (\x0d)
+         \t         tab (\x09)
+         \v         vertical tab (\x0b)
          \nnn       octal character (up to 3 octal digits)
          \xhh       hexadecimal character (up to 2 hex digits)
          \x{hh...}  hexadecimal character, any number of digits
@@ -304,12 +345,19 @@
                       or pcre_dfa_exec()
          \    pass the PCRE_NEWLINE_CRLF option to pcre_exec()
                       or pcre_dfa_exec()
+         \ pass the PCRE_NEWLINE_ANYCRLF option to pcre_exec()
+                      or pcre_dfa_exec()
+         \     pass the PCRE_NEWLINE_ANY option to pcre_exec()
+                      or pcre_dfa_exec()
 
-       The  escapes  that specify line endings are literal strings, exactly as
-       shown.  A backslash followed by anything else just escapes the anything
-       else.  If  the  very last character is a backslash, it is ignored. This
-       gives a way of passing an empty line as data, since a real  empty  line
-       terminates the data input.
+       The escapes that specify line ending  sequences  are  literal  strings,
+       exactly as shown. No more than one newline setting should be present in
+       any data line.
+
+       A backslash followed by anything else just escapes the  anything  else.
+       If  the very last character is a backslash, it is ignored. This gives a
+       way of passing an empty line as data, since a real  empty  line  termi-
+       nates the data input.
 
        If  \M  is present, pcretest calls pcre_exec() several times, with dif-
        ferent values in the match_limit and  match_limit_recursion  fields  of
@@ -335,38 +383,42 @@
        The use of \x{hh...} to represent UTF-8 characters is not dependent  on
        the  use  of  the  /8 modifier on the pattern. It is recognized always.
        There may be any number of hexadecimal digits inside  the  braces.  The
-       result  is from one to six bytes, encoded according to the UTF-8 rules.
+       result  is  from  one  to  six bytes, encoded according to the original
+       UTF-8 rules of RFC 2279. This allows for  values  in  the  range  0  to
+       0x7FFFFFFF.  Note  that not all of those are valid Unicode code points,
+       or indeed valid UTF-8 characters according to the later  rules  in  RFC
+       3629.
 
 
 THE ALTERNATIVE MATCHING FUNCTION
 
-       By  default,  pcretest  uses  the  standard  PCRE  matching   function,
+       By   default,  pcretest  uses  the  standard  PCRE  matching  function,
        pcre_exec() to match each data line. From release 6.0, PCRE supports an
-       alternative matching function, pcre_dfa_test(),  which  operates  in  a
-       different  way,  and has some restrictions. The differences between the
+       alternative  matching  function,  pcre_dfa_test(),  which operates in a
+       different way, and has some restrictions. The differences  between  the
        two functions are described in the pcrematching documentation.
 
-       If a data line contains the \D escape sequence, or if the command  line
-       contains  the -dfa option, the alternative matching function is called.
+       If  a data line contains the \D escape sequence, or if the command line
+       contains the -dfa option, the alternative matching function is  called.
        This function finds all possible matches at a given point. If, however,
-       the  \F escape sequence is present in the data line, it stops after the
+       the \F escape sequence is present in the data line, it stops after  the
        first match is found. This is always the shortest possible match.
 
 
 DEFAULT OUTPUT FROM PCRETEST
 
-       This section describes the output when the  normal  matching  function,
+       This  section  describes  the output when the normal matching function,
        pcre_exec(), is being used.
 
        When a match succeeds, pcretest outputs the list of captured substrings
-       that pcre_exec() returns, starting with number 0 for  the  string  that
+       that  pcre_exec()  returns,  starting with number 0 for the string that
        matched the whole pattern. Otherwise, it outputs "No match" or "Partial
-       match" when pcre_exec() returns PCRE_ERROR_NOMATCH  or  PCRE_ERROR_PAR-
-       TIAL,  respectively, and otherwise the PCRE negative error number. Here
+       match"  when  pcre_exec() returns PCRE_ERROR_NOMATCH or PCRE_ERROR_PAR-
+       TIAL, respectively, and otherwise the PCRE negative error number.  Here
        is an example of an interactive pcretest run.
 
          $ pcretest
-         PCRE version 5.00 07-Sep-2004
+         PCRE version 7.0 30-Nov-2006
 
            re> /^abc(\d+)/
          data> abc123
@@ -375,18 +427,35 @@
          data> xyz
          No match
 
+       Note  that unset capturing substrings that are not followed by one that
+       is set are not returned by pcre_exec(), and are not shown by  pcretest.
+       In  the following example, there are two capturing substrings, but when
+       the first data line is matched, the  second,  unset  substring  is  not
+       shown.  An "internal" unset substring is shown as "", as for the
+       second data line.
+
+           re> /(a)|(b)/
+         data> a
+          0: a
+          1: a
+         data> b
+          0: b
+          1: 
+          2: b
+
        If the strings contain any non-printing characters, they are output  as
        \0x  escapes,  or  as \x{...} escapes if the /8 modifier was present on
-       the pattern. If the pattern has the /+ modifier, the  output  for  sub-
-       string  0 is followed by the the rest of the subject string, identified
-       by "0+" like this:
+       the pattern. See below for the definition of  non-printing  characters.
+       If  the pattern has the /+ modifier, the output for substring 0 is fol-
+       lowed by the the rest of the subject string, identified  by  "0+"  like
+       this:
 
            re> /cat/+
          data> cataract
           0: cat
           0+ aract
 
-       If the pattern has the /g or /G modifier,  the  results  of  successive
+       If  the  pattern  has  the /g or /G modifier, the results of successive
        matching attempts are output in sequence, like this:
 
            re> /\Bi(\w\w)/g
@@ -400,24 +469,24 @@
 
        "No match" is output only if the first match attempt fails.
 
-       If  any  of the sequences \C, \G, or \L are present in a data line that
-       is successfully matched, the substrings extracted  by  the  convenience
+       If any of the sequences \C, \G, or \L are present in a data  line  that
+       is  successfully  matched,  the substrings extracted by the convenience
        functions are output with C, G, or L after the string number instead of
        a colon. This is in addition to the normal full list. The string length
-       (that  is,  the return from the extraction function) is given in paren-
+       (that is, the return from the extraction function) is given  in  paren-
        theses after each string for \C and \G.
 
-       Note that while patterns can be continued over several lines  (a  plain
+       Note that whereas patterns can be continued over several lines (a plain
        ">" prompt is used for continuations), data lines may not. However new-
-       lines can be included in data by means of the \n escape (or \r or  \r\n
-       for those newline settings).
+       lines  can  be included in data by means of the \n escape (or \r, \r\n,
+       etc., depending on the newline sequence setting).
 
 
 OUTPUT FROM THE ALTERNATIVE MATCHING FUNCTION
 
-       When  the  alternative  matching function, pcre_dfa_exec(), is used (by
-       means of the \D escape sequence or the -dfa command line  option),  the
-       output  consists  of  a list of all the matches that start at the first
+       When the alternative matching function, pcre_dfa_exec(),  is  used  (by
+       means  of  the \D escape sequence or the -dfa command line option), the
+       output consists of a list of all the matches that start  at  the  first
        point in the subject where there is at least one match. For example:
 
            re> /(tang|tangerine|tan)/
@@ -426,11 +495,11 @@
           1: tang
           2: tan
 
-       (Using the normal matching function on this data  finds  only  "tang".)
-       The  longest matching string is always given first (and numbered zero).
+       (Using  the  normal  matching function on this data finds only "tang".)
+       The longest matching string is always given first (and numbered zero).
 
-       If /gP is present on  the  pattern,  the  search  for  further  matches
-       resumes at the end of the longest match. For example:
+       If /g is present on the pattern, the search for further matches resumes
+       at the end of the longest match. For example:
 
            re> /(tang|tangerine|tan)/g
          data> yellow tangerine and tangy sultana\D
@@ -453,7 +522,7 @@
        can  restart  the match with additional subject data by means of the \R
        escape sequence. For example:
 
-           re> /^?(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)$/
+           re> /^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$/
          data> 23ja\P\D
          Partial match: 23ja
          data> n05\R\D
@@ -503,67 +572,88 @@
        the pcrecallout documentation.
 
 
+NON-PRINTING CHARACTERS
+
+       When pcretest is outputting text in the compiled version of a  pattern,
+       bytes  other  than 32-126 are always treated as non-printing characters
+       are are therefore shown as hex escapes.
+
+       When pcretest is outputting text that is a matched part  of  a  subject
+       string,  it behaves in the same way, unless a different locale has been
+       set for the  pattern  (using  the  /L  modifier).  In  this  case,  the
+       isprint() function to distinguish printing and non-printing characters.
+
+
 SAVING AND RELOADING COMPILED PATTERNS
 
-       The facilities described in this section are  not  available  when  the
+       The  facilities  described  in  this section are not available when the
        POSIX inteface to PCRE is being used, that is, when the /P pattern mod-
        ifier is specified.
 
        When the POSIX interface is not in use, you can cause pcretest to write
-       a  compiled  pattern to a file, by following the modifiers with > and a
+       a compiled pattern to a file, by following the modifiers with >  and  a
        file name.  For example:
 
          /pattern/im >/some/file
 
-       See the pcreprecompile documentation for a discussion about saving  and
+       See  the pcreprecompile documentation for a discussion about saving and
        re-using compiled patterns.
 
-       The  data  that  is  written  is  binary. The first eight bytes are the
-       length of the compiled pattern data  followed  by  the  length  of  the
-       optional  study  data,  each  written as four bytes in big-endian order
-       (most significant byte first). If there is no study  data  (either  the
+       The data that is written is binary.  The  first  eight  bytes  are  the
+       length  of  the  compiled  pattern  data  followed by the length of the
+       optional study data, each written as four  bytes  in  big-endian  order
+       (most  significant  byte  first). If there is no study data (either the
        pattern was not studied, or studying did not return any data), the sec-
-       ond length is zero. The lengths are followed by an exact  copy  of  the
+       ond  length  is  zero. The lengths are followed by an exact copy of the
        compiled pattern. If there is additional study data, this follows imme-
-       diately after the compiled pattern. After writing  the  file,  pcretest
+       diately  after  the  compiled pattern. After writing the file, pcretest
        expects to read a new pattern.
 
        A saved pattern can be reloaded into pcretest by specifing < and a file
-       name instead of a pattern. The name of the file must not  contain  a  <
-       character,  as  otherwise pcretest will interpret the line as a pattern
+       name  instead  of  a pattern. The name of the file must not contain a <
+       character, as otherwise pcretest will interpret the line as  a  pattern
        delimited by < characters.  For example:
 
           re> nul 2>nul
 
-SET BORLAND=c:\usr\apps\bcc55
+:: sh configure
 
-sh configure
+:: check for needed header files
+if not exist pcre.h copy pcre.h.generic pcre.h
+if not exist config.h copy config.h.generic config.h
 
-bcc32 -DDFTABLES -DSTATIC -DVPCOMPAT -I%BORLAND%\include -L%BORLAND%\lib dftables.c
+bcc32 -DDFTABLES %COMPILE_DEFAULTS% -L%BORLAND%\lib dftables.c
+IF ERRORLEVEL 1 GOTO ERROR
 
-dftables > chartables.c
+:: dftables > chartables.c
+dftables pcre_chartables.c
 
-bcc32 -c -RT- -y- -v- -u- -P- -O2 -5 -DSTATIC -DVPCOMPAT -UDFTABLES -I%BORLAND%\include get.c maketables.c pcre.c study.c
+REM compile and link the PCRE library into lib: option -B for ASM compile works too
+bcc32 -a4 -c -RT- -y- -v- -u- -R- -Q- -X -d -fp -ff -P- -O2 -Oc -Ov -3 -w-8004 -w-8064 -w-8065 -w-8012 -UDFTABLES -DVPCOMPAT %COMPILE_DEFAULTS% @makevp_c.txt
+IF ERRORLEVEL 1 GOTO ERROR
 
-tlib %BORLAND%\lib\cw32.lib *calloc *del *strncmp *memcpy *memmove *memset
-tlib pcre.lib +get.obj +maketables.obj +pcre.obj +study.obj +calloc.obj +del.obj +strncmp.obj +memcpy.obj +memmove.obj +memset.obj
+tlib %BORLAND%\lib\cw32.lib *calloc *del *strncmp *memcpy *memmove *memset *memcmp *strlen
+IF ERRORLEVEL 1 GOTO ERROR
+tlib pcre%PCRE_VER%.lib @makevp_l.txt +calloc.obj +del.obj +strncmp.obj +memcpy.obj +memmove.obj +memset.obj +memcmp.obj +strlen.obj
+IF ERRORLEVEL 1 GOTO ERROR
 
-del *.obj *.exe *.tds *.bak >nul 2>nul
+del *.obj *.tds *.bak >nul 2>nul
 
 echo ---
 echo Now the library should be complete. Please check all messages above.
 echo Don't care for warnings, it's OK.
+goto END
+
+:ERROR
+echo ---
+echo Error while compiling PCRE. Aborting...
+pause
+goto END
+
+:END

Added: freeswitch/trunk/libs/pcre/makevp_c.txt
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/makevp_c.txt	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,20 @@
+pcre_chartables.c
+pcre_compile.c
+pcre_config.c
+pcre_dfa_exec.c
+pcre_exec.c
+pcre_fullinfo.c
+pcre_get.c
+pcre_globals.c
+pcre_info.c
+pcre_maketables.c
+pcre_newline.c
+pcre_ord2utf8.c
+pcre_refcount.c
+pcre_study.c
+pcre_tables.c
+pcre_try_flipped.c
+pcre_ucd.c
+pcre_valid_utf8.c
+pcre_version.c
+pcre_xclass.c

Added: freeswitch/trunk/libs/pcre/makevp_l.txt
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/makevp_l.txt	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,20 @@
++pcre_chartables.obj        &
++pcre_compile.obj           &
++pcre_config.obj	    &
++pcre_dfa_exec.obj          &
++pcre_exec.obj		    &
++pcre_fullinfo.obj          &
++pcre_get.obj		    &
++pcre_globals.obj           &
++pcre_info.obj		    &
++pcre_maketables.obj        &
++pcre_newline.obj           &
++pcre_ord2utf8.obj          &
++pcre_refcount.obj          &
++pcre_study.obj		    &
++pcre_tables.obj	    &
++pcre_try_flipped.obj       &
++pcre_ucd.obj               &
++pcre_valid_utf8.obj        &
++pcre_version.obj           &
++pcre_xclass.obj

Modified: freeswitch/trunk/libs/pcre/pcre-config.in
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre-config.in	(original)
+++ freeswitch/trunk/libs/pcre/pcre-config.in	Mon Jun  8 18:51:30 2009
@@ -17,6 +17,9 @@
   *SunOS*)
   libR=" -R at libdir@"
   ;;
+  *BSD*)
+  libR=" -Wl,-R at libdir@"
+  ;;
 esac
 
 while test $# -gt 0; do
@@ -43,7 +46,7 @@
       echo $exec_prefix
       ;;
     --version)
-      echo @PCRE_VERSION@
+      echo @PACKAGE_VERSION@
       ;;
     --cflags | --cflags-posix)
       if test @includedir@ != /usr/include ; then

Modified: freeswitch/trunk/libs/pcre/pcre.h
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre.h	(original)
+++ freeswitch/trunk/libs/pcre/pcre.h	Mon Jun  8 18:51:30 2009
@@ -5,7 +5,7 @@
 /* This is the public header file for the PCRE library, to be #included by
 applications that call the PCRE functions.
 
-           Copyright (c) 1997-2005 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -41,44 +41,46 @@
 
 /* The current PCRE version information. */
 
-/* NOTES FOR FUTURE MAINTAINERS: Do not use numbers with leading zeros, because
-they may be treated as octal constants. The PCRE_PRERELEASE feature is for
-identifying release candidates. It might be defined as -RC2, for example. In
-real releases, it should be defined empty. Do not change the alignment of these
-statments. The code in ./configure greps out the version numbers by using "cut"
-to get values from column 29 onwards. These are substituted into pcre-config
-and libpcre.pc. The values are not put into configure.ac and substituted here
-(which would simplify this issue) because that makes life harder for those who
-cannot run ./configure. As it now stands, this file need not be edited in that
-circumstance. */
-
-#define PCRE_MAJOR          6
-#define PCRE_MINOR          7
-#define PCRE_PRERELEASE
-#define PCRE_DATE           04-Jul-2006
-
-/* Win32 uses DLL by default; it needs special stuff for exported functions
-when building PCRE. */
-
-#ifdef _WIN32
-#  ifdef PCRE_DEFINITION
-#    ifdef DLL_EXPORT
-#      define PCRE_DATA_SCOPE __declspec(dllexport)
+#define PCRE_MAJOR          7
+#define PCRE_MINOR          9
+#define PCRE_PRERELEASE     
+#define PCRE_DATE           2009-04-11
+
+/* When an application links to a PCRE DLL in Windows, the symbols that are
+imported have to be identified as such. When building PCRE, the appropriate
+export setting is defined in pcre_internal.h, which includes this file. So we
+don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
+
+#if defined(_WIN32) && !defined(PCRE_STATIC)
+#  ifndef PCRE_EXP_DECL
+#    define PCRE_EXP_DECL  extern __declspec(dllimport)
+#  endif
+#  ifdef __cplusplus
+#    ifndef PCRECPP_EXP_DECL
+#      define PCRECPP_EXP_DECL  extern __declspec(dllimport)
 #    endif
-#  else
-#    ifndef PCRE_STATIC
-#      define PCRE_DATA_SCOPE extern __declspec(dllimport)
+#    ifndef PCRECPP_EXP_DEFN
+#      define PCRECPP_EXP_DEFN  __declspec(dllimport)
 #    endif
 #  endif
 #endif
 
-/* Otherwise, we use the standard "extern". */
+/* By default, we use the standard "extern" declarations. */
 
-#ifndef PCRE_DATA_SCOPE
+#ifndef PCRE_EXP_DECL
 #  ifdef __cplusplus
-#    define PCRE_DATA_SCOPE     extern "C"
+#    define PCRE_EXP_DECL  extern "C"
 #  else
-#    define PCRE_DATA_SCOPE     extern
+#    define PCRE_EXP_DECL  extern
+#  endif
+#endif
+
+#ifdef __cplusplus
+#  ifndef PCRECPP_EXP_DECL
+#    define PCRECPP_EXP_DECL  extern
+#  endif
+#  ifndef PCRECPP_EXP_DEFN
+#    define PCRECPP_EXP_DEFN
 #  endif
 #endif
 
@@ -93,7 +95,8 @@
 extern "C" {
 #endif
 
-/* Options */
+/* Options. Some are compile-time only, some are run-time only, and some are
+both, so we keep them all distinct. */
 
 #define PCRE_CASELESS           0x00000001
 #define PCRE_MULTILINE          0x00000002
@@ -118,6 +121,13 @@
 #define PCRE_NEWLINE_CR         0x00100000
 #define PCRE_NEWLINE_LF         0x00200000
 #define PCRE_NEWLINE_CRLF       0x00300000
+#define PCRE_NEWLINE_ANY        0x00400000
+#define PCRE_NEWLINE_ANYCRLF    0x00500000
+#define PCRE_BSR_ANYCRLF        0x00800000
+#define PCRE_BSR_UNICODE        0x01000000
+#define PCRE_JAVASCRIPT_COMPAT  0x02000000
+#define PCRE_NO_START_OPTIMIZE  0x04000000
+#define PCRE_NO_START_OPTIMISE  0x04000000
 
 /* Exec-time and get/set-time error codes */
 
@@ -125,7 +135,8 @@
 #define PCRE_ERROR_NULL            (-2)
 #define PCRE_ERROR_BADOPTION       (-3)
 #define PCRE_ERROR_BADMAGIC        (-4)
-#define PCRE_ERROR_UNKNOWN_NODE    (-5)
+#define PCRE_ERROR_UNKNOWN_OPCODE  (-5)
+#define PCRE_ERROR_UNKNOWN_NODE    (-5)  /* For backward compatibility */
 #define PCRE_ERROR_NOMEMORY        (-6)
 #define PCRE_ERROR_NOSUBSTRING     (-7)
 #define PCRE_ERROR_MATCHLIMIT      (-8)
@@ -142,6 +153,8 @@
 #define PCRE_ERROR_DFA_WSSIZE     (-19)
 #define PCRE_ERROR_DFA_RECURSE    (-20)
 #define PCRE_ERROR_RECURSIONLIMIT (-21)
+#define PCRE_ERROR_NULLWSLIMIT    (-22)  /* No longer actually used */
+#define PCRE_ERROR_BADNEWLINE     (-23)
 
 /* Request types for pcre_fullinfo() */
 
@@ -158,6 +171,9 @@
 #define PCRE_INFO_NAMETABLE          9
 #define PCRE_INFO_STUDYSIZE         10
 #define PCRE_INFO_DEFAULT_TABLES    11
+#define PCRE_INFO_OKPARTIAL         12
+#define PCRE_INFO_JCHANGED          13
+#define PCRE_INFO_HASCRORLF         14
 
 /* Request types for pcre_config(). Do not re-arrange, in order to remain
 compatible. */
@@ -170,6 +186,7 @@
 #define PCRE_CONFIG_STACKRECURSE            5
 #define PCRE_CONFIG_UNICODE_PROPERTIES      6
 #define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
+#define PCRE_CONFIG_BSR                     8
 
 /* Bit flags for the pcre_extra structure. Do not re-arrange or redefine
 these bits, just add new ones on the end, in order to remain compatible. */
@@ -236,52 +253,52 @@
 have to take another form. */
 
 #ifndef VPCOMPAT
-PCRE_DATA_SCOPE void *(*pcre_malloc)(size_t);
-PCRE_DATA_SCOPE void  (*pcre_free)(void *);
-PCRE_DATA_SCOPE void *(*pcre_stack_malloc)(size_t);
-PCRE_DATA_SCOPE void  (*pcre_stack_free)(void *);
-PCRE_DATA_SCOPE int   (*pcre_callout)(pcre_callout_block *);
+PCRE_EXP_DECL void *(*pcre_malloc)(size_t);
+PCRE_EXP_DECL void  (*pcre_free)(void *);
+PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
+PCRE_EXP_DECL void  (*pcre_stack_free)(void *);
+PCRE_EXP_DECL int   (*pcre_callout)(pcre_callout_block *);
 #else   /* VPCOMPAT */
-PCRE_DATA_SCOPE void *pcre_malloc(size_t);
-PCRE_DATA_SCOPE void  pcre_free(void *);
-PCRE_DATA_SCOPE void *pcre_stack_malloc(size_t);
-PCRE_DATA_SCOPE void  pcre_stack_free(void *);
-PCRE_DATA_SCOPE int   pcre_callout(pcre_callout_block *);
+PCRE_EXP_DECL void *pcre_malloc(size_t);
+PCRE_EXP_DECL void  pcre_free(void *);
+PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
+PCRE_EXP_DECL void  pcre_stack_free(void *);
+PCRE_EXP_DECL int   pcre_callout(pcre_callout_block *);
 #endif  /* VPCOMPAT */
 
 /* Exported PCRE functions */
 
-PCRE_DATA_SCOPE pcre *pcre_compile(const char *, int, const char **, int *,
+PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,
                   const unsigned char *);
-PCRE_DATA_SCOPE pcre *pcre_compile2(const char *, int, int *, const char **,
+PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,
                   int *, const unsigned char *);
-PCRE_DATA_SCOPE int  pcre_config(int, void *);
-PCRE_DATA_SCOPE int  pcre_copy_named_substring(const pcre *, const char *,
+PCRE_EXP_DECL int  pcre_config(int, void *);
+PCRE_EXP_DECL int  pcre_copy_named_substring(const pcre *, const char *,
                   int *, int, const char *, char *, int);
-PCRE_DATA_SCOPE int  pcre_copy_substring(const char *, int *, int, int, char *,
+PCRE_EXP_DECL int  pcre_copy_substring(const char *, int *, int, int, char *,
                   int);
-PCRE_DATA_SCOPE int  pcre_dfa_exec(const pcre *, const pcre_extra *,
+PCRE_EXP_DECL int  pcre_dfa_exec(const pcre *, const pcre_extra *,
                   const char *, int, int, int, int *, int , int *, int);
-PCRE_DATA_SCOPE int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
+PCRE_EXP_DECL int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
                    int, int, int, int *, int);
-PCRE_DATA_SCOPE void pcre_free_substring(const char *);
-PCRE_DATA_SCOPE void pcre_free_substring_list(const char **);
-PCRE_DATA_SCOPE int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
+PCRE_EXP_DECL void pcre_free_substring(const char *);
+PCRE_EXP_DECL void pcre_free_substring_list(const char **);
+PCRE_EXP_DECL int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
                   void *);
-PCRE_DATA_SCOPE int  pcre_get_named_substring(const pcre *, const char *,
+PCRE_EXP_DECL int  pcre_get_named_substring(const pcre *, const char *,
                   int *, int, const char *, const char **);
-PCRE_DATA_SCOPE int  pcre_get_stringnumber(const pcre *, const char *);
-PCRE_DATA_SCOPE int  pcre_get_stringtable_entries(const pcre *, const char *,
+PCRE_EXP_DECL int  pcre_get_stringnumber(const pcre *, const char *);
+PCRE_EXP_DECL int  pcre_get_stringtable_entries(const pcre *, const char *,
                   char **, char **);
-PCRE_DATA_SCOPE int  pcre_get_substring(const char *, int *, int, int,
+PCRE_EXP_DECL int  pcre_get_substring(const char *, int *, int, int,
                   const char **);
-PCRE_DATA_SCOPE int  pcre_get_substring_list(const char *, int *, int,
+PCRE_EXP_DECL int  pcre_get_substring_list(const char *, int *, int,
                   const char ***);
-PCRE_DATA_SCOPE int  pcre_info(const pcre *, int *, int *);
-PCRE_DATA_SCOPE const unsigned char *pcre_maketables(void);
-PCRE_DATA_SCOPE int  pcre_refcount(pcre *, int);
-PCRE_DATA_SCOPE pcre_extra *pcre_study(const pcre *, int, const char **);
-PCRE_DATA_SCOPE const char *pcre_version(void);
+PCRE_EXP_DECL int  pcre_info(const pcre *, int *, int *);
+PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
+PCRE_EXP_DECL int  pcre_refcount(pcre *, int);
+PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);
+PCRE_EXP_DECL const char *pcre_version(void);
 
 #ifdef __cplusplus
 }  /* extern "C" */

Added: freeswitch/trunk/libs/pcre/pcre.h.generic
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/pcre.h.generic	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,307 @@
+/*************************************************
+*       Perl-Compatible Regular Expressions      *
+*************************************************/
+
+/* This is the public header file for the PCRE library, to be #included by
+applications that call the PCRE functions.
+
+           Copyright (c) 1997-2009 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef _PCRE_H
+#define _PCRE_H
+
+/* The current PCRE version information. */
+
+#define PCRE_MAJOR          7
+#define PCRE_MINOR          9
+#define PCRE_PRERELEASE     
+#define PCRE_DATE           2009-04-11
+
+/* When an application links to a PCRE DLL in Windows, the symbols that are
+imported have to be identified as such. When building PCRE, the appropriate
+export setting is defined in pcre_internal.h, which includes this file. So we
+don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
+
+#if defined(_WIN32) && !defined(PCRE_STATIC)
+#  ifndef PCRE_EXP_DECL
+#    define PCRE_EXP_DECL  extern __declspec(dllimport)
+#  endif
+#  ifdef __cplusplus
+#    ifndef PCRECPP_EXP_DECL
+#      define PCRECPP_EXP_DECL  extern __declspec(dllimport)
+#    endif
+#    ifndef PCRECPP_EXP_DEFN
+#      define PCRECPP_EXP_DEFN  __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+/* By default, we use the standard "extern" declarations. */
+
+#ifndef PCRE_EXP_DECL
+#  ifdef __cplusplus
+#    define PCRE_EXP_DECL  extern "C"
+#  else
+#    define PCRE_EXP_DECL  extern
+#  endif
+#endif
+
+#ifdef __cplusplus
+#  ifndef PCRECPP_EXP_DECL
+#    define PCRECPP_EXP_DECL  extern
+#  endif
+#  ifndef PCRECPP_EXP_DEFN
+#    define PCRECPP_EXP_DEFN
+#  endif
+#endif
+
+/* Have to include stdlib.h in order to ensure that size_t is defined;
+it is needed here for malloc. */
+
+#include 
+
+/* Allow for C++ users */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Options. Some are compile-time only, some are run-time only, and some are
+both, so we keep them all distinct. */
+
+#define PCRE_CASELESS           0x00000001
+#define PCRE_MULTILINE          0x00000002
+#define PCRE_DOTALL             0x00000004
+#define PCRE_EXTENDED           0x00000008
+#define PCRE_ANCHORED           0x00000010
+#define PCRE_DOLLAR_ENDONLY     0x00000020
+#define PCRE_EXTRA              0x00000040
+#define PCRE_NOTBOL             0x00000080
+#define PCRE_NOTEOL             0x00000100
+#define PCRE_UNGREEDY           0x00000200
+#define PCRE_NOTEMPTY           0x00000400
+#define PCRE_UTF8               0x00000800
+#define PCRE_NO_AUTO_CAPTURE    0x00001000
+#define PCRE_NO_UTF8_CHECK      0x00002000
+#define PCRE_AUTO_CALLOUT       0x00004000
+#define PCRE_PARTIAL            0x00008000
+#define PCRE_DFA_SHORTEST       0x00010000
+#define PCRE_DFA_RESTART        0x00020000
+#define PCRE_FIRSTLINE          0x00040000
+#define PCRE_DUPNAMES           0x00080000
+#define PCRE_NEWLINE_CR         0x00100000
+#define PCRE_NEWLINE_LF         0x00200000
+#define PCRE_NEWLINE_CRLF       0x00300000
+#define PCRE_NEWLINE_ANY        0x00400000
+#define PCRE_NEWLINE_ANYCRLF    0x00500000
+#define PCRE_BSR_ANYCRLF        0x00800000
+#define PCRE_BSR_UNICODE        0x01000000
+#define PCRE_JAVASCRIPT_COMPAT  0x02000000
+#define PCRE_NO_START_OPTIMIZE  0x04000000
+#define PCRE_NO_START_OPTIMISE  0x04000000
+
+/* Exec-time and get/set-time error codes */
+
+#define PCRE_ERROR_NOMATCH         (-1)
+#define PCRE_ERROR_NULL            (-2)
+#define PCRE_ERROR_BADOPTION       (-3)
+#define PCRE_ERROR_BADMAGIC        (-4)
+#define PCRE_ERROR_UNKNOWN_OPCODE  (-5)
+#define PCRE_ERROR_UNKNOWN_NODE    (-5)  /* For backward compatibility */
+#define PCRE_ERROR_NOMEMORY        (-6)
+#define PCRE_ERROR_NOSUBSTRING     (-7)
+#define PCRE_ERROR_MATCHLIMIT      (-8)
+#define PCRE_ERROR_CALLOUT         (-9)  /* Never used by PCRE itself */
+#define PCRE_ERROR_BADUTF8        (-10)
+#define PCRE_ERROR_BADUTF8_OFFSET (-11)
+#define PCRE_ERROR_PARTIAL        (-12)
+#define PCRE_ERROR_BADPARTIAL     (-13)
+#define PCRE_ERROR_INTERNAL       (-14)
+#define PCRE_ERROR_BADCOUNT       (-15)
+#define PCRE_ERROR_DFA_UITEM      (-16)
+#define PCRE_ERROR_DFA_UCOND      (-17)
+#define PCRE_ERROR_DFA_UMLIMIT    (-18)
+#define PCRE_ERROR_DFA_WSSIZE     (-19)
+#define PCRE_ERROR_DFA_RECURSE    (-20)
+#define PCRE_ERROR_RECURSIONLIMIT (-21)
+#define PCRE_ERROR_NULLWSLIMIT    (-22)  /* No longer actually used */
+#define PCRE_ERROR_BADNEWLINE     (-23)
+
+/* Request types for pcre_fullinfo() */
+
+#define PCRE_INFO_OPTIONS            0
+#define PCRE_INFO_SIZE               1
+#define PCRE_INFO_CAPTURECOUNT       2
+#define PCRE_INFO_BACKREFMAX         3
+#define PCRE_INFO_FIRSTBYTE          4
+#define PCRE_INFO_FIRSTCHAR          4  /* For backwards compatibility */
+#define PCRE_INFO_FIRSTTABLE         5
+#define PCRE_INFO_LASTLITERAL        6
+#define PCRE_INFO_NAMEENTRYSIZE      7
+#define PCRE_INFO_NAMECOUNT          8
+#define PCRE_INFO_NAMETABLE          9
+#define PCRE_INFO_STUDYSIZE         10
+#define PCRE_INFO_DEFAULT_TABLES    11
+#define PCRE_INFO_OKPARTIAL         12
+#define PCRE_INFO_JCHANGED          13
+#define PCRE_INFO_HASCRORLF         14
+
+/* Request types for pcre_config(). Do not re-arrange, in order to remain
+compatible. */
+
+#define PCRE_CONFIG_UTF8                    0
+#define PCRE_CONFIG_NEWLINE                 1
+#define PCRE_CONFIG_LINK_SIZE               2
+#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD  3
+#define PCRE_CONFIG_MATCH_LIMIT             4
+#define PCRE_CONFIG_STACKRECURSE            5
+#define PCRE_CONFIG_UNICODE_PROPERTIES      6
+#define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
+#define PCRE_CONFIG_BSR                     8
+
+/* Bit flags for the pcre_extra structure. Do not re-arrange or redefine
+these bits, just add new ones on the end, in order to remain compatible. */
+
+#define PCRE_EXTRA_STUDY_DATA             0x0001
+#define PCRE_EXTRA_MATCH_LIMIT            0x0002
+#define PCRE_EXTRA_CALLOUT_DATA           0x0004
+#define PCRE_EXTRA_TABLES                 0x0008
+#define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
+
+/* Types */
+
+struct real_pcre;                 /* declaration; the definition is private  */
+typedef struct real_pcre pcre;
+
+/* When PCRE is compiled as a C++ library, the subject pointer type can be
+replaced with a custom type. For conventional use, the public interface is a
+const char *. */
+
+#ifndef PCRE_SPTR
+#define PCRE_SPTR const char *
+#endif
+
+/* The structure for passing additional data to pcre_exec(). This is defined in
+such as way as to be extensible. Always add new fields at the end, in order to
+remain compatible. */
+
+typedef struct pcre_extra {
+  unsigned long int flags;        /* Bits for which fields are set */
+  void *study_data;               /* Opaque data from pcre_study() */
+  unsigned long int match_limit;  /* Maximum number of calls to match() */
+  void *callout_data;             /* Data passed back in callouts */
+  const unsigned char *tables;    /* Pointer to character tables */
+  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
+} pcre_extra;
+
+/* The structure for passing out data via the pcre_callout_function. We use a
+structure so that new fields can be added on the end in future versions,
+without changing the API of the function, thereby allowing old clients to work
+without modification. */
+
+typedef struct pcre_callout_block {
+  int          version;           /* Identifies version of block */
+  /* ------------------------ Version 0 ------------------------------- */
+  int          callout_number;    /* Number compiled into pattern */
+  int         *offset_vector;     /* The offset vector */
+  PCRE_SPTR    subject;           /* The subject being matched */
+  int          subject_length;    /* The length of the subject */
+  int          start_match;       /* Offset to start of this match attempt */
+  int          current_position;  /* Where we currently are in the subject */
+  int          capture_top;       /* Max current capture */
+  int          capture_last;      /* Most recently closed capture */
+  void        *callout_data;      /* Data passed in with the call */
+  /* ------------------- Added for Version 1 -------------------------- */
+  int          pattern_position;  /* Offset to next item in the pattern */
+  int          next_item_length;  /* Length of next item in the pattern */
+  /* ------------------------------------------------------------------ */
+} pcre_callout_block;
+
+/* Indirection for store get and free functions. These can be set to
+alternative malloc/free functions if required. Special ones are used in the
+non-recursive case for "frames". There is also an optional callout function
+that is triggered by the (?) regex item. For Virtual Pascal, these definitions
+have to take another form. */
+
+#ifndef VPCOMPAT
+PCRE_EXP_DECL void *(*pcre_malloc)(size_t);
+PCRE_EXP_DECL void  (*pcre_free)(void *);
+PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
+PCRE_EXP_DECL void  (*pcre_stack_free)(void *);
+PCRE_EXP_DECL int   (*pcre_callout)(pcre_callout_block *);
+#else   /* VPCOMPAT */
+PCRE_EXP_DECL void *pcre_malloc(size_t);
+PCRE_EXP_DECL void  pcre_free(void *);
+PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
+PCRE_EXP_DECL void  pcre_stack_free(void *);
+PCRE_EXP_DECL int   pcre_callout(pcre_callout_block *);
+#endif  /* VPCOMPAT */
+
+/* Exported PCRE functions */
+
+PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,
+                  const unsigned char *);
+PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,
+                  int *, const unsigned char *);
+PCRE_EXP_DECL int  pcre_config(int, void *);
+PCRE_EXP_DECL int  pcre_copy_named_substring(const pcre *, const char *,
+                  int *, int, const char *, char *, int);
+PCRE_EXP_DECL int  pcre_copy_substring(const char *, int *, int, int, char *,
+                  int);
+PCRE_EXP_DECL int  pcre_dfa_exec(const pcre *, const pcre_extra *,
+                  const char *, int, int, int, int *, int , int *, int);
+PCRE_EXP_DECL int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
+                   int, int, int, int *, int);
+PCRE_EXP_DECL void pcre_free_substring(const char *);
+PCRE_EXP_DECL void pcre_free_substring_list(const char **);
+PCRE_EXP_DECL int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
+                  void *);
+PCRE_EXP_DECL int  pcre_get_named_substring(const pcre *, const char *,
+                  int *, int, const char *, const char **);
+PCRE_EXP_DECL int  pcre_get_stringnumber(const pcre *, const char *);
+PCRE_EXP_DECL int  pcre_get_stringtable_entries(const pcre *, const char *,
+                  char **, char **);
+PCRE_EXP_DECL int  pcre_get_substring(const char *, int *, int, int,
+                  const char **);
+PCRE_EXP_DECL int  pcre_get_substring_list(const char *, int *, int,
+                  const char ***);
+PCRE_EXP_DECL int  pcre_info(const pcre *, int *, int *);
+PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
+PCRE_EXP_DECL int  pcre_refcount(pcre *, int);
+PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);
+PCRE_EXP_DECL const char *pcre_version(void);
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#endif /* End of pcre.h */

Added: freeswitch/trunk/libs/pcre/pcre.h.in
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/pcre.h.in	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,307 @@
+/*************************************************
+*       Perl-Compatible Regular Expressions      *
+*************************************************/
+
+/* This is the public header file for the PCRE library, to be #included by
+applications that call the PCRE functions.
+
+           Copyright (c) 1997-2009 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef _PCRE_H
+#define _PCRE_H
+
+/* The current PCRE version information. */
+
+#define PCRE_MAJOR          @PCRE_MAJOR@
+#define PCRE_MINOR          @PCRE_MINOR@
+#define PCRE_PRERELEASE     @PCRE_PRERELEASE@
+#define PCRE_DATE           @PCRE_DATE@
+
+/* When an application links to a PCRE DLL in Windows, the symbols that are
+imported have to be identified as such. When building PCRE, the appropriate
+export setting is defined in pcre_internal.h, which includes this file. So we
+don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
+
+#if defined(_WIN32) && !defined(PCRE_STATIC)
+#  ifndef PCRE_EXP_DECL
+#    define PCRE_EXP_DECL  extern __declspec(dllimport)
+#  endif
+#  ifdef __cplusplus
+#    ifndef PCRECPP_EXP_DECL
+#      define PCRECPP_EXP_DECL  extern __declspec(dllimport)
+#    endif
+#    ifndef PCRECPP_EXP_DEFN
+#      define PCRECPP_EXP_DEFN  __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+/* By default, we use the standard "extern" declarations. */
+
+#ifndef PCRE_EXP_DECL
+#  ifdef __cplusplus
+#    define PCRE_EXP_DECL  extern "C"
+#  else
+#    define PCRE_EXP_DECL  extern
+#  endif
+#endif
+
+#ifdef __cplusplus
+#  ifndef PCRECPP_EXP_DECL
+#    define PCRECPP_EXP_DECL  extern
+#  endif
+#  ifndef PCRECPP_EXP_DEFN
+#    define PCRECPP_EXP_DEFN
+#  endif
+#endif
+
+/* Have to include stdlib.h in order to ensure that size_t is defined;
+it is needed here for malloc. */
+
+#include 
+
+/* Allow for C++ users */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Options. Some are compile-time only, some are run-time only, and some are
+both, so we keep them all distinct. */
+
+#define PCRE_CASELESS           0x00000001
+#define PCRE_MULTILINE          0x00000002
+#define PCRE_DOTALL             0x00000004
+#define PCRE_EXTENDED           0x00000008
+#define PCRE_ANCHORED           0x00000010
+#define PCRE_DOLLAR_ENDONLY     0x00000020
+#define PCRE_EXTRA              0x00000040
+#define PCRE_NOTBOL             0x00000080
+#define PCRE_NOTEOL             0x00000100
+#define PCRE_UNGREEDY           0x00000200
+#define PCRE_NOTEMPTY           0x00000400
+#define PCRE_UTF8               0x00000800
+#define PCRE_NO_AUTO_CAPTURE    0x00001000
+#define PCRE_NO_UTF8_CHECK      0x00002000
+#define PCRE_AUTO_CALLOUT       0x00004000
+#define PCRE_PARTIAL            0x00008000
+#define PCRE_DFA_SHORTEST       0x00010000
+#define PCRE_DFA_RESTART        0x00020000
+#define PCRE_FIRSTLINE          0x00040000
+#define PCRE_DUPNAMES           0x00080000
+#define PCRE_NEWLINE_CR         0x00100000
+#define PCRE_NEWLINE_LF         0x00200000
+#define PCRE_NEWLINE_CRLF       0x00300000
+#define PCRE_NEWLINE_ANY        0x00400000
+#define PCRE_NEWLINE_ANYCRLF    0x00500000
+#define PCRE_BSR_ANYCRLF        0x00800000
+#define PCRE_BSR_UNICODE        0x01000000
+#define PCRE_JAVASCRIPT_COMPAT  0x02000000
+#define PCRE_NO_START_OPTIMIZE  0x04000000
+#define PCRE_NO_START_OPTIMISE  0x04000000
+
+/* Exec-time and get/set-time error codes */
+
+#define PCRE_ERROR_NOMATCH         (-1)
+#define PCRE_ERROR_NULL            (-2)
+#define PCRE_ERROR_BADOPTION       (-3)
+#define PCRE_ERROR_BADMAGIC        (-4)
+#define PCRE_ERROR_UNKNOWN_OPCODE  (-5)
+#define PCRE_ERROR_UNKNOWN_NODE    (-5)  /* For backward compatibility */
+#define PCRE_ERROR_NOMEMORY        (-6)
+#define PCRE_ERROR_NOSUBSTRING     (-7)
+#define PCRE_ERROR_MATCHLIMIT      (-8)
+#define PCRE_ERROR_CALLOUT         (-9)  /* Never used by PCRE itself */
+#define PCRE_ERROR_BADUTF8        (-10)
+#define PCRE_ERROR_BADUTF8_OFFSET (-11)
+#define PCRE_ERROR_PARTIAL        (-12)
+#define PCRE_ERROR_BADPARTIAL     (-13)
+#define PCRE_ERROR_INTERNAL       (-14)
+#define PCRE_ERROR_BADCOUNT       (-15)
+#define PCRE_ERROR_DFA_UITEM      (-16)
+#define PCRE_ERROR_DFA_UCOND      (-17)
+#define PCRE_ERROR_DFA_UMLIMIT    (-18)
+#define PCRE_ERROR_DFA_WSSIZE     (-19)
+#define PCRE_ERROR_DFA_RECURSE    (-20)
+#define PCRE_ERROR_RECURSIONLIMIT (-21)
+#define PCRE_ERROR_NULLWSLIMIT    (-22)  /* No longer actually used */
+#define PCRE_ERROR_BADNEWLINE     (-23)
+
+/* Request types for pcre_fullinfo() */
+
+#define PCRE_INFO_OPTIONS            0
+#define PCRE_INFO_SIZE               1
+#define PCRE_INFO_CAPTURECOUNT       2
+#define PCRE_INFO_BACKREFMAX         3
+#define PCRE_INFO_FIRSTBYTE          4
+#define PCRE_INFO_FIRSTCHAR          4  /* For backwards compatibility */
+#define PCRE_INFO_FIRSTTABLE         5
+#define PCRE_INFO_LASTLITERAL        6
+#define PCRE_INFO_NAMEENTRYSIZE      7
+#define PCRE_INFO_NAMECOUNT          8
+#define PCRE_INFO_NAMETABLE          9
+#define PCRE_INFO_STUDYSIZE         10
+#define PCRE_INFO_DEFAULT_TABLES    11
+#define PCRE_INFO_OKPARTIAL         12
+#define PCRE_INFO_JCHANGED          13
+#define PCRE_INFO_HASCRORLF         14
+
+/* Request types for pcre_config(). Do not re-arrange, in order to remain
+compatible. */
+
+#define PCRE_CONFIG_UTF8                    0
+#define PCRE_CONFIG_NEWLINE                 1
+#define PCRE_CONFIG_LINK_SIZE               2
+#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD  3
+#define PCRE_CONFIG_MATCH_LIMIT             4
+#define PCRE_CONFIG_STACKRECURSE            5
+#define PCRE_CONFIG_UNICODE_PROPERTIES      6
+#define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
+#define PCRE_CONFIG_BSR                     8
+
+/* Bit flags for the pcre_extra structure. Do not re-arrange or redefine
+these bits, just add new ones on the end, in order to remain compatible. */
+
+#define PCRE_EXTRA_STUDY_DATA             0x0001
+#define PCRE_EXTRA_MATCH_LIMIT            0x0002
+#define PCRE_EXTRA_CALLOUT_DATA           0x0004
+#define PCRE_EXTRA_TABLES                 0x0008
+#define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
+
+/* Types */
+
+struct real_pcre;                 /* declaration; the definition is private  */
+typedef struct real_pcre pcre;
+
+/* When PCRE is compiled as a C++ library, the subject pointer type can be
+replaced with a custom type. For conventional use, the public interface is a
+const char *. */
+
+#ifndef PCRE_SPTR
+#define PCRE_SPTR const char *
+#endif
+
+/* The structure for passing additional data to pcre_exec(). This is defined in
+such as way as to be extensible. Always add new fields at the end, in order to
+remain compatible. */
+
+typedef struct pcre_extra {
+  unsigned long int flags;        /* Bits for which fields are set */
+  void *study_data;               /* Opaque data from pcre_study() */
+  unsigned long int match_limit;  /* Maximum number of calls to match() */
+  void *callout_data;             /* Data passed back in callouts */
+  const unsigned char *tables;    /* Pointer to character tables */
+  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
+} pcre_extra;
+
+/* The structure for passing out data via the pcre_callout_function. We use a
+structure so that new fields can be added on the end in future versions,
+without changing the API of the function, thereby allowing old clients to work
+without modification. */
+
+typedef struct pcre_callout_block {
+  int          version;           /* Identifies version of block */
+  /* ------------------------ Version 0 ------------------------------- */
+  int          callout_number;    /* Number compiled into pattern */
+  int         *offset_vector;     /* The offset vector */
+  PCRE_SPTR    subject;           /* The subject being matched */
+  int          subject_length;    /* The length of the subject */
+  int          start_match;       /* Offset to start of this match attempt */
+  int          current_position;  /* Where we currently are in the subject */
+  int          capture_top;       /* Max current capture */
+  int          capture_last;      /* Most recently closed capture */
+  void        *callout_data;      /* Data passed in with the call */
+  /* ------------------- Added for Version 1 -------------------------- */
+  int          pattern_position;  /* Offset to next item in the pattern */
+  int          next_item_length;  /* Length of next item in the pattern */
+  /* ------------------------------------------------------------------ */
+} pcre_callout_block;
+
+/* Indirection for store get and free functions. These can be set to
+alternative malloc/free functions if required. Special ones are used in the
+non-recursive case for "frames". There is also an optional callout function
+that is triggered by the (?) regex item. For Virtual Pascal, these definitions
+have to take another form. */
+
+#ifndef VPCOMPAT
+PCRE_EXP_DECL void *(*pcre_malloc)(size_t);
+PCRE_EXP_DECL void  (*pcre_free)(void *);
+PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
+PCRE_EXP_DECL void  (*pcre_stack_free)(void *);
+PCRE_EXP_DECL int   (*pcre_callout)(pcre_callout_block *);
+#else   /* VPCOMPAT */
+PCRE_EXP_DECL void *pcre_malloc(size_t);
+PCRE_EXP_DECL void  pcre_free(void *);
+PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
+PCRE_EXP_DECL void  pcre_stack_free(void *);
+PCRE_EXP_DECL int   pcre_callout(pcre_callout_block *);
+#endif  /* VPCOMPAT */
+
+/* Exported PCRE functions */
+
+PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,
+                  const unsigned char *);
+PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,
+                  int *, const unsigned char *);
+PCRE_EXP_DECL int  pcre_config(int, void *);
+PCRE_EXP_DECL int  pcre_copy_named_substring(const pcre *, const char *,
+                  int *, int, const char *, char *, int);
+PCRE_EXP_DECL int  pcre_copy_substring(const char *, int *, int, int, char *,
+                  int);
+PCRE_EXP_DECL int  pcre_dfa_exec(const pcre *, const pcre_extra *,
+                  const char *, int, int, int, int *, int , int *, int);
+PCRE_EXP_DECL int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
+                   int, int, int, int *, int);
+PCRE_EXP_DECL void pcre_free_substring(const char *);
+PCRE_EXP_DECL void pcre_free_substring_list(const char **);
+PCRE_EXP_DECL int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
+                  void *);
+PCRE_EXP_DECL int  pcre_get_named_substring(const pcre *, const char *,
+                  int *, int, const char *, const char **);
+PCRE_EXP_DECL int  pcre_get_stringnumber(const pcre *, const char *);
+PCRE_EXP_DECL int  pcre_get_stringtable_entries(const pcre *, const char *,
+                  char **, char **);
+PCRE_EXP_DECL int  pcre_get_substring(const char *, int *, int, int,
+                  const char **);
+PCRE_EXP_DECL int  pcre_get_substring_list(const char *, int *, int,
+                  const char ***);
+PCRE_EXP_DECL int  pcre_info(const pcre *, int *, int *);
+PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
+PCRE_EXP_DECL int  pcre_refcount(pcre *, int);
+PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);
+PCRE_EXP_DECL const char *pcre_version(void);
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#endif /* End of pcre.h */

Added: freeswitch/trunk/libs/pcre/pcre_chartables.c.dist
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/pcre_chartables.c.dist	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,198 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* This file contains character tables that are used when no external tables
+are passed to PCRE by the application that calls it. The tables are used only
+for characters whose code values are less than 256.
+
+This is a default version of the tables that assumes ASCII encoding. A program
+called dftables (which is distributed with PCRE) can be used to build
+alternative versions of this file. This is necessary if you are running in an
+EBCDIC environment, or if you want to default to a different encoding, for
+example ISO-8859-1. When dftables is run, it creates these tables in the
+current locale. If PCRE is configured with --enable-rebuild-chartables, this
+happens automatically.
+
+The following #includes are present because without the gcc 4.x may remove the
+array definition from the final binary if PCRE is built into a static library
+and dead code stripping is activated. This leads to link errors. Pulling in the
+header ensures that the array gets flagged as "someone outside this compilation
+unit might reference this" and so it will always be supplied to the linker. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+const unsigned char _pcre_default_tables[] = {
+
+/* This table is a lower casing table. */
+
+    0,  1,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55,
+   56, 57, 58, 59, 60, 61, 62, 63,
+   64, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122, 91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,
+  136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,
+  152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,
+  168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,
+  184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,
+  200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,
+  216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,
+  232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,
+  248,249,250,251,252,253,254,255,
+
+/* This table is a case flipping table. */
+
+    0,  1,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55,
+   56, 57, 58, 59, 60, 61, 62, 63,
+   64, 97, 98, 99,100,101,102,103,
+  104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,
+  120,121,122, 91, 92, 93, 94, 95,
+   96, 65, 66, 67, 68, 69, 70, 71,
+   72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87,
+   88, 89, 90,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,
+  136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,
+  152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,
+  168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,
+  184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,
+  200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,
+  216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,
+  232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,
+  248,249,250,251,252,253,254,255,
+
+/* This table contains bit maps for various character classes. Each map is 32
+bytes long and the bits run from the least significant end of each byte. The
+classes that have their own maps are: space, xdigit, digit, upper, lower, word,
+graph, print, punct, and cntrl. Other classes are built from combinations. */
+
+  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
+  0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
+  0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+/* This table identifies various classes of character by individual bits:
+  0x01   white space character
+  0x02   letter
+  0x04   decimal digit
+  0x08   hexadecimal digit
+  0x10   alphanumeric or '_'
+  0x80   regular expression metacharacter or binary zero
+*/
+
+  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
+  0x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
+  0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
+  0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
+  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
+  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
+  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
+  0x12,0x12,0x12,0x80,0x80,0x00,0x80,0x10, /*  X - _  */
+  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
+  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
+  0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
+
+/* End of pcre_chartables.c */

Modified: freeswitch/trunk/libs/pcre/pcre_compile.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_compile.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_compile.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,14 @@
 supporting internal functions that are not used by other modules. */
 
 
-#define NLBLOCK cd            /* The block containing newline information */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define NLBLOCK cd             /* Block containing newline information */
+#define PSSTART start_pattern  /* Field containing processed string start */
+#define PSEND   end_pattern    /* Field containing processed string end */
+
 #include "pcre_internal.h"
 
 
@@ -54,18 +61,35 @@
 #endif
 
 
+/* Macro for setting individual bits in class bitmaps. */
+
+#define SETBIT(a,b) a[b/8] |= (1 << (b%8))
+
+/* Maximum length value to check against when making sure that the integer that
+holds the compiled pattern length does not overflow. We make it a bit less than
+INT_MAX to allow for adding in group terminating bytes, so that we don't have
+to check them every time. */
+
+#define OFLOW_MAX (INT_MAX - 20)
+
 
 /*************************************************
 *      Code parameters and static tables         *
 *************************************************/
 
-/* Maximum number of items on the nested bracket stacks at compile time. This
-applies to the nesting of all kinds of parentheses. It does not limit
-un-nested, non-capturing parentheses. This number can be made bigger if
-necessary - it is used to dimension one int and one unsigned char vector at
-compile time. */
+/* This value specifies the size of stack workspace that is used during the
+first pre-compile phase that determines how much memory is required. The regex
+is partly compiled into this space, but the compiled parts are discarded as
+soon as they can be, so that hopefully there will never be an overrun. The code
+does, however, check for an overrun. The largest amount I've seen used is 218,
+so this number is very generous.
+
+The same workspace is used during the second, actual compile phase for
+remembering forward references to groups so that they can be filled in at the
+end. Each entry in this list occupies LINK_SIZE bytes, so even when LINK_SIZE
+is 4 there is plenty of room. */
 
-#define BRASTACK_SIZE 200
+#define COMPILE_WORK_SIZE (4096)
 
 
 /* Table for handling escaped characters in the range '0'-'z'. Positive returns
@@ -73,21 +97,56 @@
 on. Zero means further processing is needed (for things like \x), or the escape
 is invalid. */
 
-#if !EBCDIC   /* This is the "normal" table for ASCII systems */
+#ifndef EBCDIC
+
+/* This is the "normal" table for ASCII systems or for EBCDIC systems running
+in UTF-8 mode. */
+
 static const short int escapes[] = {
-     0,      0,      0,      0,      0,      0,      0,      0,   /* 0 - 7 */
-     0,      0,    ':',    ';',    '<',    '=',    '>',    '?',   /* 8 - ? */
-   '@', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E,      0, -ESC_G,   /* @ - G */
-     0,      0,      0,      0,      0,      0,      0,      0,   /* H - O */
--ESC_P, -ESC_Q,      0, -ESC_S,      0,      0,      0, -ESC_W,   /* P - W */
--ESC_X,      0, -ESC_Z,    '[',   '\\',    ']',    '^',    '_',   /* X - _ */
-   '`',      7, -ESC_b,      0, -ESC_d,  ESC_e,  ESC_f,      0,   /* ` - g */
-     0,      0,      0,      0,      0,      0,  ESC_n,      0,   /* h - o */
--ESC_p,      0,  ESC_r, -ESC_s,  ESC_tee,    0,      0, -ESC_w,   /* p - w */
-     0,      0, -ESC_z                                            /* x - z */
+     0,                       0,
+     0,                       0,
+     0,                       0,
+     0,                       0,
+     0,                       0,
+     CHAR_COLON,              CHAR_SEMICOLON,
+     CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
+     CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
+     CHAR_COMMERCIAL_AT,      -ESC_A,
+     -ESC_B,                  -ESC_C,
+     -ESC_D,                  -ESC_E,
+     0,                       -ESC_G,
+     -ESC_H,                  0,
+     0,                       -ESC_K,
+     0,                       0,
+     0,                       0,
+     -ESC_P,                  -ESC_Q,
+     -ESC_R,                  -ESC_S,
+     0,                       0,
+     -ESC_V,                  -ESC_W,
+     -ESC_X,                  0,
+     -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
+     CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
+     CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
+     CHAR_GRAVE_ACCENT,       7,
+     -ESC_b,                  0,
+     -ESC_d,                  ESC_e,
+     ESC_f,                   0,
+     -ESC_h,                  0,
+     0,                       -ESC_k,
+     0,                       0,
+     ESC_n,                   0,
+     -ESC_p,                  0,
+     ESC_r,                   -ESC_s,
+     ESC_tee,                 0,
+     -ESC_v,                  -ESC_w,
+     0,                       0,
+     -ESC_z
 };
 
-#else         /* This is the "abnormal" table for EBCDIC systems */
+#else
+
+/* This is the "abnormal" table for EBCDIC systems without UTF-8 support. */
+
 static const short int escapes[] = {
 /*  48 */     0,     0,      0,     '.',    '<',   '(',    '+',    '|',
 /*  50 */   '&',     0,      0,       0,      0,     0,      0,      0,
@@ -97,18 +156,18 @@
 /*  70 */     0,     0,      0,       0,      0,     0,      0,      0,
 /*  78 */     0,   '`',    ':',     '#',    '@',  '\'',    '=',    '"',
 /*  80 */     0,     7, -ESC_b,       0, -ESC_d, ESC_e,  ESC_f,      0,
-/*  88 */     0,     0,      0,     '{',      0,     0,      0,      0,
-/*  90 */     0,     0,      0,     'l',      0, ESC_n,      0, -ESC_p,
+/*  88 */-ESC_h,     0,      0,     '{',      0,     0,      0,      0,
+/*  90 */     0,     0, -ESC_k,     'l',      0, ESC_n,      0, -ESC_p,
 /*  98 */     0, ESC_r,      0,     '}',      0,     0,      0,      0,
-/*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,     0, -ESC_w,      0,
+/*  A0 */     0,   '~', -ESC_s, ESC_tee,      0,-ESC_v, -ESC_w,      0,
 /*  A8 */     0,-ESC_z,      0,       0,      0,   '[',      0,      0,
 /*  B0 */     0,     0,      0,       0,      0,     0,      0,      0,
 /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
 /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
-/*  C8 */     0,     0,      0,       0,      0,     0,      0,      0,
-/*  D0 */   '}',     0,      0,       0,      0,     0,      0, -ESC_P,
-/*  D8 */-ESC_Q,     0,      0,       0,      0,     0,      0,      0,
-/*  E0 */  '\\',     0, -ESC_S,       0,      0,     0, -ESC_W, -ESC_X,
+/*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
+/*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,
+/*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
+/*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
 /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
 /*  F0 */     0,     0,      0,       0,      0,     0,      0,      0,
 /*  F8 */     0,     0,      0,       0,      0,     0,      0,      0
@@ -116,14 +175,50 @@
 #endif
 
 
-/* Tables of names of POSIX character classes and their lengths. The list is
-terminated by a zero length entry. The first three must be alpha, lower, upper,
-as this is assumed for handling case independence. */
-
-static const char *const posix_names[] = {
-  "alpha", "lower", "upper",
-  "alnum", "ascii", "blank", "cntrl", "digit", "graph",
-  "print", "punct", "space", "word",  "xdigit" };
+/* Table of special "verbs" like (*PRUNE). This is a short table, so it is
+searched linearly. Put all the names into a single string, in order to reduce
+the number of relocations when a shared library is dynamically linked. The
+string is built from string macros so that it works in UTF-8 mode on EBCDIC
+platforms. */
+
+typedef struct verbitem {
+  int   len;
+  int   op;
+} verbitem;
+
+static const char verbnames[] =
+  STRING_ACCEPT0
+  STRING_COMMIT0
+  STRING_F0
+  STRING_FAIL0
+  STRING_PRUNE0
+  STRING_SKIP0
+  STRING_THEN;
+
+static const verbitem verbs[] = {
+  { 6, OP_ACCEPT },
+  { 6, OP_COMMIT },
+  { 1, OP_FAIL },
+  { 4, OP_FAIL },
+  { 5, OP_PRUNE },
+  { 4, OP_SKIP  },
+  { 4, OP_THEN  }
+};
+
+static const int verbcount = sizeof(verbs)/sizeof(verbitem);
+
+
+/* Tables of names of POSIX character classes and their lengths. The names are
+now all in a single string, to reduce the number of relocations when a shared
+library is dynamically loaded. The list of lengths is terminated by a zero
+length entry. The first three must be alpha, lower, upper, as this is assumed
+for handling case independence. */
+
+static const char posix_names[] =
+  STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
+  STRING_ascii0 STRING_blank0 STRING_cntrl0 STRING_digit0
+  STRING_graph0 STRING_print0 STRING_punct0 STRING_space0
+  STRING_word0  STRING_xdigit;
 
 static const uschar posix_name_lengths[] = {
   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
@@ -156,73 +251,97 @@
 };
 
 
-/* The texts of compile-time error messages. These are "char *" because they
-are passed to the outside world. */
+#define STRING(a)  # a
+#define XSTRING(s) STRING(s)
 
-static const char *error_texts[] = {
-  "no error",
-  "\\ at end of pattern",
-  "\\c at end of pattern",
-  "unrecognized character follows \\",
-  "numbers out of order in {} quantifier",
+/* The texts of compile-time error messages. These are "char *" because they
+are passed to the outside world. Do not ever re-use any error number, because
+they are documented. Always add a new error instead. Messages marked DEAD below
+are no longer used. This used to be a table of strings, but in order to reduce
+the number of relocations needed when a shared library is loaded dynamically,
+it is now one long string. We cannot use a table of offsets, because the
+lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
+simply count through to the one we want - this isn't a performance issue
+because these strings are used only when there is a compilation error. */
+
+static const char error_texts[] =
+  "no error\0"
+  "\\ at end of pattern\0"
+  "\\c at end of pattern\0"
+  "unrecognized character follows \\\0"
+  "numbers out of order in {} quantifier\0"
   /* 5 */
-  "number too big in {} quantifier",
-  "missing terminating ] for character class",
-  "invalid escape sequence in character class",
-  "range out of order in character class",
-  "nothing to repeat",
+  "number too big in {} quantifier\0"
+  "missing terminating ] for character class\0"
+  "invalid escape sequence in character class\0"
+  "range out of order in character class\0"
+  "nothing to repeat\0"
   /* 10 */
-  "operand of unlimited repeat could match the empty string",
-  "internal error: unexpected repeat",
-  "unrecognized character after (?",
-  "POSIX named classes are supported only within a class",
-  "missing )",
+  "operand of unlimited repeat could match the empty string\0"  /** DEAD **/
+  "internal error: unexpected repeat\0"
+  "unrecognized character after (? or (?-\0"
+  "POSIX named classes are supported only within a class\0"
+  "missing )\0"
   /* 15 */
-  "reference to non-existent subpattern",
-  "erroffset passed as NULL",
-  "unknown option bit(s) set",
-  "missing ) after comment",
-  "parentheses nested too deeply",
+  "reference to non-existent subpattern\0"
+  "erroffset passed as NULL\0"
+  "unknown option bit(s) set\0"
+  "missing ) after comment\0"
+  "parentheses nested too deeply\0"  /** DEAD **/
   /* 20 */
-  "regular expression too large",
-  "failed to get memory",
-  "unmatched parentheses",
-  "internal error: code overflow",
-  "unrecognized character after (?<",
+  "regular expression is too large\0"
+  "failed to get memory\0"
+  "unmatched parentheses\0"
+  "internal error: code overflow\0"
+  "unrecognized character after (?<\0"
   /* 25 */
-  "lookbehind assertion is not fixed length",
-  "malformed number or name after (?(",
-  "conditional group contains more than two branches",
-  "assertion expected after (?(",
-  "(?R or (?digits must be followed by )",
+  "lookbehind assertion is not fixed length\0"
+  "malformed number or name after (?(\0"
+  "conditional group contains more than two branches\0"
+  "assertion expected after (?(\0"
+  "(?R or (?[+-]digits must be followed by )\0"
   /* 30 */
-  "unknown POSIX class name",
-  "POSIX collating elements are not supported",
-  "this version of PCRE is not compiled with PCRE_UTF8 support",
-  "spare error",
-  "character value in \\x{...} sequence is too large",
+  "unknown POSIX class name\0"
+  "POSIX collating elements are not supported\0"
+  "this version of PCRE is not compiled with PCRE_UTF8 support\0"
+  "spare error\0"  /** DEAD **/
+  "character value in \\x{...} sequence is too large\0"
   /* 35 */
-  "invalid condition (?(0)",
-  "\\C not allowed in lookbehind assertion",
-  "PCRE does not support \\L, \\l, \\N, \\U, or \\u",
-  "number after (?C is > 255",
-  "closing ) for (?C expected",
+  "invalid condition (?(0)\0"
+  "\\C not allowed in lookbehind assertion\0"
+  "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"
+  "number after (?C is > 255\0"
+  "closing ) for (?C expected\0"
   /* 40 */
-  "recursive call could loop indefinitely",
-  "unrecognized character after (?P",
-  "syntax error after (?P",
-  "two named subpatterns have the same name",
-  "invalid UTF-8 string",
+  "recursive call could loop indefinitely\0"
+  "unrecognized character after (?P\0"
+  "syntax error in subpattern name (missing terminator)\0"
+  "two named subpatterns have the same name\0"
+  "invalid UTF-8 string\0"
   /* 45 */
-  "support for \\P, \\p, and \\X has not been compiled",
-  "malformed \\P or \\p sequence",
-  "unknown property name after \\P or \\p",
-  "subpattern name is too long (maximum 32 characters)",
-  "too many named subpatterns (maximum 10,000)",
+  "support for \\P, \\p, and \\X has not been compiled\0"
+  "malformed \\P or \\p sequence\0"
+  "unknown property name after \\P or \\p\0"
+  "subpattern name is too long (maximum " XSTRING(MAX_NAME_SIZE) " characters)\0"
+  "too many named subpatterns (maximum " XSTRING(MAX_NAME_COUNT) ")\0"
   /* 50 */
-  "repeated subpattern is too long",
-  "octal value is greater than \\377 (not in UTF-8 mode)"
-};
+  "repeated subpattern is too long\0"    /** DEAD **/
+  "octal value is greater than \\377 (not in UTF-8 mode)\0"
+  "internal error: overran compiling workspace\0"
+  "internal error: previously-checked referenced subpattern not found\0"
+  "DEFINE group contains more than one branch\0"
+  /* 55 */
+  "repeating a DEFINE group is not allowed\0"
+  "inconsistent NEWLINE options\0"
+  "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
+  "a numbered reference must not be zero\0"
+  "(*VERB) with an argument is not supported\0"
+  /* 60 */
+  "(*VERB) not recognized\0"
+  "number is too big\0"
+  "subpattern name expected\0"
+  "digit expected after (?+\0"
+  "] is an invalid data character in JavaScript compatibility mode";
 
 
 /* Table to identify digits and hex digits. This is used when compiling
@@ -241,7 +360,11 @@
 
 Then we can use ctype_digit and ctype_xdigit in the code. */
 
-#if !EBCDIC    /* This is the "normal" case, for ASCII systems */
+#ifndef EBCDIC
+
+/* This is the "normal" case, for ASCII systems, and EBCDIC systems running in
+UTF-8 mode. */
+
 static const unsigned char digitab[] =
   {
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
@@ -277,7 +400,10 @@
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
 
-#else          /* This is the "abnormal" case, for EBCDIC systems */
+#else
+
+/* This is the "abnormal" case, for EBCDIC systems not running in UTF-8 mode. */
+
 static const unsigned char digitab[] =
   {
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7  0 */
@@ -291,7 +417,7 @@
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 40 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  72- |     */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 50 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88- ?     */
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  88- 95    */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 60 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 104- ?     */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 70 */
@@ -325,7 +451,7 @@
   0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*    - 71 */
   0x00,0x00,0x00,0x80,0x00,0x80,0x80,0x80, /*  72- |  */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  & - 87 */
-  0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88- ?  */
+  0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00, /*  88- 95 */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  - -103 */
   0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x80, /* 104- ?  */
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 112-119 */
@@ -352,9 +478,31 @@
 /* Definition to allow mutual recursion */
 
 static BOOL
-  compile_regex(int, int, int *, uschar **, const uschar **, int *, BOOL, int,
-    int *, int *, branch_chain *, compile_data *);
+  compile_regex(int, int, uschar **, const uschar **, int *, BOOL, BOOL, int,
+    int *, int *, branch_chain *, compile_data *, int *);
+
+
+
+/*************************************************
+*            Find an error text                  *
+*************************************************/
+
+/* The error texts are now all in one long string, to save on relocations. As
+some of the text is of unknown length, we can't use a table of offsets.
+Instead, just count through the strings. This is not a performance issue
+because it happens only when there has been a compilation error.
+
+Argument:   the error number
+Returns:    pointer to the error string
+*/
 
+static const char *
+find_error_text(int n)
+{
+const char *s = error_texts;
+for (; n > 0; n--) while (*s++ != 0) {};
+return s;
+}
 
 
 /*************************************************
@@ -363,9 +511,11 @@
 
 /* This function is called when a \ has been encountered. It either returns a
 positive value for a simple escape such as \n, or a negative value which
-encodes one of the more complicated things such as \d. When UTF-8 is enabled,
-a positive value greater than 255 may be returned. On entry, ptr is pointing at
-the \. On exit, it is on the final character of the escape sequence.
+encodes one of the more complicated things such as \d. A backreference to group
+n is returned as -(ESC_REF + n); ESC_REF is the highest ESC_xxx macro. When
+UTF-8 is enabled, a positive value greater than 255 may be returned. On entry,
+ptr is pointing at the \. On exit, it is on the final character of the escape
+sequence.
 
 Arguments:
   ptrptr         points to the pattern position pointer
@@ -376,7 +526,7 @@
 
 Returns:         zero or positive => a data character
                  negative => a special escape sequence
-                 on error, errorptr is set
+                 on error, errorcodeptr is set
 */
 
 static int
@@ -394,16 +544,16 @@
 
 if (c == 0) *errorcodeptr = ERR1;
 
-/* Non-alphamerics are literals. For digits or letters, do an initial lookup in
-a table. A non-zero result is something that can be returned immediately.
+/* Non-alphanumerics are literals. For digits or letters, do an initial lookup
+in a table. A non-zero result is something that can be returned immediately.
 Otherwise further processing may be required. */
 
-#if !EBCDIC    /* ASCII coding */
-else if (c < '0' || c > 'z') {}                           /* Not alphameric */
-else if ((i = escapes[c - '0']) != 0) c = i;
+#ifndef EBCDIC  /* ASCII/UTF-8 coding */
+else if (c < CHAR_0 || c > CHAR_z) {}                     /* Not alphanumeric */
+else if ((i = escapes[c - CHAR_0]) != 0) c = i;
 
-#else          /* EBCDIC coding */
-else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */
+#else           /* EBCDIC coding */
+else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
 else if ((i = escapes[c - 0x48]) != 0)  c = i;
 #endif
 
@@ -412,19 +562,103 @@
 else
   {
   const uschar *oldptr;
+  BOOL braced, negated;
+
   switch (c)
     {
     /* A number of Perl escapes are not handled by PCRE. We give an explicit
     error. */
 
-    case 'l':
-    case 'L':
-    case 'N':
-    case 'u':
-    case 'U':
+    case CHAR_l:
+    case CHAR_L:
+    case CHAR_N:
+    case CHAR_u:
+    case CHAR_U:
     *errorcodeptr = ERR37;
     break;
 
+    /* \g must be followed by one of a number of specific things:
+
+    (1) A number, either plain or braced. If positive, it is an absolute
+    backreference. If negative, it is a relative backreference. This is a Perl
+    5.10 feature.
+
+    (2) Perl 5.10 also supports \g{name} as a reference to a named group. This
+    is part of Perl's movement towards a unified syntax for back references. As
+    this is synonymous with \k{name}, we fudge it up by pretending it really
+    was \k.
+
+    (3) For Oniguruma compatibility we also support \g followed by a name or a
+    number either in angle brackets or in single quotes. However, these are
+    (possibly recursive) subroutine calls, _not_ backreferences. Just return
+    the -ESC_g code (cf \k). */
+
+    case CHAR_g:
+    if (ptr[1] == CHAR_LESS_THAN_SIGN || ptr[1] == CHAR_APOSTROPHE)
+      {
+      c = -ESC_g;
+      break;
+      }
+
+    /* Handle the Perl-compatible cases */
+
+    if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
+      {
+      const uschar *p;
+      for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
+        if (*p != CHAR_MINUS && (digitab[*p] & ctype_digit) == 0) break;
+      if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)
+        {
+        c = -ESC_k;
+        break;
+        }
+      braced = TRUE;
+      ptr++;
+      }
+    else braced = FALSE;
+
+    if (ptr[1] == CHAR_MINUS)
+      {
+      negated = TRUE;
+      ptr++;
+      }
+    else negated = FALSE;
+
+    c = 0;
+    while ((digitab[ptr[1]] & ctype_digit) != 0)
+      c = c * 10 + *(++ptr) - CHAR_0;
+
+    if (c < 0)   /* Integer overflow */
+      {
+      *errorcodeptr = ERR61;
+      break;
+      }
+
+    if (braced && *(++ptr) != CHAR_RIGHT_CURLY_BRACKET)
+      {
+      *errorcodeptr = ERR57;
+      break;
+      }
+
+    if (c == 0)
+      {
+      *errorcodeptr = ERR58;
+      break;
+      }
+
+    if (negated)
+      {
+      if (c > bracount)
+        {
+        *errorcodeptr = ERR15;
+        break;
+        }
+      c = bracount - (c - 1);
+      }
+
+    c = -(ESC_REF + c);
+    break;
+
     /* The handling of escape sequences consisting of a string of digits
     starting with one that is not zero is not straightforward. By experiment,
     the way Perl works seems to be as follows:
@@ -437,15 +671,20 @@
     value is greater than 377, the least significant 8 bits are taken. Inside a
     character class, \ followed by a digit is always an octal number. */
 
-    case '1': case '2': case '3': case '4': case '5':
-    case '6': case '7': case '8': case '9':
+    case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
+    case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
 
     if (!isclass)
       {
       oldptr = ptr;
-      c -= '0';
+      c -= CHAR_0;
       while ((digitab[ptr[1]] & ctype_digit) != 0)
-        c = c * 10 + *(++ptr) - '0';
+        c = c * 10 + *(++ptr) - CHAR_0;
+      if (c < 0)    /* Integer overflow */
+        {
+        *errorcodeptr = ERR61;
+        break;
+        }
       if (c < 10 || c <= bracount)
         {
         c = -(ESC_REF + c);
@@ -458,7 +697,7 @@
     generates a binary zero byte and treats the digit as a following literal.
     Thus we have to pull back the pointer by one. */
 
-    if ((c = *ptr) >= '8')
+    if ((c = *ptr) >= CHAR_8)
       {
       ptr--;
       c = 0;
@@ -471,10 +710,10 @@
     to do). Nowadays we allow for larger numbers in UTF-8 mode, but no more
     than 3 octal digits. */
 
-    case '0':
-    c -= '0';
-    while(i++ < 2 && ptr[1] >= '0' && ptr[1] <= '7')
-        c = c * 8 + *(++ptr) - '0';
+    case CHAR_0:
+    c -= CHAR_0;
+    while(i++ < 2 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
+        c = c * 8 + *(++ptr) - CHAR_0;
     if (!utf8 && c > 255) *errorcodeptr = ERR51;
     break;
 
@@ -482,8 +721,8 @@
     than 0xff in utf8 mode, but only if the ddd are hex digits. If not, { is
     treated as a data character. */
 
-    case 'x':
-    if (ptr[1] == '{')
+    case CHAR_x:
+    if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
       {
       const uschar *pt = ptr + 2;
       int count = 0;
@@ -492,19 +731,19 @@
       while ((digitab[*pt] & ctype_xdigit) != 0)
         {
         register int cc = *pt++;
-        if (c == 0 && cc == '0') continue;     /* Leading zeroes */
+        if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
         count++;
 
-#if !EBCDIC    /* ASCII coding */
-        if (cc >= 'a') cc -= 32;               /* Convert to upper case */
-        c = (c << 4) + cc - ((cc < 'A')? '0' : ('A' - 10));
-#else          /* EBCDIC coding */
-        if (cc >= 'a' && cc <= 'z') cc += 64;  /* Convert to upper case */
-        c = (c << 4) + cc - ((cc >= '0')? '0' : ('A' - 10));
+#ifndef EBCDIC  /* ASCII/UTF-8 coding */
+        if (cc >= CHAR_a) cc -= 32;               /* Convert to upper case */
+        c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
+#else           /* EBCDIC coding */
+        if (cc >= CHAR_a && cc <= CHAR_z) cc += 64;  /* Convert to upper case */
+        c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
 #endif
         }
 
-      if (*pt == '}')
+      if (*pt == CHAR_RIGHT_CURLY_BRACKET)
         {
         if (c < 0 || count > (utf8? 8 : 2)) *errorcodeptr = ERR34;
         ptr = pt;
@@ -520,46 +759,44 @@
     c = 0;
     while (i++ < 2 && (digitab[ptr[1]] & ctype_xdigit) != 0)
       {
-      int cc;                               /* Some compilers don't like ++ */
-      cc = *(++ptr);                        /* in initializers */
-#if !EBCDIC    /* ASCII coding */
-      if (cc >= 'a') cc -= 32;              /* Convert to upper case */
-      c = c * 16 + cc - ((cc < 'A')? '0' : ('A' - 10));
-#else          /* EBCDIC coding */
-      if (cc <= 'z') cc += 64;              /* Convert to upper case */
-      c = c * 16 + cc - ((cc >= '0')? '0' : ('A' - 10));
+      int cc;                                  /* Some compilers don't like */
+      cc = *(++ptr);                           /* ++ in initializers */
+#ifndef EBCDIC  /* ASCII/UTF-8 coding */
+      if (cc >= CHAR_a) cc -= 32;              /* Convert to upper case */
+      c = c * 16 + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10));
+#else           /* EBCDIC coding */
+      if (cc <= CHAR_z) cc += 64;              /* Convert to upper case */
+      c = c * 16 + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
 #endif
       }
     break;
 
-    /* Other special escapes not starting with a digit are straightforward */
+    /* For \c, a following letter is upper-cased; then the 0x40 bit is flipped.
+    This coding is ASCII-specific, but then the whole concept of \cx is
+    ASCII-specific. (However, an EBCDIC equivalent has now been added.) */
 
-    case 'c':
+    case CHAR_c:
     c = *(++ptr);
     if (c == 0)
       {
       *errorcodeptr = ERR2;
-      return 0;
+      break;
       }
 
-    /* A letter is upper-cased; then the 0x40 bit is flipped. This coding
-    is ASCII-specific, but then the whole concept of \cx is ASCII-specific.
-    (However, an EBCDIC equivalent has now been added.) */
-
-#if !EBCDIC    /* ASCII coding */
-    if (c >= 'a' && c <= 'z') c -= 32;
+#ifndef EBCDIC  /* ASCII/UTF-8 coding */
+    if (c >= CHAR_a && c <= CHAR_z) c -= 32;
     c ^= 0x40;
-#else          /* EBCDIC coding */
-    if (c >= 'a' && c <= 'z') c += 64;
+#else           /* EBCDIC coding */
+    if (c >= CHAR_a && c <= CHAR_z) c += 64;
     c ^= 0xC0;
 #endif
     break;
 
     /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
-    other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,
-    for Perl compatibility, it is a literal. This code looks a bit odd, but
-    there used to be some cases other than the default, and there may be again
-    in future, so I haven't "optimized" it. */
+    other alphanumeric following \ is an error if PCRE_EXTRA was set;
+    otherwise, for Perl compatibility, it is a literal. This code looks a bit
+    odd, but there used to be some cases other than the default, and there may
+    be again in future, so I haven't "optimized" it. */
 
     default:
     if ((options & PCRE_EXTRA) != 0) switch(c)
@@ -612,21 +849,21 @@
 /* \P or \p can be followed by a name in {}, optionally preceded by ^ for
 negation. */
 
-if (c == '{')
+if (c == CHAR_LEFT_CURLY_BRACKET)
   {
-  if (ptr[1] == '^')
+  if (ptr[1] == CHAR_CIRCUMFLEX_ACCENT)
     {
     *negptr = TRUE;
     ptr++;
     }
-  for (i = 0; i < sizeof(name) - 1; i++)
+  for (i = 0; i < (int)sizeof(name) - 1; i++)
     {
     c = *(++ptr);
     if (c == 0) goto ERROR_RETURN;
-    if (c == '}') break;
+    if (c == CHAR_RIGHT_CURLY_BRACKET) break;
     name[i] = c;
     }
-  if (c !='}') goto ERROR_RETURN;
+  if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
   name[i] = 0;
   }
 
@@ -648,7 +885,7 @@
 while (bot < top)
   {
   i = (bot + top) >> 1;
-  c = strcmp(name, _pcre_utt[i].name);
+  c = strcmp(name, _pcre_utt_names + _pcre_utt[i].name_offset);
   if (c == 0)
     {
     *dptr = _pcre_utt[i].value;
@@ -691,15 +928,15 @@
 {
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
 while ((digitab[*p] & ctype_digit) != 0) p++;
-if (*p == '}') return TRUE;
+if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
 
-if (*p++ != ',') return FALSE;
-if (*p == '}') return TRUE;
+if (*p++ != CHAR_COMMA) return FALSE;
+if (*p == CHAR_RIGHT_CURLY_BRACKET) return TRUE;
 
 if ((digitab[*p++] & ctype_digit) == 0) return FALSE;
 while ((digitab[*p] & ctype_digit) != 0) p++;
 
-return (*p == '}');
+return (*p == CHAR_RIGHT_CURLY_BRACKET);
 }
 
 
@@ -732,7 +969,7 @@
 /* Read the minimum value and do a paranoid check: a negative value indicates
 an integer overflow. */
 
-while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
+while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - CHAR_0;
 if (min < 0 || min > 65535)
   {
   *errorcodeptr = ERR5;
@@ -742,12 +979,12 @@
 /* Read the maximum value if there is one, and again do a paranoid on its size.
 Also, max must not be less than min. */
 
-if (*p == '}') max = min; else
+if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
   {
-  if (*(++p) != '}')
+  if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
     {
     max = 0;
-    while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
+    while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - CHAR_0;
     if (max < 0 || max > 65535)
       {
       *errorcodeptr = ERR5;
@@ -772,47 +1009,260 @@
 
 
 /*************************************************
-*     Find forward referenced named subpattern   *
+*  Subroutine for finding forward reference      *
 *************************************************/
 
-/* This function scans along a pattern looking for capturing subpatterns, and
-counting them. If it finds a named pattern that matches the name it is given,
-it returns its number. This is used for forward references to named
-subpatterns. We know that if (?P< is encountered, the name will be terminated
-by '>' because that is checked in the first pass.
+/* This recursive function is called only from find_parens() below. The
+top-level call starts at the beginning of the pattern. All other calls must
+start at a parenthesis. It scans along a pattern's text looking for capturing
+subpatterns, and counting them. If it finds a named pattern that matches the
+name it is given, it returns its number. Alternatively, if the name is NULL, it
+returns when it reaches a given numbered subpattern. We know that if (?P< is
+encountered, the name will be terminated by '>' because that is checked in the
+first pass. Recursion is used to keep track of subpatterns that reset the
+capturing group numbers - the (?| feature.
 
 Arguments:
-  pointer      current position in the pattern
-  count        current count of capturing parens
-  name         name to seek
-  namelen      name length
+  ptrptr       address of the current character pointer (updated)
+  cd           compile background data
+  name         name to seek, or NULL if seeking a numbered subpattern
+  lorn         name length, or subpattern number if name is NULL
+  xmode        TRUE if we are in /x mode
+  count        pointer to the current capturing subpattern number (updated)
 
 Returns:       the number of the named subpattern, or -1 if not found
 */
 
 static int
-find_named_parens(const uschar *ptr, int count, const uschar *name, int namelen)
+find_parens_sub(uschar **ptrptr, compile_data *cd, const uschar *name, int lorn,
+  BOOL xmode, int *count)
 {
-const uschar *thisname;
+uschar *ptr = *ptrptr;
+int start_count = *count;
+int hwm_count = start_count;
+BOOL dup_parens = FALSE;
+
+/* If the first character is a parenthesis, check on the type of group we are
+dealing with. The very first call may not start with a parenthesis. */
+
+if (ptr[0] == CHAR_LEFT_PARENTHESIS)
+  {
+  if (ptr[1] == CHAR_QUESTION_MARK &&
+      ptr[2] == CHAR_VERTICAL_LINE)
+    {
+    ptr += 3;
+    dup_parens = TRUE;
+    }
+
+  /* Handle a normal, unnamed capturing parenthesis */
+
+  else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)
+    {
+    *count += 1;
+    if (name == NULL && *count == lorn) return *count;
+    ptr++;
+    }
+
+  /* Handle a condition. If it is an assertion, just carry on so that it
+  is processed as normal. If not, skip to the closing parenthesis of the
+  condition (there can't be any nested parens. */
+
+  else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
+    {
+    ptr += 2;
+    if (ptr[1] != CHAR_QUESTION_MARK)
+      {
+      while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
+      if (*ptr != 0) ptr++;
+      }
+    }
+
+  /* We have either (? or (* and not a condition */
+
+  else
+    {
+    ptr += 2;
+    if (*ptr == CHAR_P) ptr++;                      /* Allow optional P */
+
+    /* We have to disambiguate (? for named groups */
+
+    if ((*ptr == CHAR_LESS_THAN_SIGN && ptr[1] != CHAR_EXCLAMATION_MARK &&
+        ptr[1] != CHAR_EQUALS_SIGN) || *ptr == CHAR_APOSTROPHE)
+      {
+      int term;
+      const uschar *thisname;
+      *count += 1;
+      if (name == NULL && *count == lorn) return *count;
+      term = *ptr++;
+      if (term == CHAR_LESS_THAN_SIGN) term = CHAR_GREATER_THAN_SIGN;
+      thisname = ptr;
+      while (*ptr != term) ptr++;
+      if (name != NULL && lorn == ptr - thisname &&
+          strncmp((const char *)name, (const char *)thisname, lorn) == 0)
+        return *count;
+      }
+    }
+  }
+
+/* Past any initial parenthesis handling, scan for parentheses or vertical
+bars. */
+
 for (; *ptr != 0; ptr++)
   {
-  if (*ptr == '\\' && ptr[1] != 0) { ptr++; continue; }
-  if (*ptr != '(') continue;
-  if (ptr[1] != '?') { count++; continue; }
-  if (ptr[2] == '(') { ptr += 2; continue; }
-  if (ptr[2] != 'P' || ptr[3] != '<') continue;
-  count++;
-  ptr += 4;
-  thisname = ptr;
-  while (*ptr != '>') ptr++;
-  if (namelen == ptr - thisname && strncmp(name, thisname, namelen) == 0)
-    return count;
+  /* Skip over backslashed characters and also entire \Q...\E */
+
+  if (*ptr == CHAR_BACKSLASH)
+    {
+    if (*(++ptr) == 0) goto FAIL_EXIT;
+    if (*ptr == CHAR_Q) for (;;)
+      {
+      while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
+      if (*ptr == 0) goto FAIL_EXIT;
+      if (*(++ptr) == CHAR_E) break;
+      }
+    continue;
+    }
+
+  /* Skip over character classes; this logic must be similar to the way they
+  are handled for real. If the first character is '^', skip it. Also, if the
+  first few characters (either before or after ^) are \Q\E or \E we skip them
+  too. This makes for compatibility with Perl. Note the use of STR macros to
+  encode "Q\\E" so that it works in UTF-8 on EBCDIC platforms. */
+
+  if (*ptr == CHAR_LEFT_SQUARE_BRACKET)
+    {
+    BOOL negate_class = FALSE;
+    for (;;)
+      {
+      int c = *(++ptr);
+      if (c == CHAR_BACKSLASH)
+        {
+        if (ptr[1] == CHAR_E)
+          ptr++;
+        else if (strncmp((const char *)ptr+1,
+                 STR_Q STR_BACKSLASH STR_E, 3) == 0)
+          ptr += 3;
+        else
+          break;
+        }
+      else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
+        negate_class = TRUE;
+      else break;
+      }
+
+    /* If the next character is ']', it is a data character that must be
+    skipped, except in JavaScript compatibility mode. */
+
+    if (ptr[1] == CHAR_RIGHT_SQUARE_BRACKET &&
+        (cd->external_options & PCRE_JAVASCRIPT_COMPAT) == 0)
+      ptr++;
+
+    while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
+      {
+      if (*ptr == 0) return -1;
+      if (*ptr == CHAR_BACKSLASH)
+        {
+        if (*(++ptr) == 0) goto FAIL_EXIT;
+        if (*ptr == CHAR_Q) for (;;)
+          {
+          while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};
+          if (*ptr == 0) goto FAIL_EXIT;
+          if (*(++ptr) == CHAR_E) break;
+          }
+        continue;
+        }
+      }
+    continue;
+    }
+
+  /* Skip comments in /x mode */
+
+  if (xmode && *ptr == CHAR_NUMBER_SIGN)
+    {
+    while (*(++ptr) != 0 && *ptr != CHAR_NL) {};
+    if (*ptr == 0) goto FAIL_EXIT;
+    continue;
+    }
+
+  /* Check for the special metacharacters */
+
+  if (*ptr == CHAR_LEFT_PARENTHESIS)
+    {
+    int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, count);
+    if (rc > 0) return rc;
+    if (*ptr == 0) goto FAIL_EXIT;
+    }
+
+  else if (*ptr == CHAR_RIGHT_PARENTHESIS)
+    {
+    if (dup_parens && *count < hwm_count) *count = hwm_count;
+    *ptrptr = ptr;
+    return -1;
+    }
+
+  else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
+    {
+    if (*count > hwm_count) hwm_count = *count;
+    *count = start_count;
+    }
   }
+
+FAIL_EXIT:
+*ptrptr = ptr;
 return -1;
 }
 
 
 
+
+/*************************************************
+*       Find forward referenced subpattern       *
+*************************************************/
+
+/* This function scans along a pattern's text looking for capturing
+subpatterns, and counting them. If it finds a named pattern that matches the
+name it is given, it returns its number. Alternatively, if the name is NULL, it
+returns when it reaches a given numbered subpattern. This is used for forward
+references to subpatterns. We used to be able to start this scan from the
+current compiling point, using the current count value from cd->bracount, and
+do it all in a single loop, but the addition of the possibility of duplicate
+subpattern numbers means that we have to scan from the very start, in order to
+take account of such duplicates, and to use a recursive function to keep track
+of the different types of group.
+
+Arguments:
+  cd           compile background data
+  name         name to seek, or NULL if seeking a numbered subpattern
+  lorn         name length, or subpattern number if name is NULL
+  xmode        TRUE if we are in /x mode
+
+Returns:       the number of the found subpattern, or -1 if not found
+*/
+
+static int
+find_parens(compile_data *cd, const uschar *name, int lorn, BOOL xmode)
+{
+uschar *ptr = (uschar *)cd->start_pattern;
+int count = 0;
+int rc;
+
+/* If the pattern does not start with an opening parenthesis, the first call
+to find_parens_sub() will scan right to the end (if necessary). However, if it
+does start with a parenthesis, find_parens_sub() will return when it hits the
+matching closing parens. That is why we have to have a loop. */
+
+for (;;)
+  {
+  rc = find_parens_sub(&ptr, cd, name, lorn, xmode, &count);
+  if (rc > 0 || *ptr++ == 0) break;
+  }
+
+return rc;
+}
+
+
+
+
 /*************************************************
 *      Find first significant op code            *
 *************************************************/
@@ -862,7 +1312,8 @@
 
     case OP_CALLOUT:
     case OP_CREF:
-    case OP_BRANUMBER:
+    case OP_RREF:
+    case OP_DEF:
     code += _pcre_OP_lengths[*code];
     break;
 
@@ -907,14 +1358,13 @@
   {
   int d;
   register int op = *cc;
-  if (op >= OP_BRA) op = OP_BRA;
-
   switch (op)
     {
+    case OP_CBRA:
     case OP_BRA:
     case OP_ONCE:
     case OP_COND:
-    d = find_fixedlength(cc, options);
+    d = find_fixedlength(cc + ((op == OP_CBRA)? 2:0), options);
     if (d < 0) return d;
     branchlength += d;
     do cc += GET(cc, 1); while (*cc == OP_ALT);
@@ -949,8 +1399,9 @@
     /* Skip over things that don't match chars */
 
     case OP_REVERSE:
-    case OP_BRANUMBER:
     case OP_CREF:
+    case OP_RREF:
+    case OP_DEF:
     case OP_OPT:
     case OP_CALLOUT:
     case OP_SOD:
@@ -995,6 +1446,7 @@
 
     case OP_TYPEEXACT:
     branchlength += GET2(cc,1);
+    if (cc[3] == OP_PROP || cc[3] == OP_NOTPROP) cc += 2;
     cc += 4;
     break;
 
@@ -1012,6 +1464,7 @@
     case OP_NOT_WORDCHAR:
     case OP_WORDCHAR:
     case OP_ANY:
+    case OP_ALLANY:
     branchlength++;
     cc++;
     break;
@@ -1094,25 +1547,52 @@
 
   if (c == OP_XCLASS) code += GET(code, 1);
 
-  /* Handle bracketed group */
+  /* Handle capturing bracket */
 
-  else if (c > OP_BRA)
+  else if (c == OP_CBRA)
     {
-    int n = c - OP_BRA;
-    if (n > EXTRACT_BASIC_MAX) n = GET2(code, 2+LINK_SIZE);
+    int n = GET2(code, 1+LINK_SIZE);
     if (n == number) return (uschar *)code;
-    code += _pcre_OP_lengths[OP_BRA];
+    code += _pcre_OP_lengths[c];
     }
 
-  /* Otherwise, we get the item's length from the table. In UTF-8 mode, opcodes
-  that are followed by a character may be followed by a multi-byte character.
-  The length in the table is a minimum, so we have to scan along to skip the
-  extra bytes. All opcodes are less than 128, so we can use relatively
-  efficient code. */
+  /* Otherwise, we can get the item's length from the table, except that for
+  repeated character types, we have to test for \p and \P, which have an extra
+  two bytes of parameters. */
 
   else
     {
+    switch(c)
+      {
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEPOSPLUS:
+      case OP_TYPEPOSQUERY:
+      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+      break;
+
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEEXACT:
+      case OP_TYPEPOSUPTO:
+      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+      break;
+      }
+
+    /* Add in the fixed length from the table */
+
     code += _pcre_OP_lengths[c];
+
+  /* In UTF-8 mode, opcodes that are followed by a character may be followed by
+  a multi-byte character. The length in the table is a minimum, so we have to
+  arrange to skip the extra bytes. */
+
+#ifdef SUPPORT_UTF8
     if (utf8) switch(c)
       {
       case OP_CHAR:
@@ -1120,15 +1600,22 @@
       case OP_EXACT:
       case OP_UPTO:
       case OP_MINUPTO:
+      case OP_POSUPTO:
       case OP_STAR:
       case OP_MINSTAR:
+      case OP_POSSTAR:
       case OP_PLUS:
       case OP_MINPLUS:
+      case OP_POSPLUS:
       case OP_QUERY:
       case OP_MINQUERY:
-      while ((*code & 0xc0) == 0x80) code++;
+      case OP_POSQUERY:
+      if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
       break;
       }
+#else
+    (void)(utf8);  /* Keep compiler happy by referencing function argument */
+#endif
     }
   }
 }
@@ -1164,22 +1651,43 @@
 
   if (c == OP_XCLASS) code += GET(code, 1);
 
-  /* All bracketed groups have the same length. */
+  /* Otherwise, we can get the item's length from the table, except that for
+  repeated character types, we have to test for \p and \P, which have an extra
+  two bytes of parameters. */
 
-  else if (c > OP_BRA)
+  else
     {
-    code += _pcre_OP_lengths[OP_BRA];
-    }
+    switch(c)
+      {
+      case OP_TYPESTAR:
+      case OP_TYPEMINSTAR:
+      case OP_TYPEPLUS:
+      case OP_TYPEMINPLUS:
+      case OP_TYPEQUERY:
+      case OP_TYPEMINQUERY:
+      case OP_TYPEPOSSTAR:
+      case OP_TYPEPOSPLUS:
+      case OP_TYPEPOSQUERY:
+      if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+      break;
 
-  /* Otherwise, we get the item's length from the table. In UTF-8 mode, opcodes
-  that are followed by a character may be followed by a multi-byte character.
-  The length in the table is a minimum, so we have to scan along to skip the
-  extra bytes. All opcodes are less than 128, so we can use relatively
-  efficient code. */
+      case OP_TYPEPOSUPTO:
+      case OP_TYPEUPTO:
+      case OP_TYPEMINUPTO:
+      case OP_TYPEEXACT:
+      if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+      break;
+      }
+
+    /* Add in the fixed length from the table */
 
-  else
-    {
     code += _pcre_OP_lengths[c];
+
+    /* In UTF-8 mode, opcodes that are followed by a character may be followed
+    by a multi-byte character. The length in the table is a minimum, so we have
+    to arrange to skip the extra bytes. */
+
+#ifdef SUPPORT_UTF8
     if (utf8) switch(c)
       {
       case OP_CHAR:
@@ -1187,15 +1695,22 @@
       case OP_EXACT:
       case OP_UPTO:
       case OP_MINUPTO:
+      case OP_POSUPTO:
       case OP_STAR:
       case OP_MINSTAR:
+      case OP_POSSTAR:
       case OP_PLUS:
       case OP_MINPLUS:
+      case OP_POSPLUS:
       case OP_QUERY:
       case OP_MINQUERY:
-      while ((*code & 0xc0) == 0x80) code++;
+      case OP_POSQUERY:
+      if (code[-1] >= 0xc0) code += _pcre_utf8_table4[code[-1] & 0x3f];
       break;
       }
+#else
+    (void)(utf8);  /* Keep compiler happy by referencing function argument */
+#endif
     }
   }
 }
@@ -1207,10 +1722,12 @@
 *************************************************/
 
 /* This function scans through a branch of a compiled pattern to see whether it
-can match the empty string or not. It is called only from could_be_empty()
-below. Note that first_significant_code() skips over assertions. If we hit an
-unclosed bracket, we return "empty" - this means we've struck an inner bracket
-whose current branch will already have been scanned.
+can match the empty string or not. It is called from could_be_empty()
+below and from compile_branch() when checking for an unlimited repeat of a
+group that can match nothing. Note that first_significant_code() skips over
+backward and negative forward assertions when its final argument is TRUE. If we
+hit an unclosed bracket, we return "empty" - this means we've struck an inner
+bracket whose current branch will already have been scanned.
 
 Arguments:
   code        points to start of search
@@ -1224,7 +1741,7 @@
 could_be_empty_branch(const uschar *code, const uschar *endcode, BOOL utf8)
 {
 register int c;
-for (code = first_significant_code(code + 1 + LINK_SIZE, NULL, 0, TRUE);
+for (code = first_significant_code(code + _pcre_OP_lengths[*code], NULL, 0, TRUE);
      code < endcode;
      code = first_significant_code(code + _pcre_OP_lengths[c], NULL, 0, TRUE))
   {
@@ -1232,33 +1749,69 @@
 
   c = *code;
 
-  if (c >= OP_BRA)
+  /* Skip over forward assertions; the other assertions are skipped by
+  first_significant_code() with a TRUE final argument. */
+
+  if (c == OP_ASSERT)
+    {
+    do code += GET(code, 1); while (*code == OP_ALT);
+    c = *code;
+    continue;
+    }
+
+  /* Groups with zero repeats can of course be empty; skip them. */
+
+  if (c == OP_BRAZERO || c == OP_BRAMINZERO || c == OP_SKIPZERO)
+    {
+    code += _pcre_OP_lengths[c];
+    do code += GET(code, 1); while (*code == OP_ALT);
+    c = *code;
+    continue;
+    }
+
+  /* For other groups, scan the branches. */
+
+  if (c == OP_BRA || c == OP_CBRA || c == OP_ONCE || c == OP_COND)
     {
     BOOL empty_branch;
     if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
 
-    /* Scan a closed bracket */
+    /* If a conditional group has only one branch, there is a second, implied,
+    empty branch, so just skip over the conditional, because it could be empty.
+    Otherwise, scan the individual branches of the group. */
 
-    empty_branch = FALSE;
-    do
-      {
-      if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
-        empty_branch = TRUE;
+    if (c == OP_COND && code[GET(code, 1)] != OP_ALT)
       code += GET(code, 1);
+    else
+      {
+      empty_branch = FALSE;
+      do
+        {
+        if (!empty_branch && could_be_empty_branch(code, endcode, utf8))
+          empty_branch = TRUE;
+        code += GET(code, 1);
+        }
+      while (*code == OP_ALT);
+      if (!empty_branch) return FALSE;   /* All branches are non-empty */
       }
-    while (*code == OP_ALT);
-    if (!empty_branch) return FALSE;   /* All branches are non-empty */
-    code += 1 + LINK_SIZE;
+
     c = *code;
+    continue;
     }
 
-  else switch (c)
+  /* Handle the other opcodes */
+
+  switch (c)
     {
-    /* Check for quantifiers after a class */
+    /* Check for quantifiers after a class. XCLASS is used for classes that
+    cannot be represented just by a bit map. This includes negated single
+    high-valued characters. The length in _pcre_OP_lengths[] is zero; the
+    actual length is stored in the compiled code, so we must update "code"
+    here. */
 
 #ifdef SUPPORT_UTF8
     case OP_XCLASS:
-    ccode = code + GET(code, 1);
+    ccode = code += GET(code, 1);
     goto CHECK_CLASS_REPEAT;
 #endif
 
@@ -1302,21 +1855,45 @@
     case OP_NOT_WORDCHAR:
     case OP_WORDCHAR:
     case OP_ANY:
+    case OP_ALLANY:
     case OP_ANYBYTE:
     case OP_CHAR:
     case OP_CHARNC:
     case OP_NOT:
     case OP_PLUS:
     case OP_MINPLUS:
+    case OP_POSPLUS:
     case OP_EXACT:
     case OP_NOTPLUS:
     case OP_NOTMINPLUS:
+    case OP_NOTPOSPLUS:
     case OP_NOTEXACT:
     case OP_TYPEPLUS:
     case OP_TYPEMINPLUS:
+    case OP_TYPEPOSPLUS:
     case OP_TYPEEXACT:
     return FALSE;
 
+    /* These are going to continue, as they may be empty, but we have to
+    fudge the length for the \p and \P cases. */
+
+    case OP_TYPESTAR:
+    case OP_TYPEMINSTAR:
+    case OP_TYPEPOSSTAR:
+    case OP_TYPEQUERY:
+    case OP_TYPEMINQUERY:
+    case OP_TYPEPOSQUERY:
+    if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
+    break;
+
+    /* Same for these */
+
+    case OP_TYPEUPTO:
+    case OP_TYPEMINUPTO:
+    case OP_TYPEPOSUPTO:
+    if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
+    break;
+
     /* End of branch */
 
     case OP_KET:
@@ -1325,16 +1902,19 @@
     case OP_ALT:
     return TRUE;
 
-    /* In UTF-8 mode, STAR, MINSTAR, QUERY, MINQUERY, UPTO, and MINUPTO  may be
-    followed by a multibyte character */
+    /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
+    MINUPTO, and POSUPTO may be followed by a multibyte character */
 
 #ifdef SUPPORT_UTF8
     case OP_STAR:
     case OP_MINSTAR:
+    case OP_POSSTAR:
     case OP_QUERY:
     case OP_MINQUERY:
+    case OP_POSQUERY:
     case OP_UPTO:
     case OP_MINUPTO:
+    case OP_POSUPTO:
     if (utf8) while ((code[2] & 0xc0) == 0x80) code++;
     break;
 #endif
@@ -1383,29 +1963,48 @@
 *************************************************/
 
 /* This function is called when the sequence "[:" or "[." or "[=" is
-encountered in a character class. It checks whether this is followed by an
-optional ^ and then a sequence of letters, terminated by a matching ":]" or
-".]" or "=]".
+encountered in a character class. It checks whether this is followed by a
+sequence of characters terminated by a matching ":]" or ".]" or "=]". If we
+reach an unescaped ']' without the special preceding character, return FALSE.
+
+Originally, this function only recognized a sequence of letters between the
+terminators, but it seems that Perl recognizes any sequence of characters,
+though of course unknown POSIX names are subsequently rejected. Perl gives an
+"Unknown POSIX class" error for [:f\oo:] for example, where previously PCRE
+didn't consider this to be a POSIX class. Likewise for [:1234:].
+
+The problem in trying to be exactly like Perl is in the handling of escapes. We
+have to be sure that [abc[:x\]pqr] is *not* treated as containing a POSIX
+class, but [abc[:x\]pqr:]] is (so that an error can be generated). The code
+below handles the special case of \], but does not try to do any other escape
+processing. This makes it different from Perl for cases such as [:l\ower:]
+where Perl recognizes it as the POSIX class "lower" but PCRE does not recognize
+"l\ower". This is a lesser evil that not diagnosing bad classes when Perl does,
+I think.
 
-Argument:
+Arguments:
   ptr      pointer to the initial [
   endptr   where to return the end pointer
-  cd       pointer to compile data
 
 Returns:   TRUE or FALSE
 */
 
 static BOOL
-check_posix_syntax(const uschar *ptr, const uschar **endptr, compile_data *cd)
+check_posix_syntax(const uschar *ptr, const uschar **endptr)
 {
 int terminator;          /* Don't combine these lines; the Solaris cc */
 terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
-if (*(++ptr) == '^') ptr++;
-while ((cd->ctypes[*ptr] & ctype_letter) != 0) ptr++;
-if (*ptr == terminator && ptr[1] == ']')
+for (++ptr; *ptr != 0; ptr++)
   {
-  *endptr = ptr;
-  return TRUE;
+  if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) ptr++; else
+    {
+    if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE;
+    if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
+      {
+      *endptr = ptr;
+      return TRUE;
+      }
+    }
   }
 return FALSE;
 }
@@ -1430,11 +2029,13 @@
 static int
 check_posix_name(const uschar *ptr, int len)
 {
+const char *pn = posix_names;
 register int yield = 0;
 while (posix_name_lengths[yield] != 0)
   {
   if (len == posix_name_lengths[yield] &&
-    strncmp((const char *)ptr, posix_names[yield], len) == 0) return yield;
+    strncmp((const char *)ptr, pn, len) == 0) return yield;
+  pn += posix_name_lengths[yield] + 1;
   yield++;
   }
 return -1;
@@ -1449,38 +2050,71 @@
 that is referenced. This means that groups can be replicated for fixed
 repetition simply by copying (because the recursion is allowed to refer to
 earlier groups that are outside the current group). However, when a group is
-optional (i.e. the minimum quantifier is zero), OP_BRAZERO is inserted before
-it, after it has been compiled. This means that any OP_RECURSE items within it
-that refer to the group itself or any contained groups have to have their
-offsets adjusted. That is the job of this function. Before it is called, the
-partially compiled regex must be temporarily terminated with OP_END.
+optional (i.e. the minimum quantifier is zero), OP_BRAZERO or OP_SKIPZERO is
+inserted before it, after it has been compiled. This means that any OP_RECURSE
+items within it that refer to the group itself or any contained groups have to
+have their offsets adjusted. That one of the jobs of this function. Before it
+is called, the partially compiled regex must be temporarily terminated with
+OP_END.
+
+This function has been extended with the possibility of forward references for
+recursions and subroutine calls. It must also check the list of such references
+for the group we are dealing with. If it finds that one of the recursions in
+the current group is on this list, it adjusts the offset in the list, not the
+value in the reference (which is a group number).
 
 Arguments:
   group      points to the start of the group
   adjust     the amount by which the group is to be moved
   utf8       TRUE in UTF-8 mode
   cd         contains pointers to tables etc.
+  save_hwm   the hwm forward reference pointer at the start of the group
 
 Returns:     nothing
 */
 
 static void
-adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd)
+adjust_recurse(uschar *group, int adjust, BOOL utf8, compile_data *cd,
+  uschar *save_hwm)
 {
 uschar *ptr = group;
+
 while ((ptr = (uschar *)find_recurse(ptr, utf8)) != NULL)
   {
-  int offset = GET(ptr, 1);
-  if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
-  ptr += 1 + LINK_SIZE;
-  }
-}
+  int offset;
+  uschar *hc;
 
+  /* See if this recursion is on the forward reference list. If so, adjust the
+  reference. */
 
+  for (hc = save_hwm; hc < cd->hwm; hc += LINK_SIZE)
+    {
+    offset = GET(hc, 0);
+    if (cd->start_code + offset == ptr + 1)
+      {
+      PUT(hc, 0, offset + adjust);
+      break;
+      }
+    }
 
-/*************************************************
-*        Insert an automatic callout point       *
-*************************************************/
+  /* Otherwise, adjust the recursion offset if it's after the start of this
+  group. */
+
+  if (hc >= cd->hwm)
+    {
+    offset = GET(ptr, 1);
+    if (cd->start_code + offset >= group) PUT(ptr, 1, offset + adjust);
+    }
+
+  ptr += 1 + LINK_SIZE;
+  }
+}
+
+
+
+/*************************************************
+*        Insert an automatic callout point       *
+*************************************************/
 
 /* This function is called when the PCRE_AUTO_CALLOUT option is set, to insert
 callout points before each pattern item.
@@ -1550,12 +2184,13 @@
 */
 
 static BOOL
-get_othercase_range(int *cptr, int d, int *ocptr, int *odptr)
+get_othercase_range(unsigned int *cptr, unsigned int d, unsigned int *ocptr,
+  unsigned int *odptr)
 {
-int c, othercase, next;
+unsigned int c, othercase, next;
 
 for (c = *cptr; c <= d; c++)
-  { if ((othercase = _pcre_ucp_othercase(c)) >= 0) break; }
+  { if ((othercase = UCD_OTHERCASE(c)) != c) break; }
 
 if (c > d) return FALSE;
 
@@ -1564,7 +2199,7 @@
 
 for (++c; c <= d; c++)
   {
-  if (_pcre_ucp_othercase(c) != next) break;
+  if (UCD_OTHERCASE(c) != next) break;
   next++;
   }
 
@@ -1576,17 +2211,353 @@
 #endif  /* SUPPORT_UCP */
 
 
+
+/*************************************************
+*     Check if auto-possessifying is possible    *
+*************************************************/
+
+/* This function is called for unlimited repeats of certain items, to see
+whether the next thing could possibly match the repeated item. If not, it makes
+sense to automatically possessify the repeated item.
+
+Arguments:
+  op_code       the repeated op code
+  this          data for this item, depends on the opcode
+  utf8          TRUE in UTF-8 mode
+  utf8_char     used for utf8 character bytes, NULL if not relevant
+  ptr           next character in pattern
+  options       options bits
+  cd            contains pointers to tables etc.
+
+Returns:        TRUE if possessifying is wanted
+*/
+
+static BOOL
+check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,
+  const uschar *ptr, int options, compile_data *cd)
+{
+int next;
+
+/* Skip whitespace and comments in extended mode */
+
+if ((options & PCRE_EXTENDED) != 0)
+  {
+  for (;;)
+    {
+    while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
+    if (*ptr == CHAR_NUMBER_SIGN)
+      {
+      while (*(++ptr) != 0)
+        if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
+      }
+    else break;
+    }
+  }
+
+/* If the next item is one that we can handle, get its value. A non-negative
+value is a character, a negative value is an escape value. */
+
+if (*ptr == CHAR_BACKSLASH)
+  {
+  int temperrorcode = 0;
+  next = check_escape(&ptr, &temperrorcode, cd->bracount, options, FALSE);
+  if (temperrorcode != 0) return FALSE;
+  ptr++;    /* Point after the escape sequence */
+  }
+
+else if ((cd->ctypes[*ptr] & ctype_meta) == 0)
+  {
+#ifdef SUPPORT_UTF8
+  if (utf8) { GETCHARINC(next, ptr); } else
+#endif
+  next = *ptr++;
+  }
+
+else return FALSE;
+
+/* Skip whitespace and comments in extended mode */
+
+if ((options & PCRE_EXTENDED) != 0)
+  {
+  for (;;)
+    {
+    while ((cd->ctypes[*ptr] & ctype_space) != 0) ptr++;
+    if (*ptr == CHAR_NUMBER_SIGN)
+      {
+      while (*(++ptr) != 0)
+        if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
+      }
+    else break;
+    }
+  }
+
+/* If the next thing is itself optional, we have to give up. */
+
+if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
+  strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
+    return FALSE;
+
+/* Now compare the next item with the previous opcode. If the previous is a
+positive single character match, "item" either contains the character or, if
+"item" is greater than 127 in utf8 mode, the character's bytes are in
+utf8_char. */
+
+
+/* Handle cases when the next item is a character. */
+
+if (next >= 0) switch(op_code)
+  {
+  case OP_CHAR:
+#ifdef SUPPORT_UTF8
+  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+#else
+  (void)(utf8_char);  /* Keep compiler happy by referencing function argument */
+#endif
+  return item != next;
+
+  /* For CHARNC (caseless character) we must check the other case. If we have
+  Unicode property support, we can use it to test the other case of
+  high-valued characters. */
+
+  case OP_CHARNC:
+#ifdef SUPPORT_UTF8
+  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+#endif
+  if (item == next) return FALSE;
+#ifdef SUPPORT_UTF8
+  if (utf8)
+    {
+    unsigned int othercase;
+    if (next < 128) othercase = cd->fcc[next]; else
+#ifdef SUPPORT_UCP
+    othercase = UCD_OTHERCASE((unsigned int)next);
+#else
+    othercase = NOTACHAR;
+#endif
+    return (unsigned int)item != othercase;
+    }
+  else
+#endif  /* SUPPORT_UTF8 */
+  return (item != cd->fcc[next]);  /* Non-UTF-8 mode */
+
+  /* For OP_NOT, "item" must be a single-byte character. */
+
+  case OP_NOT:
+  if (item == next) return TRUE;
+  if ((options & PCRE_CASELESS) == 0) return FALSE;
+#ifdef SUPPORT_UTF8
+  if (utf8)
+    {
+    unsigned int othercase;
+    if (next < 128) othercase = cd->fcc[next]; else
+#ifdef SUPPORT_UCP
+    othercase = UCD_OTHERCASE(next);
+#else
+    othercase = NOTACHAR;
+#endif
+    return (unsigned int)item == othercase;
+    }
+  else
+#endif  /* SUPPORT_UTF8 */
+  return (item == cd->fcc[next]);  /* Non-UTF-8 mode */
+
+  case OP_DIGIT:
+  return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;
+
+  case OP_NOT_DIGIT:
+  return next <= 127 && (cd->ctypes[next] & ctype_digit) != 0;
+
+  case OP_WHITESPACE:
+  return next > 127 || (cd->ctypes[next] & ctype_space) == 0;
+
+  case OP_NOT_WHITESPACE:
+  return next <= 127 && (cd->ctypes[next] & ctype_space) != 0;
+
+  case OP_WORDCHAR:
+  return next > 127 || (cd->ctypes[next] & ctype_word) == 0;
+
+  case OP_NOT_WORDCHAR:
+  return next <= 127 && (cd->ctypes[next] & ctype_word) != 0;
+
+  case OP_HSPACE:
+  case OP_NOT_HSPACE:
+  switch(next)
+    {
+    case 0x09:
+    case 0x20:
+    case 0xa0:
+    case 0x1680:
+    case 0x180e:
+    case 0x2000:
+    case 0x2001:
+    case 0x2002:
+    case 0x2003:
+    case 0x2004:
+    case 0x2005:
+    case 0x2006:
+    case 0x2007:
+    case 0x2008:
+    case 0x2009:
+    case 0x200A:
+    case 0x202f:
+    case 0x205f:
+    case 0x3000:
+    return op_code != OP_HSPACE;
+    default:
+    return op_code == OP_HSPACE;
+    }
+
+  case OP_VSPACE:
+  case OP_NOT_VSPACE:
+  switch(next)
+    {
+    case 0x0a:
+    case 0x0b:
+    case 0x0c:
+    case 0x0d:
+    case 0x85:
+    case 0x2028:
+    case 0x2029:
+    return op_code != OP_VSPACE;
+    default:
+    return op_code == OP_VSPACE;
+    }
+
+  default:
+  return FALSE;
+  }
+
+
+/* Handle the case when the next item is \d, \s, etc. */
+
+switch(op_code)
+  {
+  case OP_CHAR:
+  case OP_CHARNC:
+#ifdef SUPPORT_UTF8
+  if (utf8 && item > 127) { GETCHAR(item, utf8_char); }
+#endif
+  switch(-next)
+    {
+    case ESC_d:
+    return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;
+
+    case ESC_D:
+    return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;
+
+    case ESC_s:
+    return item > 127 || (cd->ctypes[item] & ctype_space) == 0;
+
+    case ESC_S:
+    return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;
+
+    case ESC_w:
+    return item > 127 || (cd->ctypes[item] & ctype_word) == 0;
+
+    case ESC_W:
+    return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;
+
+    case ESC_h:
+    case ESC_H:
+    switch(item)
+      {
+      case 0x09:
+      case 0x20:
+      case 0xa0:
+      case 0x1680:
+      case 0x180e:
+      case 0x2000:
+      case 0x2001:
+      case 0x2002:
+      case 0x2003:
+      case 0x2004:
+      case 0x2005:
+      case 0x2006:
+      case 0x2007:
+      case 0x2008:
+      case 0x2009:
+      case 0x200A:
+      case 0x202f:
+      case 0x205f:
+      case 0x3000:
+      return -next != ESC_h;
+      default:
+      return -next == ESC_h;
+      }
+
+    case ESC_v:
+    case ESC_V:
+    switch(item)
+      {
+      case 0x0a:
+      case 0x0b:
+      case 0x0c:
+      case 0x0d:
+      case 0x85:
+      case 0x2028:
+      case 0x2029:
+      return -next != ESC_v;
+      default:
+      return -next == ESC_v;
+      }
+
+    default:
+    return FALSE;
+    }
+
+  case OP_DIGIT:
+  return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
+         next == -ESC_h || next == -ESC_v;
+
+  case OP_NOT_DIGIT:
+  return next == -ESC_d;
+
+  case OP_WHITESPACE:
+  return next == -ESC_S || next == -ESC_d || next == -ESC_w;
+
+  case OP_NOT_WHITESPACE:
+  return next == -ESC_s || next == -ESC_h || next == -ESC_v;
+
+  case OP_HSPACE:
+  return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;
+
+  case OP_NOT_HSPACE:
+  return next == -ESC_h;
+
+  /* Can't have \S in here because VT matches \S (Perl anomaly) */
+  case OP_VSPACE:
+  return next == -ESC_V || next == -ESC_d || next == -ESC_w;
+
+  case OP_NOT_VSPACE:
+  return next == -ESC_v;
+
+  case OP_WORDCHAR:
+  return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;
+
+  case OP_NOT_WORDCHAR:
+  return next == -ESC_w || next == -ESC_d;
+
+  default:
+  return FALSE;
+  }
+
+/* Control does not reach here */
+}
+
+
+
 /*************************************************
 *           Compile one branch                   *
 *************************************************/
 
-/* Scan the pattern, compiling it into the code vector. If the options are
+/* Scan the pattern, compiling it into the a vector. If the options are
 changed during the branch, the pointer is used to change the external options
-bits.
+bits. This function is used during the pre-compile phase when we are trying
+to find out the amount of memory needed, as well as during the real compile
+phase. The value of lengthptr distinguishes the two phases.
 
 Arguments:
   optionsptr     pointer to the option bits
-  brackets       points to number of extracting brackets used
   codeptr        points to the pointer to the current code point
   ptrptr         points to the current pattern pointer
   errorcodeptr   points to error code variable
@@ -1594,15 +2565,17 @@
   reqbyteptr     set to the last literal character required, else < 0
   bcptr          points to current branch chain
   cd             contains pointers to tables etc.
+  lengthptr      NULL during the real compile phase
+                 points to length accumulator during pre-compile phase
 
 Returns:         TRUE on success
                  FALSE, with *errorcodeptr set non-zero on error
 */
 
 static BOOL
-compile_branch(int *optionsptr, int *brackets, uschar **codeptr,
-  const uschar **ptrptr, int *errorcodeptr, int *firstbyteptr,
-  int *reqbyteptr, branch_chain *bcptr, compile_data *cd)
+compile_branch(int *optionsptr, uschar **codeptr, const uschar **ptrptr,
+  int *errorcodeptr, int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr,
+  compile_data *cd, int *lengthptr)
 {
 int repeat_type, op_type;
 int repeat_min = 0, repeat_max = 0;      /* To please picky compilers */
@@ -1613,8 +2586,11 @@
 int req_caseopt, reqvary, tempreqvary;
 int options = *optionsptr;
 int after_manual_callout = 0;
+int length_prevgroup = 0;
 register int c;
 register uschar *code = *codeptr;
+uschar *last_code = code;
+uschar *orig_code = code;
 uschar *tempcode;
 BOOL inescq = FALSE;
 BOOL groupsetfirstbyte = FALSE;
@@ -1622,15 +2598,22 @@
 const uschar *tempptr;
 uschar *previous = NULL;
 uschar *previous_callout = NULL;
+uschar *save_hwm = NULL;
 uschar classbits[32];
 
 #ifdef SUPPORT_UTF8
 BOOL class_utf8;
 BOOL utf8 = (options & PCRE_UTF8) != 0;
 uschar *class_utf8data;
+uschar *class_utf8data_base;
 uschar utf8_char[6];
 #else
 BOOL utf8 = FALSE;
+uschar *utf8_char = NULL;
+#endif
+
+#ifdef PCRE_DEBUG
+if (lengthptr != NULL) DPRINTF((">> start branch\n"));
 #endif
 
 /* Set up the default and non-default settings for greediness */
@@ -1662,27 +2645,95 @@
 for (;; ptr++)
   {
   BOOL negate_class;
+  BOOL should_flip_negation;
   BOOL possessive_quantifier;
   BOOL is_quantifier;
+  BOOL is_recurse;
+  BOOL reset_bracount;
   int class_charcount;
   int class_lastchar;
   int newoptions;
   int recno;
+  int refsign;
   int skipbytes;
   int subreqbyte;
   int subfirstbyte;
+  int terminator;
   int mclength;
   uschar mcbuffer[8];
 
-  /* Next byte in the pattern */
+  /* Get next byte in the pattern */
 
   c = *ptr;
 
+  /* If we are in the pre-compile phase, accumulate the length used for the
+  previous cycle of this loop. */
+
+  if (lengthptr != NULL)
+    {
+#ifdef PCRE_DEBUG
+    if (code > cd->hwm) cd->hwm = code;                 /* High water info */
+#endif
+    if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
+      {
+      *errorcodeptr = ERR52;
+      goto FAILED;
+      }
+
+    /* There is at least one situation where code goes backwards: this is the
+    case of a zero quantifier after a class (e.g. [ab]{0}). At compile time,
+    the class is simply eliminated. However, it is created first, so we have to
+    allow memory for it. Therefore, don't ever reduce the length at this point.
+    */
+
+    if (code < last_code) code = last_code;
+
+    /* Paranoid check for integer overflow */
+
+    if (OFLOW_MAX - *lengthptr < code - last_code)
+      {
+      *errorcodeptr = ERR20;
+      goto FAILED;
+      }
+
+    *lengthptr += code - last_code;
+    DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));
+
+    /* If "previous" is set and it is not at the start of the work space, move
+    it back to there, in order to avoid filling up the work space. Otherwise,
+    if "previous" is NULL, reset the current code pointer to the start. */
+
+    if (previous != NULL)
+      {
+      if (previous > orig_code)
+        {
+        memmove(orig_code, previous, code - previous);
+        code -= previous - orig_code;
+        previous = orig_code;
+        }
+      }
+    else code = orig_code;
+
+    /* Remember where this code item starts so we can pick up the length
+    next time round. */
+
+    last_code = code;
+    }
+
+  /* In the real compile phase, just check the workspace used by the forward
+  reference list. */
+
+  else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)
+    {
+    *errorcodeptr = ERR52;
+    goto FAILED;
+    }
+
   /* If in \Q...\E, check for the end; if not, we have a literal */
 
   if (inescq && c != 0)
     {
-    if (c == '\\' && ptr[1] == 'E')
+    if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
       {
       inescq = FALSE;
       ptr++;
@@ -1692,7 +2743,8 @@
       {
       if (previous_callout != NULL)
         {
-        complete_callout(previous_callout, ptr, cd);
+        if (lengthptr == NULL)  /* Don't attempt in pre-compile phase */
+          complete_callout(previous_callout, ptr, cd);
         previous_callout = NULL;
         }
       if ((options & PCRE_AUTO_CALLOUT) != 0)
@@ -1707,13 +2759,15 @@
   /* Fill in length of a previous callout, except when the next thing is
   a quantifier. */
 
-  is_quantifier = c == '*' || c == '+' || c == '?' ||
-    (c == '{' && is_counted_repeat(ptr+1));
+  is_quantifier =
+    c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
+    (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
 
   if (!is_quantifier && previous_callout != NULL &&
        after_manual_callout-- <= 0)
     {
-    complete_callout(previous_callout, ptr, cd);
+    if (lengthptr == NULL)      /* Don't attempt in pre-compile phase */
+      complete_callout(previous_callout, ptr, cd);
     previous_callout = NULL;
     }
 
@@ -1722,14 +2776,14 @@
   if ((options & PCRE_EXTENDED) != 0)
     {
     if ((cd->ctypes[c] & ctype_space) != 0) continue;
-    if (c == '#')
+    if (c == CHAR_NUMBER_SIGN)
       {
-      while (*(++ptr) != 0) if (IS_NEWLINE(ptr)) break;
-      if (*ptr != 0)
+      while (*(++ptr) != 0)
         {
-        ptr += cd->nllen - 1;
-        continue;
+        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
         }
+      if (*ptr != 0) continue;
+
       /* Else fall through to handle end of string */
       c = 0;
       }
@@ -1745,21 +2799,32 @@
 
   switch(c)
     {
-    /* The branch terminates at end of string, |, or ). */
-
-    case 0:
-    case '|':
-    case ')':
+    /* ===================================================================*/
+    case 0:                        /* The branch terminates at string end */
+    case CHAR_VERTICAL_LINE:       /* or | or ) */
+    case CHAR_RIGHT_PARENTHESIS:
     *firstbyteptr = firstbyte;
     *reqbyteptr = reqbyte;
     *codeptr = code;
     *ptrptr = ptr;
+    if (lengthptr != NULL)
+      {
+      if (OFLOW_MAX - *lengthptr < code - last_code)
+        {
+        *errorcodeptr = ERR20;
+        goto FAILED;
+        }
+      *lengthptr += code - last_code;   /* To include callout length */
+      DPRINTF((">> end branch\n"));
+      }
     return TRUE;
 
+
+    /* ===================================================================*/
     /* Handle single-character metacharacters. In multiline mode, ^ disables
     the setting of any following char as a first character. */
 
-    case '^':
+    case CHAR_CIRCUMFLEX_ACCENT:
     if ((options & PCRE_MULTILINE) != 0)
       {
       if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
@@ -1768,7 +2833,7 @@
     *code++ = OP_CIRC;
     break;
 
-    case '$':
+    case CHAR_DOLLAR_SIGN:
     previous = NULL;
     *code++ = OP_DOLL;
     break;
@@ -1776,14 +2841,16 @@
     /* There can never be a first char if '.' is first, whatever happens about
     repeats. The value of reqbyte doesn't change either. */
 
-    case '.':
+    case CHAR_DOT:
     if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
     zerofirstbyte = firstbyte;
     zeroreqbyte = reqbyte;
     previous = code;
-    *code++ = OP_ANY;
+    *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY;
     break;
 
+
+    /* ===================================================================*/
     /* Character classes. If the included characters are all < 256, we build a
     32-byte bitmap of the permitted characters, except in the special case
     where there is only one such character. For negated classes, we build the
@@ -1794,78 +2861,133 @@
     opcode is compiled. It may optionally have a bit map for characters < 256,
     but those above are are explicitly listed afterwards. A flag byte tells
     whether the bitmap is present, and whether this is a negated class or not.
-    */
 
-    case '[':
+    In JavaScript compatibility mode, an isolated ']' causes an error. In
+    default (Perl) mode, it is treated as a data character. */
+
+    case CHAR_RIGHT_SQUARE_BRACKET:
+    if ((cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
+      {
+      *errorcodeptr = ERR64;
+      goto FAILED;
+      }
+    goto NORMAL_CHAR;
+
+    case CHAR_LEFT_SQUARE_BRACKET:
     previous = code;
 
     /* PCRE supports POSIX class stuff inside a class. Perl gives an error if
     they are encountered at the top level, so we'll do that too. */
 
-    if ((ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
-        check_posix_syntax(ptr, &tempptr, cd))
+    if ((ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
+         ptr[1] == CHAR_EQUALS_SIGN) &&
+        check_posix_syntax(ptr, &tempptr))
       {
-      *errorcodeptr = (ptr[1] == ':')? ERR13 : ERR31;
+      *errorcodeptr = (ptr[1] == CHAR_COLON)? ERR13 : ERR31;
       goto FAILED;
       }
 
-    /* If the first character is '^', set the negation flag and skip it. */
+    /* If the first character is '^', set the negation flag and skip it. Also,
+    if the first few characters (either before or after ^) are \Q\E or \E we
+    skip them too. This makes for compatibility with Perl. */
 
-    if ((c = *(++ptr)) == '^')
+    negate_class = FALSE;
+    for (;;)
       {
-      negate_class = TRUE;
       c = *(++ptr);
+      if (c == CHAR_BACKSLASH)
+        {
+        if (ptr[1] == CHAR_E)
+          ptr++;
+        else if (strncmp((const char *)ptr+1,
+                          STR_Q STR_BACKSLASH STR_E, 3) == 0)
+          ptr += 3;
+        else
+          break;
+        }
+      else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
+        negate_class = TRUE;
+      else break;
       }
-    else
+
+    /* Empty classes are allowed in JavaScript compatibility mode. Otherwise,
+    an initial ']' is taken as a data character -- the code below handles
+    that. In JS mode, [] must always fail, so generate OP_FAIL, whereas
+    [^] must match any character, so generate OP_ALLANY. */
+
+    if (c == CHAR_RIGHT_SQUARE_BRACKET &&
+        (cd->external_options & PCRE_JAVASCRIPT_COMPAT) != 0)
       {
-      negate_class = FALSE;
+      *code++ = negate_class? OP_ALLANY : OP_FAIL;
+      if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+      zerofirstbyte = firstbyte;
+      break;
       }
 
+    /* If a class contains a negative special such as \S, we need to flip the
+    negation flag at the end, so that support for characters > 255 works
+    correctly (they are all included in the class). */
+
+    should_flip_negation = FALSE;
+
     /* Keep a count of chars with values < 256 so that we can optimize the case
-    of just a single character (as long as it's < 256). For higher valued UTF-8
-    characters, we don't yet do any optimization. */
+    of just a single character (as long as it's < 256). However, For higher
+    valued UTF-8 characters, we don't yet do any optimization. */
 
     class_charcount = 0;
     class_lastchar = -1;
 
+    /* Initialize the 32-char bit map to all zeros. We build the map in a
+    temporary bit of memory, in case the class contains only 1 character (less
+    than 256), because in that case the compiled code doesn't use the bit map.
+    */
+
+    memset(classbits, 0, 32 * sizeof(uschar));
+
 #ifdef SUPPORT_UTF8
     class_utf8 = FALSE;                       /* No chars >= 256 */
-    class_utf8data = code + LINK_SIZE + 34;   /* For UTF-8 items */
+    class_utf8data = code + LINK_SIZE + 2;    /* For UTF-8 items */
+    class_utf8data_base = class_utf8data;     /* For resetting in pass 1 */
 #endif
 
-    /* Initialize the 32-char bit map to all zeros. We have to build the
-    map in a temporary bit of store, in case the class contains only 1
-    character (< 256), because in that case the compiled code doesn't use the
-    bit map. */
-
-    memset(classbits, 0, 32 * sizeof(uschar));
-
     /* Process characters until ] is reached. By writing this as a "do" it
-    means that an initial ] is taken as a data character. The first pass
-    through the regex checked the overall syntax, so we don't need to be very
-    strict here. At the start of the loop, c contains the first byte of the
-    character. */
+    means that an initial ] is taken as a data character. At the start of the
+    loop, c contains the first byte of the character. */
 
-    do
+    if (c != 0) do
       {
+      const uschar *oldptr;
+
 #ifdef SUPPORT_UTF8
       if (utf8 && c > 127)
         {                           /* Braces are required because the */
         GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
         }
+
+      /* In the pre-compile phase, accumulate the length of any UTF-8 extra
+      data and reset the pointer. This is so that very large classes that
+      contain a zillion UTF-8 characters no longer overwrite the work space
+      (which is on the stack). */
+
+      if (lengthptr != NULL)
+        {
+        *lengthptr += class_utf8data - class_utf8data_base;
+        class_utf8data = class_utf8data_base;
+        }
+
 #endif
 
       /* Inside \Q...\E everything is literal except \E */
 
       if (inescq)
         {
-        if (c == '\\' && ptr[1] == 'E')
+        if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)  /* If we are at \E */
           {
-          inescq = FALSE;
-          ptr++;
-          continue;
+          inescq = FALSE;                   /* Reset literal state */
+          ptr++;                            /* Skip the 'E' */
+          continue;                         /* Carry on with next */
           }
-        else goto LONE_SINGLE_CHARACTER;
+        goto CHECK_RANGE;                   /* Could be range if \E follows */
         }
 
       /* Handle POSIX class names. Perl allows a negation extension of the
@@ -1874,25 +2996,26 @@
       [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
       5.6 and 5.8 do. */
 
-      if (c == '[' &&
-          (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
-          check_posix_syntax(ptr, &tempptr, cd))
+      if (c == CHAR_LEFT_SQUARE_BRACKET &&
+          (ptr[1] == CHAR_COLON || ptr[1] == CHAR_DOT ||
+           ptr[1] == CHAR_EQUALS_SIGN) && check_posix_syntax(ptr, &tempptr))
         {
         BOOL local_negate = FALSE;
         int posix_class, taboffset, tabopt;
         register const uschar *cbits = cd->cbits;
         uschar pbits[32];
 
-        if (ptr[1] != ':')
+        if (ptr[1] != CHAR_COLON)
           {
           *errorcodeptr = ERR31;
           goto FAILED;
           }
 
         ptr += 2;
-        if (*ptr == '^')
+        if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
           {
           local_negate = TRUE;
+          should_flip_negation = TRUE;  /* Note negative special */
           ptr++;
           }
 
@@ -1956,40 +3079,46 @@
         }
 
       /* Backslash may introduce a single character, or it may introduce one
-      of the specials, which just set a flag. Escaped items are checked for
-      validity in the pre-compiling pass. The sequence \b is a special case.
-      Inside a class (and only there) it is treated as backspace. Elsewhere
-      it marks a word boundary. Other escapes have preset maps ready to
-      or into the one we are building. We assume they have more than one
+      of the specials, which just set a flag. The sequence \b is a special
+      case. Inside a class (and only there) it is treated as backspace.
+      Elsewhere it marks a word boundary. Other escapes have preset maps ready
+      to 'or' into the one we are building. We assume they have more than one
       character in them, so set class_charcount bigger than one. */
 
-      if (c == '\\')
+      if (c == CHAR_BACKSLASH)
         {
-        c = check_escape(&ptr, errorcodeptr, *brackets, options, TRUE);
+        c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
+        if (*errorcodeptr != 0) goto FAILED;
 
-        if (-c == ESC_b) c = '\b';       /* \b is backslash in a class */
-        else if (-c == ESC_X) c = 'X';   /* \X is literal X in a class */
+        if (-c == ESC_b) c = CHAR_BS;       /* \b is backspace in a class */
+        else if (-c == ESC_X) c = CHAR_X;   /* \X is literal X in a class */
+        else if (-c == ESC_R) c = CHAR_R;   /* \R is literal R in a class */
         else if (-c == ESC_Q)            /* Handle start of quoted string */
           {
-          if (ptr[1] == '\\' && ptr[2] == 'E')
+          if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
             {
             ptr += 2; /* avoid empty string */
             }
           else inescq = TRUE;
           continue;
           }
+        else if (-c == ESC_E) continue;  /* Ignore orphan \E */
 
         if (c < 0)
           {
           register const uschar *cbits = cd->cbits;
           class_charcount += 2;     /* Greater than 1 is what matters */
-          switch (-c)
+
+          /* Save time by not doing this in the pre-compile phase. */
+
+          if (lengthptr == NULL) switch (-c)
             {
             case ESC_d:
             for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
             continue;
 
             case ESC_D:
+            should_flip_negation = TRUE;
             for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_digit];
             continue;
 
@@ -1998,6 +3127,7 @@
             continue;
 
             case ESC_W:
+            should_flip_negation = TRUE;
             for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_word];
             continue;
 
@@ -2007,56 +3137,227 @@
             continue;
 
             case ESC_S:
+            should_flip_negation = TRUE;
             for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
             classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
             continue;
 
-#ifdef SUPPORT_UCP
-            case ESC_p:
-            case ESC_P:
+            default:    /* Not recognized; fall through */
+            break;      /* Need "default" setting to stop compiler warning. */
+            }
+
+          /* In the pre-compile phase, just do the recognition. */
+
+          else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||
+                   c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;
+
+          /* We need to deal with \H, \h, \V, and \v in both phases because
+          they use extra memory. */
+
+          if (-c == ESC_h)
+            {
+            SETBIT(classbits, 0x09); /* VT */
+            SETBIT(classbits, 0x20); /* SPACE */
+            SETBIT(classbits, 0xa0); /* NSBP */
+#ifdef SUPPORT_UTF8
+            if (utf8)
               {
-              BOOL negated;
-              int pdata;
-              int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
-              if (ptype < 0) goto FAILED;
               class_utf8 = TRUE;
-              *class_utf8data++ = ((-c == ESC_p) != negated)?
-                XCL_PROP : XCL_NOTPROP;
-              *class_utf8data++ = ptype;
-              *class_utf8data++ = pdata;
-              class_charcount -= 2;   /* Not a < 256 character */
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x1680, class_utf8data);
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x180e, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2000, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x200A, class_utf8data);
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x202f, class_utf8data);
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x205f, class_utf8data);
+              *class_utf8data++ = XCL_SINGLE;
+              class_utf8data += _pcre_ord2utf8(0x3000, class_utf8data);
               }
-            continue;
 #endif
+            continue;
+            }
 
-            /* Unrecognized escapes are faulted if PCRE is running in its
-            strict mode. By default, for compatibility with Perl, they are
-            treated as literals. */
+          if (-c == ESC_H)
+            {
+            for (c = 0; c < 32; c++)
+              {
+              int x = 0xff;
+              switch (c)
+                {
+                case 0x09/8: x ^= 1 << (0x09%8); break;
+                case 0x20/8: x ^= 1 << (0x20%8); break;
+                case 0xa0/8: x ^= 1 << (0xa0%8); break;
+                default: break;
+                }
+              classbits[c] |= x;
+              }
 
-            default:
-            if ((options & PCRE_EXTRA) != 0)
+#ifdef SUPPORT_UTF8
+            if (utf8)
               {
-              *errorcodeptr = ERR7;
-              goto FAILED;
+              class_utf8 = TRUE;
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x167f, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x1681, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x180d, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x180f, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x1fff, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x200B, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x202e, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2030, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x205e, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2060, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x2fff, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x3001, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
               }
-            c = *ptr;              /* The final character */
-            class_charcount -= 2;  /* Undo the default count from above */
+#endif
+            continue;
             }
-          }
 
-        /* Fall through if we have a single character (c >= 0). This may be
-        > 256 in UTF-8 mode. */
+          if (-c == ESC_v)
+            {
+            SETBIT(classbits, 0x0a); /* LF */
+            SETBIT(classbits, 0x0b); /* VT */
+            SETBIT(classbits, 0x0c); /* FF */
+            SETBIT(classbits, 0x0d); /* CR */
+            SETBIT(classbits, 0x85); /* NEL */
+#ifdef SUPPORT_UTF8
+            if (utf8)
+              {
+              class_utf8 = TRUE;
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2028, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+              }
+#endif
+            continue;
+            }
 
-        }   /* End of backslash handling */
+          if (-c == ESC_V)
+            {
+            for (c = 0; c < 32; c++)
+              {
+              int x = 0xff;
+              switch (c)
+                {
+                case 0x0a/8: x ^= 1 << (0x0a%8);
+                             x ^= 1 << (0x0b%8);
+                             x ^= 1 << (0x0c%8);
+                             x ^= 1 << (0x0d%8);
+                             break;
+                case 0x85/8: x ^= 1 << (0x85%8); break;
+                default: break;
+                }
+              classbits[c] |= x;
+              }
 
-      /* A single character may be followed by '-' to form a range. However,
+#ifdef SUPPORT_UTF8
+            if (utf8)
+              {
+              class_utf8 = TRUE;
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x0100, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x2027, class_utf8data);
+              *class_utf8data++ = XCL_RANGE;
+              class_utf8data += _pcre_ord2utf8(0x2029, class_utf8data);
+              class_utf8data += _pcre_ord2utf8(0x7fffffff, class_utf8data);
+              }
+#endif
+            continue;
+            }
+
+          /* We need to deal with \P and \p in both phases. */
+
+#ifdef SUPPORT_UCP
+          if (-c == ESC_p || -c == ESC_P)
+            {
+            BOOL negated;
+            int pdata;
+            int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
+            if (ptype < 0) goto FAILED;
+            class_utf8 = TRUE;
+            *class_utf8data++ = ((-c == ESC_p) != negated)?
+              XCL_PROP : XCL_NOTPROP;
+            *class_utf8data++ = ptype;
+            *class_utf8data++ = pdata;
+            class_charcount -= 2;   /* Not a < 256 character */
+            continue;
+            }
+#endif
+          /* Unrecognized escapes are faulted if PCRE is running in its
+          strict mode. By default, for compatibility with Perl, they are
+          treated as literals. */
+
+          if ((options & PCRE_EXTRA) != 0)
+            {
+            *errorcodeptr = ERR7;
+            goto FAILED;
+            }
+
+          class_charcount -= 2;  /* Undo the default count from above */
+          c = *ptr;              /* Get the final character and fall through */
+          }
+
+        /* Fall through if we have a single character (c >= 0). This may be
+        greater than 256 in UTF-8 mode. */
+
+        }   /* End of backslash handling */
+
+      /* A single character may be followed by '-' to form a range. However,
       Perl does not permit ']' to be the end of the range. A '-' character
-      here is treated as a literal. */
+      at the end is treated as a literal. Perl ignores orphaned \E sequences
+      entirely. The code for handling \Q and \E is messy. */
+
+      CHECK_RANGE:
+      while (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
+        {
+        inescq = FALSE;
+        ptr += 2;
+        }
+
+      oldptr = ptr;
+
+      /* Remember \r or \n */
 
-      if (ptr[1] == '-' && ptr[2] != ']')
+      if (c == CHAR_CR || c == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
+
+      /* Check for range */
+
+      if (!inescq && ptr[1] == CHAR_MINUS)
         {
         int d;
         ptr += 2;
+        while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E) ptr += 2;
+
+        /* If we hit \Q (not followed by \E) at this point, go into escaped
+        mode. */
+
+        while (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
+          {
+          ptr += 2;
+          if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_E)
+            { ptr += 2; continue; }
+          inescq = TRUE;
+          break;
+          }
+
+        if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
+          {
+          ptr = oldptr;
+          goto LONE_SINGLE_CHARACTER;
+          }
 
 #ifdef SUPPORT_UTF8
         if (utf8)
@@ -2071,30 +3372,41 @@
         not any of the other escapes. Perl 5.6 treats a hyphen as a literal
         in such circumstances. */
 
-        if (d == '\\')
+        if (!inescq && d == CHAR_BACKSLASH)
           {
-          const uschar *oldptr = ptr;
-          d = check_escape(&ptr, errorcodeptr, *brackets, options, TRUE);
+          d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
+          if (*errorcodeptr != 0) goto FAILED;
 
-          /* \b is backslash; \X is literal X; any other special means the '-'
-          was literal */
+          /* \b is backspace; \X is literal X; \R is literal R; any other
+          special means the '-' was literal */
 
           if (d < 0)
             {
-            if (d == -ESC_b) d = '\b';
-            else if (d == -ESC_X) d = 'X'; else
+            if (d == -ESC_b) d = CHAR_BS;
+            else if (d == -ESC_X) d = CHAR_X;
+            else if (d == -ESC_R) d = CHAR_R; else
               {
-              ptr = oldptr - 2;
+              ptr = oldptr;
               goto LONE_SINGLE_CHARACTER;  /* A few lines below */
               }
             }
           }
 
-        /* The check that the two values are in the correct order happens in
-        the pre-pass. Optimize one-character ranges */
+        /* Check that the two values are in the correct order. Optimize
+        one-character ranges */
+
+        if (d < c)
+          {
+          *errorcodeptr = ERR8;
+          goto FAILED;
+          }
 
         if (d == c) goto LONE_SINGLE_CHARACTER;  /* A few lines below */
 
+        /* Remember \r or \n */
+
+        if (d == CHAR_CR || d == CHAR_NL) cd->external_flags |= PCRE_HASCRORLF;
+
         /* In UTF-8 mode, if the upper limit is > 255, or > 127 for caseless
         matching, we have to use an XCLASS with extra data items. Caseless
         matching for characters > 127 is available only if UCP support is
@@ -2112,19 +3424,23 @@
 #ifdef SUPPORT_UCP
           if ((options & PCRE_CASELESS) != 0)
             {
-            int occ, ocd;
-            int cc = c;
-            int origd = d;
+            unsigned int occ, ocd;
+            unsigned int cc = c;
+            unsigned int origd = d;
             while (get_othercase_range(&cc, origd, &occ, &ocd))
               {
-              if (occ >= c && ocd <= d) continue;  /* Skip embedded ranges */
+              if (occ >= (unsigned int)c &&
+                  ocd <= (unsigned int)d)
+                continue;                          /* Skip embedded ranges */
 
-              if (occ < c  && ocd >= c - 1)        /* Extend the basic range */
+              if (occ < (unsigned int)c  &&
+                  ocd >= (unsigned int)c - 1)      /* Extend the basic range */
                 {                                  /* if there is overlap,   */
                 c = occ;                           /* noting that if occ < c */
                 continue;                          /* we can't have ocd > d  */
                 }                                  /* because a subrange is  */
-              if (ocd > d && occ <= d + 1)         /* always shorter than    */
+              if (ocd > (unsigned int)d &&
+                  occ <= (unsigned int)d + 1)      /* always shorter than    */
                 {                                  /* the basic range.       */
                 d = ocd;
                 continue;
@@ -2172,7 +3488,12 @@
         ranges that lie entirely within 0-127 when there is UCP support; else
         for partial ranges without UCP support. */
 
-        for (; c <= d; c++)
+        class_charcount += d - c + 1;
+        class_lastchar = d;
+
+        /* We can save a bit of time by skipping this in the pre-compile. */
+
+        if (lengthptr == NULL) for (; c <= d; c++)
           {
           classbits[c/8] |= (1 << (c&7));
           if ((options & PCRE_CASELESS) != 0)
@@ -2180,8 +3501,6 @@
             int uc = cd->fcc[c];           /* flip case */
             classbits[uc/8] |= (1 << (uc&7));
             }
-          class_charcount++;                /* in case a one-char range */
-          class_lastchar = c;
           }
 
         continue;   /* Go get the next char in the class */
@@ -2205,8 +3524,8 @@
 #ifdef SUPPORT_UCP
         if ((options & PCRE_CASELESS) != 0)
           {
-          int othercase;
-          if ((othercase = _pcre_ucp_othercase(c)) >= 0)
+          unsigned int othercase;
+          if ((othercase = UCD_OTHERCASE(c)) != c)
             {
             *class_utf8data++ = XCL_SINGLE;
             class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);
@@ -2231,17 +3550,44 @@
         }
       }
 
-    /* Loop until ']' reached; the check for end of string happens inside the
-    loop. This "while" is the end of the "do" above. */
+    /* Loop until ']' reached. This "while" is the end of the "do" above. */
+
+    while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
+
+    if (c == 0)                          /* Missing terminating ']' */
+      {
+      *errorcodeptr = ERR6;
+      goto FAILED;
+      }
+
+
+/* This code has been disabled because it would mean that \s counts as
+an explicit \r or \n reference, and that's not really what is wanted. Now
+we set the flag only if there is a literal "\r" or "\n" in the class. */
+
+#if 0
+    /* Remember whether \r or \n are in this class */
+
+    if (negate_class)
+      {
+      if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;
+      }
+    else
+      {
+      if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;
+      }
+#endif
 
-    while ((c = *(++ptr)) != ']' || inescq);
 
     /* If class_charcount is 1, we saw precisely one character whose value is
-    less than 256. In non-UTF-8 mode we can always optimize. In UTF-8 mode, we
-    can optimize the negative case only if there were no characters >= 128
-    because OP_NOT and the related opcodes like OP_NOTSTAR operate on
-    single-bytes only. This is an historical hangover. Maybe one day we can
-    tidy these opcodes to handle multi-byte characters.
+    less than 256. As long as there were no characters >= 128 and there was no
+    use of \p or \P, in other words, no use of any XCLASS features, we can
+    optimize.
+
+    In UTF-8 mode, we can optimize the negative case only if there were no
+    characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
+    operate on single-bytes only. This is an historical hangover. Maybe one day
+    we can tidy these opcodes to handle multi-byte characters.
 
     The optimization throws away the bit map. We turn the item into a
     1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note
@@ -2251,10 +3597,8 @@
     reqbyte, save the previous value for reinstating. */
 
 #ifdef SUPPORT_UTF8
-    if (class_charcount == 1 &&
-          (!utf8 ||
-          (!class_utf8 && (!negate_class || class_lastchar < 128))))
-
+    if (class_charcount == 1 && !class_utf8 &&
+      (!utf8 || !negate_class || class_lastchar < 128))
 #else
     if (class_charcount == 1)
 #endif
@@ -2297,35 +3641,31 @@
     zeroreqbyte = reqbyte;
 
     /* If there are characters with values > 255, we have to compile an
-    extended class, with its own opcode. If there are no characters < 256,
-    we can omit the bitmap. */
+    extended class, with its own opcode, unless there was a negated special
+    such as \S in the class, because in that case all characters > 255 are in
+    the class, so any that were explicitly given as well can be ignored. If
+    (when there are explicit characters > 255 that must be listed) there are no
+    characters < 256, we can omit the bitmap in the actual compiled code. */
 
 #ifdef SUPPORT_UTF8
-    if (class_utf8)
+    if (class_utf8 && !should_flip_negation)
       {
       *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
       *code++ = OP_XCLASS;
       code += LINK_SIZE;
       *code = negate_class? XCL_NOT : 0;
 
-      /* If the map is required, install it, and move on to the end of
-      the extra data */
+      /* If the map is required, move up the extra data to make room for it;
+      otherwise just move the code pointer to the end of the extra data. */
 
       if (class_charcount > 0)
         {
         *code++ |= XCL_MAP;
+        memmove(code + 32, code, class_utf8data - code);
         memcpy(code, classbits, 32);
-        code = class_utf8data;
-        }
-
-      /* If the map is not required, slide down the extra data. */
-
-      else
-        {
-        int len = class_utf8data - (code + 33);
-        memmove(code + 1, code + 33, len);
-        code += len + 1;
+        code = class_utf8data + 32;
         }
+      else code = class_utf8data;
 
       /* Now fill in the complete length of the item */
 
@@ -2334,44 +3674,46 @@
       }
 #endif
 
-    /* If there are no characters > 255, negate the 32-byte map if necessary,
-    and copy it into the code vector. If this is the first thing in the branch,
-    there can be no first char setting, whatever the repeat count. Any reqbyte
-    setting must remain unchanged after any kind of repeat. */
+    /* If there are no characters > 255, set the opcode to OP_CLASS or
+    OP_NCLASS, depending on whether the whole class was negated and whether
+    there were negative specials such as \S in the class. Then copy the 32-byte
+    map into the code vector, negating it if necessary. */
 
+    *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
     if (negate_class)
       {
-      *code++ = OP_NCLASS;
-      for (c = 0; c < 32; c++) code[c] = ~classbits[c];
+      if (lengthptr == NULL)    /* Save time in the pre-compile phase */
+        for (c = 0; c < 32; c++) code[c] = ~classbits[c];
       }
     else
       {
-      *code++ = OP_CLASS;
       memcpy(code, classbits, 32);
       }
     code += 32;
     break;
 
+
+    /* ===================================================================*/
     /* Various kinds of repeat; '{' is not necessarily a quantifier, but this
     has been tested above. */
 
-    case '{':
+    case CHAR_LEFT_CURLY_BRACKET:
     if (!is_quantifier) goto NORMAL_CHAR;
     ptr = read_repeat_counts(ptr+1, &repeat_min, &repeat_max, errorcodeptr);
     if (*errorcodeptr != 0) goto FAILED;
     goto REPEAT;
 
-    case '*':
+    case CHAR_ASTERISK:
     repeat_min = 0;
     repeat_max = -1;
     goto REPEAT;
 
-    case '+':
+    case CHAR_PLUS:
     repeat_min = 1;
     repeat_max = -1;
     goto REPEAT;
 
-    case '?':
+    case CHAR_QUESTION_MARK:
     repeat_min = 0;
     repeat_max = 1;
 
@@ -2406,33 +3748,19 @@
     but if PCRE_UNGREEDY is set, it works the other way round. We change the
     repeat type to the non-default. */
 
-    if (ptr[1] == '+')
+    if (ptr[1] == CHAR_PLUS)
       {
       repeat_type = 0;                  /* Force greedy */
       possessive_quantifier = TRUE;
       ptr++;
       }
-    else if (ptr[1] == '?')
+    else if (ptr[1] == CHAR_QUESTION_MARK)
       {
       repeat_type = greedy_non_default;
       ptr++;
       }
     else repeat_type = greedy_default;
 
-    /* If previous was a recursion, we need to wrap it inside brackets so that
-    it can be replicated if necessary. */
-
-    if (*previous == OP_RECURSE)
-      {
-      memmove(previous + 1 + LINK_SIZE, previous, 1 + LINK_SIZE);
-      code += 1 + LINK_SIZE;
-      *previous = OP_BRA;
-      PUT(previous, 1, code - previous);
-      *code = OP_KET;
-      PUT(code, 1, code - previous);
-      code += 1 + LINK_SIZE;
-      }
-
     /* If previous was a character match, abolish the item and generate a
     repeat item instead. If a char item has a minumum of more than one, ensure
     that it is set in reqbyte - it might not be if a sequence such as x{3} is
@@ -2466,18 +3794,40 @@
         if (repeat_min > 1) reqbyte = c | req_caseopt | cd->req_varyopt;
         }
 
+      /* If the repetition is unlimited, it pays to see if the next thing on
+      the line is something that cannot possibly match this character. If so,
+      automatically possessifying this item gains some performance in the case
+      where the match fails. */
+
+      if (!possessive_quantifier &&
+          repeat_max < 0 &&
+          check_auto_possessive(*previous, c, utf8, utf8_char, ptr + 1,
+            options, cd))
+        {
+        repeat_type = 0;    /* Force greedy */
+        possessive_quantifier = TRUE;
+        }
+
       goto OUTPUT_SINGLE_REPEAT;   /* Code shared with single character types */
       }
 
     /* If previous was a single negated character ([^a] or similar), we use
     one of the special opcodes, replacing it. The code is shared with single-
     character repeats by setting opt_type to add a suitable offset into
-    repeat_type. OP_NOT is currently used only for single-byte chars. */
+    repeat_type. We can also test for auto-possessification. OP_NOT is
+    currently used only for single-byte chars. */
 
     else if (*previous == OP_NOT)
       {
       op_type = OP_NOTSTAR - OP_STAR;  /* Use "not" opcodes */
       c = previous[1];
+      if (!possessive_quantifier &&
+          repeat_max < 0 &&
+          check_auto_possessive(OP_NOT, c, utf8, NULL, ptr + 1, options, cd))
+        {
+        repeat_type = 0;    /* Force greedy */
+        possessive_quantifier = TRUE;
+        }
       goto OUTPUT_SINGLE_REPEAT;
       }
 
@@ -2495,6 +3845,14 @@
       op_type = OP_TYPESTAR - OP_STAR;  /* Use type opcodes */
       c = *previous;
 
+      if (!possessive_quantifier &&
+          repeat_max < 0 &&
+          check_auto_possessive(c, 0, utf8, NULL, ptr + 1, options, cd))
+        {
+        repeat_type = 0;    /* Force greedy */
+        possessive_quantifier = TRUE;
+        }
+
       OUTPUT_SINGLE_REPEAT:
       if (*previous == OP_PROP || *previous == OP_NOTPROP)
         {
@@ -2514,7 +3872,7 @@
       /* All real repeats make it impossible to handle partial matching (maybe
       one day we will be able to remove this restriction). */
 
-      if (repeat_max != 1) cd->nopartial = TRUE;
+      if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
 
       /* Combine the op_type with the repeat_type */
 
@@ -2535,7 +3893,7 @@
         }
 
       /* A repeat minimum of 1 is optimized into some special cases. If the
-      maximum is unlimited, we use OP_PLUS. Otherwise, the original item it
+      maximum is unlimited, we use OP_PLUS. Otherwise, the original item is
       left in place and, if the maximum is greater than 1, we use OP_UPTO with
       one less than the maximum. */
 
@@ -2588,7 +3946,8 @@
           }
 
         /* Else insert an UPTO if the max is greater than the min, again
-        preceded by the character, for the previously inserted code. */
+        preceded by the character, for the previously inserted code. If the
+        UPTO is just for 1 instance, we can use QUERY instead. */
 
         else if (repeat_max != repeat_min)
           {
@@ -2607,8 +3966,16 @@
             *code++ = prop_value;
             }
           repeat_max -= repeat_min;
-          *code++ = OP_UPTO + repeat_type;
-          PUT2INC(code, 0, repeat_max);
+
+          if (repeat_max == 1)
+            {
+            *code++ = OP_QUERY + repeat_type;
+            }
+          else
+            {
+            *code++ = OP_UPTO + repeat_type;
+            PUT2INC(code, 0, repeat_max);
+            }
           }
         }
 
@@ -2655,7 +4022,7 @@
       /* All real repeats make it impossible to handle partial matching (maybe
       one day we will be able to remove this restriction). */
 
-      if (repeat_max != 1) cd->nopartial = TRUE;
+      if (repeat_max != 1) cd->external_flags |= PCRE_NOPARTIAL;
 
       if (repeat_min == 0 && repeat_max == -1)
         *code++ = OP_CRSTAR + repeat_type;
@@ -2675,14 +4042,22 @@
     /* If previous was a bracket group, we may have to replicate it in certain
     cases. */
 
-    else if (*previous >= OP_BRA || *previous == OP_ONCE ||
-             *previous == OP_COND)
+    else if (*previous == OP_BRA  || *previous == OP_CBRA ||
+             *previous == OP_ONCE || *previous == OP_COND)
       {
       register int i;
       int ketoffset = 0;
       int len = code - previous;
       uschar *bralink = NULL;
 
+      /* Repeating a DEFINE group is pointless */
+
+      if (*previous == OP_COND && previous[LINK_SIZE+1] == OP_DEF)
+        {
+        *errorcodeptr = ERR55;
+        goto FAILED;
+        }
+
       /* If the maximum repeat count is unlimited, find the end of the bracket
       by scanning through from the start, and compute the offset back to it
       from the current code pointer. There may be an OP_OPT setting following
@@ -2705,27 +4080,38 @@
 
       if (repeat_min == 0)
         {
-        /* If the maximum is also zero, we just omit the group from the output
-        altogether. */
+        /* If the maximum is also zero, we used to just omit the group from the
+        output altogether, like this:
 
-        if (repeat_max == 0)
-          {
-          code = previous;
-          goto END_REPEAT;
-          }
+        ** if (repeat_max == 0)
+        **   {
+        **   code = previous;
+        **   goto END_REPEAT;
+        **   }
+
+        However, that fails when a group is referenced as a subroutine from
+        elsewhere in the pattern, so now we stick in OP_SKIPZERO in front of it
+        so that it is skipped on execution. As we don't have a list of which
+        groups are referenced, we cannot do this selectively.
+
+        If the maximum is 1 or unlimited, we just have to stick in the BRAZERO
+        and do no more at this point. However, we do need to adjust any
+        OP_RECURSE calls inside the group that refer to the group itself or any
+        internal or forward referenced group, because the offset is from the
+        start of the whole regex. Temporarily terminate the pattern while doing
+        this. */
 
-        /* If the maximum is 1 or unlimited, we just have to stick in the
-        BRAZERO and do no more at this point. However, we do need to adjust
-        any OP_RECURSE calls inside the group that refer to the group itself or
-        any internal group, because the offset is from the start of the whole
-        regex. Temporarily terminate the pattern while doing this. */
-
-        if (repeat_max <= 1)
+        if (repeat_max <= 1)    /* Covers 0, 1, and unlimited */
           {
           *code = OP_END;
-          adjust_recurse(previous, 1, utf8, cd);
+          adjust_recurse(previous, 1, utf8, cd, save_hwm);
           memmove(previous+1, previous, len);
           code++;
+          if (repeat_max == 0)
+            {
+            *previous++ = OP_SKIPZERO;
+            goto END_REPEAT;
+            }
           *previous++ = OP_BRAZERO + repeat_type;
           }
 
@@ -2741,7 +4127,7 @@
           {
           int offset;
           *code = OP_END;
-          adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd);
+          adjust_recurse(previous, 2 + LINK_SIZE, utf8, cd, save_hwm);
           memmove(previous + 2 + LINK_SIZE, previous, len);
           code += 2 + LINK_SIZE;
           *previous++ = OP_BRAZERO + repeat_type;
@@ -2761,19 +4147,52 @@
       /* If the minimum is greater than zero, replicate the group as many
       times as necessary, and adjust the maximum to the number of subsequent
       copies that we need. If we set a first char from the group, and didn't
-      set a required char, copy the latter from the former. */
+      set a required char, copy the latter from the former. If there are any
+      forward reference subroutine calls in the group, there will be entries on
+      the workspace list; replicate these with an appropriate increment. */
 
       else
         {
         if (repeat_min > 1)
           {
-          if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;
-          for (i = 1; i < repeat_min; i++)
+          /* In the pre-compile phase, we don't actually do the replication. We
+          just adjust the length as if we had. Do some paranoid checks for
+          potential integer overflow. */
+
+          if (lengthptr != NULL)
+            {
+            int delta = (repeat_min - 1)*length_prevgroup;
+            if ((double)(repeat_min - 1)*(double)length_prevgroup >
+                                                            (double)INT_MAX ||
+                OFLOW_MAX - *lengthptr < delta)
+              {
+              *errorcodeptr = ERR20;
+              goto FAILED;
+              }
+            *lengthptr += delta;
+            }
+
+          /* This is compiling for real */
+
+          else
             {
-            memcpy(code, previous, len);
-            code += len;
+            if (groupsetfirstbyte && reqbyte < 0) reqbyte = firstbyte;
+            for (i = 1; i < repeat_min; i++)
+              {
+              uschar *hc;
+              uschar *this_hwm = cd->hwm;
+              memcpy(code, previous, len);
+              for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
+                {
+                PUT(cd->hwm, 0, GET(hc, 0) + len);
+                cd->hwm += LINK_SIZE;
+                }
+              save_hwm = this_hwm;
+              code += len;
+              }
             }
           }
+
         if (repeat_max > 0) repeat_max -= repeat_min;
         }
 
@@ -2781,12 +4200,39 @@
       the maximum is limited, it replicates the group in a nested fashion,
       remembering the bracket starts on a stack. In the case of a zero minimum,
       the first one was set up above. In all cases the repeat_max now specifies
-      the number of additional copies needed. */
+      the number of additional copies needed. Again, we must remember to
+      replicate entries on the forward reference list. */
 
       if (repeat_max >= 0)
         {
-        for (i = repeat_max - 1; i >= 0; i--)
+        /* In the pre-compile phase, we don't actually do the replication. We
+        just adjust the length as if we had. For each repetition we must add 1
+        to the length for BRAZERO and for all but the last repetition we must
+        add 2 + 2*LINKSIZE to allow for the nesting that occurs. Do some
+        paranoid checks to avoid integer overflow. */
+
+        if (lengthptr != NULL && repeat_max > 0)
+          {
+          int delta = repeat_max * (length_prevgroup + 1 + 2 + 2*LINK_SIZE) -
+                      2 - 2*LINK_SIZE;   /* Last one doesn't nest */
+          if ((double)repeat_max *
+                (double)(length_prevgroup + 1 + 2 + 2*LINK_SIZE)
+                  > (double)INT_MAX ||
+              OFLOW_MAX - *lengthptr < delta)
+            {
+            *errorcodeptr = ERR20;
+            goto FAILED;
+            }
+          *lengthptr += delta;
+          }
+
+        /* This is compiling for real */
+
+        else for (i = repeat_max - 1; i >= 0; i--)
           {
+          uschar *hc;
+          uschar *this_hwm = cd->hwm;
+
           *code++ = OP_BRAZERO + repeat_type;
 
           /* All but the final copy start a new nesting, maintaining the
@@ -2802,6 +4248,12 @@
             }
 
           memcpy(code, previous, len);
+          for (hc = save_hwm; hc < this_hwm; hc += LINK_SIZE)
+            {
+            PUT(cd->hwm, 0, GET(hc, 0) + len + ((i != 0)? 2+LINK_SIZE : 1));
+            cd->hwm += LINK_SIZE;
+            }
+          save_hwm = this_hwm;
           code += len;
           }
 
@@ -2824,11 +4276,43 @@
       /* If the maximum is unlimited, set a repeater in the final copy. We
       can't just offset backwards from the current code point, because we
       don't know if there's been an options resetting after the ket. The
-      correct offset was computed above. */
+      correct offset was computed above.
 
-      else code[-ketoffset] = OP_KETRMAX + repeat_type;
+      Then, when we are doing the actual compile phase, check to see whether
+      this group is a non-atomic one that could match an empty string. If so,
+      convert the initial operator to the S form (e.g. OP_BRA -> OP_SBRA) so
+      that runtime checking can be done. [This check is also applied to
+      atomic groups at runtime, but in a different way.] */
+
+      else
+        {
+        uschar *ketcode = code - ketoffset;
+        uschar *bracode = ketcode - GET(ketcode, 1);
+        *ketcode = OP_KETRMAX + repeat_type;
+        if (lengthptr == NULL && *bracode != OP_ONCE)
+          {
+          uschar *scode = bracode;
+          do
+            {
+            if (could_be_empty_branch(scode, ketcode, utf8))
+              {
+              *bracode += OP_SBRA - OP_BRA;
+              break;
+              }
+            scode += GET(scode, 1);
+            }
+          while (*scode == OP_ALT);
+          }
+        }
       }
 
+    /* If previous is OP_FAIL, it was generated by an empty class [] in
+    JavaScript mode. The other ways in which OP_FAIL can be generated, that is
+    by (*FAIL) or (?!) set previous to NULL, which gives a "nothing to repeat"
+    error above. We can just ignore the repeat in JS case. */
+
+    else if (*previous == OP_FAIL) goto END_REPEAT;
+
     /* Else there's some kind of shambles */
 
     else
@@ -2837,22 +4321,55 @@
       goto FAILED;
       }
 
-    /* If the character following a repeat is '+', we wrap the entire repeated
-    item inside OP_ONCE brackets. This is just syntactic sugar, taken from
-    Sun's Java package. The repeated item starts at tempcode, not at previous,
-    which might be the first part of a string whose (former) last char we
-    repeated. However, we don't support '+' after a greediness '?'. */
+    /* If the character following a repeat is '+', or if certain optimization
+    tests above succeeded, possessive_quantifier is TRUE. For some of the
+    simpler opcodes, there is an special alternative opcode for this. For
+    anything else, we wrap the entire repeated item inside OP_ONCE brackets.
+    The '+' notation is just syntactic sugar, taken from Sun's Java package,
+    but the special opcodes can optimize it a bit. The repeated item starts at
+    tempcode, not at previous, which might be the first part of a string whose
+    (former) last char we repeated.
+
+    Possessifying an 'exact' quantifier has no effect, so we can ignore it. But
+    an 'upto' may follow. We skip over an 'exact' item, and then test the
+    length of what remains before proceeding. */
 
     if (possessive_quantifier)
       {
-      int len = code - tempcode;
-      memmove(tempcode + 1+LINK_SIZE, tempcode, len);
-      code += 1 + LINK_SIZE;
-      len += 1 + LINK_SIZE;
-      tempcode[0] = OP_ONCE;
-      *code++ = OP_KET;
-      PUTINC(code, 0, len);
-      PUT(tempcode, 1, len);
+      int len;
+      if (*tempcode == OP_EXACT || *tempcode == OP_TYPEEXACT ||
+          *tempcode == OP_NOTEXACT)
+        tempcode += _pcre_OP_lengths[*tempcode] +
+          ((*tempcode == OP_TYPEEXACT &&
+             (tempcode[3] == OP_PROP || tempcode[3] == OP_NOTPROP))? 2:0);
+      len = code - tempcode;
+      if (len > 0) switch (*tempcode)
+        {
+        case OP_STAR:  *tempcode = OP_POSSTAR; break;
+        case OP_PLUS:  *tempcode = OP_POSPLUS; break;
+        case OP_QUERY: *tempcode = OP_POSQUERY; break;
+        case OP_UPTO:  *tempcode = OP_POSUPTO; break;
+
+        case OP_TYPESTAR:  *tempcode = OP_TYPEPOSSTAR; break;
+        case OP_TYPEPLUS:  *tempcode = OP_TYPEPOSPLUS; break;
+        case OP_TYPEQUERY: *tempcode = OP_TYPEPOSQUERY; break;
+        case OP_TYPEUPTO:  *tempcode = OP_TYPEPOSUPTO; break;
+
+        case OP_NOTSTAR:  *tempcode = OP_NOTPOSSTAR; break;
+        case OP_NOTPLUS:  *tempcode = OP_NOTPOSPLUS; break;
+        case OP_NOTQUERY: *tempcode = OP_NOTPOSQUERY; break;
+        case OP_NOTUPTO:  *tempcode = OP_NOTPOSUPTO; break;
+
+        default:
+        memmove(tempcode + 1+LINK_SIZE, tempcode, len);
+        code += 1 + LINK_SIZE;
+        len += 1 + LINK_SIZE;
+        tempcode[0] = OP_ONCE;
+        *code++ = OP_KET;
+        PUTINC(code, 0, len);
+        PUT(tempcode, 1, len);
+        break;
+        }
       }
 
     /* In all case we no longer have a previous item. We also set the
@@ -2865,230 +4382,516 @@
     break;
 
 
-    /* Start of nested bracket sub-expression, or comment or lookahead or
-    lookbehind or option setting or condition. First deal with special things
-    that can come after a bracket; all are introduced by ?, and the appearance
-    of any of them means that this is not a referencing group. They were
-    checked for validity in the first pass over the string, so we don't have to
-    check for syntax errors here.  */
+    /* ===================================================================*/
+    /* Start of nested parenthesized sub-expression, or comment or lookahead or
+    lookbehind or option setting or condition or all the other extended
+    parenthesis forms.  */
 
-    case '(':
+    case CHAR_LEFT_PARENTHESIS:
     newoptions = options;
     skipbytes = 0;
+    bravalue = OP_CBRA;
+    save_hwm = cd->hwm;
+    reset_bracount = FALSE;
+
+    /* First deal with various "verbs" that can be introduced by '*'. */
+
+    if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)
+      {
+      int i, namelen;
+      const char *vn = verbnames;
+      const uschar *name = ++ptr;
+      previous = NULL;
+      while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
+      if (*ptr == CHAR_COLON)
+        {
+        *errorcodeptr = ERR59;   /* Not supported */
+        goto FAILED;
+        }
+      if (*ptr != CHAR_RIGHT_PARENTHESIS)
+        {
+        *errorcodeptr = ERR60;
+        goto FAILED;
+        }
+      namelen = ptr - name;
+      for (i = 0; i < verbcount; i++)
+        {
+        if (namelen == verbs[i].len &&
+            strncmp((char *)name, vn, namelen) == 0)
+          {
+          *code = verbs[i].op;
+          if (*code++ == OP_ACCEPT) cd->had_accept = TRUE;
+          break;
+          }
+        vn += verbs[i].len + 1;
+        }
+      if (i < verbcount) continue;
+      *errorcodeptr = ERR60;
+      goto FAILED;
+      }
+
+    /* Deal with the extended parentheses; all are introduced by '?', and the
+    appearance of any of them means that this is not a capturing group. */
 
-    if (*(++ptr) == '?')
+    else if (*ptr == CHAR_QUESTION_MARK)
       {
-      int set, unset;
+      int i, set, unset, namelen;
       int *optset;
+      const uschar *name;
+      uschar *slot;
 
       switch (*(++ptr))
         {
-        case '#':                 /* Comment; skip to ket */
+        case CHAR_NUMBER_SIGN:                 /* Comment; skip to ket */
         ptr++;
-        while (*ptr != ')') ptr++;
+        while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
+        if (*ptr == 0)
+          {
+          *errorcodeptr = ERR18;
+          goto FAILED;
+          }
         continue;
 
-        case ':':                 /* Non-extracting bracket */
+
+        /* ------------------------------------------------------------ */
+        case CHAR_VERTICAL_LINE:  /* Reset capture count for each branch */
+        reset_bracount = TRUE;
+        /* Fall through */
+
+        /* ------------------------------------------------------------ */
+        case CHAR_COLON:          /* Non-capturing bracket */
         bravalue = OP_BRA;
         ptr++;
         break;
 
-        case '(':
+
+        /* ------------------------------------------------------------ */
+        case CHAR_LEFT_PARENTHESIS:
         bravalue = OP_COND;       /* Conditional group */
 
-        /* A condition can be a number, referring to a numbered group, a name,
-        referring to a named group, 'R', referring to recursion, or an
-        assertion. There are two unfortunate ambiguities, caused by history.
-        (a) 'R' can be the recursive thing or the name 'R', and (b) a number
-        could be a name that consists of digits. In both cases, we look for a
-        name first; if not found, we try the other cases. If the first
-        character after (?( is a word character, we know the rest up to ) will
-        also be word characters because the syntax was checked in the first
-        pass. */
-
-        if ((cd->ctypes[ptr[1]] & ctype_word) != 0)
-          {
-          int i, namelen;
-          int condref = 0;
-          const uschar *name;
-          uschar *slot = cd->name_table;
+        /* A condition can be an assertion, a number (referring to a numbered
+        group), a name (referring to a named group), or 'R', referring to
+        recursion. R and R&name are also permitted for recursion tests.
+
+        There are several syntaxes for testing a named group: (?(name)) is used
+        by Python; Perl 5.10 onwards uses (?() or (?('name')).
+
+        There are two unfortunate ambiguities, caused by history. (a) 'R' can
+        be the recursive thing or the name 'R' (and similarly for 'R' followed
+        by digits), and (b) a number could be a name that consists of digits.
+        In both cases, we look for a name first; if not found, we try the other
+        cases. */
+
+        /* For conditions that are assertions, check the syntax, and then exit
+        the switch. This will take control down to where bracketed groups,
+        including assertions, are processed. */
 
-          /* This is needed for all successful cases. */
+        if (ptr[1] == CHAR_QUESTION_MARK && (ptr[2] == CHAR_EQUALS_SIGN ||
+            ptr[2] == CHAR_EXCLAMATION_MARK || ptr[2] == CHAR_LESS_THAN_SIGN))
+          break;
 
-          skipbytes = 3;
+        /* Most other conditions use OP_CREF (a couple change to OP_RREF
+        below), and all need to skip 3 bytes at the start of the group. */
 
-          /* Read the name, but also get it as a number if it's all digits */
+        code[1+LINK_SIZE] = OP_CREF;
+        skipbytes = 3;
+        refsign = -1;
 
-          name = ++ptr;
-          while (*ptr != ')')
-            {
-            if (condref >= 0)
-              condref = ((digitab[*ptr] & ctype_digit) != 0)?
-                condref * 10 + *ptr - '0' : -1;
-            ptr++;
-            }
-          namelen = ptr - name;
+        /* Check for a test for recursion in a named group. */
+
+        if (ptr[1] == CHAR_R && ptr[2] == CHAR_AMPERSAND)
+          {
+          terminator = -1;
+          ptr += 2;
+          code[1+LINK_SIZE] = OP_RREF;    /* Change the type of test */
+          }
+
+        /* Check for a test for a named group's having been set, using the Perl
+        syntax (?() or (?('name') */
+
+        else if (ptr[1] == CHAR_LESS_THAN_SIGN)
+          {
+          terminator = CHAR_GREATER_THAN_SIGN;
+          ptr++;
+          }
+        else if (ptr[1] == CHAR_APOSTROPHE)
+          {
+          terminator = CHAR_APOSTROPHE;
           ptr++;
+          }
+        else
+          {
+          terminator = 0;
+          if (ptr[1] == CHAR_MINUS || ptr[1] == CHAR_PLUS) refsign = *(++ptr);
+          }
 
-          for (i = 0; i < cd->names_found; i++)
-            {
-            if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;
-            slot += cd->name_entry_size;
-            }
+        /* We now expect to read a name; any thing else is an error */
 
-          /* Found a previous named subpattern */
+        if ((cd->ctypes[ptr[1]] & ctype_word) == 0)
+          {
+          ptr += 1;  /* To get the right offset */
+          *errorcodeptr = ERR28;
+          goto FAILED;
+          }
 
-          if (i < cd->names_found)
-            {
-            condref = GET2(slot, 0);
-            code[1+LINK_SIZE] = OP_CREF;
-            PUT2(code, 2+LINK_SIZE, condref);
-            }
+        /* Read the name, but also get it as a number if it's all digits */
 
-          /* Search the pattern for a forward reference */
+        recno = 0;
+        name = ++ptr;
+        while ((cd->ctypes[*ptr] & ctype_word) != 0)
+          {
+          if (recno >= 0)
+            recno = ((digitab[*ptr] & ctype_digit) != 0)?
+              recno * 10 + *ptr - CHAR_0 : -1;
+          ptr++;
+          }
+        namelen = ptr - name;
 
-          else if ((i = find_named_parens(ptr, *brackets, name, namelen)) > 0)
-            {
-            code[1+LINK_SIZE] = OP_CREF;
-            PUT2(code, 2+LINK_SIZE, i);
-            }
+        if ((terminator > 0 && *ptr++ != terminator) ||
+            *ptr++ != CHAR_RIGHT_PARENTHESIS)
+          {
+          ptr--;      /* Error offset */
+          *errorcodeptr = ERR26;
+          goto FAILED;
+          }
 
-          /* Check for 'R' for recursion */
+        /* Do no further checking in the pre-compile phase. */
 
-          else if (namelen == 1 && *name == 'R')
-            {
-            code[1+LINK_SIZE] = OP_CREF;
-            PUT2(code, 2+LINK_SIZE, CREF_RECURSE);
-            }
+        if (lengthptr != NULL) break;
 
-          /* Check for a subpattern number */
+        /* In the real compile we do the work of looking for the actual
+        reference. If the string started with "+" or "-" we require the rest to
+        be digits, in which case recno will be set. */
 
-          else if (condref > 0)
+        if (refsign > 0)
+          {
+          if (recno <= 0)
             {
-            code[1+LINK_SIZE] = OP_CREF;
-            PUT2(code, 2+LINK_SIZE, condref);
+            *errorcodeptr = ERR58;
+            goto FAILED;
             }
-
-          /* Either an unidentified subpattern, or a reference to (?(0) */
-
-          else
+          recno = (refsign == CHAR_MINUS)?
+            cd->bracount - recno + 1 : recno +cd->bracount;
+          if (recno <= 0 || recno > cd->final_bracount)
             {
-            *errorcodeptr = (condref == 0)? ERR35: ERR15;
+            *errorcodeptr = ERR15;
             goto FAILED;
             }
+          PUT2(code, 2+LINK_SIZE, recno);
+          break;
           }
 
-        /* For conditions that are assertions, we just fall through, having
-        set bravalue above. */
-
-        break;
+        /* Otherwise (did not start with "+" or "-"), start by looking for the
+        name. */
 
-        case '=':                 /* Positive lookahead */
-        bravalue = OP_ASSERT;
-        ptr++;
-        break;
+        slot = cd->name_table;
+        for (i = 0; i < cd->names_found; i++)
+          {
+          if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;
+          slot += cd->name_entry_size;
+          }
 
-        case '!':                 /* Negative lookahead */
-        bravalue = OP_ASSERT_NOT;
-        ptr++;
-        break;
+        /* Found a previous named subpattern */
 
-        case '<':                 /* Lookbehinds */
-        switch (*(++ptr))
+        if (i < cd->names_found)
           {
-          case '=':               /* Positive lookbehind */
-          bravalue = OP_ASSERTBACK;
-          ptr++;
-          break;
-
-          case '!':               /* Negative lookbehind */
-          bravalue = OP_ASSERTBACK_NOT;
-          ptr++;
-          break;
+          recno = GET2(slot, 0);
+          PUT2(code, 2+LINK_SIZE, recno);
           }
-        break;
 
-        case '>':                 /* One-time brackets */
-        bravalue = OP_ONCE;
-        ptr++;
-        break;
+        /* Search the pattern for a forward reference */
 
-        case 'C':                 /* Callout - may be followed by digits; */
-        previous_callout = code;  /* Save for later completion */
-        after_manual_callout = 1; /* Skip one item before completing */
-        *code++ = OP_CALLOUT;     /* Already checked that the terminating */
-          {                       /* closing parenthesis is present. */
-          int n = 0;
-          while ((digitab[*(++ptr)] & ctype_digit) != 0)
-            n = n * 10 + *ptr - '0';
-          if (n > 255)
-            {
-            *errorcodeptr = ERR38;
-            goto FAILED;
-            }
-          *code++ = n;
-          PUT(code, 0, ptr - cd->start_pattern + 1);  /* Pattern offset */
-          PUT(code, LINK_SIZE, 0);                    /* Default length */
-          code += 2 * LINK_SIZE;
+        else if ((i = find_parens(cd, name, namelen,
+                        (options & PCRE_EXTENDED) != 0)) > 0)
+          {
+          PUT2(code, 2+LINK_SIZE, i);
           }
-        previous = NULL;
-        continue;
 
-        case 'P':                 /* Named subpattern handling */
-        if (*(++ptr) == '<')      /* Definition */
+        /* If terminator == 0 it means that the name followed directly after
+        the opening parenthesis [e.g. (?(abc)...] and in this case there are
+        some further alternatives to try. For the cases where terminator != 0
+        [things like (?(... or (?('name')... or (?(R&name)... ] we have
+        now checked all the possibilities, so give an error. */
+
+        else if (terminator != 0)
           {
-          int i, namelen;
-          uschar *slot = cd->name_table;
-          const uschar *name;     /* Don't amalgamate; some compilers */
-          name = ++ptr;           /* grumble at autoincrement in declaration */
+          *errorcodeptr = ERR15;
+          goto FAILED;
+          }
 
-          while (*ptr++ != '>');
-          namelen = ptr - name - 1;
+        /* Check for (?(R) for recursion. Allow digits after R to specify a
+        specific group number. */
 
-          for (i = 0; i < cd->names_found; i++)
+        else if (*name == CHAR_R)
+          {
+          recno = 0;
+          for (i = 1; i < namelen; i++)
+            {
+            if ((digitab[name[i]] & ctype_digit) == 0)
+              {
+              *errorcodeptr = ERR15;
+              goto FAILED;
+              }
+            recno = recno * 10 + name[i] - CHAR_0;
+            }
+          if (recno == 0) recno = RREF_ANY;
+          code[1+LINK_SIZE] = OP_RREF;      /* Change test type */
+          PUT2(code, 2+LINK_SIZE, recno);
+          }
+
+        /* Similarly, check for the (?(DEFINE) "condition", which is always
+        false. */
+
+        else if (namelen == 6 && strncmp((char *)name, STRING_DEFINE, 6) == 0)
+          {
+          code[1+LINK_SIZE] = OP_DEF;
+          skipbytes = 1;
+          }
+
+        /* Check for the "name" actually being a subpattern number. We are
+        in the second pass here, so final_bracount is set. */
+
+        else if (recno > 0 && recno <= cd->final_bracount)
+          {
+          PUT2(code, 2+LINK_SIZE, recno);
+          }
+
+        /* Either an unidentified subpattern, or a reference to (?(0) */
+
+        else
+          {
+          *errorcodeptr = (recno == 0)? ERR35: ERR15;
+          goto FAILED;
+          }
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case CHAR_EQUALS_SIGN:                 /* Positive lookahead */
+        bravalue = OP_ASSERT;
+        ptr++;
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case CHAR_EXCLAMATION_MARK:            /* Negative lookahead */
+        ptr++;
+        if (*ptr == CHAR_RIGHT_PARENTHESIS)    /* Optimize (?!) */
+          {
+          *code++ = OP_FAIL;
+          previous = NULL;
+          continue;
+          }
+        bravalue = OP_ASSERT_NOT;
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case CHAR_LESS_THAN_SIGN:              /* Lookbehind or named define */
+        switch (ptr[1])
+          {
+          case CHAR_EQUALS_SIGN:               /* Positive lookbehind */
+          bravalue = OP_ASSERTBACK;
+          ptr += 2;
+          break;
+
+          case CHAR_EXCLAMATION_MARK:          /* Negative lookbehind */
+          bravalue = OP_ASSERTBACK_NOT;
+          ptr += 2;
+          break;
+
+          default:                /* Could be name define, else bad */
+          if ((cd->ctypes[ptr[1]] & ctype_word) != 0) goto DEFINE_NAME;
+          ptr++;                  /* Correct offset for error */
+          *errorcodeptr = ERR24;
+          goto FAILED;
+          }
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case CHAR_GREATER_THAN_SIGN:           /* One-time brackets */
+        bravalue = OP_ONCE;
+        ptr++;
+        break;
+
+
+        /* ------------------------------------------------------------ */
+        case CHAR_C:                 /* Callout - may be followed by digits; */
+        previous_callout = code;  /* Save for later completion */
+        after_manual_callout = 1; /* Skip one item before completing */
+        *code++ = OP_CALLOUT;
+          {
+          int n = 0;
+          while ((digitab[*(++ptr)] & ctype_digit) != 0)
+            n = n * 10 + *ptr - CHAR_0;
+          if (*ptr != CHAR_RIGHT_PARENTHESIS)
+            {
+            *errorcodeptr = ERR39;
+            goto FAILED;
+            }
+          if (n > 255)
             {
-            int crc = memcmp(name, slot+2, namelen);
-            if (crc == 0)
+            *errorcodeptr = ERR38;
+            goto FAILED;
+            }
+          *code++ = n;
+          PUT(code, 0, ptr - cd->start_pattern + 1);  /* Pattern offset */
+          PUT(code, LINK_SIZE, 0);                    /* Default length */
+          code += 2 * LINK_SIZE;
+          }
+        previous = NULL;
+        continue;
+
+
+        /* ------------------------------------------------------------ */
+        case CHAR_P:              /* Python-style named subpattern handling */
+        if (*(++ptr) == CHAR_EQUALS_SIGN ||
+            *ptr == CHAR_GREATER_THAN_SIGN)  /* Reference or recursion */
+          {
+          is_recurse = *ptr == CHAR_GREATER_THAN_SIGN;
+          terminator = CHAR_RIGHT_PARENTHESIS;
+          goto NAMED_REF_OR_RECURSE;
+          }
+        else if (*ptr != CHAR_LESS_THAN_SIGN)  /* Test for Python-style defn */
+          {
+          *errorcodeptr = ERR41;
+          goto FAILED;
+          }
+        /* Fall through to handle (?P< as (?< is handled */
+
+
+        /* ------------------------------------------------------------ */
+        DEFINE_NAME:    /* Come here from (?< handling */
+        case CHAR_APOSTROPHE:
+          {
+          terminator = (*ptr == CHAR_LESS_THAN_SIGN)?
+            CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
+          name = ++ptr;
+
+          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
+          namelen = ptr - name;
+
+          /* In the pre-compile phase, just do a syntax check. */
+
+          if (lengthptr != NULL)
+            {
+            if (*ptr != terminator)
+              {
+              *errorcodeptr = ERR42;
+              goto FAILED;
+              }
+            if (cd->names_found >= MAX_NAME_COUNT)
+              {
+              *errorcodeptr = ERR49;
+              goto FAILED;
+              }
+            if (namelen + 3 > cd->name_entry_size)
               {
-              if (slot[2+namelen] == 0)
+              cd->name_entry_size = namelen + 3;
+              if (namelen > MAX_NAME_SIZE)
                 {
-                if ((options & PCRE_DUPNAMES) == 0)
-                  {
-                  *errorcodeptr = ERR43;
-                  goto FAILED;
-                  }
+                *errorcodeptr = ERR48;
+                goto FAILED;
                 }
-              else crc = -1;      /* Current name is substring */
               }
-            if (crc < 0)
+            }
+
+          /* In the real compile, create the entry in the table */
+
+          else
+            {
+            slot = cd->name_table;
+            for (i = 0; i < cd->names_found; i++)
               {
-              memmove(slot + cd->name_entry_size, slot,
-                (cd->names_found - i) * cd->name_entry_size);
-              break;
+              int crc = memcmp(name, slot+2, namelen);
+              if (crc == 0)
+                {
+                if (slot[2+namelen] == 0)
+                  {
+                  if ((options & PCRE_DUPNAMES) == 0)
+                    {
+                    *errorcodeptr = ERR43;
+                    goto FAILED;
+                    }
+                  }
+                else crc = -1;      /* Current name is substring */
+                }
+              if (crc < 0)
+                {
+                memmove(slot + cd->name_entry_size, slot,
+                  (cd->names_found - i) * cd->name_entry_size);
+                break;
+                }
+              slot += cd->name_entry_size;
               }
-            slot += cd->name_entry_size;
-            }
 
-          PUT2(slot, 0, *brackets + 1);
-          memcpy(slot + 2, name, namelen);
-          slot[2+namelen] = 0;
-          cd->names_found++;
-          goto NUMBERED_GROUP;
+            PUT2(slot, 0, cd->bracount + 1);
+            memcpy(slot + 2, name, namelen);
+            slot[2+namelen] = 0;
+            }
           }
 
-        if (*ptr == '=' || *ptr == '>')  /* Reference or recursion */
+        /* In both cases, count the number of names we've encountered. */
+
+        ptr++;                    /* Move past > or ' */
+        cd->names_found++;
+        goto NUMBERED_GROUP;
+
+
+        /* ------------------------------------------------------------ */
+        case CHAR_AMPERSAND:            /* Perl recursion/subroutine syntax */
+        terminator = CHAR_RIGHT_PARENTHESIS;
+        is_recurse = TRUE;
+        /* Fall through */
+
+        /* We come here from the Python syntax above that handles both
+        references (?P=name) and recursion (?P>name), as well as falling
+        through from the Perl recursion syntax (?&name). We also come here from
+        the Perl \k or \k'name' back reference syntax and the \k{name}
+        .NET syntax, and the Oniguruma \g<...> and \g'...' subroutine syntax. */
+
+        NAMED_REF_OR_RECURSE:
+        name = ++ptr;
+        while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
+        namelen = ptr - name;
+
+        /* In the pre-compile phase, do a syntax check and set a dummy
+        reference number. */
+
+        if (lengthptr != NULL)
           {
-          int i, namelen;
-          int type = *ptr++;
-          const uschar *name = ptr;
-          uschar *slot = cd->name_table;
+          if (namelen == 0)
+            {
+            *errorcodeptr = ERR62;
+            goto FAILED;
+            }
+          if (*ptr != terminator)
+            {
+            *errorcodeptr = ERR42;
+            goto FAILED;
+            }
+          if (namelen > MAX_NAME_SIZE)
+            {
+            *errorcodeptr = ERR48;
+            goto FAILED;
+            }
+          recno = 0;
+          }
 
-          while (*ptr != ')') ptr++;
-          namelen = ptr - name;
+        /* In the real compile, seek the name in the table. We check the name
+        first, and then check that we have reached the end of the name in the
+        table. That way, if the name that is longer than any in the table,
+        the comparison will fail without reading beyond the table entry. */
 
+        else
+          {
+          slot = cd->name_table;
           for (i = 0; i < cd->names_found; i++)
             {
-            if (strncmp((char *)name, (char *)slot+2, namelen) == 0) break;
+            if (strncmp((char *)name, (char *)slot+2, namelen) == 0 &&
+                slot[2+namelen] == 0)
+              break;
             slot += cd->name_entry_size;
             }
 
@@ -3097,71 +4900,141 @@
             recno = GET2(slot, 0);
             }
           else if ((recno =                /* Forward back reference */
-                    find_named_parens(ptr, *brackets, name, namelen)) <= 0)
+                    find_parens(cd, name, namelen,
+                      (options & PCRE_EXTENDED) != 0)) <= 0)
             {
             *errorcodeptr = ERR15;
             goto FAILED;
             }
+          }
 
-          if (type == '>') goto HANDLE_RECURSION;  /* A few lines below */
-
-          /* Back reference */
+        /* In both phases, we can now go to the code than handles numerical
+        recursion or backreferences. */
 
-          previous = code;
-          *code++ = OP_REF;
-          PUT2INC(code, 0, recno);
-          cd->backref_map |= (recno < 32)? (1 << recno) : 1;
-          if (recno > cd->top_backref) cd->top_backref = recno;
-          continue;
-          }
+        if (is_recurse) goto HANDLE_RECURSION;
+          else goto HANDLE_REFERENCE;
 
-        /* Should never happen */
-        break;
 
-        case 'R':                 /* Pattern recursion */
+        /* ------------------------------------------------------------ */
+        case CHAR_R:              /* Recursion */
         ptr++;                    /* Same as (?0)      */
         /* Fall through */
 
-        /* Recursion or "subroutine" call */
 
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
+        /* ------------------------------------------------------------ */
+        case CHAR_MINUS: case CHAR_PLUS:  /* Recursion or subroutine */
+        case CHAR_0: case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4:
+        case CHAR_5: case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
           {
           const uschar *called;
+          terminator = CHAR_RIGHT_PARENTHESIS;
+
+          /* Come here from the \g<...> and \g'...' code (Oniguruma
+          compatibility). However, the syntax has been checked to ensure that
+          the ... are a (signed) number, so that neither ERR63 nor ERR29 will
+          be called on this path, nor with the jump to OTHER_CHAR_AFTER_QUERY
+          ever be taken. */
+
+          HANDLE_NUMERICAL_RECURSION:
+
+          if ((refsign = *ptr) == CHAR_PLUS)
+            {
+            ptr++;
+            if ((digitab[*ptr] & ctype_digit) == 0)
+              {
+              *errorcodeptr = ERR63;
+              goto FAILED;
+              }
+            }
+          else if (refsign == CHAR_MINUS)
+            {
+            if ((digitab[ptr[1]] & ctype_digit) == 0)
+              goto OTHER_CHAR_AFTER_QUERY;
+            ptr++;
+            }
+
           recno = 0;
           while((digitab[*ptr] & ctype_digit) != 0)
-            recno = recno * 10 + *ptr++ - '0';
+            recno = recno * 10 + *ptr++ - CHAR_0;
+
+          if (*ptr != terminator)
+            {
+            *errorcodeptr = ERR29;
+            goto FAILED;
+            }
+
+          if (refsign == CHAR_MINUS)
+            {
+            if (recno == 0)
+              {
+              *errorcodeptr = ERR58;
+              goto FAILED;
+              }
+            recno = cd->bracount - recno + 1;
+            if (recno <= 0)
+              {
+              *errorcodeptr = ERR15;
+              goto FAILED;
+              }
+            }
+          else if (refsign == CHAR_PLUS)
+            {
+            if (recno == 0)
+              {
+              *errorcodeptr = ERR58;
+              goto FAILED;
+              }
+            recno += cd->bracount;
+            }
 
           /* Come here from code above that handles a named recursion */
 
           HANDLE_RECURSION:
 
           previous = code;
+          called = cd->start_code;
 
-          /* Find the bracket that is being referenced. Temporarily end the
-          regex in case it doesn't exist. */
+          /* When we are actually compiling, find the bracket that is being
+          referenced. Temporarily end the regex in case it doesn't exist before
+          this point. If we end up with a forward reference, first check that
+          the bracket does occur later so we can give the error (and position)
+          now. Then remember this forward reference in the workspace so it can
+          be filled in at the end. */
 
-          *code = OP_END;
-          called = (recno == 0)? cd->start_code :
-            find_bracket(cd->start_code, utf8, recno);
-          if (called == NULL)
+          if (lengthptr == NULL)
             {
-            *errorcodeptr = ERR15;
-            goto FAILED;
-            }
+            *code = OP_END;
+            if (recno != 0) called = find_bracket(cd->start_code, utf8, recno);
 
-          /* If the subpattern is still open, this is a recursive call. We
-          check to see if this is a left recursion that could loop for ever,
-          and diagnose that case. */
+            /* Forward reference */
 
-          if (GET(called, 1) == 0 && could_be_empty(called, code, bcptr, utf8))
-            {
-            *errorcodeptr = ERR40;
-            goto FAILED;
+            if (called == NULL)
+              {
+              if (find_parens(cd, NULL, recno,
+                    (options & PCRE_EXTENDED) != 0) < 0)
+                {
+                *errorcodeptr = ERR15;
+                goto FAILED;
+                }
+              called = cd->start_code + recno;
+              PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);
+              }
+
+            /* If not a forward reference, and the subpattern is still open,
+            this is a recursive call. We check to see if this is a left
+            recursion that could loop for ever, and diagnose that case. */
+
+            else if (GET(called, 1) == 0 &&
+                     could_be_empty(called, code, bcptr, utf8))
+              {
+              *errorcodeptr = ERR40;
+              goto FAILED;
+              }
             }
 
           /* Insert the recursion/subroutine item, automatically wrapped inside
-          "once" brackets. */
+          "once" brackets. Set up a "previous group" length so that a
+          subsequent quantifier will work. */
 
           *code = OP_ONCE;
           PUT(code, 1, 2 + 2*LINK_SIZE);
@@ -3174,28 +5047,43 @@
           *code = OP_KET;
           PUT(code, 1, 2 + 2*LINK_SIZE);
           code += 1 + LINK_SIZE;
+
+          length_prevgroup = 3 + 3*LINK_SIZE;
           }
+
+        /* Can't determine a first byte now */
+
+        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
         continue;
 
-        /* Character after (? not specially recognized */
 
-        default:                  /* Option setting */
+        /* ------------------------------------------------------------ */
+        default:              /* Other characters: check option setting */
+        OTHER_CHAR_AFTER_QUERY:
         set = unset = 0;
         optset = &set;
 
-        while (*ptr != ')' && *ptr != ':')
+        while (*ptr != CHAR_RIGHT_PARENTHESIS && *ptr != CHAR_COLON)
           {
           switch (*ptr++)
             {
-            case '-': optset = &unset; break;
+            case CHAR_MINUS: optset = &unset; break;
 
-            case 'i': *optset |= PCRE_CASELESS; break;
-            case 'J': *optset |= PCRE_DUPNAMES; break;
-            case 'm': *optset |= PCRE_MULTILINE; break;
-            case 's': *optset |= PCRE_DOTALL; break;
-            case 'x': *optset |= PCRE_EXTENDED; break;
-            case 'U': *optset |= PCRE_UNGREEDY; break;
-            case 'X': *optset |= PCRE_EXTRA; break;
+            case CHAR_J:    /* Record that it changed in the external options */
+            *optset |= PCRE_DUPNAMES;
+            cd->external_flags |= PCRE_JCHANGED;
+            break;
+
+            case CHAR_i: *optset |= PCRE_CASELESS; break;
+            case CHAR_m: *optset |= PCRE_MULTILINE; break;
+            case CHAR_s: *optset |= PCRE_DOTALL; break;
+            case CHAR_x: *optset |= PCRE_EXTENDED; break;
+            case CHAR_U: *optset |= PCRE_UNGREEDY; break;
+            case CHAR_X: *optset |= PCRE_EXTRA; break;
+
+            default:  *errorcodeptr = ERR12;
+                      ptr--;    /* Correct the offset */
+                      goto FAILED;
             }
           }
 
@@ -3204,33 +5092,52 @@
         newoptions = (options | set) & (~unset);
 
         /* If the options ended with ')' this is not the start of a nested
-        group with option changes, so the options change at this level. Compile
-        code to change the ims options if this setting actually changes any of
-        them. We also pass the new setting back so that it can be put at the
-        start of any following branches, and when this group ends (if we are in
-        a group), a resetting item can be compiled.
-
-        Note that if this item is right at the start of the pattern, the
-        options will have been abstracted and made global, so there will be no
-        change to compile. */
-
-        if (*ptr == ')')
+        group with option changes, so the options change at this level. If this
+        item is right at the start of the pattern, the options can be
+        abstracted and made external in the pre-compile phase, and ignored in
+        the compile phase. This can be helpful when matching -- for instance in
+        caseless checking of required bytes.
+
+        If the code pointer is not (cd->start_code + 1 + LINK_SIZE), we are
+        definitely *not* at the start of the pattern because something has been
+        compiled. In the pre-compile phase, however, the code pointer can have
+        that value after the start, because it gets reset as code is discarded
+        during the pre-compile. However, this can happen only at top level - if
+        we are within parentheses, the starting BRA will still be present. At
+        any parenthesis level, the length value can be used to test if anything
+        has been compiled at that level. Thus, a test for both these conditions
+        is necessary to ensure we correctly detect the start of the pattern in
+        both phases.
+
+        If we are not at the pattern start, compile code to change the ims
+        options if this setting actually changes any of them, and reset the
+        greedy defaults and the case value for firstbyte and reqbyte. */
+
+        if (*ptr == CHAR_RIGHT_PARENTHESIS)
           {
-          if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
+          if (code == cd->start_code + 1 + LINK_SIZE &&
+               (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
+            {
+            cd->external_options = newoptions;
+            }
+         else
             {
-            *code++ = OP_OPT;
-            *code++ = newoptions & PCRE_IMS;
+            if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
+              {
+              *code++ = OP_OPT;
+              *code++ = newoptions & PCRE_IMS;
+              }
+            greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
+            greedy_non_default = greedy_default ^ 1;
+            req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
             }
 
           /* Change options at this level, and pass them back for use
-          in subsequent branches. Reset the greedy defaults and the case
-          value for firstbyte and reqbyte. */
+          in subsequent branches. When not at the start of the pattern, this
+          information is also necessary so that a resetting item can be
+          compiled at the end of a group (if we are in a group). */
 
           *optionsptr = options = newoptions;
-          greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
-          greedy_non_default = greedy_default ^ 1;
-          req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0;
-
           previous = NULL;       /* This item can't be repeated */
           continue;              /* It is complete */
           }
@@ -3242,58 +5149,57 @@
 
         bravalue = OP_BRA;
         ptr++;
-        }
-      }
+        }     /* End of switch for character following (? */
+      }       /* End of (? handling */
 
-    /* If PCRE_NO_AUTO_CAPTURE is set, all unadorned brackets become
-    non-capturing and behave like (?:...) brackets */
+    /* Opening parenthesis not followed by '?'. If PCRE_NO_AUTO_CAPTURE is set,
+    all unadorned brackets become non-capturing and behave like (?:...)
+    brackets. */
 
     else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)
       {
       bravalue = OP_BRA;
       }
 
-    /* Else we have a referencing group; adjust the opcode. If the bracket
-    number is greater than EXTRACT_BASIC_MAX, we set the opcode one higher, and
-    arrange for the true number to follow later, in an OP_BRANUMBER item. */
+    /* Else we have a capturing group. */
 
     else
       {
       NUMBERED_GROUP:
-      if (++(*brackets) > EXTRACT_BASIC_MAX)
-        {
-        bravalue = OP_BRA + EXTRACT_BASIC_MAX + 1;
-        code[1+LINK_SIZE] = OP_BRANUMBER;
-        PUT2(code, 2+LINK_SIZE, *brackets);
-        skipbytes = 3;
-        }
-      else bravalue = OP_BRA + *brackets;
+      cd->bracount += 1;
+      PUT2(code, 1+LINK_SIZE, cd->bracount);
+      skipbytes = 2;
       }
 
-    /* Process nested bracketed re. Assertions may not be repeated, but other
-    kinds can be. We copy code into a non-register variable in order to be able
-    to pass its address because some compilers complain otherwise. Pass in a
-    new setting for the ims options if they have changed. */
+    /* Process nested bracketed regex. Assertions may not be repeated, but
+    other kinds can be. All their opcodes are >= OP_ONCE. We copy code into a
+    non-register variable in order to be able to pass its address because some
+    compilers complain otherwise. Pass in a new setting for the ims options if
+    they have changed. */
 
     previous = (bravalue >= OP_ONCE)? code : NULL;
     *code = bravalue;
     tempcode = code;
     tempreqvary = cd->req_varyopt;     /* Save value before bracket */
+    length_prevgroup = 0;              /* Initialize for pre-compile phase */
 
     if (!compile_regex(
          newoptions,                   /* The complete new option state */
          options & PCRE_IMS,           /* The previous ims option state */
-         brackets,                     /* Extracting bracket count */
          &tempcode,                    /* Where to put code (updated) */
          &ptr,                         /* Input pointer (updated) */
          errorcodeptr,                 /* Where to put an error message */
          (bravalue == OP_ASSERTBACK ||
           bravalue == OP_ASSERTBACK_NOT), /* TRUE if back assert */
-         skipbytes,                    /* Skip over OP_COND/OP_BRANUMBER */
+         reset_bracount,               /* True if (?| group */
+         skipbytes,                    /* Skip over bracket number */
          &subfirstbyte,                /* For possible first char */
          &subreqbyte,                  /* For possible last char */
          bcptr,                        /* Current branch chain */
-         cd))                          /* Tables block */
+         cd,                           /* Tables block */
+         (lengthptr == NULL)? NULL :   /* Actual compile phase */
+           &length_prevgroup           /* Pre-compile phase */
+         ))
       goto FAILED;
 
     /* At the end of compiling, code is still pointing to the start of the
@@ -3302,9 +5208,11 @@
     is on the bracket. */
 
     /* If this is a conditional bracket, check that there are no more than
-    two branches in the group. */
+    two branches in the group, or just one if it's a DEFINE group. We do this
+    in the real compile phase, not in the pre-pass, where the whole group may
+    not be available. */
 
-    else if (bravalue == OP_COND)
+    if (bravalue == OP_COND && lengthptr == NULL)
       {
       uschar *tc = code;
       int condcount = 0;
@@ -3315,29 +5223,83 @@
          }
       while (*tc != OP_KET);
 
-      if (condcount > 2)
+      /* A DEFINE group is never obeyed inline (the "condition" is always
+      false). It must have only one branch. */
+
+      if (code[LINK_SIZE+1] == OP_DEF)
         {
-        *errorcodeptr = ERR27;
-        goto FAILED;
+        if (condcount > 1)
+          {
+          *errorcodeptr = ERR54;
+          goto FAILED;
+          }
+        bravalue = OP_DEF;   /* Just a flag to suppress char handling below */
+        }
+
+      /* A "normal" conditional group. If there is just one branch, we must not
+      make use of its firstbyte or reqbyte, because this is equivalent to an
+      empty second branch. */
+
+      else
+        {
+        if (condcount > 2)
+          {
+          *errorcodeptr = ERR27;
+          goto FAILED;
+          }
+        if (condcount == 1) subfirstbyte = subreqbyte = REQ_NONE;
         }
+      }
+
+    /* Error if hit end of pattern */
+
+    if (*ptr != CHAR_RIGHT_PARENTHESIS)
+      {
+      *errorcodeptr = ERR14;
+      goto FAILED;
+      }
 
-      /* If there is just one branch, we must not make use of its firstbyte or
-      reqbyte, because this is equivalent to an empty second branch. */
+    /* In the pre-compile phase, update the length by the length of the group,
+    less the brackets at either end. Then reduce the compiled code to just a
+    set of non-capturing brackets so that it doesn't use much memory if it is
+    duplicated by a quantifier.*/
 
-      if (condcount == 1) subfirstbyte = subreqbyte = REQ_NONE;
+    if (lengthptr != NULL)
+      {
+      if (OFLOW_MAX - *lengthptr < length_prevgroup - 2 - 2*LINK_SIZE)
+        {
+        *errorcodeptr = ERR20;
+        goto FAILED;
+        }
+      *lengthptr += length_prevgroup - 2 - 2*LINK_SIZE;
+      *code++ = OP_BRA;
+      PUTINC(code, 0, 1 + LINK_SIZE);
+      *code++ = OP_KET;
+      PUTINC(code, 0, 1 + LINK_SIZE);
+      break;    /* No need to waste time with special character handling */
       }
 
-    /* Handle updating of the required and first characters. Update for normal
-    brackets of all kinds, and conditions with two branches (see code above).
-    If the bracket is followed by a quantifier with zero repeat, we have to
-    back off. Hence the definition of zeroreqbyte and zerofirstbyte outside the
-    main loop so that they can be accessed for the back off. */
+    /* Otherwise update the main code pointer to the end of the group. */
+
+    code = tempcode;
+
+    /* For a DEFINE group, required and first character settings are not
+    relevant. */
+
+    if (bravalue == OP_DEF) break;
+
+    /* Handle updating of the required and first characters for other types of
+    group. Update for normal brackets of all kinds, and conditions with two
+    branches (see code above). If the bracket is followed by a quantifier with
+    zero repeat, we have to back off. Hence the definition of zeroreqbyte and
+    zerofirstbyte outside the main loop so that they can be accessed for the
+    back off. */
 
     zeroreqbyte = reqbyte;
     zerofirstbyte = firstbyte;
     groupsetfirstbyte = FALSE;
 
-    if (bravalue >= OP_BRA || bravalue == OP_ONCE || bravalue == OP_COND)
+    if (bravalue >= OP_ONCE)
       {
       /* If we have not yet set a firstbyte in this branch, take it from the
       subpattern, remembering that it was set here so that a repeat of more
@@ -3378,44 +5340,34 @@
     firstbyte, looking for an asserted first char. */
 
     else if (bravalue == OP_ASSERT && subreqbyte >= 0) reqbyte = subreqbyte;
+    break;     /* End of processing '(' */
 
-    /* Now update the main code pointer to the end of the group. */
-
-    code = tempcode;
-
-    /* Error if hit end of pattern */
-
-    if (*ptr != ')')
-      {
-      *errorcodeptr = ERR14;
-      goto FAILED;
-      }
-    break;
-
-    /* Check \ for being a real metacharacter; if not, fall through and handle
-    it as a data character at the start of a string. Escape items are checked
-    for validity in the pre-compiling pass. */
-
-    case '\\':
-    tempptr = ptr;
-    c = check_escape(&ptr, errorcodeptr, *brackets, options, FALSE);
 
-    /* Handle metacharacters introduced by \. For ones like \d, the ESC_ values
+    /* ===================================================================*/
+    /* Handle metasequences introduced by \. For ones like \d, the ESC_ values
     are arranged to be the negation of the corresponding OP_values. For the
     back references, the values are ESC_REF plus the reference number. Only
     back references and those types that consume a character may be repeated.
     We can test for values between ESC_b and ESC_Z for the latter; this may
     have to change if any new ones are ever created. */
 
+    case CHAR_BACKSLASH:
+    tempptr = ptr;
+    c = check_escape(&ptr, errorcodeptr, cd->bracount, options, FALSE);
+    if (*errorcodeptr != 0) goto FAILED;
+
     if (c < 0)
       {
       if (-c == ESC_Q)            /* Handle start of quoted string */
         {
-        if (ptr[1] == '\\' && ptr[2] == 'E') ptr += 2; /* avoid empty string */
-          else inescq = TRUE;
+        if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
+          ptr += 2;               /* avoid empty string */
+            else inescq = TRUE;
         continue;
         }
 
+      if (-c == ESC_E) continue;  /* Perl ignores an orphan \E */
+
       /* For metasequences that actually match a character, we disable the
       setting of a first character if it hasn't already been set. */
 
@@ -3427,18 +5379,96 @@
       zerofirstbyte = firstbyte;
       zeroreqbyte = reqbyte;
 
-      /* Back references are handled specially */
+      /* \g or \g'name' is a subroutine call by name and \g or \g'n'
+      is a subroutine call by number (Oniguruma syntax). In fact, the value
+      -ESC_g is returned only for these cases. So we don't need to check for <
+      or ' if the value is -ESC_g. For the Perl syntax \g{n} the value is
+      -ESC_REF+n, and for the Perl syntax \g{name} the result is -ESC_k (as
+      that is a synonym for a named back reference). */
 
-      if (-c >= ESC_REF)
+      if (-c == ESC_g)
         {
-        int number = -c - ESC_REF;
-        previous = code;
+        const uschar *p;
+        save_hwm = cd->hwm;   /* Normally this is set when '(' is read */
+        terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
+          CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE;
+
+        /* These two statements stop the compiler for warning about possibly
+        unset variables caused by the jump to HANDLE_NUMERICAL_RECURSION. In
+        fact, because we actually check for a number below, the paths that
+        would actually be in error are never taken. */
+
+        skipbytes = 0;
+        reset_bracount = FALSE;
+
+        /* Test for a name */
+
+        if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)
+          {
+          BOOL isnumber = TRUE;
+          for (p = ptr + 1; *p != 0 && *p != terminator; p++)
+            {
+            if ((cd->ctypes[*p] & ctype_digit) == 0) isnumber = FALSE;
+            if ((cd->ctypes[*p] & ctype_word) == 0) break;
+            }
+          if (*p != terminator)
+            {
+            *errorcodeptr = ERR57;
+            break;
+            }
+          if (isnumber)
+            {
+            ptr++;
+            goto HANDLE_NUMERICAL_RECURSION;
+            }
+          is_recurse = TRUE;
+          goto NAMED_REF_OR_RECURSE;
+          }
+
+        /* Test a signed number in angle brackets or quotes. */
+
+        p = ptr + 2;
+        while ((digitab[*p] & ctype_digit) != 0) p++;
+        if (*p != terminator)
+          {
+          *errorcodeptr = ERR57;
+          break;
+          }
+        ptr++;
+        goto HANDLE_NUMERICAL_RECURSION;
+        }
+
+      /* \k or \k'name' is a back reference by name (Perl syntax).
+      We also support \k{name} (.NET syntax) */
+
+      if (-c == ESC_k && (ptr[1] == CHAR_LESS_THAN_SIGN ||
+          ptr[1] == CHAR_APOSTROPHE || ptr[1] == CHAR_LEFT_CURLY_BRACKET))
+        {
+        is_recurse = FALSE;
+        terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)?
+          CHAR_GREATER_THAN_SIGN : (*ptr == CHAR_APOSTROPHE)?
+          CHAR_APOSTROPHE : CHAR_RIGHT_CURLY_BRACKET;
+        goto NAMED_REF_OR_RECURSE;
+        }
+
+      /* Back references are handled specially; must disable firstbyte if
+      not set to cope with cases like (?=(\w+))\1: which would otherwise set
+      ':' later. */
+
+      if (-c >= ESC_REF)
+        {
+        recno = -c - ESC_REF;
+
+        HANDLE_REFERENCE:    /* Come here from named backref handling */
+        if (firstbyte == REQ_UNSET) firstbyte = REQ_NONE;
+        previous = code;
         *code++ = OP_REF;
-        PUT2INC(code, 0, number);
+        PUT2INC(code, 0, recno);
+        cd->backref_map |= (recno < 32)? (1 << recno) : 1;
+        if (recno > cd->top_backref) cd->top_backref = recno;
         }
 
-      /* So are Unicode property matches, if supported. We know that get_ucp
-      won't fail because it was tested in the pre-pass. */
+      /* So are Unicode property matches, if supported. */
 
 #ifdef SUPPORT_UCP
       else if (-c == ESC_P || -c == ESC_p)
@@ -3446,15 +5476,26 @@
         BOOL negated;
         int pdata;
         int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
+        if (ptype < 0) goto FAILED;
         previous = code;
         *code++ = ((-c == ESC_p) != negated)? OP_PROP : OP_NOTPROP;
         *code++ = ptype;
         *code++ = pdata;
         }
+#else
+
+      /* If Unicode properties are not supported, \X, \P, and \p are not
+      allowed. */
+
+      else if (-c == ESC_X || -c == ESC_P || -c == ESC_p)
+        {
+        *errorcodeptr = ERR45;
+        goto FAILED;
+        }
 #endif
 
-      /* For the rest, we can obtain the OP value by negating the escape
-      value */
+      /* For the rest (including \X when Unicode properties are supported), we
+      can obtain the OP value by negating the escape value. */
 
       else
         {
@@ -3478,9 +5519,10 @@
      mcbuffer[0] = c;
      mclength = 1;
      }
-
     goto ONE_CHAR;
 
+
+    /* ===================================================================*/
     /* Handle a literal character. It is guaranteed not to be whitespace or #
     when the extended flag is set. If we are in UTF-8 mode, it may be a
     multi-byte literal character. */
@@ -3491,7 +5533,7 @@
     mcbuffer[0] = c;
 
 #ifdef SUPPORT_UTF8
-    if (utf8 && (c & 0xc0) == 0xc0)
+    if (utf8 && c >= 0xc0)
       {
       while ((ptr[1] & 0xc0) == 0x80)
         mcbuffer[mclength++] = *(++ptr);
@@ -3506,6 +5548,11 @@
     *code++ = ((options & PCRE_CASELESS) != 0)? OP_CHARNC : OP_CHAR;
     for (c = 0; c < mclength; c++) *code++ = mcbuffer[c];
 
+    /* Remember if \r or \n were seen */
+
+    if (mcbuffer[0] == CHAR_CR || mcbuffer[0] == CHAR_NL)
+      cd->external_flags |= PCRE_HASCRORLF;
+
     /* Set the first and required bytes appropriately. If no previous first
     byte, set it from this character, but revert to none on a zero repeat.
     Otherwise, leave the firstbyte value alone, and don't change it on a zero
@@ -3542,6 +5589,7 @@
     }
   }                   /* end of big loop */
 
+
 /* Control never reaches here by falling through, only by a goto for all the
 error states. Pass back the position in the pattern so that it can be displayed
 to the user for diagnosing the error. */
@@ -3558,35 +5606,42 @@
 *     Compile sequence of alternatives           *
 *************************************************/
 
-/* On entry, ptr is pointing past the bracket character, but on return
-it points to the closing bracket, or vertical bar, or end of string.
-The code variable is pointing at the byte into which the BRA operator has been
-stored. If the ims options are changed at the start (for a (?ims: group) or
-during any branch, we need to insert an OP_OPT item at the start of every
-following branch to ensure they get set correctly at run time, and also pass
-the new options into every subsequent branch compile.
+/* On entry, ptr is pointing past the bracket character, but on return it
+points to the closing bracket, or vertical bar, or end of string. The code
+variable is pointing at the byte into which the BRA operator has been stored.
+If the ims options are changed at the start (for a (?ims: group) or during any
+branch, we need to insert an OP_OPT item at the start of every following branch
+to ensure they get set correctly at run time, and also pass the new options
+into every subsequent branch compile.
+
+This function is used during the pre-compile phase when we are trying to find
+out the amount of memory needed, as well as during the real compile phase. The
+value of lengthptr distinguishes the two phases.
 
-Argument:
+Arguments:
   options        option bits, including any changes for this subpattern
   oldims         previous settings of ims option bits
-  brackets       -> int containing the number of extracting brackets used
   codeptr        -> the address of the current code pointer
   ptrptr         -> the address of the current pattern pointer
   errorcodeptr   -> pointer to error code variable
   lookbehind     TRUE if this is a lookbehind assertion
-  skipbytes      skip this many bytes at start (for OP_COND, OP_BRANUMBER)
+  reset_bracount TRUE to reset the count for each branch
+  skipbytes      skip this many bytes at start (for brackets and OP_COND)
   firstbyteptr   place to put the first required character, or a negative number
   reqbyteptr     place to put the last required character, or a negative number
   bcptr          pointer to the chain of currently open branches
   cd             points to the data block with tables pointers etc.
+  lengthptr      NULL during the real compile phase
+                 points to length accumulator during pre-compile phase
 
-Returns:      TRUE on success
+Returns:         TRUE on success
 */
 
 static BOOL
-compile_regex(int options, int oldims, int *brackets, uschar **codeptr,
-  const uschar **ptrptr, int *errorcodeptr, BOOL lookbehind, int skipbytes,
-  int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd)
+compile_regex(int options, int oldims, uschar **codeptr, const uschar **ptrptr,
+  int *errorcodeptr, BOOL lookbehind, BOOL reset_bracount, int skipbytes,
+  int *firstbyteptr, int *reqbyteptr, branch_chain *bcptr, compile_data *cd,
+  int *lengthptr)
 {
 const uschar *ptr = *ptrptr;
 uschar *code = *codeptr;
@@ -3595,6 +5650,9 @@
 uschar *reverse_count = NULL;
 int firstbyte, reqbyte;
 int branchfirstbyte, branchreqbyte;
+int length;
+int orig_bracount;
+int max_bracount;
 branch_chain bc;
 
 bc.outer = bcptr;
@@ -3602,6 +5660,20 @@
 
 firstbyte = reqbyte = REQ_UNSET;
 
+/* Accumulate the length for use in the pre-compile phase. Start with the
+length of the BRA and KET and any extra bytes that are required at the
+beginning. We accumulate in a local variable to save frequent testing of
+lenthptr for NULL. We cannot do this by looking at the value of code at the
+start and end of each alternative, because compiled items are discarded during
+the pre-compile phase so that the work space is not exceeded. */
+
+length = 2 + 2*LINK_SIZE + skipbytes;
+
+/* WARNING: If the above line is changed for any reason, you must also change
+the code that abstracts option settings at the start of the pattern and makes
+them global. It tests the value of length for (2 + 2*LINK_SIZE) in the
+pre-compile phase to find out whether anything has yet been compiled or not. */
+
 /* Offset is set zero to mark that this bracket is still open */
 
 PUT(code, 1, 0);
@@ -3609,14 +5681,21 @@
 
 /* Loop for each alternative branch */
 
+orig_bracount = max_bracount = cd->bracount;
 for (;;)
   {
+  /* For a (?| group, reset the capturing bracket count so that each branch
+  uses the same numbers. */
+
+  if (reset_bracount) cd->bracount = orig_bracount;
+
   /* Handle a change of ims options at the start of the branch */
 
   if ((options & PCRE_IMS) != oldims)
     {
     *code++ = OP_OPT;
     *code++ = options & PCRE_IMS;
+    length += 2;
     }
 
   /* Set up dummy OP_REVERSE if lookbehind assertion */
@@ -3626,95 +5705,110 @@
     *code++ = OP_REVERSE;
     reverse_count = code;
     PUTINC(code, 0, 0);
+    length += 1 + LINK_SIZE;
     }
 
-  /* Now compile the branch */
+  /* Now compile the branch; in the pre-compile phase its length gets added
+  into the length. */
 
-  if (!compile_branch(&options, brackets, &code, &ptr, errorcodeptr,
-        &branchfirstbyte, &branchreqbyte, &bc, cd))
+  if (!compile_branch(&options, &code, &ptr, errorcodeptr, &branchfirstbyte,
+        &branchreqbyte, &bc, cd, (lengthptr == NULL)? NULL : &length))
     {
     *ptrptr = ptr;
     return FALSE;
     }
 
-  /* If this is the first branch, the firstbyte and reqbyte values for the
-  branch become the values for the regex. */
+  /* Keep the highest bracket count in case (?| was used and some branch
+  has fewer than the rest. */
 
-  if (*last_branch != OP_ALT)
-    {
-    firstbyte = branchfirstbyte;
-    reqbyte = branchreqbyte;
-    }
+  if (cd->bracount > max_bracount) max_bracount = cd->bracount;
 
-  /* If this is not the first branch, the first char and reqbyte have to
-  match the values from all the previous branches, except that if the previous
-  value for reqbyte didn't have REQ_VARY set, it can still match, and we set
-  REQ_VARY for the regex. */
+  /* In the real compile phase, there is some post-processing to be done. */
 
-  else
+  if (lengthptr == NULL)
     {
-    /* If we previously had a firstbyte, but it doesn't match the new branch,
-    we have to abandon the firstbyte for the regex, but if there was previously
-    no reqbyte, it takes on the value of the old firstbyte. */
+    /* If this is the first branch, the firstbyte and reqbyte values for the
+    branch become the values for the regex. */
 
-    if (firstbyte >= 0 && firstbyte != branchfirstbyte)
+    if (*last_branch != OP_ALT)
       {
-      if (reqbyte < 0) reqbyte = firstbyte;
-      firstbyte = REQ_NONE;
+      firstbyte = branchfirstbyte;
+      reqbyte = branchreqbyte;
       }
 
-    /* If we (now or from before) have no firstbyte, a firstbyte from the
-    branch becomes a reqbyte if there isn't a branch reqbyte. */
+    /* If this is not the first branch, the first char and reqbyte have to
+    match the values from all the previous branches, except that if the
+    previous value for reqbyte didn't have REQ_VARY set, it can still match,
+    and we set REQ_VARY for the regex. */
+
+    else
+      {
+      /* If we previously had a firstbyte, but it doesn't match the new branch,
+      we have to abandon the firstbyte for the regex, but if there was
+      previously no reqbyte, it takes on the value of the old firstbyte. */
+
+      if (firstbyte >= 0 && firstbyte != branchfirstbyte)
+        {
+        if (reqbyte < 0) reqbyte = firstbyte;
+        firstbyte = REQ_NONE;
+        }
 
-    if (firstbyte < 0 && branchfirstbyte >= 0 && branchreqbyte < 0)
-        branchreqbyte = branchfirstbyte;
+      /* If we (now or from before) have no firstbyte, a firstbyte from the
+      branch becomes a reqbyte if there isn't a branch reqbyte. */
 
-    /* Now ensure that the reqbytes match */
+      if (firstbyte < 0 && branchfirstbyte >= 0 && branchreqbyte < 0)
+          branchreqbyte = branchfirstbyte;
 
-    if ((reqbyte & ~REQ_VARY) != (branchreqbyte & ~REQ_VARY))
-      reqbyte = REQ_NONE;
-    else reqbyte |= branchreqbyte;   /* To "or" REQ_VARY */
-    }
+      /* Now ensure that the reqbytes match */
 
-  /* If lookbehind, check that this branch matches a fixed-length string,
-  and put the length into the OP_REVERSE item. Temporarily mark the end of
-  the branch with OP_END. */
+      if ((reqbyte & ~REQ_VARY) != (branchreqbyte & ~REQ_VARY))
+        reqbyte = REQ_NONE;
+      else reqbyte |= branchreqbyte;   /* To "or" REQ_VARY */
+      }
 
-  if (lookbehind)
-    {
-    int length;
-    *code = OP_END;
-    length = find_fixedlength(last_branch, options);
-    DPRINTF(("fixed length = %d\n", length));
-    if (length < 0)
+    /* If lookbehind, check that this branch matches a fixed-length string, and
+    put the length into the OP_REVERSE item. Temporarily mark the end of the
+    branch with OP_END. */
+
+    if (lookbehind)
       {
-      *errorcodeptr = (length == -2)? ERR36 : ERR25;
-      *ptrptr = ptr;
-      return FALSE;
+      int fixed_length;
+      *code = OP_END;
+      fixed_length = find_fixedlength(last_branch, options);
+      DPRINTF(("fixed length = %d\n", fixed_length));
+      if (fixed_length < 0)
+        {
+        *errorcodeptr = (fixed_length == -2)? ERR36 : ERR25;
+        *ptrptr = ptr;
+        return FALSE;
+        }
+      PUT(reverse_count, 0, fixed_length);
       }
-    PUT(reverse_count, 0, length);
     }
 
-  /* Reached end of expression, either ')' or end of pattern. Go back through
-  the alternative branches and reverse the chain of offsets, with the field in
-  the BRA item now becoming an offset to the first alternative. If there are
-  no alternatives, it points to the end of the group. The length in the
-  terminating ket is always the length of the whole bracketed item. If any of
-  the ims options were changed inside the group, compile a resetting op-code
-  following, except at the very end of the pattern. Return leaving the pointer
-  at the terminating char. */
+  /* Reached end of expression, either ')' or end of pattern. In the real
+  compile phase, go back through the alternative branches and reverse the chain
+  of offsets, with the field in the BRA item now becoming an offset to the
+  first alternative. If there are no alternatives, it points to the end of the
+  group. The length in the terminating ket is always the length of the whole
+  bracketed item. If any of the ims options were changed inside the group,
+  compile a resetting op-code following, except at the very end of the pattern.
+  Return leaving the pointer at the terminating char. */
 
-  if (*ptr != '|')
+  if (*ptr != CHAR_VERTICAL_LINE)
     {
-    int length = code - last_branch;
-    do
+    if (lengthptr == NULL)
       {
-      int prev_length = GET(last_branch, 1);
-      PUT(last_branch, 1, length);
-      length = prev_length;
-      last_branch -= length;
+      int branch_length = code - last_branch;
+      do
+        {
+        int prev_length = GET(last_branch, 1);
+        PUT(last_branch, 1, branch_length);
+        branch_length = prev_length;
+        last_branch -= branch_length;
+        }
+      while (branch_length > 0);
       }
-    while (length > 0);
 
     /* Fill in the ket */
 
@@ -3724,30 +5818,57 @@
 
     /* Resetting option if needed */
 
-    if ((options & PCRE_IMS) != oldims && *ptr == ')')
+    if ((options & PCRE_IMS) != oldims && *ptr == CHAR_RIGHT_PARENTHESIS)
       {
       *code++ = OP_OPT;
       *code++ = oldims;
+      length += 2;
       }
 
+    /* Retain the highest bracket number, in case resetting was used. */
+
+    cd->bracount = max_bracount;
+
     /* Set values to pass back */
 
     *codeptr = code;
     *ptrptr = ptr;
     *firstbyteptr = firstbyte;
     *reqbyteptr = reqbyte;
+    if (lengthptr != NULL)
+      {
+      if (OFLOW_MAX - *lengthptr < length)
+        {
+        *errorcodeptr = ERR20;
+        return FALSE;
+        }
+      *lengthptr += length;
+      }
     return TRUE;
     }
 
-  /* Another branch follows; insert an "or" node. Its length field points back
+  /* Another branch follows. In the pre-compile phase, we can move the code
+  pointer back to where it was for the start of the first branch. (That is,
+  pretend that each branch is the only one.)
+
+  In the real compile phase, insert an ALT node. Its length field points back
   to the previous branch while the bracket remains open. At the end the chain
   is reversed. It's done like this so that the start of the bracket has a
   zero offset until it is closed, making it possible to detect recursion. */
 
-  *code = OP_ALT;
-  PUT(code, 1, code - last_branch);
-  bc.current = last_branch = code;
-  code += 1 + LINK_SIZE;
+  if (lengthptr != NULL)
+    {
+    code = *codeptr + 1 + LINK_SIZE + skipbytes;
+    length += 1 + LINK_SIZE;
+    }
+  else
+    {
+    *code = OP_ALT;
+    PUT(code, 1, code - last_branch);
+    bc.current = last_branch = code;
+    code += 1 + LINK_SIZE;
+    }
+
   ptr++;
   }
 /* Control never reaches here */
@@ -3799,35 +5920,41 @@
   unsigned int backref_map)
 {
 do {
-   const uschar *scode =
-     first_significant_code(code + 1+LINK_SIZE, options, PCRE_MULTILINE, FALSE);
+   const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
+     options, PCRE_MULTILINE, FALSE);
    register int op = *scode;
 
+   /* Non-capturing brackets */
+
+   if (op == OP_BRA)
+     {
+     if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
+     }
+
    /* Capturing brackets */
 
-   if (op > OP_BRA)
+   else if (op == OP_CBRA)
      {
-     int new_map;
-     op -= OP_BRA;
-     if (op > EXTRACT_BASIC_MAX) op = GET2(scode, 2+LINK_SIZE);
-     new_map = bracket_map | ((op < 32)? (1 << op) : 1);
+     int n = GET2(scode, 1+LINK_SIZE);
+     int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
      if (!is_anchored(scode, options, new_map, backref_map)) return FALSE;
      }
 
    /* Other brackets */
 
-   else if (op == OP_BRA || op == OP_ASSERT || op == OP_ONCE || op == OP_COND)
+   else if (op == OP_ASSERT || op == OP_ONCE || op == OP_COND)
      {
      if (!is_anchored(scode, options, bracket_map, backref_map)) return FALSE;
      }
 
-   /* .* is not anchored unless DOTALL is set and it isn't in brackets that
-   are or may be referenced. */
+   /* .* is not anchored unless DOTALL is set (which generates OP_ALLANY) and
+   it isn't in brackets that are or may be referenced. */
 
-   else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR) &&
-            (*options & PCRE_DOTALL) != 0)
+   else if ((op == OP_TYPESTAR || op == OP_TYPEMINSTAR ||
+             op == OP_TYPEPOSSTAR))
      {
-     if (scode[1] != OP_ANY || (bracket_map & backref_map) != 0) return FALSE;
+     if (scode[1] != OP_ALLANY || (bracket_map & backref_map) != 0)
+       return FALSE;
      }
 
    /* Check for explicit anchoring */
@@ -3869,30 +5996,63 @@
   unsigned int backref_map)
 {
 do {
-   const uschar *scode = first_significant_code(code + 1+LINK_SIZE, NULL, 0,
-     FALSE);
+   const uschar *scode = first_significant_code(code + _pcre_OP_lengths[*code],
+     NULL, 0, FALSE);
    register int op = *scode;
 
+   /* If we are at the start of a conditional assertion group, *both* the
+   conditional assertion *and* what follows the condition must satisfy the test
+   for start of line. Other kinds of condition fail. Note that there may be an
+   auto-callout at the start of a condition. */
+
+   if (op == OP_COND)
+     {
+     scode += 1 + LINK_SIZE;
+     if (*scode == OP_CALLOUT) scode += _pcre_OP_lengths[OP_CALLOUT];
+     switch (*scode)
+       {
+       case OP_CREF:
+       case OP_RREF:
+       case OP_DEF:
+       return FALSE;
+
+       default:     /* Assertion */
+       if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
+       do scode += GET(scode, 1); while (*scode == OP_ALT);
+       scode += 1 + LINK_SIZE;
+       break;
+       }
+     scode = first_significant_code(scode, NULL, 0, FALSE);
+     op = *scode;
+     }
+
+   /* Non-capturing brackets */
+
+   if (op == OP_BRA)
+     {
+     if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
+     }
+
    /* Capturing brackets */
 
-   if (op > OP_BRA)
+   else if (op == OP_CBRA)
      {
-     int new_map;
-     op -= OP_BRA;
-     if (op > EXTRACT_BASIC_MAX) op = GET2(scode, 2+LINK_SIZE);
-     new_map = bracket_map | ((op < 32)? (1 << op) : 1);
+     int n = GET2(scode, 1+LINK_SIZE);
+     int new_map = bracket_map | ((n < 32)? (1 << n) : 1);
      if (!is_startline(scode, new_map, backref_map)) return FALSE;
      }
 
    /* Other brackets */
 
-   else if (op == OP_BRA || op == OP_ASSERT || op == OP_ONCE || op == OP_COND)
-     { if (!is_startline(scode, bracket_map, backref_map)) return FALSE; }
+   else if (op == OP_ASSERT || op == OP_ONCE)
+     {
+     if (!is_startline(scode, bracket_map, backref_map)) return FALSE;
+     }
 
    /* .* means "start at start or after \n" if it isn't in brackets that
    may be referenced. */
 
-   else if (op == OP_TYPESTAR || op == OP_TYPEMINSTAR)
+   else if (op == OP_TYPESTAR || op == OP_TYPEMINSTAR || op == OP_TYPEPOSSTAR)
      {
      if (scode[1] != OP_ANY || (bracket_map & backref_map) != 0) return FALSE;
      }
@@ -3941,14 +6101,13 @@
      first_significant_code(code + 1+LINK_SIZE, options, PCRE_CASELESS, TRUE);
    register int op = *scode;
 
-   if (op >= OP_BRA) op = OP_BRA;
-
    switch(op)
      {
      default:
      return -1;
 
      case OP_BRA:
+     case OP_CBRA:
      case OP_ASSERT:
      case OP_ONCE:
      case OP_COND:
@@ -3964,6 +6123,7 @@
      case OP_CHARNC:
      case OP_PLUS:
      case OP_MINPLUS:
+     case OP_POSPLUS:
      if (!inassert) return -1;
      if (c < 0)
        {
@@ -4004,7 +6164,7 @@
                 with errorptr and erroroffset set
 */
 
-PCRE_DATA_SCOPE pcre *
+PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
 pcre_compile(const char *pattern, int options, const char **errorptr,
   int *erroroffset, const unsigned char *tables)
 {
@@ -4012,37 +6172,36 @@
 }
 
 
-
-PCRE_DATA_SCOPE pcre *
+PCRE_EXP_DEFN pcre * PCRE_CALL_CONVENTION
 pcre_compile2(const char *pattern, int options, int *errorcodeptr,
   const char **errorptr, int *erroroffset, const unsigned char *tables)
 {
 real_pcre *re;
-int length = 1 + LINK_SIZE;      /* For initial BRA plus length */
-int c, firstbyte, reqbyte, newline;
-int bracount = 0;
-int branch_extra = 0;
-int branch_newextra;
-int item_count = -1;
-int name_count = 0;
-int max_name_size = 0;
-int lastitemlength = 0;
+int length = 1;  /* For final END opcode */
+int firstbyte, reqbyte, newline;
 int errorcode = 0;
+int skipatstart = 0;
 #ifdef SUPPORT_UTF8
 BOOL utf8;
-BOOL class_utf8;
 #endif
-BOOL inescq = FALSE;
-BOOL capturing;
-unsigned int brastackptr = 0;
 size_t size;
 uschar *code;
 const uschar *codestart;
 const uschar *ptr;
 compile_data compile_block;
 compile_data *cd = &compile_block;
-int brastack[BRASTACK_SIZE];
-uschar bralenstack[BRASTACK_SIZE];
+
+/* This space is used for "compiling" into during the first phase, when we are
+computing the amount of memory that is needed. Compiled items are thrown away
+as soon as possible, so that a fairly large buffer should be sufficient for
+this purpose. The same space is used in the second phase for remembering where
+to fill in forward references to subpatterns. */
+
+uschar cworkspace[COMPILE_WORK_SIZE];
+
+/* Set this early so that early errors get offset 0. */
+
+ptr = (const uschar *)pattern;
 
 /* We can't pass back an error message if errorptr is NULL; I guess the best we
 can do is just return NULL, but we can set a code value if there is a code
@@ -4062,11 +6221,62 @@
 if (erroroffset == NULL)
   {
   errorcode = ERR16;
-  goto PCRE_EARLY_ERROR_RETURN;
+  goto PCRE_EARLY_ERROR_RETURN2;
   }
 
 *erroroffset = 0;
 
+/* Set up pointers to the individual character tables */
+
+if (tables == NULL) tables = _pcre_default_tables;
+cd->lcc = tables + lcc_offset;
+cd->fcc = tables + fcc_offset;
+cd->cbits = tables + cbits_offset;
+cd->ctypes = tables + ctypes_offset;
+
+/* Check that all undefined public option bits are zero */
+
+if ((options & ~PUBLIC_COMPILE_OPTIONS) != 0)
+  {
+  errorcode = ERR17;
+  goto PCRE_EARLY_ERROR_RETURN;
+  }
+
+/* Check for global one-time settings at the start of the pattern, and remember
+the offset for later. */
+
+while (ptr[skipatstart] == CHAR_LEFT_PARENTHESIS &&
+       ptr[skipatstart+1] == CHAR_ASTERISK)
+  {
+  int newnl = 0;
+  int newbsr = 0;
+
+  if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)
+    { skipatstart += 7; options |= PCRE_UTF8; continue; }
+
+  if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)
+    { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
+  else if (strncmp((char *)(ptr+skipatstart+2), STRING_LF_RIGHTPAR, 3)  == 0)
+    { skipatstart += 5; newnl = PCRE_NEWLINE_LF; }
+  else if (strncmp((char *)(ptr+skipatstart+2), STRING_CRLF_RIGHTPAR, 5)  == 0)
+    { skipatstart += 7; newnl = PCRE_NEWLINE_CR + PCRE_NEWLINE_LF; }
+  else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANY_RIGHTPAR, 4) == 0)
+    { skipatstart += 6; newnl = PCRE_NEWLINE_ANY; }
+  else if (strncmp((char *)(ptr+skipatstart+2), STRING_ANYCRLF_RIGHTPAR, 8) == 0)
+    { skipatstart += 10; newnl = PCRE_NEWLINE_ANYCRLF; }
+
+  else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_ANYCRLF_RIGHTPAR, 12) == 0)
+    { skipatstart += 14; newbsr = PCRE_BSR_ANYCRLF; }
+  else if (strncmp((char *)(ptr+skipatstart+2), STRING_BSR_UNICODE_RIGHTPAR, 12) == 0)
+    { skipatstart += 14; newbsr = PCRE_BSR_UNICODE; }
+
+  if (newnl != 0)
+    options = (options & ~PCRE_NEWLINE_BITS) | newnl;
+  else if (newbsr != 0)
+    options = (options & ~(PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) | newbsr;
+  else break;
+  }
+
 /* Can't support UTF8 unless PCRE has been compiled to include the code. */
 
 #ifdef SUPPORT_UTF8
@@ -4075,7 +6285,7 @@
      (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)
   {
   errorcode = ERR44;
-  goto PCRE_EARLY_ERROR_RETURN;
+  goto PCRE_EARLY_ERROR_RETURN2;
   }
 #else
 if ((options & PCRE_UTF8) != 0)
@@ -4085,48 +6295,60 @@
   }
 #endif
 
-if ((options & ~PUBLIC_OPTIONS) != 0)
+/* Check validity of \R options. */
+
+switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
   {
-  errorcode = ERR17;
-  goto PCRE_EARLY_ERROR_RETURN;
+  case 0:
+  case PCRE_BSR_ANYCRLF:
+  case PCRE_BSR_UNICODE:
+  break;
+  default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
   }
 
-/* Set up pointers to the individual character tables */
-
-if (tables == NULL) tables = _pcre_default_tables;
-cd->lcc = tables + lcc_offset;
-cd->fcc = tables + fcc_offset;
-cd->cbits = tables + cbits_offset;
-cd->ctypes = tables + ctypes_offset;
-
-/* Handle different types of newline. The two bits give four cases. The current
-code allows for one- or two-byte sequences. */
+/* Handle different types of newline. The three bits give seven cases. The
+current code allows for fixed one- or two-byte sequences, plus "any" and
+"anycrlf". */
 
-switch (options & PCRE_NEWLINE_CRLF)
+switch (options & PCRE_NEWLINE_BITS)
   {
-  default:              newline = NEWLINE; break;   /* Compile-time default */
-  case PCRE_NEWLINE_CR: newline = '\r'; break;
-  case PCRE_NEWLINE_LF: newline = '\n'; break;
+  case 0: newline = NEWLINE; break;   /* Build-time default */
+  case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
+  case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
   case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
+       PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
+  case PCRE_NEWLINE_ANY: newline = -1; break;
+  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
+  default: errorcode = ERR56; goto PCRE_EARLY_ERROR_RETURN;
   }
 
-if (newline > 255)
+if (newline == -2)
+  {
+  cd->nltype = NLTYPE_ANYCRLF;
+  }
+else if (newline < 0)
   {
-  cd->nllen = 2;
-  cd->nl[0] = (newline >> 8) & 255;
-  cd->nl[1] = newline & 255;
+  cd->nltype = NLTYPE_ANY;
   }
 else
   {
-  cd->nllen = 1;
-  cd->nl[0] = newline;
+  cd->nltype = NLTYPE_FIXED;
+  if (newline > 255)
+    {
+    cd->nllen = 2;
+    cd->nl[0] = (newline >> 8) & 255;
+    cd->nl[1] = newline & 255;
+    }
+  else
+    {
+    cd->nllen = 1;
+    cd->nl[0] = newline;
+    }
   }
 
-/* Maximum back reference and backref bitmap. This is updated for numeric
-references during the first pass, but for named references during the actual
-compile pass. The bitmap records up to 31 back references to help in deciding
-whether (.*) can be treated as anchored or not. */
+/* Maximum back reference and backref bitmap. The bitmap records up to 31 back
+references to help in deciding whether (.*) can be treated as anchored or not.
+*/
 
 cd->top_backref = 0;
 cd->backref_map = 0;
@@ -4136,1059 +6358,173 @@
 DPRINTF(("------------------------------------------------------------------\n"));
 DPRINTF(("%s\n", pattern));
 
-/* The first thing to do is to make a pass over the pattern to compute the
-amount of store required to hold the compiled code. This does not have to be
-perfect as long as errors are overestimates. At the same time we can detect any
-flag settings right at the start, and extract them. Make an attempt to correct
-for any counted white space if an "extended" flag setting appears late in the
-pattern. We can't be so clever for #-comments. */
-
-ptr = (const uschar *)(pattern - 1);
-while ((c = *(++ptr)) != 0)
-  {
-  int min, max;
-  int class_optcount;
-  int bracket_length;
-  int duplength;
+/* Pretend to compile the pattern while actually just accumulating the length
+of memory required. This behaviour is triggered by passing a non-NULL final
+argument to compile_regex(). We pass a block of workspace (cworkspace) for it
+to compile parts of the pattern into; the compiled code is discarded when it is
+no longer needed, so hopefully this workspace will never overflow, though there
+is a test for its doing so. */
 
-  /* If we are inside a \Q...\E sequence, all chars are literal */
+cd->bracount = cd->final_bracount = 0;
+cd->names_found = 0;
+cd->name_entry_size = 0;
+cd->name_table = NULL;
+cd->start_workspace = cworkspace;
+cd->start_code = cworkspace;
+cd->hwm = cworkspace;
+cd->start_pattern = (const uschar *)pattern;
+cd->end_pattern = (const uschar *)(pattern + strlen(pattern));
+cd->req_varyopt = 0;
+cd->external_options = options;
+cd->external_flags = 0;
 
-  if (inescq)
-    {
-    if ((options & PCRE_AUTO_CALLOUT) != 0) length += 2 + 2*LINK_SIZE;
-    goto NORMAL_CHAR;
-    }
+/* Now do the pre-compile. On error, errorcode will be set non-zero, so we
+don't need to look at the result of the function here. The initial options have
+been put into the cd block so that they can be changed if an option setting is
+found within the regex right at the beginning. Bringing initial option settings
+outside can help speed up starting point checks. */
 
-  /* Otherwise, first check for ignored whitespace and comments */
+ptr += skipatstart;
+code = cworkspace;
+*code = OP_BRA;
+(void)compile_regex(cd->external_options, cd->external_options & PCRE_IMS,
+  &code, &ptr, &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd,
+  &length);
+if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
 
-  if ((options & PCRE_EXTENDED) != 0)
-    {
-    if ((cd->ctypes[c] & ctype_space) != 0) continue;
-    if (c == '#')
-      {
-      while (*(++ptr) != 0) if (IS_NEWLINE(ptr)) break;
-      if (*ptr != 0)
-        {
-        ptr += cd->nllen - 1;
-        continue;
-        }
-      break;    /* End loop at end of pattern */
-      }
-    }
+DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
+  cd->hwm - cworkspace));
 
-  item_count++;    /* Is zero for the first non-comment item */
+if (length > MAX_PATTERN_SIZE)
+  {
+  errorcode = ERR20;
+  goto PCRE_EARLY_ERROR_RETURN;
+  }
 
-  /* Allow space for auto callout before every item except quantifiers. */
+/* Compute the size of data block needed and get it, either from malloc or
+externally provided function. Integer overflow should no longer be possible
+because nowadays we limit the maximum value of cd->names_found and
+cd->name_entry_size. */
 
-  if ((options & PCRE_AUTO_CALLOUT) != 0 &&
-       c != '*' && c != '+' && c != '?' &&
-       (c != '{' || !is_counted_repeat(ptr + 1)))
-    length += 2 + 2*LINK_SIZE;
+size = length + sizeof(real_pcre) + cd->names_found * (cd->name_entry_size + 3);
+re = (real_pcre *)(pcre_malloc)(size);
 
-  switch(c)
-    {
-    /* A backslashed item may be an escaped data character or it may be a
-    character type. */
+if (re == NULL)
+  {
+  errorcode = ERR21;
+  goto PCRE_EARLY_ERROR_RETURN;
+  }
 
-    case '\\':
-    c = check_escape(&ptr, &errorcode, bracount, options, FALSE);
-    if (errorcode != 0) goto PCRE_ERROR_RETURN;
+/* Put in the magic number, and save the sizes, initial options, internal
+flags, and character table pointer. NULL is used for the default character
+tables. The nullpad field is at the end; it's there to help in the case when a
+regex compiled on a system with 4-byte pointers is run on another with 8-byte
+pointers. */
 
-    lastitemlength = 1;     /* Default length of last item for repeats */
+re->magic_number = MAGIC_NUMBER;
+re->size = size;
+re->options = cd->external_options;
+re->flags = cd->external_flags;
+re->dummy1 = 0;
+re->first_byte = 0;
+re->req_byte = 0;
+re->name_table_offset = sizeof(real_pcre);
+re->name_entry_size = cd->name_entry_size;
+re->name_count = cd->names_found;
+re->ref_count = 0;
+re->tables = (tables == _pcre_default_tables)? NULL : tables;
+re->nullpad = NULL;
 
-    if (c >= 0)             /* Data character */
-      {
-      length += 2;          /* For a one-byte character */
+/* The starting points of the name/number translation table and of the code are
+passed around in the compile data block. The start/end pattern and initial
+options are already set from the pre-compile phase, as is the name_entry_size
+field. Reset the bracket count and the names_found field. Also reset the hwm
+field; this time it's used for remembering forward references to subpatterns.
+*/
 
-#ifdef SUPPORT_UTF8
-      if (utf8 && c > 127)
-        {
-        int i;
-        for (i = 0; i < _pcre_utf8_table1_size; i++)
-          if (c <= _pcre_utf8_table1[i]) break;
-        length += i;
-        lastitemlength += i;
-        }
-#endif
+cd->final_bracount = cd->bracount;  /* Save for checking forward references */
+cd->bracount = 0;
+cd->names_found = 0;
+cd->name_table = (uschar *)re + re->name_table_offset;
+codestart = cd->name_table + re->name_entry_size * re->name_count;
+cd->start_code = codestart;
+cd->hwm = cworkspace;
+cd->req_varyopt = 0;
+cd->had_accept = FALSE;
 
-      continue;
-      }
+/* Set up a starting, non-extracting bracket, then compile the expression. On
+error, errorcode will be set non-zero, so we don't need to look at the result
+of the function here. */
 
-    /* If \Q, enter "literal" mode */
+ptr = (const uschar *)pattern + skipatstart;
+code = (uschar *)codestart;
+*code = OP_BRA;
+(void)compile_regex(re->options, re->options & PCRE_IMS, &code, &ptr,
+  &errorcode, FALSE, FALSE, 0, &firstbyte, &reqbyte, NULL, cd, NULL);
+re->top_bracket = cd->bracount;
+re->top_backref = cd->top_backref;
+re->flags = cd->external_flags;
 
-    if (-c == ESC_Q)
-      {
-      inescq = TRUE;
-      continue;
-      }
+if (cd->had_accept) reqbyte = -1;   /* Must disable after (*ACCEPT) */
 
-    /* \X is supported only if Unicode property support is compiled */
+/* If not reached end of pattern on success, there's an excess bracket. */
 
-#ifndef SUPPORT_UCP
-    if (-c == ESC_X)
-      {
-      errorcode = ERR45;
-      goto PCRE_ERROR_RETURN;
-      }
-#endif
+if (errorcode == 0 && *ptr != 0) errorcode = ERR22;
 
-    /* \P and \p are for Unicode properties, but only when the support has
-    been compiled. Each item needs 3 bytes. */
+/* Fill in the terminating state and check for disastrous overflow, but
+if debugging, leave the test till after things are printed out. */
 
-    else if (-c == ESC_P || -c == ESC_p)
-      {
-#ifdef SUPPORT_UCP
-      BOOL negated;
-      BOOL pdata;
-      length += 3;
-      lastitemlength = 3;
-      if (get_ucp(&ptr, &negated, &pdata, &errorcode) < 0)
-        goto PCRE_ERROR_RETURN;
-      continue;
-#else
-      errorcode = ERR45;
-      goto PCRE_ERROR_RETURN;
+*code++ = OP_END;
+
+#ifndef PCRE_DEBUG
+if (code - codestart > length) errorcode = ERR23;
 #endif
-      }
 
-    /* Other escapes need one byte */
+/* Fill in any forward references that are required. */
 
-    length++;
+while (errorcode == 0 && cd->hwm > cworkspace)
+  {
+  int offset, recno;
+  const uschar *groupptr;
+  cd->hwm -= LINK_SIZE;
+  offset = GET(cd->hwm, 0);
+  recno = GET(codestart, offset);
+  groupptr = find_bracket(codestart, (re->options & PCRE_UTF8) != 0, recno);
+  if (groupptr == NULL) errorcode = ERR53;
+    else PUT(((uschar *)codestart), offset, groupptr - codestart);
+  }
 
-    /* A back reference needs an additional 2 bytes, plus either one or 5
-    bytes for a repeat. We also need to keep the value of the highest
-    back reference. */
+/* Give an error if there's back reference to a non-existent capturing
+subpattern. */
 
-    if (c <= -ESC_REF)
-      {
-      int refnum = -c - ESC_REF;
-      cd->backref_map |= (refnum < 32)? (1 << refnum) : 1;
-      if (refnum > cd->top_backref)
-        cd->top_backref = refnum;
-      length += 2;   /* For single back reference */
-      if (ptr[1] == '{' && is_counted_repeat(ptr+2))
-        {
-        ptr = read_repeat_counts(ptr+2, &min, &max, &errorcode);
-        if (errorcode != 0) goto PCRE_ERROR_RETURN;
-        if ((min == 0 && (max == 1 || max == -1)) ||
-          (min == 1 && max == -1))
-            length++;
-        else length += 5;
-        if (ptr[1] == '?') ptr++;
-        }
-      }
-    continue;
+if (errorcode == 0 && re->top_backref > re->top_bracket) errorcode = ERR15;
 
-    case '^':     /* Single-byte metacharacters */
-    case '.':
-    case '$':
-    length++;
-    lastitemlength = 1;
-    continue;
+/* Failed to compile, or error while post-processing */
 
-    case '*':            /* These repeats won't be after brackets; */
-    case '+':            /* those are handled separately */
-    case '?':
-    length++;
-    goto POSESSIVE;      /* A few lines below */
-
-    /* This covers the cases of braced repeats after a single char, metachar,
-    class, or back reference. */
-
-    case '{':
-    if (!is_counted_repeat(ptr+1)) goto NORMAL_CHAR;
-    ptr = read_repeat_counts(ptr+1, &min, &max, &errorcode);
-    if (errorcode != 0) goto PCRE_ERROR_RETURN;
-
-    /* These special cases just insert one extra opcode */
-
-    if ((min == 0 && (max == 1 || max == -1)) ||
-      (min == 1 && max == -1))
-        length++;
+if (errorcode != 0)
+  {
+  (pcre_free)(re);
+  PCRE_EARLY_ERROR_RETURN:
+  *erroroffset = ptr - (const uschar *)pattern;
+  PCRE_EARLY_ERROR_RETURN2:
+  *errorptr = find_error_text(errorcode);
+  if (errorcodeptr != NULL) *errorcodeptr = errorcode;
+  return NULL;
+  }
 
-    /* These cases might insert additional copies of a preceding character. */
+/* If the anchored option was not passed, set the flag if we can determine that
+the pattern is anchored by virtue of ^ characters or \A or anything else (such
+as starting with .* when DOTALL is set).
 
-    else
-      {
-      if (min != 1)
-        {
-        length -= lastitemlength;   /* Uncount the original char or metachar */
-        if (min > 0) length += 3 + lastitemlength;
-        }
-      length += lastitemlength + ((max > 0)? 3 : 1);
-      }
-
-    if (ptr[1] == '?') ptr++;      /* Needs no extra length */
-
-    POSESSIVE:                     /* Test for possessive quantifier */
-    if (ptr[1] == '+')
-      {
-      ptr++;
-      length += 2 + 2*LINK_SIZE;   /* Allow for atomic brackets */
-      }
-    continue;
-
-    /* An alternation contains an offset to the next branch or ket. If any ims
-    options changed in the previous branch(es), and/or if we are in a
-    lookbehind assertion, extra space will be needed at the start of the
-    branch. This is handled by branch_extra. */
-
-    case '|':
-    length += 1 + LINK_SIZE + branch_extra;
-    continue;
-
-    /* A character class uses 33 characters provided that all the character
-    values are less than 256. Otherwise, it uses a bit map for low valued
-    characters, and individual items for others. Don't worry about character
-    types that aren't allowed in classes - they'll get picked up during the
-    compile. A character class that contains only one single-byte character
-    uses 2 or 3 bytes, depending on whether it is negated or not. Notice this
-    where we can. (In UTF-8 mode we can do this only for chars < 128.) */
-
-    case '[':
-    if (*(++ptr) == '^')
-      {
-      class_optcount = 10;  /* Greater than one */
-      ptr++;
-      }
-    else class_optcount = 0;
-
-#ifdef SUPPORT_UTF8
-    class_utf8 = FALSE;
-#endif
-
-    /* Written as a "do" so that an initial ']' is taken as data */
-
-    if (*ptr != 0) do
-      {
-      /* Inside \Q...\E everything is literal except \E */
-
-      if (inescq)
-        {
-        if (*ptr != '\\' || ptr[1] != 'E') goto GET_ONE_CHARACTER;
-        inescq = FALSE;
-        ptr += 1;
-        continue;
-        }
-
-      /* Outside \Q...\E, check for escapes */
-
-      if (*ptr == '\\')
-        {
-        c = check_escape(&ptr, &errorcode, bracount, options, TRUE);
-        if (errorcode != 0) goto PCRE_ERROR_RETURN;
-
-        /* \b is backspace inside a class; \X is literal */
-
-        if (-c == ESC_b) c = '\b';
-        else if (-c == ESC_X) c = 'X';
-
-        /* \Q enters quoting mode */
-
-        else if (-c == ESC_Q)
-          {
-          inescq = TRUE;
-          continue;
-          }
-
-        /* Handle escapes that turn into characters */
-
-        if (c >= 0) goto NON_SPECIAL_CHARACTER;
-
-        /* Escapes that are meta-things. The normal ones just affect the
-        bit map, but Unicode properties require an XCLASS extended item. */
-
-        else
-          {
-          class_optcount = 10;         /* \d, \s etc; make sure > 1 */
-#ifdef SUPPORT_UTF8
-          if (-c == ESC_p || -c == ESC_P)
-            {
-            if (!class_utf8)
-              {
-              class_utf8 = TRUE;
-              length += LINK_SIZE + 2;
-              }
-            length += 3;
-            }
-#endif
-          }
-        }
-
-      /* Check the syntax for POSIX stuff. The bits we actually handle are
-      checked during the real compile phase. */
-
-      else if (*ptr == '[' &&
-                (ptr[1] == ':' || ptr[1] == '.' || ptr[1] == '=') &&
-                check_posix_syntax(ptr, &ptr, cd))
-        {
-        ptr++;
-        class_optcount = 10;    /* Make sure > 1 */
-        }
-
-      /* Anything else increments the possible optimization count. We have to
-      detect ranges here so that we can compute the number of extra ranges for
-      caseless wide characters when UCP support is available. If there are wide
-      characters, we are going to have to use an XCLASS, even for single
-      characters. */
-
-      else
-        {
-        int d;
-
-        GET_ONE_CHARACTER:
-
-#ifdef SUPPORT_UTF8
-        if (utf8)
-          {
-          int extra = 0;
-          GETCHARLEN(c, ptr, extra);
-          ptr += extra;
-          }
-        else c = *ptr;
-#else
-        c = *ptr;
-#endif
-
-        /* Come here from handling \ above when it escapes to a char value */
-
-        NON_SPECIAL_CHARACTER:
-        class_optcount++;
-
-        d = -1;
-        if (ptr[1] == '-')
-          {
-          uschar const *hyptr = ptr++;
-          if (ptr[1] == '\\')
-            {
-            ptr++;
-            d = check_escape(&ptr, &errorcode, bracount, options, TRUE);
-            if (errorcode != 0) goto PCRE_ERROR_RETURN;
-            if (-d == ESC_b) d = '\b';        /* backspace */
-            else if (-d == ESC_X) d = 'X';    /* literal X in a class */
-            }
-          else if (ptr[1] != 0 && ptr[1] != ']')
-            {
-            ptr++;
-#ifdef SUPPORT_UTF8
-            if (utf8)
-              {
-              int extra = 0;
-              GETCHARLEN(d, ptr, extra);
-              ptr += extra;
-              }
-            else
-#endif
-            d = *ptr;
-            }
-          if (d < 0) ptr = hyptr;      /* go back to hyphen as data */
-          }
-
-        /* If d >= 0 we have a range. In UTF-8 mode, if the end is > 255, or >
-        127 for caseless matching, we will need to use an XCLASS. */
-
-        if (d >= 0)
-          {
-          class_optcount = 10;     /* Ensure > 1 */
-          if (d < c)
-            {
-            errorcode = ERR8;
-            goto PCRE_ERROR_RETURN;
-            }
-
-#ifdef SUPPORT_UTF8
-          if (utf8 && (d > 255 || ((options & PCRE_CASELESS) != 0 && d > 127)))
-            {
-            uschar buffer[6];
-            if (!class_utf8)         /* Allow for XCLASS overhead */
-              {
-              class_utf8 = TRUE;
-              length += LINK_SIZE + 2;
-              }
-
-#ifdef SUPPORT_UCP
-            /* If we have UCP support, find out how many extra ranges are
-            needed to map the other case of characters within this range. We
-            have to mimic the range optimization here, because extending the
-            range upwards might push d over a boundary that makes is use
-            another byte in the UTF-8 representation. */
-
-            if ((options & PCRE_CASELESS) != 0)
-              {
-              int occ, ocd;
-              int cc = c;
-              int origd = d;
-              while (get_othercase_range(&cc, origd, &occ, &ocd))
-                {
-                if (occ >= c && ocd <= d) continue;   /* Skip embedded */
-
-                if (occ < c  && ocd >= c - 1)  /* Extend the basic range */
-                  {                            /* if there is overlap,   */
-                  c = occ;                     /* noting that if occ < c */
-                  continue;                    /* we can't have ocd > d  */
-                  }                            /* because a subrange is  */
-                if (ocd > d && occ <= d + 1)   /* always shorter than    */
-                  {                            /* the basic range.       */
-                  d = ocd;
-                  continue;
-                  }
-
-                /* An extra item is needed */
-
-                length += 1 + _pcre_ord2utf8(occ, buffer) +
-                  ((occ == ocd)? 0 : _pcre_ord2utf8(ocd, buffer));
-                }
-              }
-#endif  /* SUPPORT_UCP */
-
-            /* The length of the (possibly extended) range */
-
-            length += 1 + _pcre_ord2utf8(c, buffer) + _pcre_ord2utf8(d, buffer);
-            }
-#endif  /* SUPPORT_UTF8 */
-
-          }
-
-        /* We have a single character. There is nothing to be done unless we
-        are in UTF-8 mode. If the char is > 255, or 127 when caseless, we must
-        allow for an XCL_SINGLE item, doubled for caselessness if there is UCP
-        support. */
-
-        else
-          {
-#ifdef SUPPORT_UTF8
-          if (utf8 && (c > 255 || ((options & PCRE_CASELESS) != 0 && c > 127)))
-            {
-            uschar buffer[6];
-            class_optcount = 10;     /* Ensure > 1 */
-            if (!class_utf8)         /* Allow for XCLASS overhead */
-              {
-              class_utf8 = TRUE;
-              length += LINK_SIZE + 2;
-              }
-#ifdef SUPPORT_UCP
-            length += (((options & PCRE_CASELESS) != 0)? 2 : 1) *
-              (1 + _pcre_ord2utf8(c, buffer));
-#else   /* SUPPORT_UCP */
-            length += 1 + _pcre_ord2utf8(c, buffer);
-#endif  /* SUPPORT_UCP */
-            }
-#endif  /* SUPPORT_UTF8 */
-          }
-        }
-      }
-    while (*(++ptr) != 0 && (inescq || *ptr != ']')); /* Concludes "do" above */
-
-    if (*ptr == 0)                          /* Missing terminating ']' */
-      {
-      errorcode = ERR6;
-      goto PCRE_ERROR_RETURN;
-      }
-
-    /* We can optimize when there was only one optimizable character. Repeats
-    for positive and negated single one-byte chars are handled by the general
-    code. Here, we handle repeats for the class opcodes. */
-
-    if (class_optcount == 1) length += 3; else
-      {
-      length += 33;
-
-      /* A repeat needs either 1 or 5 bytes. If it is a possessive quantifier,
-      we also need extra for wrapping the whole thing in a sub-pattern. */
-
-      if (*ptr != 0 && ptr[1] == '{' && is_counted_repeat(ptr+2))
-        {
-        ptr = read_repeat_counts(ptr+2, &min, &max, &errorcode);
-        if (errorcode != 0) goto PCRE_ERROR_RETURN;
-        if ((min == 0 && (max == 1 || max == -1)) ||
-          (min == 1 && max == -1))
-            length++;
-        else length += 5;
-        if (ptr[1] == '+')
-          {
-          ptr++;
-          length += 2 + 2*LINK_SIZE;
-          }
-        else if (ptr[1] == '?') ptr++;
-        }
-      }
-    continue;
-
-    /* Brackets may be genuine groups or special things */
-
-    case '(':
-    branch_newextra = 0;
-    bracket_length = 1 + LINK_SIZE;
-    capturing = FALSE;
-
-    /* Handle special forms of bracket, which all start (? */
-
-    if (ptr[1] == '?')
-      {
-      int set, unset;
-      int *optset;
-
-      switch (c = ptr[2])
-        {
-        /* Skip over comments entirely */
-        case '#':
-        ptr += 3;
-        while (*ptr != 0 && *ptr != ')') ptr++;
-        if (*ptr == 0)
-          {
-          errorcode = ERR18;
-          goto PCRE_ERROR_RETURN;
-          }
-        continue;
-
-        /* Non-referencing groups and lookaheads just move the pointer on, and
-        then behave like a non-special bracket, except that they don't increment
-        the count of extracting brackets. Ditto for the "once only" bracket,
-        which is in Perl from version 5.005. */
-
-        case ':':
-        case '=':
-        case '!':
-        case '>':
-        ptr += 2;
-        break;
-
-        /* Named subpatterns are an extension copied from Python */
-
-        case 'P':
-        ptr += 3;
-
-        /* Handle the definition of a named subpattern */
-
-        if (*ptr == '<')
-          {
-          const uschar *p;    /* Don't amalgamate; some compilers */
-          p = ++ptr;          /* grumble at autoincrement in declaration */
-          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
-          if (*ptr != '>')
-            {
-            errorcode = ERR42;
-            goto PCRE_ERROR_RETURN;
-            }
-          name_count++;
-          if (name_count > MAX_NAME_COUNT)
-            {
-            errorcode = ERR49;
-            goto PCRE_ERROR_RETURN;
-            }
-          if (ptr - p > max_name_size)
-            {
-            max_name_size = (ptr - p);
-            if (max_name_size > MAX_NAME_SIZE)
-              {
-              errorcode = ERR48;
-              goto PCRE_ERROR_RETURN;
-              }
-            }
-          capturing = TRUE;   /* Named parentheses are always capturing */
-          break;              /* Go handle capturing parentheses */
-          }
-
-        /* Handle back references and recursive calls to named subpatterns */
-
-        if (*ptr == '=' || *ptr == '>')
-          {
-          length += 3 + 3*LINK_SIZE;  /* Allow for the automatic "once" */
-          while ((cd->ctypes[*(++ptr)] & ctype_word) != 0);
-          if (*ptr != ')')
-            {
-            errorcode = ERR42;
-            goto PCRE_ERROR_RETURN;
-            }
-          goto RECURSE_CHECK_QUANTIFIED;
-          }
-
-        /* Unknown character after (?P */
-
-        errorcode = ERR41;
-        goto PCRE_ERROR_RETURN;
-
-        /* (?R) specifies a recursive call to the regex, which is an extension
-        to provide the facility which can be obtained by (?p{perl-code}) in
-        Perl 5.6. In Perl 5.8 this has become (??{perl-code}).
-
-        From PCRE 4.00, items such as (?3) specify subroutine-like "calls" to
-        the appropriate numbered brackets. This includes both recursive and
-        non-recursive calls. (?R) is now synonymous with (?0). */
-
-        case 'R':
-        ptr++;
-
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        ptr += 2;
-        if (c != 'R')
-          while ((digitab[*(++ptr)] & ctype_digit) != 0);
-        if (*ptr != ')')
-          {
-          errorcode = ERR29;
-          goto PCRE_ERROR_RETURN;
-          }
-        length += 3 + 3*LINK_SIZE;  /* Allows for the automatic "once" */
-
-        /* If this item is quantified, it will get wrapped inside brackets so
-        as to use the code for quantified brackets. We jump down and use the
-        code that handles this for real brackets. Come here from code for
-        named recursions/subroutines. */
-
-        RECURSE_CHECK_QUANTIFIED:
-        if (ptr[1] == '+' || ptr[1] == '*' || ptr[1] == '?' || ptr[1] == '{')
-          {
-          length += 2 + 2 * LINK_SIZE;       /* to make bracketed */
-          duplength = 5 + 3 * LINK_SIZE;
-          goto HANDLE_QUANTIFIED_BRACKETS;
-          }
-        continue;
-
-        /* (?C) is an extension which provides "callout" - to provide a bit of
-        the functionality of the Perl (?{...}) feature. An optional number may
-        follow (default is zero). */
-
-        case 'C':
-        ptr += 2;
-        while ((digitab[*(++ptr)] & ctype_digit) != 0);
-        if (*ptr != ')')
-          {
-          errorcode = ERR39;
-          goto PCRE_ERROR_RETURN;
-          }
-        length += 2 + 2*LINK_SIZE;
-        continue;
-
-        /* Lookbehinds are in Perl from version 5.005 */
-
-        case '<':
-        ptr += 3;
-        if (*ptr == '=' || *ptr == '!')
-          {
-          branch_newextra = 1 + LINK_SIZE;
-          length += 1 + LINK_SIZE;         /* For the first branch */
-          break;
-          }
-        errorcode = ERR24;
-        goto PCRE_ERROR_RETURN;
-
-        /* Conditionals are in Perl from version 5.005. The bracket must either
-        be followed by a number (for bracket reference) or by an assertion
-        group. PCRE extends this by allowing a name to reference a named group;
-        unfortunately, previously 'R' was implemented for a recursion test.
-        When this is compiled, we look for the named group 'R' first. At this
-        point we just do a basic syntax check. */
-
-        case '(':
-        if ((cd->ctypes[ptr[3]] & ctype_word) != 0)
-          {
-          ptr += 4;
-          length += 3;
-          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
-          if (*ptr != ')')
-            {
-            errorcode = ERR26;
-            goto PCRE_ERROR_RETURN;
-            }
-          }
-        else   /* An assertion must follow */
-          {
-          ptr++;   /* Can treat like ':' as far as spacing is concerned */
-          if (ptr[2] != '?' ||
-             (ptr[3] != '=' && ptr[3] != '!' && ptr[3] != '<') )
-            {
-            ptr += 2;    /* To get right offset in message */
-            errorcode = ERR28;
-            goto PCRE_ERROR_RETURN;
-            }
-          }
-        break;
-
-        /* Else loop checking valid options until ) is met. Anything else is an
-        error. If we are without any brackets, i.e. at top level, the settings
-        act as if specified in the options, so massage the options immediately.
-        This is for backward compatibility with Perl 5.004. */
-
-        default:
-        set = unset = 0;
-        optset = &set;
-        ptr += 2;
-
-        for (;; ptr++)
-          {
-          c = *ptr;
-          switch (c)
-            {
-            case 'i':
-            *optset |= PCRE_CASELESS;
-            continue;
-
-            case 'J':
-            *optset |= PCRE_DUPNAMES;
-            options |= PCRE_JCHANGED;   /* Record that it changed */
-            continue;
-
-            case 'm':
-            *optset |= PCRE_MULTILINE;
-            continue;
-
-            case 's':
-            *optset |= PCRE_DOTALL;
-            continue;
-
-            case 'x':
-            *optset |= PCRE_EXTENDED;
-            continue;
-
-            case 'X':
-            *optset |= PCRE_EXTRA;
-            continue;
-
-            case 'U':
-            *optset |= PCRE_UNGREEDY;
-            continue;
-
-            case '-':
-            optset = &unset;
-            continue;
-
-            /* A termination by ')' indicates an options-setting-only item; if
-            this is at the very start of the pattern (indicated by item_count
-            being zero), we use it to set the global options. This is helpful
-            when analyzing the pattern for first characters, etc. Otherwise
-            nothing is done here and it is handled during the compiling
-            process.
-
-            We allow for more than one options setting at the start. If such
-            settings do not change the existing options, nothing is compiled.
-            However, we must leave space just in case something is compiled.
-            This can happen for pathological sequences such as (?i)(?-i)
-            because the global options will end up with -i set. The space is
-            small and not significant. (Before I did this there was a reported
-            bug with (?i)(?-i) in a machine-generated pattern.)
-
-            [Historical note: Up to Perl 5.8, options settings at top level
-            were always global settings, wherever they appeared in the pattern.
-            That is, they were equivalent to an external setting. From 5.8
-            onwards, they apply only to what follows (which is what you might
-            expect).] */
-
-            case ')':
-            if (item_count == 0)
-              {
-              options = (options | set) & (~unset);
-              set = unset = 0;     /* To save length */
-              item_count--;        /* To allow for several */
-              length += 2;
-              }
-
-            /* Fall through */
-
-            /* A termination by ':' indicates the start of a nested group with
-            the given options set. This is again handled at compile time, but
-            we must allow for compiled space if any of the ims options are
-            set. We also have to allow for resetting space at the end of
-            the group, which is why 4 is added to the length and not just 2.
-            If there are several changes of options within the same group, this
-            will lead to an over-estimate on the length, but this shouldn't
-            matter very much. We also have to allow for resetting options at
-            the start of any alternations, which we do by setting
-            branch_newextra to 2. */
-
-            case ':':
-            if (((set|unset) & PCRE_IMS) != 0)
-              {
-              length += 4;
-              branch_newextra = 2;
-              }
-            goto END_OPTIONS;
-
-            /* Unrecognized option character */
-
-            default:
-            errorcode = ERR12;
-            goto PCRE_ERROR_RETURN;
-            }
-          }
-
-        /* If we hit a closing bracket, that's it - this is a freestanding
-        option-setting. We need to ensure that branch_extra is updated if
-        necessary. The only values branch_newextra can have here are 0 or 2.
-        If the value is 2, then branch_extra must either be 2 or 5, depending
-        on whether this is a lookbehind group or not. */
-
-        END_OPTIONS:
-        if (c == ')')
-          {
-          if (branch_newextra == 2 &&
-              (branch_extra == 0 || branch_extra == 1+LINK_SIZE))
-            branch_extra += branch_newextra;
-          continue;
-          }
-
-        /* If options were terminated by ':' control comes here. This is a
-        non-capturing group with an options change. There is nothing more that
-        needs to be done because "capturing" is already set FALSE by default;
-        we can just fall through. */
-
-        }
-      }
-
-    /* Ordinary parentheses, not followed by '?', are capturing unless
-    PCRE_NO_AUTO_CAPTURE is set. */
-
-    else capturing = (options & PCRE_NO_AUTO_CAPTURE) == 0;
-
-    /* Capturing brackets must be counted so we can process escapes in a
-    Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to need
-    an additional 3 bytes of memory per capturing bracket. */
-
-    if (capturing)
-      {
-      bracount++;
-      if (bracount > EXTRACT_BASIC_MAX) bracket_length += 3;
-      }
-
-    /* Save length for computing whole length at end if there's a repeat that
-    requires duplication of the group. Also save the current value of
-    branch_extra, and start the new group with the new value. If non-zero, this
-    will either be 2 for a (?imsx: group, or 3 for a lookbehind assertion. */
-
-    if (brastackptr >= sizeof(brastack)/sizeof(int))
-      {
-      errorcode = ERR19;
-      goto PCRE_ERROR_RETURN;
-      }
-
-    bralenstack[brastackptr] = branch_extra;
-    branch_extra = branch_newextra;
-
-    brastack[brastackptr++] = length;
-    length += bracket_length;
-    continue;
-
-    /* Handle ket. Look for subsequent max/min; for certain sets of values we
-    have to replicate this bracket up to that many times. If brastackptr is
-    0 this is an unmatched bracket which will generate an error, but take care
-    not to try to access brastack[-1] when computing the length and restoring
-    the branch_extra value. */
-
-    case ')':
-    length += 1 + LINK_SIZE;
-    if (brastackptr > 0)
-      {
-      duplength = length - brastack[--brastackptr];
-      branch_extra = bralenstack[brastackptr];
-      /* This is a paranoid check to stop integer overflow later on */
-      if (duplength > MAX_DUPLENGTH)
-        {
-        errorcode = ERR50;
-        goto PCRE_ERROR_RETURN;
-        }
-      }
-    else duplength = 0;
-
-    /* The following code is also used when a recursion such as (?3) is
-    followed by a quantifier, because in that case, it has to be wrapped inside
-    brackets so that the quantifier works. The value of duplength must be
-    set before arrival. */
-
-    HANDLE_QUANTIFIED_BRACKETS:
-
-    /* Leave ptr at the final char; for read_repeat_counts this happens
-    automatically; for the others we need an increment. */
-
-    if ((c = ptr[1]) == '{' && is_counted_repeat(ptr+2))
-      {
-      ptr = read_repeat_counts(ptr+2, &min, &max, &errorcode);
-      if (errorcode != 0) goto PCRE_ERROR_RETURN;
-      }
-    else if (c == '*') { min = 0; max = -1; ptr++; }
-    else if (c == '+') { min = 1; max = -1; ptr++; }
-    else if (c == '?') { min = 0; max = 1;  ptr++; }
-    else { min = 1; max = 1; }
-
-    /* If the minimum is zero, we have to allow for an OP_BRAZERO before the
-    group, and if the maximum is greater than zero, we have to replicate
-    maxval-1 times; each replication acquires an OP_BRAZERO plus a nesting
-    bracket set. */
-
-    if (min == 0)
-      {
-      length++;
-      if (max > 0) length += (max - 1) * (duplength + 3 + 2*LINK_SIZE);
-      }
-
-    /* When the minimum is greater than zero, we have to replicate up to
-    minval-1 times, with no additions required in the copies. Then, if there
-    is a limited maximum we have to replicate up to maxval-1 times allowing
-    for a BRAZERO item before each optional copy and nesting brackets for all
-    but one of the optional copies. */
-
-    else
-      {
-      length += (min - 1) * duplength;
-      if (max > min)   /* Need this test as max=-1 means no limit */
-        length += (max - min) * (duplength + 3 + 2*LINK_SIZE)
-          - (2 + 2*LINK_SIZE);
-      }
-
-    /* Allow space for once brackets for "possessive quantifier" */
-
-    if (ptr[1] == '+')
-      {
-      ptr++;
-      length += 2 + 2*LINK_SIZE;
-      }
-    continue;
-
-    /* Non-special character. It won't be space or # in extended mode, so it is
-    always a genuine character. If we are in a \Q...\E sequence, check for the
-    end; if not, we have a literal. */
-
-    default:
-    NORMAL_CHAR:
-
-    if (inescq && c == '\\' && ptr[1] == 'E')
-      {
-      inescq = FALSE;
-      ptr++;
-      continue;
-      }
-
-    length += 2;          /* For a one-byte character */
-    lastitemlength = 1;   /* Default length of last item for repeats */
-
-    /* In UTF-8 mode, check for additional bytes. */
-
-#ifdef SUPPORT_UTF8
-    if (utf8 && (c & 0xc0) == 0xc0)
-      {
-      while ((ptr[1] & 0xc0) == 0x80)         /* Can't flow over the end */
-        {                                     /* because the end is marked */
-        lastitemlength++;                     /* by a zero byte. */
-        length++;
-        ptr++;
-        }
-      }
-#endif
-
-    continue;
-    }
-  }
-
-length += 2 + LINK_SIZE;    /* For final KET and END */
-
-if ((options & PCRE_AUTO_CALLOUT) != 0)
-  length += 2 + 2*LINK_SIZE;  /* For final callout */
-
-if (length > MAX_PATTERN_SIZE)
-  {
-  errorcode = ERR20;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* Compute the size of data block needed and get it, either from malloc or
-externally provided function. Integer overflow should no longer be possible
-because nowadays we limit the maximum value of name_count and max_name size. */
-
-size = length + sizeof(real_pcre) + name_count * (max_name_size + 3);
-re = (real_pcre *)(pcre_malloc)(size);
-
-if (re == NULL)
-  {
-  errorcode = ERR21;
-  goto PCRE_EARLY_ERROR_RETURN;
-  }
-
-/* Put in the magic number, and save the sizes, options, and character table
-pointer. NULL is used for the default character tables. The nullpad field is at
-the end; it's there to help in the case when a regex compiled on a system with
-4-byte pointers is run on another with 8-byte pointers. */
-
-re->magic_number = MAGIC_NUMBER;
-re->size = size;
-re->options = options;
-re->dummy1 = 0;
-re->name_table_offset = sizeof(real_pcre);
-re->name_entry_size = max_name_size + 3;
-re->name_count = name_count;
-re->ref_count = 0;
-re->tables = (tables == _pcre_default_tables)? NULL : tables;
-re->nullpad = NULL;
-
-/* The starting points of the name/number translation table and of the code are
-passed around in the compile data block. */
-
-cd->names_found = 0;
-cd->name_entry_size = max_name_size + 3;
-cd->name_table = (uschar *)re + re->name_table_offset;
-codestart = cd->name_table + re->name_entry_size * re->name_count;
-cd->start_code = codestart;
-cd->start_pattern = (const uschar *)pattern;
-cd->req_varyopt = 0;
-cd->nopartial = FALSE;
-
-/* Set up a starting, non-extracting bracket, then compile the expression. On
-error, errorcode will be set non-zero, so we don't need to look at the result
-of the function here. */
-
-ptr = (const uschar *)pattern;
-code = (uschar *)codestart;
-*code = OP_BRA;
-bracount = 0;
-(void)compile_regex(options, options & PCRE_IMS, &bracount, &code, &ptr,
-  &errorcode, FALSE, 0, &firstbyte, &reqbyte, NULL, cd);
-re->top_bracket = bracount;
-re->top_backref = cd->top_backref;
-
-if (cd->nopartial) re->options |= PCRE_NOPARTIAL;
-
-/* If not reached end of pattern on success, there's an excess bracket. */
-
-if (errorcode == 0 && *ptr != 0) errorcode = ERR22;
-
-/* Fill in the terminating state and check for disastrous overflow, but
-if debugging, leave the test till after things are printed out. */
-
-*code++ = OP_END;
-
-#ifndef PCRE_DEBUG
-if (code - codestart > length) errorcode = ERR23;
-#endif
-
-/* Give an error if there's back reference to a non-existent capturing
-subpattern. */
-
-if (re->top_backref > re->top_bracket) errorcode = ERR15;
-
-/* Failed to compile, or error while post-processing */
-
-if (errorcode != 0)
-  {
-  (pcre_free)(re);
-  PCRE_ERROR_RETURN:
-  *erroroffset = ptr - (const uschar *)pattern;
-  PCRE_EARLY_ERROR_RETURN:
-  *errorptr = error_texts[errorcode];
-  if (errorcodeptr != NULL) *errorcodeptr = errorcode;
-  return NULL;
-  }
-
-/* If the anchored option was not passed, set the flag if we can determine that
-the pattern is anchored by virtue of ^ characters or \A or anything else (such
-as starting with .* when DOTALL is set).
-
-Otherwise, if we know what the first character has to be, save it, because that
+Otherwise, if we know what the first byte has to be, save it, because that
 speeds up unanchored matches no end. If not, see if we can set the
 PCRE_STARTLINE flag. This is helpful for multiline matches when all branches
 start with ^. and also when all branches start with .* for non-DOTALL matches.
 */
 
-if ((options & PCRE_ANCHORED) == 0)
+if ((re->options & PCRE_ANCHORED) == 0)
   {
-  int temp_options = options;
+  int temp_options = re->options;   /* May get changed during these scans */
   if (is_anchored(codestart, &temp_options, 0, cd->backref_map))
     re->options |= PCRE_ANCHORED;
   else
@@ -5200,10 +6536,10 @@
       int ch = firstbyte & 255;
       re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&
          cd->fcc[ch] == ch)? ch : firstbyte;
-      re->options |= PCRE_FIRSTSET;
+      re->flags |= PCRE_FIRSTSET;
       }
     else if (is_startline(codestart, 0, cd->backref_map))
-      re->options |= PCRE_STARTLINE;
+      re->flags |= PCRE_STARTLINE;
     }
   }
 
@@ -5217,7 +6553,7 @@
   int ch = reqbyte & 255;
   re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&
     cd->fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;
-  re->options |= PCRE_REQCHSET;
+  re->flags |= PCRE_REQCHSET;
   }
 
 /* Print out the compiled data if debugging is enabled. This is never the
@@ -5228,21 +6564,9 @@
 printf("Length = %d top_bracket = %d top_backref = %d\n",
   length, re->top_bracket, re->top_backref);
 
-if (re->options != 0)
-  {
-  printf("%s%s%s%s%s%s%s%s%s\n",
-    ((re->options & PCRE_NOPARTIAL) != 0)? "nopartial " : "",
-    ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "",
-    ((re->options & PCRE_CASELESS) != 0)? "caseless " : "",
-    ((re->options & PCRE_EXTENDED) != 0)? "extended " : "",
-    ((re->options & PCRE_MULTILINE) != 0)? "multiline " : "",
-    ((re->options & PCRE_DOTALL) != 0)? "dotall " : "",
-    ((re->options & PCRE_DOLLAR_ENDONLY) != 0)? "endonly " : "",
-    ((re->options & PCRE_EXTRA) != 0)? "extra " : "",
-    ((re->options & PCRE_UNGREEDY) != 0)? "ungreedy " : "");
-  }
+printf("Options=%08x\n", re->options);
 
-if ((re->options & PCRE_FIRSTSET) != 0)
+if ((re->flags & PCRE_FIRSTSET) != 0)
   {
   int ch = re->first_byte & 255;
   const char *caseless = ((re->first_byte & REQ_CASELESS) == 0)?
@@ -5251,7 +6575,7 @@
     else printf("First char = \\x%02x%s\n", ch, caseless);
   }
 
-if ((re->options & PCRE_REQCHSET) != 0)
+if ((re->flags & PCRE_REQCHSET) != 0)
   {
   int ch = re->req_byte & 255;
   const char *caseless = ((re->req_byte & REQ_CASELESS) == 0)?
@@ -5260,7 +6584,7 @@
     else printf("Req char = \\x%02x%s\n", ch, caseless);
   }
 
-pcre_printint(re, stdout);
+pcre_printint(re, stdout, TRUE);
 
 /* This check is done here in the debugging case so that the code that
 was compiled can be seen. */
@@ -5268,12 +6592,12 @@
 if (code - codestart > length)
   {
   (pcre_free)(re);
-  *errorptr = error_texts[ERR23];
+  *errorptr = find_error_text(ERR23);
   *erroroffset = ptr - (uschar *)pattern;
   if (errorcodeptr != NULL) *errorcodeptr = ERR23;
   return NULL;
   }
-#endif
+#endif   /* PCRE_DEBUG */
 
 return (pcre *)re;
 }

Modified: freeswitch/trunk/libs/pcre/pcre_config.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_config.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_config.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,10 @@
 /* This module contains the external function pcre_config(). */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -58,7 +62,7 @@
 Returns:           0 if data returned, negative on error
 */
 
-PCRE_DATA_SCOPE int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_config(int what, void *where)
 {
 switch (what)
@@ -83,6 +87,14 @@
   *((int *)where) = NEWLINE;
   break;
 
+  case PCRE_CONFIG_BSR:
+#ifdef BSR_ANYCRLF
+  *((int *)where) = 1;
+#else
+  *((int *)where) = 0;
+#endif
+  break;
+
   case PCRE_CONFIG_LINK_SIZE:
   *((int *)where) = LINK_SIZE;
   break;
@@ -92,11 +104,11 @@
   break;
 
   case PCRE_CONFIG_MATCH_LIMIT:
-  *((unsigned int *)where) = MATCH_LIMIT;
+  *((unsigned long int *)where) = MATCH_LIMIT;
   break;
 
   case PCRE_CONFIG_MATCH_LIMIT_RECURSION:
-  *((unsigned int *)where) = MATCH_LIMIT_RECURSION;
+  *((unsigned long int *)where) = MATCH_LIMIT_RECURSION;
   break;
 
   case PCRE_CONFIG_STACKRECURSE:

Modified: freeswitch/trunk/libs/pcre/pcre_dfa_exec.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_dfa_exec.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_dfa_exec.c	Mon Jun  8 18:51:30 2009
@@ -3,10 +3,11 @@
 *************************************************/
 
 /* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
+and semantics are as close as possible to those of the Perl 5 language (but see
+below for why this module is different).
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -39,11 +40,19 @@
 
 
 /* This module contains the external function pcre_dfa_exec(), which is an
-alternative matching function that uses a DFA algorithm. This is NOT Perl-
-compatible, but it has advantages in certain applications. */
+alternative matching function that uses a sort of DFA algorithm (not a true
+FSM). This is NOT Perl- compatible, but it has advantages in certain
+applications. */
 
 
-#define NLBLOCK md           /* The block containing newline information */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define NLBLOCK md             /* Block containing newline information */
+#define PSSTART start_subject  /* Field containing processed string start */
+#define PSEND   end_subject    /* Field containing processed string end */
+
 #include "pcre_internal.h"
 
 
@@ -52,30 +61,36 @@
 #define SP "                   "
 
 
-
 /*************************************************
 *      Code parameters and static tables         *
 *************************************************/
 
 /* These are offsets that are used to turn the OP_TYPESTAR and friends opcodes
-into others, under special conditions. A gap of 10 between the blocks should be
-enough. */
-
-#define OP_PROP_EXTRA    (EXTRACT_BASIC_MAX+1)
-#define OP_EXTUNI_EXTRA  (EXTRACT_BASIC_MAX+11)
+into others, under special conditions. A gap of 20 between the blocks should be
+enough. The resulting opcodes don't have to be less than 256 because they are
+never stored, so we push them well clear of the normal opcodes. */
+
+#define OP_PROP_EXTRA       300
+#define OP_EXTUNI_EXTRA     320
+#define OP_ANYNL_EXTRA      340
+#define OP_HSPACE_EXTRA     360
+#define OP_VSPACE_EXTRA     380
 
 
 /* This table identifies those opcodes that are followed immediately by a
 character that is to be tested in some way. This makes is possible to
 centralize the loading of these characters. In the case of Type * etc, the
 "character" is the opcode for \D, \d, \S, \s, \W, or \w, which will always be a
-small value. */
+small value. ***NOTE*** If the start of this table is modified, the two tables
+that follow must also be modified. */
 
-static uschar coptable[] = {
+static const uschar coptable[] = {
   0,                             /* End                                    */
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* \A, \G, \B, \b, \D, \d, \S, \s, \W, \w */
-  0, 0,                          /* Any, Anybyte                           */
+  0, 0, 0, 0, 0,                 /* \A, \G, \K, \B, \b                     */
+  0, 0, 0, 0, 0, 0,              /* \D, \d, \S, \s, \W, \w                 */
+  0, 0, 0,                       /* Any, AllAny, Anybyte                   */
   0, 0, 0,                       /* NOTPROP, PROP, EXTUNI                  */
+  0, 0, 0, 0, 0,                 /* \R, \H, \h, \V, \v                     */
   0, 0, 0, 0, 0,                 /* \Z, \z, Opt, ^, $                      */
   1,                             /* Char                                   */
   1,                             /* Charnc                                 */
@@ -83,12 +98,15 @@
   /* Positive single-char repeats                                          */
   1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */
   3, 3, 3,                       /* upto, minupto, exact                   */
+  1, 1, 1, 3,                    /* *+, ++, ?+, upto+                      */
   /* Negative single-char repeats - only for chars < 256                   */
   1, 1, 1, 1, 1, 1,              /* NOT *, *?, +, +?, ?, ??                */
   3, 3, 3,                       /* NOT upto, minupto, exact               */
+  1, 1, 1, 3,                    /* NOT *+, ++, ?+, updo+                  */
   /* Positive type repeats                                                 */
   1, 1, 1, 1, 1, 1,              /* Type *, *?, +, +?, ?, ??               */
   3, 3, 3,                       /* Type upto, minupto, exact              */
+  1, 1, 1, 3,                    /* Type *+, ++, ?+, upto+                 */
   /* Character class & ref repeats                                         */
   0, 0, 0, 0, 0, 0,              /* *, *?, +, +?, ?, ??                    */
   0, 0,                          /* CRRANGE, CRMINRANGE                    */
@@ -107,31 +125,33 @@
   0,                             /* Assert behind                          */
   0,                             /* Assert behind not                      */
   0,                             /* Reverse                                */
-  0,                             /* Once                                   */
-  0,                             /* COND                                   */
+  0, 0, 0, 0,                    /* ONCE, BRA, CBRA, COND                  */
+  0, 0, 0,                       /* SBRA, SCBRA, SCOND                     */
   0,                             /* CREF                                   */
+  0,                             /* RREF                                   */
+  0,                             /* DEF                                    */
   0, 0,                          /* BRAZERO, BRAMINZERO                    */
-  0,                             /* BRANUMBER                              */
-  0                              /* BRA                                    */
+  0, 0, 0, 0,                    /* PRUNE, SKIP, THEN, COMMIT              */
+  0, 0, 0                        /* FAIL, ACCEPT, SKIPZERO                 */
 };
 
 /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,
 and \w */
 
-static uschar toptable1[] = {
-  0, 0, 0, 0, 0,
+static const uschar toptable1[] = {
+  0, 0, 0, 0, 0, 0,
   ctype_digit, ctype_digit,
   ctype_space, ctype_space,
   ctype_word,  ctype_word,
-  0                               /* OP_ANY */
+  0, 0                            /* OP_ANY, OP_ALLANY */
 };
 
-static uschar toptable2[] = {
-  0, 0, 0, 0, 0,
+static const uschar toptable2[] = {
+  0, 0, 0, 0, 0, 0,
   ctype_digit, 0,
   ctype_space, 0,
   ctype_word,  0,
-  1                               /* OP_ANY */
+  1, 1                            /* OP_ANY, OP_ALLANY */
 };
 
 
@@ -203,8 +223,8 @@
   rlevel            function call recursion level
   recursing         regex recursive call level
 
-Returns:            > 0 =>
-                    = 0 =>
+Returns:            > 0 => number of match offset pairs placed in offsets
+                    = 0 => offsets overflowed; longest matches are present
                      -1 => failed to match
                    < -1 => some kind of unexpected problem
 
@@ -278,7 +298,7 @@
 
 const uschar *ctypes, *lcc, *fcc;
 const uschar *ptr;
-const uschar *end_code;
+const uschar *end_code, *first_op;
 
 int active_count, new_count, match_count;
 
@@ -291,6 +311,8 @@
 
 #ifdef SUPPORT_UTF8
 BOOL utf8 = (md->poptions & PCRE_UTF8) != 0;
+#else
+BOOL utf8 = FALSE;
 #endif
 
 rlevel++;
@@ -314,6 +336,9 @@
 next_new_state = new_states = active_states + wscount;
 new_count = 0;
 
+first_op = this_start_code + 1 + LINK_SIZE +
+  ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA)? 2:0);
+
 /* The first thing in any (sub) pattern is a bracket of some sort. Push all
 the alternative states onto the list, and find out where the end is. This
 makes is possible to use this function recursively, when we want to stop at a
@@ -323,7 +348,7 @@
 a backward assertion. In that case, we have to find out the maximum amount to
 move back, and set up each alternative appropriately. */
 
-if (this_start_code[1+LINK_SIZE] == OP_REVERSE)
+if (*first_op == OP_REVERSE)
   {
   int max_back = 0;
   int gone_back;
@@ -405,10 +430,13 @@
 
   else
     {
+    int length = 1 + LINK_SIZE +
+      ((*this_start_code == OP_CBRA || *this_start_code == OP_SCBRA)? 2:0);
     do
       {
-      ADD_NEW(end_code - start_code + 1 + LINK_SIZE, 0);
+      ADD_NEW(end_code - start_code + length, 0);
       end_code += GET(end_code, 1);
+      length = 1 + LINK_SIZE;
       }
     while (*end_code == OP_ALT);
     }
@@ -461,7 +489,7 @@
 
   if (ptr < end_subject)
     {
-    clen = 1;
+    clen = 1;        /* Number of bytes in the character */
 #ifdef SUPPORT_UTF8
     if (utf8) { GETCHARLEN(c, ptr, clen); } else
 #endif  /* SUPPORT_UTF8 */
@@ -469,8 +497,8 @@
     }
   else
     {
-    clen = 0;    /* At end subject */
-    c = -1;
+    clen = 0;        /* This indicates the end of the subject */
+    c = NOTACHAR;    /* This value should never actually be used */
     }
 
   /* Scan up the active states and act on each one. The result of an action
@@ -483,12 +511,11 @@
     stateblock *current_state = active_states + i;
     const uschar *code;
     int state_offset = current_state->offset;
-    int count, codevalue;
-    int chartype, script;
+    int count, codevalue, rrc;
 
 #ifdef PCRE_DEBUG
     printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset);
-    if (c < 0) printf("-1\n");
+    if (clen == 0) printf("EOL\n");
       else if (c > 32 && c < 127) printf("'%c'\n", c);
         else printf("0x%02x\n", c);
 #endif
@@ -532,7 +559,6 @@
 
     code = start_code + state_offset;
     codevalue = *code;
-    if (codevalue >= OP_BRA) codevalue = OP_BRA; /* All brackets are equal */
 
     /* If this opcode is followed by an inline character, load it. It is
     tempting to test for the presence of a subject character here, but that
@@ -540,10 +566,10 @@
     permitted.
 
     We also use this mechanism for opcodes such as OP_TYPEPLUS that take an
-    argument that is not a data character - but is always one byte long.
-    Unfortunately, we have to take special action to deal with  \P, \p, and
-    \X in this case. To keep the other cases fast, convert these ones to new
-    opcodes. */
+    argument that is not a data character - but is always one byte long. We
+    have to take special action to deal with  \P, \p, \H, \h, \V, \v and \X in
+    this case. To keep the other cases fast, convert these ones to new opcodes.
+    */
 
     if (coptable[codevalue] > 0)
       {
@@ -554,15 +580,25 @@
       d = code[coptable[codevalue]];
       if (codevalue >= OP_TYPESTAR)
         {
-        if (d == OP_ANYBYTE) return PCRE_ERROR_DFA_UITEM;
-        if (d >= OP_NOTPROP)
-          codevalue += (d == OP_EXTUNI)? OP_EXTUNI_EXTRA : OP_PROP_EXTRA;
+        switch(d)
+          {
+          case OP_ANYBYTE: return PCRE_ERROR_DFA_UITEM;
+          case OP_NOTPROP:
+          case OP_PROP: codevalue += OP_PROP_EXTRA; break;
+          case OP_ANYNL: codevalue += OP_ANYNL_EXTRA; break;
+          case OP_EXTUNI: codevalue += OP_EXTUNI_EXTRA; break;
+          case OP_NOT_HSPACE:
+          case OP_HSPACE: codevalue += OP_HSPACE_EXTRA; break;
+          case OP_NOT_VSPACE:
+          case OP_VSPACE: codevalue += OP_VSPACE_EXTRA; break;
+          default: break;
+          }
         }
       }
     else
       {
       dlen = 0;         /* Not strictly necessary, but compilers moan */
-      d = -1;           /* if these variables are not set. */
+      d = NOTACHAR;     /* if these variables are not set. */
       }
 
 
@@ -624,6 +660,7 @@
 
       /*-----------------------------------------------------------------*/
       case OP_BRA:
+      case OP_SBRA:
       do
         {
         ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
@@ -633,6 +670,18 @@
       break;
 
       /*-----------------------------------------------------------------*/
+      case OP_CBRA:
+      case OP_SCBRA:
+      ADD_ACTIVE(code - start_code + 3 + LINK_SIZE,  0);
+      code += GET(code, 1);
+      while (*code == OP_ALT)
+        {
+        ADD_ACTIVE(code - start_code + 1 + LINK_SIZE,  0);
+        code += GET(code, 1);
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
       case OP_BRAZERO:
       case OP_BRAMINZERO:
       ADD_ACTIVE(state_offset + 1, 0);
@@ -642,17 +691,18 @@
       break;
 
       /*-----------------------------------------------------------------*/
-      case OP_BRANUMBER:
-      ADD_ACTIVE(state_offset + 1 + LINK_SIZE, 0);
+      case OP_SKIPZERO:
+      code += 1 + GET(code, 2);
+      while (*code == OP_ALT) code += GET(code, 1);
+      ADD_ACTIVE(code - start_code + 1 + LINK_SIZE, 0);
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_CIRC:
       if ((ptr == start_subject && (md->moptions & PCRE_NOTBOL) == 0) ||
           ((ims & PCRE_MULTILINE) != 0 &&
-            ptr >= start_subject + md->nllen &&
             ptr != end_subject &&
-            IS_NEWLINE(ptr - md->nllen)))
+            WAS_NEWLINE(ptr)))
         { ADD_ACTIVE(state_offset + 1, 0); }
       break;
 
@@ -686,16 +736,19 @@
 
       /*-----------------------------------------------------------------*/
       case OP_ANY:
-      if (clen > 0 && ((ims & PCRE_DOTALL) != 0 ||
-                       ptr > end_subject - md->nllen ||
-                       !IS_NEWLINE(ptr)))
+      if (clen > 0 && !IS_NEWLINE(ptr))
+        { ADD_NEW(state_offset + 1, 0); }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_ALLANY:
+      if (clen > 0)
         { ADD_NEW(state_offset + 1, 0); }
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_EODN:
-      if (clen == 0 ||
-           (ptr == end_subject - md->nllen && IS_NEWLINE(ptr)))
+      if (clen == 0 || (IS_NEWLINE(ptr) && ptr == end_subject - md->nllen))
         { ADD_ACTIVE(state_offset + 1, 0); }
       break;
 
@@ -704,13 +757,12 @@
       if ((md->moptions & PCRE_NOTEOL) == 0)
         {
         if (clen == 0 ||
-            (ptr <= end_subject - md->nllen && IS_NEWLINE(ptr) &&
+            ((md->poptions & PCRE_DOLLAR_ENDONLY) == 0 && IS_NEWLINE(ptr) &&
                ((ims & PCRE_MULTILINE) != 0 || ptr == end_subject - md->nllen)
             ))
           { ADD_ACTIVE(state_offset + 1, 0); }
         }
-      else if ((ims & PCRE_MULTILINE) != 0 &&
-               ptr <= end_subject - md->nllen && IS_NEWLINE(ptr))
+      else if ((ims & PCRE_MULTILINE) != 0 && IS_NEWLINE(ptr))
         { ADD_ACTIVE(state_offset + 1, 0); }
       break;
 
@@ -759,19 +811,18 @@
       break;
 
 
-#ifdef SUPPORT_UCP
-
       /*-----------------------------------------------------------------*/
       /* Check the next character by Unicode property. We will get here only
       if the support is in the binary; otherwise a compile-time error occurs.
       */
 
+#ifdef SUPPORT_UCP
       case OP_PROP:
       case OP_NOTPROP:
       if (clen > 0)
         {
         BOOL OK;
-        int category = _pcre_ucp_findprop(c, &chartype, &script);
+        const ucd_record * prop = GET_UCD(c);
         switch(code[1])
           {
           case PT_ANY:
@@ -779,19 +830,19 @@
           break;
 
           case PT_LAMP:
-          OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
+          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
           break;
 
           case PT_GC:
-          OK = category == code[2];
+          OK = _pcre_ucp_gentype[prop->chartype] == code[2];
           break;
 
           case PT_PC:
-          OK = chartype == code[2];
+          OK = prop->chartype == code[2];
           break;
 
           case PT_SC:
-          OK = script == code[2];
+          OK = prop->script == code[2];
           break;
 
           /* Should never occur, but keep compilers from grumbling. */
@@ -811,24 +862,26 @@
 /* ========================================================================== */
       /* These opcodes likewise inspect the subject character, but have an
       argument that is not a data character. It is one of these opcodes:
-      OP_ANY, OP_DIGIT, OP_NOT_DIGIT, OP_WHITESPACE, OP_NOT_SPACE, OP_WORDCHAR,
-      OP_NOT_WORDCHAR. The value is loaded into d. */
+      OP_ANY, OP_ALLANY, OP_DIGIT, OP_NOT_DIGIT, OP_WHITESPACE, OP_NOT_SPACE,
+      OP_WORDCHAR, OP_NOT_WORDCHAR. The value is loaded into d. */
 
       case OP_TYPEPLUS:
       case OP_TYPEMINPLUS:
+      case OP_TYPEPOSPLUS:
       count = current_state->count;  /* Already matched */
       if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
       if (clen > 0)
         {
         if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
             (c < 256 &&
-              (d != OP_ANY ||
-               (ims & PCRE_DOTALL) != 0 ||
-               ptr > end_subject - md->nllen ||
-               !IS_NEWLINE(ptr)
-              ) &&
+              (d != OP_ANY || !IS_NEWLINE(ptr)) &&
               ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
           {
+          if (count > 0 && codevalue == OP_TYPEPOSPLUS)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
           count++;
           ADD_NEW(state_offset, count);
           }
@@ -838,18 +891,20 @@
       /*-----------------------------------------------------------------*/
       case OP_TYPEQUERY:
       case OP_TYPEMINQUERY:
+      case OP_TYPEPOSQUERY:
       ADD_ACTIVE(state_offset + 2, 0);
       if (clen > 0)
         {
         if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
             (c < 256 &&
-              (d != OP_ANY ||
-               (ims & PCRE_DOTALL) != 0 ||
-               ptr > end_subject - md->nllen ||
-               !IS_NEWLINE(ptr)
-              ) &&
+              (d != OP_ANY || !IS_NEWLINE(ptr)) &&
               ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
           {
+          if (codevalue == OP_TYPEPOSQUERY)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
           ADD_NEW(state_offset + 2, 0);
           }
         }
@@ -858,18 +913,20 @@
       /*-----------------------------------------------------------------*/
       case OP_TYPESTAR:
       case OP_TYPEMINSTAR:
+      case OP_TYPEPOSSTAR:
       ADD_ACTIVE(state_offset + 2, 0);
       if (clen > 0)
         {
         if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
             (c < 256 &&
-              (d != OP_ANY ||
-               (ims & PCRE_DOTALL) != 0 ||
-               ptr > end_subject - md->nllen ||
-               !IS_NEWLINE(ptr)
-              ) &&
+              (d != OP_ANY || !IS_NEWLINE(ptr)) &&
               ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
           {
+          if (codevalue == OP_TYPEPOSSTAR)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
           ADD_NEW(state_offset, 0);
           }
         }
@@ -877,22 +934,40 @@
 
       /*-----------------------------------------------------------------*/
       case OP_TYPEEXACT:
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
+            (c < 256 &&
+              (d != OP_ANY || !IS_NEWLINE(ptr)) &&
+              ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
+          {
+          if (++count >= GET2(code, 1))
+            { ADD_NEW(state_offset + 4, 0); }
+          else
+            { ADD_NEW(state_offset, count); }
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
       case OP_TYPEUPTO:
       case OP_TYPEMINUPTO:
-      if (codevalue != OP_TYPEEXACT)
-        { ADD_ACTIVE(state_offset + 4, 0); }
+      case OP_TYPEPOSUPTO:
+      ADD_ACTIVE(state_offset + 4, 0);
       count = current_state->count;  /* Number already matched */
       if (clen > 0)
         {
         if ((c >= 256 && d != OP_DIGIT && d != OP_WHITESPACE && d != OP_WORDCHAR) ||
             (c < 256 &&
-              (d != OP_ANY ||
-               (ims & PCRE_DOTALL) != 0 ||
-               ptr > end_subject - md->nllen ||
-               !IS_NEWLINE(ptr)
-              ) &&
+              (d != OP_ANY || !IS_NEWLINE(ptr)) &&
               ((ctypes[c] & toptable1[d]) ^ toptable2[d]) != 0))
           {
+          if (codevalue == OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
           if (++count >= GET2(code, 1))
             { ADD_NEW(state_offset + 4, 0); }
           else
@@ -903,18 +978,20 @@
 
 /* ========================================================================== */
       /* These are virtual opcodes that are used when something like
-      OP_TYPEPLUS has OP_PROP, OP_NOTPROP, or OP_EXTUNI as its argument. It
-      keeps the code above fast for the other cases. The argument is in the
-      d variable. */
+      OP_TYPEPLUS has OP_PROP, OP_NOTPROP, OP_ANYNL, or OP_EXTUNI as its
+      argument. It keeps the code above fast for the other cases. The argument
+      is in the d variable. */
 
+#ifdef SUPPORT_UCP
       case OP_PROP_EXTRA + OP_TYPEPLUS:
       case OP_PROP_EXTRA + OP_TYPEMINPLUS:
+      case OP_PROP_EXTRA + OP_TYPEPOSPLUS:
       count = current_state->count;           /* Already matched */
       if (count > 0) { ADD_ACTIVE(state_offset + 4, 0); }
       if (clen > 0)
         {
         BOOL OK;
-        int category = _pcre_ucp_findprop(c, &chartype, &script);
+        const ucd_record * prop = GET_UCD(c);
         switch(code[2])
           {
           case PT_ANY:
@@ -922,19 +999,19 @@
           break;
 
           case PT_LAMP:
-          OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
+          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
           break;
 
           case PT_GC:
-          OK = category == code[3];
+          OK = _pcre_ucp_gentype[prop->chartype] == code[3];
           break;
 
           case PT_PC:
-          OK = chartype == code[3];
+          OK = prop->chartype == code[3];
           break;
 
           case PT_SC:
-          OK = script == code[3];
+          OK = prop->script == code[3];
           break;
 
           /* Should never occur, but keep compilers from grumbling. */
@@ -944,25 +1021,40 @@
           break;
           }
 
-        if (OK == (d == OP_PROP)) { count++; ADD_NEW(state_offset, count); }
+        if (OK == (d == OP_PROP))
+          {
+          if (count > 0 && codevalue == OP_PROP_EXTRA + OP_TYPEPOSPLUS)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW(state_offset, count);
+          }
         }
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_EXTUNI_EXTRA + OP_TYPEPLUS:
       case OP_EXTUNI_EXTRA + OP_TYPEMINPLUS:
+      case OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS:
       count = current_state->count;  /* Already matched */
       if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
-      if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)
+      if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
         {
         const uschar *nptr = ptr + clen;
         int ncount = 0;
+        if (count > 0 && codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSPLUS)
+          {
+          active_count--;           /* Remove non-match possibility */
+          next_active_state--;
+          }
         while (nptr < end_subject)
           {
           int nd;
           int ndlen = 1;
           GETCHARLEN(nd, nptr, ndlen);
-          if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;
+          if (UCD_CATEGORY(nd) != ucp_M) break;
           ncount++;
           nptr += ndlen;
           }
@@ -970,15 +1062,149 @@
         ADD_NEW_DATA(-state_offset, count, ncount);
         }
       break;
+#endif
 
       /*-----------------------------------------------------------------*/
+      case OP_ANYNL_EXTRA + OP_TYPEPLUS:
+      case OP_ANYNL_EXTRA + OP_TYPEMINPLUS:
+      case OP_ANYNL_EXTRA + OP_TYPEPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
+      if (clen > 0)
+        {
+        int ncount = 0;
+        switch (c)
+          {
+          case 0x000b:
+          case 0x000c:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          goto ANYNL01;
+
+          case 0x000d:
+          if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
+          /* Fall through */
+
+          ANYNL01:
+          case 0x000a:
+          if (count > 0 && codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSPLUS)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW_DATA(-state_offset, count, ncount);
+          break;
+
+          default:
+          break;
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_VSPACE_EXTRA + OP_TYPEPLUS:
+      case OP_VSPACE_EXTRA + OP_TYPEMINPLUS:
+      case OP_VSPACE_EXTRA + OP_TYPEPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x000a:
+          case 0x000b:
+          case 0x000c:
+          case 0x000d:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+
+        if (OK == (d == OP_VSPACE))
+          {
+          if (count > 0 && codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSPLUS)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW_DATA(-state_offset, count, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_HSPACE_EXTRA + OP_TYPEPLUS:
+      case OP_HSPACE_EXTRA + OP_TYPEMINPLUS:
+      case OP_HSPACE_EXTRA + OP_TYPEPOSPLUS:
+      count = current_state->count;  /* Already matched */
+      if (count > 0) { ADD_ACTIVE(state_offset + 2, 0); }
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x09:      /* HT */
+          case 0x20:      /* SPACE */
+          case 0xa0:      /* NBSP */
+          case 0x1680:    /* OGHAM SPACE MARK */
+          case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+          case 0x2000:    /* EN QUAD */
+          case 0x2001:    /* EM QUAD */
+          case 0x2002:    /* EN SPACE */
+          case 0x2003:    /* EM SPACE */
+          case 0x2004:    /* THREE-PER-EM SPACE */
+          case 0x2005:    /* FOUR-PER-EM SPACE */
+          case 0x2006:    /* SIX-PER-EM SPACE */
+          case 0x2007:    /* FIGURE SPACE */
+          case 0x2008:    /* PUNCTUATION SPACE */
+          case 0x2009:    /* THIN SPACE */
+          case 0x200A:    /* HAIR SPACE */
+          case 0x202f:    /* NARROW NO-BREAK SPACE */
+          case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+          case 0x3000:    /* IDEOGRAPHIC SPACE */
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+
+        if (OK == (d == OP_HSPACE))
+          {
+          if (count > 0 && codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSPLUS)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW_DATA(-state_offset, count, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+#ifdef SUPPORT_UCP
       case OP_PROP_EXTRA + OP_TYPEQUERY:
       case OP_PROP_EXTRA + OP_TYPEMINQUERY:
+      case OP_PROP_EXTRA + OP_TYPEPOSQUERY:
       count = 4;
       goto QS1;
 
       case OP_PROP_EXTRA + OP_TYPESTAR:
       case OP_PROP_EXTRA + OP_TYPEMINSTAR:
+      case OP_PROP_EXTRA + OP_TYPEPOSSTAR:
       count = 0;
 
       QS1:
@@ -987,7 +1213,7 @@
       if (clen > 0)
         {
         BOOL OK;
-        int category = _pcre_ucp_findprop(c, &chartype, &script);
+        const ucd_record * prop = GET_UCD(c);
         switch(code[2])
           {
           case PT_ANY:
@@ -995,19 +1221,19 @@
           break;
 
           case PT_LAMP:
-          OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
+          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
           break;
 
           case PT_GC:
-          OK = category == code[3];
+          OK = _pcre_ucp_gentype[prop->chartype] == code[3];
           break;
 
           case PT_PC:
-          OK = chartype == code[3];
+          OK = prop->chartype == code[3];
           break;
 
           case PT_SC:
-          OK = script == code[3];
+          OK = prop->script == code[3];
           break;
 
           /* Should never occur, but keep compilers from grumbling. */
@@ -1017,51 +1243,224 @@
           break;
           }
 
-        if (OK == (d == OP_PROP)) { ADD_NEW(state_offset + count, 0); }
+        if (OK == (d == OP_PROP))
+          {
+          if (codevalue == OP_PROP_EXTRA + OP_TYPEPOSSTAR ||
+              codevalue == OP_PROP_EXTRA + OP_TYPEPOSQUERY)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW(state_offset + count, 0);
+          }
         }
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_EXTUNI_EXTRA + OP_TYPEQUERY:
       case OP_EXTUNI_EXTRA + OP_TYPEMINQUERY:
+      case OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY:
       count = 2;
       goto QS2;
 
       case OP_EXTUNI_EXTRA + OP_TYPESTAR:
       case OP_EXTUNI_EXTRA + OP_TYPEMINSTAR:
+      case OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR:
       count = 0;
 
       QS2:
 
       ADD_ACTIVE(state_offset + 2, 0);
-      if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)
+      if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
         {
         const uschar *nptr = ptr + clen;
         int ncount = 0;
+        if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSSTAR ||
+            codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSQUERY)
+          {
+          active_count--;           /* Remove non-match possibility */
+          next_active_state--;
+          }
         while (nptr < end_subject)
           {
           int nd;
           int ndlen = 1;
           GETCHARLEN(nd, nptr, ndlen);
-          if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;
+          if (UCD_CATEGORY(nd) != ucp_M) break;
           ncount++;
           nptr += ndlen;
           }
         ADD_NEW_DATA(-(state_offset + count), 0, ncount);
         }
       break;
+#endif
+
+      /*-----------------------------------------------------------------*/
+      case OP_ANYNL_EXTRA + OP_TYPEQUERY:
+      case OP_ANYNL_EXTRA + OP_TYPEMINQUERY:
+      case OP_ANYNL_EXTRA + OP_TYPEPOSQUERY:
+      count = 2;
+      goto QS3;
+
+      case OP_ANYNL_EXTRA + OP_TYPESTAR:
+      case OP_ANYNL_EXTRA + OP_TYPEMINSTAR:
+      case OP_ANYNL_EXTRA + OP_TYPEPOSSTAR:
+      count = 0;
+
+      QS3:
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0)
+        {
+        int ncount = 0;
+        switch (c)
+          {
+          case 0x000b:
+          case 0x000c:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          goto ANYNL02;
+
+          case 0x000d:
+          if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
+          /* Fall through */
+
+          ANYNL02:
+          case 0x000a:
+          if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSSTAR ||
+              codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSQUERY)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW_DATA(-(state_offset + count), 0, ncount);
+          break;
+
+          default:
+          break;
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_VSPACE_EXTRA + OP_TYPEQUERY:
+      case OP_VSPACE_EXTRA + OP_TYPEMINQUERY:
+      case OP_VSPACE_EXTRA + OP_TYPEPOSQUERY:
+      count = 2;
+      goto QS4;
+
+      case OP_VSPACE_EXTRA + OP_TYPESTAR:
+      case OP_VSPACE_EXTRA + OP_TYPEMINSTAR:
+      case OP_VSPACE_EXTRA + OP_TYPEPOSSTAR:
+      count = 0;
+
+      QS4:
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x000a:
+          case 0x000b:
+          case 0x000c:
+          case 0x000d:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+        if (OK == (d == OP_VSPACE))
+          {
+          if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSSTAR ||
+              codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSQUERY)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW_DATA(-(state_offset + count), 0, 0);
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_HSPACE_EXTRA + OP_TYPEQUERY:
+      case OP_HSPACE_EXTRA + OP_TYPEMINQUERY:
+      case OP_HSPACE_EXTRA + OP_TYPEPOSQUERY:
+      count = 2;
+      goto QS5;
+
+      case OP_HSPACE_EXTRA + OP_TYPESTAR:
+      case OP_HSPACE_EXTRA + OP_TYPEMINSTAR:
+      case OP_HSPACE_EXTRA + OP_TYPEPOSSTAR:
+      count = 0;
+
+      QS5:
+      ADD_ACTIVE(state_offset + 2, 0);
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x09:      /* HT */
+          case 0x20:      /* SPACE */
+          case 0xa0:      /* NBSP */
+          case 0x1680:    /* OGHAM SPACE MARK */
+          case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+          case 0x2000:    /* EN QUAD */
+          case 0x2001:    /* EM QUAD */
+          case 0x2002:    /* EN SPACE */
+          case 0x2003:    /* EM SPACE */
+          case 0x2004:    /* THREE-PER-EM SPACE */
+          case 0x2005:    /* FOUR-PER-EM SPACE */
+          case 0x2006:    /* SIX-PER-EM SPACE */
+          case 0x2007:    /* FIGURE SPACE */
+          case 0x2008:    /* PUNCTUATION SPACE */
+          case 0x2009:    /* THIN SPACE */
+          case 0x200A:    /* HAIR SPACE */
+          case 0x202f:    /* NARROW NO-BREAK SPACE */
+          case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+          case 0x3000:    /* IDEOGRAPHIC SPACE */
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+
+        if (OK == (d == OP_HSPACE))
+          {
+          if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSSTAR ||
+              codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSQUERY)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW_DATA(-(state_offset + count), 0, 0);
+          }
+        }
+      break;
 
       /*-----------------------------------------------------------------*/
+#ifdef SUPPORT_UCP
       case OP_PROP_EXTRA + OP_TYPEEXACT:
       case OP_PROP_EXTRA + OP_TYPEUPTO:
       case OP_PROP_EXTRA + OP_TYPEMINUPTO:
+      case OP_PROP_EXTRA + OP_TYPEPOSUPTO:
       if (codevalue != OP_PROP_EXTRA + OP_TYPEEXACT)
         { ADD_ACTIVE(state_offset + 6, 0); }
       count = current_state->count;  /* Number already matched */
       if (clen > 0)
         {
         BOOL OK;
-        int category = _pcre_ucp_findprop(c, &chartype, &script);
+        const ucd_record * prop = GET_UCD(c);
         switch(code[4])
           {
           case PT_ANY:
@@ -1069,19 +1468,19 @@
           break;
 
           case PT_LAMP:
-          OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
+          OK = prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt;
           break;
 
           case PT_GC:
-          OK = category == code[5];
+          OK = _pcre_ucp_gentype[prop->chartype] == code[5];
           break;
 
           case PT_PC:
-          OK = chartype == code[5];
+          OK = prop->chartype == code[5];
           break;
 
           case PT_SC:
-          OK = script == code[5];
+          OK = prop->script == code[5];
           break;
 
           /* Should never occur, but keep compilers from grumbling. */
@@ -1093,6 +1492,11 @@
 
         if (OK == (d == OP_PROP))
           {
+          if (codevalue == OP_PROP_EXTRA + OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
           if (++count >= GET2(code, 1))
             { ADD_NEW(state_offset + 6, 0); }
           else
@@ -1105,19 +1509,25 @@
       case OP_EXTUNI_EXTRA + OP_TYPEEXACT:
       case OP_EXTUNI_EXTRA + OP_TYPEUPTO:
       case OP_EXTUNI_EXTRA + OP_TYPEMINUPTO:
+      case OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO:
       if (codevalue != OP_EXTUNI_EXTRA + OP_TYPEEXACT)
         { ADD_ACTIVE(state_offset + 4, 0); }
       count = current_state->count;  /* Number already matched */
-      if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)
+      if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
         {
         const uschar *nptr = ptr + clen;
         int ncount = 0;
+        if (codevalue == OP_EXTUNI_EXTRA + OP_TYPEPOSUPTO)
+          {
+          active_count--;           /* Remove non-match possibility */
+          next_active_state--;
+          }
         while (nptr < end_subject)
           {
           int nd;
           int ndlen = 1;
           GETCHARLEN(nd, nptr, ndlen);
-          if (_pcre_ucp_findprop(nd, &chartype, &script) != ucp_M) break;
+          if (UCD_CATEGORY(nd) != ucp_M) break;
           ncount++;
           nptr += ndlen;
           }
@@ -1127,6 +1537,148 @@
           { ADD_NEW_DATA(-state_offset, count, ncount); }
         }
       break;
+#endif
+
+      /*-----------------------------------------------------------------*/
+      case OP_ANYNL_EXTRA + OP_TYPEEXACT:
+      case OP_ANYNL_EXTRA + OP_TYPEUPTO:
+      case OP_ANYNL_EXTRA + OP_TYPEMINUPTO:
+      case OP_ANYNL_EXTRA + OP_TYPEPOSUPTO:
+      if (codevalue != OP_ANYNL_EXTRA + OP_TYPEEXACT)
+        { ADD_ACTIVE(state_offset + 4, 0); }
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        int ncount = 0;
+        switch (c)
+          {
+          case 0x000b:
+          case 0x000c:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+          goto ANYNL03;
+
+          case 0x000d:
+          if (ptr + 1 < end_subject && ptr[1] == 0x0a) ncount = 1;
+          /* Fall through */
+
+          ANYNL03:
+          case 0x000a:
+          if (codevalue == OP_ANYNL_EXTRA + OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW_DATA(-(state_offset + 4), 0, ncount); }
+          else
+            { ADD_NEW_DATA(-state_offset, count, ncount); }
+          break;
+
+          default:
+          break;
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_VSPACE_EXTRA + OP_TYPEEXACT:
+      case OP_VSPACE_EXTRA + OP_TYPEUPTO:
+      case OP_VSPACE_EXTRA + OP_TYPEMINUPTO:
+      case OP_VSPACE_EXTRA + OP_TYPEPOSUPTO:
+      if (codevalue != OP_VSPACE_EXTRA + OP_TYPEEXACT)
+        { ADD_ACTIVE(state_offset + 4, 0); }
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x000a:
+          case 0x000b:
+          case 0x000c:
+          case 0x000d:
+          case 0x0085:
+          case 0x2028:
+          case 0x2029:
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          }
+
+        if (OK == (d == OP_VSPACE))
+          {
+          if (codevalue == OP_VSPACE_EXTRA + OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
+          else
+            { ADD_NEW_DATA(-state_offset, count, 0); }
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_HSPACE_EXTRA + OP_TYPEEXACT:
+      case OP_HSPACE_EXTRA + OP_TYPEUPTO:
+      case OP_HSPACE_EXTRA + OP_TYPEMINUPTO:
+      case OP_HSPACE_EXTRA + OP_TYPEPOSUPTO:
+      if (codevalue != OP_HSPACE_EXTRA + OP_TYPEEXACT)
+        { ADD_ACTIVE(state_offset + 4, 0); }
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        BOOL OK;
+        switch (c)
+          {
+          case 0x09:      /* HT */
+          case 0x20:      /* SPACE */
+          case 0xa0:      /* NBSP */
+          case 0x1680:    /* OGHAM SPACE MARK */
+          case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+          case 0x2000:    /* EN QUAD */
+          case 0x2001:    /* EM QUAD */
+          case 0x2002:    /* EN SPACE */
+          case 0x2003:    /* EM SPACE */
+          case 0x2004:    /* THREE-PER-EM SPACE */
+          case 0x2005:    /* FOUR-PER-EM SPACE */
+          case 0x2006:    /* SIX-PER-EM SPACE */
+          case 0x2007:    /* FIGURE SPACE */
+          case 0x2008:    /* PUNCTUATION SPACE */
+          case 0x2009:    /* THIN SPACE */
+          case 0x200A:    /* HAIR SPACE */
+          case 0x202f:    /* NARROW NO-BREAK SPACE */
+          case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+          case 0x3000:    /* IDEOGRAPHIC SPACE */
+          OK = TRUE;
+          break;
+
+          default:
+          OK = FALSE;
+          break;
+          }
+
+        if (OK == (d == OP_HSPACE))
+          {
+          if (codevalue == OP_HSPACE_EXTRA + OP_TYPEPOSUPTO)
+            {
+            active_count--;           /* Remove non-match possibility */
+            next_active_state--;
+            }
+          if (++count >= GET2(code, 1))
+            { ADD_NEW_DATA(-(state_offset + 4), 0, 0); }
+          else
+            { ADD_NEW_DATA(-state_offset, count, 0); }
+          }
+        }
+      break;
 
 /* ========================================================================== */
       /* These opcodes are followed by a character that is usually compared
@@ -1148,16 +1700,16 @@
         {
         if (c == d) { ADD_NEW(state_offset + dlen + 1, 0); } else
           {
-          int othercase;
+          unsigned int othercase;
           if (c < 128) othercase = fcc[c]; else
 
           /* If we have Unicode property support, we can use it to test the
           other case of the character. */
 
 #ifdef SUPPORT_UCP
-          othercase = _pcre_ucp_othercase(c);
+          othercase = UCD_OTHERCASE(c);
 #else
-          othercase = -1;
+          othercase = NOTACHAR;
 #endif
 
           if (d == othercase) { ADD_NEW(state_offset + dlen + 1, 0); }
@@ -1180,7 +1732,7 @@
       to wait for them to pass before continuing. */
 
       case OP_EXTUNI:
-      if (clen > 0 && _pcre_ucp_findprop(c, &chartype, &script) != ucp_M)
+      if (clen > 0 && UCD_CATEGORY(c) != ucp_M)
         {
         const uschar *nptr = ptr + clen;
         int ncount = 0;
@@ -1188,7 +1740,7 @@
           {
           int nclen = 1;
           GETCHARLEN(c, nptr, nclen);
-          if (_pcre_ucp_findprop(c, &chartype, &script) != ucp_M) break;
+          if (UCD_CATEGORY(c) != ucp_M) break;
           ncount++;
           nptr += nclen;
           }
@@ -1198,6 +1750,134 @@
 #endif
 
       /*-----------------------------------------------------------------*/
+      /* This is a tricky like EXTUNI because it too can match more than one
+      character (when CR is followed by LF). In this case, set up a negative
+      state to wait for one character to pass before continuing. */
+
+      case OP_ANYNL:
+      if (clen > 0) switch(c)
+        {
+        case 0x000b:
+        case 0x000c:
+        case 0x0085:
+        case 0x2028:
+        case 0x2029:
+        if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+
+        case 0x000a:
+        ADD_NEW(state_offset + 1, 0);
+        break;
+
+        case 0x000d:
+        if (ptr + 1 < end_subject && ptr[1] == 0x0a)
+          {
+          ADD_NEW_DATA(-(state_offset + 1), 0, 1);
+          }
+        else
+          {
+          ADD_NEW(state_offset + 1, 0);
+          }
+        break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_NOT_VSPACE:
+      if (clen > 0) switch(c)
+        {
+        case 0x000a:
+        case 0x000b:
+        case 0x000c:
+        case 0x000d:
+        case 0x0085:
+        case 0x2028:
+        case 0x2029:
+        break;
+
+        default:
+        ADD_NEW(state_offset + 1, 0);
+        break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_VSPACE:
+      if (clen > 0) switch(c)
+        {
+        case 0x000a:
+        case 0x000b:
+        case 0x000c:
+        case 0x000d:
+        case 0x0085:
+        case 0x2028:
+        case 0x2029:
+        ADD_NEW(state_offset + 1, 0);
+        break;
+
+        default: break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_NOT_HSPACE:
+      if (clen > 0) switch(c)
+        {
+        case 0x09:      /* HT */
+        case 0x20:      /* SPACE */
+        case 0xa0:      /* NBSP */
+        case 0x1680:    /* OGHAM SPACE MARK */
+        case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+        case 0x2000:    /* EN QUAD */
+        case 0x2001:    /* EM QUAD */
+        case 0x2002:    /* EN SPACE */
+        case 0x2003:    /* EM SPACE */
+        case 0x2004:    /* THREE-PER-EM SPACE */
+        case 0x2005:    /* FOUR-PER-EM SPACE */
+        case 0x2006:    /* SIX-PER-EM SPACE */
+        case 0x2007:    /* FIGURE SPACE */
+        case 0x2008:    /* PUNCTUATION SPACE */
+        case 0x2009:    /* THIN SPACE */
+        case 0x200A:    /* HAIR SPACE */
+        case 0x202f:    /* NARROW NO-BREAK SPACE */
+        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+        case 0x3000:    /* IDEOGRAPHIC SPACE */
+        break;
+
+        default:
+        ADD_NEW(state_offset + 1, 0);
+        break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
+      case OP_HSPACE:
+      if (clen > 0) switch(c)
+        {
+        case 0x09:      /* HT */
+        case 0x20:      /* SPACE */
+        case 0xa0:      /* NBSP */
+        case 0x1680:    /* OGHAM SPACE MARK */
+        case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+        case 0x2000:    /* EN QUAD */
+        case 0x2001:    /* EM QUAD */
+        case 0x2002:    /* EN SPACE */
+        case 0x2003:    /* EM SPACE */
+        case 0x2004:    /* THREE-PER-EM SPACE */
+        case 0x2005:    /* FOUR-PER-EM SPACE */
+        case 0x2006:    /* SIX-PER-EM SPACE */
+        case 0x2007:    /* FIGURE SPACE */
+        case 0x2008:    /* PUNCTUATION SPACE */
+        case 0x2009:    /* THIN SPACE */
+        case 0x200A:    /* HAIR SPACE */
+        case 0x202f:    /* NARROW NO-BREAK SPACE */
+        case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+        case 0x3000:    /* IDEOGRAPHIC SPACE */
+        ADD_NEW(state_offset + 1, 0);
+        break;
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
       /* Match a negated single character. This is only used for one-byte
       characters, that is, we know that d < 256. The character we are
       checking (c) can be multibyte. */
@@ -1205,7 +1885,7 @@
       case OP_NOT:
       if (clen > 0)
         {
-        int otherd = ((ims & PCRE_CASELESS) != 0)? fcc[d] : d;
+        unsigned int otherd = ((ims & PCRE_CASELESS) != 0)? fcc[d] : d;
         if (c != d && c != otherd) { ADD_NEW(state_offset + dlen + 1, 0); }
         }
       break;
@@ -1213,20 +1893,22 @@
       /*-----------------------------------------------------------------*/
       case OP_PLUS:
       case OP_MINPLUS:
+      case OP_POSPLUS:
       case OP_NOTPLUS:
       case OP_NOTMINPLUS:
+      case OP_NOTPOSPLUS:
       count = current_state->count;  /* Already matched */
       if (count > 0) { ADD_ACTIVE(state_offset + dlen + 1, 0); }
       if (clen > 0)
         {
-        int otherd = -1;
+        unsigned int otherd = NOTACHAR;
         if ((ims & PCRE_CASELESS) != 0)
           {
 #ifdef SUPPORT_UTF8
           if (utf8 && d >= 128)
             {
 #ifdef SUPPORT_UCP
-            otherd = _pcre_ucp_othercase(d);
+            otherd = UCD_OTHERCASE(d);
 #endif  /* SUPPORT_UCP */
             }
           else
@@ -1234,26 +1916,37 @@
           otherd = fcc[d];
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
-          { count++; ADD_NEW(state_offset, count); }
+          {
+          if (count > 0 &&
+              (codevalue == OP_POSPLUS || codevalue == OP_NOTPOSPLUS))
+            {
+            active_count--;             /* Remove non-match possibility */
+            next_active_state--;
+            }
+          count++;
+          ADD_NEW(state_offset, count);
+          }
         }
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_QUERY:
       case OP_MINQUERY:
+      case OP_POSQUERY:
       case OP_NOTQUERY:
       case OP_NOTMINQUERY:
+      case OP_NOTPOSQUERY:
       ADD_ACTIVE(state_offset + dlen + 1, 0);
       if (clen > 0)
         {
-        int otherd = -1;
+        unsigned int otherd = NOTACHAR;
         if ((ims & PCRE_CASELESS) != 0)
           {
 #ifdef SUPPORT_UTF8
           if (utf8 && d >= 128)
             {
 #ifdef SUPPORT_UCP
-            otherd = _pcre_ucp_othercase(d);
+            otherd = UCD_OTHERCASE(d);
 #endif  /* SUPPORT_UCP */
             }
           else
@@ -1261,26 +1954,35 @@
           otherd = fcc[d];
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
-          { ADD_NEW(state_offset + dlen + 1, 0); }
+          {
+          if (codevalue == OP_POSQUERY || codevalue == OP_NOTPOSQUERY)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW(state_offset + dlen + 1, 0);
+          }
         }
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_STAR:
       case OP_MINSTAR:
+      case OP_POSSTAR:
       case OP_NOTSTAR:
       case OP_NOTMINSTAR:
+      case OP_NOTPOSSTAR:
       ADD_ACTIVE(state_offset + dlen + 1, 0);
       if (clen > 0)
         {
-        int otherd = -1;
+        unsigned int otherd = NOTACHAR;
         if ((ims & PCRE_CASELESS) != 0)
           {
 #ifdef SUPPORT_UTF8
           if (utf8 && d >= 128)
             {
 #ifdef SUPPORT_UCP
-            otherd = _pcre_ucp_othercase(d);
+            otherd = UCD_OTHERCASE(d);
 #endif  /* SUPPORT_UCP */
             }
           else
@@ -1288,30 +1990,66 @@
           otherd = fcc[d];
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
-          { ADD_NEW(state_offset, 0); }
+          {
+          if (codevalue == OP_POSSTAR || codevalue == OP_NOTPOSSTAR)
+            {
+            active_count--;            /* Remove non-match possibility */
+            next_active_state--;
+            }
+          ADD_NEW(state_offset, 0);
+          }
         }
       break;
 
       /*-----------------------------------------------------------------*/
       case OP_EXACT:
+      case OP_NOTEXACT:
+      count = current_state->count;  /* Number already matched */
+      if (clen > 0)
+        {
+        unsigned int otherd = NOTACHAR;
+        if ((ims & PCRE_CASELESS) != 0)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8 && d >= 128)
+            {
+#ifdef SUPPORT_UCP
+            otherd = UCD_OTHERCASE(d);
+#endif  /* SUPPORT_UCP */
+            }
+          else
+#endif  /* SUPPORT_UTF8 */
+          otherd = fcc[d];
+          }
+        if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
+          {
+          if (++count >= GET2(code, 1))
+            { ADD_NEW(state_offset + dlen + 3, 0); }
+          else
+            { ADD_NEW(state_offset, count); }
+          }
+        }
+      break;
+
+      /*-----------------------------------------------------------------*/
       case OP_UPTO:
       case OP_MINUPTO:
-      case OP_NOTEXACT:
+      case OP_POSUPTO:
       case OP_NOTUPTO:
       case OP_NOTMINUPTO:
-      if (codevalue != OP_EXACT && codevalue != OP_NOTEXACT)
-        { ADD_ACTIVE(state_offset + dlen + 3, 0); }
+      case OP_NOTPOSUPTO:
+      ADD_ACTIVE(state_offset + dlen + 3, 0);
       count = current_state->count;  /* Number already matched */
       if (clen > 0)
         {
-        int otherd = -1;
+        unsigned int otherd = NOTACHAR;
         if ((ims & PCRE_CASELESS) != 0)
           {
 #ifdef SUPPORT_UTF8
           if (utf8 && d >= 128)
             {
 #ifdef SUPPORT_UCP
-            otherd = _pcre_ucp_othercase(d);
+            otherd = UCD_OTHERCASE(d);
 #endif  /* SUPPORT_UCP */
             }
           else
@@ -1320,6 +2058,11 @@
           }
         if ((c == d || c == otherd) == (codevalue < OP_NOTSTAR))
           {
+          if (codevalue == OP_POSUPTO || codevalue == OP_NOTPOSUPTO)
+            {
+            active_count--;             /* Remove non-match possibility */
+            next_active_state--;
+            }
           if (++count >= GET2(code, 1))
             { ADD_NEW(state_offset + dlen + 3, 0); }
           else
@@ -1414,7 +2157,12 @@
 
 /* ========================================================================== */
       /* These are the opcodes for fancy brackets of various kinds. We have
-      to use recursion in order to handle them. */
+      to use recursion in order to handle them. The "always failing" assersion
+      (?!) is optimised when compiling to OP_FAIL, so we have to support that,
+      though the other "backtracking verbs" are not supported. */
+
+      case OP_FAIL:
+      break;
 
       case OP_ASSERT:
       case OP_ASSERT_NOT:
@@ -1448,20 +2196,63 @@
 
       /*-----------------------------------------------------------------*/
       case OP_COND:
+      case OP_SCOND:
         {
         int local_offsets[1000];
         int local_workspace[1000];
-        int condcode = code[LINK_SIZE+1];
+        int codelink = GET(code, 1);
+        int condcode;
 
-        /* The only supported version of OP_CREF is for the value 0xffff, which
-        means "test if in a recursion". */
+        /* Because of the way auto-callout works during compile, a callout item
+        is inserted between OP_COND and an assertion condition. This does not
+        happen for the other conditions. */
 
-        if (condcode == OP_CREF)
+        if (code[LINK_SIZE+1] == OP_CALLOUT)
+          {
+          rrc = 0;
+          if (pcre_callout != NULL)
+            {
+            pcre_callout_block cb;
+            cb.version          = 1;   /* Version 1 of the callout block */
+            cb.callout_number   = code[LINK_SIZE+2];
+            cb.offset_vector    = offsets;
+            cb.subject          = (PCRE_SPTR)start_subject;
+            cb.subject_length   = end_subject - start_subject;
+            cb.start_match      = current_subject - start_subject;
+            cb.current_position = ptr - start_subject;
+            cb.pattern_position = GET(code, LINK_SIZE + 3);
+            cb.next_item_length = GET(code, 3 + 2*LINK_SIZE);
+            cb.capture_top      = 1;
+            cb.capture_last     = -1;
+            cb.callout_data     = md->callout_data;
+            if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */
+            }
+          if (rrc > 0) break;                      /* Fail this thread */
+          code += _pcre_OP_lengths[OP_CALLOUT];    /* Skip callout data */
+          }
+
+        condcode = code[LINK_SIZE+1];
+
+        /* Back reference conditions are not supported */
+
+        if (condcode == OP_CREF) return PCRE_ERROR_DFA_UCOND;
+
+        /* The DEFINE condition is always false */
+
+        if (condcode == OP_DEF)
+          { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
+
+        /* The only supported version of OP_RREF is for the value RREF_ANY,
+        which means "test if in any recursion". We can't test for specifically
+        recursed groups. */
+
+        else if (condcode == OP_RREF)
           {
           int value = GET2(code, LINK_SIZE+2);
-          if (value != 0xffff) return PCRE_ERROR_DFA_UCOND;
-          if (recursing > 0) { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }
-            else { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }
+          if (value != RREF_ANY) return PCRE_ERROR_DFA_UCOND;
+          if (recursing > 0)
+            { ADD_ACTIVE(state_offset + LINK_SIZE + 4, 0); }
+          else { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
           }
 
         /* Otherwise, the condition is an assertion */
@@ -1491,7 +2282,7 @@
                 (condcode == OP_ASSERT || condcode == OP_ASSERTBACK))
             { ADD_ACTIVE(endasscode + LINK_SIZE + 1 - start_code, 0); }
           else
-            { ADD_ACTIVE(state_offset + GET(code, 1) + LINK_SIZE + 1, 0); }
+            { ADD_ACTIVE(state_offset + codelink + LINK_SIZE + 1, 0); }
           }
         }
       break;
@@ -1643,9 +2434,9 @@
       /* Handle callouts */
 
       case OP_CALLOUT:
+      rrc = 0;
       if (pcre_callout != NULL)
         {
-        int rrc;
         pcre_callout_block cb;
         cb.version          = 1;   /* Version 1 of the callout block */
         cb.callout_number   = code[1];
@@ -1660,8 +2451,9 @@
         cb.capture_last     = -1;
         cb.callout_data     = md->callout_data;
         if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */
-        if (rrc == 0) { ADD_ACTIVE(state_offset + 2 + 2*LINK_SIZE, 0); }
         }
+      if (rrc == 0)
+        { ADD_ACTIVE(state_offset + _pcre_OP_lengths[OP_CALLOUT], 0); }
       break;
 
 
@@ -1728,7 +2520,7 @@
 
 Arguments:
   argument_re     points to the compiled expression
-  extra_data      points to extra data or is NULL (not currently used)
+  extra_data      points to extra data or is NULL
   subject         points to the subject string
   length          length of subject string (may contain binary zeros)
   start_offset    where to start in the subject string
@@ -1744,7 +2536,7 @@
                  < -1 => some kind of unexpected problem
 */
 
-PCRE_DATA_SCOPE int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data,
   const char *subject, int length, int start_offset, int options, int *offsets,
   int offsetcount, int *workspace, int wscount)
@@ -1834,29 +2626,56 @@
 md->moptions = options;
 md->poptions = re->options;
 
-/* Handle different types of newline. The two bits give four cases. If nothing
-is set at run time, whatever was used at compile time applies. */
+/* If the BSR option is not set at match time, copy what was set
+at compile time. */
+
+if ((md->moptions & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) == 0)
+  {
+  if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
+    md->moptions |= re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE);
+#ifdef BSR_ANYCRLF
+  else md->moptions |= PCRE_BSR_ANYCRLF;
+#endif
+  }
+
+/* Handle different types of newline. The three bits give eight cases. If
+nothing is set at run time, whatever was used at compile time applies. */
 
-switch ((((options & PCRE_NEWLINE_CRLF) == 0)? re->options : options) &
-         PCRE_NEWLINE_CRLF)
+switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options : (pcre_uint32)options) &
+         PCRE_NEWLINE_BITS)
   {
-  default:              newline = NEWLINE; break;   /* Compile-time default */
-  case PCRE_NEWLINE_CR: newline = '\r'; break;
-  case PCRE_NEWLINE_LF: newline = '\n'; break;
+  case 0: newline = NEWLINE; break;   /* Compile-time default */
+  case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
+  case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
   case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
+       PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
+  case PCRE_NEWLINE_ANY: newline = -1; break;
+  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
+  default: return PCRE_ERROR_BADNEWLINE;
   }
 
-if (newline > 255)
+if (newline == -2)
   {
-  md->nllen = 2;
-  md->nl[0] = (newline >> 8) & 255;
-  md->nl[1] = newline & 255;
+  md->nltype = NLTYPE_ANYCRLF;
+  }
+else if (newline < 0)
+  {
+  md->nltype = NLTYPE_ANY;
   }
 else
   {
-  md->nllen = 1;
-  md->nl[0] = newline;
+  md->nltype = NLTYPE_FIXED;
+  if (newline > 255)
+    {
+    md->nllen = 2;
+    md->nl[0] = (newline >> 8) & 255;
+    md->nl[1] = newline & 255;
+    }
+  else
+    {
+    md->nllen = 1;
+    md->nl[0] = newline;
+    }
   }
 
 /* Check a UTF-8 string if required. Unfortunately there's no way of passing
@@ -1889,7 +2708,7 @@
 used in a loop when finding where to start. */
 
 lcc = md->tables + lcc_offset;
-startline = (re->options & PCRE_STARTLINE) != 0;
+startline = (re->flags & PCRE_STARTLINE) != 0;
 firstline = (re->options & PCRE_FIRSTLINE) != 0;
 
 /* Set up the first character to match, if available. The first_byte value is
@@ -1900,7 +2719,7 @@
 
 if (!anchored)
   {
-  if ((re->options & PCRE_FIRSTSET) != 0)
+  if ((re->flags & PCRE_FIRSTSET) != 0)
     {
     first_byte = re->first_byte & 255;
     if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)
@@ -1917,7 +2736,7 @@
 /* For anchored or unanchored matches, there may be a "last known required
 character" set. */
 
-if ((re->options & PCRE_REQCHSET) != 0)
+if ((re->flags & PCRE_REQCHSET) != 0)
   {
   req_byte = re->req_byte & 255;
   req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;
@@ -1925,9 +2744,8 @@
   }
 
 /* Call the main matching function, looping for a non-anchored regex after a
-failed match. Unless restarting, optimize by moving to the first match
-character if possible, when not anchored. Then unless wanting a partial match,
-check for a required later character. */
+failed match. If not restarting, perform certain optimizations at the start of
+a match. */
 
 for (;;)
   {
@@ -1937,52 +2755,96 @@
     {
     const uschar *save_end_subject = end_subject;
 
-    /* Advance to a unique first char if possible. If firstline is TRUE, the
-    start of the match is constrained to the first line of a multiline string.
-    Implement this by temporarily adjusting end_subject so that we stop
-    scanning at a newline. If the match fails at the newline, later code breaks
-    this loop. */
+    /* If firstline is TRUE, the start of the match is constrained to the first
+    line of a multiline string. Implement this by temporarily adjusting
+    end_subject so that we stop scanning at a newline. If the match fails at
+    the newline, later code breaks this loop. */
 
     if (firstline)
       {
-      const uschar *t = current_subject;
-      while (t <= save_end_subject - md->nllen && !IS_NEWLINE(t)) t++;
+      USPTR t = current_subject;
+#ifdef SUPPORT_UTF8
+      if (utf8)
+        {
+        while (t < md->end_subject && !IS_NEWLINE(t))
+          {
+          t++;
+          while (t < end_subject && (*t & 0xc0) == 0x80) t++;
+          }
+        }
+      else
+#endif
+      while (t < md->end_subject && !IS_NEWLINE(t)) t++;
       end_subject = t;
       }
 
-    if (first_byte >= 0)
+    /* There are some optimizations that avoid running the match if a known
+    starting point is not found, or if a known later character is not present.
+    However, there is an option that disables these, for testing and for
+    ensuring that all callouts do actually occur. */
+
+    if ((options & PCRE_NO_START_OPTIMIZE) == 0)
       {
-      if (first_byte_caseless)
-        while (current_subject < end_subject &&
-               lcc[*current_subject] != first_byte)
-          current_subject++;
-      else
-        while (current_subject < end_subject && *current_subject != first_byte)
-          current_subject++;
-      }
 
-    /* Or to just after a linebreak for a multiline match if possible */
+      /* Advance to a known first byte. */
 
-    else if (startline)
-      {
-      if (current_subject > md->start_subject + md->nllen +
-          start_offset)
+      if (first_byte >= 0)
         {
-        while (current_subject <= end_subject &&
-               !IS_NEWLINE(current_subject - md->nllen))
-          current_subject++;
+        if (first_byte_caseless)
+          while (current_subject < end_subject &&
+                 lcc[*current_subject] != first_byte)
+            current_subject++;
+        else
+          while (current_subject < end_subject &&
+                 *current_subject != first_byte)
+            current_subject++;
         }
-      }
 
-    /* Or to a non-unique first char after study */
+      /* Or to just after a linebreak for a multiline match if possible */
 
-    else if (start_bits != NULL)
-      {
-      while (current_subject < end_subject)
+      else if (startline)
+        {
+        if (current_subject > md->start_subject + start_offset)
+          {
+#ifdef SUPPORT_UTF8
+          if (utf8)
+            {
+            while (current_subject < end_subject &&
+                   !WAS_NEWLINE(current_subject))
+              {
+              current_subject++;
+              while(current_subject < end_subject &&
+                    (*current_subject & 0xc0) == 0x80)
+                current_subject++;
+              }
+            }
+          else
+#endif
+          while (current_subject < end_subject && !WAS_NEWLINE(current_subject))
+            current_subject++;
+
+          /* If we have just passed a CR and the newline option is ANY or
+          ANYCRLF, and we are now at a LF, advance the match position by one
+          more character. */
+
+          if (current_subject[-1] == CHAR_CR &&
+               (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
+               current_subject < end_subject &&
+               *current_subject == CHAR_NL)
+            current_subject++;
+          }
+        }
+
+      /* Or to a non-unique first char after study */
+
+      else if (start_bits != NULL)
         {
-        register unsigned int c = *current_subject;
-        if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;
-          else break;
+        while (current_subject < end_subject)
+          {
+          register unsigned int c = *current_subject;
+          if ((start_bits[c/8] & (1 << (c&7))) == 0) current_subject++;
+            else break;
+          }
         }
       }
 
@@ -2004,10 +2866,11 @@
   showed up when somebody was matching /^C/ on a 32-megabyte string... so we
   don't do this when the string is sufficiently long.
 
-  ALSO: this processing is disabled when partial matching is requested.
-  */
+  ALSO: this processing is disabled when partial matching is requested, and can
+  also be explicitly deactivated. */
 
-  if (req_byte >= 0 &&
+  if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&
+      req_byte >= 0 &&
       end_subject - current_subject < REQ_BYTE_MAX &&
       (options & PCRE_PARTIAL) == 0)
     {
@@ -2070,9 +2933,7 @@
   /* Advance to the next subject character unless we are at the end of a line
   and firstline is set. */
 
-  if (firstline &&
-      current_subject <= end_subject - md->nllen &&
-      IS_NEWLINE(current_subject)) break;
+  if (firstline && IS_NEWLINE(current_subject)) break;
   current_subject++;
   if (utf8)
     {
@@ -2080,7 +2941,21 @@
       current_subject++;
     }
   if (current_subject > end_subject) break;
-  }
+
+  /* If we have just passed a CR and we are now at a LF, and the pattern does
+  not contain any explicit matches for \r or \n, and the newline option is CRLF
+  or ANY or ANYCRLF, advance the match position by one more character. */
+
+  if (current_subject[-1] == CHAR_CR &&
+      current_subject < end_subject &&
+      *current_subject == CHAR_NL &&
+      (re->flags & PCRE_HASCRORLF) == 0 &&
+        (md->nltype == NLTYPE_ANY ||
+         md->nltype == NLTYPE_ANYCRLF ||
+         md->nllen == 2))
+    current_subject++;
+
+  }   /* "Bumpalong" loop */
 
 return PCRE_ERROR_NOMATCH;
 }

Modified: freeswitch/trunk/libs/pcre/pcre_exec.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_exec.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_exec.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -42,25 +42,25 @@
 pattern matching using an NFA algorithm, trying to mimic Perl as closely as
 possible. There are also some static supporting functions. */
 
-#define NLBLOCK md           /* The block containing newline information */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define NLBLOCK md             /* Block containing newline information */
+#define PSSTART start_subject  /* Field containing processed string start */
+#define PSEND   end_subject    /* Field containing processed string end */
+
 #include "pcre_internal.h"
 
+/* Undefine some potentially clashing cpp symbols */
 
-/* Structure for building a chain of data that actually lives on the
-stack, for holding the values of the subject pointer at the start of each
-subpattern, so as to detect when an empty string has been matched by a
-subpattern - to break infinite loops. When NO_RECURSE is set, these blocks
-are on the heap, not on the stack. */
-
-typedef struct eptrblock {
-  struct eptrblock *epb_prev;
-  USPTR epb_saved_eptr;
-} eptrblock;
+#undef min
+#undef max
 
 /* Flag bits for the match() function */
 
-#define match_condassert   0x01    /* Called to check a condition assertion */
-#define match_isgroup      0x02    /* Set if start of bracketed group */
+#define match_condassert     0x01  /* Called to check a condition assertion */
+#define match_cbegroup       0x02  /* Could-be-empty unlimited repeat group */
 
 /* Non-error returns from the match() function. Error returns are externally
 defined PCRE_ERROR_xxx codes, which are all negative. */
@@ -68,6 +68,14 @@
 #define MATCH_MATCH        1
 #define MATCH_NOMATCH      0
 
+/* Special internal returns from the match() function. Make them sufficiently
+negative to avoid the external error codes. */
+
+#define MATCH_COMMIT       (-999)
+#define MATCH_PRUNE        (-998)
+#define MATCH_SKIP         (-997)
+#define MATCH_THEN         (-996)
+
 /* Maximum number of ints of offset to save on the stack for recursive calls.
 If the offset vector is bigger, malloc is used. This should be a multiple of 3,
 because the offset vector is always a multiple of 3 long. */
@@ -101,7 +109,7 @@
 static void
 pchars(const uschar *p, int length, BOOL is_subject, match_data *md)
 {
-int c;
+unsigned int c;
 if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
 while (length-- > 0)
   if (isprint(c = *(p++))) printf("%c", c); else printf("\\x%02x", c);
@@ -150,13 +158,39 @@
 
 if (length > md->end_subject - eptr) return FALSE;
 
-/* Separate the caselesss case for speed */
+/* Separate the caseless case for speed. In UTF-8 mode we can only do this
+properly if Unicode properties are supported. Otherwise, we can check only
+ASCII characters. */
 
 if ((ims & PCRE_CASELESS) != 0)
   {
+#ifdef SUPPORT_UTF8
+#ifdef SUPPORT_UCP
+  if (md->utf8)
+    {
+    USPTR endptr = eptr + length;
+    while (eptr < endptr)
+      {
+      int c, d;
+      GETCHARINC(c, eptr);
+      GETCHARINC(d, p);
+      if (c != d && c != UCD_OTHERCASE(d)) return FALSE;
+      }
+    }
+  else
+#endif
+#endif
+
+  /* The same code works when not in UTF-8 mode and in UTF-8 mode when there
+  is no UCP support. */
+
   while (length-- > 0)
-    if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE;
+    { if (md->lcc[*p++] != md->lcc[*eptr++]) return FALSE; }
   }
+
+/* In the caseful case, we can just compare the bytes, whether or not we
+are in UTF-8 mode. */
+
 else
   { while (length-- > 0) if (*p++ != *eptr++) return FALSE; }
 
@@ -186,20 +220,45 @@
 obtained from malloc() instead instead of on the stack. Macros are used to
 achieve this so that the actual code doesn't look very different to what it
 always used to.
+
+The original heap-recursive code used longjmp(). However, it seems that this
+can be very slow on some operating systems. Following a suggestion from Stan
+Switzer, the use of longjmp() has been abolished, at the cost of having to
+provide a unique number for each call to RMATCH. There is no way of generating
+a sequence of numbers at compile time in C. I have given them names, to make
+them stand out more clearly.
+
+Crude tests on x86 Linux show a small speedup of around 5-8%. However, on
+FreeBSD, avoiding longjmp() more than halves the time taken to run the standard
+tests. Furthermore, not using longjmp() means that local dynamic variables
+don't have indeterminate values; this has meant that the frame size can be
+reduced because the result can be "passed back" by straight setting of the
+variable instead of being passed in the frame.
 ****************************************************************************
 ***************************************************************************/
 
+/* Numbers for RMATCH calls. When this list is changed, the code at HEAP_RETURN
+below must be updated in sync.  */
+
+enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM6,  RM7,  RM8,  RM9,  RM10,
+       RM11,  RM12, RM13, RM14, RM15, RM16, RM17, RM18, RM19, RM20,
+       RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
+       RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39, RM40,
+       RM41,  RM42, RM43, RM44, RM45, RM46, RM47, RM48, RM49, RM50,
+       RM51,  RM52, RM53, RM54 };
 
 /* These versions of the macros use the stack, as normal. There are debugging
-versions and production versions. */
+versions and production versions. Note that the "rw" argument of RMATCH isn't
+actuall used in this definition. */
 
 #ifndef NO_RECURSE
 #define REGISTER register
+
 #ifdef PCRE_DEBUG
-#define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) \
+#define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
   { \
   printf("match() called in line %d\n", __LINE__); \
-  rx = match(ra,rb,rc,rd,re,rf,rg,rdepth+1); \
+  rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1); \
   printf("to line %d\n", __LINE__); \
   }
 #define RRETURN(ra) \
@@ -208,43 +267,38 @@
   return ra; \
   }
 #else
-#define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) \
-  rx = match(ra,rb,rc,rd,re,rf,rg,rdepth+1)
+#define RMATCH(ra,rb,rc,rd,re,rf,rg,rw) \
+  rrc = match(ra,rb,mstart,rc,rd,re,rf,rg,rdepth+1)
 #define RRETURN(ra) return ra
 #endif
 
 #else
 
 
-/* These versions of the macros manage a private stack on the heap. Note
-that the rd argument of RMATCH isn't actually used. It's the md argument of
-match(), which never changes. */
+/* These versions of the macros manage a private stack on the heap. Note that
+the "rd" argument of RMATCH isn't actually used in this definition. It's the md
+argument of match(), which never changes. */
 
 #define REGISTER
 
-#define RMATCH(rx,ra,rb,rc,rd,re,rf,rg)\
+#define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\
   {\
   heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\
-  if (setjmp(frame->Xwhere) == 0)\
-    {\
-    newframe->Xeptr = ra;\
-    newframe->Xecode = rb;\
-    newframe->Xoffset_top = rc;\
-    newframe->Xims = re;\
-    newframe->Xeptrb = rf;\
-    newframe->Xflags = rg;\
-    newframe->Xrdepth = frame->Xrdepth + 1;\
-    newframe->Xprevframe = frame;\
-    frame = newframe;\
-    DPRINTF(("restarting from line %d\n", __LINE__));\
-    goto HEAP_RECURSE;\
-    }\
-  else\
-    {\
-    DPRINTF(("longjumped back to line %d\n", __LINE__));\
-    frame = md->thisframe;\
-    rx = frame->Xresult;\
-    }\
+  frame->Xwhere = rw; \
+  newframe->Xeptr = ra;\
+  newframe->Xecode = rb;\
+  newframe->Xmstart = mstart;\
+  newframe->Xoffset_top = rc;\
+  newframe->Xims = re;\
+  newframe->Xeptrb = rf;\
+  newframe->Xflags = rg;\
+  newframe->Xrdepth = frame->Xrdepth + 1;\
+  newframe->Xprevframe = frame;\
+  frame = newframe;\
+  DPRINTF(("restarting from line %d\n", __LINE__));\
+  goto HEAP_RECURSE;\
+  L_##rw:\
+  DPRINTF(("jumped back to line %d\n", __LINE__));\
   }
 
 #define RRETURN(ra)\
@@ -254,9 +308,8 @@
   (pcre_stack_free)(newframe);\
   if (frame != NULL)\
     {\
-    frame->Xresult = ra;\
-    md->thisframe = frame;\
-    longjmp(frame->Xwhere, 1);\
+    rrc = ra;\
+    goto HEAP_RETURN;\
     }\
   return ra;\
   }
@@ -269,8 +322,9 @@
 
   /* Function arguments that may change */
 
-  const uschar *Xeptr;
+  USPTR Xeptr;
   const uschar *Xecode;
+  USPTR Xmstart;
   int Xoffset_top;
   long int Xims;
   eptrblock *Xeptrb;
@@ -279,19 +333,20 @@
 
   /* Function local variables */
 
-  const uschar *Xcallpat;
-  const uschar *Xcharptr;
-  const uschar *Xdata;
-  const uschar *Xnext;
-  const uschar *Xpp;
-  const uschar *Xprev;
-  const uschar *Xsaved_eptr;
+  USPTR Xcallpat;
+#ifdef SUPPORT_UTF8
+  USPTR Xcharptr;
+#endif
+  USPTR Xdata;
+  USPTR Xnext;
+  USPTR Xpp;
+  USPTR Xprev;
+  USPTR Xsaved_eptr;
 
   recursion_info Xnew_recursive;
 
   BOOL Xcur_is_word;
   BOOL Xcondition;
-  BOOL Xminimize;
   BOOL Xprev_is_word;
 
   unsigned long int Xoriginal_ims;
@@ -303,11 +358,13 @@
   int Xprop_category;
   int Xprop_chartype;
   int Xprop_script;
-  int *Xprop_test_variable;
+  int Xoclength;
+  uschar Xocchars[8];
 #endif
 
+  int Xcodelink;
   int Xctype;
-  int Xfc;
+  unsigned int Xfc;
   int Xfi;
   int Xlength;
   int Xmax;
@@ -321,10 +378,9 @@
 
   eptrblock Xnewptrb;
 
-  /* Place to pass back result, and where to jump back to */
+  /* Where to jump back to */
 
-  int  Xresult;
-  jmp_buf Xwhere;
+  int Xwhere;
 
 } heapframe;
 
@@ -340,10 +396,7 @@
 *         Match from current position            *
 *************************************************/
 
-/* On entry ecode points to the first opcode, and eptr to the first character
-in the subject string, while eptrb holds the value of eptr at the start of the
-last bracketed group - used for breaking infinite loops matching zero-length
-strings. This function is called recursively in many circumstances. Whenever it
+/* This function is called recursively in many circumstances. Whenever it
 returns a negative (error) response, the outer incarnation must also return the
 same response.
 
@@ -353,8 +406,10 @@
 made performance worse.
 
 Arguments:
-   eptr        pointer in subject
-   ecode       position in code
+   eptr        pointer to current character in subject
+   ecode       pointer to current position in compiled code
+   mstart      pointer to the current match start position (can be modified
+                 by encountering \K)
    offset_top  current top pointer
    md          pointer to "static" info for the match
    ims         current /i, /m, and /s options
@@ -362,7 +417,8 @@
                  brackets - for testing for empty matches
    flags       can contain
                  match_condassert - this is an assertion condition
-                 match_isgroup - this is the start of a bracketed group
+                 match_cbegroup - this is the start of an unlimited repeat
+                   group that can match an empty string
    rdepth      the recursion depth
 
 Returns:       MATCH_MATCH if matched            )  these values are >= 0
@@ -372,19 +428,22 @@
 */
 
 static int
-match(REGISTER USPTR eptr, REGISTER const uschar *ecode,
+match(REGISTER USPTR eptr, REGISTER const uschar *ecode, USPTR mstart,
   int offset_top, match_data *md, unsigned long int ims, eptrblock *eptrb,
   int flags, unsigned int rdepth)
 {
 /* These variables do not need to be preserved over recursion in this function,
-so they can be ordinary variables in all cases. Mark them with "register"
-because they are used a lot in loops. */
+so they can be ordinary variables in all cases. Mark some of them with
+"register" because they are used a lot in loops. */
 
 register int  rrc;         /* Returns from recursive calls */
 register int  i;           /* Used for loops not involving calls to RMATCH() */
-register unsigned int  c;  /* Character values not kept over RMATCH() calls */
+register unsigned int c;   /* Character values not kept over RMATCH() calls */
 register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
 
+BOOL minimize, possessive; /* Quantifier options */
+int condcode;
+
 /* When recursion is not being used, all "local" variables that have to be
 preserved over calls to RMATCH() are part of a "frame" which is obtained from
 heap storage. Set up the top-level frame here; others are obtained from the
@@ -398,6 +457,7 @@
 
 frame->Xeptr = eptr;
 frame->Xecode = ecode;
+frame->Xmstart = mstart;
 frame->Xoffset_top = offset_top;
 frame->Xims = ims;
 frame->Xeptrb = eptrb;
@@ -412,6 +472,7 @@
 
 #define eptr               frame->Xeptr
 #define ecode              frame->Xecode
+#define mstart             frame->Xmstart
 #define offset_top         frame->Xoffset_top
 #define ims                frame->Xims
 #define eptrb              frame->Xeptrb
@@ -424,6 +485,7 @@
 #define charptr            frame->Xcharptr
 #endif
 #define callpat            frame->Xcallpat
+#define codelink           frame->Xcodelink
 #define data               frame->Xdata
 #define next               frame->Xnext
 #define pp                 frame->Xpp
@@ -434,7 +496,6 @@
 
 #define cur_is_word        frame->Xcur_is_word
 #define condition          frame->Xcondition
-#define minimize           frame->Xminimize
 #define prev_is_word       frame->Xprev_is_word
 
 #define original_ims       frame->Xoriginal_ims
@@ -446,7 +507,8 @@
 #define prop_category      frame->Xprop_category
 #define prop_chartype      frame->Xprop_chartype
 #define prop_script        frame->Xprop_script
-#define prop_test_variable frame->Xprop_test_variable
+#define oclength           frame->Xoclength
+#define occhars            frame->Xocchars
 #endif
 
 #define ctype              frame->Xctype
@@ -470,7 +532,7 @@
 get preserved during recursion in the normal way. In this environment, fi and
 i, and fc and c, can be the same variables. */
 
-#else
+#else         /* NO_RECURSE not defined */
 #define fi i
 #define fc c
 
@@ -489,7 +551,6 @@
                                    /* that do not have to be preserved over  */
 BOOL cur_is_word;                  /* a recursive call to RMATCH().          */
 BOOL condition;
-BOOL minimize;
 BOOL prev_is_word;
 
 unsigned long int original_ims;
@@ -501,9 +562,11 @@
 int prop_category;
 int prop_chartype;
 int prop_script;
-int *prop_test_variable;
+int oclength;
+uschar occhars[8];
 #endif
 
+int codelink;
 int ctype;
 int length;
 int max;
@@ -516,7 +579,7 @@
 int stacksave[REC_STACK_SAVE_MAX];
 
 eptrblock newptrb;
-#endif
+#endif     /* NO_RECURSE */
 
 /* These statements are here to stop the compiler complaining about unitialized
 variables. */
@@ -524,9 +587,9 @@
 #ifdef SUPPORT_UCP
 prop_value = 0;
 prop_fail_result = 0;
-prop_test_variable = NULL;
 #endif
 
+
 /* This label is used for tail recursion, which is used in a few cases even
 when NO_RECURSE is not defined, in order to reduce the amount of stack that is
 used. Thanks to Ian Taylor for noticing this possibility and sending the
@@ -542,6 +605,12 @@
 complicated macro. It has to be used in one particular way. This shouldn't,
 however, impact performance when true recursion is being used. */
 
+#ifdef SUPPORT_UTF8
+utf8 = md->utf8;       /* Local copy of the flag */
+#else
+utf8 = FALSE;
+#endif
+
 /* First check that we haven't called match() too many times, or that we
 haven't exceeded the recursive call limit. */
 
@@ -550,66 +619,89 @@
 
 original_ims = ims;    /* Save for resetting on ')' */
 
-#ifdef SUPPORT_UTF8
-utf8 = md->utf8;       /* Local copy of the flag */
-#else
-utf8 = FALSE;
-#endif
-
-/* At the start of a bracketed group, add the current subject pointer to the
-stack of such pointers, to be re-instated at the end of the group when we hit
-the closing ket. When match() is called in other circumstances, we don't add to
-this stack. */
+/* At the start of a group with an unlimited repeat that may match an empty
+string, the match_cbegroup flag is set. When this is the case, add the current
+subject pointer to the chain of such remembered pointers, to be checked when we
+hit the closing ket, in order to break infinite loops that match no characters.
+When match() is called in other circumstances, don't add to the chain. The
+match_cbegroup flag must NOT be used with tail recursion, because the memory
+block that is used is on the stack, so a new one may be required for each
+match(). */
 
-if ((flags & match_isgroup) != 0)
+if ((flags & match_cbegroup) != 0)
   {
-  newptrb.epb_prev = eptrb;
   newptrb.epb_saved_eptr = eptr;
+  newptrb.epb_prev = eptrb;
   eptrb = &newptrb;
   }
 
-/* Now start processing the operations. */
+/* Now start processing the opcodes. */
 
 for (;;)
   {
+  minimize = possessive = FALSE;
   op = *ecode;
-  minimize = FALSE;
 
   /* For partial matching, remember if we ever hit the end of the subject after
   matching at least one subject character. */
 
   if (md->partial &&
       eptr >= md->end_subject &&
-      eptr > md->start_match)
+      eptr > mstart)
     md->hitend = TRUE;
 
-  /* Opening capturing bracket. If there is space in the offset vector, save
-  the current subject position in the working slot at the top of the vector. We
-  mustn't change the current values of the data slot, because they may be set
-  from a previous iteration of this group, and be referred to by a reference
-  inside the group.
-
-  If the bracket fails to match, we need to restore this value and also the
-  values of the final offsets, in case they were set by a previous iteration of
-  the same bracket.
-
-  If there isn't enough space in the offset vector, treat this as if it were a
-  non-capturing bracket. Don't worry about setting the flag for the error case
-  here; that is handled in the code for KET. */
-
-  if (op > OP_BRA)
+  switch(op)
     {
-    number = op - OP_BRA;
-
-    /* For extended extraction brackets (large number), we have to fish out the
-    number from a dummy opcode at the start. */
+    case OP_FAIL:
+    RRETURN(MATCH_NOMATCH);
 
-    if (number > EXTRACT_BASIC_MAX)
-      number = GET2(ecode, 2+LINK_SIZE);
+    case OP_PRUNE:
+    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+      ims, eptrb, flags, RM51);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    RRETURN(MATCH_PRUNE);
+
+    case OP_COMMIT:
+    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+      ims, eptrb, flags, RM52);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    RRETURN(MATCH_COMMIT);
+
+    case OP_SKIP:
+    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+      ims, eptrb, flags, RM53);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    md->start_match_ptr = eptr;   /* Pass back current position */
+    RRETURN(MATCH_SKIP);
+
+    case OP_THEN:
+    RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+      ims, eptrb, flags, RM54);
+    if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+    RRETURN(MATCH_THEN);
+
+    /* Handle a capturing bracket. If there is space in the offset vector, save
+    the current subject position in the working slot at the top of the vector.
+    We mustn't change the current values of the data slot, because they may be
+    set from a previous iteration of this group, and be referred to by a
+    reference inside the group.
+
+    If the bracket fails to match, we need to restore this value and also the
+    values of the final offsets, in case they were set by a previous iteration
+    of the same bracket.
+
+    If there isn't enough space in the offset vector, treat this as if it were
+    a non-capturing bracket. Don't worry about setting the flag for the error
+    case here; that is handled in the code for KET. */
+
+    case OP_CBRA:
+    case OP_SCBRA:
+    number = GET2(ecode, 1+LINK_SIZE);
     offset = number << 1;
 
 #ifdef PCRE_DEBUG
-    printf("start bracket %d subject=", number);
+    printf("start bracket %d\n", number);
+    printf("subject=");
     pchars(eptr, 16, TRUE, md);
     printf("\n");
 #endif
@@ -624,11 +716,12 @@
       DPRINTF(("saving %d %d %d\n", save_offset1, save_offset2, save_offset3));
       md->offset_vector[md->offset_end - number] = eptr - md->start_subject;
 
+      flags = (op == OP_SCBRA)? match_cbegroup : 0;
       do
         {
-        RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb,
-          match_isgroup);
-        if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md,
+          ims, eptrb, flags, RM1);
+        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
         md->capture_last = save_capture_last;
         ecode += GET(ecode, 1);
         }
@@ -643,40 +736,51 @@
       RRETURN(MATCH_NOMATCH);
       }
 
-    /* Insufficient room for saving captured contents */
-
-    else op = OP_BRA;
-    }
-
-  /* Other types of node can be handled by a switch */
+    /* FALL THROUGH ... Insufficient room for saving captured contents. Treat
+    as a non-capturing bracket. */
 
-  switch(op)
-    {
-    case OP_BRA:     /* Non-capturing bracket: optimized */
-    DPRINTF(("start bracket 0\n"));
+    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
 
-    /* Loop for all the alternatives */
+    DPRINTF(("insufficient capture room: treat as non-capturing\n"));
 
+    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+    /* VVVVVVVVVVVVVVVVVVVVVVVVV */
+
+    /* Non-capturing bracket. Loop for all the alternatives. When we get to the
+    final alternative within the brackets, we would return the result of a
+    recursive call to match() whatever happened. We can reduce stack usage by
+    turning this into a tail recursion, except in the case when match_cbegroup
+    is set.*/
+
+    case OP_BRA:
+    case OP_SBRA:
+    DPRINTF(("start non-capturing bracket\n"));
+    flags = (op >= OP_SBRA)? match_cbegroup : 0;
     for (;;)
       {
-      /* When we get to the final alternative within the brackets, we would
-      return the result of a recursive call to match() whatever happened. We
-      can reduce stack usage by turning this into a tail recursion. */
-
-      if (ecode[GET(ecode, 1)] != OP_ALT)
-       {
-       ecode += 1 + LINK_SIZE;
-       flags = match_isgroup;
-       DPRINTF(("bracket 0 tail recursion\n"));
-       goto TAIL_RECURSE;
-       }
+      if (ecode[GET(ecode, 1)] != OP_ALT)   /* Final alternative */
+        {
+        if (flags == 0)    /* Not a possibly empty group */
+          {
+          ecode += _pcre_OP_lengths[*ecode];
+          DPRINTF(("bracket 0 tail recursion\n"));
+          goto TAIL_RECURSE;
+          }
+
+        /* Possibly empty group; can't use tail recursion. */
+
+        RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
+          eptrb, flags, RM48);
+        RRETURN(rrc);
+        }
 
       /* For non-final alternatives, continue the loop for a NOMATCH result;
       otherwise return. */
 
-      RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb,
-        match_isgroup);
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      RMATCH(eptr, ecode + _pcre_OP_lengths[*ecode], offset_top, md, ims,
+        eptrb, flags, RM2);
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
       ecode += GET(ecode, 1);
       }
     /* Control never reaches here. */
@@ -688,55 +792,116 @@
     obeyed, we can use tail recursion to avoid using another stack frame. */
 
     case OP_COND:
-    if (ecode[LINK_SIZE+1] == OP_CREF) /* Condition extract or recurse test */
+    case OP_SCOND:
+    codelink= GET(ecode, 1);
+
+    /* Because of the way auto-callout works during compile, a callout item is
+    inserted between OP_COND and an assertion condition. */
+
+    if (ecode[LINK_SIZE+1] == OP_CALLOUT)
+      {
+      if (pcre_callout != NULL)
+        {
+        pcre_callout_block cb;
+        cb.version          = 1;   /* Version 1 of the callout block */
+        cb.callout_number   = ecode[LINK_SIZE+2];
+        cb.offset_vector    = md->offset_vector;
+        cb.subject          = (PCRE_SPTR)md->start_subject;
+        cb.subject_length   = md->end_subject - md->start_subject;
+        cb.start_match      = mstart - md->start_subject;
+        cb.current_position = eptr - md->start_subject;
+        cb.pattern_position = GET(ecode, LINK_SIZE + 3);
+        cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);
+        cb.capture_top      = offset_top/2;
+        cb.capture_last     = md->capture_last;
+        cb.callout_data     = md->callout_data;
+        if ((rrc = (*pcre_callout)(&cb)) > 0) RRETURN(MATCH_NOMATCH);
+        if (rrc < 0) RRETURN(rrc);
+        }
+      ecode += _pcre_OP_lengths[OP_CALLOUT];
+      }
+
+    condcode = ecode[LINK_SIZE+1];
+
+    /* Now see what the actual condition is */
+
+    if (condcode == OP_RREF)         /* Recursion test */
+      {
+      offset = GET2(ecode, LINK_SIZE + 2);     /* Recursion group number*/
+      condition = md->recursive != NULL &&
+        (offset == RREF_ANY || offset == md->recursive->group_num);
+      ecode += condition? 3 : GET(ecode, 1);
+      }
+
+    else if (condcode == OP_CREF)    /* Group used test */
       {
       offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */
-      condition = (offset == CREF_RECURSE * 2)?
-        (md->recursive != NULL) :
-        (offset < offset_top && md->offset_vector[offset] >= 0);
-      ecode += condition? (LINK_SIZE + 4) : (LINK_SIZE + 1 + GET(ecode, 1));
-      flags = match_isgroup;
-      goto TAIL_RECURSE;
+      condition = offset < offset_top && md->offset_vector[offset] >= 0;
+      ecode += condition? 3 : GET(ecode, 1);
+      }
+
+    else if (condcode == OP_DEF)     /* DEFINE - always false */
+      {
+      condition = FALSE;
+      ecode += GET(ecode, 1);
       }
 
     /* The condition is an assertion. Call match() to evaluate it - setting
-    the final argument TRUE causes it to stop at the end of an assertion. */
+    the final argument match_condassert causes it to stop at the end of an
+    assertion. */
 
     else
       {
-      RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
-          match_condassert | match_isgroup);
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
+          match_condassert, RM3);
       if (rrc == MATCH_MATCH)
         {
-        ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE+2);
+        condition = TRUE;
+        ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);
         while (*ecode == OP_ALT) ecode += GET(ecode, 1);
         }
-      else if (rrc != MATCH_NOMATCH)
+      else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
         {
         RRETURN(rrc);         /* Need braces because of following else */
         }
-      else ecode += GET(ecode, 1);
+      else
+        {
+        condition = FALSE;
+        ecode += codelink;
+        }
+      }
 
-      /* We are now at the branch that is to be obeyed. As there is only one,
-      we can use tail recursion to avoid using another stack frame. */
+    /* We are now at the branch that is to be obeyed. As there is only one,
+    we can use tail recursion to avoid using another stack frame, except when
+    match_cbegroup is required for an unlimited repeat of a possibly empty
+    group. If the second alternative doesn't exist, we can just plough on. */
 
+    if (condition || *ecode == OP_ALT)
+      {
+      ecode += 1 + LINK_SIZE;
+      if (op == OP_SCOND)        /* Possibly empty group */
+        {
+        RMATCH(eptr, ecode, offset_top, md, ims, eptrb, match_cbegroup, RM49);
+        RRETURN(rrc);
+        }
+      else                       /* Group must match something */
+        {
+        flags = 0;
+        goto TAIL_RECURSE;
+        }
+      }
+    else                         /* Condition false & no alternative */
+      {
       ecode += 1 + LINK_SIZE;
-      flags = match_isgroup;
-      goto TAIL_RECURSE;
       }
-    /* Control never reaches here */
-
-    /* Skip over conditional reference or large extraction number data if
-    encountered. */
-
-    case OP_CREF:
-    case OP_BRANUMBER:
-    ecode += 3;
     break;
 
-    /* End of the pattern. If we are in a recursion, we should restore the
-    offsets appropriately and continue from after the call. */
 
+    /* End of the pattern, either real or forced. If we are in a top-level
+    recursion, we should restore the offsets appropriately and continue from
+    after the call. */
+
+    case OP_ACCEPT:
     case OP_END:
     if (md->recursive != NULL && md->recursive->group_num == 0)
       {
@@ -745,7 +910,7 @@
       md->recursive = rec->prevrec;
       memmove(md->offset_vector, rec->offset_save,
         rec->saved_max * sizeof(int));
-      md->start_match = rec->save_start;
+      mstart = rec->save_start;
       ims = original_ims;
       ecode = rec->after_call;
       break;
@@ -754,9 +919,10 @@
     /* Otherwise, if PCRE_NOTEMPTY is set, fail if we have matched an empty
     string - backtracking will then try other alternatives, if any. */
 
-    if (md->notempty && eptr == md->start_match) RRETURN(MATCH_NOMATCH);
-    md->end_match_ptr = eptr;          /* Record where we ended */
-    md->end_offset_top = offset_top;   /* and how many extracts were taken */
+    if (md->notempty && eptr == mstart) RRETURN(MATCH_NOMATCH);
+    md->end_match_ptr = eptr;           /* Record where we ended */
+    md->end_offset_top = offset_top;    /* and how many extracts were taken */
+    md->start_match_ptr = mstart;       /* and the start (\K can modify) */
     RRETURN(MATCH_MATCH);
 
     /* Change option settings */
@@ -777,10 +943,10 @@
     case OP_ASSERTBACK:
     do
       {
-      RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
-        match_isgroup);
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
+        RM4);
       if (rrc == MATCH_MATCH) break;
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
       ecode += GET(ecode, 1);
       }
     while (*ecode == OP_ALT);
@@ -804,10 +970,10 @@
     case OP_ASSERTBACK_NOT:
     do
       {
-      RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL,
-        match_isgroup);
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, NULL, 0,
+        RM5);
       if (rrc == MATCH_MATCH) RRETURN(MATCH_NOMATCH);
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
       ecode += GET(ecode,1);
       }
     while (*ecode == OP_ALT);
@@ -826,12 +992,12 @@
 #ifdef SUPPORT_UTF8
     if (utf8)
       {
-      c = GET(ecode,1);
-      for (i = 0; i < c; i++)
+      i = GET(ecode, 1);
+      while (i-- > 0)
         {
         eptr--;
         if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
-        BACKCHAR(eptr)
+        BACKCHAR(eptr);
         }
       }
     else
@@ -840,7 +1006,7 @@
     /* No UTF-8 support, or not in UTF-8 mode: count is byte count */
 
       {
-      eptr -= GET(ecode,1);
+      eptr -= GET(ecode, 1);
       if (eptr < md->start_subject) RRETURN(MATCH_NOMATCH);
       }
 
@@ -862,7 +1028,7 @@
       cb.offset_vector    = md->offset_vector;
       cb.subject          = (PCRE_SPTR)md->start_subject;
       cb.subject_length   = md->end_subject - md->start_subject;
-      cb.start_match      = md->start_match - md->start_subject;
+      cb.start_match      = mstart - md->start_subject;
       cb.current_position = eptr - md->start_subject;
       cb.pattern_position = GET(ecode, 2);
       cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
@@ -897,13 +1063,8 @@
     case OP_RECURSE:
       {
       callpat = md->start_code + GET(ecode, 1);
-      new_recursive.group_num = *callpat - OP_BRA;
-
-      /* For extended extraction brackets (large number), we have to fish out
-      the number from a dummy opcode at the start. */
-
-      if (new_recursive.group_num > EXTRACT_BASIC_MAX)
-        new_recursive.group_num = GET2(callpat, 2+LINK_SIZE);
+      new_recursive.group_num = (callpat == md->start_code)? 0 :
+        GET2(callpat, 1 + LINK_SIZE);
 
       /* Add to "recursing stack" */
 
@@ -929,17 +1090,18 @@
 
       memcpy(new_recursive.offset_save, md->offset_vector,
             new_recursive.saved_max * sizeof(int));
-      new_recursive.save_start = md->start_match;
-      md->start_match = eptr;
+      new_recursive.save_start = mstart;
+      mstart = eptr;
 
       /* OK, now we can do the recursion. For each top-level alternative we
       restore the offset and recursion data. */
 
       DPRINTF(("Recursing into group %d\n", new_recursive.group_num));
+      flags = (*callpat >= OP_SBRA)? match_cbegroup : 0;
       do
         {
-        RMATCH(rrc, eptr, callpat + 1 + LINK_SIZE, offset_top, md, ims,
-            eptrb, match_isgroup);
+        RMATCH(eptr, callpat + _pcre_OP_lengths[*callpat], offset_top,
+          md, ims, eptrb, flags, RM6);
         if (rrc == MATCH_MATCH)
           {
           DPRINTF(("Recursion matched\n"));
@@ -948,9 +1110,11 @@
             (pcre_free)(new_recursive.offset_save);
           RRETURN(MATCH_MATCH);
           }
-        else if (rrc != MATCH_NOMATCH)
+        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
           {
           DPRINTF(("Recursion gave error %d\n", rrc));
+          if (new_recursive.offset_save != stacksave)
+            (pcre_free)(new_recursive.offset_save);
           RRETURN(rrc);
           }
 
@@ -982,10 +1146,9 @@
 
     do
       {
-      RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims,
-        eptrb, match_isgroup);
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM7);
       if (rrc == MATCH_MATCH) break;
-      if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
       ecode += GET(ecode,1);
       }
     while (*ecode == OP_ALT);
@@ -997,7 +1160,7 @@
     /* Continue as from after the assertion, updating the offsets high water
     mark, since extracts may have been taken. */
 
-    do ecode += GET(ecode,1); while (*ecode == OP_ALT);
+    do ecode += GET(ecode, 1); while (*ecode == OP_ALT);
 
     offset_top = md->end_offset_top;
     eptr = md->end_match_ptr;
@@ -1028,15 +1191,15 @@
 
     if (*ecode == OP_KETRMIN)
       {
-      RMATCH(rrc, eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0);
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM8);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       ecode = prev;
-      flags = match_isgroup;
+      flags = 0;
       goto TAIL_RECURSE;
       }
     else  /* OP_KETRMAX */
       {
-      RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_isgroup);
+      RMATCH(eptr, prev, offset_top, md, ims, eptrb, match_cbegroup, RM9);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       ecode += 1 + LINK_SIZE;
       flags = 0;
@@ -1051,47 +1214,61 @@
     do ecode += GET(ecode,1); while (*ecode == OP_ALT);
     break;
 
-    /* BRAZERO and BRAMINZERO occur just before a bracket group, indicating
-    that it may occur zero times. It may repeat infinitely, or not at all -
-    i.e. it could be ()* or ()? in the pattern. Brackets with fixed upper
-    repeat limits are compiled as a number of copies, with the optional ones
-    preceded by BRAZERO or BRAMINZERO. */
+    /* BRAZERO, BRAMINZERO and SKIPZERO occur just before a bracket group,
+    indicating that it may occur zero times. It may repeat infinitely, or not
+    at all - i.e. it could be ()* or ()? or even (){0} in the pattern. Brackets
+    with fixed upper repeat limits are compiled as a number of copies, with the
+    optional ones preceded by BRAZERO or BRAMINZERO. */
 
     case OP_BRAZERO:
       {
       next = ecode+1;
-      RMATCH(rrc, eptr, next, offset_top, md, ims, eptrb, match_isgroup);
+      RMATCH(eptr, next, offset_top, md, ims, eptrb, 0, RM10);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       do next += GET(next,1); while (*next == OP_ALT);
-      ecode = next + 1+LINK_SIZE;
+      ecode = next + 1 + LINK_SIZE;
       }
     break;
 
     case OP_BRAMINZERO:
       {
       next = ecode+1;
-      do next += GET(next,1); while (*next == OP_ALT);
-      RMATCH(rrc, eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb,
-        match_isgroup);
+      do next += GET(next, 1); while (*next == OP_ALT);
+      RMATCH(eptr, next + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0, RM11);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       ecode++;
       }
     break;
 
-    /* End of a group, repeated or non-repeating. If we are at the end of
-    an assertion "group", stop matching and return MATCH_MATCH, but record the
-    current high water mark for use by positive assertions. Do this also
-    for the "once" (not-backup up) groups. */
+    case OP_SKIPZERO:
+      {
+      next = ecode+1;
+      do next += GET(next,1); while (*next == OP_ALT);
+      ecode = next + 1 + LINK_SIZE;
+      }
+    break;
+
+    /* End of a group, repeated or non-repeating. */
 
     case OP_KET:
     case OP_KETRMIN:
     case OP_KETRMAX:
     prev = ecode - GET(ecode, 1);
-    saved_eptr = eptrb->epb_saved_eptr;
 
-    /* Back up the stack of bracket start pointers. */
+    /* If this was a group that remembered the subject start, in order to break
+    infinite repeats of empty string matches, retrieve the subject start from
+    the chain. Otherwise, set it NULL. */
+
+    if (*prev >= OP_SBRA)
+      {
+      saved_eptr = eptrb->epb_saved_eptr;   /* Value at start of group */
+      eptrb = eptrb->epb_prev;              /* Backup to previous group */
+      }
+    else saved_eptr = NULL;
 
-    eptrb = eptrb->epb_prev;
+    /* If we are at the end of an assertion group, stop matching and return
+    MATCH_MATCH, but record the current high water mark for use by positive
+    assertions. Do this also for the "once" (atomic) groups. */
 
     if (*prev == OP_ASSERT || *prev == OP_ASSERT_NOT ||
         *prev == OP_ASSERTBACK || *prev == OP_ASSERTBACK_NOT ||
@@ -1102,18 +1279,15 @@
       RRETURN(MATCH_MATCH);
       }
 
-    /* In all other cases except a conditional group we have to check the
-    group number back at the start and if necessary complete handling an
-    extraction by setting the offsets and bumping the high water mark. */
+    /* For capturing groups we have to check the group number back at the start
+    and if necessary complete handling an extraction by setting the offsets and
+    bumping the high water mark. Note that whole-pattern recursion is coded as
+    a recurse into group 0, so it won't be picked up here. Instead, we catch it
+    when the OP_END is reached. Other recursion is handled here. */
 
-    if (*prev != OP_COND)
+    if (*prev == OP_CBRA || *prev == OP_SCBRA)
       {
-      number = *prev - OP_BRA;
-
-      /* For extended extraction brackets (large number), we have to fish out
-      the number from a dummy opcode at the start. */
-
-      if (number > EXTRACT_BASIC_MAX) number = GET2(prev, 2+LINK_SIZE);
+      number = GET2(prev, 1+LINK_SIZE);
       offset = number << 1;
 
 #ifdef PCRE_DEBUG
@@ -1121,42 +1295,34 @@
       printf("\n");
 #endif
 
-      /* Test for a numbered group. This includes groups called as a result
-      of recursion. Note that whole-pattern recursion is coded as a recurse
-      into group 0, so it won't be picked up here. Instead, we catch it when
-      the OP_END is reached. */
-
-      if (number > 0)
+      md->capture_last = number;
+      if (offset >= md->offset_max) md->offset_overflow = TRUE; else
         {
-        md->capture_last = number;
-        if (offset >= md->offset_max) md->offset_overflow = TRUE; else
-          {
-          md->offset_vector[offset] =
-            md->offset_vector[md->offset_end - number];
-          md->offset_vector[offset+1] = eptr - md->start_subject;
-          if (offset_top <= offset) offset_top = offset + 2;
-          }
-
-        /* Handle a recursively called group. Restore the offsets
-        appropriately and continue from after the call. */
-
-        if (md->recursive != NULL && md->recursive->group_num == number)
-          {
-          recursion_info *rec = md->recursive;
-          DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
-          md->recursive = rec->prevrec;
-          md->start_match = rec->save_start;
-          memcpy(md->offset_vector, rec->offset_save,
-            rec->saved_max * sizeof(int));
-          ecode = rec->after_call;
-          ims = original_ims;
-          break;
-          }
+        md->offset_vector[offset] =
+          md->offset_vector[md->offset_end - number];
+        md->offset_vector[offset+1] = eptr - md->start_subject;
+        if (offset_top <= offset) offset_top = offset + 2;
+        }
+
+      /* Handle a recursively called group. Restore the offsets
+      appropriately and continue from after the call. */
+
+      if (md->recursive != NULL && md->recursive->group_num == number)
+        {
+        recursion_info *rec = md->recursive;
+        DPRINTF(("Recursion (%d) succeeded - continuing\n", number));
+        md->recursive = rec->prevrec;
+        mstart = rec->save_start;
+        memcpy(md->offset_vector, rec->offset_save,
+          rec->saved_max * sizeof(int));
+        ecode = rec->after_call;
+        ims = original_ims;
+        break;
         }
       }
 
-    /* Reset the value of the ims flags, in case they got changed during
-    the group. */
+    /* For both capturing and non-capturing groups, reset the value of the ims
+    flags, in case they got changed during the group. */
 
     ims = original_ims;
     DPRINTF(("ims reset to %02lx\n", ims));
@@ -1175,19 +1341,26 @@
 
     /* The repeating kets try the rest of the pattern or restart from the
     preceding bracket, in the appropriate order. In the second case, we can use
-    tail recursion to avoid using another stack frame. */
+    tail recursion to avoid using another stack frame, unless we have an
+    unlimited repeat of a group that can match an empty string. */
+
+    flags = (*prev >= OP_SBRA)? match_cbegroup : 0;
 
     if (*ecode == OP_KETRMIN)
       {
-      RMATCH(rrc, eptr, ecode + 1+LINK_SIZE, offset_top, md, ims, eptrb, 0);
+      RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, ims, eptrb, 0, RM12);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+      if (flags != 0)    /* Could match an empty string */
+        {
+        RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM50);
+        RRETURN(rrc);
+        }
       ecode = prev;
-      flags = match_isgroup;
       goto TAIL_RECURSE;
       }
     else  /* OP_KETRMAX */
       {
-      RMATCH(rrc, eptr, prev, offset_top, md, ims, eptrb, match_isgroup);
+      RMATCH(eptr, prev, offset_top, md, ims, eptrb, flags, RM13);
       if (rrc != MATCH_NOMATCH) RRETURN(rrc);
       ecode += 1 + LINK_SIZE;
       flags = 0;
@@ -1202,9 +1375,7 @@
     if ((ims & PCRE_MULTILINE) != 0)
       {
       if (eptr != md->start_subject &&
-          (eptr == md->end_subject ||
-           eptr < md->start_subject + md->nllen ||
-           !IS_NEWLINE(eptr - md->nllen)))
+          (eptr == md->end_subject || !WAS_NEWLINE(eptr)))
         RRETURN(MATCH_NOMATCH);
       ecode++;
       break;
@@ -1225,6 +1396,13 @@
     ecode++;
     break;
 
+    /* Reset the start of match point */
+
+    case OP_SET_SOM:
+    mstart = eptr;
+    ecode++;
+    break;
+
     /* Assert before internal newline if multiline, or before a terminating
     newline unless endonly is set, else end of subject unless noteol is set. */
 
@@ -1244,7 +1422,7 @@
       if (!md->endonly)
         {
         if (eptr != md->end_subject &&
-            (eptr != md->end_subject - md->nllen || !IS_NEWLINE(eptr)))
+            (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
           RRETURN(MATCH_NOMATCH);
         ecode++;
         break;
@@ -1263,7 +1441,7 @@
 
     case OP_EODN:
     if (eptr != md->end_subject &&
-        (eptr != md->end_subject - md->nllen || !IS_NEWLINE(eptr)))
+        (!IS_NEWLINE(eptr) || eptr != md->end_subject - md->nllen))
       RRETURN(MATCH_NOMATCH);
     ecode++;
     break;
@@ -1283,7 +1461,7 @@
         {
         if (eptr == md->start_subject) prev_is_word = FALSE; else
           {
-          const uschar *lastptr = eptr - 1;
+          USPTR lastptr = eptr - 1;
           while((*lastptr & 0xc0) == 0x80) lastptr--;
           GETCHAR(c, lastptr);
           prev_is_word = c < 256 && (md->ctypes[c] & ctype_word) != 0;
@@ -1317,14 +1495,12 @@
     /* Match a single character type; inline for speed */
 
     case OP_ANY:
-    if ((ims & PCRE_DOTALL) == 0)
-      {
-      if (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr))
-        RRETURN(MATCH_NOMATCH);
-      }
+    if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
+    /* Fall through */
+
+    case OP_ALLANY:
     if (eptr++ >= md->end_subject) RRETURN(MATCH_NOMATCH);
-    if (utf8)
-      while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+    if (utf8) while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
     ecode++;
     break;
 
@@ -1414,6 +1590,126 @@
     ecode++;
     break;
 
+    case OP_ANYNL:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: RRETURN(MATCH_NOMATCH);
+      case 0x000d:
+      if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+      break;
+
+      case 0x000a:
+      break;
+
+      case 0x000b:
+      case 0x000c:
+      case 0x0085:
+      case 0x2028:
+      case 0x2029:
+      if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+      break;
+      }
+    ecode++;
+    break;
+
+    case OP_NOT_HSPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: break;
+      case 0x09:      /* HT */
+      case 0x20:      /* SPACE */
+      case 0xa0:      /* NBSP */
+      case 0x1680:    /* OGHAM SPACE MARK */
+      case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+      case 0x2000:    /* EN QUAD */
+      case 0x2001:    /* EM QUAD */
+      case 0x2002:    /* EN SPACE */
+      case 0x2003:    /* EM SPACE */
+      case 0x2004:    /* THREE-PER-EM SPACE */
+      case 0x2005:    /* FOUR-PER-EM SPACE */
+      case 0x2006:    /* SIX-PER-EM SPACE */
+      case 0x2007:    /* FIGURE SPACE */
+      case 0x2008:    /* PUNCTUATION SPACE */
+      case 0x2009:    /* THIN SPACE */
+      case 0x200A:    /* HAIR SPACE */
+      case 0x202f:    /* NARROW NO-BREAK SPACE */
+      case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+      case 0x3000:    /* IDEOGRAPHIC SPACE */
+      RRETURN(MATCH_NOMATCH);
+      }
+    ecode++;
+    break;
+
+    case OP_HSPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: RRETURN(MATCH_NOMATCH);
+      case 0x09:      /* HT */
+      case 0x20:      /* SPACE */
+      case 0xa0:      /* NBSP */
+      case 0x1680:    /* OGHAM SPACE MARK */
+      case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+      case 0x2000:    /* EN QUAD */
+      case 0x2001:    /* EM QUAD */
+      case 0x2002:    /* EN SPACE */
+      case 0x2003:    /* EM SPACE */
+      case 0x2004:    /* THREE-PER-EM SPACE */
+      case 0x2005:    /* FOUR-PER-EM SPACE */
+      case 0x2006:    /* SIX-PER-EM SPACE */
+      case 0x2007:    /* FIGURE SPACE */
+      case 0x2008:    /* PUNCTUATION SPACE */
+      case 0x2009:    /* THIN SPACE */
+      case 0x200A:    /* HAIR SPACE */
+      case 0x202f:    /* NARROW NO-BREAK SPACE */
+      case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+      case 0x3000:    /* IDEOGRAPHIC SPACE */
+      break;
+      }
+    ecode++;
+    break;
+
+    case OP_NOT_VSPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: break;
+      case 0x0a:      /* LF */
+      case 0x0b:      /* VT */
+      case 0x0c:      /* FF */
+      case 0x0d:      /* CR */
+      case 0x85:      /* NEL */
+      case 0x2028:    /* LINE SEPARATOR */
+      case 0x2029:    /* PARAGRAPH SEPARATOR */
+      RRETURN(MATCH_NOMATCH);
+      }
+    ecode++;
+    break;
+
+    case OP_VSPACE:
+    if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+    GETCHARINCTEST(c, eptr);
+    switch(c)
+      {
+      default: RRETURN(MATCH_NOMATCH);
+      case 0x0a:      /* LF */
+      case 0x0b:      /* VT */
+      case 0x0c:      /* FF */
+      case 0x0d:      /* CR */
+      case 0x85:      /* NEL */
+      case 0x2028:    /* LINE SEPARATOR */
+      case 0x2029:    /* PARAGRAPH SEPARATOR */
+      break;
+      }
+    ecode++;
+    break;
+
 #ifdef SUPPORT_UCP
     /* Check the next character by Unicode property. We will get here only
     if the support is in the binary; otherwise a compile-time error occurs. */
@@ -1423,8 +1719,7 @@
     if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
     GETCHARINCTEST(c, eptr);
       {
-      int chartype, script;
-      int category = _pcre_ucp_findprop(c, &chartype, &script);
+      const ucd_record *prop = GET_UCD(c);
 
       switch(ecode[1])
         {
@@ -1433,30 +1728,29 @@
         break;
 
         case PT_LAMP:
-        if ((chartype == ucp_Lu ||
-             chartype == ucp_Ll ||
-             chartype == ucp_Lt) == (op == OP_NOTPROP))
+        if ((prop->chartype == ucp_Lu ||
+             prop->chartype == ucp_Ll ||
+             prop->chartype == ucp_Lt) == (op == OP_NOTPROP))
           RRETURN(MATCH_NOMATCH);
          break;
 
         case PT_GC:
-        if ((ecode[2] != category) == (op == OP_PROP))
+        if ((ecode[2] != _pcre_ucp_gentype[prop->chartype]) == (op == OP_PROP))
           RRETURN(MATCH_NOMATCH);
         break;
 
         case PT_PC:
-        if ((ecode[2] != chartype) == (op == OP_PROP))
+        if ((ecode[2] != prop->chartype) == (op == OP_PROP))
           RRETURN(MATCH_NOMATCH);
         break;
 
         case PT_SC:
-        if ((ecode[2] != script) == (op == OP_PROP))
+        if ((ecode[2] != prop->script) == (op == OP_PROP))
           RRETURN(MATCH_NOMATCH);
         break;
 
         default:
         RRETURN(PCRE_ERROR_INTERNAL);
-        break;
         }
 
       ecode += 3;
@@ -1470,8 +1764,7 @@
     if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
     GETCHARINCTEST(c, eptr);
       {
-      int chartype, script;
-      int category = _pcre_ucp_findprop(c, &chartype, &script);
+      int category = UCD_CATEGORY(c);
       if (category == ucp_M) RRETURN(MATCH_NOMATCH);
       while (eptr < md->end_subject)
         {
@@ -1480,7 +1773,7 @@
           {
           GETCHARLEN(c, eptr, len);
           }
-        category = _pcre_ucp_findprop(c, &chartype, &script);
+        category = UCD_CATEGORY(c);
         if (category != ucp_M) break;
         eptr += len;
         }
@@ -1501,16 +1794,25 @@
     case OP_REF:
       {
       offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
-      ecode += 3;                                 /* Advance past item */
+      ecode += 3;
+
+      /* If the reference is unset, there are two possibilities:
+
+      (a) In the default, Perl-compatible state, set the length to be longer
+      than the amount of subject left; this ensures that every attempt at a
+      match fails. We can't just fail here, because of the possibility of
+      quantifiers with zero minima.
+
+      (b) If the JavaScript compatibility flag is set, set the length to zero
+      so that the back reference matches an empty string.
 
-      /* If the reference is unset, set the length to be longer than the amount
-      of subject left; this ensures that every attempt at a match fails. We
-      can't just fail here, because of the possibility of quantifiers with zero
-      minima. */
-
-      length = (offset >= offset_top || md->offset_vector[offset] < 0)?
-        md->end_subject - eptr + 1 :
-        md->offset_vector[offset+1] - md->offset_vector[offset];
+      Otherwise, set the length to the length of what was matched by the
+      referenced subpattern. */
+
+      if (offset >= offset_top || md->offset_vector[offset] < 0)
+        length = (md->jscript_compat)? 0 : md->end_subject - eptr + 1;
+      else
+        length = md->offset_vector[offset+1] - md->offset_vector[offset];
 
       /* Set up for repetition, or handle the non-repeated case */
 
@@ -1570,7 +1872,7 @@
         {
         for (fi = min;; fi++)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM14);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (fi >= max || !match_ref(offset, eptr, length, md, ims))
             RRETURN(MATCH_NOMATCH);
@@ -1591,7 +1893,7 @@
           }
         while (eptr >= pp)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM15);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           eptr -= length;
           }
@@ -1696,7 +1998,7 @@
           {
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM16);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             GETCHARINC(c, eptr);
@@ -1716,7 +2018,7 @@
           {
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM17);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             c = *eptr++;
@@ -1753,7 +2055,7 @@
             }
           for (;;)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM18);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (eptr-- == pp) break;        /* Stop if tried at original pos */
             BACKCHAR(eptr);
@@ -1772,7 +2074,7 @@
             }
           while (eptr >= pp)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM19);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             eptr--;
             }
@@ -1785,7 +2087,8 @@
 
 
     /* Match an extended character class. This opcode is encountered only
-    in UTF-8 mode, because that's the only time it is compiled. */
+    when UTF-8 mode mode is supported. Nevertheless, we may not be in UTF-8
+    mode, because Unicode properties are supported in non-UTF-8 mode. */
 
 #ifdef SUPPORT_UTF8
     case OP_XCLASS:
@@ -1827,7 +2130,7 @@
       for (i = 1; i <= min; i++)
         {
         if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-        GETCHARINC(c, eptr);
+        GETCHARINCTEST(c, eptr);
         if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
         }
 
@@ -1843,10 +2146,10 @@
         {
         for (fi = min;; fi++)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM20);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-          GETCHARINC(c, eptr);
+          GETCHARINCTEST(c, eptr);
           if (!_pcre_xclass(c, data)) RRETURN(MATCH_NOMATCH);
           }
         /* Control never gets here */
@@ -1861,16 +2164,16 @@
           {
           int len = 1;
           if (eptr >= md->end_subject) break;
-          GETCHARLEN(c, eptr, len);
+          GETCHARLENTEST(c, eptr, len);
           if (!_pcre_xclass(c, data)) break;
           eptr += len;
           }
         for(;;)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM21);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (eptr-- == pp) break;        /* Stop if tried at original pos */
-          BACKCHAR(eptr)
+          if (utf8) BACKCHAR(eptr);
           }
         RRETURN(MATCH_NOMATCH);
         }
@@ -1926,7 +2229,7 @@
 
       else
         {
-        int dc;
+        unsigned int dc;
         GETCHARINC(dc, eptr);
         ecode += length;
 
@@ -1936,7 +2239,7 @@
         if (fc != dc)
           {
 #ifdef SUPPORT_UCP
-          if (dc != _pcre_ucp_othercase(fc))
+          if (dc != UCD_OTHERCASE(fc))
 #endif
             RRETURN(MATCH_NOMATCH);
           }
@@ -1953,13 +2256,17 @@
       }
     break;
 
-    /* Match a single character repeatedly; different opcodes share code. */
+    /* Match a single character repeatedly. */
 
     case OP_EXACT:
     min = max = GET2(ecode, 1);
     ecode += 3;
     goto REPEATCHAR;
 
+    case OP_POSUPTO:
+    possessive = TRUE;
+    /* Fall through */
+
     case OP_UPTO:
     case OP_MINUPTO:
     min = 0;
@@ -1968,6 +2275,27 @@
     ecode += 3;
     goto REPEATCHAR;
 
+    case OP_POSSTAR:
+    possessive = TRUE;
+    min = 0;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATCHAR;
+
+    case OP_POSPLUS:
+    possessive = TRUE;
+    min = 1;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATCHAR;
+
+    case OP_POSQUERY:
+    possessive = TRUE;
+    min = 0;
+    max = 1;
+    ecode++;
+    goto REPEATCHAR;
+
     case OP_STAR:
     case OP_MINSTAR:
     case OP_PLUS:
@@ -1999,20 +2327,18 @@
 
       if (length > 1)
         {
-        int oclength = 0;
-        uschar occhars[8];
-
 #ifdef SUPPORT_UCP
-        int othercase;
+        unsigned int othercase;
         if ((ims & PCRE_CASELESS) != 0 &&
-            (othercase = _pcre_ucp_othercase(fc)) >= 0 &&
-             othercase >= 0)
+            (othercase = UCD_OTHERCASE(fc)) != fc)
           oclength = _pcre_ord2utf8(othercase, occhars);
+        else oclength = 0;
 #endif  /* SUPPORT_UCP */
 
         for (i = 1; i <= min; i++)
           {
           if (memcmp(eptr, charptr, length) == 0) eptr += length;
+#ifdef SUPPORT_UCP
           /* Need braces because of following else */
           else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
           else
@@ -2020,6 +2346,9 @@
             if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);
             eptr += oclength;
             }
+#else   /* without SUPPORT_UCP */
+          else { RRETURN(MATCH_NOMATCH); }
+#endif  /* SUPPORT_UCP */
           }
 
         if (min == max) continue;
@@ -2028,10 +2357,11 @@
           {
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM22);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             if (memcmp(eptr, charptr, length) == 0) eptr += length;
+#ifdef SUPPORT_UCP
             /* Need braces because of following else */
             else if (oclength == 0) { RRETURN(MATCH_NOMATCH); }
             else
@@ -2039,30 +2369,45 @@
               if (memcmp(eptr, occhars, oclength) != 0) RRETURN(MATCH_NOMATCH);
               eptr += oclength;
               }
+#else   /* without SUPPORT_UCP */
+            else { RRETURN (MATCH_NOMATCH); }
+#endif  /* SUPPORT_UCP */
             }
           /* Control never gets here */
           }
-        else
+
+        else  /* Maximize */
           {
           pp = eptr;
           for (i = min; i < max; i++)
             {
             if (eptr > md->end_subject - length) break;
             if (memcmp(eptr, charptr, length) == 0) eptr += length;
+#ifdef SUPPORT_UCP
             else if (oclength == 0) break;
             else
               {
               if (memcmp(eptr, occhars, oclength) != 0) break;
               eptr += oclength;
               }
+#else   /* without SUPPORT_UCP */
+            else break;
+#endif  /* SUPPORT_UCP */
             }
-          while (eptr >= pp)
+
+          if (possessive) continue;
+          for(;;)
            {
-           RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+           RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM23);
            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+           if (eptr == pp) RRETURN(MATCH_NOMATCH);
+#ifdef SUPPORT_UCP
+           eptr--;
+           BACKCHAR(eptr);
+#else   /* without SUPPORT_UCP */
            eptr -= length;
+#endif  /* SUPPORT_UCP */
            }
-          RRETURN(MATCH_NOMATCH);
           }
         /* Control never gets here */
         }
@@ -2102,7 +2447,7 @@
         {
         for (fi = min;; fi++)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM24);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (fi >= max || eptr >= md->end_subject ||
               fc != md->lcc[*eptr++])
@@ -2110,7 +2455,7 @@
           }
         /* Control never gets here */
         }
-      else
+      else  /* Maximize */
         {
         pp = eptr;
         for (i = min; i < max; i++)
@@ -2118,9 +2463,10 @@
           if (eptr >= md->end_subject || fc != md->lcc[*eptr]) break;
           eptr++;
           }
+        if (possessive) continue;
         while (eptr >= pp)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM25);
           eptr--;
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           }
@@ -2139,14 +2485,14 @@
         {
         for (fi = min;; fi++)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM26);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (fi >= max || eptr >= md->end_subject || fc != *eptr++)
             RRETURN(MATCH_NOMATCH);
           }
         /* Control never gets here */
         }
-      else
+      else  /* Maximize */
         {
         pp = eptr;
         for (i = min; i < max; i++)
@@ -2154,9 +2500,10 @@
           if (eptr >= md->end_subject || fc != *eptr) break;
           eptr++;
           }
+        if (possessive) continue;
         while (eptr >= pp)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM27);
           eptr--;
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           }
@@ -2206,6 +2553,34 @@
     ecode += 3;
     goto REPEATNOTCHAR;
 
+    case OP_NOTPOSSTAR:
+    possessive = TRUE;
+    min = 0;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSPLUS:
+    possessive = TRUE;
+    min = 1;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSQUERY:
+    possessive = TRUE;
+    min = 0;
+    max = 1;
+    ecode++;
+    goto REPEATNOTCHAR;
+
+    case OP_NOTPOSUPTO:
+    possessive = TRUE;
+    min = 0;
+    max = GET2(ecode, 1);
+    ecode += 3;
+    goto REPEATNOTCHAR;
+
     case OP_NOTSTAR:
     case OP_NOTMINSTAR:
     case OP_NOTPLUS:
@@ -2245,7 +2620,7 @@
       /* UTF-8 mode */
       if (utf8)
         {
-        register int d;
+        register unsigned int d;
         for (i = 1; i <= min; i++)
           {
           GETCHARINC(d, eptr);
@@ -2270,15 +2645,16 @@
         /* UTF-8 mode */
         if (utf8)
           {
-          register int d;
+          register unsigned int d;
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM28);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             GETCHARINC(d, eptr);
             if (d < 256) d = md->lcc[d];
-            if (fi >= max || eptr >= md->end_subject || fc == d)
-              RRETURN(MATCH_NOMATCH);
+            if (fc == d) RRETURN(MATCH_NOMATCH);
+
             }
           }
         else
@@ -2287,7 +2663,7 @@
           {
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM29);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject || fc == md->lcc[*eptr++])
               RRETURN(MATCH_NOMATCH);
@@ -2306,7 +2682,7 @@
         /* UTF-8 mode */
         if (utf8)
           {
-          register int d;
+          register unsigned int d;
           for (i = min; i < max; i++)
             {
             int len = 1;
@@ -2316,9 +2692,10 @@
             if (fc == d) break;
             eptr += len;
             }
-          for(;;)
+        if (possessive) continue;
+        for(;;)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM30);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (eptr-- == pp) break;        /* Stop if tried at original pos */
             BACKCHAR(eptr);
@@ -2333,9 +2710,10 @@
             if (eptr >= md->end_subject || fc == md->lcc[*eptr]) break;
             eptr++;
             }
+          if (possessive) continue;
           while (eptr >= pp)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM31);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             eptr--;
             }
@@ -2354,7 +2732,7 @@
       /* UTF-8 mode */
       if (utf8)
         {
-        register int d;
+        register unsigned int d;
         for (i = 1; i <= min; i++)
           {
           GETCHARINC(d, eptr);
@@ -2377,14 +2755,14 @@
         /* UTF-8 mode */
         if (utf8)
           {
-          register int d;
+          register unsigned int d;
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM32);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+            if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             GETCHARINC(d, eptr);
-            if (fi >= max || eptr >= md->end_subject || fc == d)
-              RRETURN(MATCH_NOMATCH);
+            if (fc == d) RRETURN(MATCH_NOMATCH);
             }
           }
         else
@@ -2393,7 +2771,7 @@
           {
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM33);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject || fc == *eptr++)
               RRETURN(MATCH_NOMATCH);
@@ -2412,7 +2790,7 @@
         /* UTF-8 mode */
         if (utf8)
           {
-          register int d;
+          register unsigned int d;
           for (i = min; i < max; i++)
             {
             int len = 1;
@@ -2421,9 +2799,10 @@
             if (fc == d) break;
             eptr += len;
             }
+          if (possessive) continue;
           for(;;)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM34);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (eptr-- == pp) break;        /* Stop if tried at original pos */
             BACKCHAR(eptr);
@@ -2438,9 +2817,10 @@
             if (eptr >= md->end_subject || fc == *eptr) break;
             eptr++;
             }
+          if (possessive) continue;
           while (eptr >= pp)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM35);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             eptr--;
             }
@@ -2469,17 +2849,45 @@
     ecode += 3;
     goto REPEATTYPE;
 
-    case OP_TYPESTAR:
-    case OP_TYPEMINSTAR:
-    case OP_TYPEPLUS:
-    case OP_TYPEMINPLUS:
-    case OP_TYPEQUERY:
-    case OP_TYPEMINQUERY:
-    c = *ecode++ - OP_TYPESTAR;
-    minimize = (c & 1) != 0;
-    min = rep_min[c];                 /* Pick up values from tables; */
-    max = rep_max[c];                 /* zero for max => infinity */
-    if (max == 0) max = INT_MAX;
+    case OP_TYPEPOSSTAR:
+    possessive = TRUE;
+    min = 0;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSPLUS:
+    possessive = TRUE;
+    min = 1;
+    max = INT_MAX;
+    ecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSQUERY:
+    possessive = TRUE;
+    min = 0;
+    max = 1;
+    ecode++;
+    goto REPEATTYPE;
+
+    case OP_TYPEPOSUPTO:
+    possessive = TRUE;
+    min = 0;
+    max = GET2(ecode, 1);
+    ecode += 3;
+    goto REPEATTYPE;
+
+    case OP_TYPESTAR:
+    case OP_TYPEMINSTAR:
+    case OP_TYPEPLUS:
+    case OP_TYPEMINPLUS:
+    case OP_TYPEQUERY:
+    case OP_TYPEMINQUERY:
+    c = *ecode++ - OP_TYPESTAR;
+    minimize = (c & 1) != 0;
+    min = rep_min[c];                 /* Pick up values from tables; */
+    max = rep_max[c];                 /* zero for max => infinity */
+    if (max == 0) max = INT_MAX;
 
     /* Common code for all repeated single character type matches. Note that
     in UTF-8 mode, '.' matches a character of any length, but for the other
@@ -2519,7 +2927,7 @@
           for (i = 1; i <= min; i++)
             {
             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-            GETCHARINC(c, eptr);
+            GETCHARINCTEST(c, eptr);
             }
           break;
 
@@ -2527,8 +2935,8 @@
           for (i = 1; i <= min; i++)
             {
             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-            GETCHARINC(c, eptr);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            GETCHARINCTEST(c, eptr);
+            prop_chartype = UCD_CHARTYPE(c);
             if ((prop_chartype == ucp_Lu ||
                  prop_chartype == ucp_Ll ||
                  prop_chartype == ucp_Lt) == prop_fail_result)
@@ -2540,8 +2948,8 @@
           for (i = 1; i <= min; i++)
             {
             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-            GETCHARINC(c, eptr);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            GETCHARINCTEST(c, eptr);
+            prop_category = UCD_CATEGORY(c);
             if ((prop_category == prop_value) == prop_fail_result)
               RRETURN(MATCH_NOMATCH);
             }
@@ -2551,8 +2959,8 @@
           for (i = 1; i <= min; i++)
             {
             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-            GETCHARINC(c, eptr);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            GETCHARINCTEST(c, eptr);
+            prop_chartype = UCD_CHARTYPE(c);
             if ((prop_chartype == prop_value) == prop_fail_result)
               RRETURN(MATCH_NOMATCH);
             }
@@ -2562,8 +2970,8 @@
           for (i = 1; i <= min; i++)
             {
             if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
-            GETCHARINC(c, eptr);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            GETCHARINCTEST(c, eptr);
+            prop_script = UCD_SCRIPT(c);
             if ((prop_script == prop_value) == prop_fail_result)
               RRETURN(MATCH_NOMATCH);
             }
@@ -2571,7 +2979,6 @@
 
           default:
           RRETURN(PCRE_ERROR_INTERNAL);
-          break;
           }
         }
 
@@ -2583,7 +2990,7 @@
         for (i = 1; i <= min; i++)
           {
           GETCHARINCTEST(c, eptr);
-          prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+          prop_category = UCD_CATEGORY(c);
           if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
           while (eptr < md->end_subject)
             {
@@ -2592,7 +2999,7 @@
               {
               GETCHARLEN(c, eptr, len);
               }
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_category = UCD_CATEGORY(c);
             if (prop_category != ucp_M) break;
             eptr += len;
             }
@@ -2610,20 +3017,156 @@
         case OP_ANY:
         for (i = 1; i <= min; i++)
           {
-          if (eptr >= md->end_subject ||
-               ((ims & PCRE_DOTALL) == 0 &&
-                 eptr <= md->end_subject - md->nllen &&
-                 IS_NEWLINE(eptr)))
+          if (eptr >= md->end_subject || IS_NEWLINE(eptr))
             RRETURN(MATCH_NOMATCH);
           eptr++;
           while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
           }
         break;
 
+        case OP_ALLANY:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          eptr++;
+          while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+          }
+        break;
+
         case OP_ANYBYTE:
         eptr += min;
         break;
 
+        case OP_ANYNL:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x000d:
+            if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+            break;
+
+            case 0x000a:
+            break;
+
+            case 0x000b:
+            case 0x000c:
+            case 0x0085:
+            case 0x2028:
+            case 0x2029:
+            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_HSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: break;
+            case 0x09:      /* HT */
+            case 0x20:      /* SPACE */
+            case 0xa0:      /* NBSP */
+            case 0x1680:    /* OGHAM SPACE MARK */
+            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+            case 0x2000:    /* EN QUAD */
+            case 0x2001:    /* EM QUAD */
+            case 0x2002:    /* EN SPACE */
+            case 0x2003:    /* EM SPACE */
+            case 0x2004:    /* THREE-PER-EM SPACE */
+            case 0x2005:    /* FOUR-PER-EM SPACE */
+            case 0x2006:    /* SIX-PER-EM SPACE */
+            case 0x2007:    /* FIGURE SPACE */
+            case 0x2008:    /* PUNCTUATION SPACE */
+            case 0x2009:    /* THIN SPACE */
+            case 0x200A:    /* HAIR SPACE */
+            case 0x202f:    /* NARROW NO-BREAK SPACE */
+            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+            case 0x3000:    /* IDEOGRAPHIC SPACE */
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_HSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x09:      /* HT */
+            case 0x20:      /* SPACE */
+            case 0xa0:      /* NBSP */
+            case 0x1680:    /* OGHAM SPACE MARK */
+            case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+            case 0x2000:    /* EN QUAD */
+            case 0x2001:    /* EM QUAD */
+            case 0x2002:    /* EN SPACE */
+            case 0x2003:    /* EM SPACE */
+            case 0x2004:    /* THREE-PER-EM SPACE */
+            case 0x2005:    /* FOUR-PER-EM SPACE */
+            case 0x2006:    /* SIX-PER-EM SPACE */
+            case 0x2007:    /* FIGURE SPACE */
+            case 0x2008:    /* PUNCTUATION SPACE */
+            case 0x2009:    /* THIN SPACE */
+            case 0x200A:    /* HAIR SPACE */
+            case 0x202f:    /* NARROW NO-BREAK SPACE */
+            case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+            case 0x3000:    /* IDEOGRAPHIC SPACE */
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_VSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: break;
+            case 0x0a:      /* LF */
+            case 0x0b:      /* VT */
+            case 0x0c:      /* FF */
+            case 0x0d:      /* CR */
+            case 0x85:      /* NEL */
+            case 0x2028:    /* LINE SEPARATOR */
+            case 0x2029:    /* PARAGRAPH SEPARATOR */
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_VSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          GETCHARINC(c, eptr);
+          switch(c)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x0a:      /* LF */
+            case 0x0b:      /* VT */
+            case 0x0c:      /* FF */
+            case 0x0d:      /* CR */
+            case 0x85:      /* NEL */
+            case 0x2028:    /* LINE SEPARATOR */
+            case 0x2029:    /* PARAGRAPH SEPARATOR */
+            break;
+            }
+          }
+        break;
+
         case OP_NOT_DIGIT:
         for (i = 1; i <= min; i++)
           {
@@ -2648,9 +3191,9 @@
         for (i = 1; i <= min; i++)
           {
           if (eptr >= md->end_subject ||
-             (*eptr < 128 && (md->ctypes[*eptr++] & ctype_space) != 0))
+             (*eptr < 128 && (md->ctypes[*eptr] & ctype_space) != 0))
             RRETURN(MATCH_NOMATCH);
-          while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+          while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
           }
         break;
 
@@ -2668,9 +3211,9 @@
         for (i = 1; i <= min; i++)
           {
           if (eptr >= md->end_subject ||
-             (*eptr < 128 && (md->ctypes[*eptr++] & ctype_word) != 0))
+             (*eptr < 128 && (md->ctypes[*eptr] & ctype_word) != 0))
             RRETURN(MATCH_NOMATCH);
-          while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
+          while (++eptr < md->end_subject && (*eptr & 0xc0) == 0x80);
           }
         break;
 
@@ -2692,27 +3235,116 @@
 #endif     /* SUPPORT_UTF8 */
 
       /* Code for the non-UTF-8 case for minimum matching of operators other
-      than OP_PROP and OP_NOTPROP. */
+      than OP_PROP and OP_NOTPROP. We can assume that there are the minimum
+      number of bytes present, as this was tested above. */
 
       switch(ctype)
         {
         case OP_ANY:
-        if ((ims & PCRE_DOTALL) == 0)
+        for (i = 1; i <= min; i++)
           {
-          for (i = 1; i <= min; i++)
-            {
-            if (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr))
-              RRETURN(MATCH_NOMATCH);
-            eptr++;
-            }
+          if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
+          eptr++;
           }
-        else eptr += min;
+        break;
+
+        case OP_ALLANY:
+        eptr += min;
         break;
 
         case OP_ANYBYTE:
         eptr += min;
         break;
 
+        /* Because of the CRLF case, we can't assume the minimum number of
+        bytes are present in this case. */
+
+        case OP_ANYNL:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x000d:
+            if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+            break;
+            case 0x000a:
+            break;
+
+            case 0x000b:
+            case 0x000c:
+            case 0x0085:
+            if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_HSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: break;
+            case 0x09:      /* HT */
+            case 0x20:      /* SPACE */
+            case 0xa0:      /* NBSP */
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_HSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x09:      /* HT */
+            case 0x20:      /* SPACE */
+            case 0xa0:      /* NBSP */
+            break;
+            }
+          }
+        break;
+
+        case OP_NOT_VSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: break;
+            case 0x0a:      /* LF */
+            case 0x0b:      /* VT */
+            case 0x0c:      /* FF */
+            case 0x0d:      /* CR */
+            case 0x85:      /* NEL */
+            RRETURN(MATCH_NOMATCH);
+            }
+          }
+        break;
+
+        case OP_VSPACE:
+        for (i = 1; i <= min; i++)
+          {
+          if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
+          switch(*eptr++)
+            {
+            default: RRETURN(MATCH_NOMATCH);
+            case 0x0a:      /* LF */
+            case 0x0b:      /* VT */
+            case 0x0c:      /* FF */
+            case 0x0d:      /* CR */
+            case 0x85:      /* NEL */
+            break;
+            }
+          }
+        break;
+
         case OP_NOT_DIGIT:
         for (i = 1; i <= min; i++)
           if ((md->ctypes[*eptr++] & ctype_digit) != 0) RRETURN(MATCH_NOMATCH);
@@ -2768,71 +3400,70 @@
           case PT_ANY:
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM36);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             GETCHARINC(c, eptr);
             if (prop_fail_result) RRETURN(MATCH_NOMATCH);
             }
-          break;
+          /* Control never gets here */
 
           case PT_LAMP:
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM37);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             GETCHARINC(c, eptr);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_chartype = UCD_CHARTYPE(c);
             if ((prop_chartype == ucp_Lu ||
                  prop_chartype == ucp_Ll ||
                  prop_chartype == ucp_Lt) == prop_fail_result)
               RRETURN(MATCH_NOMATCH);
             }
-          break;
+          /* Control never gets here */
 
           case PT_GC:
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM38);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             GETCHARINC(c, eptr);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_category = UCD_CATEGORY(c);
             if ((prop_category == prop_value) == prop_fail_result)
               RRETURN(MATCH_NOMATCH);
             }
-          break;
+          /* Control never gets here */
 
           case PT_PC:
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM39);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             GETCHARINC(c, eptr);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_chartype = UCD_CHARTYPE(c);
             if ((prop_chartype == prop_value) == prop_fail_result)
               RRETURN(MATCH_NOMATCH);
             }
-          break;
+          /* Control never gets here */
 
           case PT_SC:
           for (fi = min;; fi++)
             {
-            RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+            RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM40);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
             GETCHARINC(c, eptr);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_script = UCD_SCRIPT(c);
             if ((prop_script == prop_value) == prop_fail_result)
               RRETURN(MATCH_NOMATCH);
             }
-          break;
+          /* Control never gets here */
 
           default:
           RRETURN(PCRE_ERROR_INTERNAL);
-          break;
           }
         }
 
@@ -2843,11 +3474,11 @@
         {
         for (fi = min;; fi++)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM41);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
           GETCHARINCTEST(c, eptr);
-          prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+          prop_category = UCD_CATEGORY(c);
           if (prop_category == ucp_M) RRETURN(MATCH_NOMATCH);
           while (eptr < md->end_subject)
             {
@@ -2856,7 +3487,7 @@
               {
               GETCHARLEN(c, eptr, len);
               }
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_category = UCD_CATEGORY(c);
             if (prop_category != ucp_M) break;
             eptr += len;
             }
@@ -2872,20 +3503,122 @@
         {
         for (fi = min;; fi++)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM42);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (fi >= max || eptr >= md->end_subject ||
-               (ctype == OP_ANY && (ims & PCRE_DOTALL) == 0 &&
-                eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))
+               (ctype == OP_ANY && IS_NEWLINE(eptr)))
             RRETURN(MATCH_NOMATCH);
 
           GETCHARINC(c, eptr);
           switch(ctype)
             {
-            case OP_ANY:        /* This is the DOTALL case */
+            case OP_ANY:        /* This is the non-NL case */
+            case OP_ALLANY:
+            case OP_ANYBYTE:
             break;
 
-            case OP_ANYBYTE:
+            case OP_ANYNL:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x000d:
+              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+              break;
+              case 0x000a:
+              break;
+
+              case 0x000b:
+              case 0x000c:
+              case 0x0085:
+              case 0x2028:
+              case 0x2029:
+              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+              break;
+              }
+            break;
+
+            case OP_NOT_HSPACE:
+            switch(c)
+              {
+              default: break;
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              case 0x1680:    /* OGHAM SPACE MARK */
+              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+              case 0x2000:    /* EN QUAD */
+              case 0x2001:    /* EM QUAD */
+              case 0x2002:    /* EN SPACE */
+              case 0x2003:    /* EM SPACE */
+              case 0x2004:    /* THREE-PER-EM SPACE */
+              case 0x2005:    /* FOUR-PER-EM SPACE */
+              case 0x2006:    /* SIX-PER-EM SPACE */
+              case 0x2007:    /* FIGURE SPACE */
+              case 0x2008:    /* PUNCTUATION SPACE */
+              case 0x2009:    /* THIN SPACE */
+              case 0x200A:    /* HAIR SPACE */
+              case 0x202f:    /* NARROW NO-BREAK SPACE */
+              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+              case 0x3000:    /* IDEOGRAPHIC SPACE */
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_HSPACE:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              case 0x1680:    /* OGHAM SPACE MARK */
+              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+              case 0x2000:    /* EN QUAD */
+              case 0x2001:    /* EM QUAD */
+              case 0x2002:    /* EN SPACE */
+              case 0x2003:    /* EM SPACE */
+              case 0x2004:    /* THREE-PER-EM SPACE */
+              case 0x2005:    /* FOUR-PER-EM SPACE */
+              case 0x2006:    /* SIX-PER-EM SPACE */
+              case 0x2007:    /* FIGURE SPACE */
+              case 0x2008:    /* PUNCTUATION SPACE */
+              case 0x2009:    /* THIN SPACE */
+              case 0x200A:    /* HAIR SPACE */
+              case 0x202f:    /* NARROW NO-BREAK SPACE */
+              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+              case 0x3000:    /* IDEOGRAPHIC SPACE */
+              break;
+              }
+            break;
+
+            case OP_NOT_VSPACE:
+            switch(c)
+              {
+              default: break;
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              case 0x2028:    /* LINE SEPARATOR */
+              case 0x2029:    /* PARAGRAPH SEPARATOR */
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_VSPACE:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              case 0x2028:    /* LINE SEPARATOR */
+              case 0x2029:    /* PARAGRAPH SEPARATOR */
+              break;
+              }
             break;
 
             case OP_NOT_DIGIT:
@@ -2929,20 +3662,85 @@
         {
         for (fi = min;; fi++)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM43);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (fi >= max || eptr >= md->end_subject ||
-               ((ims & PCRE_DOTALL) == 0 &&
-                 eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))
+               (ctype == OP_ANY && IS_NEWLINE(eptr)))
             RRETURN(MATCH_NOMATCH);
 
           c = *eptr++;
           switch(ctype)
             {
-            case OP_ANY:   /* This is the DOTALL case */
+            case OP_ANY:     /* This is the non-NL case */
+            case OP_ALLANY:
+            case OP_ANYBYTE:
             break;
 
-            case OP_ANYBYTE:
+            case OP_ANYNL:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x000d:
+              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
+              break;
+
+              case 0x000a:
+              break;
+
+              case 0x000b:
+              case 0x000c:
+              case 0x0085:
+              if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
+              break;
+              }
+            break;
+
+            case OP_NOT_HSPACE:
+            switch(c)
+              {
+              default: break;
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_HSPACE:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              break;
+              }
+            break;
+
+            case OP_NOT_VSPACE:
+            switch(c)
+              {
+              default: break;
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              RRETURN(MATCH_NOMATCH);
+              }
+            break;
+
+            case OP_VSPACE:
+            switch(c)
+              {
+              default: RRETURN(MATCH_NOMATCH);
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              break;
+              }
             break;
 
             case OP_NOT_DIGIT:
@@ -2977,7 +3775,7 @@
       /* Control never gets here */
       }
 
-    /* If maximizing it is worth using inline code for speed, doing the type
+    /* If maximizing, it is worth using inline code for speed, doing the type
     test once at the start (i.e. keep it out of the loop). Again, keep the
     UTF-8 and UCP stuff separate. */
 
@@ -3007,7 +3805,7 @@
             int len = 1;
             if (eptr >= md->end_subject) break;
             GETCHARLEN(c, eptr, len);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_chartype = UCD_CHARTYPE(c);
             if ((prop_chartype == ucp_Lu ||
                  prop_chartype == ucp_Ll ||
                  prop_chartype == ucp_Lt) == prop_fail_result)
@@ -3022,7 +3820,7 @@
             int len = 1;
             if (eptr >= md->end_subject) break;
             GETCHARLEN(c, eptr, len);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_category = UCD_CATEGORY(c);
             if ((prop_category == prop_value) == prop_fail_result)
               break;
             eptr+= len;
@@ -3035,7 +3833,7 @@
             int len = 1;
             if (eptr >= md->end_subject) break;
             GETCHARLEN(c, eptr, len);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_chartype = UCD_CHARTYPE(c);
             if ((prop_chartype == prop_value) == prop_fail_result)
               break;
             eptr+= len;
@@ -3048,7 +3846,7 @@
             int len = 1;
             if (eptr >= md->end_subject) break;
             GETCHARLEN(c, eptr, len);
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_script = UCD_SCRIPT(c);
             if ((prop_script == prop_value) == prop_fail_result)
               break;
             eptr+= len;
@@ -3058,12 +3856,13 @@
 
         /* eptr is now past the end of the maximum run */
 
+        if (possessive) continue;
         for(;;)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM44);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (eptr-- == pp) break;        /* Stop if tried at original pos */
-          BACKCHAR(eptr);
+          if (utf8) BACKCHAR(eptr);
           }
         }
 
@@ -3076,7 +3875,7 @@
           {
           if (eptr >= md->end_subject) break;
           GETCHARINCTEST(c, eptr);
-          prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+          prop_category = UCD_CATEGORY(c);
           if (prop_category == ucp_M) break;
           while (eptr < md->end_subject)
             {
@@ -3085,7 +3884,7 @@
               {
               GETCHARLEN(c, eptr, len);
               }
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_category = UCD_CATEGORY(c);
             if (prop_category != ucp_M) break;
             eptr += len;
             }
@@ -3093,20 +3892,21 @@
 
         /* eptr is now past the end of the maximum run */
 
+        if (possessive) continue;
         for(;;)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM45);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (eptr-- == pp) break;        /* Stop if tried at original pos */
           for (;;)                        /* Move back over one extended */
             {
             int len = 1;
-            BACKCHAR(eptr);
             if (!utf8) c = *eptr; else
               {
+              BACKCHAR(eptr);
               GETCHARLEN(c, eptr, len);
               }
-            prop_category = _pcre_ucp_findprop(c, &prop_chartype, &prop_script);
+            prop_category = UCD_CATEGORY(c);
             if (prop_category != ucp_M) break;
             eptr--;
             }
@@ -3124,32 +3924,13 @@
         switch(ctype)
           {
           case OP_ANY:
-
-          /* Special code is required for UTF8, but when the maximum is
-          unlimited we don't need it, so we repeat the non-UTF8 code. This is
-          probably worth it, because .* is quite a common idiom. */
-
           if (max < INT_MAX)
             {
-            if ((ims & PCRE_DOTALL) == 0)
-              {
-              for (i = min; i < max; i++)
-                {
-                if (eptr >= md->end_subject ||
-                    (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))
-                  break;
-                eptr++;
-                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
-                }
-              }
-            else
+            for (i = min; i < max; i++)
               {
-              for (i = min; i < max; i++)
-                {
-                if (eptr >= md->end_subject) break;
-                eptr++;
-                while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
-                }
+              if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
+              eptr++;
+              while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
               }
             }
 
@@ -3157,34 +3938,124 @@
 
           else
             {
-            if ((ims & PCRE_DOTALL) == 0)
+            for (i = min; i < max; i++)
               {
-              for (i = min; i < max; i++)
-                {
-                if (eptr >= md->end_subject ||
-                    (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))
-                  break;
-                eptr++;
-                }
-              break;
+              if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
+              eptr++;
+              while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
               }
-            else
+            }
+          break;
+
+          case OP_ALLANY:
+          if (max < INT_MAX)
+            {
+            for (i = min; i < max; i++)
               {
-              c = max - min;
-              if (c > md->end_subject - eptr) c = md->end_subject - eptr;
-              eptr += c;
+              if (eptr >= md->end_subject) break;
+              eptr++;
+              while (eptr < md->end_subject && (*eptr & 0xc0) == 0x80) eptr++;
               }
             }
+          else eptr = md->end_subject;   /* Unlimited UTF-8 repeat */
           break;
 
           /* The byte case is the same as non-UTF8 */
 
           case OP_ANYBYTE:
           c = max - min;
-          if (c > md->end_subject - eptr) c = md->end_subject - eptr;
+          if (c > (unsigned int)(md->end_subject - eptr))
+            c = md->end_subject - eptr;
           eptr += c;
           break;
 
+          case OP_ANYNL:
+          for (i = min; i < max; i++)
+            {
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            if (c == 0x000d)
+              {
+              if (++eptr >= md->end_subject) break;
+              if (*eptr == 0x000a) eptr++;
+              }
+            else
+              {
+              if (c != 0x000a &&
+                  (md->bsr_anycrlf ||
+                   (c != 0x000b && c != 0x000c &&
+                    c != 0x0085 && c != 0x2028 && c != 0x2029)))
+                break;
+              eptr += len;
+              }
+            }
+          break;
+
+          case OP_NOT_HSPACE:
+          case OP_HSPACE:
+          for (i = min; i < max; i++)
+            {
+            BOOL gotspace;
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            switch(c)
+              {
+              default: gotspace = FALSE; break;
+              case 0x09:      /* HT */
+              case 0x20:      /* SPACE */
+              case 0xa0:      /* NBSP */
+              case 0x1680:    /* OGHAM SPACE MARK */
+              case 0x180e:    /* MONGOLIAN VOWEL SEPARATOR */
+              case 0x2000:    /* EN QUAD */
+              case 0x2001:    /* EM QUAD */
+              case 0x2002:    /* EN SPACE */
+              case 0x2003:    /* EM SPACE */
+              case 0x2004:    /* THREE-PER-EM SPACE */
+              case 0x2005:    /* FOUR-PER-EM SPACE */
+              case 0x2006:    /* SIX-PER-EM SPACE */
+              case 0x2007:    /* FIGURE SPACE */
+              case 0x2008:    /* PUNCTUATION SPACE */
+              case 0x2009:    /* THIN SPACE */
+              case 0x200A:    /* HAIR SPACE */
+              case 0x202f:    /* NARROW NO-BREAK SPACE */
+              case 0x205f:    /* MEDIUM MATHEMATICAL SPACE */
+              case 0x3000:    /* IDEOGRAPHIC SPACE */
+              gotspace = TRUE;
+              break;
+              }
+            if (gotspace == (ctype == OP_NOT_HSPACE)) break;
+            eptr += len;
+            }
+          break;
+
+          case OP_NOT_VSPACE:
+          case OP_VSPACE:
+          for (i = min; i < max; i++)
+            {
+            BOOL gotspace;
+            int len = 1;
+            if (eptr >= md->end_subject) break;
+            GETCHARLEN(c, eptr, len);
+            switch(c)
+              {
+              default: gotspace = FALSE; break;
+              case 0x0a:      /* LF */
+              case 0x0b:      /* VT */
+              case 0x0c:      /* FF */
+              case 0x0d:      /* CR */
+              case 0x85:      /* NEL */
+              case 0x2028:    /* LINE SEPARATOR */
+              case 0x2029:    /* PARAGRAPH SEPARATOR */
+              gotspace = TRUE;
+              break;
+              }
+            if (gotspace == (ctype == OP_NOT_VSPACE)) break;
+            eptr += len;
+            }
+          break;
+
           case OP_NOT_DIGIT:
           for (i = min; i < max; i++)
             {
@@ -3257,39 +4128,99 @@
 
         /* eptr is now past the end of the maximum run */
 
+        if (possessive) continue;
         for(;;)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM46);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (eptr-- == pp) break;        /* Stop if tried at original pos */
           BACKCHAR(eptr);
           }
         }
       else
-#endif
+#endif  /* SUPPORT_UTF8 */
 
       /* Not UTF-8 mode */
         {
         switch(ctype)
           {
           case OP_ANY:
-          if ((ims & PCRE_DOTALL) == 0)
+          for (i = min; i < max; i++)
             {
-            for (i = min; i < max; i++)
+            if (eptr >= md->end_subject || IS_NEWLINE(eptr)) break;
+            eptr++;
+            }
+          break;
+
+          case OP_ALLANY:
+          case OP_ANYBYTE:
+          c = max - min;
+          if (c > (unsigned int)(md->end_subject - eptr))
+            c = md->end_subject - eptr;
+          eptr += c;
+          break;
+
+          case OP_ANYNL:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c == 0x000d)
+              {
+              if (++eptr >= md->end_subject) break;
+              if (*eptr == 0x000a) eptr++;
+              }
+            else
               {
-              if (eptr >= md->end_subject ||
-                  (eptr <= md->end_subject - md->nllen && IS_NEWLINE(eptr)))
+              if (c != 0x000a &&
+                  (md->bsr_anycrlf ||
+                    (c != 0x000b && c != 0x000c && c != 0x0085)))
                 break;
               eptr++;
               }
-            break;
             }
-          /* For DOTALL case, fall through and treat as \C */
+          break;
 
-          case OP_ANYBYTE:
-          c = max - min;
-          if (c > md->end_subject - eptr) c = md->end_subject - eptr;
-          eptr += c;
+          case OP_NOT_HSPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c == 0x09 || c == 0x20 || c == 0xa0) break;
+            eptr++;
+            }
+          break;
+
+          case OP_HSPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c != 0x09 && c != 0x20 && c != 0xa0) break;
+            eptr++;
+            }
+          break;
+
+          case OP_NOT_VSPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c == 0x0a || c == 0x0b || c == 0x0c || c == 0x0d || c == 0x85)
+              break;
+            eptr++;
+            }
+          break;
+
+          case OP_VSPACE:
+          for (i = min; i < max; i++)
+            {
+            if (eptr >= md->end_subject) break;
+            c = *eptr;
+            if (c != 0x0a && c != 0x0b && c != 0x0c && c != 0x0d && c != 0x85)
+              break;
+            eptr++;
+            }
           break;
 
           case OP_NOT_DIGIT:
@@ -3352,9 +4283,10 @@
 
         /* eptr is now past the end of the maximum run */
 
+        if (possessive) continue;
         while (eptr >= pp)
           {
-          RMATCH(rrc, eptr, ecode, offset_top, md, ims, eptrb, 0);
+          RMATCH(eptr, ecode, offset_top, md, ims, eptrb, 0, RM47);
           eptr--;
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           }
@@ -3366,14 +4298,12 @@
       }
     /* Control never gets here */
 
-    /* There's been some horrible disaster. Since all codes > OP_BRA are
-    for capturing brackets, and there shouldn't be any gaps between 0 and
-    OP_BRA, arrival here can only mean there is something seriously wrong
-    in the code above or the OP_xxx definitions. */
+    /* There's been some horrible disaster. Arrival here can only mean there is
+    something seriously wrong in the code above or the OP_xxx definitions. */
 
     default:
     DPRINTF(("Unknown opcode %d\n", *ecode));
-    RRETURN(PCRE_ERROR_UNKNOWN_NODE);
+    RRETURN(PCRE_ERROR_UNKNOWN_OPCODE);
     }
 
   /* Do not stick any code in here without much thought; it is assumed
@@ -3382,6 +4312,35 @@
 
   }             /* End of main loop */
 /* Control never reaches here */
+
+
+/* When compiling to use the heap rather than the stack for recursive calls to
+match(), the RRETURN() macro jumps here. The number that is saved in
+frame->Xwhere indicates which label we actually want to return to. */
+
+#ifdef NO_RECURSE
+#define LBL(val) case val: goto L_RM##val;
+HEAP_RETURN:
+switch (frame->Xwhere)
+  {
+  LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)
+  LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
+  LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
+  LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
+  LBL(53) LBL(54)
+#ifdef SUPPORT_UTF8
+  LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)
+  LBL(32) LBL(34) LBL(42) LBL(46)
+#ifdef SUPPORT_UCP
+  LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
+#endif  /* SUPPORT_UCP */
+#endif  /* SUPPORT_UTF8 */
+  default:
+  DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
+  return PCRE_ERROR_INTERNAL;
+  }
+#undef LBL
+#endif  /* NO_RECURSE */
 }
 
 
@@ -3394,6 +4353,7 @@
 #ifdef NO_RECURSE
 #undef eptr
 #undef ecode
+#undef mstart
 #undef offset_top
 #undef ims
 #undef eptrb
@@ -3411,7 +4371,6 @@
 
 #undef cur_is_word
 #undef condition
-#undef minimize
 #undef prev_is_word
 
 #undef original_ims
@@ -3467,7 +4426,7 @@
                  < -1 => some kind of unexpected problem
 */
 
-PCRE_DATA_SCOPE int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
   PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
   int offsetcount)
@@ -3484,6 +4443,7 @@
 BOOL firstline;
 BOOL first_byte_caseless = FALSE;
 BOOL req_byte_caseless = FALSE;
+BOOL utf8;
 match_data match_block;
 match_data *md = &match_block;
 const uschar *tables;
@@ -3553,7 +4513,7 @@
 /* Set up other data */
 
 anchored = ((re->options | options) & PCRE_ANCHORED) != 0;
-startline = (re->options & PCRE_STARTLINE) != 0;
+startline = (re->flags & PCRE_STARTLINE) != 0;
 firstline = (re->options & PCRE_FIRSTLINE) != 0;
 
 /* The code starts after the real_pcre block and the capture name table. */
@@ -3567,7 +4527,8 @@
 end_subject = md->end_subject;
 
 md->endonly = (re->options & PCRE_DOLLAR_ENDONLY) != 0;
-md->utf8 = (re->options & PCRE_UTF8) != 0;
+utf8 = md->utf8 = (re->options & PCRE_UTF8) != 0;
+md->jscript_compat = (re->options & PCRE_JAVASCRIPT_COMPAT) != 0;
 
 md->notbol = (options & PCRE_NOTBOL) != 0;
 md->noteol = (options & PCRE_NOTEOL) != 0;
@@ -3580,48 +4541,89 @@
 md->lcc = tables + lcc_offset;
 md->ctypes = tables + ctypes_offset;
 
-/* Handle different types of newline. The two bits give four cases. If nothing
-is set at run time, whatever was used at compile time applies. */
+/* Handle different \R options. */
 
-switch ((((options & PCRE_NEWLINE_CRLF) == 0)? re->options : options) &
-         PCRE_NEWLINE_CRLF)
+switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
   {
-  default:              newline = NEWLINE; break;   /* Compile-time default */
-  case PCRE_NEWLINE_CR: newline = '\r'; break;
-  case PCRE_NEWLINE_LF: newline = '\n'; break;
+  case 0:
+  if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
+    md->bsr_anycrlf = (re->options & PCRE_BSR_ANYCRLF) != 0;
+  else
+#ifdef BSR_ANYCRLF
+  md->bsr_anycrlf = TRUE;
+#else
+  md->bsr_anycrlf = FALSE;
+#endif
+  break;
+
+  case PCRE_BSR_ANYCRLF:
+  md->bsr_anycrlf = TRUE;
+  break;
+
+  case PCRE_BSR_UNICODE:
+  md->bsr_anycrlf = FALSE;
+  break;
+
+  default: return PCRE_ERROR_BADNEWLINE;
+  }
+
+/* Handle different types of newline. The three bits give eight cases. If
+nothing is set at run time, whatever was used at compile time applies. */
+
+switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options :
+        (pcre_uint32)options) & PCRE_NEWLINE_BITS)
+  {
+  case 0: newline = NEWLINE; break;   /* Compile-time default */
+  case PCRE_NEWLINE_CR: newline = CHAR_CR; break;
+  case PCRE_NEWLINE_LF: newline = CHAR_NL; break;
   case PCRE_NEWLINE_CR+
-       PCRE_NEWLINE_LF: newline = ('\r' << 8) | '\n'; break;
+       PCRE_NEWLINE_LF: newline = (CHAR_CR << 8) | CHAR_NL; break;
+  case PCRE_NEWLINE_ANY: newline = -1; break;
+  case PCRE_NEWLINE_ANYCRLF: newline = -2; break;
+  default: return PCRE_ERROR_BADNEWLINE;
   }
 
-if (newline > 255)
+if (newline == -2)
   {
-  md->nllen = 2;
-  md->nl[0] = (newline >> 8) & 255;
-  md->nl[1] = newline & 255;
+  md->nltype = NLTYPE_ANYCRLF;
+  }
+else if (newline < 0)
+  {
+  md->nltype = NLTYPE_ANY;
   }
 else
   {
-  md->nllen = 1;
-  md->nl[0] = newline;
+  md->nltype = NLTYPE_FIXED;
+  if (newline > 255)
+    {
+    md->nllen = 2;
+    md->nl[0] = (newline >> 8) & 255;
+    md->nl[1] = newline & 255;
+    }
+  else
+    {
+    md->nllen = 1;
+    md->nl[0] = newline;
+    }
   }
 
 /* Partial matching is supported only for a restricted set of regexes at the
 moment. */
 
-if (md->partial && (re->options & PCRE_NOPARTIAL) != 0)
+if (md->partial && (re->flags & PCRE_NOPARTIAL) != 0)
   return PCRE_ERROR_BADPARTIAL;
 
 /* Check a UTF-8 string if required. Unfortunately there's no way of passing
 back the character offset. */
 
 #ifdef SUPPORT_UTF8
-if (md->utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
+if (utf8 && (options & PCRE_NO_UTF8_CHECK) == 0)
   {
-  if (_pcre_valid_utf8((uschar *)subject, length) >= 0)
+  if (_pcre_valid_utf8((USPTR)subject, length) >= 0)
     return PCRE_ERROR_BADUTF8;
   if (start_offset > 0 && start_offset < length)
     {
-    int tb = ((uschar *)subject)[start_offset];
+    int tb = ((USPTR)subject)[start_offset];
     if (tb > 127)
       {
       tb &= 0xc0;
@@ -3685,7 +4687,7 @@
 
 if (!anchored)
   {
-  if ((re->options & PCRE_FIRSTSET) != 0)
+  if ((re->flags & PCRE_FIRSTSET) != 0)
     {
     first_byte = re->first_byte & 255;
     if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)
@@ -3700,19 +4702,23 @@
 /* For anchored or unanchored matches, there may be a "last known required
 character" set. */
 
-if ((re->options & PCRE_REQCHSET) != 0)
+if ((re->flags & PCRE_REQCHSET) != 0)
   {
   req_byte = re->req_byte & 255;
   req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;
   req_byte2 = (tables + fcc_offset)[req_byte];  /* case flipped */
   }
 
+
+/* ==========================================================================*/
+
 /* Loop for handling unanchored repeated matching attempts; for anchored regexs
 the loop runs just once. */
 
-do
+for(;;)
   {
   USPTR save_end_subject = end_subject;
+  USPTR new_start_match;
 
   /* Reset the maximum number of extractions we might see. */
 
@@ -3723,55 +4729,94 @@
     while (iptr < iend) *iptr++ = -1;
     }
 
-  /* Advance to a unique first char if possible. If firstline is TRUE, the
-  start of the match is constrained to the first line of a multiline string.
-  Implement this by temporarily adjusting end_subject so that we stop scanning
-  at a newline. If the match fails at the newline, later code breaks this loop.
-  */
+  /* If firstline is TRUE, the start of the match is constrained to the first
+  line of a multiline string. That is, the match must be before or at the first
+  newline. Implement this by temporarily adjusting end_subject so that we stop
+  scanning at a newline. If the match fails at the newline, later code breaks
+  this loop. */
 
   if (firstline)
     {
     USPTR t = start_match;
-    while (t <= save_end_subject - md->nllen && !IS_NEWLINE(t)) t++;
+#ifdef SUPPORT_UTF8
+    if (utf8)
+      {
+      while (t < md->end_subject && !IS_NEWLINE(t))
+        {
+        t++;
+        while (t < end_subject && (*t & 0xc0) == 0x80) t++;
+        }
+      }
+    else
+#endif
+    while (t < md->end_subject && !IS_NEWLINE(t)) t++;
     end_subject = t;
     }
 
-  /* Now test for a unique first byte */
+  /* There are some optimizations that avoid running the match if a known
+  starting point is not found, or if a known later character is not present.
+  However, there is an option that disables these, for testing and for ensuring
+  that all callouts do actually occur. */
 
-  if (first_byte >= 0)
+  if ((options & PCRE_NO_START_OPTIMIZE) == 0)
     {
-    if (first_byte_caseless)
-      while (start_match < end_subject &&
-             md->lcc[*start_match] != first_byte)
-        start_match++;
-    else
-      while (start_match < end_subject && *start_match != first_byte)
-        start_match++;
-    }
+    /* Advance to a unique first byte if there is one. */
 
-  /* Or to just after a linebreak for a multiline match if possible */
+    if (first_byte >= 0)
+      {
+      if (first_byte_caseless)
+        while (start_match < end_subject && md->lcc[*start_match] != first_byte)
+          start_match++;
+      else
+        while (start_match < end_subject && *start_match != first_byte)
+          start_match++;
+      }
 
-  else if (startline)
-    {
-    if (start_match >= md->start_subject + md->nllen +
-          start_offset)
+    /* Or to just after a linebreak for a multiline match */
+
+    else if (startline)
       {
-      while (start_match <= end_subject &&
-             !IS_NEWLINE(start_match - md->nllen))
-        start_match++;
+      if (start_match > md->start_subject + start_offset)
+        {
+#ifdef SUPPORT_UTF8
+        if (utf8)
+          {
+          while (start_match < end_subject && !WAS_NEWLINE(start_match))
+            {
+            start_match++;
+            while(start_match < end_subject && (*start_match & 0xc0) == 0x80)
+              start_match++;
+            }
+          }
+        else
+#endif
+        while (start_match < end_subject && !WAS_NEWLINE(start_match))
+          start_match++;
+
+        /* If we have just passed a CR and the newline option is ANY or ANYCRLF,
+        and we are now at a LF, advance the match position by one more character.
+        */
+
+        if (start_match[-1] == CHAR_CR &&
+             (md->nltype == NLTYPE_ANY || md->nltype == NLTYPE_ANYCRLF) &&
+             start_match < end_subject &&
+             *start_match == CHAR_NL)
+          start_match++;
+        }
       }
-    }
 
-  /* Or to a non-unique first char after study */
+    /* Or to a non-unique first byte after study */
 
-  else if (start_bits != NULL)
-    {
-    while (start_match < end_subject)
+    else if (start_bits != NULL)
       {
-      register unsigned int c = *start_match;
-      if ((start_bits[c/8] & (1 << (c&7))) == 0) start_match++; else break;
+      while (start_match < end_subject)
+        {
+        register unsigned int c = *start_match;
+        if ((start_bits[c/8] & (1 << (c&7))) == 0) start_match++;
+          else break;
+        }
       }
-    }
+    }   /* Starting optimizations */
 
   /* Restore fudged end_subject */
 
@@ -3783,23 +4828,25 @@
   printf("\n");
 #endif
 
-  /* If req_byte is set, we know that that character must appear in the subject
-  for the match to succeed. If the first character is set, req_byte must be
-  later in the subject; otherwise the test starts at the match point. This
-  optimization can save a huge amount of backtracking in patterns with nested
-  unlimited repeats that aren't going to match. Writing separate code for
-  cased/caseless versions makes it go faster, as does using an autoincrement
-  and backing off on a match.
-
-  HOWEVER: when the subject string is very, very long, searching to its end can
-  take a long time, and give bad performance on quite ordinary patterns. This
-  showed up when somebody was matching /^C/ on a 32-megabyte string... so we
-  don't do this when the string is sufficiently long.
+  /* If req_byte is set, we know that that character must appear in the
+  subject for the match to succeed. If the first character is set, req_byte
+  must be later in the subject; otherwise the test starts at the match point.
+  This optimization can save a huge amount of backtracking in patterns with
+  nested unlimited repeats that aren't going to match. Writing separate code
+  for cased/caseless versions makes it go faster, as does using an
+  autoincrement and backing off on a match.
+
+  HOWEVER: when the subject string is very, very long, searching to its end
+  can take a long time, and give bad performance on quite ordinary patterns.
+  This showed up when somebody was matching something like /^\d+C/ on a
+  32-megabyte string... so we don't do this when the string is sufficiently
+  long.
 
-  ALSO: this processing is disabled when partial matching is requested.
-  */
+  ALSO: this processing is disabled when partial matching is requested, or if
+  disabling is explicitly requested. */
 
-  if (req_byte >= 0 &&
+  if ((options & PCRE_NO_START_OPTIMIZE) == 0 &&
+      req_byte >= 0 &&
       end_subject - start_match < REQ_BYTE_MAX &&
       !md->partial)
     {
@@ -3826,9 +4873,14 @@
           }
         }
 
-      /* If we can't find the required character, break the matching loop */
+      /* If we can't find the required character, break the matching loop,
+      forcing a match failure. */
 
-      if (p >= end_subject) break;
+      if (p >= end_subject)
+        {
+        rc = MATCH_NOMATCH;
+        break;
+        }
 
       /* If we have found the required character, save the point where we
       found it, so that we don't search again next time round the loop if
@@ -3838,49 +4890,105 @@
       }
     }
 
-  /* When a match occurs, substrings will be set for all internal extractions;
-  we just need to set up the whole thing as substring 0 before returning. If
-  there were too many extractions, set the return code to zero. In the case
-  where we had to get some local store to hold offsets for backreferences, copy
-  those back references that we can. In this case there need not be overflow
-  if certain parts of the pattern were not used. */
+  /* OK, we can now run the match. */
 
-  md->start_match = start_match;
+  md->start_match_ptr = start_match;
   md->match_call_count = 0;
+  rc = match(start_match, md->start_code, start_match, 2, md, ims, NULL, 0, 0);
 
-  rc = match(start_match, md->start_code, 2, md, ims, NULL, match_isgroup, 0);
-
-  /* When the result is no match, if the subject's first character was a
-  newline and the PCRE_FIRSTLINE option is set, break (which will return
-  PCRE_ERROR_NOMATCH). The option requests that a match occur before the first
-  newline in the subject. Otherwise, advance the pointer to the next character
-  and continue - but the continuation will actually happen only when the
-  pattern is not anchored. */
-
-  if (rc == MATCH_NOMATCH)
+  switch(rc)
     {
-    if (firstline &&
-        start_match <= md->end_subject - md->nllen &&
-        IS_NEWLINE(start_match))
-      break;
-    start_match++;
+    /* NOMATCH and PRUNE advance by one character. THEN at this level acts
+    exactly like PRUNE. */
+
+    case MATCH_NOMATCH:
+    case MATCH_PRUNE:
+    case MATCH_THEN:
+    new_start_match = start_match + 1;
 #ifdef SUPPORT_UTF8
-    if (md->utf8)
-      while(start_match < end_subject && (*start_match & 0xc0) == 0x80)
-        start_match++;
+    if (utf8)
+      while(new_start_match < end_subject && (*new_start_match & 0xc0) == 0x80)
+        new_start_match++;
 #endif
-    continue;
-    }
+    break;
 
-  if (rc != MATCH_MATCH)
-    {
-    DPRINTF((">>>> error: returning %d\n", rc));
-    return rc;
+    /* SKIP passes back the next starting point explicitly. */
+
+    case MATCH_SKIP:
+    new_start_match = md->start_match_ptr;
+    break;
+
+    /* COMMIT disables the bumpalong, but otherwise behaves as NOMATCH. */
+
+    case MATCH_COMMIT:
+    rc = MATCH_NOMATCH;
+    goto ENDLOOP;
+
+    /* Any other return is some kind of error. */
+
+    default:
+    goto ENDLOOP;
     }
 
-  /* We have a match! Copy the offset information from temporary store if
-  necessary */
+  /* Control reaches here for the various types of "no match at this point"
+  result. Reset the code to MATCH_NOMATCH for subsequent checking. */
+
+  rc = MATCH_NOMATCH;
+
+  /* If PCRE_FIRSTLINE is set, the match must happen before or at the first
+  newline in the subject (though it may continue over the newline). Therefore,
+  if we have just failed to match, starting at a newline, do not continue. */
+
+  if (firstline && IS_NEWLINE(start_match)) break;
+
+  /* Advance to new matching position */
+
+  start_match = new_start_match;
+
+  /* Break the loop if the pattern is anchored or if we have passed the end of
+  the subject. */
+
+  if (anchored || start_match > end_subject) break;
+
+  /* If we have just passed a CR and we are now at a LF, and the pattern does
+  not contain any explicit matches for \r or \n, and the newline option is CRLF
+  or ANY or ANYCRLF, advance the match position by one more character. */
+
+  if (start_match[-1] == CHAR_CR &&
+      start_match < end_subject &&
+      *start_match == CHAR_NL &&
+      (re->flags & PCRE_HASCRORLF) == 0 &&
+        (md->nltype == NLTYPE_ANY ||
+         md->nltype == NLTYPE_ANYCRLF ||
+         md->nllen == 2))
+    start_match++;
+
+  }   /* End of for(;;) "bumpalong" loop */
+
+/* ==========================================================================*/
+
+/* We reach here when rc is not MATCH_NOMATCH, or if one of the stopping
+conditions is true:
 
+(1) The pattern is anchored or the match was failed by (*COMMIT);
+
+(2) We are past the end of the subject;
+
+(3) PCRE_FIRSTLINE is set and we have failed to match at a newline, because
+    this option requests that a match occur at or before the first newline in
+    the subject.
+
+When we have a match and the offset vector is big enough to deal with any
+backreferences, captured substring offsets will already be set up. In the case
+where we had to get some local store to hold offsets for backreference
+processing, copy those that we can. In this case there need not be overflow if
+certain parts of the pattern were not used, even though there are more
+capturing parentheses than vector slots. */
+
+ENDLOOP:
+
+if (rc == MATCH_MATCH)
+  {
   if (using_temporary_offsets)
     {
     if (offsetcount >= 4)
@@ -3889,18 +4997,23 @@
         (offsetcount - 2) * sizeof(int));
       DPRINTF(("Copied offsets from temporary memory\n"));
       }
-    if (md->end_offset_top > offsetcount)
-      md->offset_overflow = TRUE;
-
+    if (md->end_offset_top > offsetcount) md->offset_overflow = TRUE;
     DPRINTF(("Freeing temporary memory\n"));
     (pcre_free)(md->offset_vector);
     }
 
+  /* Set the return code to the number of captured strings, or 0 if there are
+  too many to fit into the vector. */
+
   rc = md->offset_overflow? 0 : md->end_offset_top/2;
 
+  /* If there is space, set up the whole thing as substring 0. The value of
+  md->start_match_ptr might be modified if \K was encountered on the success
+  matching path. */
+
   if (offsetcount < 2) rc = 0; else
     {
-    offsets[0] = start_match - md->start_subject;
+    offsets[0] = md->start_match_ptr - md->start_subject;
     offsets[1] = md->end_match_ptr - md->start_subject;
     }
 
@@ -3908,9 +5021,8 @@
   return rc;
   }
 
-/* This "while" is the end of the "do" above */
-
-while (!anchored && start_match <= end_subject);
+/* Control gets here if there has been an error, or if the overall match
+attempt has failed at all permitted starting positions. */
 
 if (using_temporary_offsets)
   {
@@ -3918,7 +5030,12 @@
   (pcre_free)(md->offset_vector);
   }
 
-if (md->partial && md->hitend)
+if (rc != MATCH_NOMATCH)
+  {
+  DPRINTF((">>>> error: returning %d\n", rc));
+  return rc;
+  }
+else if (md->partial && md->hitend)
   {
   DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));
   return PCRE_ERROR_PARTIAL;

Modified: freeswitch/trunk/libs/pcre/pcre_fullinfo.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_fullinfo.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_fullinfo.c	Mon Jun  8 18:51:30 2009
@@ -2,11 +2,11 @@
 *      Perl-Compatible Regular Expressions       *
 *************************************************/
 
-/*PCRE is a library of functions to support regular expressions whose syntax
+/* PCRE is a library of functions to support regular expressions whose syntax
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,10 @@
 information about a compiled pattern. */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -61,7 +65,7 @@
 Returns:           0 if data returned, negative on error
 */
 
-PCRE_DATA_SCOPE int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_fullinfo(const pcre *argument_re, const pcre_extra *extra_data, int what,
   void *where)
 {
@@ -85,7 +89,7 @@
 switch (what)
   {
   case PCRE_INFO_OPTIONS:
-  *((unsigned long int *)where) = re->options & PUBLIC_OPTIONS;
+  *((unsigned long int *)where) = re->options & PUBLIC_COMPILE_OPTIONS;
   break;
 
   case PCRE_INFO_SIZE:
@@ -106,8 +110,8 @@
 
   case PCRE_INFO_FIRSTBYTE:
   *((int *)where) =
-    ((re->options & PCRE_FIRSTSET) != 0)? re->first_byte :
-    ((re->options & PCRE_STARTLINE) != 0)? -1 : -2;
+    ((re->flags & PCRE_FIRSTSET) != 0)? re->first_byte :
+    ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
   break;
 
   /* Make sure we pass back the pointer to the bit vector in the external
@@ -121,7 +125,7 @@
 
   case PCRE_INFO_LASTLITERAL:
   *((int *)where) =
-    ((re->options & PCRE_REQCHSET) != 0)? re->req_byte : -1;
+    ((re->flags & PCRE_REQCHSET) != 0)? re->req_byte : -1;
   break;
 
   case PCRE_INFO_NAMEENTRYSIZE:
@@ -140,6 +144,18 @@
   *((const uschar **)where) = (const uschar *)(_pcre_default_tables);
   break;
 
+  case PCRE_INFO_OKPARTIAL:
+  *((int *)where) = (re->flags & PCRE_NOPARTIAL) == 0;
+  break;
+
+  case PCRE_INFO_JCHANGED:
+  *((int *)where) = (re->flags & PCRE_JCHANGED) != 0;
+  break;
+
+  case PCRE_INFO_HASCRORLF:
+  *((int *)where) = (re->flags & PCRE_HASCRORLF) != 0;
+  break;
+
   default: return PCRE_ERROR_BADOPTION;
   }
 

Modified: freeswitch/trunk/libs/pcre/pcre_get.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_get.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_get.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,10 @@
 for these functions came from Scott Wimer. */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -61,7 +65,7 @@
                 (PCRE_ERROR_NOSUBSTRING) if not found
 */
 
-int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_get_stringnumber(const pcre *code, const char *stringname)
 {
 int rc;
@@ -110,7 +114,7 @@
                 (PCRE_ERROR_NOSUBSTRING) if not found
 */
 
-int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_get_stringtable_entries(const pcre *code, const char *stringname,
   char **firstptr, char **lastptr)
 {
@@ -185,7 +189,7 @@
 int entrysize;
 char *first, *last;
 uschar *entry;
-if ((re->options & (PCRE_DUPNAMES | PCRE_JCHANGED)) == 0)
+if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
   return pcre_get_stringnumber(code, stringname);
 entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last);
 if (entrysize <= 0) return entrysize;
@@ -227,7 +231,7 @@
                    PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
 */
 
-int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_copy_substring(const char *subject, int *ovector, int stringcount,
   int stringnumber, char *buffer, int size)
 {
@@ -272,7 +276,7 @@
                    PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
 */
 
-int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_copy_named_substring(const pcre *code, const char *subject, int *ovector,
   int stringcount, const char *stringname, char *buffer, int size)
 {
@@ -304,7 +308,7 @@
                    PCRE_ERROR_NOMEMORY (-6) failed to get store
 */
 
-int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_get_substring_list(const char *subject, int *ovector, int stringcount,
   const char ***listptr)
 {
@@ -349,7 +353,7 @@
 Returns:    nothing
 */
 
-void
+PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
 pcre_free_substring_list(const char **pointer)
 {
 (pcre_free)((void *)pointer);
@@ -382,7 +386,7 @@
                    PCRE_ERROR_NOSUBSTRING (-7) substring not present
 */
 
-int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_get_substring(const char *subject, int *ovector, int stringcount,
   int stringnumber, const char **stringptr)
 {
@@ -429,14 +433,13 @@
                    PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
 */
 
-int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_get_named_substring(const pcre *code, const char *subject, int *ovector,
   int stringcount, const char *stringname, const char **stringptr)
 {
 int n = get_first_set(code, stringname, ovector);
 if (n <= 0) return n;
 return pcre_get_substring(subject, ovector, stringcount, n, stringptr);
-
 }
 
 
@@ -453,7 +456,7 @@
 Returns:    nothing
 */
 
-void
+PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
 pcre_free_substring(const char *pointer)
 {
 (pcre_free)((void *)pointer);

Modified: freeswitch/trunk/libs/pcre/pcre_globals.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_globals.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_globals.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -46,24 +46,18 @@
 all threads. However, when compiling for Virtual Pascal, things are done
 differently, and global variables are not used (see pcre.in). */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "pcre_internal.h"
 
-
 #ifndef VPCOMPAT
-#ifdef __cplusplus
-extern "C" void *(*pcre_malloc)(size_t) = malloc;
-extern "C" void  (*pcre_free)(void *) = free;
-extern "C" void *(*pcre_stack_malloc)(size_t) = malloc;
-extern "C" void  (*pcre_stack_free)(void *) = free;
-extern "C" int   (*pcre_callout)(pcre_callout_block *) = NULL;
-#else
-void *(*pcre_malloc)(size_t) = malloc;
-void  (*pcre_free)(void *) = free;
-void *(*pcre_stack_malloc)(size_t) = malloc;
-void  (*pcre_stack_free)(void *) = free;
-int   (*pcre_callout)(pcre_callout_block *) = NULL;
-#endif
+PCRE_EXP_DATA_DEFN void *(*pcre_malloc)(size_t) = malloc;
+PCRE_EXP_DATA_DEFN void  (*pcre_free)(void *) = free;
+PCRE_EXP_DATA_DEFN void *(*pcre_stack_malloc)(size_t) = malloc;
+PCRE_EXP_DATA_DEFN void  (*pcre_stack_free)(void *) = free;
+PCRE_EXP_DATA_DEFN int   (*pcre_callout)(pcre_callout_block *) = NULL;
 #endif
 
 /* End of pcre_globals.c */

Modified: freeswitch/trunk/libs/pcre/pcre_info.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_info.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_info.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,10 @@
 deprecated, as it has been superseded by pcre_fullinfo(). */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -68,7 +72,7 @@
                 or negative values on error
 */
 
-PCRE_DATA_SCOPE int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_info(const pcre *argument_re, int *optptr, int *first_byte)
 {
 real_pcre internal_re;
@@ -79,10 +83,10 @@
   re = _pcre_try_flipped(re, &internal_re, NULL, NULL);
   if (re == NULL) return PCRE_ERROR_BADMAGIC;
   }
-if (optptr != NULL) *optptr = (int)(re->options & PUBLIC_OPTIONS);
+if (optptr != NULL) *optptr = (int)(re->options & PUBLIC_COMPILE_OPTIONS);
 if (first_byte != NULL)
-  *first_byte = ((re->options & PCRE_FIRSTSET) != 0)? re->first_byte :
-     ((re->options & PCRE_STARTLINE) != 0)? -1 : -2;
+  *first_byte = ((re->flags & PCRE_FIRSTSET) != 0)? re->first_byte :
+     ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
 return re->top_bracket;
 }
 

Modified: freeswitch/trunk/libs/pcre/pcre_internal.h
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_internal.h	(original)
+++ freeswitch/trunk/libs/pcre/pcre_internal.h	Mon Jun  8 18:51:30 2009
@@ -7,7 +7,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -51,22 +51,36 @@
 #define PCRE_DEBUG
 #endif
 
+/* We do not support both EBCDIC and UTF-8 at the same time. The "configure"
+script prevents both being selected, but not everybody uses "configure". */
+
+#if defined EBCDIC && defined SUPPORT_UTF8
+#error The use of both EBCDIC and SUPPORT_UTF8 is not supported.
+#endif
+
+/* If SUPPORT_UCP is defined, SUPPORT_UTF8 must also be defined. The
+"configure" script ensures this, but not everybody uses "configure". */
+
+#if defined SUPPORT_UCP && !defined SUPPORT_UTF8
+#define SUPPORT_UTF8 1
+#endif
+
 /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef
 inline, and there are *still* stupid compilers about that don't like indented
 pre-processor statements, or at least there were when I first wrote this. After
-all, it had only been about 10 years then... */
+all, it had only been about 10 years then...
+
+It turns out that the Mac Debugging.h header also defines the macro DPRINTF, so
+be absolutely sure we get our version. */
 
+#undef DPRINTF
 #ifdef PCRE_DEBUG
 #define DPRINTF(p) printf p
 #else
-#define DPRINTF(p) /*nothing*/
+#define DPRINTF(p) /* Nothing */
 #endif
 
 
-/* Get the definitions provided by running "configure" */
-
-#include "config.h"
-
 /* Standard C headers plus the external interface definition. The only time
 setjmp and stdarg are used is when NO_RECURSE is set. */
 
@@ -79,8 +93,71 @@
 #include 
 #include 
 
-#ifndef PCRE_SPY
-#define PCRE_DEFINITION       /* Win32 __declspec(export) trigger for .dll */
+/* When compiling a DLL for Windows, the exported symbols have to be declared
+using some MS magic. I found some useful information on this web page:
+http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
+information there, using __declspec(dllexport) without "extern" we have a
+definition; with "extern" we have a declaration. The settings here override the
+setting in pcre.h (which is included below); it defines only PCRE_EXP_DECL,
+which is all that is needed for applications (they just import the symbols). We
+use:
+
+  PCRE_EXP_DECL       for declarations
+  PCRE_EXP_DEFN       for definitions of exported functions
+  PCRE_EXP_DATA_DEFN  for definitions of exported variables
+
+The reason for the two DEFN macros is that in non-Windows environments, one
+does not want to have "extern" before variable definitions because it leads to
+compiler warnings. So we distinguish between functions and variables. In
+Windows, the two should always be the same.
+
+The reason for wrapping this in #ifndef PCRE_EXP_DECL is so that pcretest,
+which is an application, but needs to import this file in order to "peek" at
+internals, can #include pcre.h first to get an application's-eye view.
+
+In principle, people compiling for non-Windows, non-Unix-like (i.e. uncommon,
+special-purpose environments) might want to stick other stuff in front of
+exported symbols. That's why, in the non-Windows case, we set PCRE_EXP_DEFN and
+PCRE_EXP_DATA_DEFN only if they are not already set. */
+
+#ifndef PCRE_EXP_DECL
+#  ifdef _WIN32
+#    ifndef PCRE_STATIC
+#      define PCRE_EXP_DECL       extern __declspec(dllexport)
+#      define PCRE_EXP_DEFN       __declspec(dllexport)
+#      define PCRE_EXP_DATA_DEFN  __declspec(dllexport)
+#    else
+#      define PCRE_EXP_DECL       extern
+#      define PCRE_EXP_DEFN
+#      define PCRE_EXP_DATA_DEFN
+#    endif
+#  else
+#    ifdef __cplusplus
+#      define PCRE_EXP_DECL       extern "C"
+#    else
+#      define PCRE_EXP_DECL       extern
+#    endif
+#    ifndef PCRE_EXP_DEFN
+#      define PCRE_EXP_DEFN       PCRE_EXP_DECL
+#    endif
+#    ifndef PCRE_EXP_DATA_DEFN
+#      define PCRE_EXP_DATA_DEFN
+#    endif
+#  endif
+#endif
+
+/* When compiling with the MSVC compiler, it is sometimes necessary to include
+a "calling convention" before exported function names. (This is secondhand
+information; I know nothing about MSVC myself). For example, something like
+
+  void __cdecl function(....)
+
+might be needed. In order so make this easy, all the exported functions have
+PCRE_CALL_CONVENTION just before their names. It is rarely needed; if not
+set, we ensure here that it has no effect. */
+
+#ifndef PCRE_CALL_CONVENTION
+#define PCRE_CALL_CONVENTION
 #endif
 
 /* We need to have types that specify unsigned 16-bit and 32-bit integers. We
@@ -91,16 +168,20 @@
 
 #if USHRT_MAX == 65535
   typedef unsigned short pcre_uint16;
+  typedef short pcre_int16;
 #elif UINT_MAX == 65535
   typedef unsigned int pcre_uint16;
+  typedef int pcre_int16;
 #else
   #error Cannot determine a type for 16-bit unsigned integers
 #endif
 
 #if UINT_MAX == 4294967295
   typedef unsigned int pcre_uint32;
+  typedef int pcre_int32;
 #elif ULONG_MAX == 4294967295
   typedef unsigned long int pcre_uint32;
+  typedef long int pcre_int32;
 #else
   #error Cannot determine a type for 32-bit unsigned integers
 #endif
@@ -114,13 +195,49 @@
 
 typedef unsigned char uschar;
 
-/* PCRE is able to support 3 different kinds of newline (CR, LF, CRLF). The
-following macro is used to package up testing for newlines. NLBLOCK is defined
-in the various modules to indicate in which datablock the parameters exist. */
+/* This is an unsigned int value that no character can ever have. UTF-8
+characters only go up to 0x7fffffff (though Unicode doesn't go beyond
+0x0010ffff). */
+
+#define NOTACHAR 0xffffffff
+
+/* PCRE is able to support several different kinds of newline (CR, LF, CRLF,
+"any" and "anycrlf" at present). The following macros are used to package up
+testing for newlines. NLBLOCK, PSSTART, and PSEND are defined in the various
+modules to indicate in which datablock the parameters exist, and what the
+start/end of string field names are. */
+
+#define NLTYPE_FIXED    0     /* Newline is a fixed length string */
+#define NLTYPE_ANY      1     /* Newline is any Unicode line ending */
+#define NLTYPE_ANYCRLF  2     /* Newline is CR, LF, or CRLF */
+
+/* This macro checks for a newline at the given position */
 
 #define IS_NEWLINE(p) \
-  ((p)[0] == NLBLOCK->nl[0] && \
-  (NLBLOCK->nllen == 1 || (p)[1] == NLBLOCK->nl[1]))
+  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
+    ((p) < NLBLOCK->PSEND && \
+     _pcre_is_newline((p), NLBLOCK->nltype, NLBLOCK->PSEND, &(NLBLOCK->nllen),\
+       utf8)) \
+    : \
+    ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
+     (p)[0] == NLBLOCK->nl[0] && \
+     (NLBLOCK->nllen == 1 || (p)[1] == NLBLOCK->nl[1]) \
+    ) \
+  )
+
+/* This macro checks for a newline immediately preceding the given position */
+
+#define WAS_NEWLINE(p) \
+  ((NLBLOCK->nltype != NLTYPE_FIXED)? \
+    ((p) > NLBLOCK->PSSTART && \
+     _pcre_was_newline((p), NLBLOCK->nltype, NLBLOCK->PSSTART, \
+       &(NLBLOCK->nllen), utf8)) \
+    : \
+    ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
+     (p)[-NLBLOCK->nllen] == NLBLOCK->nl[0] && \
+     (NLBLOCK->nllen == 1 || (p)[-NLBLOCK->nllen+1] == NLBLOCK->nl[1]) \
+    ) \
+  )
 
 /* When PCRE is compiled as a C++ library, the subject pointer can be replaced
 with a custom type. This makes it possible, for example, to allow pcre_exec()
@@ -139,6 +256,8 @@
 #define USPTR const unsigned char *
 #endif
 
+
+
 /* Include the public PCRE header and the definitions of UCP character property
 values. */
 
@@ -150,7 +269,9 @@
 option on the command line. */
 
 #ifdef VPCOMPAT
+#define strlen(s)        _strlen(s)
 #define strncmp(s1,s2,m) _strncmp(s1,s2,m)
+#define memcmp(s,c,n)    _memcmp(s,c,n)
 #define memcpy(d,s,n)    _memcpy(d,s,n)
 #define memmove(d,s,n)   _memmove(d,s,n)
 #define memset(s,c,n)    _memset(s,c,n)
@@ -159,23 +280,31 @@
 /* To cope with SunOS4 and other systems that lack memmove() but have bcopy(),
 define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY
 is set. Otherwise, include an emulating function for those systems that have
-neither (there some non-Unix environments where this is the case). This assumes
-that all calls to memmove are moving strings upwards in store, which is the
-case in PCRE. */
+neither (there some non-Unix environments where this is the case). */
 
-#if ! HAVE_MEMMOVE
+#ifndef HAVE_MEMMOVE
 #undef  memmove        /* some systems may have a macro */
-#if HAVE_BCOPY
+#ifdef HAVE_BCOPY
 #define memmove(a, b, c) bcopy(b, a, c)
 #else  /* HAVE_BCOPY */
 static void *
-pcre_memmove(unsigned char *dest, const unsigned char *src, size_t n)
+pcre_memmove(void *d, const void *s, size_t n)
 {
 size_t i;
-dest += n;
-src += n;
-for (i = 0; i < n; ++i) *(--dest) =  *(--src);
-return dest;
+unsigned char *dest = (unsigned char *)d;
+const unsigned char *src = (const unsigned char *)s;
+if (dest > src)
+  {
+  dest += n;
+  src += n;
+  for (i = 0; i < n; ++i) *(--dest) = *(--src);
+  return (void *)dest;
+  }
+else
+  {
+  for (i = 0; i < n; ++i) *dest++ = *src++;
+  return (void *)(dest - n);
+  }
 }
 #define memmove(a, b, c) pcre_memmove(a, b, c)
 #endif   /* not HAVE_BCOPY */
@@ -261,7 +390,9 @@
 
 /* When UTF-8 encoding is being used, a character is no longer just a single
 byte. The macros for character handling generate simple sequences when used in
-byte-mode, and more complicated ones for UTF-8 characters. */
+byte-mode, and more complicated ones for UTF-8 characters. BACKCHAR should
+never be called in byte mode. To make sure it can never even appear when UTF-8
+support is omitted, we don't even define it. */
 
 #ifndef SUPPORT_UTF8
 #define GETCHAR(c, eptr) c = *eptr;
@@ -269,7 +400,7 @@
 #define GETCHARINC(c, eptr) c = *eptr++;
 #define GETCHARINCTEST(c, eptr) c = *eptr++;
 #define GETCHARLEN(c, eptr, len) c = *eptr;
-#define BACKCHAR(eptr)
+/* #define BACKCHAR(eptr) */
 
 #else   /* SUPPORT_UTF8 */
 
@@ -278,7 +409,7 @@
 
 #define GETCHAR(c, eptr) \
   c = *eptr; \
-  if ((c & 0xc0) == 0xc0) \
+  if (c >= 0xc0) \
     { \
     int gcii; \
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
@@ -296,7 +427,7 @@
 
 #define GETCHARTEST(c, eptr) \
   c = *eptr; \
-  if (utf8 && (c & 0xc0) == 0xc0) \
+  if (utf8 && c >= 0xc0) \
     { \
     int gcii; \
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
@@ -314,7 +445,7 @@
 
 #define GETCHARINC(c, eptr) \
   c = *eptr++; \
-  if ((c & 0xc0) == 0xc0) \
+  if (c >= 0xc0) \
     { \
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
     int gcss = 6*gcaa; \
@@ -330,7 +461,7 @@
 
 #define GETCHARINCTEST(c, eptr) \
   c = *eptr++; \
-  if (utf8 && (c & 0xc0) == 0xc0) \
+  if (utf8 && c >= 0xc0) \
     { \
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
     int gcss = 6*gcaa; \
@@ -347,7 +478,27 @@
 
 #define GETCHARLEN(c, eptr, len) \
   c = *eptr; \
-  if ((c & 0xc0) == 0xc0) \
+  if (c >= 0xc0) \
+    { \
+    int gcii; \
+    int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
+    int gcss = 6*gcaa; \
+    c = (c & _pcre_utf8_table3[gcaa]) << gcss; \
+    for (gcii = 1; gcii <= gcaa; gcii++) \
+      { \
+      gcss -= 6; \
+      c |= (eptr[gcii] & 0x3f) << gcss; \
+      } \
+    len += gcaa; \
+    }
+
+/* Get the next UTF-8 character, testing for UTF-8 mode, not advancing the
+pointer, incrementing length if there are extra bytes. This is called when we
+know we are in UTF-8 mode. */
+
+#define GETCHARLENTEST(c, eptr, len) \
+  c = *eptr; \
+  if (utf8 && c >= 0xc0) \
     { \
     int gcii; \
     int gcaa = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */ \
@@ -362,9 +513,10 @@
     }
 
 /* If the pointer is not at the start of a character, move it back until
-it is. Called only in UTF-8 mode. */
+it is. This is called only in UTF-8 mode - we don't put a test within the macro
+because almost all calls are already within a block of UTF-8 only code. */
 
-#define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--;
+#define BACKCHAR(eptr) while((*eptr & 0xc0) == 0x80) eptr--
 
 #endif
 
@@ -381,17 +533,16 @@
 
 #define PCRE_IMS (PCRE_CASELESS|PCRE_MULTILINE|PCRE_DOTALL)
 
-/* Private options flags start at the most significant end of the four bytes.
-The public options defined in pcre.h start at the least significant end. Make
-sure they don't overlap! The bits are getting a bit scarce now -- when we run
-out, there is a dummy word in the structure that could be used for the private
-bits. */
-
-#define PCRE_NOPARTIAL     0x80000000  /* can't use partial with this regex */
-#define PCRE_FIRSTSET      0x40000000  /* first_byte is set */
-#define PCRE_REQCHSET      0x20000000  /* req_byte is set */
-#define PCRE_STARTLINE     0x10000000  /* start after \n for multiline */
-#define PCRE_JCHANGED      0x08000000  /* j option changes within regex */
+/* Private flags containing information about the compiled regex. They used to
+live at the top end of the options word, but that got almost full, so now they
+are in a 16-bit flags word. */
+
+#define PCRE_NOPARTIAL     0x0001  /* can't use partial with this regex */
+#define PCRE_FIRSTSET      0x0002  /* first_byte is set */
+#define PCRE_REQCHSET      0x0004  /* req_byte is set */
+#define PCRE_STARTLINE     0x0008  /* start after \n for multiline */
+#define PCRE_JCHANGED      0x0010  /* j option used in regex */
+#define PCRE_HASCRORLF     0x0020  /* explicit \r or \n in pattern */
 
 /* Options for the "extra" block produced by pcre_study(). */
 
@@ -400,20 +551,25 @@
 /* Masks for identifying the public options that are permitted at compile
 time, run time, or study time, respectively. */
 
-#define PUBLIC_OPTIONS \
+#define PCRE_NEWLINE_BITS (PCRE_NEWLINE_CR|PCRE_NEWLINE_LF|PCRE_NEWLINE_ANY| \
+                           PCRE_NEWLINE_ANYCRLF)
+
+#define PUBLIC_COMPILE_OPTIONS \
   (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
    PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY|PCRE_UTF8| \
    PCRE_NO_AUTO_CAPTURE|PCRE_NO_UTF8_CHECK|PCRE_AUTO_CALLOUT|PCRE_FIRSTLINE| \
-   PCRE_DUPNAMES|PCRE_NEWLINE_CR|PCRE_NEWLINE_LF)
+   PCRE_DUPNAMES|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
+   PCRE_JAVASCRIPT_COMPAT)
 
 #define PUBLIC_EXEC_OPTIONS \
   (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
-   PCRE_PARTIAL|PCRE_NEWLINE_CR|PCRE_NEWLINE_LF)
+   PCRE_PARTIAL|PCRE_NEWLINE_BITS|PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE| \
+   PCRE_NO_START_OPTIMIZE)
 
 #define PUBLIC_DFA_EXEC_OPTIONS \
   (PCRE_ANCHORED|PCRE_NOTBOL|PCRE_NOTEOL|PCRE_NOTEMPTY|PCRE_NO_UTF8_CHECK| \
-   PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_CR| \
-   PCRE_NEWLINE_LF)
+   PCRE_PARTIAL|PCRE_DFA_SHORTEST|PCRE_DFA_RESTART|PCRE_NEWLINE_BITS| \
+   PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE|PCRE_NO_START_OPTIMIZE)
 
 #define PUBLIC_STUDY_OPTIONS 0   /* None defined */
 
@@ -438,38 +594,572 @@
 #define REQ_CASELESS 0x0100    /* indicates caselessness */
 #define REQ_VARY     0x0200    /* reqbyte followed non-literal item */
 
-/* Miscellaneous definitions */
+/* Miscellaneous definitions. The #ifndef is to pacify compiler warnings in
+environments where these macros are defined elsewhere. Unfortunately, there
+is no way to do the same for the typedef. */
 
 typedef int BOOL;
 
+#ifndef FALSE
 #define FALSE   0
 #define TRUE    1
+#endif
+
+/* If PCRE is to support UTF-8 on EBCDIC platforms, we cannot use normal
+character constants like '*' because the compiler would emit their EBCDIC code,
+which is different from their ASCII/UTF-8 code. Instead we define macros for
+the characters so that they always use the ASCII/UTF-8 code when UTF-8 support
+is enabled. When UTF-8 support is not enabled, the definitions use character
+literals. Both character and string versions of each character are needed, and
+there are some longer strings as well.
+
+This means that, on EBCDIC platforms, the PCRE library can handle either
+EBCDIC, or UTF-8, but not both. To support both in the same compiled library
+would need different lookups depending on whether PCRE_UTF8 was set or not.
+This would make it impossible to use characters in switch/case statements,
+which would reduce performance. For a theoretical use (which nobody has asked
+for) in a minority area (EBCDIC platforms), this is not sensible. Any
+application that did need both could compile two versions of the library, using
+macros to give the functions distinct names. */
+
+#ifndef SUPPORT_UTF8
 
-/* Escape items that are just an encoding of a particular data value. Note that
-ESC_n is defined as yet another macro, which is set in config.h to either \n
-(the default) or \r (which some people want). */
+/* UTF-8 support is not enabled; use the platform-dependent character literals
+so that PCRE works on both ASCII and EBCDIC platforms, in non-UTF-mode only. */
+
+#define CHAR_HT                     '\t'
+#define CHAR_VT                     '\v'
+#define CHAR_FF                     '\f'
+#define CHAR_CR                     '\r'
+#define CHAR_NL                     '\n'
+#define CHAR_BS                     '\b'
+#define CHAR_BEL                    '\a'
+#ifdef EBCDIC
+#define CHAR_ESC                    '\047'
+#define CHAR_DEL                    '\007'
+#else
+#define CHAR_ESC                    '\033'
+#define CHAR_DEL                    '\177'
+#endif
+
+#define CHAR_SPACE                  ' '
+#define CHAR_EXCLAMATION_MARK       '!'
+#define CHAR_QUOTATION_MARK         '"'
+#define CHAR_NUMBER_SIGN            '#'
+#define CHAR_DOLLAR_SIGN            '$'
+#define CHAR_PERCENT_SIGN           '%'
+#define CHAR_AMPERSAND              '&'
+#define CHAR_APOSTROPHE             '\''
+#define CHAR_LEFT_PARENTHESIS       '('
+#define CHAR_RIGHT_PARENTHESIS      ')'
+#define CHAR_ASTERISK               '*'
+#define CHAR_PLUS                   '+'
+#define CHAR_COMMA                  ','
+#define CHAR_MINUS                  '-'
+#define CHAR_DOT                    '.'
+#define CHAR_SLASH                  '/'
+#define CHAR_0                      '0'
+#define CHAR_1                      '1'
+#define CHAR_2                      '2'
+#define CHAR_3                      '3'
+#define CHAR_4                      '4'
+#define CHAR_5                      '5'
+#define CHAR_6                      '6'
+#define CHAR_7                      '7'
+#define CHAR_8                      '8'
+#define CHAR_9                      '9'
+#define CHAR_COLON                  ':'
+#define CHAR_SEMICOLON              ';'
+#define CHAR_LESS_THAN_SIGN         '<'
+#define CHAR_EQUALS_SIGN            '='
+#define CHAR_GREATER_THAN_SIGN      '>'
+#define CHAR_QUESTION_MARK          '?'
+#define CHAR_COMMERCIAL_AT          '@'
+#define CHAR_A                      'A'
+#define CHAR_B                      'B'
+#define CHAR_C                      'C'
+#define CHAR_D                      'D'
+#define CHAR_E                      'E'
+#define CHAR_F                      'F'
+#define CHAR_G                      'G'
+#define CHAR_H                      'H'
+#define CHAR_I                      'I'
+#define CHAR_J                      'J'
+#define CHAR_K                      'K'
+#define CHAR_L                      'L'
+#define CHAR_M                      'M'
+#define CHAR_N                      'N'
+#define CHAR_O                      'O'
+#define CHAR_P                      'P'
+#define CHAR_Q                      'Q'
+#define CHAR_R                      'R'
+#define CHAR_S                      'S'
+#define CHAR_T                      'T'
+#define CHAR_U                      'U'
+#define CHAR_V                      'V'
+#define CHAR_W                      'W'
+#define CHAR_X                      'X'
+#define CHAR_Y                      'Y'
+#define CHAR_Z                      'Z'
+#define CHAR_LEFT_SQUARE_BRACKET    '['
+#define CHAR_BACKSLASH              '\\'
+#define CHAR_RIGHT_SQUARE_BRACKET   ']'
+#define CHAR_CIRCUMFLEX_ACCENT      '^'
+#define CHAR_UNDERSCORE             '_'
+#define CHAR_GRAVE_ACCENT           '`'
+#define CHAR_a                      'a'
+#define CHAR_b                      'b'
+#define CHAR_c                      'c'
+#define CHAR_d                      'd'
+#define CHAR_e                      'e'
+#define CHAR_f                      'f'
+#define CHAR_g                      'g'
+#define CHAR_h                      'h'
+#define CHAR_i                      'i'
+#define CHAR_j                      'j'
+#define CHAR_k                      'k'
+#define CHAR_l                      'l'
+#define CHAR_m                      'm'
+#define CHAR_n                      'n'
+#define CHAR_o                      'o'
+#define CHAR_p                      'p'
+#define CHAR_q                      'q'
+#define CHAR_r                      'r'
+#define CHAR_s                      's'
+#define CHAR_t                      't'
+#define CHAR_u                      'u'
+#define CHAR_v                      'v'
+#define CHAR_w                      'w'
+#define CHAR_x                      'x'
+#define CHAR_y                      'y'
+#define CHAR_z                      'z'
+#define CHAR_LEFT_CURLY_BRACKET     '{'
+#define CHAR_VERTICAL_LINE          '|'
+#define CHAR_RIGHT_CURLY_BRACKET    '}'
+#define CHAR_TILDE                  '~'
+
+#define STR_HT                      "\t"
+#define STR_VT                      "\v"
+#define STR_FF                      "\f"
+#define STR_CR                      "\r"
+#define STR_NL                      "\n"
+#define STR_BS                      "\b"
+#define STR_BEL                     "\a"
+#ifdef EBCDIC
+#define STR_ESC                     "\047"
+#define STR_DEL                     "\007"
+#else
+#define STR_ESC                     "\033"
+#define STR_DEL                     "\177"
+#endif
+
+#define STR_SPACE                   " "
+#define STR_EXCLAMATION_MARK        "!"
+#define STR_QUOTATION_MARK          "\""
+#define STR_NUMBER_SIGN             "#"
+#define STR_DOLLAR_SIGN             "$"
+#define STR_PERCENT_SIGN            "%"
+#define STR_AMPERSAND               "&"
+#define STR_APOSTROPHE              "'"
+#define STR_LEFT_PARENTHESIS        "("
+#define STR_RIGHT_PARENTHESIS       ")"
+#define STR_ASTERISK                "*"
+#define STR_PLUS                    "+"
+#define STR_COMMA                   ","
+#define STR_MINUS                   "-"
+#define STR_DOT                     "."
+#define STR_SLASH                   "/"
+#define STR_0                       "0"
+#define STR_1                       "1"
+#define STR_2                       "2"
+#define STR_3                       "3"
+#define STR_4                       "4"
+#define STR_5                       "5"
+#define STR_6                       "6"
+#define STR_7                       "7"
+#define STR_8                       "8"
+#define STR_9                       "9"
+#define STR_COLON                   ":"
+#define STR_SEMICOLON               ";"
+#define STR_LESS_THAN_SIGN          "<"
+#define STR_EQUALS_SIGN             "="
+#define STR_GREATER_THAN_SIGN       ">"
+#define STR_QUESTION_MARK           "?"
+#define STR_COMMERCIAL_AT           "@"
+#define STR_A                       "A"
+#define STR_B                       "B"
+#define STR_C                       "C"
+#define STR_D                       "D"
+#define STR_E                       "E"
+#define STR_F                       "F"
+#define STR_G                       "G"
+#define STR_H                       "H"
+#define STR_I                       "I"
+#define STR_J                       "J"
+#define STR_K                       "K"
+#define STR_L                       "L"
+#define STR_M                       "M"
+#define STR_N                       "N"
+#define STR_O                       "O"
+#define STR_P                       "P"
+#define STR_Q                       "Q"
+#define STR_R                       "R"
+#define STR_S                       "S"
+#define STR_T                       "T"
+#define STR_U                       "U"
+#define STR_V                       "V"
+#define STR_W                       "W"
+#define STR_X                       "X"
+#define STR_Y                       "Y"
+#define STR_Z                       "Z"
+#define STR_LEFT_SQUARE_BRACKET     "["
+#define STR_BACKSLASH               "\\"
+#define STR_RIGHT_SQUARE_BRACKET    "]"
+#define STR_CIRCUMFLEX_ACCENT       "^"
+#define STR_UNDERSCORE              "_"
+#define STR_GRAVE_ACCENT            "`"
+#define STR_a                       "a"
+#define STR_b                       "b"
+#define STR_c                       "c"
+#define STR_d                       "d"
+#define STR_e                       "e"
+#define STR_f                       "f"
+#define STR_g                       "g"
+#define STR_h                       "h"
+#define STR_i                       "i"
+#define STR_j                       "j"
+#define STR_k                       "k"
+#define STR_l                       "l"
+#define STR_m                       "m"
+#define STR_n                       "n"
+#define STR_o                       "o"
+#define STR_p                       "p"
+#define STR_q                       "q"
+#define STR_r                       "r"
+#define STR_s                       "s"
+#define STR_t                       "t"
+#define STR_u                       "u"
+#define STR_v                       "v"
+#define STR_w                       "w"
+#define STR_x                       "x"
+#define STR_y                       "y"
+#define STR_z                       "z"
+#define STR_LEFT_CURLY_BRACKET      "{"
+#define STR_VERTICAL_LINE           "|"
+#define STR_RIGHT_CURLY_BRACKET     "}"
+#define STR_TILDE                   "~"
+
+#define STRING_ACCEPT0              "ACCEPT\0"
+#define STRING_COMMIT0              "COMMIT\0"
+#define STRING_F0                   "F\0"
+#define STRING_FAIL0                "FAIL\0"
+#define STRING_PRUNE0               "PRUNE\0"
+#define STRING_SKIP0                "SKIP\0"
+#define STRING_THEN                 "THEN"
+
+#define STRING_alpha0               "alpha\0"
+#define STRING_lower0               "lower\0"
+#define STRING_upper0               "upper\0"
+#define STRING_alnum0               "alnum\0"
+#define STRING_ascii0               "ascii\0"
+#define STRING_blank0               "blank\0"
+#define STRING_cntrl0               "cntrl\0"
+#define STRING_digit0               "digit\0"
+#define STRING_graph0               "graph\0"
+#define STRING_print0               "print\0"
+#define STRING_punct0               "punct\0"
+#define STRING_space0               "space\0"
+#define STRING_word0                "word\0"
+#define STRING_xdigit               "xdigit"
+
+#define STRING_DEFINE               "DEFINE"
+
+#define STRING_CR_RIGHTPAR          "CR)"
+#define STRING_LF_RIGHTPAR          "LF)"
+#define STRING_CRLF_RIGHTPAR        "CRLF)"
+#define STRING_ANY_RIGHTPAR         "ANY)"
+#define STRING_ANYCRLF_RIGHTPAR     "ANYCRLF)"
+#define STRING_BSR_ANYCRLF_RIGHTPAR "BSR_ANYCRLF)"
+#define STRING_BSR_UNICODE_RIGHTPAR "BSR_UNICODE)"
+#define STRING_UTF8_RIGHTPAR        "UTF8)"
+
+#else  /* SUPPORT_UTF8 */
+
+/* UTF-8 support is enabled; always use UTF-8 (=ASCII) character codes. This
+works in both modes non-EBCDIC platforms, and on EBCDIC platforms in UTF-8 mode
+only. */
+
+#define CHAR_HT                     '\011'
+#define CHAR_VT                     '\013'
+#define CHAR_FF                     '\014'
+#define CHAR_CR                     '\015'
+#define CHAR_NL                     '\012'
+#define CHAR_BS                     '\010'
+#define CHAR_BEL                    '\007'
+#define CHAR_ESC                    '\033'
+#define CHAR_DEL                    '\177'
+
+#define CHAR_SPACE                  '\040'
+#define CHAR_EXCLAMATION_MARK       '\041'
+#define CHAR_QUOTATION_MARK         '\042'
+#define CHAR_NUMBER_SIGN            '\043'
+#define CHAR_DOLLAR_SIGN            '\044'
+#define CHAR_PERCENT_SIGN           '\045'
+#define CHAR_AMPERSAND              '\046'
+#define CHAR_APOSTROPHE             '\047'
+#define CHAR_LEFT_PARENTHESIS       '\050'
+#define CHAR_RIGHT_PARENTHESIS      '\051'
+#define CHAR_ASTERISK               '\052'
+#define CHAR_PLUS                   '\053'
+#define CHAR_COMMA                  '\054'
+#define CHAR_MINUS                  '\055'
+#define CHAR_DOT                    '\056'
+#define CHAR_SLASH                  '\057'
+#define CHAR_0                      '\060'
+#define CHAR_1                      '\061'
+#define CHAR_2                      '\062'
+#define CHAR_3                      '\063'
+#define CHAR_4                      '\064'
+#define CHAR_5                      '\065'
+#define CHAR_6                      '\066'
+#define CHAR_7                      '\067'
+#define CHAR_8                      '\070'
+#define CHAR_9                      '\071'
+#define CHAR_COLON                  '\072'
+#define CHAR_SEMICOLON              '\073'
+#define CHAR_LESS_THAN_SIGN         '\074'
+#define CHAR_EQUALS_SIGN            '\075'
+#define CHAR_GREATER_THAN_SIGN      '\076'
+#define CHAR_QUESTION_MARK          '\077'
+#define CHAR_COMMERCIAL_AT          '\100'
+#define CHAR_A                      '\101'
+#define CHAR_B                      '\102'
+#define CHAR_C                      '\103'
+#define CHAR_D                      '\104'
+#define CHAR_E                      '\105'
+#define CHAR_F                      '\106'
+#define CHAR_G                      '\107'
+#define CHAR_H                      '\110'
+#define CHAR_I                      '\111'
+#define CHAR_J                      '\112'
+#define CHAR_K                      '\113'
+#define CHAR_L                      '\114'
+#define CHAR_M                      '\115'
+#define CHAR_N                      '\116'
+#define CHAR_O                      '\117'
+#define CHAR_P                      '\120'
+#define CHAR_Q                      '\121'
+#define CHAR_R                      '\122'
+#define CHAR_S                      '\123'
+#define CHAR_T                      '\124'
+#define CHAR_U                      '\125'
+#define CHAR_V                      '\126'
+#define CHAR_W                      '\127'
+#define CHAR_X                      '\130'
+#define CHAR_Y                      '\131'
+#define CHAR_Z                      '\132'
+#define CHAR_LEFT_SQUARE_BRACKET    '\133'
+#define CHAR_BACKSLASH              '\134'
+#define CHAR_RIGHT_SQUARE_BRACKET   '\135'
+#define CHAR_CIRCUMFLEX_ACCENT      '\136'
+#define CHAR_UNDERSCORE             '\137'
+#define CHAR_GRAVE_ACCENT           '\140'
+#define CHAR_a                      '\141'
+#define CHAR_b                      '\142'
+#define CHAR_c                      '\143'
+#define CHAR_d                      '\144'
+#define CHAR_e                      '\145'
+#define CHAR_f                      '\146'
+#define CHAR_g                      '\147'
+#define CHAR_h                      '\150'
+#define CHAR_i                      '\151'
+#define CHAR_j                      '\152'
+#define CHAR_k                      '\153'
+#define CHAR_l                      '\154'
+#define CHAR_m                      '\155'
+#define CHAR_n                      '\156'
+#define CHAR_o                      '\157'
+#define CHAR_p                      '\160'
+#define CHAR_q                      '\161'
+#define CHAR_r                      '\162'
+#define CHAR_s                      '\163'
+#define CHAR_t                      '\164'
+#define CHAR_u                      '\165'
+#define CHAR_v                      '\166'
+#define CHAR_w                      '\167'
+#define CHAR_x                      '\170'
+#define CHAR_y                      '\171'
+#define CHAR_z                      '\172'
+#define CHAR_LEFT_CURLY_BRACKET     '\173'
+#define CHAR_VERTICAL_LINE          '\174'
+#define CHAR_RIGHT_CURLY_BRACKET    '\175'
+#define CHAR_TILDE                  '\176'
+
+#define STR_HT                      "\011"
+#define STR_VT                      "\013"
+#define STR_FF                      "\014"
+#define STR_CR                      "\015"
+#define STR_NL                      "\012"
+#define STR_BS                      "\010"
+#define STR_BEL                     "\007"
+#define STR_ESC                     "\033"
+#define STR_DEL                     "\177"
+
+#define STR_SPACE                   "\040"
+#define STR_EXCLAMATION_MARK        "\041"
+#define STR_QUOTATION_MARK          "\042"
+#define STR_NUMBER_SIGN             "\043"
+#define STR_DOLLAR_SIGN             "\044"
+#define STR_PERCENT_SIGN            "\045"
+#define STR_AMPERSAND               "\046"
+#define STR_APOSTROPHE              "\047"
+#define STR_LEFT_PARENTHESIS        "\050"
+#define STR_RIGHT_PARENTHESIS       "\051"
+#define STR_ASTERISK                "\052"
+#define STR_PLUS                    "\053"
+#define STR_COMMA                   "\054"
+#define STR_MINUS                   "\055"
+#define STR_DOT                     "\056"
+#define STR_SLASH                   "\057"
+#define STR_0                       "\060"
+#define STR_1                       "\061"
+#define STR_2                       "\062"
+#define STR_3                       "\063"
+#define STR_4                       "\064"
+#define STR_5                       "\065"
+#define STR_6                       "\066"
+#define STR_7                       "\067"
+#define STR_8                       "\070"
+#define STR_9                       "\071"
+#define STR_COLON                   "\072"
+#define STR_SEMICOLON               "\073"
+#define STR_LESS_THAN_SIGN          "\074"
+#define STR_EQUALS_SIGN             "\075"
+#define STR_GREATER_THAN_SIGN       "\076"
+#define STR_QUESTION_MARK           "\077"
+#define STR_COMMERCIAL_AT           "\100"
+#define STR_A                       "\101"
+#define STR_B                       "\102"
+#define STR_C                       "\103"
+#define STR_D                       "\104"
+#define STR_E                       "\105"
+#define STR_F                       "\106"
+#define STR_G                       "\107"
+#define STR_H                       "\110"
+#define STR_I                       "\111"
+#define STR_J                       "\112"
+#define STR_K                       "\113"
+#define STR_L                       "\114"
+#define STR_M                       "\115"
+#define STR_N                       "\116"
+#define STR_O                       "\117"
+#define STR_P                       "\120"
+#define STR_Q                       "\121"
+#define STR_R                       "\122"
+#define STR_S                       "\123"
+#define STR_T                       "\124"
+#define STR_U                       "\125"
+#define STR_V                       "\126"
+#define STR_W                       "\127"
+#define STR_X                       "\130"
+#define STR_Y                       "\131"
+#define STR_Z                       "\132"
+#define STR_LEFT_SQUARE_BRACKET     "\133"
+#define STR_BACKSLASH               "\134"
+#define STR_RIGHT_SQUARE_BRACKET    "\135"
+#define STR_CIRCUMFLEX_ACCENT       "\136"
+#define STR_UNDERSCORE              "\137"
+#define STR_GRAVE_ACCENT            "\140"
+#define STR_a                       "\141"
+#define STR_b                       "\142"
+#define STR_c                       "\143"
+#define STR_d                       "\144"
+#define STR_e                       "\145"
+#define STR_f                       "\146"
+#define STR_g                       "\147"
+#define STR_h                       "\150"
+#define STR_i                       "\151"
+#define STR_j                       "\152"
+#define STR_k                       "\153"
+#define STR_l                       "\154"
+#define STR_m                       "\155"
+#define STR_n                       "\156"
+#define STR_o                       "\157"
+#define STR_p                       "\160"
+#define STR_q                       "\161"
+#define STR_r                       "\162"
+#define STR_s                       "\163"
+#define STR_t                       "\164"
+#define STR_u                       "\165"
+#define STR_v                       "\166"
+#define STR_w                       "\167"
+#define STR_x                       "\170"
+#define STR_y                       "\171"
+#define STR_z                       "\172"
+#define STR_LEFT_CURLY_BRACKET      "\173"
+#define STR_VERTICAL_LINE           "\174"
+#define STR_RIGHT_CURLY_BRACKET     "\175"
+#define STR_TILDE                   "\176"
+
+#define STRING_ACCEPT0              STR_A STR_C STR_C STR_E STR_P STR_T "\0"
+#define STRING_COMMIT0              STR_C STR_O STR_M STR_M STR_I STR_T "\0"
+#define STRING_F0                   STR_F "\0"
+#define STRING_FAIL0                STR_F STR_A STR_I STR_L "\0"
+#define STRING_PRUNE0               STR_P STR_R STR_U STR_N STR_E "\0"
+#define STRING_SKIP0                STR_S STR_K STR_I STR_P "\0"
+#define STRING_THEN                 STR_T STR_H STR_E STR_N
+
+#define STRING_alpha0               STR_a STR_l STR_p STR_h STR_a "\0"
+#define STRING_lower0               STR_l STR_o STR_w STR_e STR_r "\0"
+#define STRING_upper0               STR_u STR_p STR_p STR_e STR_r "\0"
+#define STRING_alnum0               STR_a STR_l STR_n STR_u STR_m "\0"
+#define STRING_ascii0               STR_a STR_s STR_c STR_i STR_i "\0"
+#define STRING_blank0               STR_b STR_l STR_a STR_n STR_k "\0"
+#define STRING_cntrl0               STR_c STR_n STR_t STR_r STR_l "\0"
+#define STRING_digit0               STR_d STR_i STR_g STR_i STR_t "\0"
+#define STRING_graph0               STR_g STR_r STR_a STR_p STR_h "\0"
+#define STRING_print0               STR_p STR_r STR_i STR_n STR_t "\0"
+#define STRING_punct0               STR_p STR_u STR_n STR_c STR_t "\0"
+#define STRING_space0               STR_s STR_p STR_a STR_c STR_e "\0"
+#define STRING_word0                STR_w STR_o STR_r STR_d       "\0"
+#define STRING_xdigit               STR_x STR_d STR_i STR_g STR_i STR_t
+
+#define STRING_DEFINE               STR_D STR_E STR_F STR_I STR_N STR_E
+
+#define STRING_CR_RIGHTPAR          STR_C STR_R STR_RIGHT_PARENTHESIS
+#define STRING_LF_RIGHTPAR          STR_L STR_F STR_RIGHT_PARENTHESIS
+#define STRING_CRLF_RIGHTPAR        STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
+#define STRING_ANY_RIGHTPAR         STR_A STR_N STR_Y STR_RIGHT_PARENTHESIS
+#define STRING_ANYCRLF_RIGHTPAR     STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
+#define STRING_BSR_ANYCRLF_RIGHTPAR STR_B STR_S STR_R STR_UNDERSCORE STR_A STR_N STR_Y STR_C STR_R STR_L STR_F STR_RIGHT_PARENTHESIS
+#define STRING_BSR_UNICODE_RIGHTPAR STR_B STR_S STR_R STR_UNDERSCORE STR_U STR_N STR_I STR_C STR_O STR_D STR_E STR_RIGHT_PARENTHESIS
+#define STRING_UTF8_RIGHTPAR        STR_U STR_T STR_F STR_8 STR_RIGHT_PARENTHESIS
+
+#endif  /* SUPPORT_UTF8 */
+
+/* Escape items that are just an encoding of a particular data value. */
 
 #ifndef ESC_e
-#define ESC_e 27
+#define ESC_e CHAR_ESC
 #endif
 
 #ifndef ESC_f
-#define ESC_f '\f'
+#define ESC_f CHAR_FF
 #endif
 
 #ifndef ESC_n
-#define ESC_n NEWLINE
+#define ESC_n CHAR_NL
 #endif
 
 #ifndef ESC_r
-#define ESC_r '\r'
+#define ESC_r CHAR_CR
 #endif
 
 /* We can't officially use ESC_t because it is a POSIX reserved identifier
 (presumably because of all the others like size_t). */
 
 #ifndef ESC_tee
-#define ESC_tee '\t'
+#define ESC_tee CHAR_HT
 #endif
 
 /* Codes for different types of Unicode property */
@@ -496,22 +1186,28 @@
 value such as \n. They must have non-zero values, as check_escape() returns
 their negation. Also, they must appear in the same order as in the opcode
 definitions below, up to ESC_z. There's a dummy for OP_ANY because it
-corresponds to "." rather than an escape sequence. The final one must be
-ESC_REF as subsequent values are used for \1, \2, \3, etc. There is are two
-tests in the code for an escape greater than ESC_b and less than ESC_Z to
-detect the types that may be repeated. These are the types that consume
-characters. If any new escapes are put in between that don't consume a
-character, that code will have to change. */
-
-enum { ESC_A = 1, ESC_G, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s, ESC_W,
-       ESC_w, ESC_dum1, ESC_C, ESC_P, ESC_p, ESC_X, ESC_Z, ESC_z, ESC_E,
-       ESC_Q, ESC_REF };
+corresponds to "." rather than an escape sequence, and another for OP_ALLANY
+(which is used for [^] in JavaScript compatibility mode).
 
-/* Opcode table: OP_BRA must be last, as all values >= it are used for brackets
-that extract substrings. Starting from 1 (i.e. after OP_END), the values up to
+The final escape must be ESC_REF as subsequent values are used for
+backreferences (\1, \2, \3, etc). There are two tests in the code for an escape
+greater than ESC_b and less than ESC_Z to detect the types that may be
+repeated. These are the types that consume characters. If any new escapes are
+put in between that don't consume a character, that code will have to change.
+*/
+
+enum { ESC_A = 1, ESC_G, ESC_K, ESC_B, ESC_b, ESC_D, ESC_d, ESC_S, ESC_s,
+       ESC_W, ESC_w, ESC_dum1, ESC_dum2, ESC_C, ESC_P, ESC_p, ESC_R, ESC_H,
+       ESC_h, ESC_V, ESC_v, ESC_X, ESC_Z, ESC_z, ESC_E, ESC_Q, ESC_g, ESC_k,
+       ESC_REF };
+
+
+/* Opcode table: Starting from 1 (i.e. after OP_END), the values up to
 OP_EOD must correspond in order to the list of escapes immediately above.
-Note that whenever this list is updated, the two macro definitions that follow
-must also be updated to match. */
+
+*** NOTE NOTE NOTE *** Whenever this list is updated, the two macro definitions
+that follow must also be updated to match. There is also a table called
+"coptable" in pcre_dfa_exec.c that must be updated. */
 
 enum {
   OP_END,            /* 0 End of pattern */
@@ -520,141 +1216,181 @@
 
   OP_SOD,            /* 1 Start of data: \A */
   OP_SOM,            /* 2 Start of match (subject + offset): \G */
-  OP_NOT_WORD_BOUNDARY,  /*  3 \B */
-  OP_WORD_BOUNDARY,      /*  4 \b */
-  OP_NOT_DIGIT,          /*  5 \D */
-  OP_DIGIT,              /*  6 \d */
-  OP_NOT_WHITESPACE,     /*  7 \S */
-  OP_WHITESPACE,         /*  8 \s */
-  OP_NOT_WORDCHAR,       /*  9 \W */
-  OP_WORDCHAR,           /* 10 \w */
-  OP_ANY,            /* 11 Match any character */
-  OP_ANYBYTE,        /* 12 Match any byte (\C); different to OP_ANY for UTF-8 */
-  OP_NOTPROP,        /* 13 \P (not Unicode property) */
-  OP_PROP,           /* 14 \p (Unicode property) */
-  OP_EXTUNI,         /* 15 \X (extended Unicode sequence */
-  OP_EODN,           /* 16 End of data or \n at end of data: \Z. */
-  OP_EOD,            /* 17 End of data: \z */
-
-  OP_OPT,            /* 18 Set runtime options */
-  OP_CIRC,           /* 19 Start of line - varies with multiline switch */
-  OP_DOLL,           /* 20 End of line - varies with multiline switch */
-  OP_CHAR,           /* 21 Match one character, casefully */
-  OP_CHARNC,         /* 22 Match one character, caselessly */
-  OP_NOT,            /* 23 Match one character, not the following one */
-
-  OP_STAR,           /* 24 The maximizing and minimizing versions of */
-  OP_MINSTAR,        /* 25 all these opcodes must come in pairs, with */
-  OP_PLUS,           /* 26 the minimizing one second. */
-  OP_MINPLUS,        /* 27 This first set applies to single characters */
-  OP_QUERY,          /* 28 */
-  OP_MINQUERY,       /* 29 */
-  OP_UPTO,           /* 30 From 0 to n matches */
-  OP_MINUPTO,        /* 31 */
-  OP_EXACT,          /* 32 Exactly n matches */
-
-  OP_NOTSTAR,        /* 33 The maximizing and minimizing versions of */
-  OP_NOTMINSTAR,     /* 34 all these opcodes must come in pairs, with */
-  OP_NOTPLUS,        /* 35 the minimizing one second. */
-  OP_NOTMINPLUS,     /* 36 This set applies to "not" single characters */
-  OP_NOTQUERY,       /* 37 */
-  OP_NOTMINQUERY,    /* 38 */
-  OP_NOTUPTO,        /* 39 From 0 to n matches */
-  OP_NOTMINUPTO,     /* 40 */
-  OP_NOTEXACT,       /* 41 Exactly n matches */
-
-  OP_TYPESTAR,       /* 42 The maximizing and minimizing versions of */
-  OP_TYPEMINSTAR,    /* 43 all these opcodes must come in pairs, with */
-  OP_TYPEPLUS,       /* 44 the minimizing one second. These codes must */
-  OP_TYPEMINPLUS,    /* 45 be in exactly the same order as those above. */
-  OP_TYPEQUERY,      /* 46 This set applies to character types such as \d */
-  OP_TYPEMINQUERY,   /* 47 */
-  OP_TYPEUPTO,       /* 48 From 0 to n matches */
-  OP_TYPEMINUPTO,    /* 49 */
-  OP_TYPEEXACT,      /* 50 Exactly n matches */
-
-  OP_CRSTAR,         /* 51 The maximizing and minimizing versions of */
-  OP_CRMINSTAR,      /* 52 all these opcodes must come in pairs, with */
-  OP_CRPLUS,         /* 53 the minimizing one second. These codes must */
-  OP_CRMINPLUS,      /* 54 be in exactly the same order as those above. */
-  OP_CRQUERY,        /* 55 These are for character classes and back refs */
-  OP_CRMINQUERY,     /* 56 */
-  OP_CRRANGE,        /* 57 These are different to the three sets above. */
-  OP_CRMINRANGE,     /* 58 */
+  OP_SET_SOM,        /* 3 Set start of match (\K) */
+  OP_NOT_WORD_BOUNDARY,  /*  4 \B */
+  OP_WORD_BOUNDARY,      /*  5 \b */
+  OP_NOT_DIGIT,          /*  6 \D */
+  OP_DIGIT,              /*  7 \d */
+  OP_NOT_WHITESPACE,     /*  8 \S */
+  OP_WHITESPACE,         /*  9 \s */
+  OP_NOT_WORDCHAR,       /* 10 \W */
+  OP_WORDCHAR,           /* 11 \w */
+  OP_ANY,            /* 12 Match any character (subject to DOTALL) */
+  OP_ALLANY,         /* 13 Match any character (not subject to DOTALL) */
+  OP_ANYBYTE,        /* 14 Match any byte (\C); different to OP_ANY for UTF-8 */
+  OP_NOTPROP,        /* 15 \P (not Unicode property) */
+  OP_PROP,           /* 16 \p (Unicode property) */
+  OP_ANYNL,          /* 17 \R (any newline sequence) */
+  OP_NOT_HSPACE,     /* 18 \H (not horizontal whitespace) */
+  OP_HSPACE,         /* 19 \h (horizontal whitespace) */
+  OP_NOT_VSPACE,     /* 20 \V (not vertical whitespace) */
+  OP_VSPACE,         /* 21 \v (vertical whitespace) */
+  OP_EXTUNI,         /* 22 \X (extended Unicode sequence */
+  OP_EODN,           /* 23 End of data or \n at end of data: \Z. */
+  OP_EOD,            /* 24 End of data: \z */
+
+  OP_OPT,            /* 25 Set runtime options */
+  OP_CIRC,           /* 26 Start of line - varies with multiline switch */
+  OP_DOLL,           /* 27 End of line - varies with multiline switch */
+  OP_CHAR,           /* 28 Match one character, casefully */
+  OP_CHARNC,         /* 29 Match one character, caselessly */
+  OP_NOT,            /* 30 Match one character, not the following one */
+
+  OP_STAR,           /* 31 The maximizing and minimizing versions of */
+  OP_MINSTAR,        /* 32 these six opcodes must come in pairs, with */
+  OP_PLUS,           /* 33 the minimizing one second. */
+  OP_MINPLUS,        /* 34 This first set applies to single characters.*/
+  OP_QUERY,          /* 35 */
+  OP_MINQUERY,       /* 36 */
+
+  OP_UPTO,           /* 37 From 0 to n matches */
+  OP_MINUPTO,        /* 38 */
+  OP_EXACT,          /* 39 Exactly n matches */
+
+  OP_POSSTAR,        /* 40 Possessified star */
+  OP_POSPLUS,        /* 41 Possessified plus */
+  OP_POSQUERY,       /* 42 Posesssified query */
+  OP_POSUPTO,        /* 43 Possessified upto */
+
+  OP_NOTSTAR,        /* 44 The maximizing and minimizing versions of */
+  OP_NOTMINSTAR,     /* 45 these six opcodes must come in pairs, with */
+  OP_NOTPLUS,        /* 46 the minimizing one second. They must be in */
+  OP_NOTMINPLUS,     /* 47 exactly the same order as those above. */
+  OP_NOTQUERY,       /* 48 This set applies to "not" single characters. */
+  OP_NOTMINQUERY,    /* 49 */
+
+  OP_NOTUPTO,        /* 50 From 0 to n matches */
+  OP_NOTMINUPTO,     /* 51 */
+  OP_NOTEXACT,       /* 52 Exactly n matches */
+
+  OP_NOTPOSSTAR,     /* 53 Possessified versions */
+  OP_NOTPOSPLUS,     /* 54 */
+  OP_NOTPOSQUERY,    /* 55 */
+  OP_NOTPOSUPTO,     /* 56 */
+
+  OP_TYPESTAR,       /* 57 The maximizing and minimizing versions of */
+  OP_TYPEMINSTAR,    /* 58 these six opcodes must come in pairs, with */
+  OP_TYPEPLUS,       /* 59 the minimizing one second. These codes must */
+  OP_TYPEMINPLUS,    /* 60 be in exactly the same order as those above. */
+  OP_TYPEQUERY,      /* 61 This set applies to character types such as \d */
+  OP_TYPEMINQUERY,   /* 62 */
+
+  OP_TYPEUPTO,       /* 63 From 0 to n matches */
+  OP_TYPEMINUPTO,    /* 64 */
+  OP_TYPEEXACT,      /* 65 Exactly n matches */
+
+  OP_TYPEPOSSTAR,    /* 66 Possessified versions */
+  OP_TYPEPOSPLUS,    /* 67 */
+  OP_TYPEPOSQUERY,   /* 68 */
+  OP_TYPEPOSUPTO,    /* 69 */
+
+  OP_CRSTAR,         /* 70 The maximizing and minimizing versions of */
+  OP_CRMINSTAR,      /* 71 all these opcodes must come in pairs, with */
+  OP_CRPLUS,         /* 72 the minimizing one second. These codes must */
+  OP_CRMINPLUS,      /* 73 be in exactly the same order as those above. */
+  OP_CRQUERY,        /* 74 These are for character classes and back refs */
+  OP_CRMINQUERY,     /* 75 */
+  OP_CRRANGE,        /* 76 These are different to the three sets above. */
+  OP_CRMINRANGE,     /* 77 */
 
-  OP_CLASS,          /* 59 Match a character class, chars < 256 only */
-  OP_NCLASS,         /* 60 Same, but the bitmap was created from a negative
+  OP_CLASS,          /* 78 Match a character class, chars < 256 only */
+  OP_NCLASS,         /* 79 Same, but the bitmap was created from a negative
                            class - the difference is relevant only when a UTF-8
                            character > 255 is encountered. */
 
-  OP_XCLASS,         /* 61 Extended class for handling UTF-8 chars within the
+  OP_XCLASS,         /* 80 Extended class for handling UTF-8 chars within the
                            class. This does both positive and negative. */
 
-  OP_REF,            /* 62 Match a back reference */
-  OP_RECURSE,        /* 63 Match a numbered subpattern (possibly recursive) */
-  OP_CALLOUT,        /* 64 Call out to external function if provided */
-
-  OP_ALT,            /* 65 Start of alternation */
-  OP_KET,            /* 66 End of group that doesn't have an unbounded repeat */
-  OP_KETRMAX,        /* 67 These two must remain together and in this */
-  OP_KETRMIN,        /* 68 order. They are for groups the repeat for ever. */
-
-  /* The assertions must come before ONCE and COND */
-
-  OP_ASSERT,         /* 69 Positive lookahead */
-  OP_ASSERT_NOT,     /* 70 Negative lookahead */
-  OP_ASSERTBACK,     /* 71 Positive lookbehind */
-  OP_ASSERTBACK_NOT, /* 72 Negative lookbehind */
-  OP_REVERSE,        /* 73 Move pointer back - used in lookbehind assertions */
-
-  /* ONCE and COND must come after the assertions, with ONCE first, as there's
-  a test for >= ONCE for a subpattern that isn't an assertion. */
-
-  OP_ONCE,           /* 74 Once matched, don't back up into the subpattern */
-  OP_COND,           /* 75 Conditional group */
-  OP_CREF,           /* 76 Used to hold an extraction string number (cond ref) */
-
-  OP_BRAZERO,        /* 77 These two must remain together and in this */
-  OP_BRAMINZERO,     /* 78 order. */
-
-  OP_BRANUMBER,      /* 79 Used for extracting brackets whose number is greater
-                           than can fit into an opcode. */
-
-  OP_BRA             /* 80 This and greater values are used for brackets that
-                           extract substrings up to EXTRACT_BASIC_MAX. After
-                           that, use is made of OP_BRANUMBER. */
-};
+  OP_REF,            /* 81 Match a back reference */
+  OP_RECURSE,        /* 82 Match a numbered subpattern (possibly recursive) */
+  OP_CALLOUT,        /* 83 Call out to external function if provided */
+
+  OP_ALT,            /* 84 Start of alternation */
+  OP_KET,            /* 85 End of group that doesn't have an unbounded repeat */
+  OP_KETRMAX,        /* 86 These two must remain together and in this */
+  OP_KETRMIN,        /* 87 order. They are for groups the repeat for ever. */
+
+  /* The assertions must come before BRA, CBRA, ONCE, and COND.*/
+
+  OP_ASSERT,         /* 88 Positive lookahead */
+  OP_ASSERT_NOT,     /* 89 Negative lookahead */
+  OP_ASSERTBACK,     /* 90 Positive lookbehind */
+  OP_ASSERTBACK_NOT, /* 91 Negative lookbehind */
+  OP_REVERSE,        /* 92 Move pointer back - used in lookbehind assertions */
 
-/* WARNING WARNING WARNING: There is an implicit assumption in pcre.c and
-study.c that all opcodes are less than 128 in value. This makes handling UTF-8
-character sequences easier. */
-
-/* The highest extraction number before we have to start using additional
-bytes. (Originally PCRE didn't have support for extraction counts highter than
-this number.) The value is limited by the number of opcodes left after OP_BRA,
-i.e. 255 - OP_BRA. We actually set it a bit lower to leave room for additional
-opcodes. */
+  /* ONCE, BRA, CBRA, and COND must come after the assertions, with ONCE first,
+  as there's a test for >= ONCE for a subpattern that isn't an assertion. */
 
-#define EXTRACT_BASIC_MAX  100
+  OP_ONCE,           /* 93 Atomic group */
+  OP_BRA,            /* 94 Start of non-capturing bracket */
+  OP_CBRA,           /* 95 Start of capturing bracket */
+  OP_COND,           /* 96 Conditional group */
+
+  /* These three must follow the previous three, in the same order. There's a
+  check for >= SBRA to distinguish the two sets. */
+
+  OP_SBRA,           /* 97 Start of non-capturing bracket, check empty  */
+  OP_SCBRA,          /* 98 Start of capturing bracket, check empty */
+  OP_SCOND,          /* 99 Conditional group, check empty */
+
+  OP_CREF,           /* 100 Used to hold a capture number as condition */
+  OP_RREF,           /* 101 Used to hold a recursion number as condition */
+  OP_DEF,            /* 102 The DEFINE condition */
+
+  OP_BRAZERO,        /* 103 These two must remain together and in this */
+  OP_BRAMINZERO,     /* 104 order. */
+
+  /* These are backtracking control verbs */
+
+  OP_PRUNE,          /* 105 */
+  OP_SKIP,           /* 106 */
+  OP_THEN,           /* 107 */
+  OP_COMMIT,         /* 108 */
+
+  /* These are forced failure and success verbs */
+
+  OP_FAIL,           /* 109 */
+  OP_ACCEPT,         /* 110 */
+
+  /* This is used to skip a subpattern with a {0} quantifier */
+
+  OP_SKIPZERO        /* 111 */
+};
 
 
 /* This macro defines textual names for all the opcodes. These are used only
 for debugging. The macro is referenced only in pcre_printint.c. */
 
 #define OP_NAME_LIST \
-  "End", "\\A", "\\G", "\\B", "\\b", "\\D", "\\d",                \
-  "\\S", "\\s", "\\W", "\\w", "Any", "Anybyte",                   \
-  "notprop", "prop", "extuni",                                    \
-  "\\Z", "\\z",                                                   \
+  "End", "\\A", "\\G", "\\K", "\\B", "\\b", "\\D", "\\d",         \
+  "\\S", "\\s", "\\W", "\\w", "Any", "AllAny", "Anybyte",         \
+  "notprop", "prop", "\\R", "\\H", "\\h", "\\V", "\\v",           \
+  "extuni",  "\\Z", "\\z",                                        \
   "Opt", "^", "$", "char", "charnc", "not",                       \
   "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
+  "*+","++", "?+", "{",                                           \
   "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
+  "*+","++", "?+", "{",                                           \
   "*", "*?", "+", "+?", "?", "??", "{", "{", "{",                 \
+  "*+","++", "?+", "{",                                           \
   "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
   "class", "nclass", "xclass", "Ref", "Recurse", "Callout",       \
   "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",     \
-  "AssertB", "AssertB not", "Reverse", "Once", "Cond", "Cond ref",\
-  "Brazero", "Braminzero", "Branumber", "Bra"
+  "AssertB", "AssertB not", "Reverse",                            \
+  "Once", "Bra", "CBra", "Cond", "SBra", "SCBra", "SCond",        \
+  "Cond ref", "Cond rec", "Cond def", "Brazero", "Braminzero",    \
+  "*PRUNE", "*SKIP", "*THEN", "*COMMIT", "*FAIL", "*ACCEPT",      \
+  "Skip zero"
 
 
 /* This macro defines the length of fixed length operations in the compiled
@@ -668,9 +1404,11 @@
 
 #define OP_LENGTHS \
   1,                             /* End                                    */ \
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  /* \A, \G, \B, \B, \D, \d, \S, \s, \W, \w */ \
-  1, 1,                          /* Any, Anybyte                           */ \
+  1, 1, 1, 1, 1,                 /* \A, \G, \K, \B, \b                     */ \
+  1, 1, 1, 1, 1, 1,              /* \D, \d, \S, \s, \W, \w                 */ \
+  1, 1, 1,                       /* Any, AllAny, Anybyte                   */ \
   3, 3, 1,                       /* NOTPROP, PROP, EXTUNI                  */ \
+  1, 1, 1, 1, 1,                 /* \R, \H, \h, \V, \v                     */ \
   1, 1, 2, 1, 1,                 /* \Z, \z, Opt, ^, $                      */ \
   2,                             /* Char  - the minimum length             */ \
   2,                             /* Charnc  - the minimum length           */ \
@@ -678,12 +1416,15 @@
   /* Positive single-char repeats                            ** These are  */ \
   2, 2, 2, 2, 2, 2,              /* *, *?, +, +?, ?, ??      ** minima in  */ \
   4, 4, 4,                       /* upto, minupto, exact     ** UTF-8 mode */ \
+  2, 2, 2, 4,                    /* *+, ++, ?+, upto+                      */ \
   /* Negative single-char repeats - only for chars < 256                   */ \
   2, 2, 2, 2, 2, 2,              /* NOT *, *?, +, +?, ?, ??                */ \
   4, 4, 4,                       /* NOT upto, minupto, exact               */ \
+  2, 2, 2, 4,                    /* Possessive *, +, ?, upto               */ \
   /* Positive type repeats                                                 */ \
   2, 2, 2, 2, 2, 2,              /* Type *, *?, +, +?, ?, ??               */ \
   4, 4, 4,                       /* Type upto, minupto, exact              */ \
+  2, 2, 2, 4,                    /* Possessive *+, ++, ?+, upto+           */ \
   /* Character class & ref repeats                                         */ \
   1, 1, 1, 1, 1, 1,              /* *, *?, +, +?, ?, ??                    */ \
   5, 5,                          /* CRRANGE, CRMINRANGE                    */ \
@@ -702,17 +1443,24 @@
   1+LINK_SIZE,                   /* Assert behind                          */ \
   1+LINK_SIZE,                   /* Assert behind not                      */ \
   1+LINK_SIZE,                   /* Reverse                                */ \
-  1+LINK_SIZE,                   /* Once                                   */ \
+  1+LINK_SIZE,                   /* ONCE                                   */ \
+  1+LINK_SIZE,                   /* BRA                                    */ \
+  3+LINK_SIZE,                   /* CBRA                                   */ \
   1+LINK_SIZE,                   /* COND                                   */ \
+  1+LINK_SIZE,                   /* SBRA                                   */ \
+  3+LINK_SIZE,                   /* SCBRA                                  */ \
+  1+LINK_SIZE,                   /* SCOND                                  */ \
   3,                             /* CREF                                   */ \
+  3,                             /* RREF                                   */ \
+  1,                             /* DEF                                    */ \
   1, 1,                          /* BRAZERO, BRAMINZERO                    */ \
-  3,                             /* BRANUMBER                              */ \
-  1+LINK_SIZE                    /* BRA                                    */ \
+  1, 1, 1, 1,                    /* PRUNE, SKIP, THEN, COMMIT,             */ \
+  1, 1, 1                        /* FAIL, ACCEPT, SKIPZERO                 */
 
 
-/* A magic value for OP_CREF to indicate the "in recursion" condition. */
+/* A magic value for OP_RREF to indicate the "any recursion" condition. */
 
-#define CREF_RECURSE  0xffff
+#define RREF_ANY  0xffff
 
 /* Error code numbers. They are given names so that they can more easily be
 tracked. */
@@ -722,7 +1470,8 @@
        ERR20, ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29,
        ERR30, ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39,
        ERR40, ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49,
-       ERR50, ERR51 };
+       ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
+       ERR60, ERR61, ERR62, ERR63, ERR64 };
 
 /* The real format of the start of the pcre block; the index of names and the
 code vector run on as long as necessary after the end. We store an explicit
@@ -744,9 +1493,9 @@
 typedef struct real_pcre {
   pcre_uint32 magic_number;
   pcre_uint32 size;               /* Total that was malloced */
-  pcre_uint32 options;
-  pcre_uint32 dummy1;             /* For future use, maybe */
-
+  pcre_uint32 options;            /* Public options */
+  pcre_uint16 flags;              /* Private flags */
+  pcre_uint16 dummy1;             /* For future use */
   pcre_uint16 top_bracket;
   pcre_uint16 top_backref;
   pcre_uint16 first_byte;
@@ -777,17 +1526,25 @@
   const uschar *fcc;            /* Points to case-flipping table */
   const uschar *cbits;          /* Points to character type table */
   const uschar *ctypes;         /* Points to table of type maps */
+  const uschar *start_workspace;/* The start of working space */
   const uschar *start_code;     /* The start of the compiled code */
   const uschar *start_pattern;  /* The start of the pattern */
+  const uschar *end_pattern;    /* The end of the pattern */
+  uschar *hwm;                  /* High watermark of workspace */
   uschar *name_table;           /* The name/number table */
   int  names_found;             /* Number of entries so far */
   int  name_entry_size;         /* Size of each entry */
+  int  bracount;                /* Count of capturing parens as we compile */
+  int  final_bracount;          /* Saved value after first pass */
   int  top_backref;             /* Maximum back reference */
   unsigned int backref_map;     /* Bitmap of low back refs */
+  int  external_options;        /* External (initial) options */
+  int  external_flags;          /* External flag bits to be set */
   int  req_varyopt;             /* "After variable item" flag for reqbyte */
-  BOOL nopartial;               /* Set TRUE if partial won't work */
-  int  nllen;                   /* 1 or 2 for newline string length */
-  uschar nl[4];                 /* Newline string */
+  BOOL had_accept;              /* (*ACCEPT) encountered */
+  int  nltype;                  /* Newline type */
+  int  nllen;                   /* Newline string length */
+  uschar nl[4];                 /* Newline string when fixed length */
 } compile_data;
 
 /* Structure for maintaining a chain of pointers to the currently incomplete
@@ -805,20 +1562,20 @@
   struct recursion_info *prevrec; /* Previous recursion record (or NULL) */
   int group_num;                /* Number of group that was called */
   const uschar *after_call;     /* "Return value": points after the call in the expr */
-  USPTR save_start;             /* Old value of md->start_match */
+  USPTR save_start;             /* Old value of mstart */
   int *offset_save;             /* Pointer to start of saved offsets */
   int saved_max;                /* Number of saved offsets */
 } recursion_info;
 
-/* When compiling in a mode that doesn't use recursive calls to match(),
-a structure is used to remember local variables on the heap. It is defined in
-pcre_exec.c, close to the match() function, so that it is easy to keep it in
-step with any changes of local variable. However, the pointer to the current
-frame must be saved in some "static" place over a longjmp(). We declare the
-structure here so that we can put a pointer in the match_data structure. NOTE:
-This isn't used for a "normal" compilation of pcre. */
+/* Structure for building a chain of data for holding the values of the subject
+pointer at the start of each subpattern, so as to detect when an empty string
+has been matched by a subpattern - to break infinite loops. */
+
+typedef struct eptrblock {
+  struct eptrblock *epb_prev;
+  USPTR epb_saved_eptr;
+} eptrblock;
 
-struct heapframe;
 
 /* Structure for passing "static" information around between the functions
 doing traditional NFA matching, so that they are thread-safe. */
@@ -830,29 +1587,33 @@
   int   *offset_vector;         /* Offset vector */
   int    offset_end;            /* One past the end */
   int    offset_max;            /* The maximum usable for return data */
-  int    nllen;                 /* 1 or 2 for newline string length */
-  uschar nl[4];                 /* Newline string */
+  int    nltype;                /* Newline type */
+  int    nllen;                 /* Newline string length */
+  uschar nl[4];                 /* Newline string when fixed */
   const uschar *lcc;            /* Points to lower casing table */
   const uschar *ctypes;         /* Points to table of type maps */
   BOOL   offset_overflow;       /* Set if too many extractions */
   BOOL   notbol;                /* NOTBOL flag */
   BOOL   noteol;                /* NOTEOL flag */
   BOOL   utf8;                  /* UTF8 flag */
+  BOOL   jscript_compat;        /* JAVASCRIPT_COMPAT flag */
   BOOL   endonly;               /* Dollar not before final \n */
   BOOL   notempty;              /* Empty string match not wanted */
   BOOL   partial;               /* PARTIAL flag */
   BOOL   hitend;                /* Hit the end of the subject at some point */
+  BOOL   bsr_anycrlf;           /* \R is just any CRLF, not full Unicode */
   const uschar *start_code;     /* For use when recursing */
   USPTR  start_subject;         /* Start of the subject string */
   USPTR  end_subject;           /* End of the subject string */
-  USPTR  start_match;           /* Start of this match attempt */
+  USPTR  start_match_ptr;       /* Start of matched string */
   USPTR  end_match_ptr;         /* Subject position at end match */
   int    end_offset_top;        /* Highwater mark at end of match */
   int    capture_last;          /* Most recent capture number */
   int    start_offset;          /* The start offset value */
+  eptrblock *eptrchain;         /* Chain of eptrblocks for tail recursions */
+  int    eptrn;                 /* Next free eptrblock */
   recursion_info *recursive;    /* Linked list of recursion data */
   void  *callout_data;          /* To pass back to callouts */
-  struct heapframe *thisframe;  /* Used only when compiling for no recursion */
 } match_data;
 
 /* A similar structure is used for the same purpose by the DFA matching
@@ -865,8 +1626,9 @@
   const uschar *tables;         /* Character tables */
   int   moptions;               /* Match options */
   int   poptions;               /* Pattern options */
-  int    nllen;                 /* 1 or 2 for newline string length */
-  uschar nl[4];                 /* Newline string */
+  int    nltype;                /* Newline type */
+  int    nllen;                 /* Newline string length */
+  uschar nl[4];                 /* Newline string when fixed */
   void  *callout_data;          /* To pass back to callouts */
 } dfa_match_data;
 
@@ -876,7 +1638,7 @@
 #define ctype_letter  0x02
 #define ctype_digit   0x04
 #define ctype_xdigit  0x08
-#define ctype_word    0x10   /* alphameric or '_' */
+#define ctype_word    0x10   /* alphanumeric or '_' */
 #define ctype_meta    0x80   /* regexp meta char or zero (end pattern) */
 
 /* Offsets for the bitmap tables in pcre_cbits. Each table contains a set
@@ -904,10 +1666,12 @@
 #define tables_length (ctypes_offset + 256)
 
 /* Layout of the UCP type table that translates property names into types and
-codes. */
+codes. Each entry used to point directly to a name, but to reduce the number of
+relocations in shared libraries, it now has an offset into a single string
+instead. */
 
 typedef struct {
-  const char *name;
+  pcre_uint16 name_offset;
   pcre_uint16 type;
   pcre_uint16 value;
 } ucp_type_table;
@@ -925,6 +1689,7 @@
 
 extern const int    _pcre_utf8_table1_size;
 
+extern const char   _pcre_utt_names[];
 extern const ucp_type_table _pcre_utt[];
 extern const int _pcre_utt_size;
 
@@ -937,13 +1702,42 @@
 one of the exported public functions. They have to be "external" in the C
 sense, but are not part of the PCRE public API. */
 
-extern int         _pcre_ord2utf8(int, uschar *);
-extern real_pcre * _pcre_try_flipped(const real_pcre *, real_pcre *,
-                     const pcre_study_data *, pcre_study_data *);
-extern int         _pcre_ucp_findprop(const unsigned int, int *, int *);
-extern int         _pcre_ucp_othercase(const int);
-extern int         _pcre_valid_utf8(const uschar *, int);
-extern BOOL        _pcre_xclass(int, const uschar *);
+extern BOOL         _pcre_is_newline(const uschar *, int, const uschar *,
+                      int *, BOOL);
+extern int          _pcre_ord2utf8(int, uschar *);
+extern real_pcre   *_pcre_try_flipped(const real_pcre *, real_pcre *,
+                      const pcre_study_data *, pcre_study_data *);
+extern int          _pcre_valid_utf8(const uschar *, int);
+extern BOOL         _pcre_was_newline(const uschar *, int, const uschar *,
+                      int *, BOOL);
+extern BOOL         _pcre_xclass(int, const uschar *);
+
+
+/* Unicode character database (UCD) */
+
+typedef struct {
+  uschar script;
+  uschar chartype;
+  pcre_int32 other_case;
+} ucd_record;
+
+extern const ucd_record  _pcre_ucd_records[];
+extern const uschar      _pcre_ucd_stage1[];
+extern const pcre_uint16 _pcre_ucd_stage2[];
+extern const int         _pcre_ucp_gentype[];
+
+
+/* UCD access macros */
+
+#define UCD_BLOCK_SIZE 128
+#define GET_UCD(ch) (_pcre_ucd_records + \
+        _pcre_ucd_stage2[_pcre_ucd_stage1[(ch) / UCD_BLOCK_SIZE] * \
+        UCD_BLOCK_SIZE + ch % UCD_BLOCK_SIZE])
+
+#define UCD_CHARTYPE(ch)  GET_UCD(ch)->chartype
+#define UCD_SCRIPT(ch)    GET_UCD(ch)->script
+#define UCD_CATEGORY(ch)  _pcre_ucp_gentype[UCD_CHARTYPE(ch)]
+#define UCD_OTHERCASE(ch) (ch + GET_UCD(ch)->other_case)
 
 #endif
 

Modified: freeswitch/trunk/libs/pcre/pcre_maketables.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_maketables.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_maketables.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,10 @@
 
 
 #ifndef DFTABLES
-#include "pcre_internal.h"
+#  ifdef HAVE_CONFIG_H
+#  include "config.h"
+#  endif
+#  include "pcre_internal.h"
 #endif
 
 
@@ -130,7 +133,7 @@
   meta-character, which in this sense is any character that terminates a run
   of data characters. */
 
-  if (strchr("*+?{^.$|()[", i) != 0) x += ctype_meta;
+  if (strchr("\\*+?{^.$|()[", i) != 0) x += ctype_meta;
   *p++ = x;
   }
 

Added: freeswitch/trunk/libs/pcre/pcre_newline.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/pcre_newline.c	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,162 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+           Copyright (c) 1997-2009 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains internal functions for testing newlines when more than
+one kind of newline is to be recognized. When a newline is found, its length is
+returned. In principle, we could implement several newline "types", each
+referring to a different set of newline characters. At present, PCRE supports
+only NLTYPE_FIXED, which gets handled without these functions, NLTYPE_ANYCRLF,
+and NLTYPE_ANY. The full list of Unicode newline characters is taken from
+http://unicode.org/unicode/reports/tr18/. */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+
+/*************************************************
+*      Check for newline at given position       *
+*************************************************/
+
+/* It is guaranteed that the initial value of ptr is less than the end of the
+string that is being processed.
+
+Arguments:
+  ptr          pointer to possible newline
+  type         the newline type
+  endptr       pointer to the end of the string
+  lenptr       where to return the length
+  utf8         TRUE if in utf8 mode
+
+Returns:       TRUE or FALSE
+*/
+
+BOOL
+_pcre_is_newline(USPTR ptr, int type, USPTR endptr, int *lenptr, BOOL utf8)
+{
+int c;
+if (utf8) { GETCHAR(c, ptr); } else c = *ptr;
+
+if (type == NLTYPE_ANYCRLF) switch(c)
+  {
+  case 0x000a: *lenptr = 1; return TRUE;             /* LF */
+  case 0x000d: *lenptr = (ptr < endptr - 1 && ptr[1] == 0x0a)? 2 : 1;
+               return TRUE;                          /* CR */
+  default: return FALSE;
+  }
+
+/* NLTYPE_ANY */
+
+else switch(c)
+  {
+  case 0x000a:                                       /* LF */
+  case 0x000b:                                       /* VT */
+  case 0x000c: *lenptr = 1; return TRUE;             /* FF */
+  case 0x000d: *lenptr = (ptr < endptr - 1 && ptr[1] == 0x0a)? 2 : 1;
+               return TRUE;                          /* CR */
+  case 0x0085: *lenptr = utf8? 2 : 1; return TRUE;   /* NEL */
+  case 0x2028:                                       /* LS */
+  case 0x2029: *lenptr = 3; return TRUE;             /* PS */
+  default: return FALSE;
+  }
+}
+
+
+
+/*************************************************
+*     Check for newline at previous position     *
+*************************************************/
+
+/* It is guaranteed that the initial value of ptr is greater than the start of
+the string that is being processed.
+
+Arguments:
+  ptr          pointer to possible newline
+  type         the newline type
+  startptr     pointer to the start of the string
+  lenptr       where to return the length
+  utf8         TRUE if in utf8 mode
+
+Returns:       TRUE or FALSE
+*/
+
+BOOL
+_pcre_was_newline(USPTR ptr, int type, USPTR startptr, int *lenptr, BOOL utf8)
+{
+int c;
+ptr--;
+#ifdef SUPPORT_UTF8
+if (utf8)
+  {
+  BACKCHAR(ptr);
+  GETCHAR(c, ptr);
+  }
+else c = *ptr;
+#else   /* no UTF-8 support */
+c = *ptr;
+#endif  /* SUPPORT_UTF8 */
+
+if (type == NLTYPE_ANYCRLF) switch(c)
+  {
+  case 0x000a: *lenptr = (ptr > startptr && ptr[-1] == 0x0d)? 2 : 1;
+               return TRUE;                         /* LF */
+  case 0x000d: *lenptr = 1; return TRUE;            /* CR */
+  default: return FALSE;
+  }
+
+else switch(c)
+  {
+  case 0x000a: *lenptr = (ptr > startptr && ptr[-1] == 0x0d)? 2 : 1;
+               return TRUE;                         /* LF */
+  case 0x000b:                                      /* VT */
+  case 0x000c:                                      /* FF */
+  case 0x000d: *lenptr = 1; return TRUE;            /* CR */
+  case 0x0085: *lenptr = utf8? 2 : 1; return TRUE;  /* NEL */
+  case 0x2028:                                      /* LS */
+  case 0x2029: *lenptr = 3; return TRUE;            /* PS */
+  default: return FALSE;
+  }
+}
+
+/* End of pcre_newline.c */

Modified: freeswitch/trunk/libs/pcre/pcre_ord2utf8.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_ord2utf8.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_ord2utf8.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,9 @@
 /* This file contains a private PCRE function that converts an ordinal
 character value into a UTF8 string. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "pcre_internal.h"
 
@@ -62,6 +65,7 @@
 int
 _pcre_ord2utf8(int cvalue, uschar *buffer)
 {
+#ifdef SUPPORT_UTF8
 register int i, j;
 for (i = 0; i < _pcre_utf8_table1_size; i++)
   if (cvalue <= _pcre_utf8_table1[i]) break;
@@ -73,6 +77,11 @@
  }
 *buffer = _pcre_utf8_table2[i] | cvalue;
 return i + 1;
+#else
+(void)(cvalue);  /* Keep compiler happy; this function won't ever be */
+(void)(buffer);  /* called when SUPPORT_UTF8 is not defined. */
+return 0;
+#endif
 }
 
 /* End of pcre_ord2utf8.c */

Modified: freeswitch/trunk/libs/pcre/pcre_printint.src
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_printint.src	(original)
+++ freeswitch/trunk/libs/pcre/pcre_printint.src	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2005 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -49,9 +49,23 @@
 compiled regex for debugging purposes. */
 
 
+/* Macro that decides whether a character should be output as a literal or in
+hexadecimal. We don't use isprint() because that can vary from system to system
+(even without the use of locales) and we want the output always to be the same,
+for testing purposes. This macro is used in pcretest as well as in this file. */
+
+#ifdef EBCDIC
+#define PRINTABLE(c) ((c) >= 64 && (c) < 255)
+#else
+#define PRINTABLE(c) ((c) >= 32 && (c) < 127)
+#endif
+
+/* The table of operator names. */
+
 static const char *OP_names[] = { OP_NAME_LIST };
 
 
+
 /*************************************************
 *       Print single- or multi-byte character    *
 *************************************************/
@@ -61,9 +75,15 @@
 {
 int c = *ptr;
 
+#ifndef SUPPORT_UTF8
+utf8 = utf8;  /* Avoid compiler warning */
+if (PRINTABLE(c)) fprintf(f, "%c", c); else fprintf(f, "\\x%02x", c);
+return 0;
+
+#else
 if (!utf8 || (c & 0xc0) != 0xc0)
   {
-  if (isprint(c)) fprintf(f, "%c", c); else fprintf(f, "\\x%02x", c);
+  if (PRINTABLE(c)) fprintf(f, "%c", c); else fprintf(f, "\\x%02x", c);
   return 0;
   }
 else
@@ -92,6 +112,7 @@
   if (c < 128) fprintf(f, "\\x%02x", c); else fprintf(f, "\\x{%x}", c);
   return a;
   }
+#endif
 }
 
 
@@ -105,11 +126,11 @@
 {
 #ifdef SUPPORT_UCP
 int i;
-for (i = _pcre_utt_size; i >= 0; i--)
+for (i = _pcre_utt_size - 1; i >= 0; i--)
   {
   if (ptype == _pcre_utt[i].type && pvalue == _pcre_utt[i].value) break;
   }
-return (i >= 0)? _pcre_utt[i].name : "??";
+return (i >= 0)? _pcre_utt_names + _pcre_utt[i].name_offset : "??";
 #else
 /* It gets harder and harder to shut off unwanted compiler warnings. */
 ptype = ptype * pvalue;
@@ -124,10 +145,13 @@
 *************************************************/
 
 /* Make this function work for a regex with integers either byte order.
-However, we assume that what we are passed is a compiled regex. */
+However, we assume that what we are passed is a compiled regex. The
+print_lengths flag controls whether offsets and lengths of items are printed.
+They can be turned off from pcretest so that automatic tests on bytecode can be
+written that do not depend on the value of LINK_SIZE. */
 
 static void
-pcre_printint(pcre *external_re, FILE *f)
+pcre_printint(pcre *external_re, FILE *f, BOOL print_lengths)
 {
 real_pcre *re = (real_pcre *)external_re;
 uschar *codestart, *code;
@@ -158,17 +182,10 @@
   int c;
   int extra = 0;
 
-  fprintf(f, "%3d ", (int)(code - codestart));
-
-  if (*code >= OP_BRA)
-    {
-    if (*code - OP_BRA > EXTRACT_BASIC_MAX)
-      fprintf(f, "%3d Bra extra\n", GET(code, 1));
-    else
-      fprintf(f, "%3d Bra %d\n", GET(code, 1), *code - OP_BRA);
-    code += _pcre_OP_lengths[OP_BRA];
-    continue;
-    }
+  if (print_lengths)
+    fprintf(f, "%3d ", (int)(code - codestart));
+  else
+    fprintf(f, "    ");
 
   switch(*code)
     {
@@ -203,6 +220,15 @@
     fprintf(f, "\n");
     continue;
 
+    case OP_CBRA:
+    case OP_SCBRA:
+    if (print_lengths) fprintf(f, "%3d ", GET(code, 1));
+      else fprintf(f, "    ");
+    fprintf(f, "%s %d", OP_names[*code], GET2(code, 1+LINK_SIZE));
+    break;
+
+    case OP_BRA:
+    case OP_SBRA:
     case OP_KETRMAX:
     case OP_KETRMIN:
     case OP_ALT:
@@ -213,33 +239,47 @@
     case OP_ASSERTBACK_NOT:
     case OP_ONCE:
     case OP_COND:
+    case OP_SCOND:
     case OP_REVERSE:
-    fprintf(f, "%3d %s", GET(code, 1), OP_names[*code]);
+    if (print_lengths) fprintf(f, "%3d ", GET(code, 1));
+      else fprintf(f, "    ");
+    fprintf(f, "%s", OP_names[*code]);
     break;
 
-    case OP_BRANUMBER:
-    printf("%3d %s", GET2(code, 1), OP_names[*code]);
+    case OP_CREF:
+    fprintf(f, "%3d %s", GET2(code,1), OP_names[*code]);
     break;
 
-    case OP_CREF:
-    if (GET2(code, 1) == CREF_RECURSE)
-      fprintf(f, "    Cond recurse");
+    case OP_RREF:
+    c = GET2(code, 1);
+    if (c == RREF_ANY)
+      fprintf(f, "    Cond recurse any");
     else
-      fprintf(f, "%3d %s", GET2(code,1), OP_names[*code]);
+      fprintf(f, "    Cond recurse %d", c);
+    break;
+
+    case OP_DEF:
+    fprintf(f, "    Cond def");
     break;
 
     case OP_STAR:
     case OP_MINSTAR:
+    case OP_POSSTAR:
     case OP_PLUS:
     case OP_MINPLUS:
+    case OP_POSPLUS:
     case OP_QUERY:
     case OP_MINQUERY:
+    case OP_POSQUERY:
     case OP_TYPESTAR:
     case OP_TYPEMINSTAR:
+    case OP_TYPEPOSSTAR:
     case OP_TYPEPLUS:
     case OP_TYPEMINPLUS:
+    case OP_TYPEPOSPLUS:
     case OP_TYPEQUERY:
     case OP_TYPEMINQUERY:
+    case OP_TYPEPOSQUERY:
     fprintf(f, "    ");
     if (*code >= OP_TYPESTAR)
       {
@@ -257,17 +297,20 @@
     case OP_EXACT:
     case OP_UPTO:
     case OP_MINUPTO:
+    case OP_POSUPTO:
     fprintf(f, "    ");
     extra = print_char(f, code+3, utf8);
     fprintf(f, "{");
-    if (*code != OP_EXACT) fprintf(f, ",");
+    if (*code != OP_EXACT) fprintf(f, "0,");
     fprintf(f, "%d}", GET2(code,1));
     if (*code == OP_MINUPTO) fprintf(f, "?");
+      else if (*code == OP_POSUPTO) fprintf(f, "+");
     break;
 
     case OP_TYPEEXACT:
     case OP_TYPEUPTO:
     case OP_TYPEMINUPTO:
+    case OP_TYPEPOSUPTO:
     fprintf(f, "    %s", OP_names[code[3]]);
     if (code[3] == OP_PROP || code[3] == OP_NOTPROP)
       {
@@ -278,20 +321,26 @@
     if (*code != OP_TYPEEXACT) fprintf(f, "0,");
     fprintf(f, "%d}", GET2(code,1));
     if (*code == OP_TYPEMINUPTO) fprintf(f, "?");
+      else if (*code == OP_TYPEPOSUPTO) fprintf(f, "+");
     break;
 
     case OP_NOT:
-    if (isprint(c = code[1])) fprintf(f, "    [^%c]", c);
+    c = code[1];
+    if (PRINTABLE(c)) fprintf(f, "    [^%c]", c);
       else fprintf(f, "    [^\\x%02x]", c);
     break;
 
     case OP_NOTSTAR:
     case OP_NOTMINSTAR:
+    case OP_NOTPOSSTAR:
     case OP_NOTPLUS:
     case OP_NOTMINPLUS:
+    case OP_NOTPOSPLUS:
     case OP_NOTQUERY:
     case OP_NOTMINQUERY:
-    if (isprint(c = code[1])) fprintf(f, "    [^%c]", c);
+    case OP_NOTPOSQUERY:
+    c = code[1];
+    if (PRINTABLE(c)) fprintf(f, "    [^%c]", c);
       else fprintf(f, "    [^\\x%02x]", c);
     fprintf(f, "%s", OP_names[*code]);
     break;
@@ -299,15 +348,20 @@
     case OP_NOTEXACT:
     case OP_NOTUPTO:
     case OP_NOTMINUPTO:
-    if (isprint(c = code[3])) fprintf(f, "    [^%c]{", c);
+    case OP_NOTPOSUPTO:
+    c = code[3];
+    if (PRINTABLE(c)) fprintf(f, "    [^%c]{", c);
       else fprintf(f, "    [^\\x%02x]{", c);
     if (*code != OP_NOTEXACT) fprintf(f, "0,");
     fprintf(f, "%d}", GET2(code,1));
     if (*code == OP_NOTMINUPTO) fprintf(f, "?");
+      else if (*code == OP_NOTPOSUPTO) fprintf(f, "+");
     break;
 
     case OP_RECURSE:
-    fprintf(f, "%3d %s", GET(code, 1), OP_names[*code]);
+    if (print_lengths) fprintf(f, "%3d ", GET(code, 1));
+      else fprintf(f, "    ");
+    fprintf(f, "%s", OP_names[*code]);
     break;
 
     case OP_REF:
@@ -363,12 +417,14 @@
             for (j = i+1; j < 256; j++)
               if ((ccode[j/8] & (1 << (j&7))) == 0) break;
             if (i == '-' || i == ']') fprintf(f, "\\");
-            if (isprint(i)) fprintf(f, "%c", i); else fprintf(f, "\\x%02x", i);
+            if (PRINTABLE(i)) fprintf(f, "%c", i);
+              else fprintf(f, "\\x%02x", i);
             if (--j > i)
               {
               if (j != i + 1) fprintf(f, "-");
               if (j == '-' || j == ']') fprintf(f, "\\");
-              if (isprint(j)) fprintf(f, "%c", j); else fprintf(f, "\\x%02x", j);
+              if (PRINTABLE(j)) fprintf(f, "%c", j);
+                else fprintf(f, "\\x%02x", j);
               }
             i = j;
             }

Modified: freeswitch/trunk/libs/pcre/pcre_refcount.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_refcount.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_refcount.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,11 @@
 pattern data block. This might be helpful in applications where the block is
 shared by different users. */
 
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -63,7 +68,7 @@
                 a negative error number
 */
 
-PCRE_DATA_SCOPE int
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_refcount(pcre *argument_re, int adjust)
 {
 real_pcre *re = (real_pcre *)argument_re;

Modified: freeswitch/trunk/libs/pcre/pcre_scanner.cc
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_scanner.cc	(original)
+++ freeswitch/trunk/libs/pcre/pcre_scanner.cc	Mon Jun  8 18:51:30 2009
@@ -29,9 +29,14 @@
 //
 // Author: Sanjay Ghemawat
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
-#include "config.h"
+
+#include "pcrecpp_internal.h"
 #include "pcre_scanner.h"
 
 using std::vector;
@@ -43,6 +48,7 @@
     input_(data_),
     skip_(NULL),
     should_skip_(false),
+    skip_repeat_(false),
     save_comments_(false),
     comments_(NULL),
     comments_offset_(0) {
@@ -53,6 +59,7 @@
     input_(data_),
     skip_(NULL),
     should_skip_(false),
+    skip_repeat_(false),
     save_comments_(false),
     comments_(NULL),
     comments_offset_(0) {
@@ -63,15 +70,31 @@
   delete comments_;
 }
 
+void Scanner::SetSkipExpression(const char* re) {
+  delete skip_;
+  if (re != NULL) {
+    skip_ = new RE(re);
+    should_skip_ = true;
+    skip_repeat_ = true;
+    ConsumeSkip();
+  } else {
+    skip_ = NULL;
+    should_skip_ = false;
+    skip_repeat_ = false;
+  }
+}
+
 void Scanner::Skip(const char* re) {
   delete skip_;
   if (re != NULL) {
     skip_ = new RE(re);
     should_skip_ = true;
+    skip_repeat_ = false;
     ConsumeSkip();
   } else {
     skip_ = NULL;
     should_skip_ = false;
+    skip_repeat_ = false;
   }
 }
 
@@ -118,19 +141,22 @@
 
 // helper function to consume *skip_ and honour save_comments_
 void Scanner::ConsumeSkip() {
+  const char* start_data = input_.data();
+  while (skip_->Consume(&input_)) {
+    if (!skip_repeat_) {
+      // Only one skip allowed.
+      break;
+    }
+  }
   if (save_comments_) {
-    if (NULL == comments_) {
+    if (comments_ == NULL) {
       comments_ = new vector;
     }
-    const char *start_data = input_.data();
-    skip_->Consume(&input_);
     // already pointing one past end, so no need to +1
     int length = input_.data() - start_data;
     if (length > 0) {
       comments_->push_back(StringPiece(start_data, length));
     }
-  } else {
-    skip_->Consume(&input_);
   }
 }
 

Modified: freeswitch/trunk/libs/pcre/pcre_scanner.h
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_scanner.h	(original)
+++ freeswitch/trunk/libs/pcre/pcre_scanner.h	Mon Jun  8 18:51:30 2009
@@ -36,7 +36,7 @@
 //      Scanner scanner(input);
 //      string var;
 //      int number;
-//      scanner.Skip("\\s+");           // Skip any white space we encounter
+//      scanner.SetSkipExpression("\\s+"); // Skip any white space we encounter
 //      while (scanner.Consume("(\\w+) = (\\d+)", &var, &number)) {
 //        ...;
 //      }
@@ -47,12 +47,13 @@
 #include 
 #include 
 #include 
+
 #include 
 #include 
 
 namespace pcrecpp {
 
-class Scanner {
+class PCRECPP_EXP_DEFN Scanner {
  public:
   Scanner();
   explicit Scanner(const std::string& input);
@@ -79,9 +80,9 @@
   // If it returns true, it skips over the matched input and any
   // following input that matches the "skip" regular expression.
   bool Consume(const RE& re,
-               const Arg& arg0 = no_arg,
-               const Arg& arg1 = no_arg,
-               const Arg& arg2 = no_arg
+               const Arg& arg0 = RE::no_arg,
+               const Arg& arg1 = RE::no_arg,
+               const Arg& arg2 = RE::no_arg
                // TODO: Allow more arguments?
                );
 
@@ -90,10 +91,16 @@
   // skipped.  For example, a programming language scanner would use
   // a skip RE that matches white space and comments.
   //
-  //    scanner.Skip("(\\s|//.*|/[*](.|\n)*?[*]/)*");
+  //    scanner.SetSkipExpression("\\s+|//.*|/[*](.|\n)*?[*]/");
+  //
+  // Skipping repeats as long as it succeeds.  We used to let people do
+  // this by writing "(...)*" in the regular expression, but that added
+  // up to lots of recursive calls within the pcre library, so now we
+  // control repetition explicitly via the function call API.
   //
   // You can pass NULL for "re" if you do not want any data to be skipped.
-  void Skip(const char* re);
+  void Skip(const char* re);   // DEPRECATED; does *not* repeat
+  void SetSkipExpression(const char* re);
 
   // Temporarily pause "skip"ing. This
   //   Skip("Foo"); code ; DisableSkip(); code; EnableSkip()
@@ -109,12 +116,13 @@
   /***** Special wrappers around SetSkip() for some common idioms *****/
 
   // Arranges to skip whitespace, C comments, C++ comments.
-  // The overall RE is a repeated disjunction of the following REs:
+  // The overall RE is a disjunction of the following REs:
   //    \\s                     whitespace
   //    //.*\n                  C++ comment
   //    /[*](.|\n)*?[*]/        C comment (x*? means minimal repetitions of x)
+  // We get repetition via the semantics of SetSkipExpression, not by using *
   void SkipCXXComments() {
-    Skip("((\\s|//.*\n|/[*](.|\n)*?[*]/)*)");
+    SetSkipExpression("\\s|//.*\n|/[*](?:\n|.)*?[*]/");
   }
 
   void set_save_comments(bool comments) {
@@ -143,6 +151,7 @@
   StringPiece   input_;         // Unprocessed input
   RE*           skip_;          // If non-NULL, RE for skipping input
   bool          should_skip_;   // If true, use skip_
+  bool          skip_repeat_;   // If true, repeat skip_ as long as it works
   bool          save_comments_; // If true, aggregate the skip expression
 
   // the skipped comments

Modified: freeswitch/trunk/libs/pcre/pcre_scanner_unittest.cc
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_scanner_unittest.cc	(original)
+++ freeswitch/trunk/libs/pcre/pcre_scanner_unittest.cc	Mon Jun  8 18:51:30 2009
@@ -32,10 +32,19 @@
 // Unittest for scanner, especially GetNextComments and GetComments()
 // functionality.
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
+#include 
 #include 
-#include 
-#include 
+
+#include "pcrecpp.h"
+#include "pcre_stringpiece.h"
+#include "pcre_scanner.h"
+
+#define FLAGS_unittest_stack_size   49152
 
 // Dies with a fatal error if the two values are not equal.
 #define CHECK_EQ(a, b)  do {                                    \
@@ -116,8 +125,31 @@
   comments.resize(0);
 }
 
+static void TestBigComment() {
+  string input;
+  for (int i = 0; i < 1024; ++i) {
+    char buf[1024];  // definitely big enough
+    sprintf(buf, "    # Comment %d\n", i);
+    input += buf;
+  }
+  input += "name = value;\n";
+
+  Scanner s(input.c_str());
+  s.SetSkipExpression("\\s+|#.*\n");
+
+  string name;
+  string value;
+  s.Consume("(\\w+) = (\\w+);", &name, &value);
+  CHECK_EQ(name, "name");
+  CHECK_EQ(value, "value");
+}
+
+// TODO: also test scanner and big-comment in a thread with a
+//       small stack size
+
 int main(int argc, char** argv) {
   TestScanner();
+  TestBigComment();
 
   // Done
   printf("OK\n");

Modified: freeswitch/trunk/libs/pcre/pcre_stringpiece.cc
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_stringpiece.cc	(original)
+++ freeswitch/trunk/libs/pcre/pcre_stringpiece.cc	Mon Jun  8 18:51:30 2009
@@ -30,8 +30,12 @@
 // Author: wilsonh at google.com (Wilson Hsieh)
 //
 
-#include 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
+#include 
+#include "pcrecpp_internal.h"
 #include "pcre_stringpiece.h"
 
 std::ostream& operator<<(std::ostream& o, const pcrecpp::StringPiece& piece) {

Modified: freeswitch/trunk/libs/pcre/pcre_stringpiece.h.in
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_stringpiece.h.in	(original)
+++ freeswitch/trunk/libs/pcre/pcre_stringpiece.h.in	Mon Jun  8 18:51:30 2009
@@ -50,11 +50,13 @@
 #include 
 #endif
 
+#include 
+
 using std::string;
 
 namespace pcrecpp {
 
-class StringPiece {
+class PCRECPP_EXP_DEFN StringPiece {
  private:
   const char*   ptr_;
   int           length_;
@@ -66,7 +68,10 @@
   StringPiece()
     : ptr_(NULL), length_(0) { }
   StringPiece(const char* str)
-    : ptr_(str), length_(static_cast(strlen(str))) { }
+    : ptr_(str), length_(static_cast(strlen(ptr_))) { }
+  StringPiece(const unsigned char* str)
+    : ptr_(reinterpret_cast(str)),
+      length_(static_cast(strlen(ptr_))) { }
   StringPiece(const string& str)
     : ptr_(str.data()), length_(static_cast(str.size())) { }
   StringPiece(const char* offset, int len)

Modified: freeswitch/trunk/libs/pcre/pcre_stringpiece_unittest.cc
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_stringpiece_unittest.cc	(original)
+++ freeswitch/trunk/libs/pcre/pcre_stringpiece_unittest.cc	Mon Jun  8 18:51:30 2009
@@ -1,10 +1,16 @@
 // Copyright 2003 and onwards Google Inc.
 // Author: Sanjay Ghemawat
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include     // for make_pair
-#include 
+
+#include "pcrecpp.h"
+#include "pcre_stringpiece.h"
 
 // CHECK dies with a fatal error if condition is not true.  It is *not*
 // controlled by NDEBUG, so the check will be executed regardless of

Modified: freeswitch/trunk/libs/pcre/pcre_study.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_study.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_study.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -42,9 +42,18 @@
 supporting functions. */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
+/* Returns from set_start_bits() */
+
+enum { SSB_FAIL, SSB_DONE, SSB_CONTINUE };
+
+
 /*************************************************
 *      Set a bit and maybe its alternate case    *
 *************************************************/
@@ -72,12 +81,16 @@
 
 
 /*************************************************
-*          Create bitmap of starting chars       *
+*          Create bitmap of starting bytes       *
 *************************************************/
 
-/* This function scans a compiled unanchored expression and attempts to build a
-bitmap of the set of initial characters. If it can't, it returns FALSE. As time
-goes by, we may be able to get more clever at doing this.
+/* This function scans a compiled unanchored expression recursively and
+attempts to build a bitmap of the set of possible starting bytes. As time goes
+by, we may be able to get more clever at doing this. The SSB_CONTINUE return is
+useful for parenthesized groups in patterns such as (a*)b where the group
+provides some optional starting bytes but scanning must continue at the outer
+level to find at least one mandatory byte. At the outermost level, this
+function fails unless the result is SSB_DONE.
 
 Arguments:
   code         points to an expression
@@ -86,14 +99,17 @@
   utf8         TRUE if in UTF-8 mode
   cd           the block with char table pointers
 
-Returns:       TRUE if table built, FALSE otherwise
+Returns:       SSB_FAIL     => Failed to find any starting bytes
+               SSB_DONE     => Found mandatory starting bytes
+               SSB_CONTINUE => Found optional starting bytes
 */
 
-static BOOL
+static int
 set_start_bits(const uschar *code, uschar *start_bits, BOOL caseless,
   BOOL utf8, compile_data *cd)
 {
 register int c;
+int yield = SSB_DONE;
 
 #if 0
 /* ========================================================================= */
@@ -114,36 +130,60 @@
 
 do
   {
-  const uschar *tcode = code + 1 + LINK_SIZE;
+  const uschar *tcode = code + (((int)*code == OP_CBRA)? 3:1) + LINK_SIZE;
   BOOL try_next = TRUE;
 
-  while (try_next)
+  while (try_next)    /* Loop for items in this branch */
     {
-    /* If a branch starts with a bracket or a positive lookahead assertion,
-    recurse to set bits from within them. That's all for this branch. */
-
-    if ((int)*tcode >= OP_BRA || *tcode == OP_ASSERT)
+    int rc;
+    switch(*tcode)
       {
-      if (!set_start_bits(tcode, start_bits, caseless, utf8, cd))
-        return FALSE;
-      try_next = FALSE;
-      }
+      /* Fail if we reach something we don't understand */
 
-    else switch(*tcode)
-      {
       default:
-      return FALSE;
+      return SSB_FAIL;
 
-      /* Skip over callout */
+      /* If we hit a bracket or a positive lookahead assertion, recurse to set
+      bits from within the subpattern. If it can't find anything, we have to
+      give up. If it finds some mandatory character(s), we are done for this
+      branch. Otherwise, carry on scanning after the subpattern. */
+
+      case OP_BRA:
+      case OP_SBRA:
+      case OP_CBRA:
+      case OP_SCBRA:
+      case OP_ONCE:
+      case OP_ASSERT:
+      rc = set_start_bits(tcode, start_bits, caseless, utf8, cd);
+      if (rc == SSB_FAIL) return SSB_FAIL;
+      if (rc == SSB_DONE) try_next = FALSE; else
+        {
+        do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
+        tcode += 1 + LINK_SIZE;
+        }
+      break;
 
-      case OP_CALLOUT:
-      tcode += 2 + 2*LINK_SIZE;
+      /* If we hit ALT or KET, it means we haven't found anything mandatory in
+      this branch, though we might have found something optional. For ALT, we
+      continue with the next alternative, but we have to arrange that the final
+      result from subpattern is SSB_CONTINUE rather than SSB_DONE. For KET,
+      return SSB_CONTINUE: if this is the top level, that indicates failure,
+      but after a nested subpattern, it causes scanning to continue. */
+
+      case OP_ALT:
+      yield = SSB_CONTINUE;
+      try_next = FALSE;
       break;
 
-      /* Skip over extended extraction bracket number */
+      case OP_KET:
+      case OP_KETRMAX:
+      case OP_KETRMIN:
+      return SSB_CONTINUE;
 
-      case OP_BRANUMBER:
-      tcode += 3;
+      /* Skip over callout */
+
+      case OP_CALLOUT:
+      tcode += 2 + 2*LINK_SIZE;
       break;
 
       /* Skip over lookbehind and negative lookahead assertions */
@@ -152,7 +192,7 @@
       case OP_ASSERTBACK:
       case OP_ASSERTBACK_NOT:
       do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
-      tcode += 1+LINK_SIZE;
+      tcode += 1 + LINK_SIZE;
       break;
 
       /* Skip over an option setting, changing the caseless flag */
@@ -166,27 +206,38 @@
 
       case OP_BRAZERO:
       case OP_BRAMINZERO:
-      if (!set_start_bits(++tcode, start_bits, caseless, utf8, cd))
-        return FALSE;
+      if (set_start_bits(++tcode, start_bits, caseless, utf8, cd) == SSB_FAIL)
+        return SSB_FAIL;
 /* =========================================================================
       See the comment at the head of this function concerning the next line,
       which was an old fudge for the benefit of OS/2.
       dummy = 1;
   ========================================================================= */
       do tcode += GET(tcode,1); while (*tcode == OP_ALT);
-      tcode += 1+LINK_SIZE;
+      tcode += 1 + LINK_SIZE;
+      break;
+
+      /* SKIPZERO skips the bracket. */
+
+      case OP_SKIPZERO:
+      tcode++;
+      do tcode += GET(tcode,1); while (*tcode == OP_ALT);
+      tcode += 1 + LINK_SIZE;
       break;
 
       /* Single-char * or ? sets the bit and tries the next item */
 
       case OP_STAR:
       case OP_MINSTAR:
+      case OP_POSSTAR:
       case OP_QUERY:
       case OP_MINQUERY:
+      case OP_POSQUERY:
       set_bit(start_bits, tcode[1], caseless, cd);
       tcode += 2;
 #ifdef SUPPORT_UTF8
-      if (utf8) while ((*tcode & 0xc0) == 0x80) tcode++;
+      if (utf8 && tcode[-1] >= 0xc0)
+        tcode += _pcre_utf8_table4[tcode[-1] & 0x3f];
 #endif
       break;
 
@@ -194,10 +245,12 @@
 
       case OP_UPTO:
       case OP_MINUPTO:
+      case OP_POSUPTO:
       set_bit(start_bits, tcode[3], caseless, cd);
       tcode += 4;
 #ifdef SUPPORT_UTF8
-      if (utf8) while ((*tcode & 0xc0) == 0x80) tcode++;
+      if (utf8 && tcode[-1] >= 0xc0)
+        tcode += _pcre_utf8_table4[tcode[-1] & 0x3f];
 #endif
       break;
 
@@ -210,6 +263,7 @@
       case OP_CHARNC:
       case OP_PLUS:
       case OP_MINPLUS:
+      case OP_POSPLUS:
       set_bit(start_bits, tcode[1], caseless, cd);
       try_next = FALSE;
       break;
@@ -283,16 +337,20 @@
 
       case OP_TYPEUPTO:
       case OP_TYPEMINUPTO:
+      case OP_TYPEPOSUPTO:
       tcode += 2;               /* Fall through */
 
       case OP_TYPESTAR:
       case OP_TYPEMINSTAR:
+      case OP_TYPEPOSSTAR:
       case OP_TYPEQUERY:
       case OP_TYPEMINQUERY:
+      case OP_TYPEPOSQUERY:
       switch(tcode[1])
         {
         case OP_ANY:
-        return FALSE;
+        case OP_ALLANY:
+        return SSB_FAIL;
 
         case OP_NOT_DIGIT:
         for (c = 0; c < 32; c++)
@@ -349,11 +407,13 @@
       character with a value > 255. */
 
       case OP_NCLASS:
+#ifdef SUPPORT_UTF8
       if (utf8)
         {
         start_bits[24] |= 0xf0;              /* Bits for 0xc4 - 0xc8 */
         memset(start_bits+25, 0xff, 7);      /* Bits for 0xc9 - 0xff */
         }
+#endif
       /* Fall through */
 
       case OP_CLASS:
@@ -366,6 +426,7 @@
         value is > 127. In fact, there are only two possible starting bytes for
         characters in the range 128 - 255. */
 
+#ifdef SUPPORT_UTF8
         if (utf8)
           {
           for (c = 0; c < 16; c++) start_bits[c] |= tcode[c];
@@ -383,6 +444,7 @@
         /* In non-UTF-8 mode, the two bit maps are completely compatible. */
 
         else
+#endif
           {
           for (c = 0; c < 32; c++) start_bits[c] |= tcode[c];
           }
@@ -418,7 +480,7 @@
   code += GET(code, 1);   /* Advance to next branch */
   }
 while (*code == OP_ALT);
-return TRUE;
+return yield;
 }
 
 
@@ -442,7 +504,7 @@
             NULL on error or if no optimization possible
 */
 
-PCRE_DATA_SCOPE pcre_extra *
+PCRE_EXP_DEFN pcre_extra * PCRE_CALL_CONVENTION
 pcre_study(const pcre *external_re, int options, const char **errorptr)
 {
 uschar start_bits[32];
@@ -474,7 +536,8 @@
 a multiline pattern that matches only at "line starts", no further processing
 at present. */
 
-if ((re->options & (PCRE_ANCHORED|PCRE_FIRSTSET|PCRE_STARTLINE)) != 0)
+if ((re->options & PCRE_ANCHORED) != 0 ||
+    (re->flags & (PCRE_FIRSTSET|PCRE_STARTLINE)) != 0)
   return NULL;
 
 /* Set the character tables in the block that is passed around */
@@ -492,8 +555,8 @@
 /* See if we can find a fixed set of initial characters for the pattern. */
 
 memset(start_bits, 0, 32 * sizeof(uschar));
-if (!set_start_bits(code, start_bits, (re->options & PCRE_CASELESS) != 0,
-  (re->options & PCRE_UTF8) != 0, &compile_block)) return NULL;
+if (set_start_bits(code, start_bits, (re->options & PCRE_CASELESS) != 0,
+  (re->options & PCRE_UTF8) != 0, &compile_block) != SSB_DONE) return NULL;
 
 /* Get a pcre_extra block and a pcre_study_data block. The study data is put in
 the latter, which is pointed to by the former, which may also get additional

Modified: freeswitch/trunk/libs/pcre/pcre_tables.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_tables.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_tables.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,10 @@
 clashes with the library. */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -61,6 +65,8 @@
 /* These are the breakpoints for different numbers of bytes in a UTF-8
 character. */
 
+#ifdef SUPPORT_UTF8
+
 const int _pcre_utf8_table1[] =
   { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff};
 
@@ -72,9 +78,8 @@
 const int _pcre_utf8_table2[] = { 0,    0xc0, 0xe0, 0xf0, 0xf8, 0xfc};
 const int _pcre_utf8_table3[] = { 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
 
-/* Table of the number of extra characters, indexed by the first character
-masked with 0x3f. The highest number for a valid UTF-8 character is in fact
-0x3d. */
+/* Table of the number of extra bytes, indexed by the first byte masked with
+0x3f. The highest number for a valid UTF-8 first byte is in fact 0x3d. */
 
 const uschar _pcre_utf8_table4[] = {
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -82,112 +87,392 @@
   2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
   3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 };
 
-/* This table translates Unicode property names into type and code values. It
-is searched by binary chop, so must be in collating sequence of name. */
+/* Table to translate from particular type value to the general value. */
+
+const int _pcre_ucp_gentype[] = {
+  ucp_C, ucp_C, ucp_C, ucp_C, ucp_C,  /* Cc, Cf, Cn, Co, Cs */
+  ucp_L, ucp_L, ucp_L, ucp_L, ucp_L,  /* Ll, Lu, Lm, Lo, Lt */
+  ucp_M, ucp_M, ucp_M,                /* Mc, Me, Mn */
+  ucp_N, ucp_N, ucp_N,                /* Nd, Nl, No */
+  ucp_P, ucp_P, ucp_P, ucp_P, ucp_P,  /* Pc, Pd, Pe, Pf, Pi */
+  ucp_P, ucp_P,                       /* Ps, Po */
+  ucp_S, ucp_S, ucp_S, ucp_S,         /* Sc, Sk, Sm, So */
+  ucp_Z, ucp_Z, ucp_Z                 /* Zl, Zp, Zs */
+};
+
+/* The pcre_utt[] table below translates Unicode property names into type and
+code values. It is searched by binary chop, so must be in collating sequence of
+name. Originally, the table contained pointers to the name strings in the first
+field of each entry. However, that leads to a large number of relocations when
+a shared library is dynamically loaded. A significant reduction is made by
+putting all the names into a single, large string and then using offsets in the
+table itself. Maintenance is more error-prone, but frequent changes to this
+data are unlikely.
+
+July 2008: There is now a script called maint/GenerateUtt.py that can be used
+to generate this data instead of maintaining it entirely by hand.
+
+The script was updated in March 2009 to generate a new EBCDIC-compliant
+version. Like all other character and string literals that are compared against
+the regular expression pattern, we must use STR_ macros instead of literal
+strings to make sure that UTF-8 support works on EBCDIC platforms. */
+
+#define STRING_Any0 STR_A STR_n STR_y "\0"
+#define STRING_Arabic0 STR_A STR_r STR_a STR_b STR_i STR_c "\0"
+#define STRING_Armenian0 STR_A STR_r STR_m STR_e STR_n STR_i STR_a STR_n "\0"
+#define STRING_Balinese0 STR_B STR_a STR_l STR_i STR_n STR_e STR_s STR_e "\0"
+#define STRING_Bengali0 STR_B STR_e STR_n STR_g STR_a STR_l STR_i "\0"
+#define STRING_Bopomofo0 STR_B STR_o STR_p STR_o STR_m STR_o STR_f STR_o "\0"
+#define STRING_Braille0 STR_B STR_r STR_a STR_i STR_l STR_l STR_e "\0"
+#define STRING_Buginese0 STR_B STR_u STR_g STR_i STR_n STR_e STR_s STR_e "\0"
+#define STRING_Buhid0 STR_B STR_u STR_h STR_i STR_d "\0"
+#define STRING_C0 STR_C "\0"
+#define STRING_Canadian_Aboriginal0 STR_C STR_a STR_n STR_a STR_d STR_i STR_a STR_n STR_UNDERSCORE STR_A STR_b STR_o STR_r STR_i STR_g STR_i STR_n STR_a STR_l "\0"
+#define STRING_Carian0 STR_C STR_a STR_r STR_i STR_a STR_n "\0"
+#define STRING_Cc0 STR_C STR_c "\0"
+#define STRING_Cf0 STR_C STR_f "\0"
+#define STRING_Cham0 STR_C STR_h STR_a STR_m "\0"
+#define STRING_Cherokee0 STR_C STR_h STR_e STR_r STR_o STR_k STR_e STR_e "\0"
+#define STRING_Cn0 STR_C STR_n "\0"
+#define STRING_Co0 STR_C STR_o "\0"
+#define STRING_Common0 STR_C STR_o STR_m STR_m STR_o STR_n "\0"
+#define STRING_Coptic0 STR_C STR_o STR_p STR_t STR_i STR_c "\0"
+#define STRING_Cs0 STR_C STR_s "\0"
+#define STRING_Cuneiform0 STR_C STR_u STR_n STR_e STR_i STR_f STR_o STR_r STR_m "\0"
+#define STRING_Cypriot0 STR_C STR_y STR_p STR_r STR_i STR_o STR_t "\0"
+#define STRING_Cyrillic0 STR_C STR_y STR_r STR_i STR_l STR_l STR_i STR_c "\0"
+#define STRING_Deseret0 STR_D STR_e STR_s STR_e STR_r STR_e STR_t "\0"
+#define STRING_Devanagari0 STR_D STR_e STR_v STR_a STR_n STR_a STR_g STR_a STR_r STR_i "\0"
+#define STRING_Ethiopic0 STR_E STR_t STR_h STR_i STR_o STR_p STR_i STR_c "\0"
+#define STRING_Georgian0 STR_G STR_e STR_o STR_r STR_g STR_i STR_a STR_n "\0"
+#define STRING_Glagolitic0 STR_G STR_l STR_a STR_g STR_o STR_l STR_i STR_t STR_i STR_c "\0"
+#define STRING_Gothic0 STR_G STR_o STR_t STR_h STR_i STR_c "\0"
+#define STRING_Greek0 STR_G STR_r STR_e STR_e STR_k "\0"
+#define STRING_Gujarati0 STR_G STR_u STR_j STR_a STR_r STR_a STR_t STR_i "\0"
+#define STRING_Gurmukhi0 STR_G STR_u STR_r STR_m STR_u STR_k STR_h STR_i "\0"
+#define STRING_Han0 STR_H STR_a STR_n "\0"
+#define STRING_Hangul0 STR_H STR_a STR_n STR_g STR_u STR_l "\0"
+#define STRING_Hanunoo0 STR_H STR_a STR_n STR_u STR_n STR_o STR_o "\0"
+#define STRING_Hebrew0 STR_H STR_e STR_b STR_r STR_e STR_w "\0"
+#define STRING_Hiragana0 STR_H STR_i STR_r STR_a STR_g STR_a STR_n STR_a "\0"
+#define STRING_Inherited0 STR_I STR_n STR_h STR_e STR_r STR_i STR_t STR_e STR_d "\0"
+#define STRING_Kannada0 STR_K STR_a STR_n STR_n STR_a STR_d STR_a "\0"
+#define STRING_Katakana0 STR_K STR_a STR_t STR_a STR_k STR_a STR_n STR_a "\0"
+#define STRING_Kayah_Li0 STR_K STR_a STR_y STR_a STR_h STR_UNDERSCORE STR_L STR_i "\0"
+#define STRING_Kharoshthi0 STR_K STR_h STR_a STR_r STR_o STR_s STR_h STR_t STR_h STR_i "\0"
+#define STRING_Khmer0 STR_K STR_h STR_m STR_e STR_r "\0"
+#define STRING_L0 STR_L "\0"
+#define STRING_L_AMPERSAND0 STR_L STR_AMPERSAND "\0"
+#define STRING_Lao0 STR_L STR_a STR_o "\0"
+#define STRING_Latin0 STR_L STR_a STR_t STR_i STR_n "\0"
+#define STRING_Lepcha0 STR_L STR_e STR_p STR_c STR_h STR_a "\0"
+#define STRING_Limbu0 STR_L STR_i STR_m STR_b STR_u "\0"
+#define STRING_Linear_B0 STR_L STR_i STR_n STR_e STR_a STR_r STR_UNDERSCORE STR_B "\0"
+#define STRING_Ll0 STR_L STR_l "\0"
+#define STRING_Lm0 STR_L STR_m "\0"
+#define STRING_Lo0 STR_L STR_o "\0"
+#define STRING_Lt0 STR_L STR_t "\0"
+#define STRING_Lu0 STR_L STR_u "\0"
+#define STRING_Lycian0 STR_L STR_y STR_c STR_i STR_a STR_n "\0"
+#define STRING_Lydian0 STR_L STR_y STR_d STR_i STR_a STR_n "\0"
+#define STRING_M0 STR_M "\0"
+#define STRING_Malayalam0 STR_M STR_a STR_l STR_a STR_y STR_a STR_l STR_a STR_m "\0"
+#define STRING_Mc0 STR_M STR_c "\0"
+#define STRING_Me0 STR_M STR_e "\0"
+#define STRING_Mn0 STR_M STR_n "\0"
+#define STRING_Mongolian0 STR_M STR_o STR_n STR_g STR_o STR_l STR_i STR_a STR_n "\0"
+#define STRING_Myanmar0 STR_M STR_y STR_a STR_n STR_m STR_a STR_r "\0"
+#define STRING_N0 STR_N "\0"
+#define STRING_Nd0 STR_N STR_d "\0"
+#define STRING_New_Tai_Lue0 STR_N STR_e STR_w STR_UNDERSCORE STR_T STR_a STR_i STR_UNDERSCORE STR_L STR_u STR_e "\0"
+#define STRING_Nko0 STR_N STR_k STR_o "\0"
+#define STRING_Nl0 STR_N STR_l "\0"
+#define STRING_No0 STR_N STR_o "\0"
+#define STRING_Ogham0 STR_O STR_g STR_h STR_a STR_m "\0"
+#define STRING_Ol_Chiki0 STR_O STR_l STR_UNDERSCORE STR_C STR_h STR_i STR_k STR_i "\0"
+#define STRING_Old_Italic0 STR_O STR_l STR_d STR_UNDERSCORE STR_I STR_t STR_a STR_l STR_i STR_c "\0"
+#define STRING_Old_Persian0 STR_O STR_l STR_d STR_UNDERSCORE STR_P STR_e STR_r STR_s STR_i STR_a STR_n "\0"
+#define STRING_Oriya0 STR_O STR_r STR_i STR_y STR_a "\0"
+#define STRING_Osmanya0 STR_O STR_s STR_m STR_a STR_n STR_y STR_a "\0"
+#define STRING_P0 STR_P "\0"
+#define STRING_Pc0 STR_P STR_c "\0"
+#define STRING_Pd0 STR_P STR_d "\0"
+#define STRING_Pe0 STR_P STR_e "\0"
+#define STRING_Pf0 STR_P STR_f "\0"
+#define STRING_Phags_Pa0 STR_P STR_h STR_a STR_g STR_s STR_UNDERSCORE STR_P STR_a "\0"
+#define STRING_Phoenician0 STR_P STR_h STR_o STR_e STR_n STR_i STR_c STR_i STR_a STR_n "\0"
+#define STRING_Pi0 STR_P STR_i "\0"
+#define STRING_Po0 STR_P STR_o "\0"
+#define STRING_Ps0 STR_P STR_s "\0"
+#define STRING_Rejang0 STR_R STR_e STR_j STR_a STR_n STR_g "\0"
+#define STRING_Runic0 STR_R STR_u STR_n STR_i STR_c "\0"
+#define STRING_S0 STR_S "\0"
+#define STRING_Saurashtra0 STR_S STR_a STR_u STR_r STR_a STR_s STR_h STR_t STR_r STR_a "\0"
+#define STRING_Sc0 STR_S STR_c "\0"
+#define STRING_Shavian0 STR_S STR_h STR_a STR_v STR_i STR_a STR_n "\0"
+#define STRING_Sinhala0 STR_S STR_i STR_n STR_h STR_a STR_l STR_a "\0"
+#define STRING_Sk0 STR_S STR_k "\0"
+#define STRING_Sm0 STR_S STR_m "\0"
+#define STRING_So0 STR_S STR_o "\0"
+#define STRING_Sundanese0 STR_S STR_u STR_n STR_d STR_a STR_n STR_e STR_s STR_e "\0"
+#define STRING_Syloti_Nagri0 STR_S STR_y STR_l STR_o STR_t STR_i STR_UNDERSCORE STR_N STR_a STR_g STR_r STR_i "\0"
+#define STRING_Syriac0 STR_S STR_y STR_r STR_i STR_a STR_c "\0"
+#define STRING_Tagalog0 STR_T STR_a STR_g STR_a STR_l STR_o STR_g "\0"
+#define STRING_Tagbanwa0 STR_T STR_a STR_g STR_b STR_a STR_n STR_w STR_a "\0"
+#define STRING_Tai_Le0 STR_T STR_a STR_i STR_UNDERSCORE STR_L STR_e "\0"
+#define STRING_Tamil0 STR_T STR_a STR_m STR_i STR_l "\0"
+#define STRING_Telugu0 STR_T STR_e STR_l STR_u STR_g STR_u "\0"
+#define STRING_Thaana0 STR_T STR_h STR_a STR_a STR_n STR_a "\0"
+#define STRING_Thai0 STR_T STR_h STR_a STR_i "\0"
+#define STRING_Tibetan0 STR_T STR_i STR_b STR_e STR_t STR_a STR_n "\0"
+#define STRING_Tifinagh0 STR_T STR_i STR_f STR_i STR_n STR_a STR_g STR_h "\0"
+#define STRING_Ugaritic0 STR_U STR_g STR_a STR_r STR_i STR_t STR_i STR_c "\0"
+#define STRING_Vai0 STR_V STR_a STR_i "\0"
+#define STRING_Yi0 STR_Y STR_i "\0"
+#define STRING_Z0 STR_Z "\0"
+#define STRING_Zl0 STR_Z STR_l "\0"
+#define STRING_Zp0 STR_Z STR_p "\0"
+#define STRING_Zs0 STR_Z STR_s "\0"
+
+const char _pcre_utt_names[] =
+  STRING_Any0
+  STRING_Arabic0
+  STRING_Armenian0
+  STRING_Balinese0
+  STRING_Bengali0
+  STRING_Bopomofo0
+  STRING_Braille0
+  STRING_Buginese0
+  STRING_Buhid0
+  STRING_C0
+  STRING_Canadian_Aboriginal0
+  STRING_Carian0
+  STRING_Cc0
+  STRING_Cf0
+  STRING_Cham0
+  STRING_Cherokee0
+  STRING_Cn0
+  STRING_Co0
+  STRING_Common0
+  STRING_Coptic0
+  STRING_Cs0
+  STRING_Cuneiform0
+  STRING_Cypriot0
+  STRING_Cyrillic0
+  STRING_Deseret0
+  STRING_Devanagari0
+  STRING_Ethiopic0
+  STRING_Georgian0
+  STRING_Glagolitic0
+  STRING_Gothic0
+  STRING_Greek0
+  STRING_Gujarati0
+  STRING_Gurmukhi0
+  STRING_Han0
+  STRING_Hangul0
+  STRING_Hanunoo0
+  STRING_Hebrew0
+  STRING_Hiragana0
+  STRING_Inherited0
+  STRING_Kannada0
+  STRING_Katakana0
+  STRING_Kayah_Li0
+  STRING_Kharoshthi0
+  STRING_Khmer0
+  STRING_L0
+  STRING_L_AMPERSAND0
+  STRING_Lao0
+  STRING_Latin0
+  STRING_Lepcha0
+  STRING_Limbu0
+  STRING_Linear_B0
+  STRING_Ll0
+  STRING_Lm0
+  STRING_Lo0
+  STRING_Lt0
+  STRING_Lu0
+  STRING_Lycian0
+  STRING_Lydian0
+  STRING_M0
+  STRING_Malayalam0
+  STRING_Mc0
+  STRING_Me0
+  STRING_Mn0
+  STRING_Mongolian0
+  STRING_Myanmar0
+  STRING_N0
+  STRING_Nd0
+  STRING_New_Tai_Lue0
+  STRING_Nko0
+  STRING_Nl0
+  STRING_No0
+  STRING_Ogham0
+  STRING_Ol_Chiki0
+  STRING_Old_Italic0
+  STRING_Old_Persian0
+  STRING_Oriya0
+  STRING_Osmanya0
+  STRING_P0
+  STRING_Pc0
+  STRING_Pd0
+  STRING_Pe0
+  STRING_Pf0
+  STRING_Phags_Pa0
+  STRING_Phoenician0
+  STRING_Pi0
+  STRING_Po0
+  STRING_Ps0
+  STRING_Rejang0
+  STRING_Runic0
+  STRING_S0
+  STRING_Saurashtra0
+  STRING_Sc0
+  STRING_Shavian0
+  STRING_Sinhala0
+  STRING_Sk0
+  STRING_Sm0
+  STRING_So0
+  STRING_Sundanese0
+  STRING_Syloti_Nagri0
+  STRING_Syriac0
+  STRING_Tagalog0
+  STRING_Tagbanwa0
+  STRING_Tai_Le0
+  STRING_Tamil0
+  STRING_Telugu0
+  STRING_Thaana0
+  STRING_Thai0
+  STRING_Tibetan0
+  STRING_Tifinagh0
+  STRING_Ugaritic0
+  STRING_Vai0
+  STRING_Yi0
+  STRING_Z0
+  STRING_Zl0
+  STRING_Zp0
+  STRING_Zs0;
 
 const ucp_type_table _pcre_utt[] = {
-  { "Any",                 PT_ANY,  0 },
-  { "Arabic",              PT_SC,   ucp_Arabic },
-  { "Armenian",            PT_SC,   ucp_Armenian },
-  { "Bengali",             PT_SC,   ucp_Bengali },
-  { "Bopomofo",            PT_SC,   ucp_Bopomofo },
-  { "Braille",             PT_SC,   ucp_Braille },
-  { "Buginese",            PT_SC,   ucp_Buginese },
-  { "Buhid",               PT_SC,   ucp_Buhid },
-  { "C",                   PT_GC,   ucp_C },
-  { "Canadian_Aboriginal", PT_SC,   ucp_Canadian_Aboriginal },
-  { "Cc",                  PT_PC,   ucp_Cc },
-  { "Cf",                  PT_PC,   ucp_Cf },
-  { "Cherokee",            PT_SC,   ucp_Cherokee },
-  { "Cn",                  PT_PC,   ucp_Cn },
-  { "Co",                  PT_PC,   ucp_Co },
-  { "Common",              PT_SC,   ucp_Common },
-  { "Coptic",              PT_SC,   ucp_Coptic },
-  { "Cs",                  PT_PC,   ucp_Cs },
-  { "Cypriot",             PT_SC,   ucp_Cypriot },
-  { "Cyrillic",            PT_SC,   ucp_Cyrillic },
-  { "Deseret",             PT_SC,   ucp_Deseret },
-  { "Devanagari",          PT_SC,   ucp_Devanagari },
-  { "Ethiopic",            PT_SC,   ucp_Ethiopic },
-  { "Georgian",            PT_SC,   ucp_Georgian },
-  { "Glagolitic",          PT_SC,   ucp_Glagolitic },
-  { "Gothic",              PT_SC,   ucp_Gothic },
-  { "Greek",               PT_SC,   ucp_Greek },
-  { "Gujarati",            PT_SC,   ucp_Gujarati },
-  { "Gurmukhi",            PT_SC,   ucp_Gurmukhi },
-  { "Han",                 PT_SC,   ucp_Han },
-  { "Hangul",              PT_SC,   ucp_Hangul },
-  { "Hanunoo",             PT_SC,   ucp_Hanunoo },
-  { "Hebrew",              PT_SC,   ucp_Hebrew },
-  { "Hiragana",            PT_SC,   ucp_Hiragana },
-  { "Inherited",           PT_SC,   ucp_Inherited },
-  { "Kannada",             PT_SC,   ucp_Kannada },
-  { "Katakana",            PT_SC,   ucp_Katakana },
-  { "Kharoshthi",          PT_SC,   ucp_Kharoshthi },
-  { "Khmer",               PT_SC,   ucp_Khmer },
-  { "L",                   PT_GC,   ucp_L },
-  { "L&",                  PT_LAMP, 0 },
-  { "Lao",                 PT_SC,   ucp_Lao },
-  { "Latin",               PT_SC,   ucp_Latin },
-  { "Limbu",               PT_SC,   ucp_Limbu },
-  { "Linear_B",            PT_SC,   ucp_Linear_B },
-  { "Ll",                  PT_PC,   ucp_Ll },
-  { "Lm",                  PT_PC,   ucp_Lm },
-  { "Lo",                  PT_PC,   ucp_Lo },
-  { "Lt",                  PT_PC,   ucp_Lt },
-  { "Lu",                  PT_PC,   ucp_Lu },
-  { "M",                   PT_GC,   ucp_M },
-  { "Malayalam",           PT_SC,   ucp_Malayalam },
-  { "Mc",                  PT_PC,   ucp_Mc },
-  { "Me",                  PT_PC,   ucp_Me },
-  { "Mn",                  PT_PC,   ucp_Mn },
-  { "Mongolian",           PT_SC,   ucp_Mongolian },
-  { "Myanmar",             PT_SC,   ucp_Myanmar },
-  { "N",                   PT_GC,   ucp_N },
-  { "Nd",                  PT_PC,   ucp_Nd },
-  { "New_Tai_Lue",         PT_SC,   ucp_New_Tai_Lue },
-  { "Nl",                  PT_PC,   ucp_Nl },
-  { "No",                  PT_PC,   ucp_No },
-  { "Ogham",               PT_SC,   ucp_Ogham },
-  { "Old_Italic",          PT_SC,   ucp_Old_Italic },
-  { "Old_Persian",         PT_SC,   ucp_Old_Persian },
-  { "Oriya",               PT_SC,   ucp_Oriya },
-  { "Osmanya",             PT_SC,   ucp_Osmanya },
-  { "P",                   PT_GC,   ucp_P },
-  { "Pc",                  PT_PC,   ucp_Pc },
-  { "Pd",                  PT_PC,   ucp_Pd },
-  { "Pe",                  PT_PC,   ucp_Pe },
-  { "Pf",                  PT_PC,   ucp_Pf },
-  { "Pi",                  PT_PC,   ucp_Pi },
-  { "Po",                  PT_PC,   ucp_Po },
-  { "Ps",                  PT_PC,   ucp_Ps },
-  { "Runic",               PT_SC,   ucp_Runic },
-  { "S",                   PT_GC,   ucp_S },
-  { "Sc",                  PT_PC,   ucp_Sc },
-  { "Shavian",             PT_SC,   ucp_Shavian },
-  { "Sinhala",             PT_SC,   ucp_Sinhala },
-  { "Sk",                  PT_PC,   ucp_Sk },
-  { "Sm",                  PT_PC,   ucp_Sm },
-  { "So",                  PT_PC,   ucp_So },
-  { "Syloti_Nagri",        PT_SC,   ucp_Syloti_Nagri },
-  { "Syriac",              PT_SC,   ucp_Syriac },
-  { "Tagalog",             PT_SC,   ucp_Tagalog },
-  { "Tagbanwa",            PT_SC,   ucp_Tagbanwa },
-  { "Tai_Le",              PT_SC,   ucp_Tai_Le },
-  { "Tamil",               PT_SC,   ucp_Tamil },
-  { "Telugu",              PT_SC,   ucp_Telugu },
-  { "Thaana",              PT_SC,   ucp_Thaana },
-  { "Thai",                PT_SC,   ucp_Thai },
-  { "Tibetan",             PT_SC,   ucp_Tibetan },
-  { "Tifinagh",            PT_SC,   ucp_Tifinagh },
-  { "Ugaritic",            PT_SC,   ucp_Ugaritic },
-  { "Yi",                  PT_SC,   ucp_Yi },
-  { "Z",                   PT_GC,   ucp_Z },
-  { "Zl",                  PT_PC,   ucp_Zl },
-  { "Zp",                  PT_PC,   ucp_Zp },
-  { "Zs",                  PT_PC,   ucp_Zs }
+  {   0, PT_ANY, 0 },
+  {   4, PT_SC, ucp_Arabic },
+  {  11, PT_SC, ucp_Armenian },
+  {  20, PT_SC, ucp_Balinese },
+  {  29, PT_SC, ucp_Bengali },
+  {  37, PT_SC, ucp_Bopomofo },
+  {  46, PT_SC, ucp_Braille },
+  {  54, PT_SC, ucp_Buginese },
+  {  63, PT_SC, ucp_Buhid },
+  {  69, PT_GC, ucp_C },
+  {  71, PT_SC, ucp_Canadian_Aboriginal },
+  {  91, PT_SC, ucp_Carian },
+  {  98, PT_PC, ucp_Cc },
+  { 101, PT_PC, ucp_Cf },
+  { 104, PT_SC, ucp_Cham },
+  { 109, PT_SC, ucp_Cherokee },
+  { 118, PT_PC, ucp_Cn },
+  { 121, PT_PC, ucp_Co },
+  { 124, PT_SC, ucp_Common },
+  { 131, PT_SC, ucp_Coptic },
+  { 138, PT_PC, ucp_Cs },
+  { 141, PT_SC, ucp_Cuneiform },
+  { 151, PT_SC, ucp_Cypriot },
+  { 159, PT_SC, ucp_Cyrillic },
+  { 168, PT_SC, ucp_Deseret },
+  { 176, PT_SC, ucp_Devanagari },
+  { 187, PT_SC, ucp_Ethiopic },
+  { 196, PT_SC, ucp_Georgian },
+  { 205, PT_SC, ucp_Glagolitic },
+  { 216, PT_SC, ucp_Gothic },
+  { 223, PT_SC, ucp_Greek },
+  { 229, PT_SC, ucp_Gujarati },
+  { 238, PT_SC, ucp_Gurmukhi },
+  { 247, PT_SC, ucp_Han },
+  { 251, PT_SC, ucp_Hangul },
+  { 258, PT_SC, ucp_Hanunoo },
+  { 266, PT_SC, ucp_Hebrew },
+  { 273, PT_SC, ucp_Hiragana },
+  { 282, PT_SC, ucp_Inherited },
+  { 292, PT_SC, ucp_Kannada },
+  { 300, PT_SC, ucp_Katakana },
+  { 309, PT_SC, ucp_Kayah_Li },
+  { 318, PT_SC, ucp_Kharoshthi },
+  { 329, PT_SC, ucp_Khmer },
+  { 335, PT_GC, ucp_L },
+  { 337, PT_LAMP, 0 },
+  { 340, PT_SC, ucp_Lao },
+  { 344, PT_SC, ucp_Latin },
+  { 350, PT_SC, ucp_Lepcha },
+  { 357, PT_SC, ucp_Limbu },
+  { 363, PT_SC, ucp_Linear_B },
+  { 372, PT_PC, ucp_Ll },
+  { 375, PT_PC, ucp_Lm },
+  { 378, PT_PC, ucp_Lo },
+  { 381, PT_PC, ucp_Lt },
+  { 384, PT_PC, ucp_Lu },
+  { 387, PT_SC, ucp_Lycian },
+  { 394, PT_SC, ucp_Lydian },
+  { 401, PT_GC, ucp_M },
+  { 403, PT_SC, ucp_Malayalam },
+  { 413, PT_PC, ucp_Mc },
+  { 416, PT_PC, ucp_Me },
+  { 419, PT_PC, ucp_Mn },
+  { 422, PT_SC, ucp_Mongolian },
+  { 432, PT_SC, ucp_Myanmar },
+  { 440, PT_GC, ucp_N },
+  { 442, PT_PC, ucp_Nd },
+  { 445, PT_SC, ucp_New_Tai_Lue },
+  { 457, PT_SC, ucp_Nko },
+  { 461, PT_PC, ucp_Nl },
+  { 464, PT_PC, ucp_No },
+  { 467, PT_SC, ucp_Ogham },
+  { 473, PT_SC, ucp_Ol_Chiki },
+  { 482, PT_SC, ucp_Old_Italic },
+  { 493, PT_SC, ucp_Old_Persian },
+  { 505, PT_SC, ucp_Oriya },
+  { 511, PT_SC, ucp_Osmanya },
+  { 519, PT_GC, ucp_P },
+  { 521, PT_PC, ucp_Pc },
+  { 524, PT_PC, ucp_Pd },
+  { 527, PT_PC, ucp_Pe },
+  { 530, PT_PC, ucp_Pf },
+  { 533, PT_SC, ucp_Phags_Pa },
+  { 542, PT_SC, ucp_Phoenician },
+  { 553, PT_PC, ucp_Pi },
+  { 556, PT_PC, ucp_Po },
+  { 559, PT_PC, ucp_Ps },
+  { 562, PT_SC, ucp_Rejang },
+  { 569, PT_SC, ucp_Runic },
+  { 575, PT_GC, ucp_S },
+  { 577, PT_SC, ucp_Saurashtra },
+  { 588, PT_PC, ucp_Sc },
+  { 591, PT_SC, ucp_Shavian },
+  { 599, PT_SC, ucp_Sinhala },
+  { 607, PT_PC, ucp_Sk },
+  { 610, PT_PC, ucp_Sm },
+  { 613, PT_PC, ucp_So },
+  { 616, PT_SC, ucp_Sundanese },
+  { 626, PT_SC, ucp_Syloti_Nagri },
+  { 639, PT_SC, ucp_Syriac },
+  { 646, PT_SC, ucp_Tagalog },
+  { 654, PT_SC, ucp_Tagbanwa },
+  { 663, PT_SC, ucp_Tai_Le },
+  { 670, PT_SC, ucp_Tamil },
+  { 676, PT_SC, ucp_Telugu },
+  { 683, PT_SC, ucp_Thaana },
+  { 690, PT_SC, ucp_Thai },
+  { 695, PT_SC, ucp_Tibetan },
+  { 703, PT_SC, ucp_Tifinagh },
+  { 712, PT_SC, ucp_Ugaritic },
+  { 721, PT_SC, ucp_Vai },
+  { 725, PT_SC, ucp_Yi },
+  { 728, PT_GC, ucp_Z },
+  { 730, PT_PC, ucp_Zl },
+  { 733, PT_PC, ucp_Zp },
+  { 736, PT_PC, ucp_Zs }
 };
 
 const int _pcre_utt_size = sizeof(_pcre_utt)/sizeof(ucp_type_table);
 
+#endif  /* SUPPORT_UTF8 */
+
 /* End of pcre_tables.c */

Modified: freeswitch/trunk/libs/pcre/pcre_try_flipped.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_try_flipped.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_try_flipped.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,10 @@
 auxiliary local function to flip the appropriate bytes. */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -104,6 +108,7 @@
 *internal_re = *re;           /* To copy other fields */
 internal_re->size = byteflip(re->size, sizeof(re->size));
 internal_re->options = byteflip(re->options, sizeof(re->options));
+internal_re->flags = (pcre_uint16)byteflip(re->flags, sizeof(re->flags));
 internal_re->top_bracket =
   (pcre_uint16)byteflip(re->top_bracket, sizeof(re->top_bracket));
 internal_re->top_backref =

Added: freeswitch/trunk/libs/pcre/pcre_ucd.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/pcre_ucd.c	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,2610 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "pcre_internal.h"
+
+/* Unicode character database. */
+/* This file was autogenerated by the MultiStage2.py script. */
+/* Total size: 52808 bytes, block size: 128. */
+/* When recompiling tables with a new Unicode version,
+please check types in the structure definition from pcre_internal.h:
+typedef struct {
+uschar property_0;
+uschar property_1;
+pcre_int32 property_2;
+} ucd_record; */
+
+
+const ucd_record _pcre_ucd_records[] = { /* 3656 bytes, record size 8 */
+  {     9,      0,      0, }, /*   0 */
+  {     9,     29,      0, }, /*   1 */
+  {     9,     21,      0, }, /*   2 */
+  {     9,     23,      0, }, /*   3 */
+  {     9,     22,      0, }, /*   4 */
+  {     9,     18,      0, }, /*   5 */
+  {     9,     25,      0, }, /*   6 */
+  {     9,     17,      0, }, /*   7 */
+  {     9,     13,      0, }, /*   8 */
+  {    33,      9,     32, }, /*   9 */
+  {     9,     24,      0, }, /*  10 */
+  {     9,     16,      0, }, /*  11 */
+  {    33,      5,    -32, }, /*  12 */
+  {     9,     26,      0, }, /*  13 */
+  {    33,      5,      0, }, /*  14 */
+  {     9,     20,      0, }, /*  15 */
+  {     9,      1,      0, }, /*  16 */
+  {     9,     15,      0, }, /*  17 */
+  {     9,      5,    743, }, /*  18 */
+  {     9,     19,      0, }, /*  19 */
+  {    33,      5,    121, }, /*  20 */
+  {    33,      9,      1, }, /*  21 */
+  {    33,      5,     -1, }, /*  22 */
+  {    33,      9,   -199, }, /*  23 */
+  {    33,      5,   -232, }, /*  24 */
+  {    33,      9,   -121, }, /*  25 */
+  {    33,      5,   -300, }, /*  26 */
+  {    33,      5,    195, }, /*  27 */
+  {    33,      9,    210, }, /*  28 */
+  {    33,      9,    206, }, /*  29 */
+  {    33,      9,    205, }, /*  30 */
+  {    33,      9,     79, }, /*  31 */
+  {    33,      9,    202, }, /*  32 */
+  {    33,      9,    203, }, /*  33 */
+  {    33,      9,    207, }, /*  34 */
+  {    33,      5,     97, }, /*  35 */
+  {    33,      9,    211, }, /*  36 */
+  {    33,      9,    209, }, /*  37 */
+  {    33,      5,    163, }, /*  38 */
+  {    33,      9,    213, }, /*  39 */
+  {    33,      5,    130, }, /*  40 */
+  {    33,      9,    214, }, /*  41 */
+  {    33,      9,    218, }, /*  42 */
+  {    33,      9,    217, }, /*  43 */
+  {    33,      9,    219, }, /*  44 */
+  {    33,      7,      0, }, /*  45 */
+  {    33,      5,     56, }, /*  46 */
+  {    33,      9,      2, }, /*  47 */
+  {    33,      8,     -1, }, /*  48 */
+  {    33,      5,     -2, }, /*  49 */
+  {    33,      5,    -79, }, /*  50 */
+  {    33,      9,    -97, }, /*  51 */
+  {    33,      9,    -56, }, /*  52 */
+  {    33,      9,   -130, }, /*  53 */
+  {    33,      9,  10795, }, /*  54 */
+  {    33,      9,   -163, }, /*  55 */
+  {    33,      9,  10792, }, /*  56 */
+  {    33,      9,   -195, }, /*  57 */
+  {    33,      9,     69, }, /*  58 */
+  {    33,      9,     71, }, /*  59 */
+  {    33,      5,  10783, }, /*  60 */
+  {    33,      5,  10780, }, /*  61 */
+  {    33,      5,   -210, }, /*  62 */
+  {    33,      5,   -206, }, /*  63 */
+  {    33,      5,   -205, }, /*  64 */
+  {    33,      5,   -202, }, /*  65 */
+  {    33,      5,   -203, }, /*  66 */
+  {    33,      5,   -207, }, /*  67 */
+  {    33,      5,   -209, }, /*  68 */
+  {    33,      5,   -211, }, /*  69 */
+  {    33,      5,  10743, }, /*  70 */
+  {    33,      5,  10749, }, /*  71 */
+  {    33,      5,   -213, }, /*  72 */
+  {    33,      5,   -214, }, /*  73 */
+  {    33,      5,  10727, }, /*  74 */
+  {    33,      5,   -218, }, /*  75 */
+  {    33,      5,    -69, }, /*  76 */
+  {    33,      5,   -217, }, /*  77 */
+  {    33,      5,    -71, }, /*  78 */
+  {    33,      5,   -219, }, /*  79 */
+  {    33,      6,      0, }, /*  80 */
+  {     9,      6,      0, }, /*  81 */
+  {    27,     12,      0, }, /*  82 */
+  {    27,     12,     84, }, /*  83 */
+  {    19,      9,      1, }, /*  84 */
+  {    19,      5,     -1, }, /*  85 */
+  {    19,     24,      0, }, /*  86 */
+  {     9,      2,      0, }, /*  87 */
+  {    19,      6,      0, }, /*  88 */
+  {    19,      5,    130, }, /*  89 */
+  {    19,      9,     38, }, /*  90 */
+  {    19,      9,     37, }, /*  91 */
+  {    19,      9,     64, }, /*  92 */
+  {    19,      9,     63, }, /*  93 */
+  {    19,      5,      0, }, /*  94 */
+  {    19,      9,     32, }, /*  95 */
+  {    19,      5,    -38, }, /*  96 */
+  {    19,      5,    -37, }, /*  97 */
+  {    19,      5,    -32, }, /*  98 */
+  {    19,      5,    -31, }, /*  99 */
+  {    19,      5,    -64, }, /* 100 */
+  {    19,      5,    -63, }, /* 101 */
+  {    19,      9,      8, }, /* 102 */
+  {    19,      5,    -62, }, /* 103 */
+  {    19,      5,    -57, }, /* 104 */
+  {    19,      9,      0, }, /* 105 */
+  {    19,      5,    -47, }, /* 106 */
+  {    19,      5,    -54, }, /* 107 */
+  {    19,      5,     -8, }, /* 108 */
+  {    10,      9,      1, }, /* 109 */
+  {    10,      5,     -1, }, /* 110 */
+  {    19,      5,    -86, }, /* 111 */
+  {    19,      5,    -80, }, /* 112 */
+  {    19,      5,      7, }, /* 113 */
+  {    19,      9,    -60, }, /* 114 */
+  {    19,      5,    -96, }, /* 115 */
+  {    19,     25,      0, }, /* 116 */
+  {    19,      9,     -7, }, /* 117 */
+  {    19,      9,   -130, }, /* 118 */
+  {    12,      9,     80, }, /* 119 */
+  {    12,      9,     32, }, /* 120 */
+  {    12,      5,    -32, }, /* 121 */
+  {    12,      5,    -80, }, /* 122 */
+  {    12,      9,      1, }, /* 123 */
+  {    12,      5,     -1, }, /* 124 */
+  {    12,     26,      0, }, /* 125 */
+  {    12,     12,      0, }, /* 126 */
+  {    12,     11,      0, }, /* 127 */
+  {    12,      9,     15, }, /* 128 */
+  {    12,      5,    -15, }, /* 129 */
+  {     1,      9,     48, }, /* 130 */
+  {     1,      6,      0, }, /* 131 */
+  {     1,     21,      0, }, /* 132 */
+  {     1,      5,    -48, }, /* 133 */
+  {     1,      5,      0, }, /* 134 */
+  {     1,     17,      0, }, /* 135 */
+  {    25,     12,      0, }, /* 136 */
+  {    25,     17,      0, }, /* 137 */
+  {    25,     21,      0, }, /* 138 */
+  {    25,      7,      0, }, /* 139 */
+  {     0,     25,      0, }, /* 140 */
+  {     0,     21,      0, }, /* 141 */
+  {     0,     23,      0, }, /* 142 */
+  {     0,     26,      0, }, /* 143 */
+  {     0,     12,      0, }, /* 144 */
+  {     0,      7,      0, }, /* 145 */
+  {     0,     11,      0, }, /* 146 */
+  {     0,      6,      0, }, /* 147 */
+  {     0,     13,      0, }, /* 148 */
+  {    49,     21,      0, }, /* 149 */
+  {    49,      1,      0, }, /* 150 */
+  {    49,      7,      0, }, /* 151 */
+  {    49,     12,      0, }, /* 152 */
+  {    55,      7,      0, }, /* 153 */
+  {    55,     12,      0, }, /* 154 */
+  {    63,     13,      0, }, /* 155 */
+  {    63,      7,      0, }, /* 156 */
+  {    63,     12,      0, }, /* 157 */
+  {    63,      6,      0, }, /* 158 */
+  {    63,     26,      0, }, /* 159 */
+  {    63,     21,      0, }, /* 160 */
+  {    14,     12,      0, }, /* 161 */
+  {    14,     10,      0, }, /* 162 */
+  {    14,      7,      0, }, /* 163 */
+  {    14,     13,      0, }, /* 164 */
+  {    14,      6,      0, }, /* 165 */
+  {     2,     12,      0, }, /* 166 */
+  {     2,     10,      0, }, /* 167 */
+  {     2,      7,      0, }, /* 168 */
+  {     2,     13,      0, }, /* 169 */
+  {     2,     23,      0, }, /* 170 */
+  {     2,     15,      0, }, /* 171 */
+  {     2,     26,      0, }, /* 172 */
+  {    21,     12,      0, }, /* 173 */
+  {    21,     10,      0, }, /* 174 */
+  {    21,      7,      0, }, /* 175 */
+  {    21,     13,      0, }, /* 176 */
+  {    20,     12,      0, }, /* 177 */
+  {    20,     10,      0, }, /* 178 */
+  {    20,      7,      0, }, /* 179 */
+  {    20,     13,      0, }, /* 180 */
+  {    20,     23,      0, }, /* 181 */
+  {    43,     12,      0, }, /* 182 */
+  {    43,     10,      0, }, /* 183 */
+  {    43,      7,      0, }, /* 184 */
+  {    43,     13,      0, }, /* 185 */
+  {    43,     26,      0, }, /* 186 */
+  {    53,     12,      0, }, /* 187 */
+  {    53,      7,      0, }, /* 188 */
+  {    53,     10,      0, }, /* 189 */
+  {    53,     13,      0, }, /* 190 */
+  {    53,     15,      0, }, /* 191 */
+  {    53,     26,      0, }, /* 192 */
+  {    53,     23,      0, }, /* 193 */
+  {    54,     10,      0, }, /* 194 */
+  {    54,      7,      0, }, /* 195 */
+  {    54,     12,      0, }, /* 196 */
+  {    54,     13,      0, }, /* 197 */
+  {    54,     15,      0, }, /* 198 */
+  {    54,     26,      0, }, /* 199 */
+  {    28,     10,      0, }, /* 200 */
+  {    28,      7,      0, }, /* 201 */
+  {    28,     12,      0, }, /* 202 */
+  {    28,     13,      0, }, /* 203 */
+  {    36,     10,      0, }, /* 204 */
+  {    36,      7,      0, }, /* 205 */
+  {    36,     12,      0, }, /* 206 */
+  {    36,     13,      0, }, /* 207 */
+  {    36,     15,      0, }, /* 208 */
+  {    36,     26,      0, }, /* 209 */
+  {    47,     10,      0, }, /* 210 */
+  {    47,      7,      0, }, /* 211 */
+  {    47,     12,      0, }, /* 212 */
+  {    47,     21,      0, }, /* 213 */
+  {    56,      7,      0, }, /* 214 */
+  {    56,     12,      0, }, /* 215 */
+  {    56,      6,      0, }, /* 216 */
+  {    56,     21,      0, }, /* 217 */
+  {    56,     13,      0, }, /* 218 */
+  {    32,      7,      0, }, /* 219 */
+  {    32,     12,      0, }, /* 220 */
+  {    32,      6,      0, }, /* 221 */
+  {    32,     13,      0, }, /* 222 */
+  {    57,      7,      0, }, /* 223 */
+  {    57,     26,      0, }, /* 224 */
+  {    57,     21,      0, }, /* 225 */
+  {    57,     12,      0, }, /* 226 */
+  {    57,     13,      0, }, /* 227 */
+  {    57,     15,      0, }, /* 228 */
+  {    57,     22,      0, }, /* 229 */
+  {    57,     18,      0, }, /* 230 */
+  {    57,     10,      0, }, /* 231 */
+  {    38,      7,      0, }, /* 232 */
+  {    38,     10,      0, }, /* 233 */
+  {    38,     12,      0, }, /* 234 */
+  {    38,     13,      0, }, /* 235 */
+  {    38,     21,      0, }, /* 236 */
+  {    38,     26,      0, }, /* 237 */
+  {    16,      9,   7264, }, /* 238 */
+  {    16,      7,      0, }, /* 239 */
+  {    16,      6,      0, }, /* 240 */
+  {    23,      7,      0, }, /* 241 */
+  {    15,      7,      0, }, /* 242 */
+  {    15,     12,      0, }, /* 243 */
+  {    15,     26,      0, }, /* 244 */
+  {    15,     21,      0, }, /* 245 */
+  {    15,     15,      0, }, /* 246 */
+  {     8,      7,      0, }, /* 247 */
+  {     7,      7,      0, }, /* 248 */
+  {     7,     21,      0, }, /* 249 */
+  {    40,     29,      0, }, /* 250 */
+  {    40,      7,      0, }, /* 251 */
+  {    40,     22,      0, }, /* 252 */
+  {    40,     18,      0, }, /* 253 */
+  {    45,      7,      0, }, /* 254 */
+  {    45,     14,      0, }, /* 255 */
+  {    50,      7,      0, }, /* 256 */
+  {    50,     12,      0, }, /* 257 */
+  {    24,      7,      0, }, /* 258 */
+  {    24,     12,      0, }, /* 259 */
+  {     6,      7,      0, }, /* 260 */
+  {     6,     12,      0, }, /* 261 */
+  {    51,      7,      0, }, /* 262 */
+  {    51,     12,      0, }, /* 263 */
+  {    31,      7,      0, }, /* 264 */
+  {    31,      1,      0, }, /* 265 */
+  {    31,     10,      0, }, /* 266 */
+  {    31,     12,      0, }, /* 267 */
+  {    31,     21,      0, }, /* 268 */
+  {    31,      6,      0, }, /* 269 */
+  {    31,     23,      0, }, /* 270 */
+  {    31,     13,      0, }, /* 271 */
+  {    31,     15,      0, }, /* 272 */
+  {    37,     21,      0, }, /* 273 */
+  {    37,     17,      0, }, /* 274 */
+  {    37,     12,      0, }, /* 275 */
+  {    37,     29,      0, }, /* 276 */
+  {    37,     13,      0, }, /* 277 */
+  {    37,      7,      0, }, /* 278 */
+  {    37,      6,      0, }, /* 279 */
+  {    34,      7,      0, }, /* 280 */
+  {    34,     12,      0, }, /* 281 */
+  {    34,     10,      0, }, /* 282 */
+  {    34,     26,      0, }, /* 283 */
+  {    34,     21,      0, }, /* 284 */
+  {    34,     13,      0, }, /* 285 */
+  {    52,      7,      0, }, /* 286 */
+  {    39,      7,      0, }, /* 287 */
+  {    39,     10,      0, }, /* 288 */
+  {    39,     13,      0, }, /* 289 */
+  {    39,     21,      0, }, /* 290 */
+  {    31,     26,      0, }, /* 291 */
+  {     5,      7,      0, }, /* 292 */
+  {     5,     12,      0, }, /* 293 */
+  {     5,     10,      0, }, /* 294 */
+  {     5,     21,      0, }, /* 295 */
+  {    61,     12,      0, }, /* 296 */
+  {    61,     10,      0, }, /* 297 */
+  {    61,      7,      0, }, /* 298 */
+  {    61,     13,      0, }, /* 299 */
+  {    61,     21,      0, }, /* 300 */
+  {    61,     26,      0, }, /* 301 */
+  {    75,     12,      0, }, /* 302 */
+  {    75,     10,      0, }, /* 303 */
+  {    75,      7,      0, }, /* 304 */
+  {    75,     13,      0, }, /* 305 */
+  {    69,      7,      0, }, /* 306 */
+  {    69,     10,      0, }, /* 307 */
+  {    69,     12,      0, }, /* 308 */
+  {    69,     21,      0, }, /* 309 */
+  {    69,     13,      0, }, /* 310 */
+  {    72,     13,      0, }, /* 311 */
+  {    72,      7,      0, }, /* 312 */
+  {    72,      6,      0, }, /* 313 */
+  {    72,     21,      0, }, /* 314 */
+  {    12,      5,      0, }, /* 315 */
+  {    12,      6,      0, }, /* 316 */
+  {    33,      5,  35332, }, /* 317 */
+  {    33,      5,   3814, }, /* 318 */
+  {    33,      5,    -59, }, /* 319 */
+  {    33,      9,  -7615, }, /* 320 */
+  {    19,      5,      8, }, /* 321 */
+  {    19,      9,     -8, }, /* 322 */
+  {    19,      5,     74, }, /* 323 */
+  {    19,      5,     86, }, /* 324 */
+  {    19,      5,    100, }, /* 325 */
+  {    19,      5,    128, }, /* 326 */
+  {    19,      5,    112, }, /* 327 */
+  {    19,      5,    126, }, /* 328 */
+  {    19,      8,     -8, }, /* 329 */
+  {    19,      5,      9, }, /* 330 */
+  {    19,      9,    -74, }, /* 331 */
+  {    19,      8,     -9, }, /* 332 */
+  {    19,      5,  -7205, }, /* 333 */
+  {    19,      9,    -86, }, /* 334 */
+  {    19,      9,   -100, }, /* 335 */
+  {    19,      9,   -112, }, /* 336 */
+  {    19,      9,   -128, }, /* 337 */
+  {    19,      9,   -126, }, /* 338 */
+  {    27,      1,      0, }, /* 339 */
+  {     9,     27,      0, }, /* 340 */
+  {     9,     28,      0, }, /* 341 */
+  {    27,     11,      0, }, /* 342 */
+  {     9,      9,      0, }, /* 343 */
+  {     9,      5,      0, }, /* 344 */
+  {    19,      9,  -7517, }, /* 345 */
+  {    33,      9,  -8383, }, /* 346 */
+  {    33,      9,  -8262, }, /* 347 */
+  {    33,      9,     28, }, /* 348 */
+  {     9,      7,      0, }, /* 349 */
+  {    33,      5,    -28, }, /* 350 */
+  {    33,     14,     16, }, /* 351 */
+  {    33,     14,    -16, }, /* 352 */
+  {    33,     14,      0, }, /* 353 */
+  {     9,     26,     26, }, /* 354 */
+  {     9,     26,    -26, }, /* 355 */
+  {     4,     26,      0, }, /* 356 */
+  {    17,      9,     48, }, /* 357 */
+  {    17,      5,    -48, }, /* 358 */
+  {    33,      9, -10743, }, /* 359 */
+  {    33,      9,  -3814, }, /* 360 */
+  {    33,      9, -10727, }, /* 361 */
+  {    33,      5, -10795, }, /* 362 */
+  {    33,      5, -10792, }, /* 363 */
+  {    33,      9, -10780, }, /* 364 */
+  {    33,      9, -10749, }, /* 365 */
+  {    33,      9, -10783, }, /* 366 */
+  {    10,      5,      0, }, /* 367 */
+  {    10,     26,      0, }, /* 368 */
+  {    10,     21,      0, }, /* 369 */
+  {    10,     15,      0, }, /* 370 */
+  {    16,      5,  -7264, }, /* 371 */
+  {    58,      7,      0, }, /* 372 */
+  {    58,      6,      0, }, /* 373 */
+  {    22,     26,      0, }, /* 374 */
+  {    22,      6,      0, }, /* 375 */
+  {    22,     14,      0, }, /* 376 */
+  {    26,      7,      0, }, /* 377 */
+  {    26,      6,      0, }, /* 378 */
+  {    29,      7,      0, }, /* 379 */
+  {    29,      6,      0, }, /* 380 */
+  {     3,      7,      0, }, /* 381 */
+  {    23,     26,      0, }, /* 382 */
+  {    29,     26,      0, }, /* 383 */
+  {    22,      7,      0, }, /* 384 */
+  {    60,      7,      0, }, /* 385 */
+  {    60,      6,      0, }, /* 386 */
+  {    60,     26,      0, }, /* 387 */
+  {    76,      7,      0, }, /* 388 */
+  {    76,      6,      0, }, /* 389 */
+  {    76,     21,      0, }, /* 390 */
+  {    76,     13,      0, }, /* 391 */
+  {    12,      7,      0, }, /* 392 */
+  {    12,     21,      0, }, /* 393 */
+  {    33,      9, -35332, }, /* 394 */
+  {    48,      7,      0, }, /* 395 */
+  {    48,     12,      0, }, /* 396 */
+  {    48,     10,      0, }, /* 397 */
+  {    48,     26,      0, }, /* 398 */
+  {    64,      7,      0, }, /* 399 */
+  {    64,     21,      0, }, /* 400 */
+  {    74,     10,      0, }, /* 401 */
+  {    74,      7,      0, }, /* 402 */
+  {    74,     12,      0, }, /* 403 */
+  {    74,     21,      0, }, /* 404 */
+  {    74,     13,      0, }, /* 405 */
+  {    68,     13,      0, }, /* 406 */
+  {    68,      7,      0, }, /* 407 */
+  {    68,     12,      0, }, /* 408 */
+  {    68,     21,      0, }, /* 409 */
+  {    73,      7,      0, }, /* 410 */
+  {    73,     12,      0, }, /* 411 */
+  {    73,     10,      0, }, /* 412 */
+  {    73,     21,      0, }, /* 413 */
+  {    67,      7,      0, }, /* 414 */
+  {    67,     12,      0, }, /* 415 */
+  {    67,     10,      0, }, /* 416 */
+  {    67,     13,      0, }, /* 417 */
+  {    67,     21,      0, }, /* 418 */
+  {     9,      4,      0, }, /* 419 */
+  {     9,      3,      0, }, /* 420 */
+  {    25,     25,      0, }, /* 421 */
+  {    35,      7,      0, }, /* 422 */
+  {    19,     14,      0, }, /* 423 */
+  {    19,     15,      0, }, /* 424 */
+  {    19,     26,      0, }, /* 425 */
+  {    70,      7,      0, }, /* 426 */
+  {    66,      7,      0, }, /* 427 */
+  {    41,      7,      0, }, /* 428 */
+  {    41,     15,      0, }, /* 429 */
+  {    18,      7,      0, }, /* 430 */
+  {    18,     14,      0, }, /* 431 */
+  {    59,      7,      0, }, /* 432 */
+  {    59,     21,      0, }, /* 433 */
+  {    42,      7,      0, }, /* 434 */
+  {    42,     21,      0, }, /* 435 */
+  {    42,     14,      0, }, /* 436 */
+  {    13,      9,     40, }, /* 437 */
+  {    13,      5,    -40, }, /* 438 */
+  {    46,      7,      0, }, /* 439 */
+  {    44,      7,      0, }, /* 440 */
+  {    44,     13,      0, }, /* 441 */
+  {    11,      7,      0, }, /* 442 */
+  {    65,      7,      0, }, /* 443 */
+  {    65,     15,      0, }, /* 444 */
+  {    65,     21,      0, }, /* 445 */
+  {    71,      7,      0, }, /* 446 */
+  {    71,     21,      0, }, /* 447 */
+  {    30,      7,      0, }, /* 448 */
+  {    30,     12,      0, }, /* 449 */
+  {    30,     15,      0, }, /* 450 */
+  {    30,     21,      0, }, /* 451 */
+  {    62,      7,      0, }, /* 452 */
+  {    62,     14,      0, }, /* 453 */
+  {    62,     21,      0, }, /* 454 */
+  {     9,     10,      0, }, /* 455 */
+  {    19,     12,      0, }, /* 456 */
+};
+
+const uschar _pcre_ucd_stage1[] = { /* 8704 bytes */
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, /* U+0000 */
+ 16, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, /* U+0800 */
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 40, 40, 41, 42, 43, 44, /* U+1000 */
+ 45, 46, 47, 48, 49, 16, 50, 51, 52, 16, 53, 54, 55, 56, 57, 58, /* U+1800 */
+ 59, 60, 61, 62, 63, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, /* U+2000 */
+ 74, 74, 63, 75, 63, 63, 76, 16, 77, 78, 79, 80, 81, 82, 83, 84, /* U+2800 */
+ 85, 86, 87, 88, 89, 90, 91, 68, 92, 92, 92, 92, 92, 92, 92, 92, /* U+3000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+3800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+4000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 93, 92, 92, 92, 92, /* U+4800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+5000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+5800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+6000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+6800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+7000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+7800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+8000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+8800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+9000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 94, /* U+9800 */
+ 95, 96, 96, 96, 96, 96, 96, 96, 96, 97, 98, 98, 99,100,101,102, /* U+A000 */
+103,104,105, 16,106, 16, 16, 16,107,107,107,107,107,107,107,107, /* U+A800 */
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, /* U+B000 */
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, /* U+B800 */
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, /* U+C000 */
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, /* U+C800 */
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,108, /* U+D000 */
+109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109, /* U+D800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+E000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+E800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F000 */
+110,110, 92, 92,111,112,113,114,115,115,116,117,118,119,120,121, /* U+F800 */
+122,123,124,125, 16,126,127,128,129,130, 16, 16, 16, 16, 16, 16, /* U+10000 */
+131, 16,132, 16,133, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+10800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+11000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+11800 */
+134,134,134,134,134,134,135, 16,136, 16, 16, 16, 16, 16, 16, 16, /* U+12000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+12800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+13000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+13800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+14000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+14800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+15000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+15800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+16000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+16800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+17000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+17800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+18000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+18800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+19000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+19800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1C800 */
+ 68,137,138,139,140, 16,141, 16,142,143,144,145,146,147,148,149, /* U+1D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1E800 */
+150,151, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1F000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+1F800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+20000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+20800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+21000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+21800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+22000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+22800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+23000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+23800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+24000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+24800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+25000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+25800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+26000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+26800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+27000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+27800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+28000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+28800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+29000 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, /* U+29800 */
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,152, 16, 16, /* U+2A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2C800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2E800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2F000 */
+ 92, 92, 92, 92,153, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+2F800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+30000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+30800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+31000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+31800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+32000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+32800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+33000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+33800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+34000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+34800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+35000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+35800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+36000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+36800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+37000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+37800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+38000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+38800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+39000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+39800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3C800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3E800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3F000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+3F800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+40000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+40800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+41000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+41800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+42000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+42800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+43000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+43800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+44000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+44800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+45000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+45800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+46000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+46800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+47000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+47800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+48000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+48800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+49000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+49800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4C800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4E800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4F000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+4F800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+50000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+50800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+51000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+51800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+52000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+52800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+53000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+53800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+54000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+54800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+55000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+55800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+56000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+56800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+57000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+57800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+58000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+58800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+59000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+59800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5C800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5E800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5F000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+5F800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+60000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+60800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+61000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+61800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+62000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+62800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+63000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+63800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+64000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+64800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+65000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+65800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+66000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+66800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+67000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+67800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+68000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+68800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+69000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+69800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6C800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6E800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6F000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+6F800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+70000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+70800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+71000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+71800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+72000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+72800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+73000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+73800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+74000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+74800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+75000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+75800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+76000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+76800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+77000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+77800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+78000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+78800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+79000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+79800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7C800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7E800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7F000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+7F800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+80000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+80800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+81000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+81800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+82000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+82800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+83000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+83800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+84000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+84800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+85000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+85800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+86000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+86800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+87000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+87800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+88000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+88800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+89000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+89800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8C800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8E800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8F000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+8F800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+90000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+90800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+91000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+91800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+92000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+92800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+93000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+93800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+94000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+94800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+95000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+95800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+96000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+96800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+97000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+97800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+98000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+98800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+99000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+99800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9A000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9A800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9B000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9B800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9C000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9C800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9D000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9D800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9E000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9E800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9F000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+9F800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A0000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A0800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A1000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A1800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A2000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A2800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A3000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A3800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A4000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A4800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A5000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A5800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A6000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A6800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A7000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A7800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A8000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A8800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A9000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+A9800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AA000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AA800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AB000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AB800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AC000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AC800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AD000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AD800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AE000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AE800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AF000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+AF800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B0000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B0800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B1000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B1800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B2000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B2800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B3000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B3800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B4000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B4800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B5000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B5800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B6000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B6800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B7000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B7800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B8000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B8800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B9000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+B9800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BA000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BA800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BB000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BB800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BC000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BC800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BD000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BD800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BE000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BE800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BF000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+BF800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C0000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C0800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C1000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C1800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C2000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C2800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C3000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C3800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C4000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C4800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C5000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C5800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C6000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C6800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C7000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C7800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C8000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C8800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C9000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+C9800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CA000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CA800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CB000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CB800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CC000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CC800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CD000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CD800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CE000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CE800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CF000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+CF800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D0000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D0800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D1000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D1800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D2000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D2800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D3000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D3800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D4000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D4800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D5000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D5800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D6000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D6800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D7000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D7800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D8000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D8800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D9000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+D9800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DA000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DA800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DB000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DB800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DC000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DC800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DD000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DD800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DE000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DE800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DF000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+DF800 */
+154, 16,155,156, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E0000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E0800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E1000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E1800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E2000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E2800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E3000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E3800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E4000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E4800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E5000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E5800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E6000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E6800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E7000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E7800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E8000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E8800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E9000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+E9800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EA000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EA800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EB000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EB800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EC000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EC800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+ED000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+ED800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EE000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EE800 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EF000 */
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* U+EF800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F0000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F0800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F1000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F1800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F2000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F2800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F3000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F3800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F4000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F4800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F5000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F5800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F6000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F6800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F7000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F7800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F8000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F8800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F9000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+F9800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FA000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FA800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FB000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FB800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FC000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FC800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FD000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FD800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FE000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FE800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+FF000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,157, /* U+FF800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+100000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+100800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+101000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+101800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+102000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+102800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+103000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+103800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+104000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+104800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+105000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+105800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+106000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+106800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+107000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+107800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+108000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+108800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+109000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+109800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10A000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10A800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10B000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10B800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10C000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10C800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10D000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10D800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10E000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10E800 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, /* U+10F000 */
+110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,157, /* U+10F800 */
+};
+
+const pcre_uint16 _pcre_ucd_stage2[] = { /* 40448 bytes, block = 128 */
+/* block 0 */
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  2,  2,  3,  2,  2,  2,  4,  5,  2,  6,  2,  7,  2,  2,
+  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  2,  2,  6,  6,  6,  2,
+  2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  4,  2,  5, 10, 11,
+ 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  4,  6,  5,  6,  0,
+
+/* block 1 */
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  1,  2,  3,  3,  3,  3, 13, 13, 10, 13, 14, 15,  6, 16, 13, 10,
+ 13,  6, 17, 17, 10, 18, 13,  2, 10, 17, 14, 19, 17, 17, 17,  2,
+  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  6,  9,  9,  9,  9,  9,  9,  9, 14,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12,  6, 12, 12, 12, 12, 12, 12, 12, 20,
+
+/* block 2 */
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 23, 24, 21, 22, 21, 22, 21, 22, 14, 21, 22, 21, 22, 21, 22, 21,
+ 22, 21, 22, 21, 22, 21, 22, 21, 22, 14, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 25, 21, 22, 21, 22, 21, 22, 26,
+
+/* block 3 */
+ 27, 28, 21, 22, 21, 22, 29, 21, 22, 30, 30, 21, 22, 14, 31, 32,
+ 33, 21, 22, 30, 34, 35, 36, 37, 21, 22, 38, 14, 36, 39, 40, 41,
+ 21, 22, 21, 22, 21, 22, 42, 21, 22, 42, 14, 14, 21, 22, 42, 21,
+ 22, 43, 43, 21, 22, 21, 22, 44, 21, 22, 14, 45, 21, 22, 14, 46,
+ 45, 45, 45, 45, 47, 48, 49, 47, 48, 49, 47, 48, 49, 21, 22, 21,
+ 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 50, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 14, 47, 48, 49, 21, 22, 51, 52, 21, 22, 21, 22, 21, 22, 21, 22,
+
+/* block 4 */
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 53, 14, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 14, 14, 14, 14, 14, 14, 54, 21, 22, 55, 56, 14,
+ 14, 21, 22, 57, 58, 59, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 60, 61, 14, 62, 63, 14, 64, 64, 14, 65, 14, 66, 14, 14, 14, 14,
+ 64, 14, 14, 67, 14, 14, 14, 14, 68, 69, 14, 70, 14, 14, 14, 69,
+ 14, 71, 72, 14, 14, 73, 14, 14, 14, 14, 14, 14, 14, 74, 14, 14,
+
+/* block 5 */
+ 75, 14, 14, 75, 14, 14, 14, 14, 75, 76, 77, 77, 78, 14, 14, 14,
+ 14, 14, 79, 14, 45, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 80, 80, 80, 80, 80, 80, 80, 80, 80, 81, 81, 81, 81, 81, 81, 81,
+ 81, 81, 10, 10, 10, 10, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 81, 81, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 80, 80, 80, 80, 80, 10, 10, 10, 10, 10, 10, 10, 81, 10, 81, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+
+/* block 6 */
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 83, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 84, 85, 84, 85, 81, 86, 84, 85, 87, 87, 88, 89, 89, 89,  2, 87,
+
+/* block 7 */
+ 87, 87, 87, 87, 86, 10, 90,  2, 91, 91, 91, 87, 92, 87, 93, 93,
+ 94, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 87, 95, 95, 95, 95, 95, 95, 95, 95, 95, 96, 97, 97, 97,
+ 94, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
+ 98, 98, 99, 98, 98, 98, 98, 98, 98, 98, 98, 98,100,101,101,102,
+103,104,105,105,105,106,107,108, 84, 85, 84, 85, 84, 85, 84, 85,
+ 84, 85,109,110,109,110,109,110,109,110,109,110,109,110,109,110,
+111,112,113, 94,114,115,116, 84, 85,117, 84, 85, 94,118,118,118,
+
+/* block 8 */
+119,119,119,119,119,119,119,119,119,119,119,119,119,119,119,119,
+120,120,120,120,120,120,120,120,120,120,120,120,120,120,120,120,
+120,120,120,120,120,120,120,120,120,120,120,120,120,120,120,120,
+121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,
+121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,121,
+122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+
+/* block 9 */
+123,124,125,126,126,126,126,126,127,127,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+128,123,124,123,124,123,124,123,124,123,124,123,124,123,124,129,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+
+/* block 10 */
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
+130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,130,
+130,130,130,130,130,130,130, 87, 87,131,132,132,132,132,132,132,
+ 87,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
+133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,
+
+/* block 11 */
+133,133,133,133,133,133,133,134, 87,  2,135, 87, 87, 87, 87, 87,
+ 87,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,
+136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,
+136,136,136,136,136,136,136,136,136,136,136,136,136,136,137,136,
+138,136,136,138,136,136,138,136, 87, 87, 87, 87, 87, 87, 87, 87,
+139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,
+139,139,139,139,139,139,139,139,139,139,139, 87, 87, 87, 87, 87,
+139,139,139,138,138, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 12 */
+ 16, 16, 16, 16, 87, 87,140,140,140,141,141,142,  2,141,143,143,
+144,144,144,144,144,144,144,144,144,144,144,  2, 87, 87,141,  2,
+ 87,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+ 81,145,145,145,145,145,145,145,145,145,145, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82,144,144,144,144,144,144,144,144,144, 87,
+  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,141,141,141,141,145,145,
+ 82,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+
+/* block 13 */
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,141,145,144,144,144,144,144,144,144, 16,146,144,
+144,144,144,144,144,147,147,144,144,143,144,144,144,144,145,145,
+148,148,148,148,148,148,148,148,148,148,145,145,145,143,143,145,
+
+/* block 14 */
+149,149,149,149,149,149,149,149,149,149,149,149,149,149, 87,150,
+151,152,151,151,151,151,151,151,151,151,151,151,151,151,151,151,
+151,151,151,151,151,151,151,151,151,151,151,151,151,151,151,151,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152, 87, 87,151,151,151,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+
+/* block 15 */
+153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,153,
+153,153,153,153,153,153,154,154,154,154,154,154,154,154,154,154,
+154,153, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+155,155,155,155,155,155,155,155,155,155,156,156,156,156,156,156,
+156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,
+156,156,156,156,156,156,156,156,156,156,156,157,157,157,157,157,
+157,157,157,157,158,158,159,160,160,160,158, 87, 87, 87, 87, 87,
+
+/* block 16 */
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 17 */
+ 87,161,161,162,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+163,163,163,163,163,163,163,163,163,163, 87, 87,161,163,162,162,
+162,161,161,161,161,161,161,161,161,162,162,162,162,161, 87, 87,
+163, 82, 82,161,161, 87, 87, 87,163,163,163,163,163,163,163,163,
+163,163,161,161,  2,  2,164,164,164,164,164,164,164,164,164,164,
+  2,165,163, 87, 87, 87, 87, 87, 87, 87, 87,163,163,163,163,163,
+
+/* block 18 */
+ 87,166,167,167, 87,168,168,168,168,168,168,168,168, 87, 87,168,
+168, 87, 87,168,168,168,168,168,168,168,168,168,168,168,168,168,
+168,168,168,168,168,168,168,168,168, 87,168,168,168,168,168,168,
+168, 87,168, 87, 87, 87,168,168,168,168, 87, 87,166,168,167,167,
+167,166,166,166,166, 87, 87,167,167, 87, 87,167,167,166,168, 87,
+ 87, 87, 87, 87, 87, 87, 87,167, 87, 87, 87, 87,168,168, 87,168,
+168,168,166,166, 87, 87,169,169,169,169,169,169,169,169,169,169,
+168,168,170,170,171,171,171,171,171,171,172, 87, 87, 87, 87, 87,
+
+/* block 19 */
+ 87,173,173,174, 87,175,175,175,175,175,175, 87, 87, 87, 87,175,
+175, 87, 87,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175, 87,175,175,175,175,175,175,
+175, 87,175,175, 87,175,175, 87,175,175, 87, 87,173, 87,174,174,
+174,173,173, 87, 87, 87, 87,173,173, 87, 87,173,173,173, 87, 87,
+ 87,173, 87, 87, 87, 87, 87, 87, 87,175,175,175,175, 87,175, 87,
+ 87, 87, 87, 87, 87, 87,176,176,176,176,176,176,176,176,176,176,
+173,173,175,175,175,173, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 20 */
+ 87,177,177,178, 87,179,179,179,179,179,179,179,179,179, 87,179,
+179,179, 87,179,179,179,179,179,179,179,179,179,179,179,179,179,
+179,179,179,179,179,179,179,179,179, 87,179,179,179,179,179,179,
+179, 87,179,179, 87,179,179,179,179,179, 87, 87,177,179,178,178,
+178,177,177,177,177,177, 87,177,177,178, 87,178,178,177, 87, 87,
+179, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+179,179,177,177, 87, 87,180,180,180,180,180,180,180,180,180,180,
+ 87,181, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 21 */
+ 87,182,183,183, 87,184,184,184,184,184,184,184,184, 87, 87,184,
+184, 87, 87,184,184,184,184,184,184,184,184,184,184,184,184,184,
+184,184,184,184,184,184,184,184,184, 87,184,184,184,184,184,184,
+184, 87,184,184, 87,184,184,184,184,184, 87, 87,182,184,183,182,
+183,182,182,182,182, 87, 87,183,183, 87, 87,183,183,182, 87, 87,
+ 87, 87, 87, 87, 87, 87,182,183, 87, 87, 87, 87,184,184, 87,184,
+184,184,182,182, 87, 87,185,185,185,185,185,185,185,185,185,185,
+186,184, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 22 */
+ 87, 87,187,188, 87,188,188,188,188,188,188, 87, 87, 87,188,188,
+188, 87,188,188,188,188, 87, 87, 87,188,188, 87,188, 87,188,188,
+ 87, 87, 87,188,188, 87, 87, 87,188,188,188, 87, 87, 87,188,188,
+188,188,188,188,188,188,188,188,188,188, 87, 87, 87, 87,189,189,
+187,189,189, 87, 87, 87,189,189,189, 87,189,189,189,187, 87, 87,
+188, 87, 87, 87, 87, 87, 87,189, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87,190,190,190,190,190,190,190,190,190,190,
+191,191,191,192,192,192,192,192,192,193,192, 87, 87, 87, 87, 87,
+
+/* block 23 */
+ 87,194,194,194, 87,195,195,195,195,195,195,195,195, 87,195,195,
+195, 87,195,195,195,195,195,195,195,195,195,195,195,195,195,195,
+195,195,195,195,195,195,195,195,195, 87,195,195,195,195,195,195,
+195,195,195,195, 87,195,195,195,195,195, 87, 87, 87,195,196,196,
+196,194,194,194,194, 87,196,196,196, 87,196,196,196,196, 87, 87,
+ 87, 87, 87, 87, 87,196,196, 87,195,195, 87, 87, 87, 87, 87, 87,
+195,195,196,196, 87, 87,197,197,197,197,197,197,197,197,197,197,
+ 87, 87, 87, 87, 87, 87, 87, 87,198,198,198,198,198,198,198,199,
+
+/* block 24 */
+ 87, 87,200,200, 87,201,201,201,201,201,201,201,201, 87,201,201,
+201, 87,201,201,201,201,201,201,201,201,201,201,201,201,201,201,
+201,201,201,201,201,201,201,201,201, 87,201,201,201,201,201,201,
+201,201,201,201, 87,201,201,201,201,201, 87, 87,202,201,200,202,
+200,200,200,200,200, 87,202,200,200, 87,200,200,202,202, 87, 87,
+ 87, 87, 87, 87, 87,200,200, 87, 87, 87, 87, 87, 87, 87,201, 87,
+201,201,202,202, 87, 87,203,203,203,203,203,203,203,203,203,203,
+ 87, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 25 */
+ 87, 87,204,204, 87,205,205,205,205,205,205,205,205, 87,205,205,
+205, 87,205,205,205,205,205,205,205,205,205,205,205,205,205,205,
+205,205,205,205,205,205,205,205,205, 87,205,205,205,205,205,205,
+205,205,205,205,205,205,205,205,205,205, 87, 87, 87,205,204,204,
+204,206,206,206,206, 87,204,204,204, 87,204,204,204,206, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87,204, 87, 87, 87, 87, 87, 87, 87, 87,
+205,205,206,206, 87, 87,207,207,207,207,207,207,207,207,207,207,
+208,208,208,208,208,208, 87, 87, 87,209,205,205,205,205,205,205,
+
+/* block 26 */
+ 87, 87,210,210, 87,211,211,211,211,211,211,211,211,211,211,211,
+211,211,211,211,211,211,211, 87, 87, 87,211,211,211,211,211,211,
+211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,
+211,211, 87,211,211,211,211,211,211,211,211,211, 87,211, 87, 87,
+211,211,211,211,211,211,211, 87, 87, 87,212, 87, 87, 87, 87,210,
+210,210,212,212,212, 87,212, 87,210,210,210,210,210,210,210,210,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87,210,210,213, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 27 */
+ 87,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,
+214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,
+214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,
+214,215,214,214,215,215,215,215,215,215,215, 87, 87, 87, 87,  3,
+214,214,214,214,214,214,216,215,215,215,215,215,215,215,215,217,
+218,218,218,218,218,218,218,218,218,218,217,217, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 28 */
+ 87,219,219, 87,219, 87, 87,219,219, 87,219, 87, 87,219, 87, 87,
+ 87, 87, 87, 87,219,219,219,219, 87,219,219,219,219,219,219,219,
+ 87,219,219,219, 87,219, 87,219, 87, 87,219,219, 87,219,219,219,
+219,220,219,219,220,220,220,220,220,220, 87,220,220,219, 87, 87,
+219,219,219,219,219, 87,221, 87,220,220,220,220,220,220, 87, 87,
+222,222,222,222,222,222,222,222,222,222, 87, 87,219,219, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 29 */
+223,224,224,224,225,225,225,225,225,225,225,225,225,225,225,225,
+225,225,225,224,224,224,224,224,226,226,224,224,224,224,224,224,
+227,227,227,227,227,227,227,227,227,227,228,228,228,228,228,228,
+228,228,228,228,224,226,224,226,224,226,229,230,229,230,231,231,
+223,223,223,223,223,223,223,223, 87,223,223,223,223,223,223,223,
+223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
+223,223,223,223,223,223,223,223,223,223,223,223,223, 87, 87, 87,
+ 87,226,226,226,226,226,226,226,226,226,226,226,226,226,226,231,
+
+/* block 30 */
+226,226,226,226,226,225,226,226,223,223,223,223, 87, 87, 87, 87,
+226,226,226,226,226,226,226,226, 87,226,226,226,226,226,226,226,
+226,226,226,226,226,226,226,226,226,226,226,226,226,226,226,226,
+226,226,226,226,226,226,226,226,226,226,226,226,226, 87,224,224,
+224,224,224,224,224,224,226,224,224,224,224,224,224, 87,224,224,
+225,225,225,225,225, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 31 */
+232,232,232,232,232,232,232,232,232,232,232,232,232,232,232,232,
+232,232,232,232,232,232,232,232,232,232,232,232,232,232,232,232,
+232,232,232,232,232,232,232,232,232,232,232,233,233,234,234,234,
+234,233,234,234,234,234,234,234,233,234,234,233,233,234,234,232,
+235,235,235,235,235,235,235,235,235,235,236,236,236,236,236,236,
+232,232,232,232,232,232,233,233,234,234,232,232,232,232,234,234,
+234,232,233,233,233,232,232,233,233,233,233,233,233,233,232,232,
+232,234,234,234,234,232,232,232,232,232,232,232,232,232,232,232,
+
+/* block 32 */
+232,232,234,233,233,234,234,233,233,233,233,233,233,234,232,233,
+235,235,235,235,235,235,235,235,235,235, 87, 87, 87, 87,237,237,
+238,238,238,238,238,238,238,238,238,238,238,238,238,238,238,238,
+238,238,238,238,238,238,238,238,238,238,238,238,238,238,238,238,
+238,238,238,238,238,238, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+239,239,239,239,239,239,239,239,239,239,239,239,239,239,239,239,
+239,239,239,239,239,239,239,239,239,239,239,239,239,239,239,239,
+239,239,239,239,239,239,239,239,239,239,239,  2,240, 87, 87, 87,
+
+/* block 33 */
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241, 87, 87, 87, 87, 87,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+
+/* block 34 */
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241, 87, 87, 87, 87, 87,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241, 87, 87, 87, 87, 87, 87,
+
+/* block 35 */
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242, 87,242,242,242,242, 87, 87,
+242,242,242,242,242,242,242, 87,242, 87,242,242,242,242, 87, 87,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+
+/* block 36 */
+242,242,242,242,242,242,242,242,242, 87,242,242,242,242, 87, 87,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242, 87,242,242,242,242, 87, 87,242,242,242,242,242,242,242, 87,
+242, 87,242,242,242,242, 87, 87,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242, 87,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+
+/* block 37 */
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242, 87,242,242,242,242, 87, 87,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242,242,242,242,242, 87, 87, 87, 87,243,
+244,245,245,245,245,245,245,245,245,246,246,246,246,246,246,246,
+246,246,246,246,246,246,246,246,246,246,246,246,246, 87, 87, 87,
+
+/* block 38 */
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+244,244,244,244,244,244,244,244,244,244, 87, 87, 87, 87, 87, 87,
+247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,
+247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,
+247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,
+247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,
+247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,
+247,247,247,247,247, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 39 */
+ 87,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+
+/* block 40 */
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+
+/* block 41 */
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,
+248,248,248,248,248,248,248,248,248,248,248,248,248,249,249,248,
+248,248,248,248,248,248,248, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 42 */
+250,251,251,251,251,251,251,251,251,251,251,251,251,251,251,251,
+251,251,251,251,251,251,251,251,251,251,251,252,253, 87, 87, 87,
+254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,
+254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,
+254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,
+254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,
+254,254,254,254,254,254,254,254,254,254,254,  2,  2,  2,255,255,
+255, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 43 */
+256,256,256,256,256,256,256,256,256,256,256,256,256, 87,256,256,
+256,256,257,257,257, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,
+258,258,259,259,259,  2,  2, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,260,
+260,260,261,261, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+262,262,262,262,262,262,262,262,262,262,262,262,262, 87,262,262,
+262, 87,263,263, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 44 */
+264,264,264,264,264,264,264,264,264,264,264,264,264,264,264,264,
+264,264,264,264,264,264,264,264,264,264,264,264,264,264,264,264,
+264,264,264,264,264,264,264,264,264,264,264,264,264,264,264,264,
+264,264,264,264,265,265,266,267,267,267,267,267,267,267,266,266,
+266,266,266,266,266,266,267,266,266,267,267,267,267,267,267,267,
+267,267,267,267,268,268,268,269,268,268,268,270,264,267, 87, 87,
+271,271,271,271,271,271,271,271,271,271, 87, 87, 87, 87, 87, 87,
+272,272,272,272,272,272,272,272,272,272, 87, 87, 87, 87, 87, 87,
+
+/* block 45 */
+273,273,  2,  2,273,  2,274,273,273,273,273,275,275,275,276, 87,
+277,277,277,277,277,277,277,277,277,277, 87, 87, 87, 87, 87, 87,
+278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,
+278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,
+278,278,278,279,278,278,278,278,278,278,278,278,278,278,278,278,
+278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,
+278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,
+278,278,278,278,278,278,278,278, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 46 */
+278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,
+278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,
+278,278,278,278,278,278,278,278,278,275,278, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 47 */
+280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,
+280,280,280,280,280,280,280,280,280,280,280,280,280, 87, 87, 87,
+281,281,281,282,282,282,282,281,281,282,282,282, 87, 87, 87, 87,
+282,282,281,282,282,282,282,282,282,281,281,281, 87, 87, 87, 87,
+283, 87, 87, 87,284,284,285,285,285,285,285,285,285,285,285,285,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286, 87, 87,
+286,286,286,286,286, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 48 */
+287,287,287,287,287,287,287,287,287,287,287,287,287,287,287,287,
+287,287,287,287,287,287,287,287,287,287,287,287,287,287,287,287,
+287,287,287,287,287,287,287,287,287,287, 87, 87, 87, 87, 87, 87,
+288,288,288,288,288,288,288,288,288,288,288,288,288,288,288,288,
+288,287,287,287,287,287,287,287,288,288, 87, 87, 87, 87, 87, 87,
+289,289,289,289,289,289,289,289,289,289, 87, 87, 87, 87,290,290,
+291,291,291,291,291,291,291,291,291,291,291,291,291,291,291,291,
+291,291,291,291,291,291,291,291,291,291,291,291,291,291,291,291,
+
+/* block 49 */
+292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
+292,292,292,292,292,292,292,293,293,294,294,294, 87, 87,295,295,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 50 */
+296,296,296,296,297,298,298,298,298,298,298,298,298,298,298,298,
+298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
+298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
+298,298,298,298,296,297,296,296,296,296,296,297,296,297,297,297,
+297,297,296,297,297,298,298,298,298,298,298,298, 87, 87, 87, 87,
+299,299,299,299,299,299,299,299,299,299,300,300,300,300,300,300,
+300,301,301,301,301,301,301,301,301,301,301,296,296,296,296,296,
+296,296,296,296,301,301,301,301,301,301,301,301,301, 87, 87, 87,
+
+/* block 51 */
+302,302,303,304,304,304,304,304,304,304,304,304,304,304,304,304,
+304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
+304,303,302,302,302,302,303,303,302,302,303, 87, 87, 87,304,304,
+305,305,305,305,305,305,305,305,305,305, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 52 */
+306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,
+306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,
+306,306,306,306,307,307,307,307,307,307,307,307,308,308,308,308,
+308,308,308,308,307,307,308,308, 87, 87, 87,309,309,309,309,309,
+310,310,310,310,310,310,310,310,310,310, 87, 87, 87,306,306,306,
+311,311,311,311,311,311,311,311,311,311,312,312,312,312,312,312,
+312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,312,
+312,312,312,312,312,312,312,312,313,313,313,313,313,313,314,314,
+
+/* block 53 */
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 94, 94, 94, 94, 94,315, 80, 80, 80, 80,
+ 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
+ 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
+ 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 88, 88, 88,
+ 88, 88, 14, 14, 14, 14, 94, 94, 94, 94, 94, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14,316,317, 14, 14, 14,318, 14, 14,
+
+/* block 54 */
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 80, 80, 80, 80, 80,
+ 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
+ 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 88,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 82, 82,
+
+/* block 55 */
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+
+/* block 56 */
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 14, 14, 14, 14, 14,319, 14, 14,320, 14,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+
+/* block 57 */
+321,321,321,321,321,321,321,321,322,322,322,322,322,322,322,322,
+321,321,321,321,321,321, 87, 87,322,322,322,322,322,322, 87, 87,
+321,321,321,321,321,321,321,321,322,322,322,322,322,322,322,322,
+321,321,321,321,321,321,321,321,322,322,322,322,322,322,322,322,
+321,321,321,321,321,321, 87, 87,322,322,322,322,322,322, 87, 87,
+ 94,321, 94,321, 94,321, 94,321, 87,322, 87,322, 87,322, 87,322,
+321,321,321,321,321,321,321,321,322,322,322,322,322,322,322,322,
+323,323,324,324,324,324,325,325,326,326,327,327,328,328, 87, 87,
+
+/* block 58 */
+321,321,321,321,321,321,321,321,329,329,329,329,329,329,329,329,
+321,321,321,321,321,321,321,321,329,329,329,329,329,329,329,329,
+321,321,321,321,321,321,321,321,329,329,329,329,329,329,329,329,
+321,321, 94,330, 94, 87, 94, 94,322,322,331,331,332, 86,333, 86,
+ 86, 86, 94,330, 94, 87, 94, 94,334,334,334,334,332, 86, 86, 86,
+321,321, 94, 94, 87, 87, 94, 94,322,322,335,335, 87, 86, 86, 86,
+321,321, 94, 94, 94,113, 94, 94,322,322,336,336,117, 86, 86, 86,
+ 87, 87, 94,330, 94, 87, 94, 94,337,337,338,338,332, 86, 86, 87,
+
+/* block 59 */
+  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,339,339, 16, 16,
+  7,  7,  7,  7,  7,  7,  2,  2, 15, 19,  4, 15, 15, 19,  4, 15,
+  2,  2,  2,  2,  2,  2,  2,  2,340,341, 16, 16, 16, 16, 16,  1,
+  2,  2,  2,  2,  2,  2,  2,  2,  2, 15, 19,  2,  2,  2,  2, 11,
+ 11,  2,  2,  2,  6,  4,  5,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+  2,  2,  6,  2, 11,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  1,
+ 16, 16, 16, 16, 16, 87, 87, 87, 87, 87, 16, 16, 16, 16, 16, 16,
+ 17, 14, 87, 87, 17, 17, 17, 17, 17, 17,  6,  6,  6,  4,  5, 14,
+
+/* block 60 */
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,  6,  6,  6,  4,  5, 87,
+ 80, 80, 80, 80, 80, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+  3,  3,  3,  3,  3,  3, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,342,342,342,
+342, 82,342,342,342, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 61 */
+ 13, 13,343, 13, 13, 13, 13,343, 13, 13,344,343,343,343,344,344,
+343,343,343,344, 13,343, 13, 13, 13,343,343,343,343,343, 13, 13,
+ 13, 13, 13, 13,343, 13,345, 13,343, 13,346,347,343,343, 13,344,
+343,343,348,343,344,349,349,349,349,344, 13, 13,344,344,343,343,
+  6,  6,  6,  6,  6,343,344,344,344,344, 13,  6, 13, 13,350, 13,
+ 87, 87, 87, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,
+352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352,
+
+/* block 62 */
+353,353,353, 21, 22,353,353,353,353, 87, 87, 87, 87, 87, 87, 87,
+  6,  6,  6,  6,  6, 13, 13, 13, 13, 13,  6,  6, 13, 13, 13, 13,
+  6, 13, 13,  6, 13, 13,  6, 13, 13, 13, 13, 13, 13, 13,  6, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  6,  6,
+ 13, 13,  6, 13,  6, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+
+/* block 63 */
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+
+/* block 64 */
+ 13, 13, 13, 13, 13, 13, 13, 13,  6,  6,  6,  6, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+  6,  6, 13, 13, 13, 13, 13, 13, 13,  4,  5, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  6, 13, 13, 13,
+
+/* block 65 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  6,  6,  6,  6,
+  6,  6, 13, 13, 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 66 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+
+/* block 67 */
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13,354,354,354,354,354,354,354,354,354,354,
+354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,
+355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,
+355,355,355,355,355,355,355,355,355,355, 17, 17, 17, 17, 17, 17,
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+
+/* block 68 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+
+/* block 69 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13,  6, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13,  6, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13,  6,  6,  6,  6,  6,  6,  6,  6,
+
+/* block 70 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,  6,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+
+/* block 71 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87, 87,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87, 87, 87,
+ 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 72 */
+ 87, 13, 13, 13, 13, 87, 13, 13, 13, 13, 87, 87, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 87, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87, 13, 87, 13,
+ 13, 13, 13, 87, 87, 87, 13, 87, 13, 13, 13, 13, 13, 13, 13, 87,
+ 87, 13, 13, 13, 13, 13, 13, 13,  4,  5,  4,  5,  4,  5,  4,  5,
+  4,  5,  4,  5,  4,  5, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+
+/* block 73 */
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17, 17, 17, 13, 87, 87, 87, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 87, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87,
+  6,  6,  6,  6,  6,  4,  5,  6,  6,  6,  6, 87,  6, 87, 87, 87,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  4,  5,  4,  5,  4,  5,  4,  5,  4,  5,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+
+/* block 74 */
+356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,
+356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,
+356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,
+356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,
+356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,
+356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,
+356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,
+356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,356,
+
+/* block 75 */
+  6,  6,  6,  4,  5,  4,  5,  4,  5,  4,  5,  4,  5,  4,  5,  4,
+  5,  4,  5,  4,  5,  4,  5,  4,  5,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  4,  5,  4,  5,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  4,  5,  6,  6,
+
+/* block 76 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+  6,  6,  6,  6,  6, 13, 13,  6,  6,  6,  6,  6,  6, 87, 87, 87,
+ 13, 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 77 */
+357,357,357,357,357,357,357,357,357,357,357,357,357,357,357,357,
+357,357,357,357,357,357,357,357,357,357,357,357,357,357,357,357,
+357,357,357,357,357,357,357,357,357,357,357,357,357,357,357, 87,
+358,358,358,358,358,358,358,358,358,358,358,358,358,358,358,358,
+358,358,358,358,358,358,358,358,358,358,358,358,358,358,358,358,
+358,358,358,358,358,358,358,358,358,358,358,358,358,358,358, 87,
+ 21, 22,359,360,361,362,363, 21, 22, 21, 22, 21, 22,364,365,366,
+ 87, 14, 21, 22, 14, 21, 22, 14, 14, 14, 14, 14, 14, 80, 87, 87,
+
+/* block 78 */
+109,110,109,110,109,110,109,110,109,110,109,110,109,110,109,110,
+109,110,109,110,109,110,109,110,109,110,109,110,109,110,109,110,
+109,110,109,110,109,110,109,110,109,110,109,110,109,110,109,110,
+109,110,109,110,109,110,109,110,109,110,109,110,109,110,109,110,
+109,110,109,110,109,110,109,110,109,110,109,110,109,110,109,110,
+109,110,109,110,109,110,109,110,109,110,109,110,109,110,109,110,
+109,110,109,110,367,368,368,368,368,368,368, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87,369,369,369,369,370,369,369,
+
+/* block 79 */
+371,371,371,371,371,371,371,371,371,371,371,371,371,371,371,371,
+371,371,371,371,371,371,371,371,371,371,371,371,371,371,371,371,
+371,371,371,371,371,371, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+372,372,372,372,372,372,372,372,372,372,372,372,372,372,372,372,
+372,372,372,372,372,372,372,372,372,372,372,372,372,372,372,372,
+372,372,372,372,372,372,372,372,372,372,372,372,372,372,372,372,
+372,372,372,372,372,372, 87, 87, 87, 87, 87, 87, 87, 87, 87,373,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 80 */
+242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,
+242,242,242,242,242,242,242, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+242,242,242,242,242,242,242, 87,242,242,242,242,242,242,242, 87,
+242,242,242,242,242,242,242, 87,242,242,242,242,242,242,242, 87,
+242,242,242,242,242,242,242, 87,242,242,242,242,242,242,242, 87,
+242,242,242,242,242,242,242, 87,242,242,242,242,242,242,242, 87,
+126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,
+126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,126,
+
+/* block 81 */
+  2,  2, 15, 19, 15, 19,  2,  2,  2, 15, 19,  2, 15, 19,  2,  2,
+  2,  2,  2,  2,  2,  2,  2,  7,  2,  2,  7,  2, 15, 19,  2,  2,
+ 15, 19,  4,  5,  4,  5,  4,  5,  4,  5,  2,  2,  2,  2,  2, 81,
+  2, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 82 */
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374, 87,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 83 */
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+
+/* block 84 */
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,
+374,374,374,374,374,374, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87, 87, 87, 87,
+
+/* block 85 */
+  1,  2,  2,  2, 13,375,349,376,  4,  5,  4,  5,  4,  5,  4,  5,
+  4,  5, 13, 13,  4,  5,  4,  5,  4,  5,  4,  5,  7,  4,  5,  5,
+ 13,376,376,376,376,376,376,376,376,376, 82, 82, 82, 82, 82, 82,
+  7, 81, 81, 81, 81, 81, 13, 13,376,376,376,375,349,  2, 13, 13,
+ 87,377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,
+377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,
+377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,
+377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,
+
+/* block 86 */
+377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,
+377,377,377,377,377,377,377, 87, 87, 82, 82, 10, 10,378,378,377,
+  7,379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,
+379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,
+379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,
+379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,
+379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,
+379,379,379,379,379,379,379,379,379,379,379,  2, 81,380,380,379,
+
+/* block 87 */
+ 87, 87, 87, 87, 87,381,381,381,381,381,381,381,381,381,381,381,
+381,381,381,381,381,381,381,381,381,381,381,381,381,381,381,381,
+381,381,381,381,381,381,381,381,381,381,381,381,381,381, 87, 87,
+ 87,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+
+/* block 88 */
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241, 87,
+ 13, 13, 17, 17, 17, 17, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+381,381,381,381,381,381,381,381,381,381,381,381,381,381,381,381,
+381,381,381,381,381,381,381,381, 87, 87, 87, 87, 87, 87, 87, 87,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,
+
+/* block 89 */
+382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,
+382,382,382,382,382,382,382,382,382,382,382,382,382,382,382, 87,
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 13, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,
+382,382,382,382,382,382,382,382,382,382,382,382,382,382,382, 13,
+
+/* block 90 */
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
+383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
+383,383,383,383,383,383,383,383,383,383,383,383,383,383,383, 87,
+
+/* block 91 */
+383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
+383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
+383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
+383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
+383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,
+383,383,383,383,383,383,383,383, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+
+/* block 92 */
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+
+/* block 93 */
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+
+/* block 94 */
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 95 */
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,386,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+
+/* block 96 */
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,385,
+
+/* block 97 */
+385,385,385,385,385,385,385,385,385,385,385,385,385, 87, 87, 87,
+387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,
+387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,
+387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,
+387,387,387,387,387,387,387, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 98 */
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+
+/* block 99 */
+388,388,388,388,388,388,388,388,388,388,388,388,389,390,390,390,
+388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,
+391,391,391,391,391,391,391,391,391,391,388,388, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+ 87, 87,123,124,123,124,123,124,123,124,123,124,123,124,392,126,
+127,127,127,393, 87, 87, 87, 87, 87, 87, 87, 87,126,126,393,316,
+
+/* block 100 */
+123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,
+123,124,123,124,123,124,123,124, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 101 */
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 10, 10, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 14, 14, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22,
+ 80, 14, 14, 14, 14, 14, 14, 14, 14, 21, 22, 21, 22,394, 21, 22,
+
+/* block 102 */
+ 21, 22, 21, 22, 21, 22, 21, 22, 81, 10, 10, 21, 22, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 45, 45, 45, 45, 45,
+
+/* block 103 */
+395,395,396,395,395,395,396,395,395,395,395,396,395,395,395,395,
+395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,
+395,395,395,397,397,396,396,397,398,398,398,398, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+399,399,399,399,399,399,399,399,399,399,399,399,399,399,399,399,
+399,399,399,399,399,399,399,399,399,399,399,399,399,399,399,399,
+399,399,399,399,399,399,399,399,399,399,399,399,399,399,399,399,
+399,399,399,399,400,400,400,400, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 104 */
+401,401,402,402,402,402,402,402,402,402,402,402,402,402,402,402,
+402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,
+402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,
+402,402,402,402,401,401,401,401,401,401,401,401,401,401,401,401,
+401,401,401,401,403, 87, 87, 87, 87, 87, 87, 87, 87, 87,404,404,
+405,405,405,405,405,405,405,405,405,405, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 105 */
+406,406,406,406,406,406,406,406,406,406,407,407,407,407,407,407,
+407,407,407,407,407,407,407,407,407,407,407,407,407,407,407,407,
+407,407,407,407,407,407,408,408,408,408,408,408,408,408,409,409,
+410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,
+410,410,410,410,410,410,410,411,411,411,411,411,411,411,411,411,
+411,411,412,412, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,413,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 106 */
+414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,
+414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,
+414,414,414,414,414,414,414,414,414,415,415,415,415,415,415,416,
+416,415,415,416,416,415,415, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+414,414,414,415,414,414,414,414,414,414,414,414,415,416, 87, 87,
+417,417,417,417,417,417,417,417,417,417, 87, 87,418,418,418,418,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 107 */
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+
+/* block 108 */
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 109 */
+419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,
+419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,
+419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,
+419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,
+419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,
+419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,
+419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,
+419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,419,
+
+/* block 110 */
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+
+/* block 111 */
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384, 87, 87,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384, 87, 87, 87, 87, 87,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+
+/* block 112 */
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 113 */
+ 14, 14, 14, 14, 14, 14, 14, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87,134,134,134,134,134, 87, 87, 87, 87, 87,139,136,139,
+139,139,139,139,139,139,139,139,139,421,139,139,139,139,139,139,
+139,139,139,139,139,139,139, 87,139,139,139,139,139, 87,139, 87,
+139,139, 87,139,139, 87,139,139,139,139,139,139,139,139,139,139,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+
+/* block 114 */
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+
+/* block 115 */
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+
+/* block 116 */
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,  4,  5,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+
+/* block 117 */
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+ 87, 87,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+145,145,145,145,145,145,145,145,145,145,145,145,142, 13, 87, 87,
+
+/* block 118 */
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+  2,  2,  2,  2,  2,  2,  2,  4,  5,  2, 87, 87, 87, 87, 87, 87,
+ 82, 82, 82, 82, 82, 82, 82, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+  2,  7,  7, 11, 11,  4,  5,  4,  5,  4,  5,  4,  5,  4,  5,  4,
+  5,  4,  5,  4,  5,  2,  2,  4,  5,  2,  2,  2,  2, 11, 11, 11,
+  2,  2,  2, 87,  2,  2,  2,  2,  7,  4,  5,  4,  5,  4,  5,  2,
+  2,  2,  6,  7,  6,  6,  6, 87,  2,  3,  2,  2, 87, 87, 87, 87,
+145,145,145,145,145, 87,145,145,145,145,145,145,145,145,145,145,
+
+/* block 119 */
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,145,
+145,145,145,145,145,145,145,145,145,145,145,145,145, 87, 87, 16,
+
+/* block 120 */
+ 87,  2,  2,  2,  3,  2,  2,  2,  4,  5,  2,  6,  2,  7,  2,  2,
+  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  2,  2,  6,  6,  6,  2,
+  2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  4,  2,  5, 10, 11,
+ 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  4,  6,  5,  6,  4,
+  5,  2,  4,  5,  2,  2,379,379,379,379,379,379,379,379,379,379,
+ 81,379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,
+
+/* block 121 */
+379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,379,
+379,379,379,379,379,379,379,379,379,379,379,379,379,379, 81, 81,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,
+241,241,241,241,241,241,241,241,241,241,241,241,241,241,241, 87,
+ 87, 87,241,241,241,241,241,241, 87, 87,241,241,241,241,241,241,
+ 87, 87,241,241,241,241,241,241, 87, 87,241,241,241, 87, 87, 87,
+  3,  3,  6, 10, 13,  3,  3, 87, 13,  6,  6,  6,  6, 13, 13, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 16, 16, 16, 13, 13, 87, 87,
+
+/* block 122 */
+422,422,422,422,422,422,422,422,422,422,422,422, 87,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422, 87,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422, 87,422,422, 87,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422, 87, 87,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 123 */
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,422,
+422,422,422,422,422,422,422,422,422,422,422, 87, 87, 87, 87, 87,
+
+/* block 124 */
+  2,  2, 13, 87, 87, 87, 87, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17, 17, 17, 87, 87, 87, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+423,423,423,423,423,423,423,423,423,423,423,423,423,423,423,423,
+423,423,423,423,423,423,423,423,423,423,423,423,423,423,423,423,
+423,423,423,423,423,423,423,423,423,423,423,423,423,423,423,423,
+423,423,423,423,423,424,424,424,424,425,425,425,425,425,425,425,
+
+/* block 125 */
+425,425,425,425,425,425,425,425,425,425,424, 87, 87, 87, 87, 87,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 82, 87, 87,
+
+/* block 126 */
+426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,
+426,426,426,426,426,426,426,426,426,426,426,426,426, 87, 87, 87,
+427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,
+427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,
+427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,
+427, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 127 */
+428,428,428,428,428,428,428,428,428,428,428,428,428,428,428,428,
+428,428,428,428,428,428,428,428,428,428,428,428,428,428,428, 87,
+429,429,429,429, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,
+430,431,430,430,430,430,430,430,430,430,431, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 128 */
+432,432,432,432,432,432,432,432,432,432,432,432,432,432,432,432,
+432,432,432,432,432,432,432,432,432,432,432,432,432,432, 87,433,
+434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,
+434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,
+434,434,434,434, 87, 87, 87, 87,434,434,434,434,434,434,434,434,
+435,436,436,436,436,436, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 129 */
+437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
+437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
+437,437,437,437,437,437,437,437,438,438,438,438,438,438,438,438,
+438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
+438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,
+439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,
+439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,
+439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,
+
+/* block 130 */
+440,440,440,440,440,440,440,440,440,440,440,440,440,440,440,440,
+440,440,440,440,440,440,440,440,440,440,440,440,440,440, 87, 87,
+441,441,441,441,441,441,441,441,441,441, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 131 */
+442,442,442,442,442,442, 87, 87,442, 87,442,442,442,442,442,442,
+442,442,442,442,442,442,442,442,442,442,442,442,442,442,442,442,
+442,442,442,442,442,442,442,442,442,442,442,442,442,442,442,442,
+442,442,442,442,442,442, 87,442,442, 87, 87, 87,442, 87, 87,442,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 132 */
+443,443,443,443,443,443,443,443,443,443,443,443,443,443,443,443,
+443,443,443,443,443,443,444,444,444,444, 87, 87, 87, 87, 87,445,
+446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,
+446,446,446,446,446,446,446,446,446,446, 87, 87, 87, 87, 87,447,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 133 */
+448,449,449,449, 87,449,449, 87, 87, 87, 87, 87,449,449,449,449,
+448,448,448,448, 87,448,448,448, 87,448,448,448,448,448,448,448,
+448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,
+448,448,448,448, 87, 87, 87, 87,449,449,449, 87, 87, 87, 87,449,
+450,450,450,450,450,450,450,450, 87, 87, 87, 87, 87, 87, 87, 87,
+451,451,451,451,451,451,451,451,451, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 134 */
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+
+/* block 135 */
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,452,
+452,452,452,452,452,452,452,452,452,452,452,452,452,452,452, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 136 */
+453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,
+453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,
+453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,
+453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,
+453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,
+453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,
+453,453,453, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+454,454,454,454, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 137 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 138 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 87, 87, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13,455,455, 82, 82, 82, 13, 13, 13,455,455,455,
+455,455,455, 16, 16, 16, 16, 16, 16, 16, 16, 82, 82, 82, 82, 82,
+
+/* block 139 */
+ 82, 82, 82, 13, 13, 82, 82, 82, 82, 82, 82, 82, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 82, 82, 82, 82, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 140 */
+425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,
+425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,
+425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,
+425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,
+425,425,456,456,456,425, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 141 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 142 */
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,344,344,
+344,344,344,344,344, 87,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+
+/* block 143 */
+343,343,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,343, 87,343,343,
+ 87, 87,343, 87, 87,343,343, 87, 87,343,343,343,343, 87,343,343,
+343,343,343,343,343,343,344,344,344,344, 87,344, 87,344,344,344,
+344,344,344,344, 87,344,344,344,344,344,344,344,344,344,344,344,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+
+/* block 144 */
+344,344,344,344,343,343, 87,343,343,343,343, 87, 87,343,343,343,
+343,343,343,343,343, 87,343,343,343,343,343,343,343, 87,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,343,343, 87,343,343,343,343, 87,
+343,343,343,343,343, 87,343, 87, 87, 87,343,343,343,343,343,343,
+343, 87,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+
+/* block 145 */
+343,343,343,343,343,343,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+
+/* block 146 */
+344,344,344,344,344,344,344,344,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+
+/* block 147 */
+343,343,343,343,343,343,343,343,343,343,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344, 87, 87,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,  6,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,  6,344,344,344,344,
+344,344,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,  6,344,344,344,344,
+
+/* block 148 */
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,  6,344,344,344,344,344,344,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,  6,344,344,344,344,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,  6,
+344,344,344,344,344,344,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,  6,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+
+/* block 149 */
+344,344,344,344,344,344,344,344,344,  6,344,344,344,344,344,344,
+343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,
+343,343,343,343,343,343,343,343,343,  6,344,344,344,344,344,344,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+344,344,344,  6,344,344,344,344,344,344,343,344, 87, 87,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+
+/* block 150 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 87, 87, 87, 87,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+
+/* block 151 */
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 152 */
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 153 */
+384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,384,
+384,384,384,384,384,384,384,384,384,384,384,384,384,384, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 154 */
+ 87, 16, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+
+/* block 155 */
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+
+/* block 156 */
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+
+/* block 157 */
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,
+420,420,420,420,420,420,420,420,420,420,420,420,420,420, 87, 87,
+
+};
+
+#if UCD_BLOCK_SIZE != 128
+#error Please correct UCD_BLOCK_SIZE in pcre_internal.h
+#endif

Modified: freeswitch/trunk/libs/pcre/pcre_valid_utf8.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_valid_utf8.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_valid_utf8.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,10 @@
 strings. */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -55,6 +59,13 @@
 can be turned off for maximum performance, but the consequences of supplying
 an invalid string are then undefined.
 
+Originally, this function checked according to RFC 2279, allowing for values in
+the range 0 to 0x7fffffff, up to 6 bytes long, but ensuring that they were in
+the canonical format. Once somebody had pointed out RFC 3629 to me (it
+obsoletes 2279), additional restrictions were applied. The values are now
+limited to be between 0 and 0x0010ffff, no more than 4 bytes long, and the
+subrange 0xd000 to 0xdfff is excluded.
+
 Arguments:
   string       points to the string
   length       length of string, or -1 if the string is zero-terminated
@@ -64,9 +75,10 @@
 */
 
 int
-_pcre_valid_utf8(const uschar *string, int length)
+_pcre_valid_utf8(USPTR string, int length)
 {
-register const uschar *p;
+#ifdef SUPPORT_UTF8
+register USPTR p;
 
 if (length < 0)
   {
@@ -79,32 +91,49 @@
   register int ab;
   register int c = *p;
   if (c < 128) continue;
-  if ((c & 0xc0) != 0xc0) return p - string;
-  ab = _pcre_utf8_table4[c & 0x3f];  /* Number of additional bytes */
-  if (length < ab) return p - string;
+  if (c < 0xc0) return p - string;
+  ab = _pcre_utf8_table4[c & 0x3f];     /* Number of additional bytes */
+  if (length < ab || ab > 3) return p - string;
   length -= ab;
 
   /* Check top bits in the second byte */
   if ((*(++p) & 0xc0) != 0x80) return p - string;
 
-  /* Check for overlong sequences for each different length */
+  /* Check for overlong sequences for each different length, and for the
+  excluded range 0xd000 to 0xdfff.  */
+
   switch (ab)
     {
-    /* Check for xx00 000x */
+    /* Check for xx00 000x (overlong sequence) */
+
     case 1:
     if ((c & 0x3e) == 0) return p - string;
     continue;   /* We know there aren't any more bytes to check */
 
-    /* Check for 1110 0000, xx0x xxxx */
+    /* Check for 1110 0000, xx0x xxxx (overlong sequence) or
+                 1110 1101, 1010 xxxx (0xd000 - 0xdfff) */
+
     case 2:
-    if (c == 0xe0 && (*p & 0x20) == 0) return p - string;
+    if ((c == 0xe0 && (*p & 0x20) == 0) ||
+        (c == 0xed && *p >= 0xa0))
+      return p - string;
     break;
 
-    /* Check for 1111 0000, xx00 xxxx */
+    /* Check for 1111 0000, xx00 xxxx (overlong sequence) or
+       greater than 0x0010ffff (f4 8f bf bf) */
+
     case 3:
-    if (c == 0xf0 && (*p & 0x30) == 0) return p - string;
+    if ((c == 0xf0 && (*p & 0x30) == 0) ||
+        (c > 0xf4 ) ||
+        (c == 0xf4 && *p > 0x8f))
+      return p - string;
     break;
 
+#if 0
+    /* These cases can no longer occur, as we restrict to a maximum of four
+    bytes nowadays. Leave the code here in case we ever want to add an option
+    for longer sequences. */
+
     /* Check for 1111 1000, xx00 0xxx */
     case 4:
     if (c == 0xf8 && (*p & 0x38) == 0) return p - string;
@@ -115,6 +144,8 @@
     if (c == 0xfe || c == 0xff ||
        (c == 0xfc && (*p & 0x3c) == 0)) return p - string;
     break;
+#endif
+
     }
 
   /* Check for valid bytes after the 2nd, if any; all must start 10 */
@@ -123,6 +154,10 @@
     if ((*(++p) & 0xc0) != 0x80) return p - string;
     }
   }
+#else
+(void)(string);  /* Keep picky compilers happy */
+(void)(length);
+#endif
 
 return -1;
 }

Modified: freeswitch/trunk/libs/pcre/pcre_version.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_version.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_version.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -42,6 +42,10 @@
 string that identifies the PCRE version that is in use. */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -49,16 +53,38 @@
 *          Return version string                 *
 *************************************************/
 
+/* These macros are the standard way of turning unquoted text into C strings.
+They allow macros like PCRE_MAJOR to be defined without quotes, which is
+convenient for user programs that want to test its value. */
+
 #define STRING(a)  # a
 #define XSTRING(s) STRING(s)
 
-PCRE_DATA_SCOPE const char *
+/* A problem turned up with PCRE_PRERELEASE, which is defined empty for
+production releases. Originally, it was used naively in this code:
+
+  return XSTRING(PCRE_MAJOR)
+         "." XSTRING(PCRE_MINOR)
+             XSTRING(PCRE_PRERELEASE)
+         " " XSTRING(PCRE_DATE);
+
+However, when PCRE_PRERELEASE is empty, this leads to an attempted expansion of
+STRING(). The C standard states: "If (before argument substitution) any
+argument consists of no preprocessing tokens, the behavior is undefined." It
+turns out the gcc treats this case as a single empty string - which is what we
+really want - but Visual C grumbles about the lack of an argument for the
+macro. Unfortunately, both are within their rights. To cope with both ways of
+handling this, I had resort to some messy hackery that does a test at run time.
+I could find no way of detecting that a macro is defined as an empty string at
+pre-processor time. This hack uses a standard trick for avoiding calling
+the STRING macro with an empty argument when doing the test. */
+
+PCRE_EXP_DEFN const char * PCRE_CALL_CONVENTION
 pcre_version(void)
 {
-return XSTRING(PCRE_MAJOR)
-       "." XSTRING(PCRE_MINOR)
-           XSTRING(PCRE_PRERELEASE)
-       " " XSTRING(PCRE_DATE);
+return (XSTRING(Z PCRE_PRERELEASE)[1] == 0)?
+  XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE) :
+  XSTRING(PCRE_MAJOR.PCRE_MINOR) XSTRING(PCRE_PRERELEASE PCRE_DATE);
 }
 
 /* End of pcre_version.c */

Modified: freeswitch/trunk/libs/pcre/pcre_xclass.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_xclass.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_xclass.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -39,10 +39,13 @@
 
 
 /* This module contains an internal function that is used to match an extended
-class (one that contains characters whose values are > 255). It is used by both
-pcre_exec() and pcre_def_exec(). */
+class. It is used by both pcre_exec() and pcre_def_exec(). */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 
@@ -51,7 +54,7 @@
 *************************************************/
 
 /* This function is called to match a character against an extended class that
-might contain values > 255.
+might contain values > 255 and/or Unicode properties.
 
 Arguments:
   c           the character
@@ -100,8 +103,7 @@
 #ifdef SUPPORT_UCP
   else  /* XCL_PROP & XCL_NOTPROP */
     {
-    int chartype, script;
-    int category = _pcre_ucp_findprop(c, &chartype, &script);
+    const ucd_record *prop = GET_UCD(c);
 
     switch(*data)
       {
@@ -110,20 +112,20 @@
       break;
 
       case PT_LAMP:
-      if ((chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt) ==
+      if ((prop->chartype == ucp_Lu || prop->chartype == ucp_Ll || prop->chartype == ucp_Lt) ==
           (t == XCL_PROP)) return !negated;
       break;
 
       case PT_GC:
-      if ((data[1] == category) == (t == XCL_PROP)) return !negated;
+      if ((data[1] == _pcre_ucp_gentype[prop->chartype]) == (t == XCL_PROP)) return !negated;
       break;
 
       case PT_PC:
-      if ((data[1] == chartype) == (t == XCL_PROP)) return !negated;
+      if ((data[1] == prop->chartype) == (t == XCL_PROP)) return !negated;
       break;
 
       case PT_SC:
-      if ((data[1] == script) == (t == XCL_PROP)) return !negated;
+      if ((data[1] == prop->script) == (t == XCL_PROP)) return !negated;
       break;
 
       /* This should never occur, but compilers may mutter if there is no

Modified: freeswitch/trunk/libs/pcre/pcrecpp.cc
==============================================================================
--- freeswitch/trunk/libs/pcre/pcrecpp.cc	(original)
+++ freeswitch/trunk/libs/pcre/pcrecpp.cc	Mon Jun  8 18:51:30 2009
@@ -29,6 +29,10 @@
 //
 // Author: Sanjay Ghemawat
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -37,13 +41,11 @@
 #include 
 #include 
 #include 
-#include "config.h"
-// We need this to compile the proper dll on windows/msys.  This is copied
-// from pcre_internal.h.  It would probably be better just to include that.
-#define PCRE_DEFINITION  /* Win32 __declspec(export) trigger for .dll */
+
+#include "pcrecpp_internal.h"
 #include "pcre.h"
-#include "pcre_stringpiece.h"
 #include "pcrecpp.h"
+#include "pcre_stringpiece.h"
 
 
 namespace pcrecpp {
@@ -53,7 +55,23 @@
 static const int kVecSize = (1 + kMaxArgs) * 3;  // results + PCRE workspace
 
 // Special object that stands-in for no argument
-Arg no_arg((void*)NULL);
+Arg RE::no_arg((void*)NULL);
+
+// This is for ABI compatibility with old versions of pcre (pre-7.6),
+// which defined a global no_arg variable instead of putting it in the
+// RE class.  This works on GCC >= 3, at least.  It definitely works
+// for ELF, but may not for other object formats (Mach-O, for
+// instance, does not support aliases.)  We could probably have a more
+// inclusive test if we ever needed it.  (Note that not only the
+// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are
+// gnu-specific.)
+#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__)
+# define ULP_AS_STRING(x)            ULP_AS_STRING_INTERNAL(x)
+# define ULP_AS_STRING_INTERNAL(x)   #x
+# define USER_LABEL_PREFIX_STR       ULP_AS_STRING(__USER_LABEL_PREFIX__)
+extern Arg no_arg
+  __attribute__((alias(USER_LABEL_PREFIX_STR "_ZN7pcrecpp2RE6no_argE")));
+#endif
 
 // If a regular expression has no error, its error_ field points here
 static const string empty_string;
@@ -61,7 +79,7 @@
 // If the user doesn't ask for any options, we just use this one
 static RE_Options default_options;
 
-void RE::Init(const char* pat, const RE_Options* options) {
+void RE::Init(const string& pat, const RE_Options* options) {
   pattern_ = pat;
   if (options == NULL) {
     options_ = default_options;
@@ -74,27 +92,22 @@
 
   re_partial_ = Compile(UNANCHORED);
   if (re_partial_ != NULL) {
-    // Check for complicated patterns.  The following change is
-    // conservative in that it may treat some "simple" patterns
-    // as "complex" (e.g., if the vertical bar is in a character
-    // class or is escaped).  But it seems good enough.
-    if (strchr(pat, '|') == NULL) {
-      // Simple pattern: we can use position-based checks to perform
-      // fully anchored matches
-      re_full_ = re_partial_;
-    } else {
-      // We need a special pattern for anchored matches
-      re_full_ = Compile(ANCHOR_BOTH);
-    }
+    re_full_ = Compile(ANCHOR_BOTH);
   }
 }
 
+void RE::Cleanup() {
+  if (re_full_ != NULL)         (*pcre_free)(re_full_);
+  if (re_partial_ != NULL)      (*pcre_free)(re_partial_);
+  if (error_ != &empty_string)  delete error_;
+}
+
+
 RE::~RE() {
-  if (re_full_ != NULL && re_full_ != re_partial_) (*pcre_free)(re_full_);
-  if (re_partial_ != NULL)                         (*pcre_free)(re_partial_);
-  if (error_ != &empty_string)                     delete error_;
+  Cleanup();
 }
 
+
 pcre* RE::Compile(Anchor anchor) {
   // First, convert RE_Options into pcre options
   int pcre_options = 0;
@@ -334,13 +347,17 @@
 
 // Returns PCRE_NEWLINE_CRLF, PCRE_NEWLINE_CR, or PCRE_NEWLINE_LF.
 // Note that PCRE_NEWLINE_CRLF is defined to be P_N_CR | P_N_LF.
+// Modified by PH to add PCRE_NEWLINE_ANY and PCRE_NEWLINE_ANYCRLF.
+
 static int NewlineMode(int pcre_options) {
   // TODO: if we can make it threadsafe, cache this var
   int newline_mode = 0;
   /* if (newline_mode) return newline_mode; */  // do this once it's cached
-  if (pcre_options & (PCRE_NEWLINE_CRLF|PCRE_NEWLINE_CR|PCRE_NEWLINE_LF)) {
+  if (pcre_options & (PCRE_NEWLINE_CRLF|PCRE_NEWLINE_CR|PCRE_NEWLINE_LF|
+                      PCRE_NEWLINE_ANY|PCRE_NEWLINE_ANYCRLF)) {
     newline_mode = (pcre_options &
-                    (PCRE_NEWLINE_CRLF|PCRE_NEWLINE_CR|PCRE_NEWLINE_LF));
+                    (PCRE_NEWLINE_CRLF|PCRE_NEWLINE_CR|PCRE_NEWLINE_LF|
+                     PCRE_NEWLINE_ANY|PCRE_NEWLINE_ANYCRLF));
   } else {
     int newline;
     pcre_config(PCRE_CONFIG_NEWLINE, &newline);
@@ -350,8 +367,12 @@
       newline_mode = PCRE_NEWLINE_CR;
     else if (newline == 3338)
       newline_mode = PCRE_NEWLINE_CRLF;
+    else if (newline == -1)
+      newline_mode = PCRE_NEWLINE_ANY;
+    else if (newline == -2)
+      newline_mode = PCRE_NEWLINE_ANYCRLF;
     else
-      assert("" == "Unexpected return value from pcre_config(NEWLINE)");
+      assert(NULL == "Unexpected return value from pcre_config(NEWLINE)");
   }
   return newline_mode;
 }
@@ -364,7 +385,7 @@
   int start = 0;
   int lastend = -1;
 
-  for (; start <= static_cast(str->length()); count++) {
+  while (start <= static_cast(str->length())) {
     int matches = TryMatch(*str, start, UNANCHORED, vec, kVecSize);
     if (matches <= 0)
       break;
@@ -379,9 +400,13 @@
       // Note it's better to call pcre_fullinfo() than to examine
       // all_options(), since options_ could have changed bewteen
       // compile-time and now, but this is simpler and safe enough.
+      // Modified by PH to add ANY and ANYCRLF.
       if (start+1 < static_cast(str->length()) &&
           (*str)[start] == '\r' && (*str)[start+1] == '\n' &&
-          NewlineMode(options_.all_options()) == PCRE_NEWLINE_CRLF) {
+          (NewlineMode(options_.all_options()) == PCRE_NEWLINE_CRLF ||
+           NewlineMode(options_.all_options()) == PCRE_NEWLINE_ANY ||
+           NewlineMode(options_.all_options()) == PCRE_NEWLINE_ANYCRLF)
+          ) {
         matchend++;
       }
       // We also need to advance more than one char if we're in utf8 mode.
@@ -424,6 +449,40 @@
   return Rewrite(out, rewrite, text, vec, matches);
 }
 
+/*static*/ string RE::QuoteMeta(const StringPiece& unquoted) {
+  string result;
+
+  // Escape any ascii character not in [A-Za-z_0-9].
+  //
+  // Note that it's legal to escape a character even if it has no
+  // special meaning in a regular expression -- so this function does
+  // that.  (This also makes it identical to the perl function of the
+  // same name; see `perldoc -f quotemeta`.)  The one exception is
+  // escaping NUL: rather than doing backslash + NUL, like perl does,
+  // we do '\0', because pcre itself doesn't take embedded NUL chars.
+  for (int ii = 0; ii < unquoted.size(); ++ii) {
+    // Note that using 'isalnum' here raises the benchmark time from
+    // 32ns to 58ns:
+    if (unquoted[ii] == '\0') {
+      result += "\\0";
+    } else if ((unquoted[ii] < 'a' || unquoted[ii] > 'z') &&
+               (unquoted[ii] < 'A' || unquoted[ii] > 'Z') &&
+               (unquoted[ii] < '0' || unquoted[ii] > '9') &&
+               unquoted[ii] != '_' &&
+               // If this is the part of a UTF8 or Latin1 character, we need
+               // to copy this byte without escaping.  Experimentally this is
+               // what works correctly with the regexp library.
+               !(unquoted[ii] & 128)) {
+      result += '\\';
+      result += unquoted[ii];
+    } else {
+      result += unquoted[ii];
+    }
+  }
+
+  return result;
+}
+
 /***** Actual matching and rewriting code *****/
 
 int RE::TryMatch(const StringPiece& text,
@@ -437,7 +496,7 @@
     return 0;
   }
 
-  pcre_extra extra = { 0 };
+  pcre_extra extra = { 0, 0, 0, 0, 0, 0 };
   if (options_.match_limit() > 0) {
     extra.flags |= PCRE_EXTRA_MATCH_LIMIT;
     extra.match_limit = options_.match_limit();
@@ -470,13 +529,6 @@
     rc = vecsize / 2;
   }
 
-  if ((anchor == ANCHOR_BOTH) && (re_full_ == re_partial_)) {
-    // We need an extra check to make sure that the match extended
-    // to the end of the input string
-    assert(vec[0] == 0);                 // PCRE_ANCHORED forces starting match
-    if (vec[1] != text.size()) return 0; // Did not get ending match
-  }
-
   return rc;
 }
 
@@ -553,14 +605,14 @@
         if (start >= 0)
           out->append(text.data() + start, vec[2 * n + 1] - start);
       } else if (c == '\\') {
-        out->push_back('\\');
+        *out += '\\';
       } else {
         //fprintf(stderr, "invalid rewrite pattern: %.*s\n",
         //        rewrite.size(), rewrite.data());
         return false;
       }
     } else {
-      out->push_back(c);
+      *out += c;
     }
   }
   return true;
@@ -588,23 +640,27 @@
 }
 
 bool Arg::parse_string(const char* str, int n, void* dest) {
+  if (dest == NULL) return true;
   reinterpret_cast(dest)->assign(str, n);
   return true;
 }
 
 bool Arg::parse_stringpiece(const char* str, int n, void* dest) {
+  if (dest == NULL) return true;
   reinterpret_cast(dest)->set(str, n);
   return true;
 }
 
 bool Arg::parse_char(const char* str, int n, void* dest) {
   if (n != 1) return false;
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = str[0];
   return true;
 }
 
 bool Arg::parse_uchar(const char* str, int n, void* dest) {
   if (n != 1) return false;
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = str[0];
   return true;
 }
@@ -653,6 +709,7 @@
   long r = strtol(str, &end, radix);
   if (end != str + n) return false;   // Leftover junk
   if (errno) return false;
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = r;
   return true;
 }
@@ -670,6 +727,7 @@
   unsigned long r = strtoul(str, &end, radix);
   if (end != str + n) return false;   // Leftover junk
   if (errno) return false;
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = r;
   return true;
 }
@@ -681,7 +739,8 @@
   long r;
   if (!parse_long_radix(str, n, &r, radix)) return false; // Could not parse
   if (r < SHRT_MIN || r > SHRT_MAX) return false;       // Out of range
-  *(reinterpret_cast(dest)) = r;
+  if (dest == NULL) return true;
+  *(reinterpret_cast(dest)) = static_cast(r);
   return true;
 }
 
@@ -692,7 +751,8 @@
   unsigned long r;
   if (!parse_ulong_radix(str, n, &r, radix)) return false; // Could not parse
   if (r > USHRT_MAX) return false;                      // Out of range
-  *(reinterpret_cast(dest)) = r;
+  if (dest == NULL) return true;
+  *(reinterpret_cast(dest)) = static_cast(r);
   return true;
 }
 
@@ -703,6 +763,7 @@
   long r;
   if (!parse_long_radix(str, n, &r, radix)) return false; // Could not parse
   if (r < INT_MIN || r > INT_MAX) return false;         // Out of range
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = r;
   return true;
 }
@@ -714,6 +775,7 @@
   unsigned long r;
   if (!parse_ulong_radix(str, n, &r, radix)) return false; // Could not parse
   if (r > UINT_MAX) return false;                       // Out of range
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = r;
   return true;
 }
@@ -734,11 +796,14 @@
   long long r = strtoq(str, &end, radix);
 #elif defined HAVE_STRTOLL
   long long r = strtoll(str, &end, radix);
+#elif defined HAVE__STRTOI64
+  long long r = _strtoi64(str, &end, radix);
 #else
 #error parse_longlong_radix: cannot convert input to a long-long
 #endif
   if (end != str + n) return false;   // Leftover junk
   if (errno) return false;
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = r;
   return true;
 #endif   /* HAVE_LONG_LONG */
@@ -761,11 +826,14 @@
   unsigned long long r = strtouq(str, &end, radix);
 #elif defined HAVE_STRTOLL
   unsigned long long r = strtoull(str, &end, radix);
+#elif defined HAVE__STRTOI64
+  unsigned long long r = _strtoui64(str, &end, radix);
 #else
 #error parse_ulonglong_radix: cannot convert input to a long-long
 #endif
   if (end != str + n) return false;   // Leftover junk
   if (errno) return false;
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = r;
   return true;
 #endif   /* HAVE_UNSIGNED_LONG_LONG */
@@ -783,6 +851,7 @@
   double r = strtod(buf, &end);
   if (end != buf + n) return false;   // Leftover junk
   if (errno) return false;
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = r;
   return true;
 }
@@ -790,6 +859,7 @@
 bool Arg::parse_float(const char* str, int n, void* dest) {
   double r;
   if (!parse_double(str, n, &r)) return false;
+  if (dest == NULL) return true;
   *(reinterpret_cast(dest)) = static_cast(r);
   return true;
 }
@@ -809,14 +879,14 @@
     return parse_##name##_radix(str, n, dest, 0);                       \
   }
 
-DEFINE_INTEGER_PARSERS(short);
-DEFINE_INTEGER_PARSERS(ushort);
-DEFINE_INTEGER_PARSERS(int);
-DEFINE_INTEGER_PARSERS(uint);
-DEFINE_INTEGER_PARSERS(long);
-DEFINE_INTEGER_PARSERS(ulong);
-DEFINE_INTEGER_PARSERS(longlong);
-DEFINE_INTEGER_PARSERS(ulonglong);
+DEFINE_INTEGER_PARSERS(short)      /*                                   */
+DEFINE_INTEGER_PARSERS(ushort)     /*                                   */
+DEFINE_INTEGER_PARSERS(int)        /* Don't use semicolons after these  */
+DEFINE_INTEGER_PARSERS(uint)       /* statements because they can cause */
+DEFINE_INTEGER_PARSERS(long)       /* compiler warnings if the checking */
+DEFINE_INTEGER_PARSERS(ulong)      /* level is turned up high enough.   */
+DEFINE_INTEGER_PARSERS(longlong)   /*                                   */
+DEFINE_INTEGER_PARSERS(ulonglong)  /*                                   */
 
 #undef DEFINE_INTEGER_PARSERS
 

Modified: freeswitch/trunk/libs/pcre/pcrecpp.h
==============================================================================
--- freeswitch/trunk/libs/pcre/pcrecpp.h	(original)
+++ freeswitch/trunk/libs/pcre/pcrecpp.h	Mon Jun  8 18:51:30 2009
@@ -112,6 +112,12 @@
 //    T             (where "bool T::ParseFrom(const char*, int)" exists)
 //    NULL          (the corresponding matched sub-pattern is not copied)
 //
+// CAVEAT: An optional sub-pattern that does not exist in the matched
+// string is assigned the empty string.  Therefore, the following will
+// return false (because the empty string is not a valid number):
+//    int number;
+//    pcrecpp::RE::FullMatch("abc", "[a-z]+(\\d+)?", &number);
+//
 // -----------------------------------------------------------------------
 // DO_MATCH
 //
@@ -325,11 +331,10 @@
 
 
 #include 
-#include    // defines the Arg class
-// These aren't technically needed here, but we include them
-// anyway so folks who include pcrecpp.h don't have to include
-// all these other header files as well.
 #include 
+#include    // defines the Arg class
+// This isn't technically needed here, but we include it
+// anyway so folks who include pcrecpp.h don't have to.
 #include 
 
 namespace pcrecpp {
@@ -341,16 +346,13 @@
 #define PCRE_IS_SET(o)  \
         (all_options_ & o) == o
 
-// We convert user-passed pointers into special Arg objects
-extern Arg no_arg;
-
 /***** Compiling regular expressions: the RE class *****/
 
 // RE_Options allow you to set options to be passed along to pcre,
 // along with other options we put on top of pcre.
 // Only 9 modifiers, plus match_limit and match_limit_recursion,
 // are supported now.
-class RE_Options {
+class PCRECPP_EXP_DEFN RE_Options {
  public:
   // constructor
   RE_Options() : match_limit_(0), match_limit_recursion_(0), all_options_(0) {}
@@ -398,25 +400,25 @@
     return PCRE_IS_SET(PCRE_DOTALL);
   }
   RE_Options &set_dotall(bool x) {
-    PCRE_SET_OR_CLEAR(x,PCRE_DOTALL);
+    PCRE_SET_OR_CLEAR(x, PCRE_DOTALL);
   }
 
   bool extended() const {
     return PCRE_IS_SET(PCRE_EXTENDED);
   }
   RE_Options &set_extended(bool x) {
-    PCRE_SET_OR_CLEAR(x,PCRE_EXTENDED);
+    PCRE_SET_OR_CLEAR(x, PCRE_EXTENDED);
   }
 
   bool dollar_endonly() const {
     return PCRE_IS_SET(PCRE_DOLLAR_ENDONLY);
   }
   RE_Options &set_dollar_endonly(bool x) {
-    PCRE_SET_OR_CLEAR(x,PCRE_DOLLAR_ENDONLY);
+    PCRE_SET_OR_CLEAR(x, PCRE_DOLLAR_ENDONLY);
   }
 
   bool extra() const {
-    return PCRE_IS_SET( PCRE_EXTRA);
+    return PCRE_IS_SET(PCRE_EXTRA);
   }
   RE_Options &set_extra(bool x) {
     PCRE_SET_OR_CLEAR(x, PCRE_EXTRA);
@@ -482,14 +484,37 @@
 // Interface for regular expression matching.  Also corresponds to a
 // pre-compiled regular expression.  An "RE" object is safe for
 // concurrent use by multiple threads.
-class RE {
+class PCRECPP_EXP_DEFN RE {
  public:
   // We provide implicit conversions from strings so that users can
   // pass in a string or a "const char*" wherever an "RE" is expected.
+  RE(const string& pat) { Init(pat, NULL); }
+  RE(const string& pat, const RE_Options& option) { Init(pat, &option); }
   RE(const char* pat) { Init(pat, NULL); }
-  RE(const char *pat, const RE_Options& option) { Init(pat, &option); }
-  RE(const string& pat) { Init(pat.c_str(), NULL); }
-  RE(const string& pat, const RE_Options& option) { Init(pat.c_str(), &option); }
+  RE(const char* pat, const RE_Options& option) { Init(pat, &option); }
+  RE(const unsigned char* pat) {
+    Init(reinterpret_cast(pat), NULL);
+  }
+  RE(const unsigned char* pat, const RE_Options& option) {
+    Init(reinterpret_cast(pat), &option);
+  }
+
+  // Copy constructor & assignment - note that these are expensive
+  // because they recompile the expression.
+  RE(const RE& re) { Init(re.pattern_, &re.options_); }
+  const RE& operator=(const RE& re) {
+    if (this != &re) {
+      Cleanup();
+
+      // This is the code that originally came from Google
+      // Init(re.pattern_.c_str(), &re.options_);
+
+      // This is the replacement from Ari Pollak
+      Init(re.pattern_, &re.options_);
+    }
+    return *this;
+  }
+
 
   ~RE();
 
@@ -589,6 +614,18 @@
                const StringPiece &text,
                string *out) const;
 
+  // Escapes all potentially meaningful regexp characters in
+  // 'unquoted'.  The returned string, used as a regular expression,
+  // will exactly match the original string.  For example,
+  //           1.5-2.0?
+  // may become:
+  //           1\.5\-2\.0\?
+  // Note QuoteMeta behaves the same as perl's QuoteMeta function,
+  // *except* that it escapes the NUL character (\0) as backslash + 0,
+  // rather than backslash + NUL.
+  static string QuoteMeta(const StringPiece& unquoted);
+
+
   /***** Generic matching interface *****/
 
   // Type of match (TODO: Should be restructured as part of RE_Options)
@@ -609,9 +646,19 @@
   // regexp wasn't valid on construction.
   int NumberOfCapturingGroups() const;
 
+  // The default value for an argument, to indicate the end of the argument
+  // list. This must be used only in optional argument defaults. It should NOT
+  // be passed explicitly. Some people have tried to use it like this:
+  //
+  //   FullMatch(x, y, &z, no_arg, &w);
+  //
+  // This is a mistake, and will not work.
+  static Arg no_arg;
+
  private:
 
-  void Init(const char* pattern, const RE_Options* options);
+  void Init(const string& pattern, const RE_Options* options);
+  void Cleanup();
 
   // Match against "text", filling in "vec" (up to "vecsize" * 2/3) with
   // pairs of integers for the beginning and end positions of matched
@@ -655,11 +702,6 @@
   pcre*         re_full_;       // For full matches
   pcre*         re_partial_;    // For partial matches
   const string* error_;         // Error indicator (or points to empty string)
-
-  // Don't allow the default copy or assignment constructors --
-  // they're expensive and too easy to do by accident.
-  RE(const RE&);
-  void operator=(const RE&);
 };
 
 }   // namespace pcrecpp

Added: freeswitch/trunk/libs/pcre/pcrecpp_internal.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/pcrecpp_internal.h	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,71 @@
+/*************************************************
+*       Perl-Compatible Regular Expressions      *
+*************************************************/
+
+/*
+Copyright (c) 2005, Google Inc.
+All rights reserved.
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+#ifndef PCRECPP_INTERNAL_H
+#define PCRECPP_INTERNAL_H
+
+/* When compiling a DLL for Windows, the exported symbols have to be declared
+using some MS magic. I found some useful information on this web page:
+http://msdn2.microsoft.com/en-us/library/y4h7bcy6(VS.80).aspx. According to the
+information there, using __declspec(dllexport) without "extern" we have a
+definition; with "extern" we have a declaration. The settings here override the
+setting in pcre.h. We use:
+
+  PCRECPP_EXP_DECL       for declarations
+  PCRECPP_EXP_DEFN       for definitions of exported functions
+
+*/
+
+#ifndef PCRECPP_EXP_DECL
+#  ifdef _WIN32
+#    ifndef PCRE_STATIC
+#      define PCRECPP_EXP_DECL       extern __declspec(dllexport)
+#      define PCRECPP_EXP_DEFN       __declspec(dllexport)
+#    else
+#      define PCRECPP_EXP_DECL       extern
+#      define PCRECPP_EXP_DEFN
+#    endif
+#  else
+#    define PCRECPP_EXP_DECL         extern
+#    define PCRECPP_EXP_DEFN
+#  endif
+#endif
+
+#endif  /* PCRECPP_INTERNAL_H */
+
+/* End of pcrecpp_internal.h */

Modified: freeswitch/trunk/libs/pcre/pcrecpp_unittest.cc
==============================================================================
--- freeswitch/trunk/libs/pcre/pcrecpp_unittest.cc	(original)
+++ freeswitch/trunk/libs/pcre/pcrecpp_unittest.cc	Mon Jun  8 18:51:30 2009
@@ -1,4 +1,6 @@
-// Copyright (c) 2005, Google Inc.
+// -*- coding: utf-8 -*-
+//
+// Copyright (c) 2005 - 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -31,10 +33,13 @@
 //
 // TODO: Test extractions for PartialMatch/Consume
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
-#include "config.h"
 #include "pcrecpp.h"
 
 using pcrecpp::StringPiece;
@@ -105,8 +110,8 @@
       initial_size = VirtualProcessSize();
       printf("Size after 50000: %llu\n", initial_size);
     }
-    char buf[100];
-    snprintf(buf, sizeof(buf), "pat%09d", i);
+    char buf[100];  // definitely big enough
+    sprintf(buf, "pat%09d", i);
     RE newre(buf);
   }
   uint64 final_size = VirtualProcessSize();
@@ -208,87 +213,103 @@
     const char *original;
     const char *single;
     const char *global;
+    int global_count;         // the expected return value from ReplaceAll
   };
   static const ReplaceTest tests[] = {
     { "(qu|[b-df-hj-np-tv-z]*)([a-z]+)",
       "\\2\\1ay",
       "the quick brown fox jumps over the lazy dogs.",
       "ethay quick brown fox jumps over the lazy dogs.",
-      "ethay ickquay ownbray oxfay umpsjay overay ethay azylay ogsday." },
+      "ethay ickquay ownbray oxfay umpsjay overay ethay azylay ogsday.",
+      9 },
     { "\\w+",
       "\\0-NOSPAM",
       "paul.haahr at google.com",
       "paul-NOSPAM.haahr at google.com",
-      "paul-NOSPAM.haahr-NOSPAM at google-NOSPAM.com-NOSPAM" },
+      "paul-NOSPAM.haahr-NOSPAM at google-NOSPAM.com-NOSPAM",
+      4 },
     { "^",
       "(START)",
       "foo",
       "(START)foo",
-      "(START)foo" },
+      "(START)foo",
+      1 },
     { "^",
       "(START)",
       "",
       "(START)",
-      "(START)" },
+      "(START)",
+      1 },
     { "$",
       "(END)",
       "",
       "(END)",
-      "(END)" },
+      "(END)",
+      1 },
     { "b",
       "bb",
       "ababababab",
       "abbabababab",
-      "abbabbabbabbabb" },
+      "abbabbabbabbabb",
+       5 },
     { "b",
       "bb",
       "bbbbbb",
       "bbbbbbb",
-      "bbbbbbbbbbbb" },
+      "bbbbbbbbbbbb",
+      6 },
     { "b+",
       "bb",
       "bbbbbb",
       "bb",
-      "bb" },
+      "bb",
+      1 },
     { "b*",
       "bb",
       "bbbbbb",
       "bb",
-      "bb" },
+      "bb",
+      1 },
     { "b*",
       "bb",
       "aaaaa",
       "bbaaaaa",
-      "bbabbabbabbabbabb" },
+      "bbabbabbabbabbabb",
+      6 },
     { "b*",
       "bb",
       "aa\naa\n",
       "bbaa\naa\n",
-      "bbabbabb\nbbabbabb\nbb" },
+      "bbabbabb\nbbabbabb\nbb",
+      7 },
     { "b*",
       "bb",
       "aa\raa\r",
       "bbaa\raa\r",
-      "bbabbabb\rbbabbabb\rbb" },
+      "bbabbabb\rbbabbabb\rbb",
+      7 },
     { "b*",
       "bb",
       "aa\r\naa\r\n",
       "bbaa\r\naa\r\n",
-      "bbabbabb\r\nbbabbabb\r\nbb" },
+      "bbabbabb\r\nbbabbabb\r\nbb",
+      7 },
 #ifdef SUPPORT_UTF8
     { "b*",
       "bb",
       "\xE3\x83\x9B\xE3\x83\xBC\xE3\x83\xA0\xE3\x81\xB8",   // utf8
       "bb\xE3\x83\x9B\xE3\x83\xBC\xE3\x83\xA0\xE3\x81\xB8",
-      "bb\xE3\x83\x9B""bb""\xE3\x83\xBC""bb""\xE3\x83\xA0""bb""\xE3\x81\xB8""bb" },
+      "bb\xE3\x83\x9B""bb""\xE3\x83\xBC""bb""\xE3\x83\xA0""bb""\xE3\x81\xB8""bb",
+      5 },
     { "b*",
       "bb",
       "\xE3\x83\x9B\r\n\xE3\x83\xBC\r\xE3\x83\xA0\n\xE3\x81\xB8\r\n",   // utf8
       "bb\xE3\x83\x9B\r\n\xE3\x83\xBC\r\xE3\x83\xA0\n\xE3\x81\xB8\r\n",
       ("bb\xE3\x83\x9B""bb\r\nbb""\xE3\x83\xBC""bb\rbb""\xE3\x83\xA0"
-       "bb\nbb""\xE3\x81\xB8""bb\r\nbb") },
+       "bb\nbb""\xE3\x81\xB8""bb\r\nbb"),
+      9 },
 #endif
-    { "", NULL, NULL, NULL, NULL }
+    { "", NULL, NULL, NULL, NULL, 0 }
   };
 
 #ifdef SUPPORT_UTF8
@@ -304,8 +325,9 @@
     CHECK(re.Replace(t->rewrite, &one));
     CHECK_EQ(one, t->single);
     string all(t->original);
-    CHECK(re.GlobalReplace(t->rewrite, &all) > 0);
+    const int replace_count = re.GlobalReplace(t->rewrite, &all);
     CHECK_EQ(all, t->global);
+    CHECK_EQ(replace_count, t->global_count);
   }
 
   // One final test: test \r\n replacement when we're not in CRLF mode
@@ -313,14 +335,14 @@
     RE re("b*", RE_Options(PCRE_NEWLINE_CR).set_utf8(support_utf8));
     assert(re.error().empty());
     string all("aa\r\naa\r\n");
-    CHECK(re.GlobalReplace("bb", &all) > 0);
+    CHECK_EQ(re.GlobalReplace("bb", &all), 9);
     CHECK_EQ(all, string("bbabbabb\rbb\nbbabbabb\rbb\nbb"));
   }
   {
     RE re("b*", RE_Options(PCRE_NEWLINE_LF).set_utf8(support_utf8));
     assert(re.error().empty());
     string all("aa\r\naa\r\n");
-    CHECK(re.GlobalReplace("bb", &all) > 0);
+    CHECK_EQ(re.GlobalReplace("bb", &all), 9);
     CHECK_EQ(all, string("bbabbabb\rbb\nbbabbabb\rbb\nbb"));
   }
   // TODO: test what happens when no PCRE_NEWLINE_* flag is set.
@@ -445,6 +467,81 @@
   CHECK(re4.FullMatch(text_bad) == false);
 }
 
+// A meta-quoted string, interpreted as a pattern, should always match
+// the original unquoted string.
+static void TestQuoteMeta(string unquoted, RE_Options options = RE_Options()) {
+  string quoted = RE::QuoteMeta(unquoted);
+  RE re(quoted, options);
+  CHECK(re.FullMatch(unquoted));
+}
+
+// A string containing meaningful regexp characters, which is then meta-
+// quoted, should not generally match a string the unquoted string does.
+static void NegativeTestQuoteMeta(string unquoted, string should_not_match,
+                                  RE_Options options = RE_Options()) {
+  string quoted = RE::QuoteMeta(unquoted);
+  RE re(quoted, options);
+  CHECK(!re.FullMatch(should_not_match));
+}
+
+// Tests that quoted meta characters match their original strings,
+// and that a few things that shouldn't match indeed do not.
+static void TestQuotaMetaSimple() {
+  TestQuoteMeta("foo");
+  TestQuoteMeta("foo.bar");
+  TestQuoteMeta("foo\\.bar");
+  TestQuoteMeta("[1-9]");
+  TestQuoteMeta("1.5-2.0?");
+  TestQuoteMeta("\\d");
+  TestQuoteMeta("Who doesn't like ice cream?");
+  TestQuoteMeta("((a|b)c?d*e+[f-h]i)");
+  TestQuoteMeta("((?!)xxx).*yyy");
+  TestQuoteMeta("([");
+  TestQuoteMeta(string("foo\0bar", 7));
+}
+
+static void TestQuoteMetaSimpleNegative() {
+  NegativeTestQuoteMeta("foo", "bar");
+  NegativeTestQuoteMeta("...", "bar");
+  NegativeTestQuoteMeta("\\.", ".");
+  NegativeTestQuoteMeta("\\.", "..");
+  NegativeTestQuoteMeta("(a)", "a");
+  NegativeTestQuoteMeta("(a|b)", "a");
+  NegativeTestQuoteMeta("(a|b)", "(a)");
+  NegativeTestQuoteMeta("(a|b)", "a|b");
+  NegativeTestQuoteMeta("[0-9]", "0");
+  NegativeTestQuoteMeta("[0-9]", "0-9");
+  NegativeTestQuoteMeta("[0-9]", "[9]");
+  NegativeTestQuoteMeta("((?!)xxx)", "xxx");
+}
+
+static void TestQuoteMetaLatin1() {
+  TestQuoteMeta("3\xb2 = 9");
+}
+
+static void TestQuoteMetaUtf8() {
+#ifdef SUPPORT_UTF8
+  TestQuoteMeta("Pl\xc3\xa1\x63ido Domingo", pcrecpp::UTF8());
+  TestQuoteMeta("xyz", pcrecpp::UTF8());            // No fancy utf8
+  TestQuoteMeta("\xc2\xb0", pcrecpp::UTF8());       // 2-byte utf8 (degree symbol)
+  TestQuoteMeta("27\xc2\xb0 degrees", pcrecpp::UTF8());  // As a middle character
+  TestQuoteMeta("\xe2\x80\xb3", pcrecpp::UTF8());   // 3-byte utf8 (double prime)
+  TestQuoteMeta("\xf0\x9d\x85\x9f", pcrecpp::UTF8()); // 4-byte utf8 (music note)
+  TestQuoteMeta("27\xc2\xb0"); // Interpreted as Latin-1, but should still work
+  NegativeTestQuoteMeta("27\xc2\xb0",               // 2-byte utf (degree symbol)
+                        "27\\\xc2\\\xb0",
+                        pcrecpp::UTF8());
+#endif
+}
+
+static void TestQuoteMetaAll() {
+  printf("Testing QuoteMeta\n");
+  TestQuotaMetaSimple();
+  TestQuoteMetaSimpleNegative();
+  TestQuoteMetaLatin1();
+  TestQuoteMetaUtf8();
+}
+
 //
 // Options tests contributed by
 // Giuseppe Maxia, CTO, Stardata s.r.l.
@@ -667,6 +764,35 @@
   Test_all_options();
 }
 
+static void TestConstructors() {
+  printf("Testing constructors\n");
+
+  RE_Options options;
+  options.set_dotall(true);
+  const char *str = "HELLO\n" "cruel\n" "world";
+
+  RE orig("HELLO.*world", options);
+  CHECK(orig.FullMatch(str));
+
+  RE copy1(orig);
+  CHECK(copy1.FullMatch(str));
+
+  RE copy2("not a match");
+  CHECK(!copy2.FullMatch(str));
+  copy2 = copy1;
+  CHECK(copy2.FullMatch(str));
+  copy2 = orig;
+  CHECK(copy2.FullMatch(str));
+
+  // Make sure when we assign to ourselves, nothing bad happens
+  orig = orig;
+  copy1 = copy1;
+  copy2 = copy2;
+  CHECK(orig.FullMatch(str));
+  CHECK(copy1.FullMatch(str));
+  CHECK(copy2.FullMatch(str));
+}
+
 int main(int argc, char** argv) {
   // Treat any flag as --help
   if (argc > 1 && argv[1][0] == '-') {
@@ -701,8 +827,11 @@
   /***** FullMatch with no args *****/
 
   CHECK(RE("h.*o").FullMatch("hello"));
-  CHECK(!RE("h.*o").FullMatch("othello"));
-  CHECK(!RE("h.*o").FullMatch("hello!"));
+  CHECK(!RE("h.*o").FullMatch("othello"));     // Must be anchored at front
+  CHECK(!RE("h.*o").FullMatch("hello!"));      // Must be anchored at end
+  CHECK(RE("a*").FullMatch("aaaa"));           // Fullmatch with normal op
+  CHECK(RE("a*?").FullMatch("aaaa"));          // Fullmatch with nongreedy op
+  CHECK(RE("a*?\\z").FullMatch("aaaa"));       // Two unusual ops
 
   /***** FullMatch with args *****/
 
@@ -746,6 +875,24 @@
   CHECK_EQ(s, string("ruby"));
   CHECK_EQ(i, 1234);
 
+  // Ignore non-void* NULL arg
+  CHECK(RE("he(.*)lo").FullMatch("hello", (char*)NULL));
+  CHECK(RE("h(.*)o").FullMatch("hello", (string*)NULL));
+  CHECK(RE("h(.*)o").FullMatch("hello", (StringPiece*)NULL));
+  CHECK(RE("(.*)").FullMatch("1234", (int*)NULL));
+#ifdef HAVE_LONG_LONG
+  CHECK(RE("(.*)").FullMatch("1234567890123456", (long long*)NULL));
+#endif
+  CHECK(RE("(.*)").FullMatch("123.4567890123456", (double*)NULL));
+  CHECK(RE("(.*)").FullMatch("123.4567890123456", (float*)NULL));
+
+  // Fail on non-void* NULL arg if the match doesn't parse for the given type.
+  CHECK(!RE("h(.*)lo").FullMatch("hello", &s, (char*)NULL));
+  CHECK(!RE("(.*)").FullMatch("hello", (int*)NULL));
+  CHECK(!RE("(.*)").FullMatch("1234567890123456", (int*)NULL));
+  CHECK(!RE("(.*)").FullMatch("hello", (double*)NULL));
+  CHECK(!RE("(.*)").FullMatch("hello", (float*)NULL));
+
   // Ignored arg
   CHECK(RE("(\\w+)(:)(\\d+)").FullMatch("ruby:1234", &s, (void*)NULL, &i));
   CHECK_EQ(s, string("ruby"));
@@ -797,27 +944,34 @@
     CHECK(!RE("(\\d+)").FullMatch("4294967296", &v));
   }
 #ifdef HAVE_LONG_LONG
+# if defined(__MINGW__) || defined(__MINGW32__)
+#   define LLD "%I64d"
+#   define LLU "%I64u"
+# else
+#   define LLD "%lld"
+#   define LLU "%llu"
+# endif
   {
     long long v;
     static const long long max_value = 0x7fffffffffffffffLL;
     static const long long min_value = -max_value - 1;
-    char buf[32];
+    char buf[32];  // definitely big enough for a long long
 
     CHECK(RE("(-?\\d+)").FullMatch("100", &v)); CHECK_EQ(v, 100);
     CHECK(RE("(-?\\d+)").FullMatch("-100",&v)); CHECK_EQ(v, -100);
 
-    snprintf(buf, sizeof(buf), "%lld", max_value);
+    sprintf(buf, LLD, max_value);
     CHECK(RE("(-?\\d+)").FullMatch(buf,&v)); CHECK_EQ(v, max_value);
 
-    snprintf(buf, sizeof(buf), "%lld", min_value);
+    sprintf(buf, LLD, min_value);
     CHECK(RE("(-?\\d+)").FullMatch(buf,&v)); CHECK_EQ(v, min_value);
 
-    snprintf(buf, sizeof(buf), "%lld", max_value);
+    sprintf(buf, LLD, max_value);
     assert(buf[strlen(buf)-1] != '9');
     buf[strlen(buf)-1]++;
     CHECK(!RE("(-?\\d+)").FullMatch(buf, &v));
 
-    snprintf(buf, sizeof(buf), "%lld", min_value);
+    sprintf(buf, LLD, min_value);
     assert(buf[strlen(buf)-1] != '9');
     buf[strlen(buf)-1]++;
     CHECK(!RE("(-?\\d+)").FullMatch(buf, &v));
@@ -828,12 +982,12 @@
     unsigned long long v;
     long long v2;
     static const unsigned long long max_value = 0xffffffffffffffffULL;
-    char buf[32];
+    char buf[32];  // definitely big enough for a unsigned long long
 
     CHECK(RE("(-?\\d+)").FullMatch("100",&v)); CHECK_EQ(v, 100);
     CHECK(RE("(-?\\d+)").FullMatch("-100",&v2)); CHECK_EQ(v2, -100);
 
-    snprintf(buf, sizeof(buf), "%llu", max_value);
+    sprintf(buf, LLU, max_value);
     CHECK(RE("(-?\\d+)").FullMatch(buf,&v)); CHECK_EQ(v, max_value);
 
     assert(buf[strlen(buf)-1] != '9');
@@ -985,11 +1139,14 @@
   CHECK(RE("h.*o").PartialMatch("hello!"));
   CHECK(RE("((((((((((((((((((((x))))))))))))))))))))").PartialMatch("x"));
 
+  /***** other tests *****/
+
   RadixTests();
   TestReplace();
   TestExtract();
   TestConsume();
   TestFindAndConsume();
+  TestQuoteMetaAll();
   TestMatchNumberPeculiarity();
 
   // Check the pattern() accessor
@@ -1011,13 +1168,13 @@
     printf("Testing UTF-8 handling\n");
 
     // Three Japanese characters (nihongo)
-    const char utf8_string[] = {
+    const unsigned char utf8_string[] = {
          0xe6, 0x97, 0xa5, // 65e5
          0xe6, 0x9c, 0xac, // 627c
          0xe8, 0xaa, 0x9e, // 8a9e
          0
     };
-    const char utf8_pattern[] = {
+    const unsigned char utf8_pattern[] = {
          '.',
          0xe6, 0x9c, 0xac, // 627c
          '.',
@@ -1109,6 +1266,9 @@
     VERBOSE_TEST  = true;
   TestOptions();
 
+  // Test the constructors
+  TestConstructors();
+
   // Done
   printf("OK\n");
 

Modified: freeswitch/trunk/libs/pcre/pcrecpparg.h.in
==============================================================================
--- freeswitch/trunk/libs/pcre/pcrecpparg.h.in	(original)
+++ freeswitch/trunk/libs/pcre/pcrecpparg.h.in	Mon Jun  8 18:51:30 2009
@@ -35,6 +35,8 @@
 #include     // for NULL
 #include 
 
+#include 
+
 namespace pcrecpp {
 
 class StringPiece;
@@ -46,12 +48,13 @@
 class _RE_MatchObject {
  public:
   static inline bool Parse(const char* str, int n, void* dest) {
+    if (dest == NULL) return true;
     T* object = reinterpret_cast(dest);
     return object->ParseFrom(str, n);
   }
 };
 
-class Arg {
+class PCRECPP_EXP_DEFN Arg {
  public:
   // Empty constructor so we can declare arrays of Arg
   Arg();
@@ -148,17 +151,17 @@
   inline Arg CRadix(type* ptr) { \
     return Arg(ptr, Arg::parse_ ## name ## _cradix); }
 
-MAKE_INTEGER_PARSER(short,              short);
-MAKE_INTEGER_PARSER(unsigned short,     ushort);
-MAKE_INTEGER_PARSER(int,                int);
-MAKE_INTEGER_PARSER(unsigned int,       uint);
-MAKE_INTEGER_PARSER(long,               long);
-MAKE_INTEGER_PARSER(unsigned long,      ulong);
-#if @pcre_have_long_long@
-MAKE_INTEGER_PARSER(long long,          longlong);
-#endif
-#if @pcre_have_ulong_long@
-MAKE_INTEGER_PARSER(unsigned long long, ulonglong);
+MAKE_INTEGER_PARSER(short,              short)     /*                        */
+MAKE_INTEGER_PARSER(unsigned short,     ushort)    /*                        */
+MAKE_INTEGER_PARSER(int,                int)       /* Don't use semicolons   */
+MAKE_INTEGER_PARSER(unsigned int,       uint)      /* after these statement  */
+MAKE_INTEGER_PARSER(long,               long)      /* because they can cause */
+MAKE_INTEGER_PARSER(unsigned long,      ulong)     /* compiler warnings if   */
+#if @pcre_have_long_long@                          /* the checking level is  */
+MAKE_INTEGER_PARSER(long long,          longlong)  /* turned up high enough. */
+#endif                                             /*                        */
+#if @pcre_have_ulong_long@                         /*                        */
+MAKE_INTEGER_PARSER(unsigned long long, ulonglong) /*                        */
 #endif
 
 #undef PCRE_IS_SET

Modified: freeswitch/trunk/libs/pcre/pcredemo.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcredemo.c	(original)
+++ freeswitch/trunk/libs/pcre/pcredemo.c	Mon Jun  8 18:51:30 2009
@@ -4,17 +4,27 @@
 
 /* This is a demonstration program to illustrate the most straightforward ways
 of calling the PCRE regular expression library from a C program. See the
-pcresample documentation for a short discussion.
+pcresample documentation for a short discussion ("man pcresample" if you have
+the PCRE man pages installed).
+
+In Unix-like environments, compile this program thuswise:
 
-Compile thuswise:
   gcc -Wall pcredemo.c -I/usr/local/include -L/usr/local/lib \
     -R/usr/local/lib -lpcre
 
 Replace "/usr/local/include" and "/usr/local/lib" with wherever the include and
-library files for PCRE are installed on your system. Only some operating
+library files for PCRE are installed on your system. You don't need -I and -L
+if PCRE is installed in the standard system libraries. Only some operating
 systems (e.g. Solaris) use the -R option.
-*/
 
+Building under Windows:
+
+If you want to statically link this program against a non-dll .a file, you must
+define PCRE_STATIC before including pcre.h, otherwise the pcre_malloc() and
+pcre_free() exported functions will be declared __declspec(dllimport), with
+unwanted results. So in this environment, uncomment the following line. */
+
+/* #define PCRE_STATIC */
 
 #include 
 #include 
@@ -128,8 +138,8 @@
 
 /*************************************************************************
 * We have found the first match within the subject string. If the output *
-* vector wasn't big enough, set its size to the maximum. Then output any *
-* substrings that were captured.                                         *
+* vector wasn't big enough, say so. Then output any substrings that were *
+* captured.                                                              *
 *************************************************************************/
 
 /* The output vector wasn't big enough */
@@ -154,7 +164,7 @@
 /**************************************************************************
 * That concludes the basic part of this demonstration program. We have    *
 * compiled a pattern, and performed a single match. The code that follows *
-* first shows how to access named substrings, and then how to code for    *
+* shows first how to access named substrings, and then how to code for    *
 * repeated matches on the same subject.                                   *
 **************************************************************************/
 

Added: freeswitch/trunk/libs/pcre/pcregexp.pas
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/pcregexp.pas	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,820 @@
+{
+  pcRegExp - Perl compatible regular expressions for Virtual Pascal
+  (c) 2001 Peter S. Voronov aka Chem O'Dun 
+
+  Based on PCRE library interface unit for Virtual Pascal.
+  (c) 2001 Alexander Tokarev 
+
+  The current PCRE version is: 3.7
+
+  This software must be distributed as Freeware.
+
+  The PCRE library is written by: Philip Hazel 
+  Copyright (c) 1997-2004 University of Cambridge
+
+  AngelsHolocaust 4-11-04 updated to use version v5.0
+  (INFO: this is regex-directed, NFA)
+  AH:  9-11-04 - pcre_free: removed var, pcre already gives the ptr, now
+			    everything works as it should (no more crashes)
+		 -> removed CheckRegExp because pcre handles errors perfectly
+      10-11-04 - added pcError (errorhandling), pcInit
+      13-11-04 - removed the ErrorPos = 0 check -> always print erroroffset
+      17-10-05 - support for \1-\9 backreferences in TpcRegExp.GetReplStr
+      17-02-06 - added RunTimeOptions: caller can set options while searching
+      19-02-06 - added SearchOfs(): let PCRE use the complete string and offset
+		 into the string itself
+      20-12-06 - support for version 7.0
+      27.08.08 - support for v7.7
+}
+
+{$H+} {$DEFINE PCRE_3_7} {$DEFINE PCRE_5_0} {$DEFINE PCRE_7_0} {$DEFINE PCRE_7_7}
+
+Unit pcregexp;
+
+Interface
+
+uses objects;
+
+Type
+ PpcRegExp = ^TpcRegExp;
+// TpcRegExp = object
+ TpcRegExp = object(TObject)
+  MatchesCount: integer;
+  RegExpC, RegExpExt : Pointer;
+  Matches:Pointer;
+  RegExp: shortstring;
+  SourceLen: integer;
+  PartialMatch : boolean;
+  Error : boolean;
+  ErrorMsg : Pchar;
+  ErrorPos : integer;
+  RunTimeOptions: Integer; // options which can be set by the caller
+  constructor Init(const ARegExp : shortstring; AOptions : integer; ALocale : Pointer);
+  function Search(AStr: Pchar; ALen : longint) : boolean; virtual;
+  function SearchNext( AStr: Pchar; ALen : longint) : boolean; virtual;
+  function SearchOfs ( AStr: Pchar; ALen, AOfs : longint) : boolean; virtual;
+  function MatchSub(ANom: integer; var Pos, Len : longint) : boolean; virtual;
+  function MatchFull(var Pos, Len : longint) : boolean; virtual;
+  function GetSubStr(ANom: integer; AStr: Pchar) : string; virtual;
+  function GetFullStr(AStr: Pchar) : string; virtual;
+  function GetReplStr(AStr: Pchar; const ARepl: string) : string; virtual;
+  function GetPreSubStr(AStr: Pchar) : string; virtual;
+  function GetPostSubStr(AStr: Pchar) : string; virtual;
+  function ErrorStr : string; virtual;
+  destructor Done; virtual;
+ end;
+
+ function pcGrepMatch(WildCard, aStr: string; AOptions:integer; ALocale : Pointer): Boolean;
+ function pcGrepSub(WildCard, aStr, aRepl: string; AOptions:integer; ALocale : Pointer): string;
+
+ function pcFastGrepMatch(WildCard, aStr: string): Boolean;
+ function pcFastGrepSub(WildCard, aStr, aRepl: string): string;
+
+{$IFDEF PCRE_5_0}
+ function pcGetVersion : pchar;
+{$ENDIF}
+
+ function pcError (var pRegExp : Pointer) : Boolean;
+ function pcInit  (const Pattern: Shortstring; CaseSens: Boolean) : Pointer;
+
+Const { Options }
+ PCRE_CASELESS         = $0001;
+ PCRE_MULTILINE        = $0002;
+ PCRE_DOTALL           = $0004;
+ PCRE_EXTENDED         = $0008;
+ PCRE_ANCHORED         = $0010;
+ PCRE_DOLLAR_ENDONLY   = $0020;
+ PCRE_EXTRA            = $0040;
+ PCRE_NOTBOL           = $0080;
+ PCRE_NOTEOL           = $0100;
+ PCRE_UNGREEDY         = $0200;
+ PCRE_NOTEMPTY         = $0400;
+{$IFDEF PCRE_5_0}
+ PCRE_UTF8             = $0800;
+ PCRE_NO_AUTO_CAPTURE  = $1000;
+ PCRE_NO_UTF8_CHECK    = $2000;
+ PCRE_AUTO_CALLOUT     = $4000;
+ PCRE_PARTIAL          = $8000;
+{$ENDIF}
+{$IFDEF PCRE_7_0}
+ PCRE_DFA_SHORTEST     = $00010000;
+ PCRE_DFA_RESTART      = $00020000;
+ PCRE_FIRSTLINE        = $00040000;
+ PCRE_DUPNAMES         = $00080000;
+ PCRE_NEWLINE_CR       = $00100000;
+ PCRE_NEWLINE_LF       = $00200000;
+ PCRE_NEWLINE_CRLF     = $00300000;
+ PCRE_NEWLINE_ANY      = $00400000;
+ PCRE_NEWLINE_ANYCRLF  = $00500000;
+
+ PCRE_NEWLINE_BITS     = PCRE_NEWLINE_CR or PCRE_NEWLINE_LF or PCRE_NEWLINE_ANY;
+
+{$ENDIF}
+{$IFDEF PCRE_7_7}
+ PCRE_BSR_ANYCRLF      = $00800000;
+ PCRE_BSR_UNICODE      = $01000000;
+ PCRE_JAVASCRIPT_COMPAT= $02000000;
+{$ENDIF}
+
+ PCRE_COMPILE_ALLOWED_OPTIONS = PCRE_ANCHORED + PCRE_AUTO_CALLOUT + PCRE_CASELESS  +
+				PCRE_DOLLAR_ENDONLY + PCRE_DOTALL + PCRE_EXTENDED  +
+				PCRE_EXTRA + PCRE_MULTILINE + PCRE_NO_AUTO_CAPTURE +
+				PCRE_UNGREEDY + PCRE_UTF8 + PCRE_NO_UTF8_CHECK
+				{$IFDEF PCRE_7_0}
+				+ PCRE_DUPNAMES + PCRE_FIRSTLINE + PCRE_NEWLINE_BITS
+				{$ENDIF}
+				{$IFDEF PCRE_7_7}
+				+ PCRE_BSR_ANYCRLF + PCRE_BSR_UNICODE + PCRE_JAVASCRIPT_COMPAT
+				{$ENDIF}
+				;
+
+ PCRE_EXEC_ALLOWED_OPTIONS = PCRE_ANCHORED + PCRE_NOTBOL + PCRE_NOTEOL +
+			     PCRE_NOTEMPTY + PCRE_NO_UTF8_CHECK + PCRE_PARTIAL
+			     {$IFDEF PCRE_7_0}
+			     + PCRE_NEWLINE_BITS
+			     {$ENDIF}
+			     {$IFDEF PCRE_7_7}
+			     + PCRE_BSR_ANYCRLF + PCRE_BSR_UNICODE
+			     {$ENDIF}
+			     ;
+
+{$IFDEF PCRE_7_0}
+ PCRE_DFA_EXEC_ALLOWED_OPTIONS = PCRE_ANCHORED + PCRE_NOTBOL + PCRE_NOTEOL +
+				 PCRE_NOTEMPTY + PCRE_NO_UTF8_CHECK + PCRE_PARTIAL +
+				 PCRE_DFA_SHORTEST + PCRE_DFA_RESTART +
+				 PCRE_NEWLINE_BITS
+				 {$IFDEF PCRE_7_7}
+				 + PCRE_BSR_ANYCRLF + PCRE_BSR_UNICODE
+				 {$ENDIF}
+				 ;
+{$ENDIF}
+
+{ Exec-time and get/set-time error codes }
+ PCRE_ERROR_NOMATCH        =  -1;
+ PCRE_ERROR_NULL	   =  -2;
+ PCRE_ERROR_BADOPTION      =  -3;
+ PCRE_ERROR_BADMAGIC       =  -4;
+ PCRE_ERROR_UNKNOWN_MODE   =  -5;
+ PCRE_ERROR_NOMEMORY       =  -6;
+ PCRE_ERROR_NOSUBSTRING    =  -7;
+{$IFDEF PCRE_5_0}
+ PCRE_ERROR_MATCHLIMIT     =  -8;
+ PCRE_ERROR_CALLOUT        =  -9;  { Never used by PCRE itself }
+ PCRE_ERROR_BADUTF8        = -10;
+ PCRE_ERROR_BADUTF8_OFFSET = -11;
+ PCRE_ERROR_PARTIAL        = -12;
+ PCRE_ERROR_BADPARTIAL     = -13;
+ PCRE_ERROR_INTERNAL       = -14;
+ PCRE_ERROR_BADCOUNT       = -15;
+{$ENDIF}
+{$IFDEF PCRE_7_0}
+ PCRE_ERROR_DFA_UITEM      = -16;
+ PCRE_ERROR_DFA_UCOND      = -17;
+ PCRE_ERROR_DFA_UMLIMIT    = -18;
+ PCRE_ERROR_DFA_WSSIZE     = -19;
+ PCRE_ERROR_DFA_RECURSE    = -20;
+ PCRE_ERROR_RECURSIONLIMIT = -21;
+ PCRE_ERROR_NULLWSLIMIT    = -22;
+ PCRE_ERROR_BADNEWLINE     = -23;
+{$ENDIF}
+
+{ Request types for pcre_fullinfo() }
+
+ PCRE_INFO_OPTIONS         =  0;
+ PCRE_INFO_SIZE 	   =  1;
+ PCRE_INFO_CAPTURECOUNT    =  2;
+ PCRE_INFO_BACKREFMAX      =  3;
+ PCRE_INFO_FIRSTBYTE       =  4;
+ PCRE_INFO_FIRSTCHAR       =  4; { For backwards compatibility }
+ PCRE_INFO_FIRSTTABLE      =  5;
+{$IFDEF PCRE_5_0}
+ PCRE_INFO_LASTLITERAL     =  6;
+ PCRE_INFO_NAMEENTRYSIZE   =  7;
+ PCRE_INFO_NAMECOUNT       =  8;
+ PCRE_INFO_NAMETABLE       =  9;
+ PCRE_INFO_STUDYSIZE       = 10;
+ PCRE_INFO_DEFAULT_TABLES  = 11;
+{$ENDIF PCRE_5_0}
+{$IFDEF PCRE_7_7}
+ PCRE_INFO_OKPARTIAL       = 12;
+ PCRE_INFO_JCHANGED        = 13;
+ PCRE_INFO_HASCRORLF       = 14;
+{$ENDIF}
+
+{ Request types for pcre_config() }
+{$IFDEF PCRE_5_0}
+ PCRE_CONFIG_UTF8       	    = 0;
+ PCRE_CONFIG_NEWLINE    	    = 1;
+ PCRE_CONFIG_LINK_SIZE  	    = 2;
+ PCRE_CONFIG_POSIX_MALLOC_THRESHOLD = 3;
+ PCRE_CONFIG_MATCH_LIMIT	    = 4;
+ PCRE_CONFIG_STACKRECURSE           = 5;
+ PCRE_CONFIG_UNICODE_PROPERTIES     = 6;
+{$ENDIF PCRE_5_0}
+{$IFDEF PCRE_7_0}
+ PCRE_CONFIG_MATCH_LIMIT_RECURSION  = 7;
+{$ENDIF}
+{$IFDEF PCRE_7_7}
+ PCRE_CONFIG_BSR		    = 8;
+{$ENDIF}
+
+{ Bit flags for the pcre_extra structure }
+{$IFDEF PCRE_5_0}
+ PCRE_EXTRA_STUDY_DATA  	  = $0001;
+ PCRE_EXTRA_MATCH_LIMIT 	  = $0002;
+ PCRE_EXTRA_CALLOUT_DATA	  = $0004;
+ PCRE_EXTRA_TABLES      	  = $0008;
+{$ENDIF PCRE_5_0}
+{$IFDEF PCRE_7_0}
+ PCRE_EXTRA_MATCH_LIMIT_RECURSION = $0010;
+{$ENDIF}
+
+Const
+// DefaultOptions : integer = 0;
+ DefaultLocaleTable : pointer = nil;
+
+{$IFDEF PCRE_5_0}
+{ The structure for passing additional data to pcre_exec(). This is defined in
+such as way as to be extensible. Always add new fields at the end, in order to
+remain compatible. }
+
+type ppcre_extra = ^tpcre_extra;
+     tpcre_extra = record
+       flags : longint; 	       { Bits for which fields are set }
+       study_data : pointer;           { Opaque data from pcre_study() }
+       match_limit : longint;          { Maximum number of calls to match() }
+       callout_data : pointer;         { Data passed back in callouts }
+       tables : pointer;	       { Pointer to character tables }
+       match_limit_recursion: longint; { Max recursive calls to match() }
+     end;
+
+type ppcre_callout_block = ^pcre_callout_block;
+     pcre_callout_block = record
+       version,
+  (* ------------------------ Version 0 ------------------------------- *)
+       callout_number : integer;
+       offset_vector : pointer;
+       subject : pchar;
+       subject_length, start_match, current_position, capture_top,
+       capture_last : integer;
+       callout_data : pointer;
+  (* ------------------- Added for Version 1 -------------------------- *)
+       pattern_position, next_item_length : integer;
+     end;
+{$ENDIF PCRE_5_0}
+
+{$OrgName+}
+{$IFDEF VIRTUALPASCAL} {&Cdecl+} {$ENDIF VIRTUALPASCAL}
+
+ { local replacement of external pcre memory management functions }
+ function pcre_malloc( size : integer ) : pointer;
+ procedure pcre_free( {var} p : pointer );
+{$IFDEF PCRE_5_0}
+ const pcre_stack_malloc: function ( size : integer ): pointer = pcre_malloc;
+       pcre_stack_free: procedure ( {var} p : pointer ) = pcre_free;
+ function pcre_callout(var p : ppcre_callout_block) : integer;
+{$ENDIF PCRE_5_0}
+{$IFDEF VIRTUALPASCAL} {&Cdecl-} {$ENDIF VIRTUALPASCAL}
+
+Implementation
+
+Uses strings, collect, messages, dnapp, commands, advance0, stringsx
+    {$IFDEF VIRTUALPASCAL} ,vpsyslow {$ENDIF VIRTUALPASCAL};
+
+Const
+ MAGIC_NUMBER = $50435245; { 'PCRE' }
+ MAX_MATCHES = 90; { changed in 3.5 version; should be divisible by 3, was 64}
+
+Type
+ PMatchArray = ^TMatchArray;
+ TMatchArray = array[0..( MAX_MATCHES * 3 )] of integer;
+
+ PRegExpCollection = ^TRegExpCollection;
+ TRegExpCollection =  object(TSortedCollection)
+   MaxRegExp : integer;
+   SearchRegExp : shortstring;
+   CompareModeInsert : boolean;
+   constructor Init(AMaxRegExp:integer);
+   procedure FreeItem(P: Pointer); virtual;
+   function  Compare(P1, P2: Pointer): Integer; virtual;
+   function  Find(ARegExp:shortstring;var P: PpcRegExp):boolean; virtual;
+   function CheckNew(ARegExp:shortstring):PpcRegExp;virtual;
+ end;
+
+Var
+ PRegExpCache : PRegExpCollection;
+
+
+{$IFDEF VIRTUALPASCAL} {&Cdecl+} {$ENDIF VIRTUALPASCAL}
+
+ { imported original pcre functions }
+
+ function pcre_compile( const pattern : PChar; options : integer;
+			var errorptr : PChar; var erroroffset : integer;
+			const tables : PChar ) : pointer {pcre}; external;
+{$IFDEF PCRE_7_0}
+ function pcre_compile2( const pattern : PChar; options : integer;
+			 var errorcodeptr : Integer;
+			 var errorptr : PChar; var erroroffset : integer;
+			 const tables : PChar ) : pointer {pcre}; external;
+{$ENDIF}
+{$IFDEF PCRE_5_0}
+ function pcre_config( what : integer; where : pointer) : integer; external;
+ function pcre_copy_named_substring( const code : pointer {pcre};
+				     const subject : pchar;
+				     var ovector : integer;
+				     stringcount : integer;
+				     const stringname : pchar;
+				     var buffer : pchar;
+				     size : integer) : integer; external;
+ function pcre_copy_substring( const subject : pchar; var ovector : integer;
+			       stringcount, stringnumber : integer;
+			       var buffer : pchar; size : integer )
+			       : integer; external;
+ function pcre_exec( const argument_re : pointer {pcre};
+		     const extra_data : pointer {pcre_extra};
+{$ELSE}
+ function pcre_exec( const external_re : pointer;
+		     const external_extra : pointer;
+{$ENDIF}
+		     const subject : PChar;
+		     length, start_offset, options : integer;
+		     offsets : pointer;
+		     offsetcount : integer ) : integer; external;
+{$IFDEF PCRE_7_0}
+ function pcre_dfa_exec( const argument_re : pointer {pcre};
+			 const extra_data : pointer {pcre_extra};
+			 const subject : pchar;
+			 length, start_offset, options : integer;
+			 offsets : pointer;
+			 offsetcount : integer;
+			 workspace : pointer;
+			 wscount : integer ) : integer; external;
+{$ENDIF}
+{$IFDEF PCRE_5_0}
+ procedure pcre_free_substring( const p : pchar ); external;
+ procedure pcre_free_substring_list( var p : pchar ); external;
+ function pcre_fullinfo( const argument_re : pointer {pcre};
+			 const extra_data : pointer {pcre_extra};
+			 what : integer;
+			 where : pointer ) : integer; external;
+ function pcre_get_named_substring( const code : pointer {pcre};
+				    const subject : pchar;
+				    var ovector : integer;
+				    stringcount : integer;
+				    const stringname : pchar;
+				    var stringptr : pchar ) : integer; external;
+ function pcre_get_stringnumber( const code : pointer {pcre};
+				 const stringname : pchar ) : integer; external;
+ function pcre_get_stringtable_entries( const code : pointer {pcre};
+					const stringname : pchar;
+					var firstptr,
+					    lastptr : pchar ) : integer; external;
+ function pcre_get_substring( const subject : pchar; var ovector : integer;
+			      stringcount, stringnumber : integer;
+			      var stringptr : pchar ) : integer; external;
+ function pcre_get_substring_list( const subject : pchar; var ovector : integer;
+				   stringcount : integer;
+				   listptr : pointer {const char ***listptr}) : integer; external;
+ function pcre_info( const argument_re : pointer {pcre};
+		     var optptr : integer;
+		     var first_byte : integer ) : integer; external;
+ function pcre_maketables : pchar; external;
+{$ENDIF}
+{$IFDEF PCRE_7_0}
+ function pcre_refcount( const argument_re : pointer {pcre};
+			 adjust : integer ) : pchar; external;
+{$ENDIF}
+ function pcre_study( const external_re : pointer {pcre};
+		      options : integer;
+		      var errorptr : PChar ) : pointer {pcre_extra}; external;
+{$IFDEF PCRE_5_0}
+ function pcre_version : pchar; external;
+{$ENDIF}
+
+ function pcre_malloc( size : integer ) : pointer;
+ begin
+  GetMem( result, size );
+ end;
+
+ procedure pcre_free( {var} p : pointer );
+ begin
+  if (p <> nil) then
+    FreeMem( p, 0 );
+  {@p := nil;}
+ end;
+
+{$IFDEF PCRE_5_0}
+(* Called from PCRE as a result of the (?C) item. We print out where we are in
+the match. Yield zero unless more callouts than the fail count, or the callout
+data is not zero. *)
+
+ function pcre_callout;
+ begin
+ end;
+{$ENDIF}
+
+{$IFDEF VIRTUALPASCAL} {&Cdecl-} {$ENDIF VIRTUALPASCAL}
+
+// Always include the newest version of the library
+{$IFDEF PCRE_7_7}
+  {$L pcre77.lib}
+{$ELSE}
+  {$IFDEF PCRE_7_0}
+    {$L pcre70.lib}
+  {$ELSE}
+    {$IFDEF PCRE_5_0}
+      {$L pcre50.lib}
+    {$ELSE}
+      {$IFDEF PCRE_3_7}
+	{$L pcre37.lib}
+      {$ENDIF PCRE_3_7}
+    {$ENDIF PCRE_5_0}
+  {$ENDIF PCRE_7_0}
+{$ENDIF PCRE_7_7}
+
+{TpcRegExp}
+
+ constructor TpcRegExp.Init(const ARegExp:shortstring; AOptions:integer; ALocale : Pointer);
+ var
+  pRegExp : PChar;
+ begin
+  RegExp:=ARegExp;
+  RegExpC:=nil;
+  RegExpExt:=nil;
+  Matches:=nil;
+  MatchesCount:=0;
+  Error:=true;
+  ErrorMsg:=nil;
+  ErrorPos:=0;
+  RunTimeOptions := 0;
+  if length(RegExp) < 255 then
+   begin
+    RegExp[length(RegExp)+1]:=#0;
+    pRegExp:=@RegExp[1];
+   end
+  else
+   begin
+    GetMem(pRegExp,length(RegExp)+1);
+    pRegExp:=strpcopy(pRegExp,RegExp);
+   end;
+  RegExpC := pcre_compile( pRegExp,
+			   AOptions and PCRE_COMPILE_ALLOWED_OPTIONS,
+			   ErrorMsg, ErrorPos, ALocale);
+  if length(RegExp) = 255 then
+   StrDispose(pRegExp);
+  if RegExpC = nil then
+   exit;
+  ErrorMsg:=nil;
+  RegExpExt := pcre_study( RegExpC, 0, ErrorMsg );
+  if (RegExpExt = nil) and (ErrorMsg <> nil) then
+   begin
+    pcre_free(RegExpC);
+    exit;
+   end;
+  GetMem(Matches,SizeOf(TMatchArray));
+  Error:=false;
+ end;
+
+ destructor TpcRegExp.Done;
+ begin
+  if RegExpC <> nil then
+    pcre_free(RegExpC);
+  if RegExpExt <> nil then
+    pcre_free(RegExpExt);
+  if Matches <> nil then
+    FreeMem(Matches,SizeOf(TMatchArray));
+ end;
+
+ function TpcRegExp.SearchNext( AStr: Pchar; ALen : longint ) : boolean;
+ var Options: Integer;
+ begin // must handle PCRE_ERROR_PARTIAL here
+  Options := (RunTimeOptions or startup.MiscMultiData.cfgRegEx.DefaultOptions) and
+	     PCRE_EXEC_ALLOWED_OPTIONS;
+  if MatchesCount > 0 then
+    MatchesCount:=pcre_exec( RegExpC, RegExpExt, AStr, ALen, PMatchArray(Matches)^[1],
+			     Options, Matches, MAX_MATCHES ) else
+    MatchesCount:=pcre_exec( RegExpC, RegExpExt, AStr, ALen, 0,
+			     Options, Matches, MAX_MATCHES );
+{  if MatchesCount = 0 then
+    MatchesCount := MatchesCount div 3;}
+  PartialMatch := MatchesCount = PCRE_ERROR_PARTIAL;
+  SearchNext := MatchesCount > 0;
+ end;
+
+ function TpcRegExp.Search( AStr: Pchar; ALen : longint):boolean;
+ begin
+  MatchesCount:=0;
+  Search:=SearchNext(AStr,ALen);
+  SourceLen:=ALen;
+ end;
+
+ function TpcRegExp.SearchOfs( AStr: Pchar; ALen, AOfs: longint ) : boolean;
+ var Options: Integer;
+ begin
+  MatchesCount:=0;
+  Options := (RunTimeOptions or startup.MiscMultiData.cfgRegEx.DefaultOptions) and
+	     PCRE_EXEC_ALLOWED_OPTIONS;
+  MatchesCount:=pcre_exec( RegExpC, RegExpExt, AStr, ALen, AOfs,
+			   Options, Matches, MAX_MATCHES );
+  PartialMatch := MatchesCount = PCRE_ERROR_PARTIAL;
+  SearchOfs := MatchesCount > 0;
+  SourceLen := ALen-AOfs;
+ end;
+
+ function TpcRegExp.MatchSub(ANom:integer; var Pos,Len:longint):boolean;
+ begin
+  if (MatchesCount > 0) and (ANom <= (MatchesCount-1)) then
+   begin
+    ANom:=ANom*2;
+    Pos:=PMatchArray(Matches)^[ANom];
+    Len:=PMatchArray(Matches)^[ANom+1]-Pos;
+    MatchSub:=true;
+   end
+  else
+   MatchSub:=false;
+ end;
+
+ function TpcRegExp.MatchFull(var Pos,Len:longint):boolean;
+ begin
+  MatchFull:=MatchSub(0,Pos,Len);
+ end;
+
+ function TpcRegExp.GetSubStr(ANom: integer; AStr: Pchar):string;
+ var
+  s: ansistring;
+  pos,len: longint;
+ begin
+  s:='';
+  if MatchSub(ANom, pos, len) then
+   begin
+    setlength(s, len);
+    Move(AStr[pos], s[1], len);
+   end;
+  GetSubStr:=s;
+ end;
+
+ function TpcRegExp.GetPreSubStr(AStr: Pchar):string;
+ var
+  s: ansistring;
+  l: longint;
+ begin
+  s:='';
+  if (MatchesCount > 0) then
+   begin
+    l:=PMatchArray(Matches)^[0]-1;
+    if l > 0 then
+     begin
+      setlength(s,l);
+      Move(AStr[1],s[1],l);
+     end;
+   end;
+  GetPreSubStr:=s;
+ end;
+
+ function TpcRegExp.GetPostSubStr(AStr: Pchar):string;
+ var
+  s: ansistring;
+  l: longint;
+  ANom: integer;
+ begin
+  s:='';
+  if (MatchesCount > 0) then
+   begin
+    ANom:=(MatchesCount-1){*2} shl 1;
+    l:=SourceLen-PMatchArray(Matches)^[ANom+1]+1;
+    if l > 0 then
+     begin
+      setlength(s,l);
+      Move(AStr[PMatchArray(Matches)^[ANom+1]],s[1],l);
+     end;
+   end;
+  GetPostSubStr:=s;
+ end;
+
+
+ function TpcRegExp.GetFullStr(AStr: Pchar):string;
+ var
+  s: ansistring;
+  l: longint;
+ begin
+  GetFullStr:=GetSubStr(0,AStr);
+ end;
+
+ function TpcRegExp.GetReplStr(AStr: Pchar; const ARepl: string):string;
+ var
+  s: ansistring;
+  l,i,lasti: longint;
+ begin
+  l:=length(ARepl);
+  i:=1;
+  lasti:=1;
+  s:='';
+  while i <= l do
+   begin
+    case ARepl[i] of
+     '\' :
+      begin
+       if i < l then
+	begin
+	 s:=s+copy(ARepl,lasti,i-lasti){+ARepl[i+1]};
+	 {AH 17-10-05 support for POSIX \1-\9 backreferences}
+	 case ARepl[i+1] of
+	  '0' : s:=s+GetFullStr(AStr);
+	  '1'..'9' : s:=s+GetSubStr(ord(ARepl[i+1])-ord('0'),AStr);
+	  else s:=s+ARepl[i+1]; // copy the escaped character
+	 end;
+	end;
+       inc(i);
+       lasti:=i+1;
+      end;
+     '$' :
+      begin
+       if i < l then
+	begin
+	 s:=s+copy(ARepl,lasti,i-lasti);
+	 case ARepl[i+1] of
+	  '&' : s:=s+GetFullStr(AStr);
+	  '1'..'9' : s:=s+GetSubStr(ord(ARepl[i+1])-ord('0'),AStr);
+	  '`' : s:=s+GetPreSubStr(AStr);
+	  #39 : s:=s+GetPostSubStr(AStr);
+	 end;
+	end;
+       inc(i);
+       lasti:=i+1;
+      end;
+    end;
+    inc(i);
+   end;
+  if lasti <= {AH 25-10-2004 added =, else l==1 won't work} l then
+    s:=s+copy(ARepl,lasti,l-lasti+1);
+  GetReplStr:=s;
+ end;
+
+ function TpcRegExp.ErrorStr:string;
+  begin
+   ErrorStr:=StrPas(ErrorMsg);
+  end;
+
+{TRegExpCollection}
+
+constructor TRegExpCollection.Init(AMaxRegExp: integer);
+begin
+ Inherited Init(1,1);
+ MaxRegExp:=AMaxRegExp;
+ CompareModeInsert:=true;
+end;
+
+procedure TRegExpCollection.FreeItem(P: Pointer);
+begin
+ if P <> nil then
+  begin
+   Dispose(PpcRegExp(P),Done);
+  end;
+end;
+
+function  TRegExpCollection.Compare(P1, P2: Pointer): Integer;
+//var
+// l,l1,l2,i : byte;
+//// wPos: pchar;
+begin
+ if CompareModeInsert then
+  begin
+//   l1:=length(PpcRegExp(P1)^.RegExp);
+//   l2:=length(PpcRegExp(P2)^.RegExp);
+//   if l1 > l2 then l:=l2 else
+//      	     l:=l1;
+//   for i:=1 to l do
+//     if PpcRegExp(P1).RegExp[i] <> PpcRegExp(P2).RegExp[i] then break;
+//   if i <=l then
+//     Compare:=ord(PpcRegExp(P1).RegExp[i])-ord(PpcRegExp(P2).RegExp[i]) else
+//     Compare:=l1-l2;
+    Compare := stringsx.PasStrCmp(PpcRegExp(P1).RegExp, PpcRegExp(P2).RegExp, False);
+  end
+ else
+  begin
+//   l1:=length(PpcRegExp(P1)^.RegExp);
+//   l2:=length(SearchRegExp);
+//   if l1 > l2 then l:=l2 else
+//      	     l:=l1;
+//   for i:=1 to l do
+//     if PpcRegExp(P1).RegExp[i] <> SearchRegExp[i] then
+//     begin
+//       Compare:=ord(PpcRegExp(P1).RegExp[i])-ord(SearchRegExp[i]);
+//       break;
+//     end;
+//   if i > l then Compare:=l1-l2;
+    Compare := stringsx.PasStrCmp(PpcRegExp(P1).RegExp, SearchRegExp, False);
+  end;
+end;
+
+function  TRegExpCollection.Find(ARegExp:shortstring;var P: PpcRegExp):boolean;
+var I : integer;
+begin
+ CompareModeInsert:=false;
+ SearchRegExp:=ARegExp;
+ if Search(nil,I) then
+  begin
+   P:=PpcRegExp(At(I));
+   Find:=true;
+  end
+ else
+  begin
+   P:=nil;
+   Find:=false;
+  end;
+ CompareModeInsert:=true;
+end;
+
+function TRegExpCollection.CheckNew(ARegExp:shortstring):PpcRegExp;
+var
+ P : PpcRegExp;
+begin
+ if not Find(ARegExp,P) then
+  begin
+   if Count = MaxRegExp then
+    AtFree(0);
+   P:=New(ppcRegExp,Init(ARegExp,PCRE_CASELESS,nil));
+   Insert(P);
+  end;
+ CheckNew:=P;
+end;
+
+function pcGrepMatch(WildCard, aStr: string; AOptions:integer; ALocale : Pointer): Boolean;
+var
+ PpcRE:PpcRegExp;
+begin
+ PpcRE:=New(ppcRegExp,Init(WildCard,AOptions,Alocale));
+ pcGrepMatch:=PpcRE^.Search(pchar(AStr),Length(AStr));
+ Dispose(PpcRE,Done);
+end;
+
+function pcGrepSub(WildCard, aStr, aRepl: string; AOptions:integer; ALocale : Pointer): string;
+var
+ PpcRE:PpcRegExp;
+begin
+ PpcRE:=New(ppcRegExp,Init(WildCard,AOptions,Alocale));
+ if PpcRE^.Search(pchar(AStr),Length(AStr)) then
+  pcGrepSub:=PpcRE^.GetReplStr(pchar(AStr),ARepl)
+ else
+  pcGrepSub:='';
+ Dispose(PpcRE,Done);
+end;
+
+function pcFastGrepMatch(WildCard, aStr: string): Boolean;
+var
+ PpcRE:PpcRegExp;
+begin
+ PpcRE:=PRegExpCache^.CheckNew(WildCard);
+ pcFastGrepMatch:=PpcRE^.Search(pchar(AStr),Length(AStr));
+end;
+
+function pcFastGrepSub(WildCard, aStr, aRepl: string): string;
+var
+ PpcRE:PpcRegExp;
+begin
+ PpcRE:=PRegExpCache^.CheckNew(WildCard);
+ if PpcRE^.Search(pchar(AStr),Length(AStr)) then
+  pcFastGrepSub:=PpcRE^.GetReplStr(pchar(AStr),ARepl)
+ else
+  pcFastGrepSub:='';
+end;
+
+{$IFDEF PCRE_5_0}
+function pcGetVersion : pchar; assembler; {$FRAME-}{$USES none}
+asm
+  call pcre_version
+end;
+{$ENDIF PCRE_5_0}
+
+function pcError;
+var P: ppcRegExp absolute pRegExp;
+begin
+  Result := (P = nil) or P^.Error;
+  If Result and (P <> nil) then
+  begin
+{     if P^.ErrorPos = 0 then
+      MessageBox(GetString(erRegExpCompile)+'"'+P^.ErrorStr+'"', nil,mfConfirmation+mfOkButton)
+    else}
+      MessageBox(GetString(erRegExpCompile)+'"'+P^.ErrorStr+'"'+GetString(erRegExpCompPos),
+		 @P^.ErrorPos,mfConfirmation+mfOkButton);
+    Dispose(P, Done);
+    P:=nil;
+  end;
+end;
+
+function pcInit;
+var Options : Integer;
+begin
+  If CaseSens then Options := 0 else Options := PCRE_CASELESS;
+  Result := New( PpcRegExp, Init( Pattern,
+				  {DefaultOptions}
+				  startup.MiscMultiData.cfgRegEx.DefaultOptions or Options,
+				  DefaultLocaleTable) );
+end;
+
+Initialization
+ PRegExpCache:=New(PRegExpCollection,Init(64));
+Finalization
+ Dispose(PRegExpCache,Done);
+End.

Modified: freeswitch/trunk/libs/pcre/pcregrep.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcregrep.c	(original)
+++ freeswitch/trunk/libs/pcre/pcregrep.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 its pattern matching. On a Unix or Win32 system it can recurse into
 directories.
 
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,10 @@
 -----------------------------------------------------------------------------
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -46,9 +50,19 @@
 
 #include 
 #include 
+
+#ifdef HAVE_UNISTD_H
 #include 
+#endif
+
+#ifdef SUPPORT_LIBZ
+#include 
+#endif
+
+#ifdef SUPPORT_LIBBZ2
+#include 
+#endif
 
-#include "config.h"
 #include "pcre.h"
 
 #define FALSE 0
@@ -56,8 +70,8 @@
 
 typedef int BOOL;
 
-#define VERSION "4.3 01-Jun-2006"
 #define MAX_PATTERN_COUNT 100
+#define OFFSET_SIZE 99
 
 #if BUFSIZ > 8192
 #define MBUFTHIRD BUFSIZ
@@ -65,13 +79,16 @@
 #define MBUFTHIRD 8192
 #endif
 
-
 /* Values for the "filenames" variable, which specifies options for file name
 output. The order is important; it is assumed that a file name is wanted for
 all values greater than FN_DEFAULT. */
 
 enum { FN_NONE, FN_DEFAULT, FN_ONLY, FN_NOMATCH_ONLY, FN_FORCE };
 
+/* File reading styles */
+
+enum { FR_PLAIN, FR_LIBZ, FR_LIBBZ2 };
+
 /* Actions for the -d and -D options */
 
 enum { dee_READ, dee_SKIP, dee_RECURSE };
@@ -83,6 +100,10 @@
 #define PO_LINE_MATCH     0x0002
 #define PO_FIXED_STRINGS  0x0004
 
+/* Line ending types */
+
+enum { EL_LF, EL_CR, EL_CRLF, EL_ANY, EL_ANYCRLF };
+
 
 
 /*************************************************
@@ -100,8 +121,7 @@
 static const char *jfriedl_postfix = "";
 #endif
 
-static int  endlinebyte = '\n';     /* Last byte of endline sequence */
-static int  endlineextra = 0;       /* Extra bytes for endline sequence */
+static int  endlinetype;
 
 static char *colour_string = (char *)"1;31";
 static char *colour_option = NULL;
@@ -115,14 +135,18 @@
 static const unsigned char *pcretables = NULL;
 
 static int  pattern_count = 0;
-static pcre **pattern_list;
-static pcre_extra **hints_list;
+static pcre **pattern_list = NULL;
+static pcre_extra **hints_list = NULL;
 
 static char *include_pattern = NULL;
 static char *exclude_pattern = NULL;
+static char *include_dir_pattern = NULL;
+static char *exclude_dir_pattern = NULL;
 
 static pcre *include_compiled = NULL;
 static pcre *exclude_compiled = NULL;
+static pcre *include_dir_compiled = NULL;
+static pcre *exclude_dir_compiled = NULL;
 
 static int after_context = 0;
 static int before_context = 0;
@@ -135,13 +159,16 @@
 
 static BOOL count_only = FALSE;
 static BOOL do_colour = FALSE;
+static BOOL file_offsets = FALSE;
 static BOOL hyphenpending = FALSE;
 static BOOL invert = FALSE;
+static BOOL line_offsets = FALSE;
 static BOOL multiline = FALSE;
 static BOOL number = FALSE;
 static BOOL only_matching = FALSE;
 static BOOL quiet = FALSE;
 static BOOL silent = FALSE;
+static BOOL utf8 = FALSE;
 
 /* Structure for options and list of them */
 
@@ -159,13 +186,17 @@
 /* Options without a single-letter equivalent get a negative value. This can be
 used to identify them. */
 
-#define N_COLOUR    (-1)
-#define N_EXCLUDE   (-2)
-#define N_HELP      (-3)
-#define N_INCLUDE   (-4)
-#define N_LABEL     (-5)
-#define N_LOCALE    (-6)
-#define N_NULL      (-7)
+#define N_COLOUR       (-1)
+#define N_EXCLUDE      (-2)
+#define N_EXCLUDE_DIR  (-3)
+#define N_HELP         (-4)
+#define N_INCLUDE      (-5)
+#define N_INCLUDE_DIR  (-6)
+#define N_LABEL        (-7)
+#define N_LOCALE       (-8)
+#define N_NULL         (-9)
+#define N_LOFFSETS     (-10)
+#define N_FOFFSETS     (-11)
 
 static option_item optionlist[] = {
   { OP_NODATA,    N_NULL,   NULL,              "",              "  terminate options" },
@@ -181,21 +212,25 @@
   { OP_PATLIST,   'e',      NULL,              "regex(p)",      "specify pattern (may be used more than once)" },
   { OP_NODATA,    'F',      NULL,              "fixed_strings", "patterns are sets of newline-separated strings" },
   { OP_STRING,    'f',      &pattern_filename, "file=path",     "read patterns from file" },
+  { OP_NODATA,    N_FOFFSETS, NULL,            "file-offsets",  "output file offsets, not text" },
   { OP_NODATA,    'H',      NULL,              "with-filename", "force the prefixing filename on output" },
   { OP_NODATA,    'h',      NULL,              "no-filename",   "suppress the prefixing filename on output" },
   { OP_NODATA,    'i',      NULL,              "ignore-case",   "ignore case distinctions" },
   { OP_NODATA,    'l',      NULL,              "files-with-matches", "print only FILE names containing matches" },
   { OP_NODATA,    'L',      NULL,              "files-without-match","print only FILE names not containing matches" },
   { OP_STRING,    N_LABEL,  &stdin_name,       "label=name",    "set name for standard input" },
+  { OP_NODATA,    N_LOFFSETS, NULL,            "line-offsets",  "output line numbers and offsets, not text" },
   { OP_STRING,    N_LOCALE, &locale,           "locale=locale", "use the named locale" },
   { OP_NODATA,    'M',      NULL,              "multiline",     "run in multiline mode" },
-  { OP_STRING,    'N',      &newline,          "newline=type",  "specify newline type (CR, LR, CRLF)" },
+  { OP_STRING,    'N',      &newline,          "newline=type",  "set newline type (CR, LF, CRLF, ANYCRLF or ANY)" },
   { OP_NODATA,    'n',      NULL,              "line-number",   "print line number with output lines" },
   { OP_NODATA,    'o',      NULL,              "only-matching", "show only the part of the line that matched" },
   { OP_NODATA,    'q',      NULL,              "quiet",         "suppress output, just set return code" },
   { OP_NODATA,    'r',      NULL,              "recursive",     "recursively scan sub-directories" },
   { OP_STRING,    N_EXCLUDE,&exclude_pattern,  "exclude=pattern","exclude matching files when recursing" },
   { OP_STRING,    N_INCLUDE,&include_pattern,  "include=pattern","include matching files when recursing" },
+  { OP_STRING,    N_EXCLUDE_DIR,&exclude_dir_pattern, "exclude_dir=pattern","exclude matching directories when recursing" },
+  { OP_STRING,    N_INCLUDE_DIR,&include_dir_pattern, "include_dir=pattern","include matching directories when recursing" },
 #ifdef JFRIEDL_DEBUG
   { OP_OP_NUMBER, 'S',      &S_arg,            "jeffS",         "replace matched (sub)string with X" },
 #endif
@@ -219,6 +254,16 @@
 static const char *suffix[] = {
   "", "\\b", ")$",   ")$",   "\\E", "\\E\\b", "\\E)$",   "\\E)$" };
 
+/* UTF-8 tables - used only when the newline setting is "any". */
+
+const int utf8_table3[] = { 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01};
+
+const char utf8_table4[] = {
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+  3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 };
+
 
 
 /*************************************************
@@ -231,7 +276,7 @@
 
 /************* Directory scanning in Unix ***********/
 
-#if IS_UNIX
+#if defined HAVE_SYS_STAT_H && defined HAVE_DIRENT_H && defined HAVE_SYS_TYPES_H
 #include 
 #include 
 #include 
@@ -263,7 +308,7 @@
   if (strcmp(dent->d_name, ".") != 0 && strcmp(dent->d_name, "..") != 0)
     return dent->d_name;
   }
-return NULL;   /* Keep compiler happy; never executed */
+/* Control never reaches here */
 }
 
 static void
@@ -298,10 +343,11 @@
 
 /* I (Philip Hazel) have no means of testing this code. It was contributed by
 Lionel Fourquaux. David Burgess added a patch to define INVALID_FILE_ATTRIBUTES
-when it did not exist. */
-
+when it did not exist. David Byron added a patch that moved the #include of
+ to before the INVALID_FILE_ATTRIBUTES definition rather than after.
+*/
 
-#elif HAVE_WIN32API
+#elif HAVE_WINDOWS_H
 
 #ifndef STRICT
 # define STRICT
@@ -309,12 +355,13 @@
 #ifndef WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
+
+#include 
+
 #ifndef INVALID_FILE_ATTRIBUTES
 #define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF
 #endif
 
-#include 
-
 typedef struct directory_type
 {
 HANDLE handle;
@@ -399,7 +446,7 @@
 
 int isregfile(char *filename)
 {
-return !isdirectory(filename)
+return !isdirectory(filename);
 }
 
 
@@ -410,7 +457,7 @@
 static BOOL
 is_stdout_tty(void)
 {
-FALSE;
+return FALSE;
 }
 
 
@@ -423,8 +470,8 @@
 typedef void directory_type;
 
 int isdirectory(char *filename) { return 0; }
-directory_type * opendirectory(char *filename) {}
-char *readdirectory(directory_type *dir) {}
+directory_type * opendirectory(char *filename) { return (directory_type*)0;}
+char *readdirectory(directory_type *dir) { return (char*)0;}
 void closedirectory(directory_type *dir) {}
 
 
@@ -448,7 +495,7 @@
 
 
 
-#if ! HAVE_STRERROR
+#ifndef HAVE_STRERROR
 /*************************************************
 *     Provide strerror() for non-ANSI libraries  *
 *************************************************/
@@ -471,6 +518,271 @@
 
 
 /*************************************************
+*             Find end of line                   *
+*************************************************/
+
+/* The length of the endline sequence that is found is set via lenptr. This may
+be zero at the very end of the file if there is no line-ending sequence there.
+
+Arguments:
+  p         current position in line
+  endptr    end of available data
+  lenptr    where to put the length of the eol sequence
+
+Returns:    pointer to the last byte of the line
+*/
+
+static char *
+end_of_line(char *p, char *endptr, int *lenptr)
+{
+switch(endlinetype)
+  {
+  default:      /* Just in case */
+  case EL_LF:
+  while (p < endptr && *p != '\n') p++;
+  if (p < endptr)
+    {
+    *lenptr = 1;
+    return p + 1;
+    }
+  *lenptr = 0;
+  return endptr;
+
+  case EL_CR:
+  while (p < endptr && *p != '\r') p++;
+  if (p < endptr)
+    {
+    *lenptr = 1;
+    return p + 1;
+    }
+  *lenptr = 0;
+  return endptr;
+
+  case EL_CRLF:
+  for (;;)
+    {
+    while (p < endptr && *p != '\r') p++;
+    if (++p >= endptr)
+      {
+      *lenptr = 0;
+      return endptr;
+      }
+    if (*p == '\n')
+      {
+      *lenptr = 2;
+      return p + 1;
+      }
+    }
+  break;
+
+  case EL_ANYCRLF:
+  while (p < endptr)
+    {
+    int extra = 0;
+    register int c = *((unsigned char *)p);
+
+    if (utf8 && c >= 0xc0)
+      {
+      int gcii, gcss;
+      extra = utf8_table4[c & 0x3f];  /* Number of additional bytes */
+      gcss = 6*extra;
+      c = (c & utf8_table3[extra]) << gcss;
+      for (gcii = 1; gcii <= extra; gcii++)
+        {
+        gcss -= 6;
+        c |= (p[gcii] & 0x3f) << gcss;
+        }
+      }
+
+    p += 1 + extra;
+
+    switch (c)
+      {
+      case 0x0a:    /* LF */
+      *lenptr = 1;
+      return p;
+
+      case 0x0d:    /* CR */
+      if (p < endptr && *p == 0x0a)
+        {
+        *lenptr = 2;
+        p++;
+        }
+      else *lenptr = 1;
+      return p;
+
+      default:
+      break;
+      }
+    }   /* End of loop for ANYCRLF case */
+
+  *lenptr = 0;  /* Must have hit the end */
+  return endptr;
+
+  case EL_ANY:
+  while (p < endptr)
+    {
+    int extra = 0;
+    register int c = *((unsigned char *)p);
+
+    if (utf8 && c >= 0xc0)
+      {
+      int gcii, gcss;
+      extra = utf8_table4[c & 0x3f];  /* Number of additional bytes */
+      gcss = 6*extra;
+      c = (c & utf8_table3[extra]) << gcss;
+      for (gcii = 1; gcii <= extra; gcii++)
+        {
+        gcss -= 6;
+        c |= (p[gcii] & 0x3f) << gcss;
+        }
+      }
+
+    p += 1 + extra;
+
+    switch (c)
+      {
+      case 0x0a:    /* LF */
+      case 0x0b:    /* VT */
+      case 0x0c:    /* FF */
+      *lenptr = 1;
+      return p;
+
+      case 0x0d:    /* CR */
+      if (p < endptr && *p == 0x0a)
+        {
+        *lenptr = 2;
+        p++;
+        }
+      else *lenptr = 1;
+      return p;
+
+      case 0x85:    /* NEL */
+      *lenptr = utf8? 2 : 1;
+      return p;
+
+      case 0x2028:  /* LS */
+      case 0x2029:  /* PS */
+      *lenptr = 3;
+      return p;
+
+      default:
+      break;
+      }
+    }   /* End of loop for ANY case */
+
+  *lenptr = 0;  /* Must have hit the end */
+  return endptr;
+  }     /* End of overall switch */
+}
+
+
+
+/*************************************************
+*         Find start of previous line            *
+*************************************************/
+
+/* This is called when looking back for before lines to print.
+
+Arguments:
+  p         start of the subsequent line
+  startptr  start of available data
+
+Returns:    pointer to the start of the previous line
+*/
+
+static char *
+previous_line(char *p, char *startptr)
+{
+switch(endlinetype)
+  {
+  default:      /* Just in case */
+  case EL_LF:
+  p--;
+  while (p > startptr && p[-1] != '\n') p--;
+  return p;
+
+  case EL_CR:
+  p--;
+  while (p > startptr && p[-1] != '\n') p--;
+  return p;
+
+  case EL_CRLF:
+  for (;;)
+    {
+    p -= 2;
+    while (p > startptr && p[-1] != '\n') p--;
+    if (p <= startptr + 1 || p[-2] == '\r') return p;
+    }
+  return p;   /* But control should never get here */
+
+  case EL_ANY:
+  case EL_ANYCRLF:
+  if (*(--p) == '\n' && p > startptr && p[-1] == '\r') p--;
+  if (utf8) while ((*p & 0xc0) == 0x80) p--;
+
+  while (p > startptr)
+    {
+    register int c;
+    char *pp = p - 1;
+
+    if (utf8)
+      {
+      int extra = 0;
+      while ((*pp & 0xc0) == 0x80) pp--;
+      c = *((unsigned char *)pp);
+      if (c >= 0xc0)
+        {
+        int gcii, gcss;
+        extra = utf8_table4[c & 0x3f];  /* Number of additional bytes */
+        gcss = 6*extra;
+        c = (c & utf8_table3[extra]) << gcss;
+        for (gcii = 1; gcii <= extra; gcii++)
+          {
+          gcss -= 6;
+          c |= (pp[gcii] & 0x3f) << gcss;
+          }
+        }
+      }
+    else c = *((unsigned char *)pp);
+
+    if (endlinetype == EL_ANYCRLF) switch (c)
+      {
+      case 0x0a:    /* LF */
+      case 0x0d:    /* CR */
+      return p;
+
+      default:
+      break;
+      }
+
+    else switch (c)
+      {
+      case 0x0a:    /* LF */
+      case 0x0b:    /* VT */
+      case 0x0c:    /* FF */
+      case 0x0d:    /* CR */
+      case 0x85:    /* NEL */
+      case 0x2028:  /* LS */
+      case 0x2029:  /* PS */
+      return p;
+
+      default:
+      break;
+      }
+
+    p = pp;  /* Back one character */
+    }        /* End of loop for ANY case */
+
+  return startptr;  /* Hit start of data */
+  }     /* End of overall switch */
+}
+
+
+
+
+
+/*************************************************
 *       Print the previous "after" lines         *
 *************************************************/
 
@@ -495,13 +807,13 @@
   int count = 0;
   while (lastmatchrestart < endptr && count++ < after_context)
     {
+    int ellength;
     char *pp = lastmatchrestart;
     if (printname != NULL) fprintf(stdout, "%s-", printname);
     if (number) fprintf(stdout, "%d-", lastmatchnumber++);
-    while (*pp != endlinebyte) pp++;
-    fwrite(lastmatchrestart, 1, pp - lastmatchrestart + (1 + endlineextra),
-      stdout);
-    lastmatchrestart = pp + 1;
+    pp = end_of_line(pp, endptr, &ellength);
+    fwrite(lastmatchrestart, 1, pp - lastmatchrestart, stdout);
+    lastmatchrestart = pp;
     }
   hyphenpending = TRUE;
   }
@@ -510,6 +822,60 @@
 
 
 /*************************************************
+*   Apply patterns to subject till one matches   *
+*************************************************/
+
+/* This function is called to run through all patterns, looking for a match. It
+is used multiple times for the same subject when colouring is enabled, in order
+to find all possible matches.
+
+Arguments:
+  matchptr    the start of the subject
+  length      the length of the subject to match
+  offsets     the offets vector to fill in
+  mrc         address of where to put the result of pcre_exec()
+
+Returns:      TRUE if there was a match
+              FALSE if there was no match
+              invert if there was a non-fatal error
+*/
+
+static BOOL
+match_patterns(char *matchptr, size_t length, int *offsets, int *mrc)
+{
+int i;
+for (i = 0; i < pattern_count; i++)
+  {
+  *mrc = pcre_exec(pattern_list[i], hints_list[i], matchptr, length, 0,
+    PCRE_NOTEMPTY, offsets, OFFSET_SIZE);
+  if (*mrc >= 0) return TRUE;
+  if (*mrc == PCRE_ERROR_NOMATCH) continue;
+  fprintf(stderr, "pcregrep: pcre_exec() error %d while matching ", *mrc);
+  if (pattern_count > 1) fprintf(stderr, "pattern number %d to ", i+1);
+  fprintf(stderr, "this text:\n");
+  fwrite(matchptr, 1, length, stderr);  /* In case binary zero included */
+  fprintf(stderr, "\n");
+  if (error_count == 0 &&
+      (*mrc == PCRE_ERROR_MATCHLIMIT || *mrc == PCRE_ERROR_RECURSIONLIMIT))
+    {
+    fprintf(stderr, "pcregrep: error %d means that a resource limit "
+      "was exceeded\n", *mrc);
+    fprintf(stderr, "pcregrep: check your regex for nested unlimited loops\n");
+    }
+  if (error_count++ > 20)
+    {
+    fprintf(stderr, "pcregrep: too many errors - abandoned\n");
+    exit(2);
+    }
+  return invert;    /* No more matching; don't show the line again */
+  }
+
+return FALSE;  /* No match, no errors */
+}
+
+
+
+/*************************************************
 *            Grep an individual file             *
 *************************************************/
 
@@ -521,34 +887,74 @@
 "before" context printing.
 
 Arguments:
-  in           the fopened FILE stream
+  handle       the fopened FILE stream for a normal file
+               the gzFile pointer when reading is via libz
+               the BZFILE pointer when reading is via libbz2
+  frtype       FR_PLAIN, FR_LIBZ, or FR_LIBBZ2
   printname    the file name if it is to be printed for each match
                or NULL if the file name is not to be printed
                it cannot be NULL if filenames[_nomatch]_only is set
 
 Returns:       0 if there was at least one match
                1 otherwise (no matches)
+               2 if there is a read error on a .bz2 file
 */
 
 static int
-pcregrep(FILE *in, char *printname)
+pcregrep(void *handle, int frtype, char *printname)
 {
 int rc = 1;
 int linenumber = 1;
 int lastmatchnumber = 0;
 int count = 0;
-int offsets[99];
+int filepos = 0;
+int offsets[OFFSET_SIZE];
 char *lastmatchrestart = NULL;
 char buffer[3*MBUFTHIRD];
 char *ptr = buffer;
 char *endptr;
 size_t bufflength;
 BOOL endhyphenpending = FALSE;
+FILE *in = NULL;                    /* Ensure initialized */
+
+#ifdef SUPPORT_LIBZ
+gzFile ingz = NULL;
+#endif
+
+#ifdef SUPPORT_LIBBZ2
+BZFILE *inbz2 = NULL;
+#endif
+
+
+/* Do the first read into the start of the buffer and set up the pointer to end
+of what we have. In the case of libz, a non-zipped .gz file will be read as a
+plain file. However, if a .bz2 file isn't actually bzipped, the first read will
+fail. */
+
+#ifdef SUPPORT_LIBZ
+if (frtype == FR_LIBZ)
+  {
+  ingz = (gzFile)handle;
+  bufflength = gzread (ingz, buffer, 3*MBUFTHIRD);
+  }
+else
+#endif
 
-/* Do the first read into the start of the buffer and set up the pointer to
-end of what we have. */
+#ifdef SUPPORT_LIBBZ2
+if (frtype == FR_LIBBZ2)
+  {
+  inbz2 = (BZFILE *)handle;
+  bufflength = BZ2_bzread(inbz2, buffer, 3*MBUFTHIRD);
+  if ((int)bufflength < 0) return 2;   /* Gotcha: bufflength is size_t; */
+  }                                    /* without the cast it is unsigned. */
+else
+#endif
+
+  {
+  in = (FILE *)handle;
+  bufflength = fread(buffer, 1, 3*MBUFTHIRD, in);
+  }
 
-bufflength = fread(buffer, 1, 3*MBUFTHIRD, in);
 endptr = buffer + bufflength;
 
 /* Loop while the current pointer is not at the end of the file. For large
@@ -558,23 +964,24 @@
 
 while (ptr < endptr)
   {
-  int i;
+  int endlinelength;
   int mrc = 0;
-  BOOL match = FALSE;
+  BOOL match;
+  char *matchptr = ptr;
   char *t = ptr;
   size_t length, linelength;
 
   /* At this point, ptr is at the start of a line. We need to find the length
   of the subject string to pass to pcre_exec(). In multiline mode, it is the
   length remainder of the data in the buffer. Otherwise, it is the length of
-  the next line. After matching, we always advance by the length of the next
-  line. In multiline mode the PCRE_FIRSTLINE option is used for compiling, so
-  that any match is constrained to be in the first line. */
-
-  linelength = 0;
-  while (t < endptr && *t++ != endlinebyte) linelength++;
-  length = multiline? endptr - ptr : linelength;
-
+  the next line, excluding the terminating newline. After matching, we always
+  advance by the length of the next line. In multiline mode the PCRE_FIRSTLINE
+  option is used for compiling, so that any match is constrained to be in the
+  first line. */
+
+  t = end_of_line(t, endptr, &endlinelength);
+  linelength = t - ptr - endlinelength;
+  length = multiline? (size_t)(endptr - ptr) : linelength;
 
   /* Extra processing for Jeffrey Friedl's debugging. */
 
@@ -585,6 +992,7 @@
       #include 
       struct timeval start_time, end_time;
       struct timezone dummy;
+      int i;
 
       if (jfriedl_XT)
       {
@@ -610,7 +1018,8 @@
 
 
       for (i = 0; i < jfriedl_XR; i++)
-          match = (pcre_exec(pattern_list[0], hints_list[0], ptr, length, 0, 0, offsets, 99) >= 0);
+          match = (pcre_exec(pattern_list[0], hints_list[0], ptr, length, 0,
+              PCRE_NOTEMPTY, offsets, OFFSET_SIZE) >= 0);
 
       if (gettimeofday(&end_time, &dummy) != 0)
               perror("bad gettimeofday");
@@ -624,38 +1033,16 @@
   }
 #endif
 
+  /* We come back here after a match when the -o option (only_matching) is set,
+  in order to find any further matches in the same line. */
 
-  /* Run through all the patterns until one matches. Note that we don't include
-  the final newline in the subject string. */
+  ONLY_MATCHING_RESTART:
 
-  for (i = 0; i < pattern_count; i++)
-    {
-    mrc = pcre_exec(pattern_list[i], hints_list[i], ptr, length, 0, 0,
-      offsets, 99);
-    if (mrc >= 0) { match = TRUE; break; }
-    if (mrc != PCRE_ERROR_NOMATCH)
-      {
-      fprintf(stderr, "pcregrep: pcre_exec() error %d while matching ", mrc);
-      if (pattern_count > 1) fprintf(stderr, "pattern number %d to ", i+1);
-      fprintf(stderr, "this line:\n");
-      fwrite(ptr, 1, linelength, stderr);   /* In case binary zero included */
-      fprintf(stderr, "\n");
-      if (error_count == 0 &&
-          (mrc == PCRE_ERROR_MATCHLIMIT || mrc == PCRE_ERROR_RECURSIONLIMIT))
-        {
-        fprintf(stderr, "pcregrep: error %d means that a resource limit "
-          "was exceeded\n", mrc);
-        fprintf(stderr, "pcregrep: check your regex for nested unlimited loops\n");
-        }
-      if (error_count++ > 20)
-        {
-        fprintf(stderr, "pcregrep: too many errors - abandoned\n");
-        exit(2);
-        }
-      match = invert;    /* No more matching; don't show the line again */
-      break;
-      }
-    }
+  /* Run through all the patterns until one matches or there is an error other
+  than NOMATCH. This code is in a subroutine so that it can be re-used for
+  finding subsequent matches when colouring matched lines. */
+
+  match = match_patterns(matchptr, length, offsets, &mrc);
 
   /* If it's a match or a not-match (as required), do what's wanted. */
 
@@ -685,14 +1072,37 @@
     else if (quiet) return 0;
 
     /* The --only-matching option prints just the substring that matched, and
-    does not pring any context. */
+    the --file-offsets and --line-offsets options output offsets for the
+    matching substring (they both force --only-matching). None of these options
+    prints any context. Afterwards, adjust the start and length, and then jump
+    back to look for further matches in the same line. If we are in invert
+    mode, however, nothing is printed - this could be still useful because the
+    return code is set. */
 
     else if (only_matching)
       {
-      if (printname != NULL) fprintf(stdout, "%s:", printname);
-      if (number) fprintf(stdout, "%d:", linenumber);
-      fwrite(ptr + offsets[0], 1, offsets[1] - offsets[0], stdout);
-      fprintf(stdout, "\n");
+      if (!invert)
+        {
+        if (printname != NULL) fprintf(stdout, "%s:", printname);
+        if (number) fprintf(stdout, "%d:", linenumber);
+        if (line_offsets)
+          fprintf(stdout, "%d,%d", (int)(matchptr + offsets[0] - ptr),
+            offsets[1] - offsets[0]);
+        else if (file_offsets)
+          fprintf(stdout, "%d,%d", (int)(filepos + matchptr + offsets[0] - ptr),
+            offsets[1] - offsets[0]);
+        else
+          {
+          if (do_colour) fprintf(stdout, "%c[%sm", 0x1b, colour_string);
+          fwrite(matchptr + offsets[0], 1, offsets[1] - offsets[0], stdout);
+          if (do_colour) fprintf(stdout, "%c[00m", 0x1b);
+          }
+        fprintf(stdout, "\n");
+        matchptr += offsets[1];
+        length -= offsets[1];
+        match = FALSE;
+        goto ONLY_MATCHING_RESTART;
+        }
       }
 
     /* This is the default case when none of the above options is set. We print
@@ -706,13 +1116,13 @@
 
       if (after_context > 0 && lastmatchnumber > 0)
         {
+        int ellength;
         int linecount = 0;
         char *p = lastmatchrestart;
 
         while (p < ptr && linecount < after_context)
           {
-          while (*p != endlinebyte) p++;
-          p++;
+          p = end_of_line(p, ptr, &ellength);
           linecount++;
           }
 
@@ -725,10 +1135,9 @@
           char *pp = lastmatchrestart;
           if (printname != NULL) fprintf(stdout, "%s-", printname);
           if (number) fprintf(stdout, "%d-", lastmatchnumber++);
-          while (*pp != endlinebyte) pp++;
-          fwrite(lastmatchrestart, 1, pp - lastmatchrestart +
-            (1 + endlineextra), stdout);
-          lastmatchrestart = pp + 1;
+          pp = end_of_line(pp, endptr, &ellength);
+          fwrite(lastmatchrestart, 1, pp - lastmatchrestart, stdout);
+          lastmatchrestart = pp;
           }
         if (lastmatchrestart != ptr) hyphenpending = TRUE;
         }
@@ -754,8 +1163,7 @@
                linecount < before_context)
           {
           linecount++;
-          p--;
-          while (p > buffer && p[-1] != endlinebyte) p--;
+          p = previous_line(p, buffer);
           }
 
         if (lastmatchnumber > 0 && p > lastmatchrestart && !hyphenprinted)
@@ -763,12 +1171,13 @@
 
         while (p < ptr)
           {
+          int ellength;
           char *pp = p;
           if (printname != NULL) fprintf(stdout, "%s-", printname);
           if (number) fprintf(stdout, "%d-", linenumber - linecount--);
-          while (*pp != endlinebyte) pp++;
-          fwrite(p, 1, pp - p + (1 + endlineextra), stdout);
-          p = pp + 1;
+          pp = end_of_line(pp, endptr, &ellength);
+          fwrite(p, 1, pp - p, stdout);
+          p = pp;
           }
         }
 
@@ -783,16 +1192,26 @@
 
       /* In multiline mode, we want to print to the end of the line in which
       the end of the matched string is found, so we adjust linelength and the
-      line number appropriately. Because the PCRE_FIRSTLINE option is set, the
-      start of the match will always be before the first newline sequence. */
+      line number appropriately, but only when there actually was a match
+      (invert not set). Because the PCRE_FIRSTLINE option is set, the start of
+      the match will always be before the first newline sequence. */
 
       if (multiline)
         {
-        char *endmatch = ptr + offsets[1];
-        t = ptr;
-        while (t < endmatch) { if (*t++ == endlinebyte) linenumber++; }
-        while (endmatch < endptr && *endmatch != endlinebyte) endmatch++;
-        linelength = endmatch - ptr;
+        int ellength;
+        char *endmatch = ptr;
+        if (!invert)
+          {
+          endmatch += offsets[1];
+          t = ptr;
+          while (t < endmatch)
+            {
+            t = end_of_line(t, endptr, &ellength);
+            if (t <= endmatch) linenumber++; else break;
+            }
+          }
+        endmatch = end_of_line(endmatch, endptr, &ellength);
+        linelength = endmatch - ptr - ellength;
         }
 
       /*** NOTE: Use only fwrite() to output the data line, so that binary
@@ -814,19 +1233,34 @@
       else
 #endif
 
-      /* We have to split the line(s) up if colouring. */
+      /* We have to split the line(s) up if colouring, and search for further
+      matches. */
 
       if (do_colour)
         {
+        int last_offset = 0;
         fwrite(ptr, 1, offsets[0], stdout);
         fprintf(stdout, "%c[%sm", 0x1b, colour_string);
         fwrite(ptr + offsets[0], 1, offsets[1] - offsets[0], stdout);
         fprintf(stdout, "%c[00m", 0x1b);
-        fwrite(ptr + offsets[1], 1, linelength - offsets[1], stdout);
+        for (;;)
+          {
+          last_offset += offsets[1];
+          matchptr += offsets[1];
+          length -= offsets[1];
+          if (!match_patterns(matchptr, length, offsets, &mrc)) break;
+          fwrite(matchptr, 1, offsets[0], stdout);
+          fprintf(stdout, "%c[%sm", 0x1b, colour_string);
+          fwrite(matchptr + offsets[0], 1, offsets[1] - offsets[0], stdout);
+          fprintf(stdout, "%c[00m", 0x1b);
+          }
+        fwrite(ptr + last_offset, 1, (linelength + endlinelength) - last_offset,
+          stdout);
         }
-      else fwrite(ptr, 1, linelength, stdout);
 
-      fprintf(stdout, "\n");
+      /* Not colouring; no need to search for further matches */
+
+      else fwrite(ptr, 1, linelength + endlinelength, stdout);
       }
 
     /* End of doing what has to be done for a match */
@@ -836,13 +1270,33 @@
     /* Remember where the last match happened for after_context. We remember
     where we are about to restart, and that line's number. */
 
-    lastmatchrestart = ptr + linelength + 1;
+    lastmatchrestart = ptr + linelength + endlinelength;
     lastmatchnumber = linenumber + 1;
     }
 
-  /* Advance to after the newline and increment the line number. */
+  /* For a match in multiline inverted mode (which of course did not cause
+  anything to be printed), we have to move on to the end of the match before
+  proceeding. */
+
+  if (multiline && invert && match)
+    {
+    int ellength;
+    char *endmatch = ptr + offsets[1];
+    t = ptr;
+    while (t < endmatch)
+      {
+      t = end_of_line(t, endptr, &ellength);
+      if (t <= endmatch) linenumber++; else break;
+      }
+    endmatch = end_of_line(endmatch, endptr, &ellength);
+    linelength = endmatch - ptr - ellength;
+    }
 
-  ptr += linelength + 1;
+  /* Advance to after the newline and increment the line number. The file
+  offset to the current line is maintained in filepos. */
+
+  ptr += linelength + endlinelength;
+  filepos += linelength + endlinelength;
   linenumber++;
 
   /* If we haven't yet reached the end of the file (the buffer is full), and
@@ -864,7 +1318,23 @@
 
     memmove(buffer, buffer + MBUFTHIRD, 2*MBUFTHIRD);
     ptr -= MBUFTHIRD;
+
+#ifdef SUPPORT_LIBZ
+    if (frtype == FR_LIBZ)
+      bufflength = 2*MBUFTHIRD +
+        gzread (ingz, buffer + 2*MBUFTHIRD, MBUFTHIRD);
+    else
+#endif
+
+#ifdef SUPPORT_LIBBZ2
+    if (frtype == FR_LIBBZ2)
+      bufflength = 2*MBUFTHIRD +
+        BZ2_bzread(inbz2, buffer + 2*MBUFTHIRD, MBUFTHIRD);
+    else
+#endif
+
     bufflength = 2*MBUFTHIRD + fread(buffer + 2*MBUFTHIRD, 1, MBUFTHIRD, in);
+
     endptr = buffer + bufflength;
 
     /* Adjust any last match point */
@@ -928,21 +1398,32 @@
 {
 int rc = 1;
 int sep;
-FILE *in;
+int frtype;
+int pathlen;
+void *handle;
+FILE *in = NULL;           /* Ensure initialized */
+
+#ifdef SUPPORT_LIBZ
+gzFile ingz = NULL;
+#endif
+
+#ifdef SUPPORT_LIBBZ2
+BZFILE *inbz2 = NULL;
+#endif
 
 /* If the file name is "-" we scan stdin */
 
 if (strcmp(pathname, "-") == 0)
   {
-  return pcregrep(stdin,
+  return pcregrep(stdin, FR_PLAIN,
     (filenames > FN_DEFAULT || (filenames == FN_DEFAULT && !only_one_at_top))?
       stdin_name : NULL);
   }
 
-
 /* If the file is a directory, skip if skipping or if we are recursing, scan
-each file within it, subject to any include or exclude patterns that were set.
-The scanning code is localized so it can be made system-specific. */
+each file and directory within it, subject to any include or exclude patterns
+that were set. The scanning code is localized so it can be made
+system-specific. */
 
 if ((sep = isdirectory(pathname)) != 0)
   {
@@ -963,17 +1444,30 @@
 
     while ((nextfile = readdirectory(dir)) != NULL)
       {
-      int frc, blen;
+      int frc, nflen;
       sprintf(buffer, "%.512s%c%.128s", pathname, sep, nextfile);
-      blen = strlen(buffer);
+      nflen = strlen(nextfile);
+
+      if (isdirectory(buffer))
+        {
+        if (exclude_dir_compiled != NULL &&
+            pcre_exec(exclude_dir_compiled, NULL, nextfile, nflen, 0, 0, NULL, 0) >= 0)
+          continue;
+
+        if (include_dir_compiled != NULL &&
+            pcre_exec(include_dir_compiled, NULL, nextfile, nflen, 0, 0, NULL, 0) < 0)
+          continue;
+        }
+      else
+        {
+        if (exclude_compiled != NULL &&
+            pcre_exec(exclude_compiled, NULL, nextfile, nflen, 0, 0, NULL, 0) >= 0)
+          continue;
 
-      if (exclude_compiled != NULL &&
-          pcre_exec(exclude_compiled, NULL, buffer, blen, 0, 0, NULL, 0) >= 0)
-        continue;
-
-      if (include_compiled != NULL &&
-          pcre_exec(include_compiled, NULL, buffer, blen, 0, 0, NULL, 0) < 0)
-        continue;
+        if (include_compiled != NULL &&
+            pcre_exec(include_compiled, NULL, nextfile, nflen, 0, 0, NULL, 0) < 0)
+          continue;
+        }
 
       frc = grep_or_recurse(buffer, dir_recurse, FALSE);
       if (frc > 1) rc = frc;
@@ -996,8 +1490,54 @@
 argument at top level, we don't show the file name, unless we are only showing
 the file name, or the filename was forced (-H). */
 
-in = fopen(pathname, "r");
-if (in == NULL)
+pathlen = strlen(pathname);
+
+/* Open using zlib if it is supported and the file name ends with .gz. */
+
+#ifdef SUPPORT_LIBZ
+if (pathlen > 3 && strcmp(pathname + pathlen - 3, ".gz") == 0)
+  {
+  ingz = gzopen(pathname, "rb");
+  if (ingz == NULL)
+    {
+    if (!silent)
+      fprintf(stderr, "pcregrep: Failed to open %s: %s\n", pathname,
+        strerror(errno));
+    return 2;
+    }
+  handle = (void *)ingz;
+  frtype = FR_LIBZ;
+  }
+else
+#endif
+
+/* Otherwise open with bz2lib if it is supported and the name ends with .bz2. */
+
+#ifdef SUPPORT_LIBBZ2
+if (pathlen > 4 && strcmp(pathname + pathlen - 4, ".bz2") == 0)
+  {
+  inbz2 = BZ2_bzopen(pathname, "rb");
+  handle = (void *)inbz2;
+  frtype = FR_LIBBZ2;
+  }
+else
+#endif
+
+/* Otherwise use plain fopen(). The label is so that we can come back here if
+an attempt to read a .bz2 file indicates that it really is a plain file. */
+
+#ifdef SUPPORT_LIBBZ2
+PLAIN_FILE:
+#endif
+  {
+  in = fopen(pathname, "r");
+  handle = (void *)in;
+  frtype = FR_PLAIN;
+  }
+
+/* All the opening methods return errno when they fail. */
+
+if (handle == NULL)
   {
   if (!silent)
     fprintf(stderr, "pcregrep: Failed to open %s: %s\n", pathname,
@@ -1005,10 +1545,50 @@
   return 2;
   }
 
-rc = pcregrep(in, (filenames > FN_DEFAULT ||
+/* Now grep the file */
+
+rc = pcregrep(handle, frtype, (filenames > FN_DEFAULT ||
   (filenames == FN_DEFAULT && !only_one_at_top))? pathname : NULL);
 
+/* Close in an appropriate manner. */
+
+#ifdef SUPPORT_LIBZ
+if (frtype == FR_LIBZ)
+  gzclose(ingz);
+else
+#endif
+
+/* If it is a .bz2 file and the result is 2, it means that the first attempt to
+read failed. If the error indicates that the file isn't in fact bzipped, try
+again as a normal file. */
+
+#ifdef SUPPORT_LIBBZ2
+if (frtype == FR_LIBBZ2)
+  {
+  if (rc == 2)
+    {
+    int errnum;
+    const char *err = BZ2_bzerror(inbz2, &errnum);
+    if (errnum == BZ_DATA_ERROR_MAGIC)
+      {
+      BZ2_bzclose(inbz2);
+      goto PLAIN_FILE;
+      }
+    else if (!silent)
+      fprintf(stderr, "pcregrep: Failed to read %s using bzlib: %s\n",
+        pathname, err);
+    }
+  BZ2_bzclose(inbz2);
+  }
+else
+#endif
+
+/* Normal file close */
+
 fclose(in);
+
+/* Pass back the yield from pcregrep(). */
+
 return rc;
 }
 
@@ -1029,7 +1609,8 @@
   if (op->one_char > 0) fprintf(stderr, "%c", op->one_char);
   }
 fprintf(stderr, "] [long options] [pattern] [files]\n");
-fprintf(stderr, "Type `pcregrep --help' for more information.\n");
+fprintf(stderr, "Type `pcregrep --help' for more information and the long "
+  "options.\n");
 return rc;
 }
 
@@ -1048,9 +1629,23 @@
 printf("Usage: pcregrep [OPTION]... [PATTERN] [FILE1 FILE2 ...]\n");
 printf("Search for PATTERN in each FILE or standard input.\n");
 printf("PATTERN must be present if neither -e nor -f is used.\n");
-printf("\"-\" can be used as a file name to mean STDIN.\n\n");
-printf("Example: pcregrep -i 'hello.*world' menu.h main.c\n\n");
+printf("\"-\" can be used as a file name to mean STDIN.\n");
 
+#ifdef SUPPORT_LIBZ
+printf("Files whose names end in .gz are read using zlib.\n");
+#endif
+
+#ifdef SUPPORT_LIBBZ2
+printf("Files whose names end in .bz2 are read using bzlib2.\n");
+#endif
+
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
+printf("Other files and the standard input are read as plain files.\n\n");
+#else
+printf("All files are read as plain files, without any interpretation.\n\n");
+#endif
+
+printf("Example: pcregrep -i 'hello.*world' menu.h main.c\n\n");
 printf("Options:\n");
 
 for (op = optionlist; op->one_char != 0; op++)
@@ -1058,8 +1653,7 @@
   int n;
   char s[4];
   if (op->one_char > 0) sprintf(s, "-%c,", op->one_char); else strcpy(s, "   ");
-  printf("  %s --%s%n", s, op->long_name, &n);
-  n = 30 - n;
+  n = 30 - printf("  %s --%s", s, op->long_name);
   if (n < 1) n = 1;
   printf("%.*s%s\n", n, "                    ", op->help_text);
   }
@@ -1084,7 +1678,9 @@
 {
 switch(letter)
   {
+  case N_FOFFSETS: file_offsets = TRUE; break;
   case N_HELP: help(); exit(0);
+  case N_LOFFSETS: line_offsets = number = TRUE; break;
   case 'c': count_only = TRUE; break;
   case 'F': process_options |= PO_FIXED_STRINGS; break;
   case 'H': filenames = FN_FORCE; break;
@@ -1098,14 +1694,13 @@
   case 'q': quiet = TRUE; break;
   case 'r': dee_action = dee_RECURSE; break;
   case 's': silent = TRUE; break;
-  case 'u': options |= PCRE_UTF8; break;
+  case 'u': options |= PCRE_UTF8; utf8 = TRUE; break;
   case 'v': invert = TRUE; break;
   case 'w': process_options |= PO_WORD_MATCH; break;
   case 'x': process_options |= PO_LINE_MATCH; break;
 
   case 'V':
-  fprintf(stderr, "pcregrep version %s using ", VERSION);
-  fprintf(stderr, "PCRE version %s\n", pcre_version());
+  fprintf(stderr, "pcregrep version %s\n", pcre_version());
   exit(0);
   break;
 
@@ -1181,7 +1776,11 @@
   suffix[process_options]);
 pattern_list[pattern_count] =
   pcre_compile(buffer, options, &error, &errptr, pcretables);
-if (pattern_list[pattern_count++] != NULL) return TRUE;
+if (pattern_list[pattern_count] != NULL)
+  {
+  pattern_count++;
+  return TRUE;
+  }
 
 /* Handle compile errors */
 
@@ -1231,14 +1830,16 @@
 {
 if ((process_options & PO_FIXED_STRINGS) != 0)
   {
+  char *eop = pattern + strlen(pattern);
   char buffer[MBUFTHIRD];
   for(;;)
     {
-    char *p = strchr(pattern, endlinebyte);
-    if (p == NULL)
+    int ellength;
+    char *p = end_of_line(pattern, eop, &ellength);
+    if (ellength == 0)
       return compile_single_pattern(pattern, options, filename, count);
-    sprintf(buffer, "%.*s", p - pattern - endlineextra, pattern);
-    pattern = p + 1;
+    sprintf(buffer, "%.*s", (int)(p - pattern - ellength), pattern);
+    pattern = p;
     if (!compile_single_pattern(buffer, options, filename, count))
       return FALSE;
     }
@@ -1261,20 +1862,27 @@
 int rc = 1;
 int pcre_options = 0;
 int cmd_pattern_count = 0;
+int hint_count = 0;
 int errptr;
 BOOL only_one_at_top;
 char *patterns[MAX_PATTERN_COUNT];
 const char *locale_from = "--locale";
 const char *error;
 
-/* Set the default line ending value from the default in the PCRE library. */
+/* Set the default line ending value from the default in the PCRE library;
+"lf", "cr", "crlf", and "any" are supported. Anything else is treated as "lf".
+Note that the return values from pcre_config(), though derived from the ASCII
+codes, are the same in EBCDIC environments, so we must use the actual values
+rather than escapes such as as '\r'. */
 
 (void)pcre_config(PCRE_CONFIG_NEWLINE, &i);
 switch(i)
   {
-  default:                 newline = (char *)"lf"; break;
-  case '\r':               newline = (char *)"cr"; break;
-  case ('\r' << 8) | '\n': newline = (char *)"crlf"; break;
+  default:               newline = (char *)"lf"; break;
+  case 13:               newline = (char *)"cr"; break;
+  case (13 << 8) | 10:   newline = (char *)"crlf"; break;
+  case -1:               newline = (char *)"any"; break;
+  case -2:               newline = (char *)"anycrlf"; break;
   }
 
 /* Process the options */
@@ -1332,7 +1940,7 @@
         else                 /* Special case xxx=data */
           {
           int oplen = equals - op->long_name;
-          int arglen = (argequals == NULL)? strlen(arg) : argequals - arg;
+          int arglen = (argequals == NULL)? (int)strlen(arg) : argequals - arg;
           if (oplen == arglen && strncmp(arg, op->long_name, oplen) == 0)
             {
             option_data = arg + arglen;
@@ -1351,8 +1959,8 @@
         char buff2[24];
         int baselen = opbra - op->long_name;
         sprintf(buff1, "%.*s", baselen, op->long_name);
-        sprintf(buff2, "%s%.*s", buff1, strlen(op->long_name) - baselen - 2,
-          opbra + 1);
+        sprintf(buff2, "%s%.*s", buff1,
+          (int)strlen(op->long_name) - baselen - 2, opbra + 1);
         if (strcmp(arg, buff1) == 0 || strcmp(arg, buff2) == 0)
           break;
         }
@@ -1511,6 +2119,19 @@
   if (before_context == 0) before_context = both_context;
   }
 
+/* Only one of --only-matching, --file-offsets, or --line-offsets is permitted.
+However, the latter two set the only_matching flag. */
+
+if ((only_matching && (file_offsets || line_offsets)) ||
+    (file_offsets && line_offsets))
+  {
+  fprintf(stderr, "pcregrep: Cannot mix --only-matching, --file-offsets "
+    "and/or --line-offsets\n");
+  exit(usage(2));
+  }
+
+if (file_offsets || line_offsets) only_matching = TRUE;
+
 /* If a locale has not been provided as an option, see if the LC_CTYPE or
 LC_ALL environment variable is set, and if so, use it. */
 
@@ -1565,16 +2186,27 @@
 if (strcmp(newline, "cr") == 0 || strcmp(newline, "CR") == 0)
   {
   pcre_options |= PCRE_NEWLINE_CR;
-  endlinebyte = '\r';
+  endlinetype = EL_CR;
   }
 else if (strcmp(newline, "lf") == 0 || strcmp(newline, "LF") == 0)
   {
   pcre_options |= PCRE_NEWLINE_LF;
+  endlinetype = EL_LF;
   }
 else if (strcmp(newline, "crlf") == 0 || strcmp(newline, "CRLF") == 0)
   {
   pcre_options |= PCRE_NEWLINE_CRLF;
-  endlineextra = 1;
+  endlinetype = EL_CRLF;
+  }
+else if (strcmp(newline, "any") == 0 || strcmp(newline, "ANY") == 0)
+  {
+  pcre_options |= PCRE_NEWLINE_ANY;
+  endlinetype = EL_ANY;
+  }
+else if (strcmp(newline, "anycrlf") == 0 || strcmp(newline, "ANYCRLF") == 0)
+  {
+  pcre_options |= PCRE_NEWLINE_ANYCRLF;
+  endlinetype = EL_ANYCRLF;
   }
 else
   {
@@ -1630,7 +2262,7 @@
 if (pattern_list == NULL || hints_list == NULL)
   {
   fprintf(stderr, "pcregrep: malloc failed\n");
-  return 2;
+  goto EXIT2;
   }
 
 /* If no patterns were provided by -e, and there is no file provided by -f,
@@ -1649,7 +2281,7 @@
   {
   if (!compile_pattern(patterns[j], pcre_options, NULL,
        (j == 0 && cmd_pattern_count == 1)? 0 : j + 1))
-    return 2;
+    goto EXIT2;
   }
 
 /* Compile the regular expressions that are provided in a file. */
@@ -1673,7 +2305,7 @@
       {
       fprintf(stderr, "pcregrep: Failed to open %s: %s\n", pattern_filename,
         strerror(errno));
-      return 2;
+      goto EXIT2;
       }
     filename = pattern_filename;
     }
@@ -1686,7 +2318,7 @@
     linenumber++;
     if (buffer[0] == 0) continue;   /* Skip blank lines */
     if (!compile_pattern(buffer, pcre_options, filename, linenumber))
-      return 2;
+      goto EXIT2;
     }
 
   if (f != stdin) fclose(f);
@@ -1702,8 +2334,9 @@
     char s[16];
     if (pattern_count == 1) s[0] = 0; else sprintf(s, " number %d", j);
     fprintf(stderr, "pcregrep: Error while studying regex%s: %s\n", s, error);
-    return 2;
+    goto EXIT2;
     }
+  hint_count++;
   }
 
 /* If there are include or exclude patterns, compile them. */
@@ -1716,7 +2349,7 @@
     {
     fprintf(stderr, "pcregrep: Error in 'exclude' regex at offset %d: %s\n",
       errptr, error);
-    return 2;
+    goto EXIT2;
     }
   }
 
@@ -1728,14 +2361,41 @@
     {
     fprintf(stderr, "pcregrep: Error in 'include' regex at offset %d: %s\n",
       errptr, error);
-    return 2;
+    goto EXIT2;
+    }
+  }
+
+if (exclude_dir_pattern != NULL)
+  {
+  exclude_dir_compiled = pcre_compile(exclude_dir_pattern, 0, &error, &errptr,
+    pcretables);
+  if (exclude_dir_compiled == NULL)
+    {
+    fprintf(stderr, "pcregrep: Error in 'exclude_dir' regex at offset %d: %s\n",
+      errptr, error);
+    goto EXIT2;
+    }
+  }
+
+if (include_dir_pattern != NULL)
+  {
+  include_dir_compiled = pcre_compile(include_dir_pattern, 0, &error, &errptr,
+    pcretables);
+  if (include_dir_compiled == NULL)
+    {
+    fprintf(stderr, "pcregrep: Error in 'include_dir' regex at offset %d: %s\n",
+      errptr, error);
+    goto EXIT2;
     }
   }
 
 /* If there are no further arguments, do the business on stdin and exit. */
 
 if (i >= argc)
-  return pcregrep(stdin, (filenames > FN_DEFAULT)? stdin_name : NULL);
+  {
+  rc = pcregrep(stdin, FR_PLAIN, (filenames > FN_DEFAULT)? stdin_name : NULL);
+  goto EXIT;
+  }
 
 /* Otherwise, work through the remaining arguments as files or directories.
 Pass in the fact that there is only one argument at top level - this suppresses
@@ -1752,7 +2412,22 @@
     else if (frc == 0 && rc == 1) rc = 0;
   }
 
+EXIT:
+if (pattern_list != NULL)
+  {
+  for (i = 0; i < pattern_count; i++) free(pattern_list[i]);
+  free(pattern_list);
+  }
+if (hints_list != NULL)
+  {
+  for (i = 0; i < hint_count; i++) free(hints_list[i]);
+  free(hints_list);
+  }
 return rc;
+
+EXIT2:
+rc = 2;
+goto EXIT;
 }
 
 /* End of pcregrep */

Modified: freeswitch/trunk/libs/pcre/pcreposix.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcreposix.c	(original)
+++ freeswitch/trunk/libs/pcre/pcreposix.c	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2006 University of Cambridge
+           Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -42,10 +42,24 @@
 functions. */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
+/* Ensure that the PCREPOSIX_EXP_xxx macros are set appropriately for
+compiling these functions. This must come before including pcreposix.h, where
+they are set for an application (using these functions) if they have not
+previously been set. */
+
+#if defined(_WIN32) && !defined(PCRE_STATIC)
+#  define PCREPOSIX_EXP_DECL extern __declspec(dllexport)
+#  define PCREPOSIX_EXP_DEFN __declspec(dllexport)
+#endif
+
+#include "pcre.h"
 #include "pcre_internal.h"
 #include "pcreposix.h"
-#include "stdlib.h"
-
 
 
 /* Table to translate PCRE compile time error codes into POSIX error codes. */
@@ -78,9 +92,9 @@
   REG_BADPAT,  /* unrecognized character after (?< */
   REG_BADPAT,  /* lookbehind assertion is not fixed length */
   REG_BADPAT,  /* malformed number or name after (?( */
-  REG_BADPAT,  /* conditional group containe more than two branches */
+  REG_BADPAT,  /* conditional group contains more than two branches */
   REG_BADPAT,  /* assertion expected after (?( */
-  REG_BADPAT,  /* (?R or (?digits must be followed by ) */
+  REG_BADPAT,  /* (?R or (?[+-]digits must be followed by ) */
   REG_ECTYPE,  /* unknown POSIX class name */
   REG_BADPAT,  /* POSIX collating elements are not supported */
   REG_INVARG,  /* this version of PCRE is not compiled with PCRE_UTF8 support */
@@ -93,7 +107,7 @@
   REG_BADPAT,  /* closing ) for (?C expected */
   REG_BADPAT,  /* recursive call could loop indefinitely */
   REG_BADPAT,  /* unrecognized character after (?P */
-  REG_BADPAT,  /* syntax error after (?P */
+  REG_BADPAT,  /* syntax error in subpattern name (missing terminator) */
   REG_BADPAT,  /* two named subpatterns have the same name */
   REG_BADPAT,  /* invalid UTF-8 string */
   REG_BADPAT,  /* support for \P, \p, and \X has not been compiled */
@@ -102,7 +116,18 @@
   REG_BADPAT,  /* subpattern name is too long (maximum 32 characters) */
   REG_BADPAT,  /* too many named subpatterns (maximum 10,000) */
   REG_BADPAT,  /* repeated subpattern is too long */
-  REG_BADPAT   /* octal value is greater than \377 (not in UTF-8 mode) */
+  REG_BADPAT,  /* octal value is greater than \377 (not in UTF-8 mode) */
+  REG_BADPAT,  /* internal error: overran compiling workspace */
+  REG_BADPAT,  /* internal error: previously-checked referenced subpattern not found */
+  REG_BADPAT,  /* DEFINE group contains more than one branch */
+  REG_BADPAT,  /* repeating a DEFINE group is not allowed */
+  REG_INVARG,  /* inconsistent NEWLINE options */
+  REG_BADPAT,  /* \g is not followed followed by an (optionally braced) non-zero number */
+  REG_BADPAT,  /* (?+ or (?- must be followed by a non-zero number */
+  REG_BADPAT,  /* number is too big */
+  REG_BADPAT,  /* subpattern name expected */
+  REG_BADPAT,  /* digit expected after (?+ */
+  REG_BADPAT   /* ] is an invalid data character in JavaScript compatibility mode */
 };
 
 /* Table of texts corresponding to POSIX error codes */
@@ -135,7 +160,7 @@
 *          Translate error code to string        *
 *************************************************/
 
-PCRE_DATA_SCOPE size_t
+PCREPOSIX_EXP_DEFN size_t PCRE_CALL_CONVENTION
 regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
 {
 const char *message, *addmessage;
@@ -170,7 +195,7 @@
 *           Free store held by a regex           *
 *************************************************/
 
-PCRE_DATA_SCOPE void
+PCREPOSIX_EXP_DEFN void PCRE_CALL_CONVENTION
 regfree(regex_t *preg)
 {
 (pcre_free)(preg->re_pcre);
@@ -193,7 +218,7 @@
               various non-zero codes on failure
 */
 
-PCRE_DATA_SCOPE int
+PCREPOSIX_EXP_DEFN int PCRE_CALL_CONVENTION
 regcomp(regex_t *preg, const char *pattern, int cflags)
 {
 const char *errorptr;
@@ -235,11 +260,11 @@
 be set. When this is the case, the nmatch and pmatch arguments are ignored, and
 the only result is yes/no/error. */
 
-PCRE_DATA_SCOPE int
+PCREPOSIX_EXP_DEFN int PCRE_CALL_CONVENTION
 regexec(const regex_t *preg, const char *string, size_t nmatch,
   regmatch_t pmatch[], int eflags)
 {
-int rc;
+int rc, so, eo;
 int options = 0;
 int *ovector = NULL;
 int small_ovector[POSIX_MALLOC_THRESHOLD * 3];
@@ -249,6 +274,7 @@
 
 if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
 if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
+if ((eflags & REG_NOTEMPTY) != 0) options |= PCRE_NOTEMPTY;
 
 ((regex_t *)preg)->re_erroffset = (size_t)(-1);  /* Only has meaning after compile */
 
@@ -272,7 +298,23 @@
     }
   }
 
-rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string, (int)strlen(string),
+/* REG_STARTEND is a BSD extension, to allow for non-NUL-terminated strings.
+The man page from OS X says "REG_STARTEND affects only the location of the
+string, not how it is matched". That is why the "so" value is used to bump the
+start location rather than being passed as a PCRE "starting offset". */
+
+if ((eflags & REG_STARTEND) != 0)
+  {
+  so = pmatch[0].rm_so;
+  eo = pmatch[0].rm_eo;
+  }
+else
+  {
+  so = 0;
+  eo = strlen(string);
+  }
+
+rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string + so, (eo - so),
   0, options, ovector, nmatch * 3);
 
 if (rc == 0) rc = nmatch;    /* All captured slots were filled in */

Modified: freeswitch/trunk/libs/pcre/pcreposix.h
==============================================================================
--- freeswitch/trunk/libs/pcre/pcreposix.h	(original)
+++ freeswitch/trunk/libs/pcre/pcreposix.h	Mon Jun  8 18:51:30 2009
@@ -9,7 +9,7 @@
 Compatible Regular Expression library. It defines the things POSIX says should
 be there. I hope.
 
-            Copyright (c) 1997-2006 University of Cambridge
+            Copyright (c) 1997-2009 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,8 @@
 #define REG_DOTALL    0x0010   /* NOT defined by POSIX. */
 #define REG_NOSUB     0x0020
 #define REG_UTF8      0x0040   /* NOT defined by POSIX. */
+#define REG_STARTEND  0x0080   /* BSD feature: pass subject string by so,eo */
+#define REG_NOTEMPTY  0x0100   /* NOT defined by POSIX. */
 
 /* This is not used by PCRE, but by defining it we make it easier
 to slot PCRE into existing programs that make POSIX calls. */
@@ -105,40 +107,35 @@
   regoff_t rm_eo;
 } regmatch_t;
 
-/* Win32 uses DLL by default; it needs special stuff for exported functions
-when building PCRE. */
-
-#ifndef PCRE_DATA_SCOPE
-#ifdef _WIN32
-#  ifdef PCRE_DEFINITION
-#    ifdef DLL_EXPORT
-#      define PCRE_DATA_SCOPE __declspec(dllexport)
-#    endif
-#  else
-#    ifndef PCRE_STATIC
-#      define PCRE_DATA_SCOPE extern __declspec(dllimport)
-#    endif
-#  endif
-#endif
+/* When an application links to a PCRE DLL in Windows, the symbols that are
+imported have to be identified as such. When building PCRE, the appropriate
+export settings are needed, and are set in pcreposix.c before including this
+file. */
+
+#if defined(_WIN32) && !defined(PCRE_STATIC) && !defined(PCREPOSIX_EXP_DECL)
+#  define PCREPOSIX_EXP_DECL  extern __declspec(dllimport)
+#  define PCREPOSIX_EXP_DEFN  __declspec(dllimport)
 #endif
 
-/* Otherwise, we use the standard "extern". */
+/* By default, we use the standard "extern" declarations. */
 
-#ifndef PCRE_DATA_SCOPE
+#ifndef PCREPOSIX_EXP_DECL
 #  ifdef __cplusplus
-#    define PCRE_DATA_SCOPE     extern "C"
+#    define PCREPOSIX_EXP_DECL  extern "C"
+#    define PCREPOSIX_EXP_DEFN  extern "C"
 #  else
-#    define PCRE_DATA_SCOPE     extern
+#    define PCREPOSIX_EXP_DECL  extern
+#    define PCREPOSIX_EXP_DEFN  extern
 #  endif
 #endif
 
 /* The functions */
 
-PCRE_DATA_SCOPE int regcomp(regex_t *, const char *, int);
-PCRE_DATA_SCOPE int regexec(const regex_t *, const char *, size_t,
-                  regmatch_t *, int);
-PCRE_DATA_SCOPE size_t regerror(int, const regex_t *, char *, size_t);
-PCRE_DATA_SCOPE void regfree(regex_t *);
+PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
+PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
+                     regmatch_t *, int);
+PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t);
+PCREPOSIX_EXP_DECL void regfree(regex_t *);
 
 #ifdef __cplusplus
 }   /* extern "C" */

Modified: freeswitch/trunk/libs/pcre/pcretest.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcretest.c	(original)
+++ freeswitch/trunk/libs/pcre/pcretest.c	Mon Jun  8 18:51:30 2009
@@ -36,6 +36,10 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -44,23 +48,62 @@
 #include 
 #include 
 
-#ifndef _WIN32
-#include 
+#ifdef SUPPORT_LIBREADLINE
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
+#include 
+#include 
 #endif
 
-#define PCRE_SPY        /* For Win32 build, import data, not export */
 
-/* We include pcre_internal.h because we need the internal info for displaying
-the results of pcre_study() and we also need to know about the internal
-macros, structures, and other internal data values; pcretest has "inside
-information" compared to a program that strictly follows the PCRE API. */
+/* A number of things vary for Windows builds. Originally, pcretest opened its
+input and output without "b"; then I was told that "b" was needed in some
+environments, so it was added for release 5.0 to both the input and output. (It
+makes no difference on Unix-like systems.) Later I was told that it is wrong
+for the input on Windows. I've now abstracted the modes into two macros that
+are set here, to make it easier to fiddle with them, and removed "b" from the
+input mode under Windows. */
+
+#if defined(_WIN32) || defined(WIN32)
+#include                 /* For _setmode() */
+#include              /* For _O_BINARY */
+#define INPUT_MODE   "r"
+#define OUTPUT_MODE  "wb"
+
+#ifndef isatty
+#define isatty _isatty         /* This is what Windows calls them, I'm told, */
+#endif                         /* though in some environments they seem to   */
+                               /* be already defined, hence the #ifndefs.    */
+#ifndef fileno
+#define fileno _fileno
+#endif
+
+#else
+#include           /* These two includes are needed */
+#include       /* for setrlimit(). */
+#define INPUT_MODE   "rb"
+#define OUTPUT_MODE  "wb"
+#endif
+
 
+/* We have to include pcre_internal.h because we need the internal info for
+displaying the results of pcre_study() and we also need to know about the
+internal macros, structures, and other internal data values; pcretest has
+"inside information" compared to a program that strictly follows the PCRE API.
+
+Although pcre_internal.h does itself include pcre.h, we explicitly include it
+here before pcre_internal.h so that the PCRE_EXP_xxx macros get set
+appropriately for an application, not for building PCRE. */
+
+#include "pcre.h"
 #include "pcre_internal.h"
 
-/* We need access to the data tables that PCRE uses. So as not to have to keep
-two copies, we include the source file here, changing the names of the external
-symbols to prevent clashes. */
+/* We need access to some of the data tables that PCRE uses. So as not to have
+to keep two copies, we include the source file here, changing the names of the
+external symbols to prevent clashes. */
 
+#define _pcre_ucp_gentype      ucp_gentype
 #define _pcre_utf8_table1      utf8_table1
 #define _pcre_utf8_table1_size utf8_table1_size
 #define _pcre_utf8_table2      utf8_table2
@@ -68,16 +111,25 @@
 #define _pcre_utf8_table4      utf8_table4
 #define _pcre_utt              utt
 #define _pcre_utt_size         utt_size
+#define _pcre_utt_names        utt_names
 #define _pcre_OP_lengths       OP_lengths
 
 #include "pcre_tables.c"
 
 /* We also need the pcre_printint() function for printing out compiled
 patterns. This function is in a separate file so that it can be included in
-pcre_compile.c when that module is compiled with debugging enabled. */
+pcre_compile.c when that module is compiled with debugging enabled.
+
+The definition of the macro PRINTABLE, which determines whether to print an
+output character as-is or as a hex value when showing compiled patterns, is
+contained in this file. We uses it here also, in cases when the locale has not
+been explicitly changed, so as to get consistent output from systems that
+differ in their output from isprint() even in the "C" locale. */
 
 #include "pcre_printint.src"
 
+#define PRINTHEX(c) (locale_set? isprint(c) : PRINTABLE(c))
+
 
 /* It is possible to compile this test program without including support for
 testing the POSIX interface, though this is not available via the standard
@@ -87,10 +139,17 @@
 #include "pcreposix.h"
 #endif
 
-/* It is also possible, for the benefit of the version imported into Exim, to
-build pcretest without support for UTF8 (define NOUTF8), without the interface
-to the DFA matcher (NODFA), and without the doublecheck of the old "info"
-function (define NOINFOCHECK). */
+/* It is also possible, for the benefit of the version currently imported into
+Exim, to build pcretest without support for UTF8 (define NOUTF8), without the
+interface to the DFA matcher (NODFA), and without the doublecheck of the old
+"info" function (define NOINFOCHECK). In fact, we automatically cut out the
+UTF8 support if PCRE is built without it. */
+
+#ifndef SUPPORT_UTF8
+#ifndef NOUTF8
+#define NOUTF8
+#endif
+#endif
 
 
 /* Other parameters */
@@ -103,6 +162,8 @@
 #endif
 #endif
 
+/* This is the default loop count for timing. */
+
 #define LOOPREPEAT 500000
 
 /* Static variables */
@@ -113,7 +174,9 @@
 static int callout_extra;
 static int callout_fail_count;
 static int callout_fail_id;
+static int debug_lengths;
 static int first_callout;
+static int locale_set = 0;
 static int show_malloc;
 static int use_utf8;
 static size_t gotten_store;
@@ -143,6 +206,7 @@
 Arguments:
   f            the file to read
   start        where in buffer to start (this *must* be within buffer)
+  prompt       for stdin or readline()
 
 Returns:       pointer to the start of new data
                could be a copy of start, or could be moved
@@ -150,18 +214,47 @@
 */
 
 static uschar *
-extend_inputline(FILE *f, uschar *start)
+extend_inputline(FILE *f, uschar *start, const char *prompt)
 {
 uschar *here = start;
 
 for (;;)
   {
   int rlen = buffer_size - (here - buffer);
+
   if (rlen > 1000)
     {
     int dlen;
-    if (fgets((char *)here, rlen,  f) == NULL)
-      return (here == start)? NULL : start;
+
+    /* If libreadline support is required, use readline() to read a line if the
+    input is a terminal. Note that readline() removes the trailing newline, so
+    we must put it back again, to be compatible with fgets(). */
+
+#ifdef SUPPORT_LIBREADLINE
+    if (isatty(fileno(f)))
+      {
+      size_t len;
+      char *s = readline(prompt);
+      if (s == NULL) return (here == start)? NULL : start;
+      len = strlen(s);
+      if (len > 0) add_history(s);
+      if (len > rlen - 1) len = rlen - 1;
+      memcpy(here, s, len);
+      here[len] = '\n';
+      here[len+1] = 0;
+      free(s);
+      }
+    else
+#endif
+
+    /* Read the next line by normal means, prompting if the file is stdin. */
+
+      {
+      if (f == stdin) printf(prompt);
+      if (fgets((char *)here, rlen,  f) == NULL)
+        return (here == start)? NULL : start;
+      }
+
     dlen = (int)strlen((char *)here);
     if (dlen > 0 && here[dlen - 1] == '\n') return start;
     here += dlen;
@@ -213,7 +306,7 @@
 
 /* We don't use strtoul() because SunOS4 doesn't have it. Rather than mess
 around with conditional compilation, just do the job by hand. It is only used
-for unpicking the -o argument, so just keep it simple.
+for unpicking arguments, so just keep it simple.
 
 Arguments:
   str           string to be converted
@@ -311,6 +404,8 @@
 Returns:     number of characters placed in the buffer
 */
 
+#if !defined NOUTF8
+
 static int
 ord2utf8(int cvalue, uschar *utf8bytes)
 {
@@ -327,6 +422,8 @@
 return i + 1;
 }
 
+#endif
+
 
 
 /*************************************************
@@ -353,16 +450,19 @@
       {
       length -= rc - 1;
       p += rc;
-      if (c < 256 && isprint(c))
+      if (PRINTHEX(c))
         {
         if (f != NULL) fprintf(f, "%c", c);
         yield++;
         }
       else
         {
-        int n;
-        if (f != NULL) fprintf(f, "\\x{%02x}%n", c, &n);
-        yield += n;
+        int n = 4;
+        if (f != NULL) fprintf(f, "\\x{%02x}", c);
+        yield += (n <= 0x000000ff)? 2 :
+                 (n <= 0x00000fff)? 3 :
+                 (n <= 0x0000ffff)? 4 :
+                 (n <= 0x000fffff)? 5 : 6;
         }
       continue;
       }
@@ -371,7 +471,8 @@
 
    /* Not UTF-8, or malformed UTF-8  */
 
-  if (isprint(c = *(p++)))
+  c = *p++;
+  if (PRINTHEX(c))
     {
     if (f != NULL) fprintf(f, "%c", c);
     yield++;
@@ -610,11 +711,38 @@
 
 
 /*************************************************
+*         Case-independent strncmp() function    *
+*************************************************/
+
+/*
+Arguments:
+  s         first string
+  t         second string
+  n         number of characters to compare
+
+Returns:    < 0, = 0, or > 0, according to the comparison
+*/
+
+static int
+strncmpic(uschar *s, uschar *t, int n)
+{
+while (n--)
+  {
+  int c = tolower(*s++) - tolower(*t++);
+  if (c) return c;
+  }
+return 0;
+}
+
+
+
+/*************************************************
 *         Check newline indicator                *
 *************************************************/
 
 /* This is used both at compile and run-time to check for  escapes, where
-xxx is LF, CR, or CRLF. Print a message and return 0 if there is no match.
+xxx is LF, CR, CRLF, ANYCRLF, or ANY. Print a message and return 0 if there is
+no match.
 
 Arguments:
   p           points after the leading '<'
@@ -626,9 +754,13 @@
 static int
 check_newline(uschar *p, FILE *f)
 {
-if (strncmp((char *)p, "cr>", 3) == 0) return PCRE_NEWLINE_CR;
-if (strncmp((char *)p, "lf>", 3) == 0) return PCRE_NEWLINE_LF;
-if (strncmp((char *)p, "crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
+if (strncmpic(p, (uschar *)"cr>", 3) == 0) return PCRE_NEWLINE_CR;
+if (strncmpic(p, (uschar *)"lf>", 3) == 0) return PCRE_NEWLINE_LF;
+if (strncmpic(p, (uschar *)"crlf>", 5) == 0) return PCRE_NEWLINE_CRLF;
+if (strncmpic(p, (uschar *)"anycrlf>", 8) == 0) return PCRE_NEWLINE_ANYCRLF;
+if (strncmpic(p, (uschar *)"any>", 4) == 0) return PCRE_NEWLINE_ANY;
+if (strncmpic(p, (uschar *)"bsr_anycrlf>", 12) == 0) return PCRE_BSR_ANYCRLF;
+if (strncmpic(p, (uschar *)"bsr_unicode>", 12) == 0) return PCRE_BSR_UNICODE;
 fprintf(f, "Unknown newline type at: <%s\n", p);
 return 0;
 }
@@ -636,6 +768,46 @@
 
 
 /*************************************************
+*             Usage function                     *
+*************************************************/
+
+static void
+usage(void)
+{
+printf("Usage:     pcretest [options] [ []]\n\n");
+printf("Input and output default to stdin and stdout.\n");
+#ifdef SUPPORT_LIBREADLINE
+printf("If input is a terminal, readline() is used to read from it.\n");
+#else
+printf("This version of pcretest is not linked with readline().\n");
+#endif
+printf("\nOptions:\n");
+printf("  -b       show compiled code (bytecode)\n");
+printf("  -C       show PCRE compile-time options and exit\n");
+printf("  -d       debug: show compiled code and information (-b and -i)\n");
+#if !defined NODFA
+printf("  -dfa     force DFA matching for all subjects\n");
+#endif
+printf("  -help    show usage information\n");
+printf("  -i       show information about compiled patterns\n"
+       "  -M       find MATCH_LIMIT minimum for each subject\n"
+       "  -m       output memory used information\n"
+       "  -o    set size of offsets vector to \n");
+#if !defined NOPOSIX
+printf("  -p       use POSIX interface\n");
+#endif
+printf("  -q       quiet: do not output PCRE version number at start\n");
+printf("  -S    set stack size to  megabytes\n");
+printf("  -s       output store (memory) used information\n"
+       "  -t       time compilation and execution\n");
+printf("  -t    time compilation and execution, repeating  times\n");
+printf("  -tm      time execution (matching) only\n");
+printf("  -tm   time execution (matching) only, repeating  times\n");
+}
+
+
+
+/*************************************************
 *                Main Program                    *
 *************************************************/
 
@@ -648,8 +820,10 @@
 FILE *infile = stdin;
 int options = 0;
 int study_options = 0;
+int default_find_match_limit = FALSE;
 int op = 1;
 int timeit = 0;
+int timeitm = 0;
 int showinfo = 0;
 int showstore = 0;
 int quiet = 0;
@@ -681,16 +855,19 @@
 dbuffer = (unsigned char *)malloc(buffer_size);
 pbuffer = (unsigned char *)malloc(buffer_size);
 
-/* The outfile variable is static so that new_malloc can use it. The _setmode()
-stuff is some magic that I don't understand, but which apparently does good
-things in Windows. It's related to line terminations.  */
-
-#if defined(_WIN32) || defined(WIN32)
-_setmode( _fileno( stdout ), 0x8000 );
-#endif  /* defined(_WIN32) || defined(WIN32) */
+/* The outfile variable is static so that new_malloc can use it. */
 
 outfile = stdout;
 
+/* The following  _setmode() stuff is some Windows magic that tells its runtime
+library to translate CRLF into a single LF character. At least, that's what
+I've been told: never having used Windows I take this all on trust. Originally
+it set 0x8000, but then I was advised that _O_BINARY was better. */
+
+#if defined(_WIN32) || defined(WIN32)
+_setmode( _fileno( stdout ), _O_BINARY );
+#endif
+
 /* Scan options */
 
 while (argc > 1 && argv[op][0] == '-')
@@ -699,10 +876,11 @@
 
   if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)
     showstore = 1;
-  else if (strcmp(argv[op], "-t") == 0) timeit = 1;
   else if (strcmp(argv[op], "-q") == 0) quiet = 1;
+  else if (strcmp(argv[op], "-b") == 0) debug = 1;
   else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
   else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
+  else if (strcmp(argv[op], "-M") == 0) default_find_match_limit = TRUE;
 #if !defined NODFA
   else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;
 #endif
@@ -713,11 +891,25 @@
     op++;
     argc--;
     }
+  else if (strcmp(argv[op], "-t") == 0 || strcmp(argv[op], "-tm") == 0)
+    {
+    int both = argv[op][2] == 0;
+    int temp;
+    if (argc > 2 && (temp = get_value((unsigned char *)argv[op+1], &endptr),
+                     *endptr == 0))
+      {
+      timeitm = temp;
+      op++;
+      argc--;
+      }
+    else timeitm = LOOPREPEAT;
+    if (both) timeit = timeitm;
+    }
   else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&
       ((stack_size = get_value((unsigned char *)argv[op+1], &endptr)),
         *endptr == 0))
     {
-#ifdef _WIN32
+#if defined(_WIN32) || defined(WIN32)
     printf("PCRE: -S not supported on this OS\n");
     exit(1);
 #else
@@ -741,6 +933,7 @@
   else if (strcmp(argv[op], "-C") == 0)
     {
     int rc;
+    unsigned long int lrc;
     printf("PCRE version %s\n", pcre_version());
     printf("Compiled with\n");
     (void)pcre_config(PCRE_CONFIG_UTF8, &rc);
@@ -748,38 +941,37 @@
     (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
     printf("  %sUnicode properties support\n", rc? "" : "No ");
     (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
-    printf("  Newline sequence is %s\n", (rc == '\r')? "CR" :
-      (rc == '\n')? "LF" : "CRLF");
+    /* Note that these values are always the ASCII values, even
+    in EBCDIC environments. CR is 13 and NL is 10. */
+    printf("  Newline sequence is %s\n", (rc == 13)? "CR" :
+      (rc == 10)? "LF" : (rc == (13<<8 | 10))? "CRLF" :
+      (rc == -2)? "ANYCRLF" :
+      (rc == -1)? "ANY" : "???");
+    (void)pcre_config(PCRE_CONFIG_BSR, &rc);
+    printf("  \\R matches %s\n", rc? "CR, LF, or CRLF only" :
+                                     "all Unicode newlines");
     (void)pcre_config(PCRE_CONFIG_LINK_SIZE, &rc);
     printf("  Internal link size = %d\n", rc);
     (void)pcre_config(PCRE_CONFIG_POSIX_MALLOC_THRESHOLD, &rc);
     printf("  POSIX malloc threshold = %d\n", rc);
-    (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &rc);
-    printf("  Default match limit = %d\n", rc);
-    (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &rc);
-    printf("  Default recursion depth limit = %d\n", rc);
+    (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT, &lrc);
+    printf("  Default match limit = %ld\n", lrc);
+    (void)pcre_config(PCRE_CONFIG_MATCH_LIMIT_RECURSION, &lrc);
+    printf("  Default recursion depth limit = %ld\n", lrc);
     (void)pcre_config(PCRE_CONFIG_STACKRECURSE, &rc);
     printf("  Match recursion uses %s\n", rc? "stack" : "heap");
-    exit(0);
+    goto EXIT;
+    }
+  else if (strcmp(argv[op], "-help") == 0 ||
+           strcmp(argv[op], "--help") == 0)
+    {
+    usage();
+    goto EXIT;
     }
   else
     {
     printf("** Unknown or malformed option %s\n", argv[op]);
-    printf("Usage:   pcretest [options] [ []]\n");
-    printf("  -C     show PCRE compile-time options and exit\n");
-    printf("  -d     debug: show compiled code; implies -i\n");
-#if !defined NODFA
-    printf("  -dfa   force DFA matching for all subjects\n");
-#endif
-    printf("  -i     show information about compiled pattern\n"
-           "  -m     output memory used information\n"
-           "  -o  set size of offsets vector to \n");
-#if !defined NOPOSIX
-    printf("  -p     use POSIX interface\n");
-#endif
-    printf("  -S  set stack size to  megabytes\n");
-    printf("  -s     output store (memory) used information\n"
-           "  -t     time compilation and execution\n");
+    usage();
     yield = 1;
     goto EXIT;
     }
@@ -794,7 +986,7 @@
 if (offsets == NULL)
   {
   printf("** Failed to get %d bytes of memory for offsets vector\n",
-    size_offsets_max * (int)sizeof(int));
+    (int)(size_offsets_max * sizeof(int)));
   yield = 1;
   goto EXIT;
   }
@@ -803,7 +995,7 @@
 
 if (argc > 1)
   {
-  infile = fopen(argv[op], "rb");
+  infile = fopen(argv[op], INPUT_MODE);
   if (infile == NULL)
     {
     printf("** Failed to open %s\n", argv[op]);
@@ -814,7 +1006,7 @@
 
 if (argc > 2)
   {
-  outfile = fopen(argv[op+1], "wb");
+  outfile = fopen(argv[op+1], OUTPUT_MODE);
   if (outfile == NULL)
     {
     printf("** Failed to open %s\n", argv[op+1]);
@@ -859,12 +1051,12 @@
   int do_showinfo = showinfo;
   int do_showrest = 0;
   int do_flip = 0;
-  int erroroffset, len, delimiter;
+  int erroroffset, len, delimiter, poffset;
 
   use_utf8 = 0;
+  debug_lengths = 1;
 
-  if (infile == stdin) printf("  re> ");
-  if (extend_inputline(infile, buffer) == NULL) break;
+  if (extend_inputline(infile, buffer, "  re> ") == NULL) break;
   if (infile != stdin) fprintf(outfile, "%s", (char *)buffer);
   fflush(outfile);
 
@@ -964,11 +1156,12 @@
 
   if (isalnum(delimiter) || delimiter == '\\')
     {
-    fprintf(outfile, "** Delimiter must not be alphameric or \\\n");
+    fprintf(outfile, "** Delimiter must not be alphanumeric or \\\n");
     goto SKIP_DATA;
     }
 
   pp = p;
+  poffset = p - buffer;
 
   for(;;)
     {
@@ -979,8 +1172,7 @@
       pp++;
       }
     if (*pp != 0) break;
-    if (infile == stdin) printf("    > ");
-    if ((pp = extend_inputline(infile, pp)) == NULL)
+    if ((pp = extend_inputline(infile, pp, "    > ")) == NULL)
       {
       fprintf(outfile, "** Unexpected EOF\n");
       done = 1;
@@ -989,6 +1181,11 @@
     if (infile != stdin) fprintf(outfile, "%s", (char *)pp);
     }
 
+  /* The buffer may have moved while being extended; reset the start of data
+  pointer to the correct relative point in the buffer. */
+
+  p = buffer + poffset;
+
   /* If the first character after the delimiter is backslash, make
   the pattern end with backslash. This is purely to provide a way
   of testing for the error message when a pattern ends with backslash. */
@@ -1020,6 +1217,7 @@
 
       case '+': do_showrest = 1; break;
       case 'A': options |= PCRE_ANCHORED; break;
+      case 'B': do_debug = 1; break;
       case 'C': options |= PCRE_AUTO_CALLOUT; break;
       case 'D': do_debug = do_showinfo = 1; break;
       case 'E': options |= PCRE_DOLLAR_ENDONLY; break;
@@ -1037,19 +1235,22 @@
       case 'S': do_study = 1; break;
       case 'U': options |= PCRE_UNGREEDY; break;
       case 'X': options |= PCRE_EXTRA; break;
+      case 'Z': debug_lengths = 0; break;
       case '8': options |= PCRE_UTF8; use_utf8 = 1; break;
       case '?': options |= PCRE_NO_UTF8_CHECK; break;
 
       case 'L':
       ppp = pp;
-      /* The '\r' test here is so that it works on Windows */
-      while (*ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;
+      /* The '\r' test here is so that it works on Windows. */
+      /* The '0' test is just in case this is an unterminated line. */
+      while (*ppp != 0 && *ppp != '\n' && *ppp != '\r' && *ppp != ' ') ppp++;
       *ppp = 0;
       if (setlocale(LC_CTYPE, (const char *)pp) == NULL)
         {
         fprintf(outfile, "** Failed to set locale \"%s\"\n", pp);
         goto SKIP_DATA;
         }
+      locale_set = 1;
       tables = pcre_maketables();
       pp = ppp;
       break;
@@ -1063,10 +1264,18 @@
 
       case '<':
         {
-        int x = check_newline(pp, outfile);
-        if (x == 0) goto SKIP_DATA;
-        options |= x;
-        while (*pp++ != '>');
+        if (strncmp((char *)pp, "JS>", 3) == 0)
+          {
+          options |= PCRE_JAVASCRIPT_COMPAT;
+          pp += 3;
+          }
+        else
+          {
+          int x = check_newline(pp, outfile);
+          if (x == 0) goto SKIP_DATA;
+          options |= x;
+          while (*pp++ != '>');
+          }
         }
       break;
 
@@ -1116,19 +1325,21 @@
 #endif  /* !defined NOPOSIX */
 
     {
-    if (timeit)
+    unsigned long int get_options;
+
+    if (timeit > 0)
       {
       register int i;
       clock_t time_taken;
       clock_t start_time = clock();
-      for (i = 0; i < LOOPREPEAT; i++)
+      for (i = 0; i < timeit; i++)
         {
         re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
         if (re != NULL) free(re);
         }
       time_taken = clock() - start_time;
-      fprintf(outfile, "Compile time %.3f milliseconds\n",
-        (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /
+      fprintf(outfile, "Compile time %.4f milliseconds\n",
+        (((double)time_taken * 1000.0) / (double)timeit) /
           (double)CLOCKS_PER_SEC);
       }
 
@@ -1145,7 +1356,7 @@
         {
         for (;;)
           {
-          if (extend_inputline(infile, buffer) == NULL)
+          if (extend_inputline(infile, buffer, NULL) == NULL)
             {
             done = 1;
             goto CONTINUE;
@@ -1159,9 +1370,16 @@
       goto CONTINUE;
       }
 
-    /* Compilation succeeded; print data if required. There are now two
-    info-returning functions. The old one has a limited interface and
-    returns only limited data. Check that it agrees with the newer one. */
+    /* Compilation succeeded. It is now possible to set the UTF-8 option from
+    within the regex; check for this so that we know how to process the data
+    lines. */
+
+    new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
+    if ((get_options & PCRE_UTF8) != 0) use_utf8 = 1;
+
+    /* Print information if required. There are now two info-returning
+    functions. The old one has a limited interface and returns only limited
+    data. Check that it agrees with the newer one. */
 
     if (log_store)
       fprintf(outfile, "Memory allocation (code space): %d\n",
@@ -1180,17 +1398,17 @@
 
     if (do_study)
       {
-      if (timeit)
+      if (timeit > 0)
         {
         register int i;
         clock_t time_taken;
         clock_t start_time = clock();
-        for (i = 0; i < LOOPREPEAT; i++)
+        for (i = 0; i < timeit; i++)
           extra = pcre_study(re, study_options, &error);
         time_taken = clock() - start_time;
         if (extra != NULL) free(extra);
-        fprintf(outfile, "  Study time %.3f milliseconds\n",
-          (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /
+        fprintf(outfile, "  Study time %.4f milliseconds\n",
+          (((double)time_taken * 1000.0) / (double)timeit) /
             (double)CLOCKS_PER_SEC);
         }
       extra = pcre_study(re, study_options, &error);
@@ -1208,18 +1426,25 @@
     if (do_flip)
       {
       real_pcre *rre = (real_pcre *)re;
-      rre->magic_number = byteflip(rre->magic_number, sizeof(rre->magic_number));
+      rre->magic_number =
+        byteflip(rre->magic_number, sizeof(rre->magic_number));
       rre->size = byteflip(rre->size, sizeof(rre->size));
       rre->options = byteflip(rre->options, sizeof(rre->options));
-      rre->top_bracket = byteflip(rre->top_bracket, sizeof(rre->top_bracket));
-      rre->top_backref = byteflip(rre->top_backref, sizeof(rre->top_backref));
-      rre->first_byte = byteflip(rre->first_byte, sizeof(rre->first_byte));
-      rre->req_byte = byteflip(rre->req_byte, sizeof(rre->req_byte));
-      rre->name_table_offset = byteflip(rre->name_table_offset,
+      rre->flags = (pcre_uint16)byteflip(rre->flags, sizeof(rre->flags));
+      rre->top_bracket =
+        (pcre_uint16)byteflip(rre->top_bracket, sizeof(rre->top_bracket));
+      rre->top_backref =
+        (pcre_uint16)byteflip(rre->top_backref, sizeof(rre->top_backref));
+      rre->first_byte =
+        (pcre_uint16)byteflip(rre->first_byte, sizeof(rre->first_byte));
+      rre->req_byte =
+        (pcre_uint16)byteflip(rre->req_byte, sizeof(rre->req_byte));
+      rre->name_table_offset = (pcre_uint16)byteflip(rre->name_table_offset,
         sizeof(rre->name_table_offset));
-      rre->name_entry_size = byteflip(rre->name_entry_size,
+      rre->name_entry_size = (pcre_uint16)byteflip(rre->name_entry_size,
         sizeof(rre->name_entry_size));
-      rre->name_count = byteflip(rre->name_count, sizeof(rre->name_count));
+      rre->name_count = (pcre_uint16)byteflip(rre->name_count,
+        sizeof(rre->name_count));
 
       if (extra != NULL)
         {
@@ -1233,23 +1458,25 @@
 
     SHOW_INFO:
 
+    if (do_debug)
+      {
+      fprintf(outfile, "------------------------------------------------------------------\n");
+      pcre_printint(re, outfile, debug_lengths);
+      }
+
+    /* We already have the options in get_options (see above) */
+
     if (do_showinfo)
       {
-      unsigned long int get_options, all_options;
+      unsigned long int all_options;
 #if !defined NOINFOCHECK
       int old_first_char, old_options, old_count;
 #endif
-      int count, backrefmax, first_char, need_char;
+      int count, backrefmax, first_char, need_char, okpartial, jchanged,
+        hascrorlf;
       int nameentrysize, namecount;
       const uschar *nametable;
 
-      if (do_debug)
-        {
-        fprintf(outfile, "------------------------------------------------------------------\n");
-        pcre_printint(re, outfile);
-        }
-
-      new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
       new_info(re, NULL, PCRE_INFO_SIZE, &size);
       new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
       new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);
@@ -1258,6 +1485,9 @@
       new_info(re, NULL, PCRE_INFO_NAMEENTRYSIZE, &nameentrysize);
       new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount);
       new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable);
+      new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial);
+      new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged);
+      new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf);
 
 #if !defined NOINFOCHECK
       old_count = pcre_info(re, &old_options, &old_first_char);
@@ -1299,26 +1529,22 @@
           }
         }
 
-      /* The NOPARTIAL bit is a private bit in the options, so we have
-      to fish it out via out back door */
+      if (!okpartial) fprintf(outfile, "Partial matching not supported\n");
+      if (hascrorlf) fprintf(outfile, "Contains explicit CR or LF match\n");
 
       all_options = ((real_pcre *)re)->options;
-      if (do_flip)
-        {
-        all_options = byteflip(all_options, sizeof(all_options));
-         }
-
-      if ((all_options & PCRE_NOPARTIAL) != 0)
-        fprintf(outfile, "Partial matching not supported\n");
+      if (do_flip) all_options = byteflip(all_options, sizeof(all_options));
 
       if (get_options == 0) fprintf(outfile, "No options\n");
-        else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+        else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
           ((get_options & PCRE_ANCHORED) != 0)? " anchored" : "",
           ((get_options & PCRE_CASELESS) != 0)? " caseless" : "",
           ((get_options & PCRE_EXTENDED) != 0)? " extended" : "",
           ((get_options & PCRE_MULTILINE) != 0)? " multiline" : "",
           ((get_options & PCRE_FIRSTLINE) != 0)? " firstline" : "",
           ((get_options & PCRE_DOTALL) != 0)? " dotall" : "",
+          ((get_options & PCRE_BSR_ANYCRLF) != 0)? " bsr_anycrlf" : "",
+          ((get_options & PCRE_BSR_UNICODE) != 0)? " bsr_unicode" : "",
           ((get_options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
           ((get_options & PCRE_EXTRA) != 0)? " extra" : "",
           ((get_options & PCRE_UNGREEDY) != 0)? " ungreedy" : "",
@@ -1327,7 +1553,9 @@
           ((get_options & PCRE_NO_UTF8_CHECK) != 0)? " no_utf8_check" : "",
           ((get_options & PCRE_DUPNAMES) != 0)? " dupnames" : "");
 
-      switch (get_options & PCRE_NEWLINE_CRLF)
+      if (jchanged) fprintf(outfile, "Duplicate name status changes\n");
+
+      switch (get_options & PCRE_NEWLINE_BITS)
         {
         case PCRE_NEWLINE_CR:
         fprintf(outfile, "Forced newline sequence: CR\n");
@@ -1341,6 +1569,14 @@
         fprintf(outfile, "Forced newline sequence: CRLF\n");
         break;
 
+        case PCRE_NEWLINE_ANYCRLF:
+        fprintf(outfile, "Forced newline sequence: ANYCRLF\n");
+        break;
+
+        case PCRE_NEWLINE_ANY:
+        fprintf(outfile, "Forced newline sequence: ANY\n");
+        break;
+
         default:
         break;
         }
@@ -1358,7 +1594,7 @@
         int ch = first_char & 255;
         const char *caseless = ((first_char & REQ_CASELESS) == 0)?
           "" : " (caseless)";
-        if (isprint(ch))
+        if (PRINTHEX(ch))
           fprintf(outfile, "First char = \'%c\'%s\n", ch, caseless);
         else
           fprintf(outfile, "First char = %d%s\n", ch, caseless);
@@ -1373,7 +1609,7 @@
         int ch = need_char & 255;
         const char *caseless = ((need_char & REQ_CASELESS) == 0)?
           "" : " (caseless)";
-        if (isprint(ch))
+        if (PRINTHEX(ch))
           fprintf(outfile, "Need char = \'%c\'%s\n", ch, caseless);
         else
           fprintf(outfile, "Need char = %d%s\n", ch, caseless);
@@ -1409,7 +1645,7 @@
                   fprintf(outfile, "\n  ");
                   c = 2;
                   }
-                if (isprint(i) && i != ' ')
+                if (PRINTHEX(i) && i != ' ')
                   {
                   fprintf(outfile, "%c ", i);
                   c += 2;
@@ -1441,15 +1677,15 @@
       else
         {
         uschar sbuf[8];
-        sbuf[0] = (true_size >> 24)  & 255;
-        sbuf[1] = (true_size >> 16)  & 255;
-        sbuf[2] = (true_size >>  8)  & 255;
-        sbuf[3] = (true_size)  & 255;
-
-        sbuf[4] = (true_study_size >> 24)  & 255;
-        sbuf[5] = (true_study_size >> 16)  & 255;
-        sbuf[6] = (true_study_size >>  8)  & 255;
-        sbuf[7] = (true_study_size)  & 255;
+        sbuf[0] = (uschar)((true_size >> 24) & 255);
+        sbuf[1] = (uschar)((true_size >> 16) & 255);
+        sbuf[2] = (uschar)((true_size >>  8) & 255);
+        sbuf[3] = (uschar)((true_size) & 255);
+
+        sbuf[4] = (uschar)((true_study_size >> 24) & 255);
+        sbuf[5] = (uschar)((true_study_size >> 16) & 255);
+        sbuf[6] = (uschar)((true_study_size >>  8) & 255);
+        sbuf[7] = (uschar)((true_study_size) & 255);
 
         if (fwrite(sbuf, 1, 8, f) < 8 ||
             fwrite(re, 1, true_size, f) < true_size)
@@ -1468,6 +1704,7 @@
                 strerror(errno));
               }
             else fprintf(outfile, "Study data written to %s\n", to_file);
+
             }
           }
         fclose(f);
@@ -1485,14 +1722,14 @@
   for (;;)
     {
     uschar *q;
-    uschar *bptr = dbuffer;
+    uschar *bptr;
     int *use_offsets = offsets;
     int use_size_offsets = size_offsets;
     int callout_data = 0;
     int callout_data_set = 0;
     int count, c;
     int copystrings = 0;
-    int find_match_limit = 0;
+    int find_match_limit = default_find_match_limit;
     int getstrings = 0;
     int getlist = 0;
     int gmatched = 0;
@@ -1522,8 +1759,7 @@
     len = 0;
     for (;;)
       {
-      if (infile == stdin) printf("data> ");
-      if (extend_inputline(infile, buffer + len) == NULL)
+      if (extend_inputline(infile, buffer + len, "data> ") == NULL)
         {
         if (len > 0) break;
         done = 1;
@@ -1541,7 +1777,7 @@
     p = buffer;
     while (isspace(*p)) p++;
 
-    q = dbuffer;
+    bptr = q = dbuffer;
     while ((c = *p++) != 0)
       {
       int i = 0;
@@ -1591,9 +1827,19 @@
             {
             unsigned char buff8[8];
             int ii, utn;
-            utn = ord2utf8(c, buff8);
-            for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
-            c = buff8[ii];   /* Last byte */
+            if (use_utf8)
+              {
+              utn = ord2utf8(c, buff8);
+              for (ii = 0; ii < utn - 1; ii++) *q++ = buff8[ii];
+              c = buff8[ii];   /* Last byte */
+              }
+            else
+             {
+             if (c > 255)
+               fprintf(outfile, "** Character \\x{%x} is greater than 255 and "
+                 "UTF-8 mode is not enabled.\n"
+                 "** Truncation will probably give the wrong result.\n", c);
+             }
             p = pt + 1;
             break;
             }
@@ -1736,7 +1982,7 @@
           if (offsets == NULL)
             {
             printf("** Failed to get %d bytes of memory for offsets vector\n",
-              size_offsets_max * (int)sizeof(int));
+              (int)(size_offsets_max * sizeof(int)));
             yield = 1;
             goto EXIT;
             }
@@ -1781,6 +2027,10 @@
         show_malloc = 1;
         continue;
 
+        case 'Y':
+        options |= PCRE_NO_START_OPTIMIZE;
+        continue;
+
         case 'Z':
         options |= PCRE_NOTEOL;
         continue;
@@ -1803,6 +2053,23 @@
     *q = 0;
     len = q - dbuffer;
 
+    /* Move the data to the end of the buffer so that a read over the end of
+    the buffer will be seen by valgrind, even if it doesn't cause a crash. If
+    we are using the POSIX interface, we must include the terminating zero. */
+
+#if !defined NOPOSIX
+    if (posix || do_posix)
+      {
+      memmove(bptr + buffer_size - len - 1, bptr, len + 1);
+      bptr += buffer_size - len - 1;
+      }
+    else
+#endif
+      {
+      memmove(bptr + buffer_size - len, bptr, len);
+      bptr += buffer_size - len;
+      }
+
     if ((all_use_dfa || use_dfa) && find_match_limit)
       {
       printf("**Match limit not relevant for DFA matching: ignored\n");
@@ -1822,6 +2089,7 @@
         pmatch = (regmatch_t *)malloc(sizeof(regmatch_t) * use_size_offsets);
       if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
       if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
+      if ((options & PCRE_NOTEMPTY) != 0) eflags |= REG_NOTEMPTY;
 
       rc = regexec(&preg, (const char *)bptr, use_size_offsets, pmatch, eflags);
 
@@ -1866,7 +2134,7 @@
 
     for (;; gmatched++)    /* Loop for /g or /G */
       {
-      if (timeit)
+      if (timeitm > 0)
         {
         register int i;
         clock_t time_taken;
@@ -1876,7 +2144,7 @@
         if (all_use_dfa || use_dfa)
           {
           int workspace[1000];
-          for (i = 0; i < LOOPREPEAT; i++)
+          for (i = 0; i < timeitm; i++)
             count = pcre_dfa_exec(re, NULL, (char *)bptr, len, start_offset,
               options | g_notempty, use_offsets, use_size_offsets, workspace,
               sizeof(workspace)/sizeof(int));
@@ -1884,13 +2152,13 @@
         else
 #endif
 
-        for (i = 0; i < LOOPREPEAT; i++)
+        for (i = 0; i < timeitm; i++)
           count = pcre_exec(re, extra, (char *)bptr, len,
             start_offset, options | g_notempty, use_offsets, use_size_offsets);
 
         time_taken = clock() - start_time;
-        fprintf(outfile, "Execute time %.3f milliseconds\n",
-          (((double)time_taken * 1000.0) / (double)LOOPREPEAT) /
+        fprintf(outfile, "Execute time %.4f milliseconds\n",
+          (((double)time_taken * 1000.0) / (double)timeitm) /
             (double)CLOCKS_PER_SEC);
         }
 
@@ -1966,7 +2234,28 @@
 
       if (count >= 0)
         {
-        int i;
+        int i, maxcount;
+
+#if !defined NODFA
+        if (all_use_dfa || use_dfa) maxcount = use_size_offsets/2; else
+#endif
+          maxcount = use_size_offsets/3;
+
+        /* This is a check against a lunatic return value. */
+
+        if (count > maxcount)
+          {
+          fprintf(outfile,
+            "** PCRE error: returned count %d is too big for offset size %d\n",
+            count, use_size_offsets);
+          count = use_size_offsets/3;
+          if (do_g || do_G)
+            {
+            fprintf(outfile, "** /%c loop abandoned\n", do_g? 'g' : 'G');
+            do_g = do_G = FALSE;        /* Break g/G loop */
+            }
+          }
+
         for (i = 0; i < count * 2; i += 2)
           {
           if (use_offsets[i] < 0)
@@ -2084,19 +2373,46 @@
         }
 
       /* Failed to match. If this is a /g or /G loop and we previously set
-      g_notempty after a null match, this is not necessarily the end.
-      We want to advance the start offset, and continue. In the case of UTF-8
-      matching, the advance must be one character, not one byte. Fudge the
-      offset values to achieve this. We won't be at the end of the string -
-      that was checked before setting g_notempty. */
+      g_notempty after a null match, this is not necessarily the end. We want
+      to advance the start offset, and continue. We won't be at the end of the
+      string - that was checked before setting g_notempty.
+
+      Complication arises in the case when the newline option is "any" or
+      "anycrlf". If the previous match was at the end of a line terminated by
+      CRLF, an advance of one character just passes the \r, whereas we should
+      prefer the longer newline sequence, as does the code in pcre_exec().
+      Fudge the offset value to achieve this.
+
+      Otherwise, in the case of UTF-8 matching, the advance must be one
+      character, not one byte. */
 
       else
         {
         if (g_notempty != 0)
           {
           int onechar = 1;
+          unsigned int obits = ((real_pcre *)re)->options;
           use_offsets[0] = start_offset;
-          if (use_utf8)
+          if ((obits & PCRE_NEWLINE_BITS) == 0)
+            {
+            int d;
+            (void)pcre_config(PCRE_CONFIG_NEWLINE, &d);
+            /* Note that these values are always the ASCII ones, even in
+            EBCDIC environments. CR = 13, NL = 10. */
+            obits = (d == 13)? PCRE_NEWLINE_CR :
+                    (d == 10)? PCRE_NEWLINE_LF :
+                    (d == (13<<8 | 10))? PCRE_NEWLINE_CRLF :
+                    (d == -2)? PCRE_NEWLINE_ANYCRLF :
+                    (d == -1)? PCRE_NEWLINE_ANY : 0;
+            }
+          if (((obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANY ||
+               (obits & PCRE_NEWLINE_BITS) == PCRE_NEWLINE_ANYCRLF)
+              &&
+              start_offset < len - 1 &&
+              bptr[start_offset] == '\r' &&
+              bptr[start_offset+1] == '\n')
+            onechar++;
+          else if (use_utf8)
             {
             while (start_offset + onechar < len)
               {
@@ -2131,6 +2447,7 @@
       character. */
 
       g_notempty = 0;
+
       if (use_offsets[0] == use_offsets[1])
         {
         if (use_offsets[0] == len) break;
@@ -2165,6 +2482,7 @@
     {
     new_free((void *)tables);
     setlocale(LC_CTYPE, "C");
+    locale_set = 0;
     }
   }
 

Added: freeswitch/trunk/libs/pcre/perltest.pl
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/perltest.pl	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,191 @@
+#! /usr/bin/env perl
+
+# Program for testing regular expressions with perl to check that PCRE handles
+# them the same. This is the version that supports /8 for UTF-8 testing. As it
+# stands, it requires at least Perl 5.8 for UTF-8 support. However, it needs to
+# have "use utf8" at the start for running the UTF-8 tests, but *not* for the
+# other tests. The only way I've found for doing this is to cat this line in
+# explicitly in the RunPerlTest script.
+
+# use locale;  # With this included, \x0b matches \s!
+
+# Function for turning a string into a string of printing chars. There are
+# currently problems with UTF-8 strings; this fudges round them.
+
+sub pchars {
+my($t) = "";
+
+if ($utf8)
+  {
+  @p = unpack('U*', $_[0]);
+  foreach $c (@p)
+    {
+    if ($c >= 32 && $c < 127) { $t .= chr $c; }
+      else { $t .= sprintf("\\x{%02x}", $c); }
+    }
+  }
+
+else
+  {
+  foreach $c (split(//, $_[0]))
+    {
+    if (ord $c >= 32 && ord $c < 127) { $t .= $c; }
+      else { $t .= sprintf("\\x%02x", ord $c); }
+    }
+  }
+
+$t;
+}
+
+
+# Read lines from named file or stdin and write to named file or stdout; lines
+# consist of a regular expression, in delimiters and optionally followed by
+# options, followed by a set of test data, terminated by an empty line.
+
+# Sort out the input and output files
+
+if (@ARGV > 0)
+  {
+  open(INFILE, "<$ARGV[0]") || die "Failed to open $ARGV[0]\n";
+  $infile = "INFILE";
+  }
+else { $infile = "STDIN"; }
+
+if (@ARGV > 1)
+  {
+  open(OUTFILE, ">$ARGV[1]") || die "Failed to open $ARGV[1]\n";
+  $outfile = "OUTFILE";
+  }
+else { $outfile = "STDOUT"; }
+
+printf($outfile "Perl $] Regular Expressions\n\n");
+
+# Main loop
+
+NEXT_RE:
+for (;;)
+  {
+  printf "  re> " if $infile eq "STDIN";
+  last if ! ($_ = <$infile>);
+  printf $outfile "$_" if $infile ne "STDIN";
+  next if ($_ eq "");
+
+  $pattern = $_;
+
+  while ($pattern !~ /^\s*(.).*\1/s)
+    {
+    printf "    > " if $infile eq "STDIN";
+    last if ! ($_ = <$infile>);
+    printf $outfile "$_" if $infile ne "STDIN";
+    $pattern .= $_;
+    }
+
+   chomp($pattern);
+   $pattern =~ s/\s+$//;
+
+  # The private /+ modifier means "print $' afterwards".
+
+  $showrest = ($pattern =~ s/\+(?=[a-z]*$)//);
+
+  # Remove /8 from a UTF-8 pattern.
+
+  $utf8 = $pattern =~ s/8(?=[a-z]*$)//;
+
+  # Check that the pattern is valid
+
+  eval "\$_ =~ ${pattern}";
+  if ($@)
+    {
+    printf $outfile "Error: $@";
+    next NEXT_RE;
+    }
+
+  # If the /g modifier is present, we want to put a loop round the matching;
+  # otherwise just a single "if".
+
+  $cmd = ($pattern =~ /g[a-z]*$/)? "while" : "if";
+
+  # If the pattern is actually the null string, Perl uses the most recently
+  # executed (and successfully compiled) regex is used instead. This is a
+  # nasty trap for the unwary! The PCRE test suite does contain null strings
+  # in places - if they are allowed through here all sorts of weird and
+  # unexpected effects happen. To avoid this, we replace such patterns with
+  # a non-null pattern that has the same effect.
+
+  $pattern = "/(?#)/$2" if ($pattern =~ /^(.)\1(.*)$/);
+
+  # Read data lines and test them
+
+  for (;;)
+    {
+    printf "data> " if $infile eq "STDIN";
+    last NEXT_RE if ! ($_ = <$infile>);
+    chomp;
+    printf $outfile "$_\n" if $infile ne "STDIN";
+
+    s/\s+$//;
+    s/^\s+//;
+
+    last if ($_ eq "");
+    $x = eval "\"$_\"";   # To get escapes processed
+
+    # Empty array for holding results, then do the matching.
+
+    @subs = ();
+
+    $pushes = "push \@subs,\$&;" .
+         "push \@subs,\$1;" .
+         "push \@subs,\$2;" .
+         "push \@subs,\$3;" .
+         "push \@subs,\$4;" .
+         "push \@subs,\$5;" .
+         "push \@subs,\$6;" .
+         "push \@subs,\$7;" .
+         "push \@subs,\$8;" .
+         "push \@subs,\$9;" .
+         "push \@subs,\$10;" .
+         "push \@subs,\$11;" .
+         "push \@subs,\$12;" .
+         "push \@subs,\$13;" .
+         "push \@subs,\$14;" .
+         "push \@subs,\$15;" .
+         "push \@subs,\$16;" .
+         "push \@subs,\$'; }";
+
+    eval "${cmd} (\$x =~ ${pattern}) {" . $pushes;
+
+    if ($@)
+      {
+      printf $outfile "Error: $@\n";
+      next NEXT_RE;
+      }
+    elsif (scalar(@subs) == 0)
+      {
+      printf $outfile "No match\n";
+      }
+    else
+      {
+      while (scalar(@subs) != 0)
+        {
+        printf $outfile (" 0: %s\n", &pchars($subs[0]));
+        printf $outfile (" 0+ %s\n", &pchars($subs[17])) if $showrest;
+        $last_printed = 0;
+        for ($i = 1; $i <= 16; $i++)
+          {
+          if (defined $subs[$i])
+            {
+            while ($last_printed++ < $i-1)
+              { printf $outfile ("%2d: \n", $last_printed); }
+            printf $outfile ("%2d: %s\n", $i, &pchars($subs[$i]));
+            $last_printed = $i;
+            }
+          }
+        splice(@subs, 0, 18);
+        }
+      }
+    }
+  }
+
+# printf $outfile "\n";
+
+# End

Added: freeswitch/trunk/libs/pcre/testdata/grepinput8
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/testdata/grepinput8	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,11 @@
+X one
+X twoX threeX four
X five
+X six
+X seven??X eight???X nine???X ten
+
+Before 111
+Before 222???Before 333??Match
+After 111
+After 222???After 333
+And so on and so on
+And so on and so on

Added: freeswitch/trunk/libs/pcre/testdata/grepinputv
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/testdata/grepinputv	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,4 @@
+The quick brown
+fox jumps
+over the lazy dog.
+This time it jumps and jumps and jumps.

Modified: freeswitch/trunk/libs/pcre/testdata/grepinputx
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/grepinputx	(original)
+++ freeswitch/trunk/libs/pcre/testdata/grepinputx	Mon Jun  8 18:51:30 2009
@@ -39,10 +39,5 @@
 nineteen
 twenty
 
-Here follows some CR/LF/CRLF test data.
-
-abc
def
-ghi
-jkl
-
+This line contains pattern not on a line by itself.
 This is the last line of this file.

Modified: freeswitch/trunk/libs/pcre/testdata/grepoutput
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/grepoutput	(original)
+++ freeswitch/trunk/libs/pcre/testdata/grepoutput	Mon Jun  8 18:51:30 2009
@@ -18,6 +18,7 @@
 ./testdata/grepinput:608:Check up on PATTERN near the end.
 ./testdata/grepinputx:3:Here is the pattern again.
 ./testdata/grepinputx:5:Pattern
+./testdata/grepinputx:42:This line contains pattern not on a line by itself.
 ---------------------------- Test 6 ------------------------------
 7:PATTERN at the start of a line.
 8:In the middle of a line, PATTERN appears.
@@ -25,6 +26,7 @@
 608:Check up on PATTERN near the end.
 3:Here is the pattern again.
 5:Pattern
+42:This line contains pattern not on a line by itself.
 ---------------------------- Test 7 ------------------------------
 ./testdata/grepinput
 ./testdata/grepinputx
@@ -75,18 +77,13 @@
 39:nineteen
 40:twenty
 41:
-42:Here follows some CR/LF/CRLF test data.
-43:
-44:abc
def
-45:ghi
-46:jkl
-47:
-48:This is the last line of this file.
+43:This is the last line of this file.
 ---------------------------- Test 12 -----------------------------
 Pattern
 ---------------------------- Test 13 -----------------------------
 Here is the pattern again.
 That time it was on a line by itself.
+This line contains pattern not on a line by itself.
 ---------------------------- Test 14 -----------------------------
 ./testdata/grepinputx:To pat or not to pat, that is the question.
 ---------------------------- Test 15 -----------------------------
@@ -163,8 +160,8 @@
 nineteen
 twenty
 
-Here follows some CR/LF/CRLF test data.
-
+This line contains pattern not on a line by itself.
+This is the last line of this file.
 ---------------------------- Test 25 -----------------------------
 15-
 16-complete pair
@@ -214,8 +211,8 @@
 nineteen
 twenty
 
-Here follows some CR/LF/CRLF test data.
-
+This line contains pattern not on a line by itself.
+This is the last line of this file.
 ---------------------------- Test 27 -----------------------------
 four
 five
@@ -235,9 +232,8 @@
 nineteen
 twenty
 
-Here follows some CR/LF/CRLF test data.
-
-abc
def
+This line contains pattern not on a line by itself.
+This is the last line of this file.
 ---------------------------- Test 28 -----------------------------
 14-of lines all by themselves.
 15-
@@ -289,11 +285,8 @@
 nineteen
 twenty
 
-Here follows some CR/LF/CRLF test data.
-
-abc
def
-ghi
-jkl
+This line contains pattern not on a line by itself.
+This is the last line of this file.
 ---------------------------- Test 30 -----------------------------
 ./testdata/grepinput-4-features should be added at the end, because some of the tests involve the
 ./testdata/grepinput-5-output of line numbers, and we don't want these to change.
@@ -313,6 +306,11 @@
 ./testdata/grepinputx:3:Here is the pattern again.
 ./testdata/grepinputx-4-
 ./testdata/grepinputx:5:Pattern
+--
+./testdata/grepinputx-39-nineteen
+./testdata/grepinputx-40-twenty
+./testdata/grepinputx-41-
+./testdata/grepinputx:42:This line contains pattern not on a line by itself.
 ---------------------------- Test 31 -----------------------------
 ./testdata/grepinput:7:PATTERN at the start of a line.
 ./testdata/grepinput:8:In the middle of a line, PATTERN appears.
@@ -331,6 +329,9 @@
 ./testdata/grepinputx-6-That time it was on a line by itself.
 ./testdata/grepinputx-7-
 ./testdata/grepinputx-8-To pat or not to pat, that is the question.
+--
+./testdata/grepinputx:42:This line contains pattern not on a line by itself.
+./testdata/grepinputx-43-This is the last line of this file.
 ---------------------------- Test 32 -----------------------------
 ./testdata/grepinputx
 ---------------------------- Test 33 -----------------------------
@@ -342,6 +343,7 @@
 ./testdata/grepinputx
 RC=0
 ---------------------------- Test 36 -----------------------------
+./testdata/grepinput8
 ./testdata/grepinputx
 RC=0
 ---------------------------- Test 37 -----------------------------
@@ -349,11 +351,11 @@
 aaaaa2
 RC=0
 ======== STDERR ========
-pcregrep: pcre_exec() error -8 while matching this line:
+pcregrep: pcre_exec() error -8 while matching this text:
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 pcregrep: error -8 means that a resource limit was exceeded
 pcregrep: check your regex for nested unlimited loops
-pcregrep: pcre_exec() error -8 while matching this line:
+pcregrep: pcre_exec() error -8 while matching this text:
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 ---------------------------- Test 38 ------------------------------
 This line contains a binary zero here >< for testing.
@@ -371,10 +373,13 @@
 ./testdata/grepinput:597:after the binary zero
 ---------------------------- Test 42 ------------------------------
 595:before
+595:zero
 596:zero
 597:after
+597:zero
 ---------------------------- Test 43 ------------------------------
 595:before
+595:zero
 596:zero
 597:zero
 ---------------------------- Test 44 ------------------------------
@@ -396,22 +401,25 @@
 AB.VE the turtle
 PUT NEW DATA ABOVE THIS LINE.
 ---------------------------- Test 49 ------------------------------
-abc
def
-ghi
-jkl
 ---------------------------- Test 50 ------------------------------
-def
+over the lazy dog.
+This time it jumps and jumps and jumps.
 ---------------------------- Test 51 ------------------------------
-abc
def
-ghi
-jkl
+fox [1;31mjumps[00m
+This time it [1;31mjumps[00m and [1;31mjumps[00m and [1;31mjumps[00m.
 ---------------------------- Test 52 ------------------------------
-def
-
-ghi
-jkl
-
-This is the last line of this file.
-
+36972,6
+36990,4
+37024,4
+37066,5
+37083,4
 ---------------------------- Test 53 ------------------------------
-jkl
+595:15,6
+595:33,4
+596:28,4
+597:15,5
+597:32,4
+---------------------------- Test 54 -----------------------------
+Here is the [1;31mpattern[00m again.
+That time it was on a [1;31mline by itself[00m.
+This line contains [1;31mpattern[00m not on a [1;31mline by itself[00m.

Added: freeswitch/trunk/libs/pcre/testdata/grepoutput8
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/testdata/grepoutput8	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,10 @@
+---------------------------- Test U1 ------------------------------
+1:X one
+2:X two3:X three4:X four
5:X five
+6:X six
+7:X seven??8:X eight???9:X nine???10:X ten
+---------------------------- Test U2 ------------------------------
+12-Before 111
+13-Before 222???14-Before 333??15:Match
+16-After 111
+17-After 222???18-After 333

Added: freeswitch/trunk/libs/pcre/testdata/grepoutputN
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/testdata/grepoutputN	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,16 @@
+---------------------------- Test N1 ------------------------------
+1:abc
2:def
---------------------------- Test N2 ------------------------------
+1:abc
def
+2:ghi
+jkl---------------------------- Test N3 ------------------------------
+2:def
3:
+ghi
+jkl---------------------------- Test N4 ------------------------------
+2:ghi
+jkl---------------------------- Test N5 ------------------------------
+1:abc
2:def
+3:ghi
+4:jkl---------------------------- Test N6 ------------------------------
+1:abc
2:def
+3:ghi
+4:jkl
\ No newline at end of file

Modified: freeswitch/trunk/libs/pcre/testdata/testinput1
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput1	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput1	Mon Jun  8 18:51:30 2009
@@ -1297,7 +1297,7 @@
     abc
 
 /^a	b
-  
    c/x
+      c/x
     abc
 
 /^(a|)\1*b/
@@ -1453,11 +1453,6 @@
 /{4,5a}bc/
     {4,5a}bc
 
-/^a.b/
-    a\rb
-    *** Failers
-    a\nb
-
 /abc$/
     abc
     abc\n
@@ -1499,8 +1494,8 @@
 /(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\12\123/
     abcdefghijk\12S
 
-/ab\gdef/
-    abgdef
+/ab\idef/
+    abidef
 
 /a{0}bc/
     bc
@@ -3381,9 +3376,14 @@
     cdaccb
 
 /^(?:a?b?)*$/
+    \
+    a
+    ab
+    aaa   
     *** Failers
     dbcb
     a--
+    aa-- 
 
 /((?s)^a(.))((?m)^b$)/
     a\nb\nc\n
@@ -3421,11 +3421,6 @@
 /((?m)^b)/
     a\nb\nc\n
 
-/(?(1)a|b)/
-
-/(?(1)b|a)/
-    a
-
 /(x)?(?(1)a|b)/
     *** Failers
     a
@@ -3883,4 +3878,190 @@
     a,b]
     [a,b,c]  
 
+/(?-x: )/x
+    A\x20B
+    
+"(?x)(?-x: \s*#\s*)"
+    A # B
+    ** Failers
+    #  
+
+"(?x-is)(?:(?-ixs) \s*#\s*) include"
+    A #include
+    ** Failers
+    A#include  
+    A #Include
+
+/a*b*\w/
+    aaabbbb
+    aaaa
+    a
+
+/a*b?\w/
+    aaabbbb
+    aaaa
+    a
+
+/a*b{0,4}\w/
+    aaabbbb
+    aaaa
+    a
+
+/a*b{0,}\w/
+    aaabbbb
+    aaaa
+    a
+    
+/a*\d*\w/
+    0a
+    a 
+    
+/a*b *\w/x
+    a 
+
+/a*b#comment
+  *\w/x
+    a 
+
+/a* b *\w/x
+    a 
+
+/^\w+=.*(\\\n.*)*/
+    abc=xyz\\\npqr
+
+/(?=(\w+))\1:/
+    abcd:
+
+/^(?=(\w+))\1:/
+    abcd:
+
+/^\Eabc/
+    abc
+    
+/^[\Eabc]/
+    a
+    ** Failers 
+    E 
+    
+/^[a-\Ec]/
+    b
+    ** Failers
+    -
+    E    
+
+/^[a\E\E-\Ec]/
+    b
+    ** Failers
+    -
+    E    
+
+/^[\E\Qa\E-\Qz\E]+/
+    b
+    ** Failers
+    -  
+    
+/^[a\Q]bc\E]/
+    a
+    ]
+    c
+    
+/^[a-\Q\E]/
+    a
+    -     
+
+/^(a()*)*/
+    aaaa
+
+/^(?:a(?:(?:))*)*/
+    aaaa
+
+/^(a()+)+/
+    aaaa
+
+/^(?:a(?:(?:))+)+/
+    aaaa
+
+/(a){0,3}(?(1)b|(c|))*D/
+    abbD
+    ccccD
+    D  
+
+/(a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/(?>a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/(?:a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/\Z/g
+  abc\n
+  
+/^(?s)(?>.*)(?iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|BM
+
+|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|BM
+
+/(a(?1)b)/BM
+
+/(a(?1)+b)/BM
+
+/a(?Pb|c)d(?Pe)/BM
+
+/(?:a(?Pc(?Pd)))(?Pa)/BM
+
+/(?Pa)...(?P=a)bbb(?P>a)d/BM
+
+/abc(?C255)de(?C)f/BM
+
+/abcde/CBM
+
+/\x{100}/8BM
+
+/\x{1000}/8BM
+
+/\x{10000}/8BM
+
+/\x{100000}/8BM
+
+/\x{1000000}/8BM
+
+/\x{4000000}/8BM
+
+/\x{7fffFFFF}/8BM
+
+/[\x{ff}]/8BM
+
+/[\x{100}]/8BM
+
+/\x80/8BM
+
+/\xff/8BM
+
+/\x{0041}\x{2262}\x{0391}\x{002e}/D8M
+    
+/\x{D55c}\x{ad6d}\x{C5B4}/D8M 
+
+/\x{65e5}\x{672c}\x{8a9e}/D8M
+
+/[\x{100}]/8BM
+
+/[Z\x{100}]/8BM
+
+/^[\x{100}\E-\Q\E\x{150}]/B8M
+
+/^[\Q??\E-\Q??\E]/B8M
+
+/^[\Q??\E-\Q??\E/B8M
+
+/[\p{L}]/BM
+
+/[\p{^L}]/BM
+
+/[\P{L}]/BM
+
+/[\P{^L}]/BM
+
+/[abc\p{L}\x{0660}]/8BM
+
+/[\p{Nd}]/8BM
+
+/[\p{Nd}+-]+/8BM
+
+/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8iBM
+
+/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8BM
+
+/[\x{105}-\x{109}]/8iBM
+
+/( ( (?(1)0|) )*   )/xBM
+
+/(  (?(1)0|)*   )/xBM
+
+/[a]/BM
+
+/[a]/8BM
+
+/[\xaa]/BM
+
+/[\xaa]/8BM
+
+/[^a]/BM
+
+/[^a]/8BM
+
+/[^\xaa]/BM
+
+/[^\xaa]/8BM
+
+/ End of testinput10 /

Modified: freeswitch/trunk/libs/pcre/testdata/testinput2
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput2	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput2	Mon Jun  8 18:51:30 2009
@@ -1,6 +1,6 @@
-/(a)b|/
+/(a)b|/I
 
-/abc/
+/abc/I
     abc
     defabc
     \Aabc
@@ -8,29 +8,29 @@
     \Adefabc
     ABC
 
-/^abc/
+/^abc/I
     abc
     \Aabc
     *** Failers
     defabc
     \Adefabc
 
-/a+bc/
+/a+bc/I
 
-/a*bc/
+/a*bc/I
 
-/a{3}bc/
+/a{3}bc/I
 
-/(abc|a+z)/
+/(abc|a+z)/I
 
-/^abc$/
+/^abc$/I
     abc
     *** Failers
     def\nabc
 
-/ab\gdef/X
+/ab\idef/X
 
-/(?X)ab\gdef/X
+/(?X)ab\idef/X
 
 /x{5,4}/
 
@@ -50,41 +50,41 @@
 
 /(?z)abc/
 
-/.*b/
+/.*b/I
 
-/.*?b/
+/.*?b/I
 
-/cat|dog|elephant/
+/cat|dog|elephant/I
     this sentence eventually mentions a cat
     this sentences rambles on and on for a while and then reaches elephant
 
-/cat|dog|elephant/S
+/cat|dog|elephant/IS
     this sentence eventually mentions a cat
     this sentences rambles on and on for a while and then reaches elephant
 
-/cat|dog|elephant/iS
+/cat|dog|elephant/IiS
     this sentence eventually mentions a CAT cat
     this sentences rambles on and on for a while to elephant ElePhant
 
-/a|[bcd]/S
+/a|[bcd]/IS
 
-/(a|[^\dZ])/S
+/(a|[^\dZ])/IS
 
-/(a|b)*[\s]/S
+/(a|b)*[\s]/IS
 
 /(ab\2)/
 
 /{4,5}abc/
 
-/(a)(b)(c)\2/
+/(a)(b)(c)\2/I
     abcb
     \O0abcb
     \O3abcb
     \O6abcb
     \O9abcb
-    \O12abcb 
+    \O12abcb
 
-/(a)bc|(a)(b)\2/
+/(a)bc|(a)(b)\2/I
     abc
     \O0abc
     \O3abc
@@ -96,7 +96,7 @@
     \O9aba
     \O12aba
 
-/abc$/E
+/abc$/IE
     abc
     *** Failers
     abc\n
@@ -104,93 +104,93 @@
 
 /(a)(b)(c)(d)(e)\6/
 
-/the quick brown fox/
+/the quick brown fox/I
     the quick brown fox
     this is a line with the quick brown fox
 
-/the quick brown fox/A
+/the quick brown fox/IA
     the quick brown fox
     *** Failers
     this is a line with the quick brown fox
 
 /ab(?z)cd/
 
-/^abc|def/
+/^abc|def/I
     abcdef
     abcdef\B
 
-/.*((abc)$|(def))/
+/.*((abc)$|(def))/I
     defabc
     \Zdefabc
 
-/abc/P
+/abc/IP
     abc
     *** Failers
-    
-/^abc|def/P
+
+/^abc|def/IP
     abcdef
     abcdef\B
 
-/.*((abc)$|(def))/P
+/.*((abc)$|(def))/IP
     defabc
     \Zdefabc
-  
-/the quick brown fox/P
+
+/the quick brown fox/IP
     the quick brown fox
-    *** Failers 
-    The Quick Brown Fox 
+    *** Failers
+    The Quick Brown Fox
 
-/the quick brown fox/Pi
+/the quick brown fox/IPi
     the quick brown fox
-    The Quick Brown Fox 
+    The Quick Brown Fox
 
-/abc.def/P
+/abc.def/IP
     *** Failers
     abc\ndef
-    
-/abc$/P
+
+/abc$/IP
     abc
-    abc\n 
+    abc\n
 
-/(abc)\2/P
+/(abc)\2/IP
 
-/(abc\1)/P
+/(abc\1)/IP
     abc
 
 /)/
 
 /a[]b/
 
-/[^aeiou ]{3,}/
-    co-processors, and for 
-    
-/<.*>/
+/[^aeiou ]{3,}/I
+    co-processors, and for
+
+/<.*>/I
     abcghinop
 
-/<.*?>/
+/<.*?>/I
     abcghinop
 
-/<.*>/U
+/<.*>/IU
     abcghinop
-    
-/(?U)<.*>/
+
+/(?U)<.*>/I
     abcghinop
 
-/<.*?>/U
+/<.*?>/IU
     abcghinop
-    
-/={3,}/U
+
+/={3,}/IU
     abc========def
-    
-/(?U)={3,}?/
+
+/(?U)={3,}?/I
     abc========def
-    
-/(?^abc)/m
+/(?>^abc)/Im
     abc
     def\nabc
     *** Failers
-    defabc   
+    defabc
 
 /(?<=ab(c+)d)ef/
 
@@ -293,50 +295,50 @@
 
 /The next three are in testinput2 because they have variable length branches/
 
-/(?<=bullock|donkey)-cart/
+/(?<=bullock|donkey)-cart/I
     the bullock-cart
     a donkey-cart race
     *** Failers
     cart
-    horse-and-cart    
-      
-/(?<=ab(?i)x|y|z)/
+    horse-and-cart
+
+/(?<=ab(?i)x|y|z)/I
 
-/(?>.*)(?<=(abcd)|(xyz))/
+/(?>.*)(?<=(abcd)|(xyz))/I
     alphabetabcd
     endingxyz
 
-/(?<=ab(?i)x(?-i)y|(?i)z|b)ZZ/
+/(?<=ab(?i)x(?-i)y|(?i)z|b)ZZ/I
     abxyZZ
     abXyZZ
     ZZZ
     zZZ
     bZZ
-    BZZ     
+    BZZ
     *** Failers
-    ZZ 
-    abXYZZ 
+    ZZ
+    abXYZZ
     zzz
-    bzz  
+    bzz
 
-/(?[^()]+) | (?R) )* \) /xg
-    (ab(xy)cd)pqr 
+/\(  ( (?>[^()]+) | (?R) )* \) /Ixg
+    (ab(xy)cd)pqr
     1(abcd)(x(y)z)pqr
 
-/\(  (?: (?>[^()]+) | (?R) ) \) /x
+/\(  (?: (?>[^()]+) | (?R) ) \) /Ix
     (abcd)
     (ab(xy)cd)
-    (a(b(c)d)e) 
-    ((ab)) 
+    (a(b(c)d)e)
+    ((ab))
     *** Failers
-    ()   
+    ()
 
-/\(  (?: (?>[^()]+) | (?R) )? \) /x
+/\(  (?: (?>[^()]+) | (?R) )? \) /Ix
     ()
     12(abcde(fsh)xyz(foo(bar))lmno)89
 
-/\(  ( (?>[^()]+) | (?R) )* \) /x
+/\(  ( (?>[^()]+) | (?R) )* \) /Ix
     (ab(xy)cd)
 
-/\( ( ( (?>[^()]+) | (?R) )* ) \) /x
+/\( ( ( (?>[^()]+) | (?R) )* ) \) /Ix
     (ab(xy)cd)
 
-/\( (123)? ( ( (?>[^()]+) | (?R) )* ) \) /x
+/\( (123)? ( ( (?>[^()]+) | (?R) )* ) \) /Ix
     (ab(xy)cd)
     (123ab(xy)cd)
 
-/\( ( (123)? ( (?>[^()]+) | (?R) )* ) \) /x
+/\( ( (123)? ( (?>[^()]+) | (?R) )* ) \) /Ix
     (ab(xy)cd)
     (123ab(xy)cd)
 
-/\( (((((((((( ( (?>[^()]+) | (?R) )* )))))))))) \) /x
+/\( (((((((((( ( (?>[^()]+) | (?R) )* )))))))))) \) /Ix
     (ab(xy)cd)
 
-/\( ( ( (?>[^()<>]+) | ((?>[^()]+)) | (?R) )* ) \) /x
+/\( ( ( (?>[^()<>]+) | ((?>[^()]+)) | (?R) )* ) \) /Ix
     (abcd(xyzqrs)123)
 
-/\( ( ( (?>[^()]+) | ((?R)) )* ) \) /x
+/\( ( ( (?>[^()]+) | ((?R)) )* ) \) /Ix
     (ab(cd)ef)
     (ab(cd(ef)gh)ij)
 
-/^[[:alnum:]]/D
+/^[[:alnum:]]/DZ
 
-/^[[:^alnum:]]/D
+/^[[:^alnum:]]/DZ
 
-/^[[:alpha:]]/D
+/^[[:alpha:]]/DZ
+
+/^[[:^alpha:]]/DZ
 
-/^[[:^alpha:]]/D
-             
 /[_[:alpha:]]/IS
 
-/^[[:ascii:]]/D
+/^[[:ascii:]]/DZ
 
-/^[[:^ascii:]]/D
+/^[[:^ascii:]]/DZ
 
-/^[[:blank:]]/D
+/^[[:blank:]]/DZ
 
-/^[[:^blank:]]/D
+/^[[:^blank:]]/DZ
 
 /[\n\x0b\x0c\x0d[:blank:]]/IS
 
-/^[[:cntrl:]]/D
+/^[[:cntrl:]]/DZ
 
-/^[[:digit:]]/D
+/^[[:digit:]]/DZ
 
-/^[[:graph:]]/D
+/^[[:graph:]]/DZ
 
-/^[[:lower:]]/D
+/^[[:lower:]]/DZ
 
-/^[[:print:]]/D
+/^[[:print:]]/DZ
 
-/^[[:punct:]]/D
+/^[[:punct:]]/DZ
 
-/^[[:space:]]/D
+/^[[:space:]]/DZ
 
-/^[[:upper:]]/D
+/^[[:upper:]]/DZ
 
-/^[[:xdigit:]]/D
+/^[[:xdigit:]]/DZ
 
-/^[[:word:]]/D
+/^[[:word:]]/DZ
 
-/^[[:^cntrl:]]/D
+/^[[:^cntrl:]]/DZ
 
-/^[12[:^digit:]]/D
+/^[12[:^digit:]]/DZ
 
-/^[[:^blank:]]/D
+/^[[:^blank:]]/DZ
 
-/[01[:alpha:]%]/D
+/[01[:alpha:]%]/DZ
 
-/[[.ch.]]/
+/[[.ch.]]/I
 
-/[[=ch=]]/
+/[[=ch=]]/I
 
-/[[:rhubarb:]]/
+/[[:rhubarb:]]/I
 
-/[[:upper:]]/i
+/[[:upper:]]/Ii
     A
-    a 
-    
-/[[:lower:]]/i
+    a
+
+/[[:lower:]]/Ii
     A
-    a 
+    a
 
-/((?-i)[[:lower:]])[[:lower:]]/i
+/((?-i)[[:lower:]])[[:lower:]]/Ii
     ab
     aB
     *** Failers
     Ab
-    AB        
+    AB
 
-/[\200-\110]/
+/[\200-\110]/I
 
-/^(?(0)f|b)oo/
+/^(?(0)f|b)oo/I
 
-/This one's here because of the large output vector needed/
+/This one's here because of the large output vector needed/I
 
-/(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\w+)\s+(\270)/
+/(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\w+)\s+(\270)/I
     \O900 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 ABC ABC
 
-/This one's here because Perl does this differently and PCRE can't at present/
+/This one's here because Perl does this differently and PCRE can't at present/I
 
-/(main(O)?)+/
+/(main(O)?)+/I
     mainmain
     mainOmain
-    
-/These are all cases where Perl does it differently (nested captures)/
 
-/^(a(b)?)+$/
+/These are all cases where Perl does it differently (nested captures)/I
+
+/^(a(b)?)+$/I
     aba
-   
-/^(aa(bb)?)+$/
-    aabbaa    
-    
-/^(aa|aa(bb))+$/
-    aabbaa 
-    
-/^(aa(bb)??)+$/
-    aabbaa    
-    
-/^(?:aa(bb)?)+$/
-    aabbaa    
-    
-/^(aa(b(b))?)+$/
-    aabbaa    
 
-/^(?:aa(b(b))?)+$/
-    aabbaa    
+/^(aa(bb)?)+$/I
+    aabbaa
 
-/^(?:aa(b(?:b))?)+$/
-    aabbaa    
+/^(aa|aa(bb))+$/I
+    aabbaa
 
-/^(?:aa(bb(?:b))?)+$/
-    aabbbaa    
-    
-/^(?:aa(b(?:bb))?)+$/
-    aabbbaa    
+/^(aa(bb)??)+$/I
+    aabbaa
 
-/^(?:aa(?:b(b))?)+$/
-    aabbaa    
+/^(?:aa(bb)?)+$/I
+    aabbaa
 
-/^(?:aa(?:b(bb))?)+$/
-    aabbbaa    
+/^(aa(b(b))?)+$/I
+    aabbaa
 
-/^(aa(b(bb))?)+$/
-    aabbbaa    
+/^(?:aa(b(b))?)+$/I
+    aabbaa
 
-/^(aa(bb(bb))?)+$/
-    aabbbbaa    
+/^(?:aa(b(?:b))?)+$/I
+    aabbaa
 
-/--------------------------------------------------------------------/ 
-    
-/#/xMD
+/^(?:aa(bb(?:b))?)+$/I
+    aabbbaa
+
+/^(?:aa(b(?:bb))?)+$/I
+    aabbbaa
+
+/^(?:aa(?:b(b))?)+$/I
+    aabbaa
 
-/a#/xMD
+/^(?:aa(?:b(bb))?)+$/I
+    aabbbaa
 
-/[\s]/D
+/^(aa(b(bb))?)+$/I
+    aabbbaa
 
-/[\S]/D
+/^(aa(bb(bb))?)+$/I
+    aabbbbaa
 
-/a(?i)b/D
+/--------------------------------------------------------------------/I
+
+/#/IxDZ
+
+/a#/IxDZ
+
+/[\s]/DZ
+
+/[\S]/DZ
+
+/a(?i)b/DZ
     ab
     aB
-    *** Failers 
-    AB  
+    *** Failers
+    AB
 
-/(a(?i)b)/D
+/(a(?i)b)/DZ
     ab
     aB
-    *** Failers 
-    AB  
-    
-/   (?i)abc/xD
+    *** Failers
+    AB
+
+/   (?i)abc/IxDZ
 
 /#this is a comment
-  (?i)abc/xD
+  (?i)abc/IxDZ
 
-/123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/D
+/123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/DZ
 
-/\Q123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/D
+/\Q123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/DZ
 
-/\Q\E/D
+/\Q\E/DZ
     \
 
-/\Q\Ex/D
+/\Q\Ex/DZ
 
-/ \Q\E/D
+/ \Q\E/DZ
 
-/a\Q\E/D
+/a\Q\E/DZ
   abc
   bca
-  bac  
+  bac
 
-/a\Q\Eb/D
+/a\Q\Eb/DZ
   abc
 
-/\Q\Eabc/D
+/\Q\Eabc/DZ
 
-/x*+\w/D
+/x*+\w/DZ
     *** Failers
     xxxxx
-    
-/x?+/D
 
-/x++/D
+/x?+/DZ
 
-/x{1,3}+/D 
+/x++/DZ
 
-/(x)*+/D
+/x{1,3}+/DZ
 
-/^(\w++|\s++)*$/
+/(x)*+/DZ
+
+/^(\w++|\s++)*$/I
     now is the time for all good men to come to the aid of the party
     *** Failers
     this is not a line with only words and spaces!
-    
-/(\d++)(\w)/
+
+/(\d++)(\w)/I
     12345a
     *** Failers
-    12345+ 
+    12345+
 
-/a++b/
+/a++b/I
     aaab
 
-/(a++b)/
+/(a++b)/I
     aaab
 
-/(a++)b/
+/(a++)b/I
     aaab
 
-/([^()]++|\([^()]*\))+/
+/([^()]++|\([^()]*\))+/I
     ((abc(ade)ufh()()x
-    
-/\(([^()]++|\([^()]+\))+\)/ 
+
+/\(([^()]++|\([^()]+\))+\)/I
     (abc)
     (abc(def)xyz)
     *** Failers
-    ((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa   
+    ((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
-/(abc){1,3}+/D
+/(abc){1,3}+/DZ
 
-/a+?+/
+/a+?+/I
 
-/a{2,3}?+b/
+/a{2,3}?+b/I
 
-/(?U)a+?+/
+/(?U)a+?+/I
 
-/a{2,3}?+b/U
+/a{2,3}?+b/IU
 
-/x(?U)a++b/D
+/x(?U)a++b/DZ
     xaaaab
 
-/(?U)xa++b/D
+/(?U)xa++b/DZ
     xaaaab
 
-/^((a+)(?U)([ab]+)(?-U)([bc]+)(\w*))/D
+/^((a+)(?U)([ab]+)(?-U)([bc]+)(\w*))/DZ
 
-/^x(?U)a+b/D
+/^x(?U)a+b/DZ
 
-/^x(?U)(a+)b/D
+/^x(?U)(a+)b/DZ
 
-/[.x.]/
+/[.x.]/I
 
-/[=x=]/
+/[=x=]/I
 
-/[:x:]/
+/[:x:]/I
 
-/\l/
+/\l/I
 
-/\L/
+/\L/I
 
-/\N{name}/
+/\N{name}/I
 
-/\u/
+/\u/I
 
-/\U/
+/\U/I
 
-/[/
+/[/I
 
-/[a-/
+/[a-/I
 
-/[[:space:]/
+/[[:space:]/I
 
-/[\s]/DM
+/[\s]/IDZ
 
-/[[:space:]]/DM
+/[[:space:]]/IDZ
 
-/[[:space:]abcde]/DM
+/[[:space:]abcde]/IDZ
 
-/< (?: (?(R) \d++  | [^<>]*+) | (?R)) * >/x
+/< (?: (?(R) \d++  | [^<>]*+) | (?R)) * >/Ix
     <>
     
      hij>
      hij>
-    def> 
-          
+    def>
+    
     *** Failers
     iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|DM
+|8J\$WE\<\.rX\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZ
 
-|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|DM
+|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZ
 
 /(.*)\d+\1/I
 
 /(.*)\d+/I
-    
+
 /(.*)\d+\1/Is
 
 /(.*)\d+/Is
@@ -956,12 +956,12 @@
 
 /((.*))\d+\1/I
     abc123bc
-    
+
 /a[b]/I
 
 /(?=a).*/I
 
-/(?=abc).xyz/iI
+/(?=abc).xyz/IiI
 
 /(?=abc)(?i).xyz/I
 
@@ -975,13 +975,13 @@
 
 /()a/I
 
-/(?(1)ab|ac)/I
+/(?(1)ab|ac)(.)/I
 
-/(?(1)abz|acz)/I
+/(?(1)abz|acz)(.)/I
 
-/(?(1)abz)/I
+/(?(1)abz)(.)/I
 
-/(?(1)abz)123/I
+/(?(1)abz)(1)23/I
 
 /(a)+/I
 
@@ -1003,11 +1003,11 @@
 
 /a^b/I
 
-/^a/mI
+/^a/Im
   abcde
-  xy\nabc 
-  *** Failers 
-  xyabc 
+  xy\nabc
+  *** Failers
+  xyabc
 
 /c|abc/I
 
@@ -1015,328 +1015,328 @@
 
 /[ab](?i)cd/IS
 
-/abc(?C)def/
+/abc(?C)def/I
     abcdef
-    1234abcdef 
+    1234abcdef
     *** Failers
     abcxyz
-    abcxyzf   
+    abcxyzf
 
-/abc(?C)de(?C1)f/
+/abc(?C)de(?C1)f/I
     123abcdef
-    
-/(?C1)\dabc(?C2)def/ 
+
+/(?C1)\dabc(?C2)def/I
     1234abcdef
     *** Failers
-    abcdef 
-    
-/(?C255)ab/
+    abcdef
 
-/(?C256)ab/
+/(?C255)ab/I
 
-/(?Cab)xx/ 
+/(?C256)ab/I
 
-/(?C12vr)x/
+/(?Cab)xx/I
 
-/abc(?C)def/
+/(?C12vr)x/I
+
+/abc(?C)def/I
     *** Failers
     \x83\x0\x61bcdef
 
-/(abc)(?C)de(?C1)f/
+/(abc)(?C)de(?C1)f/I
     123abcdef
-    123abcdef\C+ 
-    123abcdef\C- 
+    123abcdef\C+
+    123abcdef\C-
     *** Failers
-    123abcdef\C!1 
-    
-/(?C0)(abc(?C1))*/
+    123abcdef\C!1
+
+/(?C0)(abc(?C1))*/I
     abcabcabc
-    abcabc\C!1!3   
+    abcabc\C!1!3
     *** Failers
-    abcabcabc\C!1!3   
+    abcabcabc\C!1!3
 
-/(\d{3}(?C))*/
+/(\d{3}(?C))*/I
     123\C+
     123456\C+
-    123456789\C+  
+    123456789\C+
 
-/((xyz)(?C)p|(?C1)xyzabc)/
+/((xyz)(?C)p|(?C1)xyzabc)/I
     xyzabc\C+
 
-/(X)((xyz)(?C)p|(?C1)xyzabc)/
+/(X)((xyz)(?C)p|(?C1)xyzabc)/I
     Xxyzabc\C+
 
-/(?=(abc))(?C)abcdef/
+/(?=(abc))(?C)abcdef/I
     abcdef\C+
-    
-/(?!(abc)(?C1)d)(?C2)abcxyz/
-    abcxyz\C+ 
 
-/(?<=(abc)(?C))xyz/
+/(?!(abc)(?C1)d)(?C2)abcxyz/I
+    abcxyz\C+
+
+/(?<=(abc)(?C))xyz/I
    abcxyz\C+
-   
-/a(b+)(c*)(?C1)/
+
+/a(b+)(c*)(?C1)/I
     abbbbbccc\C*1
 
-/a(b+?)(c*?)(?C1)/
+/a(b+?)(c*?)(?C1)/I
     abbbbbccc\C*1
-   
-/(?C)abc/ 
 
-/(?C)^abc/
+/(?C)abc/I
 
-/(?C)a|b/S
+/(?C)^abc/I
 
-/(?R)/
+/(?C)a|b/IS
 
-/(a|(?R))/
+/(?R)/I
 
-/(ab|(bc|(de|(?R))))/
+/(a|(?R))/I
 
-/x(ab|(bc|(de|(?R))))/
+/(ab|(bc|(de|(?R))))/I
+
+/x(ab|(bc|(de|(?R))))/I
     xab
     xbc
     xde
     xxab
     xxxab
     *** Failers
-    xyab   
+    xyab
 
-/(ab|(bc|(de|(?1))))/
+/(ab|(bc|(de|(?1))))/I
 
-/x(ab|(bc|(de|(?1)x)x)x)/
+/x(ab|(bc|(de|(?1)x)x)x)/I
 
-/^([^()]|\((?1)*\))*$/
+/^([^()]|\((?1)*\))*$/I
     abc
     a(b)c
-    a(b(c))d  
+    a(b(c))d
     *** Failers)
-    a(b(c)d  
+    a(b(c)d
 
-/^>abc>([^()]|\((?1)*\))*abc>([^()]|\((?1)*\))*abc>123abc>1(2)3abc>(1(2)3)]*+) | (?2)) * >))/x
+/((< (?: (?(R) \d++  | [^<>]*+) | (?2)) * >))/Ix
     <>
     
      hij>
      hij>
-    def> 
-          
+    def>
+    
     *** Failers
     b|c)d(?Pe)/D
+/a(?Pb|c)d(?Pe)/DZ
     abde
-    acde 
+    acde
 
-/(?:a(?Pc(?Pd)))(?Pa)/D
+/(?:a(?Pc(?Pd)))(?Pa)/DZ
 
-/(?Pa)...(?P=a)bbb(?P>a)d/D
+/(?Pa)...(?P=a)bbb(?P>a)d/DZ
 
-/^\W*(?:(?P(?P.)\W*(?P>one)\W*(?P=two)|)|(?P(?P.)\W*(?P>three)\W*(?P=four)|\W*.\W*))\W*$/i
+/^\W*(?:(?P(?P.)\W*(?P>one)\W*(?P=two)|)|(?P(?P.)\W*(?P>three)\W*(?P=four)|\W*.\W*))\W*$/Ii
     1221
     Satan, oscillate my metallic sonatas!
     A man, a plan, a canal: Panama!
-    Able was I ere I saw Elba. 
+    Able was I ere I saw Elba.
     *** Failers
-    The quick brown fox  
-    
-/((?(R)a|b))\1(?1)?/
+    The quick brown fox
+
+/((?(R)a|b))\1(?1)?/I
   bb
-  bbaa 
+  bbaa
 
-/(.*)a/sI
+/(.*)a/Is
 
-/(.*)a\1/sI
+/(.*)a\1/Is
 
-/(.*)a(b)\2/sI
+/(.*)a(b)\2/Is
 
-/((.*)a|(.*)b)z/sI
+/((.*)a|(.*)b)z/Is
 
-/((.*)a|(.*)b)z\1/sI
+/((.*)a|(.*)b)z\1/Is
 
-/((.*)a|(.*)b)z\2/sI
+/((.*)a|(.*)b)z\2/Is
 
-/((.*)a|(.*)b)z\3/sI
+/((.*)a|(.*)b)z\3/Is
 
-/((.*)a|^(.*)b)z\3/sI
+/((.*)a|^(.*)b)z\3/Is
 
-/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a/sI
+/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a/Is
 
-/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\31/sI
+/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\31/Is
 
-/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\32/sI
+/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\32/Is
 
-/(a)(bc)/ND
+/(a)(bc)/INDZ
   abc
 
-/(?Pa)(bc)/ND
+/(?Pa)(bc)/INDZ
   abc
 
-/(a)(?Pbc)/ND
+/(a)(?Pbc)/INDZ
 
-/(a+)*zz/
+/(a+)*zz/I
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazzbbbbbb\M
   aaaaaaaaaaaaaz\M
 
-/(aaa(?C1)bbb|ab)/
+/(aaa(?C1)bbb|ab)/I
    aaabbb
    aaabbb\C*0
    aaabbb\C*1
    aaabbb\C*-1
 
-/ab(?Pcd)ef(?Pgh)/
+/ab(?Pcd)ef(?Pgh)/I
     abcdefgh
     abcdefgh\C1\Gtwo
     abcdefgh\Cone\Ctwo
-    abcdefgh\Cthree  
+    abcdefgh\Cthree
 
-/(?P)(?P)/D
+/(?P)(?P)/DZ
 
-/(?P)(?P)/D
+/(?P)(?P)/DZ
 
-/(?Pzz)(?Paa)/
+/(?Pzz)(?Paa)/I
     zzaa\CZ
     zzaa\CA
 
-/(?Peks)(?Peccs)/
+/(?Peks)(?Peccs)/I
 
-/(?Pabc(?Pdef)(?Pxyz))/
+/(?Pabc(?Pdef)(?Pxyz))/I
 
-"\[((?P\d+)(,(?P>elem))*)\]"
+"\[((?P\d+)(,(?P>elem))*)\]"I
     [10,20,30,5,5,4,4,2,43,23,4234]
     *** Failers
-    []  
+    []
 
-"\[((?P\d+)(,(?P>elem))*)?\]"
+"\[((?P\d+)(,(?P>elem))*)?\]"I
     [10,20,30,5,5,4,4,2,43,23,4234]
-    [] 
+    []
 
-/(a(b(?2)c))?/D
+/(a(b(?2)c))?/DZ
 
-/(a(b(?2)c))*/D
+/(a(b(?2)c))*/DZ
 
-/(a(b(?2)c)){0,2}/D
+/(a(b(?2)c)){0,2}/DZ
 
-/[ab]{1}+/D
+/[ab]{1}+/DZ
 
-/((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/i
+/((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/Ii
      Baby Bjorn Active Carrier - With free SHIPPING!!
 
-/((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/iS
+/((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/IiS
      Baby Bjorn Active Carrier - With free SHIPPING!!
-     
-/a*.*b/SD
 
-/(a|b)*.?c/SD 
+/a*.*b/ISDZ
+
+/(a|b)*.?c/ISDZ
 
-/abc(?C255)de(?C)f/D
+/abc(?C255)de(?C)f/DZ
 
-/abcde/CD
+/abcde/ICDZ
   abcde
-  abcdfe 
-  
-/a*b/CD
+  abcdfe
+
+/a*b/ICDZ
   ab
   aaaab
-  aaaacb   
+  aaaacb
 
-/a+b/CD
+/a+b/ICDZ
   ab
   aaaab
-  aaaacb   
+  aaaacb
 
-/(abc|def)x/CD
+/(abc|def)x/ICDZ
   abcx
   defx
   abcdefzx
 
-/(ab|cd){3,4}/C
+/(ab|cd){3,4}/IC
   ababab
   abcdabcd
-  abcdcdcdcdcd  
+  abcdcdcdcdcd
 
-/([ab]{,4}c|xy)/CD
+/([ab]{,4}c|xy)/ICDZ
     Note: that { does NOT introduce a quantifier
 
-/([ab]{1,4}c|xy){4,5}?123/CD
+/([ab]{1,4}c|xy){4,5}?123/ICDZ
     aacaacaacaacaac123
 
 /\b.*/I
   ab cd\>1
-  
-/\b.*/Is 
+
+/\b.*/Is
   ab cd\>1
-  
+
 /(?!.bcd).*/I
-  Xbcd12345 
+  Xbcd12345
 
-/abcde/
+/abcde/I
     ab\P
     abc\P
     abcd\P
-    abcde\P   
+    abcde\P
     the quick brown abc\P
     ** Failers\P
     the quick brown abxyz fox\P
-    
-"^(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/(20)?\d\d$"
+
+"^(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/(20)?\d\d$"I
     13/05/04\P
     13/5/2004\P
-    02/05/09\P 
+    02/05/09\P
     1\P
     1/2\P
     1/2/0\P
-    1/2/04\P    
+    1/2/04\P
     0\P
     02/\P
-    02/0\P   
+    02/0\P
     02/1\P
     ** Failers\P
     \P
@@ -1344,285 +1344,285 @@
     33/4/04\P
     3/13/04\P
     0/1/2003\P
-    0/\P 
-    02/0/\P 
-    02/13\P  
+    0/\P
+    02/0/\P
+    02/13\P
 
 /0{0,2}ABC/I
-    
+
 /\d{3,}ABC/I
-    
+
 /\d*ABC/I
 
 /[abc]+DE/I
 
-/[abc]?123/
+/[abc]?123/I
     123\P
     a\P
     b\P
     c\P
     c12\P
-    c123\P      
+    c123\P
 
-/^(?:\d){3,5}X/
+/^(?:\d){3,5}X/I
     1\P
     123\P
     123X
     1234\P
     1234X
     12345\P
-    12345X      
-    *** Failers 
-    1X 
-    123456\P 
+    12345X
+    *** Failers
+    1X
+    123456\P
 
-/abc/>testsavedregex
+/abc/I>testsavedregex
 testsavedregex
+
+/abc/IF>testsavedregex
 testsavedregex
+/(a|b)/IS>testsavedregex
 testsavedregex
+    def
+
+/(a|b)/ISF>testsavedregex
 (.)*~smg
+    def
+
+~<(\w+)/?>(.)*~smgI
     \n\n\nPartner der LCO\nde\nPartner der LINEAS Consulting\nGmbH\nLINEAS Consulting GmbH Hamburg\nPartnerfirmen\n30 days\nindex,follow\n\nja\n3\nPartner\n\n\nLCO\nLINEAS Consulting\n15.10.2003\n\n\n\n\nDie Partnerfirmen der LINEAS Consulting\nGmbH\n\n\n \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
 
 /^a/IF
 
-/line\nbreak/
+/line\nbreak/I
     this is a line\nbreak
-    line one\nthis is a line\nbreak in the second line 
+    line one\nthis is a line\nbreak in the second line
 
-/line\nbreak/f
+/line\nbreak/If
     this is a line\nbreak
-    ** Failers 
-    line one\nthis is a line\nbreak in the second line 
+    ** Failers
+    line one\nthis is a line\nbreak in the second line
 
-/line\nbreak/mf
+/line\nbreak/Imf
     this is a line\nbreak
-    ** Failers 
-    line one\nthis is a line\nbreak in the second line 
+    ** Failers
+    line one\nthis is a line\nbreak in the second line
 
-/ab.cd/P
+/ab.cd/IP
     ab-cd
-    ab=cd 
+    ab=cd
     ** Failers
     ab\ncd
 
-/ab.cd/Ps
+/ab.cd/IPs
     ab-cd
-    ab=cd 
+    ab=cd
     ab\ncd
 
-/(?i)(?-i)AbCd/
+/(?i)(?-i)AbCd/I
     AbCd
     ** Failers
-    abcd  
-    
-/a{11111111111111111111}/
+    abcd
 
-/(){64294967295}/
+/a{11111111111111111111}/I
 
-/(){2,4294967295}/
+/(){64294967295}/I
 
-"(?i:a)(?i:b)(?i:c)(?i:d)(?i:e)(?i:f)(?i:g)(?i:h)(?i:i)(?i:j)(k)(?i:l)A\1B"
+/(){2,4294967295}/I
+
+"(?i:a)(?i:b)(?i:c)(?i:d)(?i:e)(?i:f)(?i:g)(?i:h)(?i:i)(?i:j)(k)(?i:l)A\1B"I
     abcdefghijklAkB
 
-"(?Pa)(?Pb)(?Pc)(?Pd)(?Pe)(?Pf)(?Pg)(?Ph)(?Pi)(?Pj)(?Pk)(?Pl)A\11B"
+"(?Pa)(?Pb)(?Pc)(?Pd)(?Pe)(?Pf)(?Pg)(?Ph)(?Pi)(?Pj)(?Pk)(?Pl)A\11B"I
     abcdefghijklAkB
 
-"(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)A\11B"
+"(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)A\11B"I
     abcdefghijklAkB
 
-"(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)"
+"(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)"I
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
-"(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)"
+"(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)"I
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
-/[^()]*(?:\((?R)\)[^()]*)*/
+/[^()]*(?:\((?R)\)[^()]*)*/I
     (this(and)that
-    (this(and)that) 
+    (this(and)that)
     (this(and)that)stuff
 
-/[^()]*(?:\((?>(?R))\)[^()]*)*/
+/[^()]*(?:\((?>(?R))\)[^()]*)*/I
     (this(and)that
-    (this(and)that) 
-    
-/[^()]*(?:\((?R)\))*[^()]*/
+    (this(and)that)
+
+/[^()]*(?:\((?R)\))*[^()]*/I
     (this(and)that
-    (this(and)that) 
+    (this(and)that)
 
-/(?:\((?R)\))*[^()]*/
+/(?:\((?R)\))*[^()]*/I
     (this(and)that
-    (this(and)that) 
-    ((this)) 
+    (this(and)that)
+    ((this))
 
-/(?:\((?R)\))|[^()]*/
+/(?:\((?R)\))|[^()]*/I
     (this(and)that
-    (this(and)that) 
+    (this(and)that)
     (this)
-    ((this)) 
-    
-/a(b)c/PN
+    ((this))
+
+/a(b)c/IPN
     abc
-    
-/a(?Pb)c/PN
-    abc  
-    
-/\x{100}/ 
 
-/\x{0000ff}/
+/a(?Pb)c/IPN
+    abc
+
+/\x{100}/I
+
+/\x{0000ff}/I
 
-/^((?Pa1)|(?Pa2)b)/
+/^((?Pa1)|(?Pa2)b)/I
 
-/^((?Pa1)|(?Pa2)b)/J
+/^((?Pa1)|(?Pa2)b)/IJ
     a1b\CA
-    a2b\CA 
+    a2b\CA
     ** Failers
-    a1b\CZ\CA 
-    
-/^(?Pa)(?Pb)/J
+    a1b\CZ\CA
+
+/^(?Pa)(?Pb)/IJ
     ab\CA
-    
-/^(?Pa)(?Pb)|cd/J
+
+/^(?Pa)(?Pb)|cd/IJ
     ab\CA
-    cd\CA 
-  
-/^(?Pa)(?Pb)|cd(?Pef)(?Pgh)/J
-    cdefgh\CA 
-  
-/^((?Pa1)|(?Pa2)b)/J
+    cd\CA
+
+/^(?Pa)(?Pb)|cd(?Pef)(?Pgh)/IJ
+    cdefgh\CA
+
+/^((?Pa1)|(?Pa2)b)/IJ
     a1b\GA
-    a2b\GA 
+    a2b\GA
     ** Failers
-    a1b\GZ\GA 
-    
-/^(?Pa)(?Pb)/J
+    a1b\GZ\GA
+
+/^(?Pa)(?Pb)/IJ
     ab\GA
-    
-/^(?Pa)(?Pb)|cd/J
+
+/^(?Pa)(?Pb)|cd/IJ
     ab\GA
-    cd\GA 
-  
-/^(?Pa)(?Pb)|cd(?Pef)(?Pgh)/J
-    cdefgh\GA 
-  
-/(?J)^((?Pa1)|(?Pa2)b)/
+    cd\GA
+
+/^(?Pa)(?Pb)|cd(?Pef)(?Pgh)/IJ
+    cdefgh\GA
+
+/(?J)^((?Pa1)|(?Pa2)b)/I
     a1b\CA
-    a2b\CA 
-    
-/^(?Pa) (?J:(?Pb)(?Pc)) (?Pd)/
+    a2b\CA
+
+/^(?Pa) (?J:(?Pb)(?Pc)) (?Pd)/I
 
 / In this next test, J is not set at the outer level; consequently it isn't
-set in the pattern's options; consequently pcre_get_named_substring() produces 
-a random value. /x
+set in the pattern's options; consequently pcre_get_named_substring() produces
+a random value. /Ix
 
-/^(?Pa) (?J:(?Pb)(?Pc)) (?Pd)/
+/^(?Pa) (?J:(?Pb)(?Pc)) (?Pd)/I
     a bc d\CA\CB\CC
 
-/^(?Pa)?(?(A)a|b)/
+/^(?Pa)?(?(A)a|b)/I
     aabc
     bc
     ** Failers
-    abc   
+    abc
 
-/(?:(?(ZZ)a|b)(?PX))+/
+/(?:(?(ZZ)a|b)(?PX))+/I
     bXaX
 
-/(?:(?(2y)a|b)(X))+/
+/(?:(?(2y)a|b)(X))+/I
 
-/(?:(?(ZA)a|b)(?PX))+/
+/(?:(?(ZA)a|b)(?PX))+/I
 
-/(?:(?(ZZ)a|b)(?(ZZ)a|b)(?PX))+/
+/(?:(?(ZZ)a|b)(?(ZZ)a|b)(?PX))+/I
     bbXaaX
 
-/(?:(?(ZZ)a|\(b\))\\(?PX))+/
+/(?:(?(ZZ)a|\(b\))\\(?PX))+/I
     (b)\\Xa\\X
 
-/(?PX|Y))+/
+/(?:(?(A)(?P=A)a|b)(?PX|Y))+/I
     bXXaYYaY
-    bXYaXXaX  
+    bXYaXXaX
 
-/()()()()()()()()()(?:(?(A)(?P=A)a|b)(?PX|Y))+/
+/()()()()()()()()()(?:(?(A)(?P=A)a|b)(?PX|Y))+/I
     bXXaYYaY
 
-/\777/
+/\777/I
 
-/\s*,\s*/S
+/\s*,\s*/IS
     \x0b,\x0b
-    \x0c,\x0d 
+    \x0c,\x0d
 
-/^abc/m
+/^abc/Im
     xyz\nabc
     xyz\nabc\
     xyz\r\nabc\
     xyz\rabc\
     xyz\r\nabc\
-    ** Failers 
+    ** Failers
     xyz\nabc\
     xyz\r\nabc\
     xyz\nabc\
     xyz\rabc\
     xyz\rabc\
-    
-/abc$/m
+
+/abc$/Im
     xyzabc
-    xyzabc\n 
-    xyzabc\npqr 
-    xyzabc\r\ 
-    xyzabc\rpqr\ 
-    xyzabc\r\n\ 
-    xyzabc\r\npqr\ 
-    ** Failers
-    xyzabc\r 
-    xyzabc\rpqr 
-    xyzabc\r\n 
-    xyzabc\r\npqr 
-    
-/^abc/m
+    xyzabc\n
+    xyzabc\npqr
+    xyzabc\r\
+    xyzabc\rpqr\
+    xyzabc\r\n\
+    xyzabc\r\npqr\
+    ** Failers
+    xyzabc\r
+    xyzabc\rpqr
+    xyzabc\r\n
+    xyzabc\r\npqr
+
+/^abc/Im
     xyz\rabcdef
     xyz\nabcdef\
-    ** Failers  
+    ** Failers
     xyz\nabcdef
-       
-/^abc/m
+
+/^abc/Im
     xyz\nabcdef
     xyz\rabcdef\
-    ** Failers  
+    ** Failers
     xyz\rabcdef
-       
-/^abc/m
+
+/^abc/Im
     xyz\r\nabcdef
     xyz\rabcdef\
-    ** Failers  
+    ** Failers
     xyz\rabcdef
-    
-/^abc/m
 
-/abc/
+/^abc/Im
+
+/abc/I
     xyz\rabc\
-    abc  
-       
-/.*/
+    abc
+
+/.*/I
     abc\ndef
     abc\rdef
     abc\r\ndef
@@ -1633,14 +1633,1144 @@
     \abc\rdef
     \abc\r\ndef
 
-/\w+(.)(.)?def/s
+/\w+(.)(.)?def/Is
     abc\ndef
     abc\rdef
     abc\r\ndef
 
-+((?:\s|//.*\\n|/[*](?:\\n|.)*?[*]/)*)+
++((?:\s|//.*\\n|/[*](?:\\n|.)*?[*]/)*)+I
    /* this is a C style comment */\M
 
-/(?P25[0-5]|2[0-4]\d|[01]?\d?\d)(?:\.(?P>B)){3}/
+/(?P25[0-5]|2[0-4]\d|[01]?\d?\d)(?:\.(?P>B)){3}/I
+
+/()()()()()()()()()()()()()()()()()()()()
+ ()()()()()()()()()()()()()()()()()()()()
+ ()()()()()()()()()()()()()()()()()()()()
+ ()()()()()()()()()()()()()()()()()()()()
+ ()()()()()()()()()()()()()()()()()()()()
+ (.(.))/Ix
+    XY\O400
+
+/(a*b|(?i:c*(?-i)d))/IS
+
+/()[ab]xyz/IS
+
+/(|)[ab]xyz/IS
+
+/(|c)[ab]xyz/IS
+
+/(|c?)[ab]xyz/IS
+
+/(d?|c?)[ab]xyz/IS
+
+/(d?|c)[ab]xyz/IS
+
+/^a*b\d/DZ
+
+/^a*+b\d/DZ
+
+/^a*?b\d/DZ
+
+/^a+A\d/DZ
+    aaaA5
+    ** Failers
+    aaaa5
+
+/^a*A\d/IiDZ
+    aaaA5
+    aaaa5
+
+/(a*|b*)[cd]/IS
+
+/(a+|b*)[cd]/IS
+
+/(a*|b+)[cd]/IS
+
+/(a+|b+)[cd]/IS
+
+/((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
+ ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
+ (((
+ a
+ ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+ ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+ )))
+/Ix
+  large nest
+
+/a*\d/BZ
+
+/a*\D/BZ
+
+/0*\d/BZ
+
+/0*\D/BZ
+
+/a*\s/BZ
+
+/a*\S/BZ
+
+/ *\s/BZ
+
+/ *\S/BZ
+
+/a*\w/BZ
+
+/a*\W/BZ
+
+/=*\w/BZ
+
+/=*\W/BZ
+
+/\d*a/BZ
+
+/\d*2/BZ
+
+/\d*\d/BZ
+
+/\d*\D/BZ
+
+/\d*\s/BZ
+
+/\d*\S/BZ
+
+/\d*\w/BZ
+
+/\d*\W/BZ
+
+/\D*a/BZ
+
+/\D*2/BZ
+
+/\D*\d/BZ
+
+/\D*\D/BZ
+
+/\D*\s/BZ
+
+/\D*\S/BZ
+
+/\D*\w/BZ
+
+/\D*\W/BZ
+
+/\s*a/BZ
+
+/\s*2/BZ
+
+/\s*\d/BZ
+
+/\s*\D/BZ
+
+/\s*\s/BZ
+
+/\s*\S/BZ
+
+/\s*\w/BZ
+
+/\s*\W/BZ
+
+/\S*a/BZ
+
+/\S*2/BZ
+
+/\S*\d/BZ
+
+/\S*\D/BZ
+
+/\S*\s/BZ
+
+/\S*\S/BZ
+
+/\S*\w/BZ
+
+/\S*\W/BZ
+
+/\w*a/BZ
+
+/\w*2/BZ
+
+/\w*\d/BZ
+
+/\w*\D/BZ
+
+/\w*\s/BZ
+
+/\w*\S/BZ
+
+/\w*\w/BZ
+
+/\w*\W/BZ
+
+/\W*a/BZ
+
+/\W*2/BZ
+
+/\W*\d/BZ
+
+/\W*\D/BZ
+
+/\W*\s/BZ
+
+/\W*\S/BZ
+
+/\W*\w/BZ
+
+/\W*\W/BZ
+
+/[^a]+a/BZ
+
+/[^a]+a/BZi
+
+/[^a]+A/BZi
+
+/[^a]+b/BZ
+
+/[^a]+\d/BZ
+
+/a*[^a]/BZ
+
+/(?Px)(?Py)/I
+    xy\Cabc\Cxyz
+
+/(?x)(?'xyz'y)/I
+    xy\Cabc\Cxyz
+
+/(?x)(?'xyz>y)/I
+
+/(?P'abc'x)(?Py)/I
+
+/^(?:(?(ZZ)a|b)(?X))+/
+    bXaX
+    bXbX
+    ** Failers
+    aXaX
+    aXbX
+
+/^(?P>abc)(?xxx)/
+
+/^(?P>abc)(?x|y)/
+    xx
+    xy
+    yy
+    yx
+
+/^(?P>abc)(?Px|y)/
+    xx
+    xy
+    yy
+    yx
+
+/^((?(abc)a|b)(?x|y))+/
+    bxay
+    bxby
+    ** Failers
+    axby
+
+/^(((?P=abc)|X)(?x|y))+/
+    XxXxxx
+    XxXyyx
+    XxXyxx
+    ** Failers
+    x
+
+/^(?1)(abc)/
+    abcabc
+
+/^(?:(?:\1|X)(a|b))+/
+    Xaaa
+    Xaba
+
+/^[\E\Qa\E-\Qz\E]+/BZ
+
+/^[a\Q]bc\E]/BZ
+
+/^[a-\Q\E]/BZ
+
+/^(?P>abc)[()](?)/BZ
+
+/^((?(abc)y)[()](?Px))+/BZ
+    (xy)x
+
+/^(?P>abc)\Q()\E(?)/BZ
+
+/^(?P>abc)[a\Q(]\E(](?)/BZ
+
+/^(?P>abc) # this is (a comment)
+  (?)/BZx
+
+/^\W*(?:(?(?.)\W*(?&one)\W*\k|)|(?(?.)\W*(?&three)\W*\k'four'|\W*.\W*))\W*$/Ii
+    1221
+    Satan, oscillate my metallic sonatas!
+    A man, a plan, a canal: Panama!
+    Able was I ere I saw Elba.
+    *** Failers
+    The quick brown fox
+
+/(?=(\w+))\1:/I
+    abcd:
+
+/(?=(?'abc'\w+))\k:/I
+    abcd:
+
+/(?'abc'\w+):\k{2}/
+    a:aaxyz
+    ab:ababxyz
+    ** Failers
+    a:axyz
+    ab:abxyz
+
+/(?'abc'a|b)(?d|e)\k{2}/J
+    adaa
+    ** Failers
+    addd
+    adbb
+
+/(?'abc'a|b)(?d|e)(?&abc){2}/J
+    bdaa
+    bdab
+    ** Failers
+    bddd
+
+/^(?a)? (?()b|c) (?('ab')d|e)/x
+    abd
+    ce
+
+/(?( (?'B' abc (?(R) (?(R&A)1) (?(R&B)2) X  |  (?1)  (?2)   (?R) ))) /x
+    abcabc1Xabc2XabcXabcabc
+
+/(? (?'B' abc (?(R) (?(R&1)1) (?(R&B)2) X  |  (?1)  (?2)   (?R) ))) /x
+
+/(?<1> (?'B' abc (?(R) (?(R&1)1) (?(R&B)2) X  |  (?1)  (?2)   (?R) ))) /x
+    abcabc1Xabc2XabcXabcabc
+
+/^(?(DEFINE) (? a) (? b) )  (?&A) (?&B) /x
+    abcd
+
+/(?(?&NAME_PAT))\s+(?(?&ADDRESS_PAT))
+  (?(DEFINE)
+  (?[a-z]+)
+  (?\d+)
+  )/x
+    metcalfe 33
+
+/^(?(DEFINE) abc | xyz ) /x
+
+/(?(DEFINE) abc) xyz/xI
+
+/(?(DEFINE) abc){3} xyz/x
+
+/(a|)*\d/
+  \O0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  \O0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/^a.b/
+    a\rb
+    a\nb\
+    a\x85b\ 
+    ** Failers
+    a\nb
+    a\nb\
+    a\rb\
+    a\rb\
+    a\x85b\ 
+    a\rb\
+
+/^abc./mgx
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x85abc7 JUNK
+
+/abc.$/mgx
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc7 abc9
+
+/a/
+
+/a/
+
+/^a\Rb/
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0cb
+    a\x85b
+    ** Failers
+    a\n\rb
+
+/^a\R*b/
+    ab
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0cb
+    a\x85b
+    a\n\rb
+    a\n\r\x85\x0cb
+
+/^a\R+b/
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0cb
+    a\x85b
+    a\n\rb
+    a\n\r\x85\x0cb
+    ** Failers
+    ab
+
+/^a\R{1,3}b/
+    a\nb
+    a\n\rb
+    a\n\r\x85b
+    a\r\n\r\nb
+    a\r\n\r\n\r\nb
+    a\n\r\n\rb
+    a\n\n\r\nb
+    ** Failers
+    a\n\n\n\rb
+    a\r
+
+/^a[\R]b/
+    aRb
+    ** Failers
+    a\nb
+
+/(?&abc)X(?P)/I
+    abcPXP123
+
+/(?1)X(?P)/I
+    abcPXP123
+
+/(?(DEFINE)(?2[0-4]\d|25[0-5]|1\d\d|[1-9]?\d))\b(?&byte)(\.(?&byte)){3}/
+    1.2.3.4
+    131.111.10.206
+    10.0.0.0
+    ** Failers
+    10.6
+    455.3.4.5
+
+/\b(?&byte)(\.(?&byte)){3}(?(DEFINE)(?2[0-4]\d|25[0-5]|1\d\d|[1-9]?\d))/
+    1.2.3.4
+    131.111.10.206
+    10.0.0.0
+    ** Failers
+    10.6
+    455.3.4.5
+
+/(?:a(?&abc)b)*(?x)/
+    123axbaxbaxbx456
+    123axbaxbaxb456
+
+/(?:a(?&abc)b){1,5}(?x)/
+    123axbaxbaxbx456
+
+/(?:a(?&abc)b){2,5}(?x)/
+    123axbaxbaxbx456
+
+/(?:a(?&abc)b){2,}(?x)/
+    123axbaxbaxbx456
+
+/(abc)(?i:(?1))/
+   defabcabcxyz
+   DEFabcABCXYZ
+
+/(abc)(?:(?i)(?1))/
+   defabcabcxyz
+   DEFabcABCXYZ
+
+/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
+    ababababbbabZXXXX
+
+/^(a)\g-2/
+
+/^(a)\g/
+
+/^(a)\g{0}/
+
+/^(a)\g{3/
+
+/^(a)\g{4a}/
+
+/^a.b/
+    a\rb
+    *** Failers
+    a\nb
+
+/.+foo/
+    afoo
+    ** Failers
+    \r\nfoo
+    \nfoo
+
+/.+foo/
+    afoo
+    \nfoo
+    ** Failers
+    \r\nfoo
+
+/.+foo/
+    afoo
+    ** Failers
+    \nfoo
+    \r\nfoo
+
+/.+foo/s
+    afoo
+    \r\nfoo
+    \nfoo
+    
+/^$/mg
+    abc\r\rxyz
+    abc\n\rxyz  
+    ** Failers 
+    abc\r\nxyz
+
+/(?m)^$/g+
+    abc\r\n\r\n
+
+/(?m)^$|^\r\n/g+ 
+    abc\r\n\r\n
+    
+/(?m)$/g+ 
+    abc\r\n\r\n
+
+/abc.$/mgx
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc9
+
+/^X/m
+    XABC
+    ** Failers 
+    XABC\B
+
+/(ab|c)(?-1)/BZ
+    abc
+
+/xy(?+1)(abc)/BZ
+    xyabcabc
+    ** Failers
+    xyabc  
+    
+/x(?-0)y/
+
+/x(?-1)y/
+
+/x(?+0)y/ 
+
+/x(?+1)y/
+
+/^(abc)?(?(-1)X|Y)/BZ
+    abcX
+    Y
+    ** Failers
+    abcY   
+    
+/^((?(+1)X|Y)(abc))+/BZ 
+    YabcXabc
+    YabcXabcXabc
+    ** Failers
+    XabcXabc  
+
+/(?(-1)a)/BZ
+
+/((?(-1)a))/BZ
+
+/((?(-2)a))/BZ
+
+/^(?(+1)X|Y)(.)/BZ
+    Y!
+
+/(foo)\Kbar/
+    foobar
+   
+/(foo)(\Kbar|baz)/
+    foobar
+    foobaz 
+
+/(foo\Kbar)baz/
+    foobarbaz
+
+/(?tom|bon)-\k{A}/
+    tom-tom
+    bon-bon 
+    ** Failers
+    tom-bon  
+
+/(?tom|bon)-\g{A}/
+    tom-tom
+    bon-bon 
+    
+/\g{A/ 
+
+/(?|(abc)|(xyz))/BZ
+   >abc<
+   >xyz< 
+
+/(x)(?|(abc)|(xyz))(x)/BZ
+    xabcx
+    xxyzx 
+
+/(x)(?|(abc)(pqr)|(xyz))(x)/BZ
+    xabcpqrx
+    xxyzx 
+
+/(?|(abc)|(xyz))\1/
+    abcabc
+    xyzxyz 
+    ** Failers
+    abcxyz
+    xyzabc   
+    
+/(?|(abc)|(xyz))(?1)/
+    abcabc
+    xyzabc 
+    ** Failers 
+    xyzxyz 
+ 
+/\H\h\V\v/
+    X X\x0a
+    X\x09X\x0b
+    ** Failers
+    \xa0 X\x0a   
+    
+/\H*\h+\V?\v{3,4}/ 
+    \x09\x20\xa0X\x0a\x0b\x0c\x0d\x0a
+    \x09\x20\xa0\x0a\x0b\x0c\x0d\x0a
+    \x09\x20\xa0\x0a\x0b\x0c
+    ** Failers 
+    \x09\x20\xa0\x0a\x0b
+     
+/\H{3,4}/
+    XY  ABCDE
+    XY  PQR ST 
+    
+/.\h{3,4}./
+    XY  AB    PQRS
+
+/\h*X\h?\H+Y\H?Z/
+    >XNNNYZ
+    >  X NYQZ
+    ** Failers
+    >XYZ   
+    >  X NY Z
+
+/\v*X\v?Y\v+Z\V*\x0a\V+\x0b\V{2,3}\x0c/
+    >XY\x0aZ\x0aA\x0bNN\x0c
+    >\x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+
+/[\h]/BZ
+    >\x09<
+
+/[\h]+/BZ
+    >\x09\x20\xa0<
+
+/[\v]/BZ
+
+/[\H]/BZ
+
+/[^\h]/BZ
+
+/[\V]/BZ
+
+/[\x0a\V]/BZ
+
+/\H++X/BZ
+    ** Failers
+    XXXX
+    
+/\H+\hY/BZ
+    XXXX Y 
+
+/\H+ Y/BZ
+
+/\h+A/BZ
+
+/\v*B/BZ
+
+/\V+\x0a/BZ
+
+/A+\h/BZ
+
+/ *\H/BZ
+
+/A*\v/BZ
+
+/\x0b*\V/BZ
+
+/\d+\h/BZ
+
+/\d*\v/BZ
+
+/S+\h\S+\v/BZ
+
+/\w{3,}\h\w+\v/BZ
+
+/\h+\d\h+\w\h+\S\h+\H/BZ
+
+/\v+\d\v+\w\v+\S\v+\V/BZ
+
+/\H+\h\H+\d/BZ
+
+/\V+\v\V+\w/BZ
+
+/\( (?: [^()]* | (?R) )* \)/x
+(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(00)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)
+
+/[\E]AAA/
+
+/[\Q\E]AAA/
+
+/[^\E]AAA/
+
+/[^\Q\E]AAA/
+
+/[\E^]AAA/
+
+/[\Q\E^]AAA/
+
+/A(*PRUNE)B(*SKIP)C(*THEN)D(*COMMIT)E(*F)F(*FAIL)G(?!)H(*ACCEPT)I/BZ
+
+/^a+(*FAIL)/
+    aaaaaa
+    
+/a+b?c+(*FAIL)/
+    aaabccc
+
+/a+b?(*PRUNE)c+(*FAIL)/
+    aaabccc
+
+/a+b?(*COMMIT)c+(*FAIL)/
+    aaabccc
+    
+/a+b?(*SKIP)c+(*FAIL)/
+    aaabcccaaabccc
+
+/^(?:aaa(*THEN)\w{6}|bbb(*THEN)\w{5}|ccc(*THEN)\w{4}|\w{3})/
+    aaaxxxxxx
+    aaa++++++ 
+    bbbxxxxx
+    bbb+++++ 
+    cccxxxx
+    ccc++++ 
+    dddddddd   
+
+/^(aaa(*THEN)\w{6}|bbb(*THEN)\w{5}|ccc(*THEN)\w{4}|\w{3})/
+    aaaxxxxxx
+    aaa++++++ 
+    bbbxxxxx
+    bbb+++++ 
+    cccxxxx
+    ccc++++ 
+    dddddddd   
+
+/a+b?(*THEN)c+(*FAIL)/
+    aaabccc
+
+/(A (A|B(*ACCEPT)|C) D)(E)/x
+    ABX
+    AADE
+    ACDE
+    ** Failers
+    AD 
+        
+/^a+(*FAIL)/C
+    aaaaaa
+    
+/a+b?c+(*FAIL)/C
+    aaabccc
+
+/a+b?(*PRUNE)c+(*FAIL)/C
+    aaabccc
+
+/a+b?(*COMMIT)c+(*FAIL)/C
+    aaabccc
+    
+/a+b?(*SKIP)c+(*FAIL)/C
+    aaabcccaaabccc
+
+/a+b?(*THEN)c+(*FAIL)/C
+    aaabccc
+    
+/a(*PRUNE:XXX)b/
+
+/a(*MARK)b/ 
+
+/(?i:A{1,}\6666666666)/
+
+/\g6666666666/
+
+/[\g6666666666]/
+
+/(?1)\c[/
+
+/.+A/
+    \r\nA
+    
+/\nA/
+    \r\nA 
+
+/[\r\n]A/
+    \r\nA 
+
+/(\r|\n)A/
+    \r\nA 
+
+/a(*CR)b/
+
+/(*CR)a.b/
+    a\nb
+    ** Failers
+    a\rb  
+
+/(*CR)a.b/
+    a\nb
+    ** Failers
+    a\rb  
+
+/(*LF)a.b/
+    a\rb
+    ** Failers
+    a\nb  
+
+/(*CRLF)a.b/
+    a\rb
+    a\nb  
+    ** Failers
+    a\r\nb  
+
+/(*ANYCRLF)a.b/
+    ** Failers
+    a\rb
+    a\nb  
+    a\r\nb  
+
+/(*ANY)a.b/
+    ** Failers
+    a\rb
+    a\nb  
+    a\r\nb  
+    a\x85b 
+
+/a\Rb/I
+    a\rb
+    a\nb
+    a\r\nb
+    ** Failers
+    a\x85b
+    a\x0bb     
+
+/a\Rb/I
+    a\rb
+    a\nb
+    a\r\nb
+    a\x85b
+    a\x0bb     
+    ** Failers 
+    a\x85b\
+    a\x0bb\
+    
+/a\R?b/I
+    a\rb
+    a\nb
+    a\r\nb
+    ** Failers
+    a\x85b
+    a\x0bb     
+
+/a\R?b/I
+    a\rb
+    a\nb
+    a\r\nb
+    a\x85b
+    a\x0bb     
+    ** Failers 
+    a\x85b\
+    a\x0bb\
+    
+/a\R{2,4}b/I
+    a\r\n\nb
+    a\n\r\rb
+    a\r\n\r\n\r\n\r\nb
+    ** Failers
+    a\x85\85b
+    a\x0b\0bb     
+
+/a\R{2,4}b/I
+    a\r\rb
+    a\n\n\nb
+    a\r\n\n\r\rb
+    a\x85\85b
+    a\x0b\0bb     
+    ** Failers 
+    a\r\r\r\r\rb 
+    a\x85\85b\
+    a\x0b\0bb\
+ 
+/(*BSR_ANYCRLF)a\Rb/I
+    a\nb
+    a\rb 
+
+/(*BSR_UNICODE)a\Rb/I
+    a\x85b
+
+/(*BSR_ANYCRLF)(*CRLF)a\Rb/I
+    a\nb
+    a\rb 
+
+/(*CRLF)(*BSR_UNICODE)a\Rb/I
+    a\x85b
+
+/(*CRLF)(*BSR_ANYCRLF)(*CR)ab/I
+
+/(?)(?&)/
+
+/(?)(?&a)/
+
+/(?)(?&aaaaaaaaaaaaaaaaaaaaaaa)/
+
+/(?+-a)/
+
+/(?-+a)/
+
+/(?(-1))/
+
+/(?(+10))/
+
+/(?(10))/
+
+/(?(+2))()()/
+
+/(?(2))()()/
+
+/\k''/
+
+/\k<>/
+
+/\k{}/
+
+/(?P=)/
+
+/(?P>)/
+
+/(?!\w)(?R)/
+
+/(?=\w)(?R)/
+
+/(?a|b\gc)/
+    aaaa
+    bacxxx
+    bbaccxxx 
+    bbbacccxx
+
+/^(?a|b\g'name'c)/
+    aaaa
+    bacxxx
+    bbaccxxx 
+    bbbacccxx
+
+/^(a|b\g<1>c)/
+    aaaa
+    bacxxx
+    bbaccxxx 
+    bbbacccxx
+
+/^(a|b\g'1'c)/
+    aaaa
+    bacxxx
+    bbaccxxx 
+    bbbacccxx
+
+/^(a|b\g'-1'c)/
+    aaaa
+    bacxxx
+    bbaccxxx 
+    bbbacccxx
+
+/(^(a|b\g<-1>c))/
+    aaaa
+    bacxxx
+    bbaccxxx 
+    bbbacccxx
+
+/(^(a|b\g<-1'c))/
+
+/(^(a|b\g{-1}))/
+    bacxxx
+
+/(?-i:\g)(?i:(?a))/
+    XaaX
+    XAAX 
+
+/(?i:\g)(?-i:(?a))/
+    XaaX
+    ** Failers 
+    XAAX 
+
+/(?-i:\g<+1>)(?i:(a))/
+    XaaX
+    XAAX 
+
+/(?=(?(?#simplesyntax)\$(?[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)(?:\[(?[a-zA-Z0-9_\x{7f}-\x{ff}]+|\$\g)\]|->\g(\(.*?\))?)?|(?#simple syntax withbraces)\$\{(?:\g(?\[(?:\g|'(?:\\.|[^'\\])*'|"(?:\g|\\.|[^"\\])*")\])?|\g|\$\{\g\})\}|(?#complexsyntax)\{(?\$(?\g(\g*|\(.*?\))?)(?:->\g)*|\$\g|\$\{\g\})\}))\{/
+
+/(?a|b|c)\g*/
+   abc
+   accccbbb 
+
+/^(?+1)(?x|y){0}z/
+    xzxx
+    yzyy 
+    ** Failers
+    xxz  
+
+/(\3)(\1)(a)/
+    cat
+
+/(\3)(\1)(a)/
+    cat
+    
+/TA]/
+    The ACTA] comes 
+
+/TA]/
+    The ACTA] comes 
+
+/(?2)[]a()b](abc)/
+    abcbabc
+
+/(?2)[^]a()b](abc)/
+    abcbabc
+
+/(?1)[]a()b](abc)/
+    abcbabc
+    ** Failers 
+    abcXabc
+
+/(?1)[^]a()b](abc)/
+    abcXabc
+    ** Failers 
+    abcbabc
+
+/(?2)[]a()b](abc)(xyz)/
+    xyzbabcxyz
+
+/(?&N)[]a(?)](?abc)/
+   abc)](abc)/
+   abc
+    ** Failers
+    ab
+
+/a[]+b/
+    ** Failers
+    ab 
+
+/a[]*+b/
+    ** Failers
+    ab 
+
+/a[^]b/
+    aXb
+    a\nb 
+    ** Failers
+    ab  
+    
+/a[^]+b/ 
+    aXb
+    a\nX\nXb 
+    ** Failers
+    ab  
+
+/a(?!)+b/
+
+/a(*FAIL)+b/
+
+/(abc|pqr|123){0}[xyz]/SI
+
+/(?(?=.*b)b|^)/CI
+   adc
+   abc 
+   
+/(?(?=b).*b|^d)/I
+
+/(?(?=.*b).*b|^d)/I
+
+/a?|b?/P
+    abc
+    ** Failers
+    ddd\N   
+
+/xyz/C
+  xyz 
+  abcxyz 
+  abcxyz\Y
+  ** Failers 
+  abc
+  abc\Y
+  abcxypqr  
+  abcxypqr\Y  
+
+/^"((?(?=[a])[^"])|b)*"$/C
+    "ab"
+
+/^"((?(?=[a])[^"])|b)*"$/
+    "ab"
+
+/^X(?5)(a)(?|(b)|(q))(c)(d)(Y)/
+    XYabcdY
+
+/^X(?5)(a)(?|(b)|(q))(c)(d)Y/
+    XYabcdY
+
+/^X(?&N)(a)(?|(b)|(q))(c)(d)(?Y)/
+    XYabcdY
+ 
+/^X(?7)(a)(?|(b)|(q)(r)(s))(c)(d)(Y)/
+    XYabcdY
+
+/^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)/
+    XYabcdY
+
+/^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)/
+    XYabcdY
 
 / End of testinput2 /

Modified: freeswitch/trunk/libs/pcre/testdata/testinput3
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput3	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput3	Mon Jun  8 18:51:30 2009
@@ -86,6 +86,6 @@
     >>>\xaa<<<
     >>>\xba<<< 
     
-/[[:alpha:]][[:lower:]][[:upper:]]/DLfr_FR 
+/[[:alpha:]][[:lower:]][[:upper:]]/DZLfr_FR 
 
 / End of testinput3 /

Modified: freeswitch/trunk/libs/pcre/testdata/testinput4
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput4	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput4	Mon Jun  8 18:51:30 2009
@@ -520,4 +520,107 @@
     abcdefg
     ab
 
+/a*\x{100}*\w/8
+    a 
+
+/\S\S/8g
+    A\x{a3}BC
+    
+/\S{2}/8g
+    A\x{a3}BC
+    
+/\W\W/8g
+    +\x{a3}== 
+
+/\W{2}/8g
+    +\x{a3}== 
+
+/\S/8g
+    \x{442}\x{435}\x{441}\x{442}
+
+/[\S]/8g
+    \x{442}\x{435}\x{441}\x{442}
+
+/\D/8g
+    \x{442}\x{435}\x{441}\x{442}
+
+/[\D]/8g
+    \x{442}\x{435}\x{441}\x{442}
+
+/\W/8g
+    \x{2442}\x{2435}\x{2441}\x{2442}
+
+/[\W]/8g
+    \x{2442}\x{2435}\x{2441}\x{2442}
+    
+/[\S\s]*/8
+    abc\n\r\x{442}\x{435}\x{441}\x{442}xyz 
+
+/[\x{41f}\S]/8g
+    \x{442}\x{435}\x{441}\x{442}
+
+/.[^\S]./8g
+    abc def\x{442}\x{443}xyz\npqr
+
+/.[^\S\n]./8g
+    abc def\x{442}\x{443}xyz\npqr
+
+/[[:^alnum:]]/8g  
+    +\x{2442}
+    
+/[[:^alpha:]]/8g 
+    +\x{2442}
+    
+/[[:^ascii:]]/8g 
+    A\x{442}
+    
+/[[:^blank:]]/8g 
+    A\x{442}
+    
+/[[:^cntrl:]]/8g 
+    A\x{442}
+    
+/[[:^digit:]]/8g 
+    A\x{442}
+    
+/[[:^graph:]]/8g 
+    \x19\x{e01ff}
+    
+/[[:^lower:]]/8g 
+    A\x{422}
+    
+/[[:^print:]]/8g 
+    \x{19}\x{e01ff}
+    
+/[[:^punct:]]/8g 
+    A\x{442}
+    
+/[[:^space:]]/8g 
+    A\x{442}
+    
+/[[:^upper:]]/8g 
+    a\x{442}
+    
+/[[:^word:]]/8g  
+    +\x{2442}
+    
+/[[:^xdigit:]]/8g
+    M\x{442}
+
+/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????abcdefghijklmnopqrstuvwxyz???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????\d-_^]/8
+
+/^[^d]*?$/
+    abc
+
+/^[^d]*?$/8
+    abc
+
+/^[^d]*?$/i
+    abc
+
+/^[^d]*?$/8i
+    abc
+
+/(?i)[\xc3\xa9\xc3\xbd]|[\xc3\xa9\xc3\xbdA]/8
+
 / End of testinput4 /

Modified: freeswitch/trunk/libs/pcre/testdata/testinput5
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput5	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput5	Mon Jun  8 18:51:30 2009
@@ -1,20 +1,20 @@
-/\x{100}/8DM
+/\x{100}/8DZ
 
-/\x{1000}/8DM
+/\x{1000}/8DZ
 
-/\x{10000}/8DM
+/\x{10000}/8DZ
 
-/\x{100000}/8DM
+/\x{100000}/8DZ
 
-/\x{1000000}/8DM
+/\x{1000000}/8DZ
 
-/\x{4000000}/8DM
+/\x{4000000}/8DZ
 
-/\x{7fffFFFF}/8DM
+/\x{7fffFFFF}/8DZ
 
-/[\x{ff}]/8DM
+/[\x{ff}]/8DZ
 
-/[\x{100}]/8DM
+/[\x{100}]/8DZ
 
 /\x{ffffffff}/8
 
@@ -23,39 +23,39 @@
 /^\x{100}a\x{1234}/8
     \x{100}a\x{1234}bcd
 
-/\x80/8D
+/\x80/8DZ
 
-/\xff/8D
+/\xff/8DZ
 
-/\x{0041}\x{2262}\x{0391}\x{002e}/D8
+/\x{0041}\x{2262}\x{0391}\x{002e}/DZ8
     \x{0041}\x{2262}\x{0391}\x{002e}
     
-/\x{D55c}\x{ad6d}\x{C5B4}/D8 
+/\x{D55c}\x{ad6d}\x{C5B4}/DZ8 
     \x{D55c}\x{ad6d}\x{C5B4} 
 
-/\x{65e5}\x{672c}\x{8a9e}/D8
+/\x{65e5}\x{672c}\x{8a9e}/DZ8
     \x{65e5}\x{672c}\x{8a9e}
 
-/\x{80}/D8
+/\x{80}/DZ8
 
-/\x{084}/D8
+/\x{084}/DZ8
 
-/\x{104}/D8
+/\x{104}/DZ8
 
-/\x{861}/D8
+/\x{861}/DZ8
 
-/\x{212ab}/D8
+/\x{212ab}/DZ8
 
-/.{3,5}X/D8
+/.{3,5}X/DZ8
     \x{212ab}\x{212ab}\x{212ab}\x{861}X
 
 
-/.{3,5}?/D8
+/.{3,5}?/DZ8
     \x{212ab}\x{212ab}\x{212ab}\x{861}
 
-/-- These tests are here rather than in testinput4 because Perl 5.6 has --/
-/-- some problems with UTF-8 support, in the area of \x{..} where the   --/
-/-- value is < 255. It grumbles about invalid UTF-8 strings.            --/
+/-- These tests are here rather than in testinput4 because Perl 5.6 has some
+problems with UTF-8 support, in the area of \x{..} where the value is < 255. 
+It grumbles about invalid UTF-8 strings. --/
 
 /^[a\x{c0}]b/8
     \x{c0}b
@@ -80,29 +80,29 @@
 /(?<=\C)X/8
     Should produce an error diagnostic
     
-/-- This one is here not because it's different to Perl, but because the --/
-/-- way the captured single-byte is displayed. (In Perl it becomes a --/
-/-- character, and you can't tell the difference.) --/
+/-- This one is here not because it's different to Perl, but because the way
+the captured single-byte is displayed. (In Perl it becomes a character, and you
+can't tell the difference.) --/
     
 /X(\C)(.*)/8
     X\x{1234}
     X\nabc 
     
-/^[ab]/8D
+/^[ab]/8DZ
     bar
     *** Failers
     c
     \x{ff}
     \x{100}  
 
-/^[^ab]/8D
+/^[^ab]/8DZ
     c
     \x{ff}
     \x{100}  
     *** Failers 
     aaa
   
-/[^ab\xC0-\xF0]/8SD
+/[^ab\xC0-\xF0]/8SDZ
     \x{f1}
     \x{bf}
     \x{100}
@@ -111,16 +111,16 @@
     \x{c0} 
     \x{f0} 
 
-/??{3,4}/8SD
+/??{3,4}/8SDZ
   \x{100}\x{100}\x{100}\x{100\x{100}
 
-/(\x{100}+|x)/8SD
+/(\x{100}+|x)/8SDZ
 
-/(\x{100}*a|x)/8SD
+/(\x{100}*a|x)/8SDZ
 
-/(\x{100}{0,2}a|x)/8SD
+/(\x{100}{0,2}a|x)/8SDZ
 
-/(\x{100}{1,2}a|x)/8SD
+/(\x{100}{1,2}a|x)/8SDZ
 
 /\x{100}*(\d+|"(?1)")/8
     1234
@@ -132,34 +132,34 @@
     *** Failers 
     \x{100}\x{100}abcd
 
-/\x{100}/8D
+/\x{100}/8DZ
 
-/\x{100}*/8D
+/\x{100}*/8DZ
 
-/a\x{100}*/8D
+/a\x{100}*/8DZ
 
-/ab\x{100}*/8D
+/ab\x{100}*/8DZ
 
-/a\x{100}\x{101}*/8D
+/a\x{100}\x{101}*/8DZ
 
-/a\x{100}\x{101}+/8D
+/a\x{100}\x{101}+/8DZ
 
-/\x{100}*A/8D
+/\x{100}*A/8DZ
     A
 
-/\x{100}*\d(?R)/8D
+/\x{100}*\d(?R)/8DZ
 
-/[^\x{c4}]/D
+/[^\x{c4}]/DZ
 
-/[^\x{c4}]/8D
+/[^\x{c4}]/8DZ
 
-/[\x{100}]/8DM
+/[\x{100}]/8DZ
     \x{100}
     Z\x{100}
     \x{100}Z
     *** Failers 
 
-/[Z\x{100}]/8DM
+/[Z\x{100}]/8DZ
     Z\x{100}
     \x{100}
     \x{100}Z
@@ -174,21 +174,21 @@
     \x{105}
     \x{ff}    
 
-/[z-\x{100}]/8D
+/[z-\x{100}]/8DZ
 
-/[z\Qa-d]??\E]/8D
+/[z\Qa-d]??\E]/8DZ
     \x{100}
     ?? 
 
-/[\xFF]/D
+/[\xFF]/DZ
     >\xff<
 
-/[\xff]/D8
+/[\xff]/DZ8
     >\x{ff}<
 
-/[^\xFF]/D
+/[^\xFF]/DZ
 
-/[^\xff]/8D
+/[^\xff]/8DZ
 
 /[??-??]/8
     ?? # Matches without Study
@@ -212,7 +212,7 @@
 
 /???xxx/8
 
-/???xxx/8?D
+/???xxx/8?DZ
 
 /abc/8
     ?]
@@ -238,20 +238,24 @@
     \xf9\x87\x80\x80\x80  
     \xfc\x84\x80\x80\x80\x80
     \xfd\x83\x80\x80\x80\x80
+    \?\xf8\x88\x80\x80\x80  
+    \?\xf9\x87\x80\x80\x80  
+    \?\xfc\x84\x80\x80\x80\x80
+    \?\xfd\x83\x80\x80\x80\x80
 
-/\x{100}abc(xyz(?1))/8D
+/\x{100}abc(xyz(?1))/8DZ
 
-/[^\x{100}]abc(xyz(?1))/8D
+/[^\x{100}]abc(xyz(?1))/8DZ
 
-/[ab\x{100}]abc(xyz(?1))/8D
+/[ab\x{100}]abc(xyz(?1))/8DZ
 
-/(\x{100}(b(?2)c))?/D8
+/(\x{100}(b(?2)c))?/DZ8
 
-/(\x{100}(b(?2)c)){0,2}/D8
+/(\x{100}(b(?2)c)){0,2}/DZ8
 
-/(\x{100}(b(?1)c))?/D8
+/(\x{100}(b(?1)c))?/DZ8
 
-/(\x{100}(b(?1)c)){0,2}/D8
+/(\x{100}(b(?1)c)){0,2}/DZ8
 
 /\W/8
     A.B
@@ -263,12 +267,222 @@
 /a\x{1234}b/P8
     a\x{1234}b
 
-/^\???/8D
+/^\???/8DZ
 
 /\777/I
 
 /\777/8I
   \x{1ff}
   \777 
+  
+/\x{100}*\d/8DZ
+
+/\x{100}*\s/8DZ
+
+/\x{100}*\w/8DZ
+
+/\x{100}*\D/8DZ
+
+/\x{100}*\S/8DZ
+
+/\x{100}*\W/8DZ
+
+/\x{100}+\x{200}/8DZ
+
+/\x{100}+X/8DZ
+
+/X+\x{200}/8DZ
+
+/()()()()()()()()()()
+ ()()()()()()()()()()
+ ()()()()()()()()()()
+ ()()()()()()()()()()
+ A (x) (?41) B/8x
+    AxxB     
+
+/^[\x{100}\E-\Q\E\x{150}]/BZ8
+
+/^[\Q??\E-\Q??\E]/BZ8
+
+/^[\Q??\E-\Q??\E/BZ8
+
+/^abc./mgx8
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x{0085}abc7 \x{2028}abc8 \x{2029}abc9 JUNK
+
+/abc.$/mgx8
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x{0085} abc7\x{2028} abc8\x{2029} abc9
+
+/^a\Rb/8
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0cb
+    a\x{85}b   
+    a\x{2028}b 
+    a\x{2029}b 
+    ** Failers
+    a\n\rb    
+
+/^a\R*b/8
+    ab
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0c\x{2028}\x{2029}b
+    a\x{85}b   
+    a\n\rb    
+    a\n\r\x{85}\x0cb 
+
+/^a\R+b/8
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0c\x{2028}\x{2029}b
+    a\x{85}b   
+    a\n\rb    
+    a\n\r\x{85}\x0cb 
+    ** Failers
+    ab  
+
+/^a\R{1,3}b/8
+    a\nb
+    a\n\rb
+    a\n\r\x{85}b
+    a\r\n\r\nb 
+    a\r\n\r\n\r\nb 
+    a\n\r\n\rb
+    a\n\n\r\nb 
+    ** Failers
+    a\n\n\n\rb
+    a\r
+
+/\H\h\V\v/8
+    X X\x0a
+    X\x09X\x0b
+    ** Failers
+    \x{a0} X\x0a   
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+    \x09\x20\x{a0}\x0a\x0b\x0c\x0d\x0a
+    \x09\x20\x{a0}\x0a\x0b\x0c
+    ** Failers 
+    \x09\x20\x{a0}\x0a\x0b
+     
+/\H\h\V\v/8
+    \x{3001}\x{3000}\x{2030}\x{2028}
+    X\x{180e}X\x{85}
+    ** Failers
+    \x{2009} X\x0a   
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x0c\x0d\x0a
+    \x09\x{205f}\x{a0}\x0a\x{2029}\x0c\x{2028}\x0a
+    \x09\x20\x{202f}\x0a\x0b\x0c
+    ** Failers 
+    \x09\x{200a}\x{a0}\x{2028}\x0b
+     
+/[\h]/8BZ
+    >\x{1680}
+
+/[\h]{3,}/8BZ
+    >\x{1680}\x{180e}\x{2000}\x{2003}\x{200a}\x{202f}\x{205f}\x{3000}<
+
+/[\v]/8BZ
+
+/[\H]/8BZ
+
+/[\V]/8BZ
+
+/.*$/8
+    \x{1ec5} 
+    
+/-- This tests the stricter UTF-8 check according to RFC 3629. --/ 
+    
+/X/8
+    \x{0}\x{d7ff}\x{e000}\x{10ffff}
+    \x{d800}
+    \x{d800}\?
+    \x{da00}
+    \x{da00}\?
+    \x{dfff}
+    \x{dfff}\?
+    \x{110000}    
+    \x{110000}\?    
+    \x{2000000} 
+    \x{2000000}\? 
+    \x{7fffffff} 
+    \x{7fffffff}\? 
+
+/a\Rb/I8
+    a\rb
+    a\nb
+    a\r\nb
+    ** Failers
+    a\x{85}b
+    a\x0bb     
+
+/a\Rb/I8
+    a\rb
+    a\nb
+    a\r\nb
+    a\x{85}b
+    a\x0bb     
+    ** Failers 
+    a\x{85}b\
+    a\x0bb\
+    
+/a\R?b/I8
+    a\rb
+    a\nb
+    a\r\nb
+    ** Failers
+    a\x{85}b
+    a\x0bb     
+
+/a\R?b/I8
+    a\rb
+    a\nb
+    a\r\nb
+    a\x{85}b
+    a\x0bb     
+    ** Failers 
+    a\x{85}b\
+    a\x0bb\
+ 
+/.*a.*=.b.*/8
+    QQQ\x{2029}ABCaXYZ=!bPQR
+    ** Failers
+    a\x{2029}b
+    \x61\xe2\x80\xa9\x62 
+
+/[[:a\x{100}b:]]/8
+
+/a[^]b/8
+    a\x{1234}b
+    a\nb 
+    ** Failers
+    ab  
+    
+/a[^]+b/8
+    aXb
+    a\nX\nX\x{1234}b 
+    ** Failers
+    ab  
+
+/(\x{de})\1/
+    \x{de}\x{de}
+    \x{123} 
+
+/X/8f 
+    A\x{1ec5}ABCXYZ
+
+/(*UTF8)\x{1234}/
+  abcd\x{1234}pqr
+
+/(*CRLF)(*UTF8)(*BSR_UNICODE)a\Rb/I
 
 / End of testinput5 /

Modified: freeswitch/trunk/libs/pcre/testdata/testinput6
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput6	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput6	Mon Jun  8 18:51:30 2009
@@ -61,7 +61,7 @@
     \x{09f} 
   
 /^\p{Cs}/8
-    \x{dfff}
+    \?\x{dfff}
     ** Failers
     \x{09f} 
   
@@ -69,7 +69,7 @@
     a
     ** Failers 
     Z
-    \x{dfff}  
+    \x{e000}  
   
 /^\p{Lm}/8
     \x{2b0}
@@ -323,20 +323,20 @@
     ** Failers
     WXYZ 
 
-/[\p{L}]/D
+/[\p{L}]/DZ
 
-/[\p{^L}]/D
+/[\p{^L}]/DZ
 
-/[\P{L}]/D
+/[\P{L}]/DZ
 
-/[\P{^L}]/D
+/[\P{^L}]/DZ
 
-/[abc\p{L}\x{0660}]/8D
+/[abc\p{L}\x{0660}]/8DZ
 
-/[\p{Nd}]/8DM
+/[\p{Nd}]/8DZ
     1234
 
-/[\p{Nd}+-]+/8DM
+/[\p{Nd}+-]+/8DZ
     1234
     12-34
     12+\x{661}-34  
@@ -425,13 +425,13 @@
     A\x{391}\x{10427}\x{ff5a}\x{1fb0}
     A\x{391}\x{10427}\x{ff3a}\x{1fb8}
 
-/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8iD
+/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8iDZ
 
-/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8D
+/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8DZ
 
-/AB\x{1fb0}/8D
+/AB\x{1fb0}/8DZ
 
-/AB\x{1fb0}/8Di
+/AB\x{1fb0}/8DZi
 
 /\x{391}+/8i
     \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}
@@ -452,7 +452,7 @@
     \x{c0}
     \x{e0} 
 
-/[\x{105}-\x{109}]/8iD
+/[\x{105}-\x{109}]/8iDZ
     \x{104}
     \x{105}
     \x{109}  
@@ -460,7 +460,7 @@
     \x{100}
     \x{10a} 
     
-/[z-\x{100}]/8iD 
+/[z-\x{100}]/8iDZ 
     Z
     z
     \x{39c}
@@ -475,7 +475,7 @@
     Y
     y           
 
-/[z-\x{100}]/8Di
+/[z-\x{100}]/8DZi
 
 /^\X/8
     A
@@ -747,4 +747,208 @@
 /([\pL]=(abc))*X/
     L=abcX
 
+/The next two should be Perl-compatible, but it fails to match \x{e0}. PCRE
+will match it only with UCP support, because without that it has no notion
+of case for anything other than the ASCII letters. / 
+
+/((?i)[\x{c0}])/8
+    \x{c0}
+    \x{e0} 
+
+/(?i:[\x{c0}])/8
+    \x{c0}
+    \x{e0} 
+    
+/^\p{Balinese}\p{Cuneiform}\p{Nko}\p{Phags_Pa}\p{Phoenician}/8
+    \x{1b00}\x{12000}\x{7c0}\x{a840}\x{10900}
+
+/The next two are special cases where the lengths of the different cases of the 
+same character differ. The first went wrong with heap frame storage; the 2nd
+was broken in all cases./
+
+/^\x{023a}+?(\x{0130}+)/8i
+  \x{023a}\x{2c65}\x{0130}
+  
+/^\x{023a}+([^X])/8i
+  \x{023a}\x{2c65}X
+
+/Check property support in non-UTF-8 mode/
+ 
+/\p{L}{4}/
+    123abcdefg
+    123abc\xc4\xc5zz
+
+/\X{1,3}\d/
+  \x8aBCD
+  
+/\X?\d/
+  \x8aBCD 
+
+/\P{L}?\d/
+  \x8aBCD 
+
+/[\PPP\x8a]{1,}\x80/
+    A\x80
+
+/(?:[\PPa*]*){8,}/
+
+/[\P{Any}]/BZ
+
+/[\P{Any}\E]/BZ
+
+/(\P{Yi}+\277)/
+
+/(\P{Yi}+\277)?/
+
+/(?<=\P{Yi}{3}A)X/
+
+/\p{Yi}+(\P{Yi}+)(?1)/
+
+/(\P{Yi}{2}\277)?/
+
+/[\P{Yi}A]/
+
+/[\P{Yi}\P{Yi}\P{Yi}A]/
+
+/[^\P{Yi}A]/
+
+/[^\P{Yi}\P{Yi}\P{Yi}A]/
+
+/(\P{Yi}*\277)*/
+
+/(\P{Yi}*?\277)*/
+
+/(\p{Yi}*+\277)*/
+
+/(\P{Yi}?\277)*/
+
+/(\P{Yi}??\277)*/
+
+/(\p{Yi}?+\277)*/
+
+/(\P{Yi}{0,3}\277)*/
+
+/(\P{Yi}{0,3}?\277)*/
+
+/(\p{Yi}{0,3}+\277)*/
+
+/^[\p{Arabic}]/8
+    \x{60e} 
+    \x{656} 
+    \x{657} 
+    \x{658} 
+    \x{659} 
+    \x{65a} 
+    \x{65b} 
+    \x{65c} 
+    \x{65d} 
+    \x{65e} 
+    \x{66a} 
+    \x{6e9} 
+    \x{6ef}
+    \x{6fa}  
+    ** Failers
+    \x{600}
+    \x{650}
+    \x{651}  
+    \x{652}  
+    \x{653}  
+    \x{654} 
+    \x{655} 
+    \x{65f}  
+    
+/^\p{Cyrillic}/8
+    \x{1d2b} 
+    
+/^\p{Common}/8
+    \x{589}
+    \x{60c}
+    \x{61f}  
+    \x{964}
+    \x{965}  
+    \x{970}  
+
+/^\p{Inherited}/8
+    \x{64b}
+    \x{654}
+    \x{655}
+    \x{200c} 
+    ** Failers
+    \x{64a}
+    \x{656}     
+
+/^\p{Shavian}/8
+    \x{10450}
+    \x{1047f}
+    
+/^\p{Deseret}/8
+    \x{10400}
+    \x{1044f}
+    
+/^\p{Osmanya}/8
+    \x{10480}
+    \x{1049d}
+    \x{104a0}
+    \x{104a9}
+    ** Failers
+    \x{1049e}
+    \x{1049f}
+    \x{104aa}           
+
+/\p{Zl}{2,3}+/8BZ
+    \xe2\x80\xa8\xe2\x80\xa8
+    \x{2028}\x{2028}\x{2028}
+    
+/\p{Zl}/8BZ
+
+/\p{Lu}{3}+/8BZ
+
+/\pL{2}+/8BZ
+
+/\p{Cc}{2}+/8BZ
+
+/\x{c0}+\x{116}+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+
+/[\x{c0}\x{116}]+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+
+/\p{Carian}\p{Cham}\p{Kayah_Li}\p{Lepcha}\p{Lycian}\p{Lydian}\p{Ol_Chiki}\p{Rejang}\p{Saurashtra}\p{Sundanese}\p{Vai}/8
+    \x{102A4}\x{AA52}\x{A91D}\x{1C46}\x{10283}\x{1092E}\x{1C6B}\x{A93B}\x{A8BF}\x{1BA0}\x{A50A}====
+
+/\x{a77d}\x{1d79}/8i
+    \x{a77d}\x{1d79}
+    \x{1d79}\x{a77d} 
+
+/\x{a77d}\x{1d79}/8
+    \x{a77d}\x{1d79}
+    ** Failers 
+    \x{1d79}\x{a77d} 
+
+/(A)\1/8i
+    AA
+    Aa
+    aa
+    aA
+
+/(\x{de})\1/8i
+    \x{de}\x{de}
+    \x{de}\x{fe}
+    \x{fe}\x{fe}
+    \x{fe}\x{de}
+
+/(\x{10a})\1/8i
+    \x{10a}\x{10a}
+    \x{10a}\x{10b}
+    \x{10b}\x{10b}
+    \x{10b}\x{10a}
+    
+/The next two tests are for property support in non-UTF-8 mode/
+
+/(?:\p{Lu}|\x20)+/
+    \x41\x20\x50\xC2\x54\xC9\x20\x54\x4F\x44\x41\x59
+
+/[\p{Lu}\x20]+/
+    \x41\x20\x50\xC2\x54\xC9\x20\x54\x4F\x44\x41\x59
+
 / End of testinput6 /

Modified: freeswitch/trunk/libs/pcre/testdata/testinput7
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput7	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput7	Mon Jun  8 18:51:30 2009
@@ -1775,7 +1775,7 @@
     abc
 
 /^a	b
-  
    c/x
+      c/x
     abc
 
 /ab{1,3}bc/
@@ -1888,7 +1888,7 @@
 /{4,5a}bc/
     {4,5a}bc
 
-/^a.b/
+/^a.b/
     a\rb
     *** Failers
     a\nb
@@ -1931,8 +1931,8 @@
 /(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\12\123/
     abcdefghijk\12S
 
-/ab\gdef/
-    abgdef
+/ab\idef/
+    abidef
 
 /a{0}bc/
     bc
@@ -2733,8 +2733,6 @@
     abc
     abq
 
-/ab{1,}bc/
-
 /ab+bc/
     abbbbc
 
@@ -4066,7 +4064,7 @@
     xyz\rabc\
     xyz\rabc\
     
-/abc$/m
+/abc$/m
     xyzabc
     xyzabc\n 
     xyzabc\npqr 
@@ -4098,7 +4096,7 @@
     ** Failers  
     xyz\rabcdef
     
-/.*/
+/.*/
     abc\ndef
     abc\rdef
     abc\r\ndef
@@ -4114,4 +4112,313 @@
     abc\rdef
     abc\r\ndef
 
+/^\w+=.*(\\\n.*)*/
+    abc=xyz\\\npqr
+
+/^(a()*)*/
+    aaaa
+
+/^(?:a(?:(?:))*)*/
+    aaaa
+
+/^(a()+)+/
+    aaaa
+
+/^(?:a(?:(?:))+)+/
+    aaaa
+
+/(a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/(?>a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/(?:a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/^a.b/
+    a\rb
+    a\nb\ 
+    ** Failers
+    a\nb
+    a\nb\
+    a\rb\   
+    a\rb\   
+
+/^abc./mgx
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x85abc7 JUNK
+
+/abc.$/mgx
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc9
+
+/^a\Rb/
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0cb
+    a\x85b   
+    ** Failers
+    a\n\rb    
+
+/^a\R*b/
+    ab
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0cb
+    a\x85b   
+    a\n\rb    
+    a\n\r\x85\x0cb 
+
+/^a\R+b/
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0cb
+    a\x85b   
+    a\n\rb    
+    a\n\r\x85\x0cb 
+    ** Failers
+    ab  
+    
+/^a\R{1,3}b/
+    a\nb
+    a\n\rb
+    a\n\r\x85b
+    a\r\n\r\nb 
+    a\r\n\r\n\r\nb 
+    a\n\r\n\rb
+    a\n\n\r\nb 
+    ** Failers
+    a\n\n\n\rb
+    a\r
+
+/^a[\R]b/
+    aRb
+    ** Failers
+    a\nb  
+
+/.+foo/
+    afoo
+    ** Failers 
+    \r\nfoo 
+    \nfoo 
+
+/.+foo/
+    afoo
+    \nfoo 
+    ** Failers 
+    \r\nfoo 
+
+/.+foo/
+    afoo
+    ** Failers 
+    \nfoo 
+    \r\nfoo 
+
+/.+foo/s
+    afoo
+    \r\nfoo 
+    \nfoo 
+
+/^$/mg
+    abc\r\rxyz
+    abc\n\rxyz  
+    ** Failers 
+    abc\r\nxyz
+
+/^X/m
+    XABC
+    ** Failers 
+    XABC\B
+
+/(?m)^$/g+
+    abc\r\n\r\n
+
+/(?m)^$|^\r\n/g+ 
+    abc\r\n\r\n
+    
+/(?m)$/g+ 
+    abc\r\n\r\n
+
+/(?|(abc)|(xyz))/
+   >abc<
+   >xyz< 
+
+/(x)(?|(abc)|(xyz))(x)/
+    xabcx
+    xxyzx 
+
+/(x)(?|(abc)(pqr)|(xyz))(x)/
+    xabcpqrx
+    xxyzx 
+
+/(?|(abc)|(xyz))(?1)/
+    abcabc
+    xyzabc 
+    ** Failers 
+    xyzxyz 
+ 
+/\H\h\V\v/
+    X X\x0a
+    X\x09X\x0b
+    ** Failers
+    \xa0 X\x0a   
+    
+/\H*\h+\V?\v{3,4}/ 
+    \x09\x20\xa0X\x0a\x0b\x0c\x0d\x0a
+    \x09\x20\xa0\x0a\x0b\x0c\x0d\x0a
+    \x09\x20\xa0\x0a\x0b\x0c
+    ** Failers 
+    \x09\x20\xa0\x0a\x0b
+     
+/\H{3,4}/
+    XY  ABCDE
+    XY  PQR ST 
+    
+/.\h{3,4}./
+    XY  AB    PQRS
+
+/\h*X\h?\H+Y\H?Z/
+    >XNNNYZ
+    >  X NYQZ
+    ** Failers
+    >XYZ   
+    >  X NY Z
+
+/\v*X\v?Y\v+Z\V*\x0a\V+\x0b\V{2,3}\x0c/
+    >XY\x0aZ\x0aA\x0bNN\x0c
+    >\x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+
+/.+A/
+    \r\nA
+    
+/\nA/
+    \r\nA 
+
+/[\r\n]A/
+    \r\nA 
+
+/(\r|\n)A/
+    \r\nA 
+
+/a\Rb/I
+    a\rb
+    a\nb
+    a\r\nb
+    ** Failers
+    a\x85b
+    a\x0bb     
+
+/a\Rb/I
+    a\rb
+    a\nb
+    a\r\nb
+    a\x85b
+    a\x0bb     
+    ** Failers 
+    a\x85b\
+    a\x0bb\
+    
+/a\R?b/I
+    a\rb
+    a\nb
+    a\r\nb
+    ** Failers
+    a\x85b
+    a\x0bb     
+
+/a\R?b/I
+    a\rb
+    a\nb
+    a\r\nb
+    a\x85b
+    a\x0bb     
+    ** Failers 
+    a\x85b\
+    a\x0bb\
+    
+/a\R{2,4}b/I
+    a\r\n\nb
+    a\n\r\rb
+    a\r\n\r\n\r\n\r\nb
+    ** Failers
+    a\x85\85b
+    a\x0b\0bb     
+
+/a\R{2,4}b/I
+    a\r\rb
+    a\n\n\nb
+    a\r\n\n\r\rb
+    a\x85\85b
+    a\x0b\0bb     
+    ** Failers 
+    a\r\r\r\r\rb 
+    a\x85\85b\
+    a\x0b\0bb\
+    
+/a(?!)|\wbc/
+    abc 
+
+/a[]b/
+    ** Failers
+    ab
+
+/a[]+b/
+    ** Failers
+    ab 
+
+/a[]*+b/
+    ** Failers
+    ab 
+
+/a[^]b/
+    aXb
+    a\nb 
+    ** Failers
+    ab  
+    
+/a[^]+b/ 
+    aXb
+    a\nX\nXb 
+    ** Failers
+    ab  
+
+/X$/E
+    X
+    ** Failers 
+    X\n 
+
+/X$/
+    X
+    X\n 
+
+/xyz/C
+  xyz 
+  abcxyz 
+  abcxyz\Y
+  ** Failers 
+  abc
+  abc\Y
+  abcxypqr  
+  abcxypqr\Y  
+  
+/(?C)ab/
+  ab
+  \C-ab
+  
+/ab/C
+  ab
+  \C-ab    
+
+/^"((?(?=[a])[^"])|b)*"$/C
+    "ab"
+    \C-"ab"
+
 / End of testinput7 /

Modified: freeswitch/trunk/libs/pcre/testdata/testinput8
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput8	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput8	Mon Jun  8 18:51:30 2009
@@ -537,4 +537,134 @@
 /^\x{85}$/8i
     \x{85}
 
+/^abc./mgx8
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x{0085}abc7 \x{2028}abc8 \x{2029}abc9 JUNK
+
+/abc.$/mgx8
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x{0085} abc7\x{2028} abc8\x{2029} abc9
+
+/^a\Rb/8
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0cb
+    a\x{85}b   
+    a\x{2028}b 
+    a\x{2029}b 
+    ** Failers
+    a\n\rb    
+
+/^a\R*b/8
+    ab
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0c\x{2028}\x{2029}b
+    a\x{85}b   
+    a\n\rb    
+    a\n\r\x{85}\x0cb 
+
+/^a\R+b/8
+    a\nb
+    a\rb
+    a\r\nb
+    a\x0bb
+    a\x0c\x{2028}\x{2029}b
+    a\x{85}b   
+    a\n\rb    
+    a\n\r\x{85}\x0cb 
+    ** Failers
+    ab  
+
+/^a\R{1,3}b/8
+    a\nb
+    a\n\rb
+    a\n\r\x{85}b
+    a\r\n\r\nb 
+    a\r\n\r\n\r\nb 
+    a\n\r\n\rb
+    a\n\n\r\nb 
+    ** Failers
+    a\n\n\n\rb
+    a\r
+
+/\h+\V?\v{3,4}/8 
+    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+
+/\V?\v{3,4}/8 
+    \x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+
+/\h+\V?\v{3,4}/8
+    >\x09\x20\x{a0}X\x0a\x0a\x0a<
+
+/\V?\v{3,4}/8
+    >\x09\x20\x{a0}X\x0a\x0a\x0a<
+
+/\H\h\V\v/8
+    X X\x0a
+    X\x09X\x0b
+    ** Failers
+    \x{a0} X\x0a   
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+    \x09\x20\x{a0}\x0a\x0b\x0c\x0d\x0a
+    \x09\x20\x{a0}\x0a\x0b\x0c
+    ** Failers 
+    \x09\x20\x{a0}\x0a\x0b
+     
+/\H\h\V\v/8
+    \x{3001}\x{3000}\x{2030}\x{2028}
+    X\x{180e}X\x{85}
+    ** Failers
+    \x{2009} X\x0a   
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x0c\x0d\x0a
+    \x09\x{205f}\x{a0}\x0a\x{2029}\x0c\x{2028}\x0a
+    \x09\x20\x{202f}\x0a\x0b\x0c
+    ** Failers 
+    \x09\x{200a}\x{a0}\x{2028}\x0b
+     
+/a\Rb/I8
+    a\rb
+    a\nb
+    a\r\nb
+    ** Failers
+    a\x{85}b
+    a\x0bb     
+
+/a\Rb/I8
+    a\rb
+    a\nb
+    a\r\nb
+    a\x{85}b
+    a\x0bb     
+    ** Failers 
+    a\x{85}b\
+    a\x0bb\
+    
+/a\R?b/I8
+    a\rb
+    a\nb
+    a\r\nb
+    ** Failers
+    a\x{85}b
+    a\x0bb     
+
+/a\R?b/I8
+    a\rb
+    a\nb
+    a\r\nb
+    a\x{85}b
+    a\x0bb     
+    ** Failers 
+    a\x{85}b\
+    a\x0bb\
+ 
+/X/8f 
+    A\x{1ec5}ABCXYZ
+
 / End of testinput 8 / 

Modified: freeswitch/trunk/libs/pcre/testdata/testinput9
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testinput9	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testinput9	Mon Jun  8 18:51:30 2009
@@ -148,7 +148,7 @@
     \x{09f} 
   
 /^\p{Cs}/8
-    \x{dfff}
+    \?\x{dfff}
     ** Failers
     \x{09f} 
   
@@ -156,7 +156,7 @@
     a
     ** Failers 
     Z
-    \x{dfff}  
+    \x{e000}  
   
 /^\p{Lm}/8
     \x{2b0}
@@ -813,4 +813,34 @@
      \x{1c5}XY
      AXY      
 
+/^\x{023a}+?(\x{0130}+)/8i
+  \x{023a}\x{2c65}\x{0130}
+  
+/^\x{023a}+([^X])/8i
+  \x{023a}\x{2c65}X
+ 
+/\x{c0}+\x{116}+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+
+/[\x{c0}\x{116}]+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+
+/Check property support in non-UTF-8 mode/
+ 
+/\p{L}{4}/
+    123abcdefg
+    123abc\xc4\xc5zz
+
+/\p{Carian}\p{Cham}\p{Kayah_Li}\p{Lepcha}\p{Lycian}\p{Lydian}\p{Ol_Chiki}\p{Rejang}\p{Saurashtra}\p{Sundanese}\p{Vai}/8
+    \x{102A4}\x{AA52}\x{A91D}\x{1C46}\x{10283}\x{1092E}\x{1C6B}\x{A93B}\x{A8BF}\x{1BA0}\x{A50A}====
+
+/\x{a77d}\x{1d79}/8i
+    \x{a77d}\x{1d79}
+    \x{1d79}\x{a77d} 
+
+/\x{a77d}\x{1d79}/8
+    \x{a77d}\x{1d79}
+    ** Failers 
+    \x{1d79}\x{a77d} 
+
 / End / 

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput1
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput1	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput1	Mon Jun  8 18:51:30 2009
@@ -1817,7 +1817,7 @@
 No match
 
 /^a	b
-  
    c/x
+      c/x
     abc
  0: abc
 
@@ -2093,14 +2093,6 @@
     {4,5a}bc
  0: {4,5a}bc
 
-/^a.b/
-    a\rb
- 0: a\x0db
-    *** Failers
-No match
-    a\nb
-No match
-
 /abc$/
     abc
  0: abc
@@ -2197,9 +2189,9 @@
 10: j
 11: k
 
-/ab\gdef/
-    abgdef
- 0: abgdef
+/ab\idef/
+    abidef
+ 0: abidef
 
 /a{0}bc/
     bc
@@ -5480,12 +5472,22 @@
  0: b
 
 /^(?:a?b?)*$/
+    \
+ 0: 
+    a
+ 0: a
+    ab
+ 0: ab
+    aaa   
+ 0: aaa
     *** Failers
 No match
     dbcb
 No match
     a--
 No match
+    aa-- 
+No match
 
 /((?s)^a(.))((?m)^b$)/
     a\nb\nc\n
@@ -5549,12 +5551,6 @@
  0: b
  1: b
 
-/(?(1)a|b)/
-
-/(?(1)b|a)/
-    a
- 0: a
-
 /(x)?(?(1)a|b)/
     *** Failers
 No match
@@ -6353,4 +6349,301 @@
     [a,b,c]  
  0: [a,b,c]
 
+/(?-x: )/x
+    A\x20B
+ 0:  
+    
+"(?x)(?-x: \s*#\s*)"
+    A # B
+ 0:  # 
+    ** Failers
+No match
+    #  
+No match
+
+"(?x-is)(?:(?-ixs) \s*#\s*) include"
+    A #include
+ 0:  #include
+    ** Failers
+No match
+    A#include  
+No match
+    A #Include
+No match
+
+/a*b*\w/
+    aaabbbb
+ 0: aaabbbb
+    aaaa
+ 0: aaaa
+    a
+ 0: a
+
+/a*b?\w/
+    aaabbbb
+ 0: aaabb
+    aaaa
+ 0: aaaa
+    a
+ 0: a
+
+/a*b{0,4}\w/
+    aaabbbb
+ 0: aaabbbb
+    aaaa
+ 0: aaaa
+    a
+ 0: a
+
+/a*b{0,}\w/
+    aaabbbb
+ 0: aaabbbb
+    aaaa
+ 0: aaaa
+    a
+ 0: a
+    
+/a*\d*\w/
+    0a
+ 0: 0a
+    a 
+ 0: a
+    
+/a*b *\w/x
+    a 
+ 0: a
+
+/a*b#comment
+  *\w/x
+    a 
+ 0: a
+
+/a* b *\w/x
+    a 
+ 0: a
+
+/^\w+=.*(\\\n.*)*/
+    abc=xyz\\\npqr
+ 0: abc=xyz\
+
+/(?=(\w+))\1:/
+    abcd:
+ 0: abcd:
+ 1: abcd
+
+/^(?=(\w+))\1:/
+    abcd:
+ 0: abcd:
+ 1: abcd
+
+/^\Eabc/
+    abc
+ 0: abc
+    
+/^[\Eabc]/
+    a
+ 0: a
+    ** Failers 
+No match
+    E 
+No match
+    
+/^[a-\Ec]/
+    b
+ 0: b
+    ** Failers
+No match
+    -
+No match
+    E    
+No match
+
+/^[a\E\E-\Ec]/
+    b
+ 0: b
+    ** Failers
+No match
+    -
+No match
+    E    
+No match
+
+/^[\E\Qa\E-\Qz\E]+/
+    b
+ 0: b
+    ** Failers
+No match
+    -  
+No match
+    
+/^[a\Q]bc\E]/
+    a
+ 0: a
+    ]
+ 0: ]
+    c
+ 0: c
+    
+/^[a-\Q\E]/
+    a
+ 0: a
+    -     
+ 0: -
+
+/^(a()*)*/
+    aaaa
+ 0: aaaa
+ 1: a
+ 2: 
+
+/^(?:a(?:(?:))*)*/
+    aaaa
+ 0: aaaa
+
+/^(a()+)+/
+    aaaa
+ 0: aaaa
+ 1: a
+ 2: 
+
+/^(?:a(?:(?:))+)+/
+    aaaa
+ 0: aaaa
+
+/(a){0,3}(?(1)b|(c|))*D/
+    abbD
+ 0: abbD
+ 1: a
+    ccccD
+ 0: ccccD
+ 1: 
+ 2: 
+    D  
+ 0: D
+ 1: 
+ 2: 
+
+/(a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 1: 
+
+/(?>a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/(?:a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/\Z/g
+  abc\n
+ 0: 
+ 0: 
+  
+/^(?s)(?>.*)(?iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|BM
+Memory allocation (code space): 826
+------------------------------------------------------------------
+  0 822 Bra
+  3     8J$WE<.rX+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW at QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X
+821     \b
+822 822 Ket
+825     End
+------------------------------------------------------------------
+
+|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|BM
+Memory allocation (code space): 816
+------------------------------------------------------------------
+  0 812 Bra
+  3     $<.X+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW at QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X
+811     \b
+812 812 Ket
+815     End
+------------------------------------------------------------------
+
+/(a(?1)b)/BM
+Memory allocation (code space): 28
+------------------------------------------------------------------
+  0  24 Bra
+  3  18 CBra 1
+  8     a
+ 10   6 Once
+ 13   3 Recurse
+ 16   6 Ket
+ 19     b
+ 21  18 Ket
+ 24  24 Ket
+ 27     End
+------------------------------------------------------------------
+
+/(a(?1)+b)/BM
+Memory allocation (code space): 28
+------------------------------------------------------------------
+  0  24 Bra
+  3  18 CBra 1
+  8     a
+ 10   6 Once
+ 13   3 Recurse
+ 16   6 KetRmax
+ 19     b
+ 21  18 Ket
+ 24  24 Ket
+ 27     End
+------------------------------------------------------------------
+
+/a(?Pb|c)d(?Pe)/BM
+Memory allocation (code space): 42
+------------------------------------------------------------------
+  0  32 Bra
+  3     a
+  5   7 CBra 1
+ 10     b
+ 12   5 Alt
+ 15     c
+ 17  12 Ket
+ 20     d
+ 22   7 CBra 2
+ 27     e
+ 29   7 Ket
+ 32  32 Ket
+ 35     End
+------------------------------------------------------------------
+
+/(?:a(?Pc(?Pd)))(?Pa)/BM
+Memory allocation (code space): 54
+------------------------------------------------------------------
+  0  41 Bra
+  3  25 Bra
+  6     a
+  8  17 CBra 1
+ 13     c
+ 15   7 CBra 2
+ 20     d
+ 22   7 Ket
+ 25  17 Ket
+ 28  25 Ket
+ 31   7 CBra 3
+ 36     a
+ 38   7 Ket
+ 41  41 Ket
+ 44     End
+------------------------------------------------------------------
+
+/(?Pa)...(?P=a)bbb(?P>a)d/BM
+Memory allocation (code space): 43
+------------------------------------------------------------------
+  0  36 Bra
+  3   7 CBra 1
+  8     a
+ 10   7 Ket
+ 13     Any
+ 14     Any
+ 15     Any
+ 16     \1
+ 19     bbb
+ 25   6 Once
+ 28   3 Recurse
+ 31   6 Ket
+ 34     d
+ 36  36 Ket
+ 39     End
+------------------------------------------------------------------
+
+/abc(?C255)de(?C)f/BM
+Memory allocation (code space): 31
+------------------------------------------------------------------
+  0  27 Bra
+  3     abc
+  9     Callout 255 10 1
+ 15     de
+ 19     Callout 0 16 1
+ 25     f
+ 27  27 Ket
+ 30     End
+------------------------------------------------------------------
+
+/abcde/CBM
+Memory allocation (code space): 53
+------------------------------------------------------------------
+  0  49 Bra
+  3     Callout 255 0 1
+  9     a
+ 11     Callout 255 1 1
+ 17     b
+ 19     Callout 255 2 1
+ 25     c
+ 27     Callout 255 3 1
+ 33     d
+ 35     Callout 255 4 1
+ 41     e
+ 43     Callout 255 5 0
+ 49  49 Ket
+ 52     End
+------------------------------------------------------------------
+
+/\x{100}/8BM
+Memory allocation (code space): 10
+------------------------------------------------------------------
+  0   6 Bra
+  3     \x{100}
+  6   6 Ket
+  9     End
+------------------------------------------------------------------
+
+/\x{1000}/8BM
+Memory allocation (code space): 11
+------------------------------------------------------------------
+  0   7 Bra
+  3     \x{1000}
+  7   7 Ket
+ 10     End
+------------------------------------------------------------------
+
+/\x{10000}/8BM
+Memory allocation (code space): 12
+------------------------------------------------------------------
+  0   8 Bra
+  3     \x{10000}
+  8   8 Ket
+ 11     End
+------------------------------------------------------------------
+
+/\x{100000}/8BM
+Memory allocation (code space): 12
+------------------------------------------------------------------
+  0   8 Bra
+  3     \x{100000}
+  8   8 Ket
+ 11     End
+------------------------------------------------------------------
+
+/\x{1000000}/8BM
+Memory allocation (code space): 13
+------------------------------------------------------------------
+  0   9 Bra
+  3     \x{1000000}
+  9   9 Ket
+ 12     End
+------------------------------------------------------------------
+
+/\x{4000000}/8BM
+Memory allocation (code space): 14
+------------------------------------------------------------------
+  0  10 Bra
+  3     \x{4000000}
+ 10  10 Ket
+ 13     End
+------------------------------------------------------------------
+
+/\x{7fffFFFF}/8BM
+Memory allocation (code space): 14
+------------------------------------------------------------------
+  0  10 Bra
+  3     \x{7fffffff}
+ 10  10 Ket
+ 13     End
+------------------------------------------------------------------
+
+/[\x{ff}]/8BM
+Memory allocation (code space): 10
+------------------------------------------------------------------
+  0   6 Bra
+  3     \x{ff}
+  6   6 Ket
+  9     End
+------------------------------------------------------------------
+
+/[\x{100}]/8BM
+Memory allocation (code space): 15
+------------------------------------------------------------------
+  0  11 Bra
+  3     [\x{100}]
+ 11  11 Ket
+ 14     End
+------------------------------------------------------------------
+
+/\x80/8BM
+Memory allocation (code space): 10
+------------------------------------------------------------------
+  0   6 Bra
+  3     \x{80}
+  6   6 Ket
+  9     End
+------------------------------------------------------------------
+
+/\xff/8BM
+Memory allocation (code space): 10
+------------------------------------------------------------------
+  0   6 Bra
+  3     \x{ff}
+  6   6 Ket
+  9     End
+------------------------------------------------------------------
+
+/\x{0041}\x{2262}\x{0391}\x{002e}/D8M
+Memory allocation (code space): 18
+------------------------------------------------------------------
+  0  14 Bra
+  3     A\x{2262}\x{391}.
+ 14  14 Ket
+ 17     End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: utf8
+First char = 'A'
+Need char = '.'
+    
+/\x{D55c}\x{ad6d}\x{C5B4}/D8M 
+Memory allocation (code space): 19
+------------------------------------------------------------------
+  0  15 Bra
+  3     \x{d55c}\x{ad6d}\x{c5b4}
+ 15  15 Ket
+ 18     End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: utf8
+First char = 237
+Need char = 180
+
+/\x{65e5}\x{672c}\x{8a9e}/D8M
+Memory allocation (code space): 19
+------------------------------------------------------------------
+  0  15 Bra
+  3     \x{65e5}\x{672c}\x{8a9e}
+ 15  15 Ket
+ 18     End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: utf8
+First char = 230
+Need char = 158
+
+/[\x{100}]/8BM
+Memory allocation (code space): 15
+------------------------------------------------------------------
+  0  11 Bra
+  3     [\x{100}]
+ 11  11 Ket
+ 14     End
+------------------------------------------------------------------
+
+/[Z\x{100}]/8BM
+Memory allocation (code space): 47
+------------------------------------------------------------------
+  0  43 Bra
+  3     [Z\x{100}]
+ 43  43 Ket
+ 46     End
+------------------------------------------------------------------
+
+/^[\x{100}\E-\Q\E\x{150}]/B8M
+Memory allocation (code space): 18
+------------------------------------------------------------------
+  0  14 Bra
+  3     ^
+  4     [\x{100}-\x{150}]
+ 14  14 Ket
+ 17     End
+------------------------------------------------------------------
+
+/^[\Q??\E-\Q??\E]/B8M
+Memory allocation (code space): 18
+------------------------------------------------------------------
+  0  14 Bra
+  3     ^
+  4     [\x{100}-\x{150}]
+ 14  14 Ket
+ 17     End
+------------------------------------------------------------------
+
+/^[\Q??\E-\Q??\E/B8M
+Failed: missing terminating ] for character class at offset 15
+
+/[\p{L}]/BM
+Memory allocation (code space): 15
+------------------------------------------------------------------
+  0  11 Bra
+  3     [\p{L}]
+ 11  11 Ket
+ 14     End
+------------------------------------------------------------------
+
+/[\p{^L}]/BM
+Memory allocation (code space): 15
+------------------------------------------------------------------
+  0  11 Bra
+  3     [\P{L}]
+ 11  11 Ket
+ 14     End
+------------------------------------------------------------------
+
+/[\P{L}]/BM
+Memory allocation (code space): 15
+------------------------------------------------------------------
+  0  11 Bra
+  3     [\P{L}]
+ 11  11 Ket
+ 14     End
+------------------------------------------------------------------
+
+/[\P{^L}]/BM
+Memory allocation (code space): 15
+------------------------------------------------------------------
+  0  11 Bra
+  3     [\p{L}]
+ 11  11 Ket
+ 14     End
+------------------------------------------------------------------
+
+/[abc\p{L}\x{0660}]/8BM
+Memory allocation (code space): 50
+------------------------------------------------------------------
+  0  46 Bra
+  3     [a-c\p{L}\x{660}]
+ 46  46 Ket
+ 49     End
+------------------------------------------------------------------
+
+/[\p{Nd}]/8BM
+Memory allocation (code space): 15
+------------------------------------------------------------------
+  0  11 Bra
+  3     [\p{Nd}]
+ 11  11 Ket
+ 14     End
+------------------------------------------------------------------
+
+/[\p{Nd}+-]+/8BM
+Memory allocation (code space): 48
+------------------------------------------------------------------
+  0  44 Bra
+  3     [+\-\p{Nd}]+
+ 44  44 Ket
+ 47     End
+------------------------------------------------------------------
+
+/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8iBM
+Memory allocation (code space): 25
+------------------------------------------------------------------
+  0  21 Bra
+  3  NC A\x{391}\x{10427}\x{ff3a}\x{1fb0}
+ 21  21 Ket
+ 24     End
+------------------------------------------------------------------
+
+/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8BM
+Memory allocation (code space): 25
+------------------------------------------------------------------
+  0  21 Bra
+  3     A\x{391}\x{10427}\x{ff3a}\x{1fb0}
+ 21  21 Ket
+ 24     End
+------------------------------------------------------------------
+
+/[\x{105}-\x{109}]/8iBM
+Memory allocation (code space): 17
+------------------------------------------------------------------
+  0  13 Bra
+  3     [\x{104}-\x{109}]
+ 13  13 Ket
+ 16     End
+------------------------------------------------------------------
+
+/( ( (?(1)0|) )*   )/xBM
+Memory allocation (code space): 38
+------------------------------------------------------------------
+  0  34 Bra
+  3  28 CBra 1
+  8     Brazero
+  9  19 SCBra 2
+ 14   8 Cond
+ 17   1 Cond ref
+ 20     0
+ 22   3 Alt
+ 25  11 Ket
+ 28  19 KetRmax
+ 31  28 Ket
+ 34  34 Ket
+ 37     End
+------------------------------------------------------------------
+
+/(  (?(1)0|)*   )/xBM
+Memory allocation (code space): 30
+------------------------------------------------------------------
+  0  26 Bra
+  3  20 CBra 1
+  8     Brazero
+  9   8 SCond
+ 12   1 Cond ref
+ 15     0
+ 17   3 Alt
+ 20  11 KetRmax
+ 23  20 Ket
+ 26  26 Ket
+ 29     End
+------------------------------------------------------------------
+
+/[a]/BM
+Memory allocation (code space): 9
+------------------------------------------------------------------
+  0   5 Bra
+  3     a
+  5   5 Ket
+  8     End
+------------------------------------------------------------------
+
+/[a]/8BM
+Memory allocation (code space): 9
+------------------------------------------------------------------
+  0   5 Bra
+  3     a
+  5   5 Ket
+  8     End
+------------------------------------------------------------------
+
+/[\xaa]/BM
+Memory allocation (code space): 9
+------------------------------------------------------------------
+  0   5 Bra
+  3     \xaa
+  5   5 Ket
+  8     End
+------------------------------------------------------------------
+
+/[\xaa]/8BM
+Memory allocation (code space): 10
+------------------------------------------------------------------
+  0   6 Bra
+  3     \x{aa}
+  6   6 Ket
+  9     End
+------------------------------------------------------------------
+
+/[^a]/BM
+Memory allocation (code space): 9
+------------------------------------------------------------------
+  0   5 Bra
+  3     [^a]
+  5   5 Ket
+  8     End
+------------------------------------------------------------------
+
+/[^a]/8BM
+Memory allocation (code space): 9
+------------------------------------------------------------------
+  0   5 Bra
+  3     [^a]
+  5   5 Ket
+  8     End
+------------------------------------------------------------------
+
+/[^\xaa]/BM
+Memory allocation (code space): 9
+------------------------------------------------------------------
+  0   5 Bra
+  3     [^\xaa]
+  5   5 Ket
+  8     End
+------------------------------------------------------------------
+
+/[^\xaa]/8BM
+Memory allocation (code space): 40
+------------------------------------------------------------------
+  0  36 Bra
+  3     [\x00-\xa9\xab-\xff] (neg)
+ 36  36 Ket
+ 39     End
+------------------------------------------------------------------
+
+/ End of testinput10 /

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput2
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput2	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput2	Mon Jun  8 18:51:30 2009
@@ -1,10 +1,10 @@
-/(a)b|/
+/(a)b|/I
 Capturing subpattern count = 1
 No options
 No first char
 No need char
 
-/abc/
+/abc/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
@@ -22,7 +22,7 @@
     ABC
 No match
 
-/^abc/
+/^abc/I
 Capturing subpattern count = 0
 Options: anchored
 No first char
@@ -38,35 +38,35 @@
     \Adefabc
 No match
 
-/a+bc/
+/a+bc/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 Need char = 'c'
 
-/a*bc/
+/a*bc/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 No first char
 Need char = 'c'
 
-/a{3}bc/
+/a{3}bc/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 Need char = 'c'
 
-/(abc|a+z)/
+/(abc|a+z)/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
 First char = 'a'
 No need char
 
-/^abc$/
+/^abc$/I
 Capturing subpattern count = 0
 Options: anchored
 No first char
@@ -78,10 +78,10 @@
     def\nabc
 No match
 
-/ab\gdef/X
+/ab\idef/X
 Failed: unrecognized character follows \ at offset 3
 
-/(?X)ab\gdef/X
+/(?X)ab\idef/X
 Failed: unrecognized character follows \ at offset 7
 
 /x{5,4}/
@@ -109,23 +109,23 @@
 Failed: missing ) after comment at offset 7
 
 /(?z)abc/
-Failed: unrecognized character after (? at offset 2
+Failed: unrecognized character after (? or (?- at offset 2
 
-/.*b/
+/.*b/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char at start or follows newline
 Need char = 'b'
 
-/.*?b/
+/.*?b/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char at start or follows newline
 Need char = 'b'
 
-/cat|dog|elephant/
+/cat|dog|elephant/I
 Capturing subpattern count = 0
 No options
 No first char
@@ -135,7 +135,7 @@
     this sentences rambles on and on for a while and then reaches elephant
  0: elephant
 
-/cat|dog|elephant/S
+/cat|dog|elephant/IS
 Capturing subpattern count = 0
 No options
 No first char
@@ -146,7 +146,7 @@
     this sentences rambles on and on for a while and then reaches elephant
  0: elephant
 
-/cat|dog|elephant/iS
+/cat|dog|elephant/IiS
 Capturing subpattern count = 0
 Options: caseless
 No first char
@@ -157,14 +157,14 @@
     this sentences rambles on and on for a while to elephant ElePhant
  0: elephant
 
-/a|[bcd]/S
+/a|[bcd]/IS
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 Starting byte set: a b c d 
 
-/(a|[^\dZ])/S
+/(a|[^\dZ])/IS
 Capturing subpattern count = 1
 No options
 No first char
@@ -184,7 +184,7 @@
   \xed \xee \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf7 \xf8 \xf9 \xfa \xfb 
   \xfc \xfd \xfe \xff 
 
-/(a|b)*[\s]/S
+/(a|b)*[\s]/IS
 Capturing subpattern count = 1
 No options
 No first char
@@ -197,7 +197,7 @@
 /{4,5}abc/
 Failed: nothing to repeat at offset 4
 
-/(a)(b)(c)\2/
+/(a)(b)(c)\2/I
 Capturing subpattern count = 3
 Max back reference = 2
 No options
@@ -222,13 +222,13 @@
  0: abcb
  1: a
  2: b
-    \O12abcb 
+    \O12abcb
  0: abcb
  1: a
  2: b
  3: c
 
-/(a)bc|(a)(b)\2/
+/(a)bc|(a)(b)\2/I
 Capturing subpattern count = 3
 Max back reference = 2
 No options
@@ -270,7 +270,7 @@
  2: a
  3: b
 
-/abc$/E
+/abc$/IE
 Capturing subpattern count = 0
 Options: dollar_endonly
 First char = 'a'
@@ -287,7 +287,7 @@
 /(a)(b)(c)(d)(e)\6/
 Failed: reference to non-existent subpattern at offset 17
 
-/the quick brown fox/
+/the quick brown fox/I
 Capturing subpattern count = 0
 No options
 First char = 't'
@@ -297,7 +297,7 @@
     this is a line with the quick brown fox
  0: the quick brown fox
 
-/the quick brown fox/A
+/the quick brown fox/IA
 Capturing subpattern count = 0
 Options: anchored
 No first char
@@ -310,9 +310,9 @@
 No match
 
 /ab(?z)cd/
-Failed: unrecognized character after (? at offset 4
+Failed: unrecognized character after (? or (?- at offset 4
 
-/^abc|def/
+/^abc|def/I
 Capturing subpattern count = 0
 No options
 No first char
@@ -322,7 +322,7 @@
     abcdef\B
  0: def
 
-/.*((abc)$|(def))/
+/.*((abc)$|(def))/I
 Capturing subpattern count = 3
 Partial matching not supported
 No options
@@ -338,19 +338,19 @@
  2: 
  3: def
 
-/abc/P
+/abc/IP
     abc
  0: abc
     *** Failers
 No match: POSIX code 17: match failed
-    
-/^abc|def/P
+
+/^abc|def/IP
     abcdef
  0: abc
     abcdef\B
  0: def
 
-/.*((abc)$|(def))/P
+/.*((abc)$|(def))/IP
     defabc
  0: defabc
  1: abc
@@ -359,37 +359,37 @@
  0: def
  1: def
  3: def
-  
-/the quick brown fox/P
+
+/the quick brown fox/IP
     the quick brown fox
  0: the quick brown fox
-    *** Failers 
+    *** Failers
 No match: POSIX code 17: match failed
-    The Quick Brown Fox 
+    The Quick Brown Fox
 No match: POSIX code 17: match failed
 
-/the quick brown fox/Pi
+/the quick brown fox/IPi
     the quick brown fox
  0: the quick brown fox
-    The Quick Brown Fox 
+    The Quick Brown Fox
  0: The Quick Brown Fox
 
-/abc.def/P
+/abc.def/IP
     *** Failers
 No match: POSIX code 17: match failed
     abc\ndef
 No match: POSIX code 17: match failed
-    
-/abc$/P
+
+/abc$/IP
     abc
  0: abc
-    abc\n 
+    abc\n
  0: abc
 
-/(abc)\2/P
+/(abc)\2/IP
 Failed: POSIX code 15: bad back reference at offset 7     
 
-/(abc\1)/P
+/(abc\1)/IP
     abc
 No match: POSIX code 17: match failed
 
@@ -399,16 +399,16 @@
 /a[]b/
 Failed: missing terminating ] for character class at offset 4
 
-/[^aeiou ]{3,}/
+/[^aeiou ]{3,}/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 No first char
 No need char
-    co-processors, and for 
+    co-processors, and for
  0: -pr
-    
-/<.*>/
+
+/<.*>/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -417,7 +417,7 @@
     abcghinop
  0: ghi
 
-/<.*?>/
+/<.*?>/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -426,7 +426,7 @@
     abcghinop
  0: 
 
-/<.*>/U
+/<.*>/IU
 Capturing subpattern count = 0
 Partial matching not supported
 Options: ungreedy
@@ -434,8 +434,8 @@
 Need char = '>'
     abcghinop
  0: 
-    
-/(?U)<.*>/
+
+/(?U)<.*>/I
 Capturing subpattern count = 0
 Partial matching not supported
 Options: ungreedy
@@ -444,7 +444,7 @@
     abcghinop
  0: 
 
-/<.*?>/U
+/<.*?>/IU
 Capturing subpattern count = 0
 Partial matching not supported
 Options: ungreedy
@@ -452,8 +452,8 @@
 Need char = '>'
     abcghinop
  0: ghi
-    
-/={3,}/U
+
+/={3,}/IU
 Capturing subpattern count = 0
 Partial matching not supported
 Options: ungreedy
@@ -461,8 +461,8 @@
 Need char = '='
     abc========def
  0: ===
-    
-/(?U)={3,}?/
+
+/(?U)={3,}?/I
 Capturing subpattern count = 0
 Partial matching not supported
 Options: ungreedy
@@ -470,21 +470,21 @@
 Need char = '='
     abc========def
  0: ========
-    
-/(?^abc)/m
+/(?>^abc)/Im
 Capturing subpattern count = 0
 Options: multiline
 First char at start or follows newline
@@ -741,7 +746,7 @@
  0: abc
     *** Failers
 No match
-    defabc   
+    defabc
 No match
 
 /(?<=ab(c+)d)ef/
@@ -754,12 +759,8 @@
 Failed: lookbehind assertion is not fixed length at offset 13
 
 /The next three are in testinput2 because they have variable length branches/
-Capturing subpattern count = 0
-No options
-First char = 'T'
-Need char = 's'
 
-/(?<=bullock|donkey)-cart/
+/(?<=bullock|donkey)-cart/I
 Capturing subpattern count = 0
 No options
 First char = '-'
@@ -772,16 +773,16 @@
 No match
     cart
 No match
-    horse-and-cart    
+    horse-and-cart
 No match
-      
-/(?<=ab(?i)x|y|z)/
+
+/(?<=ab(?i)x|y|z)/I
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/(?>.*)(?<=(abcd)|(xyz))/
+/(?>.*)(?<=(abcd)|(xyz))/I
 Capturing subpattern count = 2
 Partial matching not supported
 No options
@@ -795,7 +796,7 @@
  1: 
  2: xyz
 
-/(?<=ab(?i)x(?-i)y|(?i)z|b)ZZ/
+/(?<=ab(?i)x(?-i)y|(?i)z|b)ZZ/I
 Capturing subpattern count = 0
 No options
 First char = 'Z'
@@ -810,56 +811,56 @@
  0: ZZ
     bZZ
  0: ZZ
-    BZZ     
+    BZZ
  0: ZZ
     *** Failers
 No match
-    ZZ 
+    ZZ
 No match
-    abXYZZ 
+    abXYZZ
 No match
     zzz
 No match
-    bzz  
+    bzz
 No match
 
-/(?
@@ -1071,7 +1069,7 @@
  1L a
  2L 
  3L f
-    bcdef\G1\G2\G3\G4\L 
+    bcdef\G1\G2\G3\G4\L
  0: bcdef
  1: bc
  2: bc
@@ -1084,40 +1082,40 @@
  1L bc
  2L bc
  3L f
-    adefghijk\C0 
+    adefghijk\C0
  0: adef
  1: a
  2: 
  3: f
  0C adef (4)
-    
-/^abc\00def/
+
+/^abc\00def/I
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
-    abc\00def\L\C0 
+    abc\00def\L\C0
  0: abc\x00def
  0C abc (7)
  0L abc
-    
-/word ((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ 
-)((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ 
-)?)?)?)?)?)?)?)?)?otherword/M
-Memory allocation (code space): 432
+
+/word ((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+
+)((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+
+)?)?)?)?)?)?)?)?)?otherword/I
 Capturing subpattern count = 8
 Partial matching not supported
+Contains explicit CR or LF match
 No options
 First char = 'w'
 Need char = 'd'
 
-/.*X/D
+/.*X/IDZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     Any*
-  5     X
-  7   7 Ket
- 10     End
+        Bra
+        Any*
+        X
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -1125,13 +1123,13 @@
 First char at start or follows newline
 Need char = 'X'
 
-/.*X/Ds
+/.*X/IDZs
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     Any*
-  5     X
-  7   7 Ket
- 10     End
+        Bra
+        AllAny*
+        X
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -1139,18 +1137,18 @@
 No first char
 Need char = 'X'
 
-/(.*X|^B)/D
+/(.*X|^B)/IDZ
 ------------------------------------------------------------------
-  0  19 Bra 0
-  3   7 Bra 1
-  6     Any*
-  8     X
- 10   6 Alt
- 13     ^
- 14     B
- 16  13 Ket
- 19  19 Ket
- 22     End
+        Bra
+        CBra 1
+        Any*
+        X
+        Alt
+        ^
+        B
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
@@ -1158,37 +1156,37 @@
 First char at start or follows newline
 No need char
 
-/(.*X|^B)/Ds
+/(.*X|^B)/IDZs
 ------------------------------------------------------------------
-  0  19 Bra 0
-  3   7 Bra 1
-  6     Any*
-  8     X
- 10   6 Alt
- 13     ^
- 14     B
- 16  13 Ket
- 19  19 Ket
- 22     End
+        Bra
+        CBra 1
+        AllAny*
+        X
+        Alt
+        ^
+        B
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
 Options: anchored dotall
 No first char
 No need char
-    
-/(?s)(.*X|^B)/D
+
+/(?s)(.*X|^B)/IDZ
 ------------------------------------------------------------------
-  0  19 Bra 0
-  3   7 Bra 1
-  6     Any*
-  8     X
- 10   6 Alt
- 13     ^
- 14     B
- 16  13 Ket
- 19  19 Ket
- 22     End
+        Bra
+        CBra 1
+        AllAny*
+        X
+        Alt
+        ^
+        B
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
@@ -1196,29 +1194,29 @@
 No first char
 No need char
 
-/(?s:.*X|^B)/D
+/(?s:.*X|^B)/IDZ
 ------------------------------------------------------------------
-  0  25 Bra 0
-  3   9 Bra 0
-  6  04 Opt
-  8     Any*
- 10     X
- 12   8 Alt
- 15  04 Opt
- 17     ^
- 18     B
- 20  17 Ket
- 23  00 Opt
- 25  25 Ket
- 28     End
+        Bra
+        Bra
+     04 Opt
+        AllAny*
+        X
+        Alt
+     04 Opt
+        ^
+        B
+        Ket
+     00 Opt
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
-No options
-First char at start or follows newline
+Options: anchored
+No first char
 No need char
 
-/\Biss\B/+
+/\Biss\B/I+
 Capturing subpattern count = 0
 No options
 First char = 'i'
@@ -1227,12 +1225,12 @@
  0: iss
  0+ issippi
 
-/\Biss\B/+P
+/\Biss\B/I+P
     Mississippi
  0: iss
  0+ issippi
 
-/iss/G+
+/iss/IG+
 Capturing subpattern count = 0
 No options
 First char = 'i'
@@ -1243,7 +1241,7 @@
  0: iss
  0+ ippi
 
-/\Biss\B/G+
+/\Biss\B/IG+
 Capturing subpattern count = 0
 No options
 First char = 'i'
@@ -1252,7 +1250,7 @@
  0: iss
  0+ issippi
 
-/\Biss\B/g+
+/\Biss\B/Ig+
 Capturing subpattern count = 0
 No options
 First char = 'i'
@@ -1267,7 +1265,7 @@
     Mississippi\A
 No match
 
-/(?<=[Ms])iss/g+
+/(?<=[Ms])iss/Ig+
 Capturing subpattern count = 0
 No options
 First char = 'i'
@@ -1278,7 +1276,7 @@
  0: iss
  0+ ippi
 
-/(?<=[Ms])iss/G+
+/(?<=[Ms])iss/IG+
 Capturing subpattern count = 0
 No options
 First char = 'i'
@@ -1287,7 +1285,7 @@
  0: iss
  0+ issippi
 
-/^iss/g+
+/^iss/Ig+
 Capturing subpattern count = 0
 Options: anchored
 No first char
@@ -1295,20 +1293,20 @@
     ississippi
  0: iss
  0+ issippi
-    
-/.*iss/g+
+
+/.*iss/Ig+
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char at start or follows newline
 Need char = 's'
-    abciss\nxyzisspqr 
+    abciss\nxyzisspqr
  0: abciss
  0+ \x0axyzisspqr
  0: xyziss
  0+ pqr
 
-/.i./+g
+/.i./I+g
 Capturing subpattern count = 0
 No options
 No first char
@@ -1334,11 +1332,11 @@
  0+ river
  0: riv
  0+ er
-    Missouri river\A  
+    Missouri river\A
  0: Mis
  0+ souri river
 
-/^.is/+g
+/^.is/I+g
 Capturing subpattern count = 0
 Options: anchored
 No first char
@@ -1347,8 +1345,9 @@
  0: Mis
  0+ sissippi
 
-/^ab\n/g+
+/^ab\n/Ig+
 Capturing subpattern count = 0
+Contains explicit CR or LF match
 Options: anchored
 No first char
 No need char
@@ -1356,8 +1355,9 @@
  0: ab\x0a
  0+ ab\x0acd
 
-/^ab\n/mg+
+/^ab\n/Img+
 Capturing subpattern count = 0
+Contains explicit CR or LF match
 Options: multiline
 First char at start or follows newline
 Need char = 10
@@ -1367,272 +1367,272 @@
  0: ab\x0a
  0+ cd
 
-/abc/
+/abc/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'c'
 
-/abc|bac/
+/abc|bac/I
 Capturing subpattern count = 0
 No options
 No first char
 Need char = 'c'
 
-/(abc|bac)/
+/(abc|bac)/I
 Capturing subpattern count = 1
 No options
 No first char
 Need char = 'c'
 
-/(abc|(c|dc))/
+/(abc|(c|dc))/I
 Capturing subpattern count = 2
 No options
 No first char
 Need char = 'c'
 
-/(abc|(d|de)c)/
+/(abc|(d|de)c)/I
 Capturing subpattern count = 2
 No options
 No first char
 Need char = 'c'
 
-/a*/
+/a*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 No first char
 No need char
 
-/a+/
+/a+/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 No need char
 
-/(baa|a+)/
+/(baa|a+)/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
 No first char
 Need char = 'a'
 
-/a{0,3}/
+/a{0,3}/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 No first char
 No need char
 
-/baa{3,}/
+/baa{3,}/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'b'
 Need char = 'a'
 
-/"([^\\"]+|\\.)*"/
+/"([^\\"]+|\\.)*"/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
 First char = '"'
 Need char = '"'
 
-/(abc|ab[cd])/
+/(abc|ab[cd])/I
 Capturing subpattern count = 1
 No options
 First char = 'a'
 No need char
 
-/(a|.)/
+/(a|.)/I
 Capturing subpattern count = 1
 No options
 No first char
 No need char
 
-/a|ba|\w/
+/a|ba|\w/I
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/abc(?=pqr)/
+/abc(?=pqr)/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'r'
 
-/...(?<=abc)/
+/...(?<=abc)/I
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/abc(?!pqr)/
+/abc(?!pqr)/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'c'
 
-/ab./
+/ab./I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'b'
 
-/ab[xyz]/
+/ab[xyz]/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'b'
 
-/abc*/
+/abc*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
 
-/ab.c*/
+/ab.c*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
 
-/a.c*/
+/a.c*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 No need char
 
-/.c*/
+/.c*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 No first char
 No need char
 
-/ac*/
+/ac*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 No need char
 
-/(a.c*|b.c*)/
+/(a.c*|b.c*)/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
 No first char
 No need char
 
-/a.c*|aba/
+/a.c*|aba/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 No need char
 
-/.+a/
+/.+a/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 No first char
 Need char = 'a'
 
-/(?=abcda)a.*/
+/(?=abcda)a.*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 Need char = 'a'
 
-/(?=a)a.*/
+/(?=a)a.*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 No need char
 
-/a(b)*/
+/a(b)*/I
 Capturing subpattern count = 1
 No options
 First char = 'a'
 No need char
 
-/a\d*/
+/a\d*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 No need char
 
-/ab\d*/
+/ab\d*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
 
-/a(\d)*/
+/a(\d)*/I
 Capturing subpattern count = 1
 No options
 First char = 'a'
 No need char
 
-/abcde{0,0}/
+/abcde{0,0}/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'd'
 
-/ab\d+/
+/ab\d+/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
 
-/a(?(1)b)/
-Capturing subpattern count = 0
+/a(?(1)b)(.)/I
+Capturing subpattern count = 1
 No options
 First char = 'a'
 No need char
 
-/a(?(1)bag|big)/
-Capturing subpattern count = 0
+/a(?(1)bag|big)(.)/I
+Capturing subpattern count = 1
 No options
 First char = 'a'
 Need char = 'g'
 
-/a(?(1)bag|big)*/
-Capturing subpattern count = 0
+/a(?(1)bag|big)*(.)/I
+Capturing subpattern count = 1
 No options
 First char = 'a'
 No need char
 
-/a(?(1)bag|big)+/
-Capturing subpattern count = 0
+/a(?(1)bag|big)+(.)/I
+Capturing subpattern count = 1
 No options
 First char = 'a'
 Need char = 'g'
 
-/a(?(1)b..|b..)/
-Capturing subpattern count = 0
+/a(?(1)b..|b..)(.)/I
+Capturing subpattern count = 1
 No options
 First char = 'a'
 Need char = 'b'
 
-/ab\d{0}e/
+/ab\d{0}e/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'e'
 
-/a?b?/
+/a?b?/I
 Capturing subpattern count = 0
 No options
 No first char
@@ -1647,10 +1647,10 @@
  0: 
     *** Failers
  0: 
-    \N     
+    \N
 No match
-    
-/|-/
+
+/|-/I
 Capturing subpattern count = 0
 No options
 No first char
@@ -1663,10 +1663,10 @@
  0: -
     *** Failers
  0: 
-    \Nabc     
+    \Nabc
 No match
 
-/a*(b+)(z)(z)/P
+/a*(b+)(z)(z)/IP
     aaaabbbbzzzz
  0: aaaabbbbzz
  1: bbbb
@@ -1692,8 +1692,8 @@
  1: bbbb
  2: z
  3: z
-    
-/^.?abcd/S 
+
+/^.?abcd/IS
 Capturing subpattern count = 0
 Options: anchored
 No first char
@@ -1707,7 +1707,7 @@
   (?R)          # Recurse - i.e. nested bracketed string
   )*            # Zero or more contents
   \)            # Closing )
-  /x
+  /Ix
 Capturing subpattern count = 0
 Partial matching not supported
 Options: extended
@@ -1719,30 +1719,30 @@
  0: (abcd)
     xyz(abcd)
  0: (abcd)
-    (ab(xy)cd)pqr 
+    (ab(xy)cd)pqr
  0: (ab(xy)cd)
-    (ab(xycd)pqr 
+    (ab(xycd)pqr
  0: (xycd)
-    () abc () 
+    () abc ()
  0: ()
     12(abcde(fsh)xyz(foo(bar))lmno)89
  0: (abcde(fsh)xyz(foo(bar))lmno)
     *** Failers
 No match
-    abcd 
+    abcd
 No match
     abcd)
 No match
-    (abcd  
+    (abcd
 No match
 
-/\(  ( (?>[^()]+) | (?R) )* \) /xg
+/\(  ( (?>[^()]+) | (?R) )* \) /Ixg
 Capturing subpattern count = 1
 Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
-    (ab(xy)cd)pqr 
+    (ab(xy)cd)pqr
  0: (ab(xy)cd)
  1: cd
     1(abcd)(x(y)z)pqr
@@ -1751,7 +1751,7 @@
  0: (x(y)z)
  1: z
 
-/\(  (?: (?>[^()]+) | (?R) ) \) /x
+/\(  (?: (?>[^()]+) | (?R) ) \) /Ix
 Capturing subpattern count = 0
 Partial matching not supported
 Options: extended
@@ -1761,16 +1761,16 @@
  0: (abcd)
     (ab(xy)cd)
  0: (xy)
-    (a(b(c)d)e) 
+    (a(b(c)d)e)
  0: (c)
-    ((ab)) 
+    ((ab))
  0: ((ab))
     *** Failers
 No match
-    ()   
+    ()
 No match
 
-/\(  (?: (?>[^()]+) | (?R) )? \) /x
+/\(  (?: (?>[^()]+) | (?R) )? \) /Ix
 Capturing subpattern count = 0
 Partial matching not supported
 Options: extended
@@ -1781,7 +1781,7 @@
     12(abcde(fsh)xyz(foo(bar))lmno)89
  0: (fsh)
 
-/\(  ( (?>[^()]+) | (?R) )* \) /x
+/\(  ( (?>[^()]+) | (?R) )* \) /Ix
 Capturing subpattern count = 1
 Partial matching not supported
 Options: extended
@@ -1791,7 +1791,7 @@
  0: (ab(xy)cd)
  1: cd
 
-/\( ( ( (?>[^()]+) | (?R) )* ) \) /x
+/\( ( ( (?>[^()]+) | (?R) )* ) \) /Ix
 Capturing subpattern count = 2
 Partial matching not supported
 Options: extended
@@ -1802,7 +1802,7 @@
  1: ab(xy)cd
  2: cd
 
-/\( (123)? ( ( (?>[^()]+) | (?R) )* ) \) /x
+/\( (123)? ( ( (?>[^()]+) | (?R) )* ) \) /Ix
 Capturing subpattern count = 3
 Partial matching not supported
 Options: extended
@@ -1819,7 +1819,7 @@
  2: ab(xy)cd
  3: cd
 
-/\( ( (123)? ( (?>[^()]+) | (?R) )* ) \) /x
+/\( ( (123)? ( (?>[^()]+) | (?R) )* ) \) /Ix
 Capturing subpattern count = 3
 Partial matching not supported
 Options: extended
@@ -1836,7 +1836,7 @@
  2: 123
  3: cd
 
-/\( (((((((((( ( (?>[^()]+) | (?R) )* )))))))))) \) /x
+/\( (((((((((( ( (?>[^()]+) | (?R) )* )))))))))) \) /Ix
 Capturing subpattern count = 11
 Partial matching not supported
 Options: extended
@@ -1856,7 +1856,7 @@
 10: ab(xy)cd
 11: cd
 
-/\( ( ( (?>[^()<>]+) | ((?>[^()]+)) | (?R) )* ) \) /x
+/\( ( ( (?>[^()<>]+) | ((?>[^()]+)) | (?R) )* ) \) /Ix
 Capturing subpattern count = 3
 Partial matching not supported
 Options: extended
@@ -1868,7 +1868,7 @@
  2: 123
  3: 
 
-/\( ( ( (?>[^()]+) | ((?R)) )* ) \) /x
+/\( ( ( (?>[^()]+) | ((?R)) )* ) \) /Ix
 Capturing subpattern count = 3
 Partial matching not supported
 Options: extended
@@ -1885,58 +1885,58 @@
  2: ij
  3: (cd(ef)gh)
 
-/^[[:alnum:]]/D
+/^[[:alnum:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [0-9A-Za-z]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [0-9A-Za-z]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:^alnum:]]/D
+/^[[:^alnum:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x00-/:-@[-`{-\xff]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x00-/:-@[-`{-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:alpha:]]/D
+/^[[:alpha:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [A-Za-z]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [A-Za-z]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:^alpha:]]/D
+/^[[:^alpha:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x00-@[-`{-\xff]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x00-@[-`{-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
-             
+
 /[_[:alpha:]]/IS
 Capturing subpattern count = 0
 No options
@@ -1945,52 +1945,52 @@
 Starting byte set: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
   _ a b c d e f g h i j k l m n o p q r s t u v w x y z 
 
-/^[[:ascii:]]/D
+/^[[:ascii:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x00-\x7f]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x00-\x7f]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:^ascii:]]/D
+/^[[:^ascii:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x80-\xff]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x80-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:blank:]]/D
+/^[[:blank:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x09 ]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x09 ]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:^blank:]]/D
+/^[[:^blank:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x00-\x08\x0a-\x1f!-\xff]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x00-\x08\x0a-\x1f!-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
@@ -1999,222 +1999,223 @@
 
 /[\n\x0b\x0c\x0d[:blank:]]/IS
 Capturing subpattern count = 0
+Contains explicit CR or LF match
 No options
 No first char
 No need char
 Starting byte set: \x09 \x0a \x0b \x0c \x0d \x20 
 
-/^[[:cntrl:]]/D
+/^[[:cntrl:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x00-\x1f\x7f]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x00-\x1f\x7f]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:digit:]]/D
+/^[[:digit:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [0-9]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [0-9]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:graph:]]/D
+/^[[:graph:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [!-~]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [!-~]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:lower:]]/D
+/^[[:lower:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [a-z]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [a-z]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:print:]]/D
+/^[[:print:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [ -~]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [ -~]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:punct:]]/D
+/^[[:punct:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [!-/:-@[-`{-~]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [!-/:-@[-`{-~]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:space:]]/D
+/^[[:space:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x09-\x0d ]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x09-\x0d ]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:upper:]]/D
+/^[[:upper:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [A-Z]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [A-Z]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:xdigit:]]/D
+/^[[:xdigit:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [0-9A-Fa-f]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [0-9A-Fa-f]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:word:]]/D
+/^[[:word:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [0-9A-Z_a-z]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [0-9A-Z_a-z]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:^cntrl:]]/D
+/^[[:^cntrl:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [ -~\x80-\xff]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [ -~\x80-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[12[:^digit:]]/D
+/^[12[:^digit:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x00-/12:-\xff]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x00-/12:-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/^[[:^blank:]]/D
+/^[[:^blank:]]/DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x00-\x08\x0a-\x1f!-\xff]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x00-\x08\x0a-\x1f!-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/[01[:alpha:]%]/D
+/[01[:alpha:]%]/DZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [%01A-Za-z]
- 36  36 Ket
- 39     End
+        Bra
+        [%01A-Za-z]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[[.ch.]]/
+/[[.ch.]]/I
 Failed: POSIX collating elements are not supported at offset 1
 
-/[[=ch=]]/
+/[[=ch=]]/I
 Failed: POSIX collating elements are not supported at offset 1
 
-/[[:rhubarb:]]/
+/[[:rhubarb:]]/I
 Failed: unknown POSIX class name at offset 3
 
-/[[:upper:]]/i
+/[[:upper:]]/Ii
 Capturing subpattern count = 0
 Options: caseless
 No first char
 No need char
     A
  0: A
-    a 
+    a
  0: a
-    
-/[[:lower:]]/i
+
+/[[:lower:]]/Ii
 Capturing subpattern count = 0
 Options: caseless
 No first char
 No need char
     A
  0: A
-    a 
+    a
  0: a
 
-/((?-i)[[:lower:]])[[:lower:]]/i
+/((?-i)[[:lower:]])[[:lower:]]/Ii
 Capturing subpattern count = 1
 Options: caseless
 No first char
@@ -2230,22 +2231,22 @@
  1: a
     Ab
 No match
-    AB        
+    AB
 No match
 
-/[\200-\110]/
+/[\200-\110]/I
 Failed: range out of order in character class at offset 9
 
-/^(?(0)f|b)oo/
+/^(?(0)f|b)oo/I
 Failed: invalid condition (?(0) at offset 6
 
-/This one's here because of the large output vector needed/
+/This one's here because of the large output vector needed/I
 Capturing subpattern count = 0
 No options
 First char = 'T'
 Need char = 'd'
 
-/(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\w+)\s+(\270)/
+/(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\w+)\s+(\270)/I
 Capturing subpattern count = 271
 Max back reference = 270
 Partial matching not supported
@@ -2526,13 +2527,13 @@
 270: ABC
 271: ABC
 
-/This one's here because Perl does this differently and PCRE can't at present/
+/This one's here because Perl does this differently and PCRE can't at present/I
 Capturing subpattern count = 0
 No options
 First char = 'T'
 Need char = 't'
 
-/(main(O)?)+/
+/(main(O)?)+/I
 Capturing subpattern count = 2
 No options
 First char = 'm'
@@ -2544,14 +2545,14 @@
  0: mainOmain
  1: main
  2: O
-    
-/These are all cases where Perl does it differently (nested captures)/
+
+/These are all cases where Perl does it differently (nested captures)/I
 Capturing subpattern count = 1
 No options
 First char = 'T'
 Need char = 's'
 
-/^(a(b)?)+$/
+/^(a(b)?)+$/I
 Capturing subpattern count = 2
 Options: anchored
 No first char
@@ -2560,197 +2561,195 @@
  0: aba
  1: a
  2: b
-   
-/^(aa(bb)?)+$/
+
+/^(aa(bb)?)+$/I
 Capturing subpattern count = 2
 Options: anchored
 No first char
 No need char
-    aabbaa    
+    aabbaa
  0: aabbaa
  1: aa
  2: bb
-    
-/^(aa|aa(bb))+$/
+
+/^(aa|aa(bb))+$/I
 Capturing subpattern count = 2
 Options: anchored
 No first char
 No need char
-    aabbaa 
+    aabbaa
  0: aabbaa
  1: aa
  2: bb
-    
-/^(aa(bb)??)+$/
+
+/^(aa(bb)??)+$/I
 Capturing subpattern count = 2
 Options: anchored
 No first char
 No need char
-    aabbaa    
+    aabbaa
  0: aabbaa
  1: aa
  2: bb
-    
-/^(?:aa(bb)?)+$/
+
+/^(?:aa(bb)?)+$/I
 Capturing subpattern count = 1
 Options: anchored
 No first char
 No need char
-    aabbaa    
+    aabbaa
  0: aabbaa
  1: bb
-    
-/^(aa(b(b))?)+$/
+
+/^(aa(b(b))?)+$/I
 Capturing subpattern count = 3
 Options: anchored
 No first char
 No need char
-    aabbaa    
+    aabbaa
  0: aabbaa
  1: aa
  2: bb
  3: b
 
-/^(?:aa(b(b))?)+$/
+/^(?:aa(b(b))?)+$/I
 Capturing subpattern count = 2
 Options: anchored
 No first char
 No need char
-    aabbaa    
+    aabbaa
  0: aabbaa
  1: bb
  2: b
 
-/^(?:aa(b(?:b))?)+$/
+/^(?:aa(b(?:b))?)+$/I
 Capturing subpattern count = 1
 Options: anchored
 No first char
 No need char
-    aabbaa    
+    aabbaa
  0: aabbaa
  1: bb
 
-/^(?:aa(bb(?:b))?)+$/
+/^(?:aa(bb(?:b))?)+$/I
 Capturing subpattern count = 1
 Options: anchored
 No first char
 No need char
-    aabbbaa    
+    aabbbaa
  0: aabbbaa
  1: bbb
-    
-/^(?:aa(b(?:bb))?)+$/
+
+/^(?:aa(b(?:bb))?)+$/I
 Capturing subpattern count = 1
 Options: anchored
 No first char
 No need char
-    aabbbaa    
+    aabbbaa
  0: aabbbaa
  1: bbb
 
-/^(?:aa(?:b(b))?)+$/
+/^(?:aa(?:b(b))?)+$/I
 Capturing subpattern count = 1
 Options: anchored
 No first char
 No need char
-    aabbaa    
+    aabbaa
  0: aabbaa
  1: b
 
-/^(?:aa(?:b(bb))?)+$/
+/^(?:aa(?:b(bb))?)+$/I
 Capturing subpattern count = 1
 Options: anchored
 No first char
 No need char
-    aabbbaa    
+    aabbbaa
  0: aabbbaa
  1: bb
 
-/^(aa(b(bb))?)+$/
+/^(aa(b(bb))?)+$/I
 Capturing subpattern count = 3
 Options: anchored
 No first char
 No need char
-    aabbbaa    
+    aabbbaa
  0: aabbbaa
  1: aa
  2: bbb
  3: bb
 
-/^(aa(bb(bb))?)+$/
+/^(aa(bb(bb))?)+$/I
 Capturing subpattern count = 3
 Options: anchored
 No first char
 No need char
-    aabbbbaa    
+    aabbbbaa
  0: aabbbbaa
  1: aa
  2: bbbb
  3: bb
 
-/--------------------------------------------------------------------/ 
+/--------------------------------------------------------------------/I
 Capturing subpattern count = 0
 No options
 First char = '-'
 Need char = '-'
-    
-/#/xMD
-Memory allocation (code space): 7
+
+/#/IxDZ
 ------------------------------------------------------------------
-  0   3 Bra 0
-  3   3 Ket
-  6     End
+        Bra
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: extended
 No first char
 No need char
 
-/a#/xMD
-Memory allocation (code space): 9
+/a#/IxDZ
 ------------------------------------------------------------------
-  0   5 Bra 0
-  3     a
-  5   5 Ket
-  8     End
+        Bra
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: extended
 First char = 'a'
 No need char
 
-/[\s]/D
+/[\s]/DZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [\x09\x0a\x0c\x0d ]
- 36  36 Ket
- 39     End
+        Bra
+        [\x09\x0a\x0c\x0d ]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[\S]/D
+/[\S]/DZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [\x00-\x08\x0b\x0e-\x1f!-\xff]
- 36  36 Ket
- 39     End
+        Bra
+        [\x00-\x08\x0b\x0e-\x1f!-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/a(?i)b/D
+/a(?i)b/DZ
 ------------------------------------------------------------------
-  0   9 Bra 0
-  3     a
-  5  01 Opt
-  7  NC b
-  9   9 Ket
- 12     End
+        Bra
+        a
+     01 Opt
+     NC b
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
@@ -2760,22 +2759,22 @@
  0: ab
     aB
  0: aB
-    *** Failers 
+    *** Failers
 No match
-    AB  
+    AB
 No match
 
-/(a(?i)b)/D
+/(a(?i)b)/DZ
 ------------------------------------------------------------------
-  0  17 Bra 0
-  3   9 Bra 1
-  6     a
-  8  01 Opt
- 10  NC b
- 12   9 Ket
- 15  00 Opt
- 17  17 Ket
- 20     End
+        Bra
+        CBra 1
+        a
+     01 Opt
+     NC b
+        Ket
+     00 Opt
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 No options
@@ -2787,17 +2786,17 @@
     aB
  0: aB
  1: aB
-    *** Failers 
+    *** Failers
 No match
-    AB  
+    AB
 No match
-    
-/   (?i)abc/xD
+
+/   (?i)abc/IxDZ
 ------------------------------------------------------------------
-  0   9 Bra 0
-  3  NC abc
-  9   9 Ket
- 12     End
+        Bra
+     NC abc
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: caseless extended
@@ -2805,47 +2804,47 @@
 Need char = 'c' (caseless)
 
 /#this is a comment
-  (?i)abc/xD
+  (?i)abc/IxDZ
 ------------------------------------------------------------------
-  0   9 Bra 0
-  3  NC abc
-  9   9 Ket
- 12     End
+        Bra
+     NC abc
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: caseless extended
 First char = 'a' (caseless)
 Need char = 'c' (caseless)
 
-/123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/D
+/123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/DZ
 ------------------------------------------------------------------
-  0 603 Bra 0
-  3     123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
-603 603 Ket
-606     End
+        Bra
+        123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 First char = '1'
 Need char = '0'
 
-/\Q123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/D
+/\Q123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890/DZ
 ------------------------------------------------------------------
-  0 603 Bra 0
-  3     123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
-603 603 Ket
-606     End
+        Bra
+        123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 First char = '1'
 Need char = '0'
 
-/\Q\E/D
+/\Q\E/DZ
 ------------------------------------------------------------------
-  0   3 Bra 0
-  3   3 Ket
-  6     End
+        Bra
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
@@ -2854,36 +2853,36 @@
     \
  0: 
 
-/\Q\Ex/D
+/\Q\Ex/DZ
 ------------------------------------------------------------------
-  0   5 Bra 0
-  3     x
-  5   5 Ket
-  8     End
+        Bra
+        x
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 First char = 'x'
 No need char
 
-/ \Q\E/D
+/ \Q\E/DZ
 ------------------------------------------------------------------
-  0   5 Bra 0
-  3      
-  5   5 Ket
-  8     End
+        Bra
+         
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 First char = ' '
 No need char
 
-/a\Q\E/D
+/a\Q\E/DZ
 ------------------------------------------------------------------
-  0   5 Bra 0
-  3     a
-  5   5 Ket
-  8     End
+        Bra
+        a
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
@@ -2893,15 +2892,15 @@
  0: a
   bca
  0: a
-  bac  
+  bac
  0: a
 
-/a\Q\Eb/D
+/a\Q\Eb/DZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     ab
-  7   7 Ket
- 10     End
+        Bra
+        ab
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
@@ -2910,27 +2909,25 @@
   abc
  0: ab
 
-/\Q\Eabc/D
+/\Q\Eabc/DZ
 ------------------------------------------------------------------
-  0   9 Bra 0
-  3     abc
-  9   9 Ket
- 12     End
+        Bra
+        abc
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'c'
 
-/x*+\w/D
+/x*+\w/DZ
 ------------------------------------------------------------------
-  0  12 Bra 0
-  3   5 Once
-  6     x*
-  8   5 Ket
- 11     \w
- 12  12 Ket
- 15     End
+        Bra
+        x*+
+        \w
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -2941,29 +2938,25 @@
  0: F
     xxxxx
 No match
-    
-/x?+/D
+
+/x?+/DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3   5 Once
-  6     x?
-  8   5 Ket
- 11  11 Ket
- 14     End
+        Bra
+        x?+
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/x++/D
+/x++/DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3   5 Once
-  6     x+
-  8   5 Ket
- 11  11 Ket
- 14     End
+        Bra
+        x++
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -2971,15 +2964,15 @@
 First char = 'x'
 No need char
 
-/x{1,3}+/D 
+/x{1,3}+/DZ
 ------------------------------------------------------------------
-  0  15 Bra 0
-  3   9 Once
-  6     x
-  8     x{,2}
- 12   9 Ket
- 15  15 Ket
- 18     End
+        Bra
+        Once
+        x
+        x{0,2}
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -2987,24 +2980,24 @@
 First char = 'x'
 No need char
 
-/(x)*+/D
+/(x)*+/DZ
 ------------------------------------------------------------------
-  0  18 Bra 0
-  3  12 Once
-  6     Brazero
-  7   5 Bra 1
- 10     x
- 12   5 KetRmax
- 15  12 Ket
- 18  18 Ket
- 21     End
+        Bra
+        Once
+        Brazero
+        CBra 1
+        x
+        KetRmax
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 No options
 No first char
 No need char
 
-/^(\w++|\s++)*$/
+/^(\w++|\s++)*$/I
 Capturing subpattern count = 1
 Partial matching not supported
 Options: anchored
@@ -3017,8 +3010,8 @@
 No match
     this is not a line with only words and spaces!
 No match
-    
-/(\d++)(\w)/
+
+/(\d++)(\w)/I
 Capturing subpattern count = 2
 Partial matching not supported
 No options
@@ -3030,10 +3023,10 @@
  2: a
     *** Failers
 No match
-    12345+ 
+    12345+
 No match
 
-/a++b/
+/a++b/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -3042,7 +3035,7 @@
     aaab
  0: aaab
 
-/(a++b)/
+/(a++b)/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
@@ -3052,7 +3045,7 @@
  0: aaab
  1: aaab
 
-/(a++)b/
+/(a++)b/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
@@ -3062,7 +3055,7 @@
  0: aaab
  1: aaa
 
-/([^()]++|\([^()]*\))+/
+/([^()]++|\([^()]*\))+/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
@@ -3071,8 +3064,8 @@
     ((abc(ade)ufh()()x
  0: abc(ade)ufh()()x
  1: x
-    
-/\(([^()]++|\([^()]+\))+\)/ 
+
+/\(([^()]++|\([^()]+\))+\)/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
@@ -3086,57 +3079,55 @@
  1: xyz
     *** Failers
 No match
-    ((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa   
+    ((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 No match
 
-/(abc){1,3}+/D
+/(abc){1,3}+/DZ
 ------------------------------------------------------------------
-  0  53 Bra 0
-  3  47 Once
-  6   9 Bra 1
-  9     abc
- 15   9 Ket
- 18     Brazero
- 19  28 Bra 0
- 22   9 Bra 1
- 25     abc
- 31   9 Ket
- 34     Brazero
- 35   9 Bra 1
- 38     abc
- 44   9 Ket
- 47  28 Ket
- 50  47 Ket
- 53  53 Ket
- 56     End
+        Bra
+        Once
+        CBra 1
+        abc
+        Ket
+        Brazero
+        Bra
+        CBra 1
+        abc
+        Ket
+        Brazero
+        CBra 1
+        abc
+        Ket
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 No options
 First char = 'a'
 Need char = 'c'
 
-/a+?+/
+/a+?+/I
 Failed: nothing to repeat at offset 3
 
-/a{2,3}?+b/
+/a{2,3}?+b/I
 Failed: nothing to repeat at offset 7
 
-/(?U)a+?+/
+/(?U)a+?+/I
 Failed: nothing to repeat at offset 7
 
-/a{2,3}?+b/U
+/a{2,3}?+b/IU
 Failed: nothing to repeat at offset 7
 
-/x(?U)a++b/D
+/x(?U)a++b/DZ
 ------------------------------------------------------------------
-  0  15 Bra 0
-  3     x
-  5   5 Once
-  8     a+
- 10   5 Ket
- 13     b
- 15  15 Ket
- 18     End
+        Bra
+        x
+        a++
+        b
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -3146,16 +3137,14 @@
     xaaaab
  0: xaaaab
 
-/(?U)xa++b/D
+/(?U)xa++b/DZ
 ------------------------------------------------------------------
-  0  15 Bra 0
-  3     x
-  5   5 Once
-  8     a+
- 10   5 Ket
- 13     b
- 15  15 Ket
- 18     End
+        Bra
+        x
+        a++
+        b
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -3165,26 +3154,26 @@
     xaaaab
  0: xaaaab
 
-/^((a+)(?U)([ab]+)(?-U)([bc]+)(\w*))/D
+/^((a+)(?U)([ab]+)(?-U)([bc]+)(\w*))/DZ
 ------------------------------------------------------------------
-  0 106 Bra 0
-  3     ^
-  4  99 Bra 1
-  7   5 Bra 2
- 10     a+
- 12   5 Ket
- 15  37 Bra 3
- 18     [ab]+?
- 52  37 Ket
- 55  37 Bra 4
- 58     [bc]+
- 92  37 Ket
- 95   5 Bra 5
- 98     \w*
-100   5 Ket
-103  99 Ket
-106 106 Ket
-109     End
+        Bra
+        ^
+        CBra 1
+        CBra 2
+        a+
+        Ket
+        CBra 3
+        [ab]+?
+        Ket
+        CBra 4
+        [bc]+
+        Ket
+        CBra 5
+        \w*
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 5
 Partial matching not supported
@@ -3192,15 +3181,15 @@
 No first char
 No need char
 
-/^x(?U)a+b/D
+/^x(?U)a+b/DZ
 ------------------------------------------------------------------
-  0  10 Bra 0
-  3     ^
-  4     x
-  6     a+?
-  8     b
- 10  10 Ket
- 13     End
+        Bra
+        ^
+        x
+        a++
+        b
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -3208,17 +3197,17 @@
 No first char
 Need char = 'b'
 
-/^x(?U)(a+)b/D
+/^x(?U)(a+)b/DZ
 ------------------------------------------------------------------
-  0  16 Bra 0
-  3     ^
-  4     x
-  6   5 Bra 1
-  9     a+?
- 11   5 Ket
- 14     b
- 16  16 Ket
- 19     End
+        Bra
+        ^
+        x
+        CBra 1
+        a+?
+        Ket
+        b
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
@@ -3226,79 +3215,76 @@
 No first char
 Need char = 'b'
 
-/[.x.]/
+/[.x.]/I
 Failed: POSIX collating elements are not supported at offset 0
 
-/[=x=]/
+/[=x=]/I
 Failed: POSIX collating elements are not supported at offset 0
 
-/[:x:]/
+/[:x:]/I
 Failed: POSIX named classes are supported only within a class at offset 0
 
-/\l/
+/\l/I
 Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
 
-/\L/
+/\L/I
 Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
 
-/\N{name}/
+/\N{name}/I
 Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
 
-/\u/
+/\u/I
 Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
 
-/\U/
+/\U/I
 Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
 
-/[/
+/[/I
 Failed: missing terminating ] for character class at offset 1
 
-/[a-/
+/[a-/I
 Failed: missing terminating ] for character class at offset 3
 
-/[[:space:]/
+/[[:space:]/I
 Failed: missing terminating ] for character class at offset 10
 
-/[\s]/DM
-Memory allocation (code space): 40
+/[\s]/IDZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [\x09\x0a\x0c\x0d ]
- 36  36 Ket
- 39     End
+        Bra
+        [\x09\x0a\x0c\x0d ]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[[:space:]]/DM
-Memory allocation (code space): 40
+/[[:space:]]/IDZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [\x09-\x0d ]
- 36  36 Ket
- 39     End
+        Bra
+        [\x09-\x0d ]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[[:space:]abcde]/DM
-Memory allocation (code space): 40
+/[[:space:]abcde]/IDZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [\x09-\x0d a-e]
- 36  36 Ket
- 39     End
+        Bra
+        [\x09-\x0d a-e]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/< (?: (?(R) \d++  | [^<>]*+) | (?R)) * >/x
+/< (?: (?(R) \d++  | [^<>]*+) | (?R)) * >/Ix
 Capturing subpattern count = 0
 Partial matching not supported
 Options: extended
@@ -3312,37 +3298,35 @@
  0:  hij>
      hij>
  0: 
-    def> 
+    def>
  0: def>
-          
+    
  0: <>
     *** Failers
 No match
     iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|DM
-Memory allocation (code space): 826
+|8J\$WE\<\.rX\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZ
 ------------------------------------------------------------------
-  0 822 Bra 0
-  3     8J$WE<.rX+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW at QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X
-821     \b
-822 822 Ket
-825     End
+        Bra
+        8J$WE<.rX+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW at QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X
+        \b
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 First char = '8'
 Need char = 'X'
 
-|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|DM
-Memory allocation (code space): 816
+|\$\<\.X\+ix\[d1b\!H\#\?vV0vrK\:ZH1\=2M\>iV\;\?aPhFB\<\*vW\@QW\@sO9\}cfZA\-i\'w\%hKd6gt1UJP\,15_\#QY\$M\^Mss_U\/\]\&LK9\[5vQub\^w\[KDD\qmj\;2\}YWFdYx\.Ap\]hjCPTP\(n28k\+3\;o\&WXqs\/gOXdr\$\:r\'do0\;b4c\(f_Gr\=\"\\4\)\[01T7ajQJvL\$W\~mL_sS\/4h\:x\*\[ZN\=KLs\&L5zX\/\/\>it\,o\:aU\(\;Z\>pW\&T7oP\'2K\^E\:x9\'c\[\%z\-\,64JQ5AeH_G\#KijUKghQw\^\\vea3a\?kka_G\$8\#\`\*kynsxzBLru\'\]k_\[7FrVx\}\^\=\$blx\>s\-N\%j\;D\*aZDnsw\:YKZ\%Q\.Kne9\#hP\?\+b3\(SOvL\,\^\;\&u5\@\?5C5Bhb\=m\-vEh_L15Jl\]U\)0RP6\{q\%L\^_z5E\'Dw6X\b|IDZ
 ------------------------------------------------------------------
-  0 812 Bra 0
-  3     $<.X+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW at QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X
-811     \b
-812 812 Ket
-815     End
+        Bra
+        $<.X+ix[d1b!H#?vV0vrK:ZH1=2M>iV;?aPhFB<*vW at QW@sO9}cfZA-i'w%hKd6gt1UJP,15_#QY$M^Mss_U/]&LK9[5vQub^w[KDDqmj;2}YWFdYx.Ap]hjCPTP(n28k+3;o&WXqs/gOXdr$:r'do0;b4c(f_Gr="\4)[01T7ajQJvL$W~mL_sS/4h:x*[ZN=KLs&L5zX//>it,o:aU(;Z>pW&T7oP'2K^E:x9'c[%z-,64JQ5AeH_G#KijUKghQw^\vea3a?kka_G$8#`*kynsxzBLru']k_[7FrVx}^=$blx>s-N%j;D*aZDnsw:YKZ%Q.Kne9#hP?+b3(SOvL,^;&u5@?5C5Bhb=m-vEh_L15Jl]U)0RP6{q%L^_z5E'Dw6X
+        \b
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
@@ -3363,7 +3347,7 @@
 No options
 First char at start or follows newline
 No need char
-    
+
 /(.*)\d+\1/Is
 Capturing subpattern count = 1
 Max back reference = 1
@@ -3398,7 +3382,7 @@
  0: bc123bc
  1: bc
  2: bc
-    
+
 /a[b]/I
 Capturing subpattern count = 0
 No options
@@ -3412,7 +3396,7 @@
 First char = 'a'
 No need char
 
-/(?=abc).xyz/iI
+/(?=abc).xyz/IiI
 Capturing subpattern count = 0
 Options: caseless
 First char = 'a' (caseless)
@@ -3454,26 +3438,26 @@
 No first char
 Need char = 'a'
 
-/(?(1)ab|ac)/I
-Capturing subpattern count = 0
+/(?(1)ab|ac)(.)/I
+Capturing subpattern count = 1
 No options
 First char = 'a'
 No need char
 
-/(?(1)abz|acz)/I
-Capturing subpattern count = 0
+/(?(1)abz|acz)(.)/I
+Capturing subpattern count = 1
 No options
 First char = 'a'
 Need char = 'z'
 
-/(?(1)abz)/I
-Capturing subpattern count = 0
+/(?(1)abz)(.)/I
+Capturing subpattern count = 1
 No options
 No first char
 No need char
 
-/(?(1)abz)123/I
-Capturing subpattern count = 0
+/(?(1)abz)(1)23/I
+Capturing subpattern count = 1
 No options
 No first char
 Need char = '3'
@@ -3540,18 +3524,18 @@
 First char = 'a'
 Need char = 'b'
 
-/^a/mI
+/^a/Im
 Capturing subpattern count = 0
 Options: multiline
 First char at start or follows newline
 Need char = 'a'
   abcde
  0: a
-  xy\nabc 
+  xy\nabc
  0: a
-  *** Failers 
+  *** Failers
 No match
-  xyabc 
+  xyabc
 No match
 
 /c|abc/I
@@ -3574,7 +3558,7 @@
 Need char = 'd' (caseless)
 Starting byte set: a b 
 
-/abc(?C)def/
+/abc(?C)def/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
@@ -3583,7 +3567,7 @@
 --->abcdef
   0 ^  ^       d
  0: abcdef
-    1234abcdef 
+    1234abcdef
 --->1234abcdef
   0     ^  ^       d
  0: abcdef
@@ -3591,12 +3575,12 @@
 No match
     abcxyz
 No match
-    abcxyzf   
+    abcxyzf
 --->abcxyzf
   0 ^  ^        d
 No match
 
-/abc(?C)de(?C1)f/
+/abc(?C)de(?C1)f/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
@@ -3606,8 +3590,8 @@
   0    ^  ^       d
   1    ^    ^     f
  0: abcdef
-    
-/(?C1)\dabc(?C2)def/ 
+
+/(?C1)\dabc(?C2)def/I
 Capturing subpattern count = 0
 No options
 No first char
@@ -3622,7 +3606,7 @@
  0: 4abcdef
     *** Failers
 No match
-    abcdef 
+    abcdef
 --->abcdef
   1 ^          \d
   1  ^         \d
@@ -3631,23 +3615,23 @@
   1     ^      \d
   1      ^     \d
 No match
-    
-/(?C255)ab/
+
+/(?C255)ab/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'b'
 
-/(?C256)ab/
+/(?C256)ab/I
 Failed: number after (?C is > 255 at offset 6
 
-/(?Cab)xx/ 
+/(?Cab)xx/I
 Failed: closing ) for (?C expected at offset 3
 
-/(?C12vr)x/
+/(?C12vr)x/I
 Failed: closing ) for (?C expected at offset 5
 
-/abc(?C)def/
+/abc(?C)def/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
@@ -3659,7 +3643,7 @@
   0         ^  ^       d
  0: abcdef
 
-/(abc)(?C)de(?C1)f/
+/(abc)(?C)de(?C1)f/I
 Capturing subpattern count = 1
 No options
 First char = 'a'
@@ -3670,7 +3654,7 @@
   1    ^    ^     f
  0: abcdef
  1: abc
-    123abcdef\C+ 
+    123abcdef\C+
 Callout 0: last capture = 1
  0: 
  1: abc
@@ -3683,18 +3667,18 @@
        ^    ^     f
  0: abcdef
  1: abc
-    123abcdef\C- 
+    123abcdef\C-
  0: abcdef
  1: abc
     *** Failers
 No match
-    123abcdef\C!1 
+    123abcdef\C!1
 --->123abcdef
   0    ^  ^       d
   1    ^    ^     f
 No match
-    
-/(?C0)(abc(?C1))*/
+
+/(?C0)(abc(?C1))*/I
 Capturing subpattern count = 1
 No options
 No first char
@@ -3707,7 +3691,7 @@
   1 ^        ^    )
  0: abcabcabc
  1: abc
-    abcabc\C!1!3   
+    abcabc\C!1!3
 --->abcabc
   0 ^          (abc(?C1))*
   1 ^  ^       )
@@ -3718,7 +3702,7 @@
 --->*** Failers
   0 ^               (abc(?C1))*
  0: 
-    abcabcabc\C!1!3   
+    abcabcabc\C!1!3
 --->abcabcabc
   0 ^             (abc(?C1))*
   1 ^  ^          )
@@ -3727,7 +3711,7 @@
  0: abcabc
  1: abc
 
-/(\d{3}(?C))*/
+/(\d{3}(?C))*/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
@@ -3752,7 +3736,7 @@
     ^     ^    )
  0: 123456
  1: 456
-    123456789\C+  
+    123456789\C+
 Callout 0: last capture = -1
  0: 
 --->123456789
@@ -3770,7 +3754,7 @@
  0: 123456789
  1: 789
 
-/((xyz)(?C)p|(?C1)xyzabc)/
+/((xyz)(?C)p|(?C1)xyzabc)/I
 Capturing subpattern count = 2
 No options
 First char = 'x'
@@ -3789,7 +3773,7 @@
  0: xyzabc
  1: xyzabc
 
-/(X)((xyz)(?C)p|(?C1)xyzabc)/
+/(X)((xyz)(?C)p|(?C1)xyzabc)/I
 Capturing subpattern count = 3
 No options
 First char = 'X'
@@ -3811,7 +3795,7 @@
  1: X
  2: xyzabc
 
-/(?=(abc))(?C)abcdef/
+/(?=(abc))(?C)abcdef/I
 Capturing subpattern count = 1
 No options
 First char = 'a'
@@ -3824,13 +3808,13 @@
     ^          a
  0: abcdef
  1: abc
-    
-/(?!(abc)(?C1)d)(?C2)abcxyz/
+
+/(?!(abc)(?C1)d)(?C2)abcxyz/I
 Capturing subpattern count = 1
 No options
 First char = 'a'
 Need char = 'z'
-    abcxyz\C+ 
+    abcxyz\C+
 Callout 1: last capture = 1
  0: 
  1: abc
@@ -3842,7 +3826,7 @@
     ^          a
  0: abcxyz
 
-/(?<=(abc)(?C))xyz/
+/(?<=(abc)(?C))xyz/I
 Capturing subpattern count = 1
 No options
 First char = 'x'
@@ -3855,8 +3839,8 @@
        ^       )
  0: xyz
  1: abc
-   
-/a(b+)(c*)(?C1)/
+
+/a(b+)(c*)(?C1)/I
 Capturing subpattern count = 2
 Partial matching not supported
 No options
@@ -3882,7 +3866,7 @@
 Callout data = 1
 No match
 
-/a(b+?)(c*?)(?C1)/
+/a(b+?)(c*?)(?C1)/I
 Capturing subpattern count = 2
 Partial matching not supported
 No options
@@ -3907,36 +3891,36 @@
   1 ^        ^    
 Callout data = 1
 No match
-   
-/(?C)abc/ 
+
+/(?C)abc/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'c'
 
-/(?C)^abc/
+/(?C)^abc/I
 Capturing subpattern count = 0
 Options: anchored
 No first char
 No need char
 
-/(?C)a|b/S
+/(?C)a|b/IS
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 Starting byte set: a b 
 
-/(?R)/
+/(?R)/I
 Failed: recursive call could loop indefinitely at offset 3
 
-/(a|(?R))/
+/(a|(?R))/I
 Failed: recursive call could loop indefinitely at offset 6
 
-/(ab|(bc|(de|(?R))))/
+/(ab|(bc|(de|(?R))))/I
 Failed: recursive call could loop indefinitely at offset 15
 
-/x(ab|(bc|(de|(?R))))/
+/x(ab|(bc|(de|(?R))))/I
 Capturing subpattern count = 3
 No options
 First char = 'x'
@@ -3965,16 +3949,16 @@
  3: xxab
     *** Failers
 No match
-    xyab   
+    xyab
 No match
 
-/(ab|(bc|(de|(?1))))/
+/(ab|(bc|(de|(?1))))/I
 Failed: recursive call could loop indefinitely at offset 15
 
-/x(ab|(bc|(de|(?1)x)x)x)/
+/x(ab|(bc|(de|(?1)x)x)x)/I
 Failed: recursive call could loop indefinitely at offset 16
 
-/^([^()]|\((?1)*\))*$/
+/^([^()]|\((?1)*\))*$/I
 Capturing subpattern count = 1
 Options: anchored
 No first char
@@ -3985,15 +3969,15 @@
     a(b)c
  0: a(b)c
  1: c
-    a(b(c))d  
+    a(b(c))d
  0: a(b(c))d
  1: d
     *** Failers)
 No match
-    a(b(c)d  
+    a(b(c)d
 No match
 
-/^>abc>([^()]|\((?1)*\))*abc>([^()]|\((?1)*\))*abc>(1(2)3)
  3: A man, a plan, a canal: Panama
  4: A
-    Able was I ere I saw Elba. 
+    Able was I ere I saw Elba.
  0: Able was I ere I saw Elba.
  1: 
  2: 
@@ -4075,10 +4059,10 @@
  4: A
     *** Failers
 No match
-    The quick brown fox  
+    The quick brown fox
 No match
-    
-/^(\d+|\((?1)([+*-])(?1)\)|-(?1))$/
+
+/^(\d+|\((?1)([+*-])(?1)\)|-(?1))$/I
 Capturing subpattern count = 2
 Partial matching not supported
 Options: anchored
@@ -4098,8 +4082,8 @@
 No match
     ((2+2)*-3)-7)
 No match
-         
-/^(x(y|(?1){2})z)/
+
+/^(x(y|(?1){2})z)/I
 Capturing subpattern count = 2
 Options: anchored
 No first char
@@ -4108,7 +4092,7 @@
  0: xyz
  1: xyz
  2: y
-    xxyzxyzz 
+    xxyzxyzz
  0: xxyzxyzz
  1: xxyzxyzz
  2: xyzxyz
@@ -4116,10 +4100,10 @@
 No match
     xxyzz
 No match
-    xxyzxyzxyzz   
+    xxyzxyzxyzz
 No match
 
-/((< (?: (?(R) \d++  | [^<>]*+) | (?2)) * >))/x
+/((< (?: (?(R) \d++  | [^<>]*+) | (?2)) * >))/Ix
 Capturing subpattern count = 2
 Partial matching not supported
 Options: extended
@@ -4141,11 +4125,11 @@
  0: 
  1: 
  2: 
-    def> 
+    def>
  0: def>
  1: def>
  2: def>
-          
+    
  0: <>
  1: <>
  2: <>
@@ -4154,13 +4138,13 @@
     b|c)d(?Pe)/D
+/a(?Pb|c)d(?Pe)/DZ
 ------------------------------------------------------------------
-  0  28 Bra 0
-  3     a
-  5   5 Bra 1
-  8     b
- 10   5 Alt
- 13     c
- 15  10 Ket
- 18     d
- 20   5 Bra 2
- 23     e
- 25   5 Ket
- 28  28 Ket
- 31     End
+        Bra
+        a
+        CBra 1
+        b
+        Alt
+        c
+        Ket
+        d
+        CBra 2
+        e
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 Named capturing subpatterns:
@@ -4229,28 +4213,28 @@
  0: abde
  1: b
  2: e
-    acde 
+    acde
  0: acde
  1: c
  2: e
 
-/(?:a(?Pc(?Pd)))(?Pa)/D
+/(?:a(?Pc(?Pd)))(?Pa)/DZ
 ------------------------------------------------------------------
-  0  35 Bra 0
-  3  21 Bra 0
-  6     a
-  8  13 Bra 1
- 11     c
- 13   5 Bra 2
- 16     d
- 18   5 Ket
- 21  13 Ket
- 24  21 Ket
- 27   5 Bra 3
- 30     a
- 32   5 Ket
- 35  35 Ket
- 38     End
+        Bra
+        Bra
+        a
+        CBra 1
+        c
+        CBra 2
+        d
+        Ket
+        Ket
+        Ket
+        CBra 3
+        a
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 3
 Named capturing subpatterns:
@@ -4261,23 +4245,23 @@
 First char = 'a'
 Need char = 'a'
 
-/(?Pa)...(?P=a)bbb(?P>a)d/D
+/(?Pa)...(?P=a)bbb(?P>a)d/DZ
 ------------------------------------------------------------------
-  0  34 Bra 0
-  3   5 Bra 1
-  6     a
-  8   5 Ket
- 11     Any
- 12     Any
- 13     Any
- 14     \1
- 17     bbb
- 23   6 Once
- 26   3 Recurse
- 29   6 Ket
- 32     d
- 34  34 Ket
- 37     End
+        Bra
+        CBra 1
+        a
+        Ket
+        Any
+        Any
+        Any
+        \1
+        bbb
+        Once
+        Recurse
+        Ket
+        d
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Max back reference = 1
@@ -4287,7 +4271,7 @@
 First char = 'a'
 Need char = 'd'
 
-/^\W*(?:(?P(?P.)\W*(?P>one)\W*(?P=two)|)|(?P(?P.)\W*(?P>three)\W*(?P=four)|\W*.\W*))\W*$/i
+/^\W*(?:(?P(?P.)\W*(?P>one)\W*(?P=two)|)|(?P(?P.)\W*(?P>three)\W*(?P=four)|\W*.\W*))\W*$/Ii
 Capturing subpattern count = 4
 Max back reference = 4
 Named capturing subpatterns:
@@ -4315,7 +4299,7 @@
  2: 
  3: A man, a plan, a canal: Panama
  4: A
-    Able was I ere I saw Elba. 
+    Able was I ere I saw Elba.
  0: Able was I ere I saw Elba.
  1: 
  2: 
@@ -4323,10 +4307,10 @@
  4: A
     *** Failers
 No match
-    The quick brown fox  
+    The quick brown fox
 No match
-    
-/((?(R)a|b))\1(?1)?/
+
+/((?(R)a|b))\1(?1)?/I
 Capturing subpattern count = 1
 Max back reference = 1
 No options
@@ -4335,18 +4319,18 @@
   bb
  0: bb
  1: b
-  bbaa 
+  bbaa
  0: bba
  1: b
 
-/(.*)a/sI
+/(.*)a/Is
 Capturing subpattern count = 1
 Partial matching not supported
 Options: anchored dotall
 No first char
 Need char = 'a'
 
-/(.*)a\1/sI
+/(.*)a\1/Is
 Capturing subpattern count = 1
 Max back reference = 1
 Partial matching not supported
@@ -4354,7 +4338,7 @@
 No first char
 Need char = 'a'
 
-/(.*)a(b)\2/sI
+/(.*)a(b)\2/Is
 Capturing subpattern count = 2
 Max back reference = 2
 Partial matching not supported
@@ -4362,14 +4346,14 @@
 No first char
 Need char = 'b'
 
-/((.*)a|(.*)b)z/sI
+/((.*)a|(.*)b)z/Is
 Capturing subpattern count = 3
 Partial matching not supported
 Options: anchored dotall
 No first char
 Need char = 'z'
 
-/((.*)a|(.*)b)z\1/sI
+/((.*)a|(.*)b)z\1/Is
 Capturing subpattern count = 3
 Max back reference = 1
 Partial matching not supported
@@ -4377,7 +4361,7 @@
 No first char
 Need char = 'z'
 
-/((.*)a|(.*)b)z\2/sI
+/((.*)a|(.*)b)z\2/Is
 Capturing subpattern count = 3
 Max back reference = 2
 Partial matching not supported
@@ -4385,7 +4369,7 @@
 No first char
 Need char = 'z'
 
-/((.*)a|(.*)b)z\3/sI
+/((.*)a|(.*)b)z\3/Is
 Capturing subpattern count = 3
 Max back reference = 3
 Partial matching not supported
@@ -4393,7 +4377,7 @@
 No first char
 Need char = 'z'
 
-/((.*)a|^(.*)b)z\3/sI
+/((.*)a|^(.*)b)z\3/Is
 Capturing subpattern count = 3
 Max back reference = 3
 Partial matching not supported
@@ -4401,14 +4385,14 @@
 No first char
 Need char = 'z'
 
-/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a/sI
+/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a/Is
 Capturing subpattern count = 31
 Partial matching not supported
 Options: anchored dotall
 No first char
 No need char
 
-/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\31/sI
+/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\31/Is
 Capturing subpattern count = 31
 Max back reference = 31
 Partial matching not supported
@@ -4416,7 +4400,7 @@
 No first char
 No need char
 
-/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\32/sI
+/(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\32/Is
 Capturing subpattern count = 32
 Max back reference = 32
 Partial matching not supported
@@ -4424,17 +4408,17 @@
 No first char
 No need char
 
-/(a)(bc)/ND
+/(a)(bc)/INDZ
 ------------------------------------------------------------------
-  0  21 Bra 0
-  3   5 Bra 0
-  6     a
-  8   5 Ket
- 11   7 Bra 0
- 14     bc
- 18   7 Ket
- 21  21 Ket
- 24     End
+        Bra
+        Bra
+        a
+        Ket
+        Bra
+        bc
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: no_auto_capture
@@ -4443,17 +4427,17 @@
   abc
  0: abc
 
-/(?Pa)(bc)/ND
+/(?Pa)(bc)/INDZ
 ------------------------------------------------------------------
-  0  21 Bra 0
-  3   5 Bra 1
-  6     a
-  8   5 Ket
- 11   7 Bra 0
- 14     bc
- 18   7 Ket
- 21  21 Ket
- 24     End
+        Bra
+        CBra 1
+        a
+        Ket
+        Bra
+        bc
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Named capturing subpatterns:
@@ -4465,17 +4449,17 @@
  0: abc
  1: a
 
-/(a)(?Pbc)/ND
+/(a)(?Pbc)/INDZ
 ------------------------------------------------------------------
-  0  21 Bra 0
-  3   5 Bra 0
-  6     a
-  8   5 Ket
- 11   7 Bra 1
- 14     bc
- 18   7 Ket
- 21  21 Ket
- 24     End
+        Bra
+        Bra
+        a
+        Ket
+        CBra 1
+        bc
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Named capturing subpatterns:
@@ -4484,7 +4468,7 @@
 First char = 'a'
 Need char = 'c'
 
-/(a+)*zz/
+/(a+)*zz/I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
@@ -4500,7 +4484,7 @@
 Minimum match() recursion limit = 42
 No match
 
-/(aaa(?C1)bbb|ab)/
+/(aaa(?C1)bbb|ab)/I
 Capturing subpattern count = 1
 No options
 First char = 'a'
@@ -4527,7 +4511,7 @@
 Callout data = -1
 No match
 
-/ab(?Pcd)ef(?Pgh)/
+/ab(?Pcd)ef(?Pgh)/I
 Capturing subpattern count = 2
 Named capturing subpatterns:
   one   1
@@ -4551,22 +4535,22 @@
  2: gh
   C cd (2) one
   C gh (2) two
-    abcdefgh\Cthree  
+    abcdefgh\Cthree
 no parentheses with name "three"
  0: abcdefgh
  1: cd
  2: gh
 copy substring three failed -7
 
-/(?P)(?P)/D
+/(?P)(?P)/DZ
 ------------------------------------------------------------------
-  0  15 Bra 0
-  3   3 Bra 1
-  6   3 Ket
-  9   3 Bra 2
- 12   3 Ket
- 15  15 Ket
- 18     End
+        Bra
+        CBra 1
+        Ket
+        CBra 2
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 Named capturing subpatterns:
@@ -4576,15 +4560,15 @@
 No first char
 No need char
 
-/(?P)(?P)/D
+/(?P)(?P)/DZ
 ------------------------------------------------------------------
-  0  15 Bra 0
-  3   3 Bra 1
-  6   3 Ket
-  9   3 Bra 2
- 12   3 Ket
- 15  15 Ket
- 18     End
+        Bra
+        CBra 1
+        Ket
+        CBra 2
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 Named capturing subpatterns:
@@ -4594,7 +4578,7 @@
 No first char
 No need char
 
-/(?Pzz)(?Paa)/
+/(?Pzz)(?Paa)/I
 Capturing subpattern count = 2
 Named capturing subpatterns:
   A   2
@@ -4613,13 +4597,13 @@
  2: aa
   C aa (2) A
 
-/(?Peks)(?Peccs)/
-Failed: two named subpatterns have the same name at offset 16
+/(?Peks)(?Peccs)/I
+Failed: two named subpatterns have the same name at offset 15
 
-/(?Pabc(?Pdef)(?Pxyz))/
-Failed: two named subpatterns have the same name at offset 31
+/(?Pabc(?Pdef)(?Pxyz))/I
+Failed: two named subpatterns have the same name at offset 30
 
-"\[((?P\d+)(,(?P>elem))*)\]"
+"\[((?P\d+)(,(?P>elem))*)\]"I
 Capturing subpattern count = 3
 Named capturing subpatterns:
   elem   2
@@ -4634,10 +4618,10 @@
  3: ,4234
     *** Failers
 No match
-    []  
+    []
 No match
 
-"\[((?P\d+)(,(?P>elem))*)?\]"
+"\[((?P\d+)(,(?P>elem))*)?\]"I
 Capturing subpattern count = 3
 Named capturing subpatterns:
   elem   2
@@ -4650,103 +4634,103 @@
  1: 10,20,30,5,5,4,4,2,43,23,4234
  2: 10
  3: ,4234
-    [] 
+    []
  0: []
 
-/(a(b(?2)c))?/D
+/(a(b(?2)c))?/DZ
 ------------------------------------------------------------------
-  0  31 Bra 0
-  3     Brazero
-  4  24 Bra 1
-  7     a
-  9  16 Bra 2
- 12     b
- 14   6 Once
- 17   9 Recurse
- 20   6 Ket
- 23     c
- 25  16 Ket
- 28  24 Ket
- 31  31 Ket
- 34     End
+        Bra
+        Brazero
+        CBra 1
+        a
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 No options
 No first char
 No need char
 
-/(a(b(?2)c))*/D
+/(a(b(?2)c))*/DZ
 ------------------------------------------------------------------
-  0  31 Bra 0
-  3     Brazero
-  4  24 Bra 1
-  7     a
-  9  16 Bra 2
- 12     b
- 14   6 Once
- 17   9 Recurse
- 20   6 Ket
- 23     c
- 25  16 Ket
- 28  24 KetRmax
- 31  31 Ket
- 34     End
+        Bra
+        Brazero
+        CBra 1
+        a
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        KetRmax
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 No options
 No first char
 No need char
 
-/(a(b(?2)c)){0,2}/D
+/(a(b(?2)c)){0,2}/DZ
 ------------------------------------------------------------------
-  0  65 Bra 0
-  3     Brazero
-  4  58 Bra 0
-  7  24 Bra 1
- 10     a
- 12  16 Bra 2
- 15     b
- 17   6 Once
- 20  12 Recurse
- 23   6 Ket
- 26     c
- 28  16 Ket
- 31  24 Ket
- 34     Brazero
- 35  24 Bra 1
- 38     a
- 40  16 Bra 2
- 43     b
- 45   6 Once
- 48  12 Recurse
- 51   6 Ket
- 54     c
- 56  16 Ket
- 59  24 Ket
- 62  58 Ket
- 65  65 Ket
- 68     End
+        Bra
+        Brazero
+        Bra
+        CBra 1
+        a
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Brazero
+        CBra 1
+        a
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 No options
 No first char
 No need char
 
-/[ab]{1}+/D
+/[ab]{1}+/DZ
 ------------------------------------------------------------------
-  0  47 Bra 0
-  3  41 Once
-  6     [ab]{1,1}
- 44  41 Ket
- 47  47 Ket
- 50     End
+        Bra
+        Once
+        [ab]{1,1}
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/i
+/((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/Ii
 Capturing subpattern count = 3
 Partial matching not supported
 Options: caseless
@@ -4756,7 +4740,7 @@
  0: Baby Bjorn Active Carrier - With free SHIPPING!!
  1: Baby Bjorn Active Carrier - With free SHIPPING!!
 
-/((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/iS
+/((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/IiS
 Capturing subpattern count = 3
 Partial matching not supported
 Options: caseless
@@ -4766,15 +4750,15 @@
      Baby Bjorn Active Carrier - With free SHIPPING!!
  0: Baby Bjorn Active Carrier - With free SHIPPING!!
  1: Baby Bjorn Active Carrier - With free SHIPPING!!
-     
-/a*.*b/SD
+
+/a*.*b/ISDZ
 ------------------------------------------------------------------
-  0   9 Bra 0
-  3     a*
-  5     Any*
-  7     b
-  9   9 Ket
- 12     End
+        Bra
+        a*
+        Any*
+        b
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -4783,19 +4767,19 @@
 Need char = 'b'
 Study returned NULL
 
-/(a|b)*.?c/SD 
+/(a|b)*.?c/ISDZ
 ------------------------------------------------------------------
-  0  21 Bra 0
-  3     Brazero
-  4   5 Bra 1
-  7     a
-  9   5 Alt
- 12     b
- 14  10 KetRmax
- 17     Any?
- 19     c
- 21  21 Ket
- 24     End
+        Bra
+        Brazero
+        CBra 1
+        a
+        Alt
+        b
+        KetRmax
+        Any?
+        c
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 No options
@@ -4803,38 +4787,38 @@
 Need char = 'c'
 Study returned NULL
 
-/abc(?C255)de(?C)f/D
+/abc(?C255)de(?C)f/DZ
 ------------------------------------------------------------------
-  0  27 Bra 0
-  3     abc
-  9     Callout 255 10 1
- 15     de
- 19     Callout 0 16 1
- 25     f
- 27  27 Ket
- 30     End
+        Bra
+        abc
+        Callout 255 10 1
+        de
+        Callout 0 16 1
+        f
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'f'
 
-/abcde/CD
+/abcde/ICDZ
 ------------------------------------------------------------------
-  0  49 Bra 0
-  3     Callout 255 0 1
-  9     a
- 11     Callout 255 1 1
- 17     b
- 19     Callout 255 2 1
- 25     c
- 27     Callout 255 3 1
- 33     d
- 35     Callout 255 4 1
- 41     e
- 43     Callout 255 5 0
- 49  49 Ket
- 52     End
+        Bra
+        Callout 255 0 1
+        a
+        Callout 255 1 1
+        b
+        Callout 255 2 1
+        c
+        Callout 255 3 1
+        d
+        Callout 255 4 1
+        e
+        Callout 255 5 0
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options:
@@ -4849,7 +4833,7 @@
  +4 ^   ^     e
  +5 ^    ^    
  0: abcde
-  abcdfe 
+  abcdfe
 --->abcdfe
  +0 ^          a
  +1 ^^         b
@@ -4857,17 +4841,17 @@
  +3 ^  ^       d
  +4 ^   ^      e
 No match
-  
-/a*b/CD
+
+/a*b/ICDZ
 ------------------------------------------------------------------
-  0  25 Bra 0
-  3     Callout 255 0 2
-  9     a*
- 11     Callout 255 2 1
- 17     b
- 19     Callout 255 3 0
- 25  25 Ket
- 28     End
+        Bra
+        Callout 255 0 2
+        a*+
+        Callout 255 2 1
+        b
+        Callout 255 3 0
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -4886,26 +4870,16 @@
  +2 ^   ^     b
  +3 ^    ^    
  0: aaaab
-  aaaacb   
+  aaaacb
 --->aaaacb
  +0 ^          a*
  +2 ^   ^      b
- +2 ^  ^       b
- +2 ^ ^        b
- +2 ^^         b
- +2 ^          b
  +0  ^         a*
  +2  ^  ^      b
- +2  ^ ^       b
- +2  ^^        b
- +2  ^         b
  +0   ^        a*
  +2   ^ ^      b
- +2   ^^       b
- +2   ^        b
  +0    ^       a*
  +2    ^^      b
- +2    ^       b
  +0     ^      a*
  +2     ^      b
  +0      ^     a*
@@ -4913,16 +4887,16 @@
  +3      ^^    
  0: b
 
-/a+b/CD
+/a+b/ICDZ
 ------------------------------------------------------------------
-  0  25 Bra 0
-  3     Callout 255 0 2
-  9     a+
- 11     Callout 255 2 1
- 17     b
- 19     Callout 255 3 0
- 25  25 Ket
- 28     End
+        Bra
+        Callout 255 0 2
+        a++
+        Callout 255 2 1
+        b
+        Callout 255 3 0
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -4941,50 +4915,44 @@
  +2 ^   ^     b
  +3 ^    ^    
  0: aaaab
-  aaaacb   
+  aaaacb
 --->aaaacb
  +0 ^          a+
  +2 ^   ^      b
- +2 ^  ^       b
- +2 ^ ^        b
- +2 ^^         b
  +0  ^         a+
  +2  ^  ^      b
- +2  ^ ^       b
- +2  ^^        b
  +0   ^        a+
  +2   ^ ^      b
- +2   ^^       b
  +0    ^       a+
  +2    ^^      b
 No match
 
-/(abc|def)x/CD
+/(abc|def)x/ICDZ
 ------------------------------------------------------------------
-  0  92 Bra 0
-  3     Callout 255 0 9
-  9  33 Bra 1
- 12     Callout 255 1 1
- 18     a
- 20     Callout 255 2 1
- 26     b
- 28     Callout 255 3 1
- 34     c
- 36     Callout 255 4 0
- 42  33 Alt
- 45     Callout 255 5 1
- 51     d
- 53     Callout 255 6 1
- 59     e
- 61     Callout 255 7 1
- 67     f
- 69     Callout 255 8 0
- 75  66 Ket
- 78     Callout 255 9 1
- 84     x
- 86     Callout 255 10 0
- 92  92 Ket
- 95     End
+        Bra
+        Callout 255 0 9
+        CBra 1
+        Callout 255 1 1
+        a
+        Callout 255 2 1
+        b
+        Callout 255 3 1
+        c
+        Callout 255 4 0
+        Alt
+        Callout 255 5 1
+        d
+        Callout 255 6 1
+        e
+        Callout 255 7 1
+        f
+        Callout 255 8 0
+        Ket
+        Callout 255 9 1
+        x
+        Callout 255 10 0
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Options:
@@ -5049,7 +5017,7 @@
  +5        ^     d
 No match
 
-/(ab|cd){3,4}/C
+/(ab|cd){3,4}/IC
 Capturing subpattern count = 1
 Options:
 No first char
@@ -5091,7 +5059,7 @@
 +12 ^       ^    
  0: abcdabcd
  1: cd
-  abcdcdcdcdcd  
+  abcdcdcdcdcd
 --->abcdcdcdcdcd
  +0 ^                (ab|cd){3,4}
  +1 ^                a
@@ -5113,34 +5081,34 @@
  0: abcdcdcd
  1: cd
 
-/([ab]{,4}c|xy)/CD
+/([ab]{,4}c|xy)/ICDZ
 ------------------------------------------------------------------
-  0 131 Bra 0
-  3     Callout 255 0 14
-  9  88 Bra 1
- 12     Callout 255 1 4
- 18     [ab]
- 51     Callout 255 5 1
- 57     {
- 59     Callout 255 6 1
- 65     ,
- 67     Callout 255 7 1
- 73     4
- 75     Callout 255 8 1
- 81     }
- 83     Callout 255 9 1
- 89     c
- 91     Callout 255 10 0
- 97  25 Alt
-100     Callout 255 11 1
-106     x
-108     Callout 255 12 1
-114     y
-116     Callout 255 13 0
-122 113 Ket
-125     Callout 255 14 0
-131 131 Ket
-134     End
+        Bra
+        Callout 255 0 14
+        CBra 1
+        Callout 255 1 4
+        [ab]
+        Callout 255 5 1
+        {
+        Callout 255 6 1
+        ,
+        Callout 255 7 1
+        4
+        Callout 255 8 1
+        }
+        Callout 255 9 1
+        c
+        Callout 255 10 0
+        Alt
+        Callout 255 11 1
+        x
+        Callout 255 12 1
+        y
+        Callout 255 13 0
+        Ket
+        Callout 255 14 0
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Options:
@@ -5288,85 +5256,85 @@
 +11                                             ^    x
 No match
 
-/([ab]{1,4}c|xy){4,5}?123/CD
+/([ab]{1,4}c|xy){4,5}?123/ICDZ
 ------------------------------------------------------------------
-  0 485 Bra 0
-  3     Callout 255 0 21
-  9  61 Bra 1
- 12     Callout 255 1 9
- 18     [ab]{1,4}
- 56     Callout 255 10 1
- 62     c
- 64     Callout 255 11 0
- 70  25 Alt
- 73     Callout 255 12 1
- 79     x
- 81     Callout 255 13 1
- 87     y
- 89     Callout 255 14 0
- 95  86 Ket
- 98  61 Bra 1
-101     Callout 255 1 9
-107     [ab]{1,4}
-145     Callout 255 10 1
-151     c
-153     Callout 255 11 0
-159  25 Alt
-162     Callout 255 12 1
-168     x
-170     Callout 255 13 1
-176     y
-178     Callout 255 14 0
-184  86 Ket
-187  61 Bra 1
-190     Callout 255 1 9
-196     [ab]{1,4}
-234     Callout 255 10 1
-240     c
-242     Callout 255 11 0
-248  25 Alt
-251     Callout 255 12 1
-257     x
-259     Callout 255 13 1
-265     y
-267     Callout 255 14 0
-273  86 Ket
-276  61 Bra 1
-279     Callout 255 1 9
-285     [ab]{1,4}
-323     Callout 255 10 1
-329     c
-331     Callout 255 11 0
-337  25 Alt
-340     Callout 255 12 1
-346     x
-348     Callout 255 13 1
-354     y
-356     Callout 255 14 0
-362  86 Ket
-365     Braminzero
-366  61 Bra 1
-369     Callout 255 1 9
-375     [ab]{1,4}
-413     Callout 255 10 1
-419     c
-421     Callout 255 11 0
-427  25 Alt
-430     Callout 255 12 1
-436     x
-438     Callout 255 13 1
-444     y
-446     Callout 255 14 0
-452  86 Ket
-455     Callout 255 21 1
-461     1
-463     Callout 255 22 1
-469     2
-471     Callout 255 23 1
-477     3
-479     Callout 255 24 0
-485 485 Ket
-488     End
+        Bra
+        Callout 255 0 21
+        CBra 1
+        Callout 255 1 9
+        [ab]{1,4}
+        Callout 255 10 1
+        c
+        Callout 255 11 0
+        Alt
+        Callout 255 12 1
+        x
+        Callout 255 13 1
+        y
+        Callout 255 14 0
+        Ket
+        CBra 1
+        Callout 255 1 9
+        [ab]{1,4}
+        Callout 255 10 1
+        c
+        Callout 255 11 0
+        Alt
+        Callout 255 12 1
+        x
+        Callout 255 13 1
+        y
+        Callout 255 14 0
+        Ket
+        CBra 1
+        Callout 255 1 9
+        [ab]{1,4}
+        Callout 255 10 1
+        c
+        Callout 255 11 0
+        Alt
+        Callout 255 12 1
+        x
+        Callout 255 13 1
+        y
+        Callout 255 14 0
+        Ket
+        CBra 1
+        Callout 255 1 9
+        [ab]{1,4}
+        Callout 255 10 1
+        c
+        Callout 255 11 0
+        Alt
+        Callout 255 12 1
+        x
+        Callout 255 13 1
+        y
+        Callout 255 14 0
+        Ket
+        Braminzero
+        CBra 1
+        Callout 255 1 9
+        [ab]{1,4}
+        Callout 255 10 1
+        c
+        Callout 255 11 0
+        Alt
+        Callout 255 12 1
+        x
+        Callout 255 13 1
+        y
+        Callout 255 14 0
+        Ket
+        Callout 255 21 1
+        1
+        Callout 255 22 1
+        2
+        Callout 255 23 1
+        3
+        Callout 255 24 0
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
@@ -5407,8 +5375,8 @@
 No need char
   ab cd\>1
  0:  cd
-  
-/\b.*/Is 
+
+/\b.*/Is
 Capturing subpattern count = 0
 Partial matching not supported
 Options: dotall
@@ -5416,17 +5384,17 @@
 No need char
   ab cd\>1
  0:  cd
-  
+
 /(?!.bcd).*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 No first char
 No need char
-  Xbcd12345 
+  Xbcd12345
  0: bcd12345
 
-/abcde/
+/abcde/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
@@ -5437,7 +5405,7 @@
 Partial match
     abcd\P
 Partial match
-    abcde\P   
+    abcde\P
  0: abcde
     the quick brown abc\P
 Partial match
@@ -5445,8 +5413,8 @@
 No match
     the quick brown abxyz fox\P
 No match
-    
-"^(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/(20)?\d\d$"
+
+"^(0?[1-9]|[12][0-9]|3[01])/(0?[1-9]|1[012])/(20)?\d\d$"I
 Capturing subpattern count = 3
 Options: anchored
 No first char
@@ -5460,7 +5428,7 @@
  1: 13
  2: 5
  3: 20
-    02/05/09\P 
+    02/05/09\P
  0: 02/05/09
  1: 02
  2: 05
@@ -5470,7 +5438,7 @@
 Partial match
     1/2/0\P
 Partial match
-    1/2/04\P    
+    1/2/04\P
  0: 1/2/04
  1: 1
  2: 2
@@ -5478,7 +5446,7 @@
 Partial match
     02/\P
 Partial match
-    02/0\P   
+    02/0\P
 Partial match
     02/1\P
 Partial match
@@ -5494,11 +5462,11 @@
 No match
     0/1/2003\P
 No match
-    0/\P 
+    0/\P
 No match
-    02/0/\P 
+    02/0/\P
 No match
-    02/13\P  
+    02/13\P
 No match
 
 /0{0,2}ABC/I
@@ -5507,14 +5475,14 @@
 No options
 No first char
 Need char = 'C'
-    
+
 /\d{3,}ABC/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
 No first char
 Need char = 'C'
-    
+
 /\d*ABC/I
 Capturing subpattern count = 0
 Partial matching not supported
@@ -5529,7 +5497,7 @@
 No first char
 Need char = 'E'
 
-/[abc]?123/
+/[abc]?123/I
 Capturing subpattern count = 0
 No options
 No first char
@@ -5544,10 +5512,10 @@
 Partial match
     c12\P
 Partial match
-    c123\P      
+    c123\P
  0: c123
 
-/^(?:\d){3,5}X/
+/^(?:\d){3,5}X/I
 Capturing subpattern count = 0
 Options: anchored
 No first char
@@ -5564,16 +5532,16 @@
  0: 1234X
     12345\P
 Partial match
-    12345X      
+    12345X
  0: 12345X
-    *** Failers 
+    *** Failers
 No match
-    1X 
+    1X
 No match
-    123456\P 
+    123456\P
 No match
 
-/abc/>testsavedregex
+/abc/I>testsavedregex
 Capturing subpattern count = 0
 No options
 First char = 'a'
@@ -5582,18 +5550,14 @@
 testsavedregex
+
+/abc/IF>testsavedregex
 Capturing subpattern count = 0
 No options
 First char = 'a'
@@ -5602,10 +5566,6 @@
 testsavedregex
+/(a|b)/IS>testsavedregex
 Capturing subpattern count = 1
 No options
 No first char
@@ -5624,21 +5584,16 @@
 testsavedregex
+
+/(a|b)/ISF>testsavedregex
 Capturing subpattern count = 1
 No options
 No first char
@@ -5649,21 +5604,16 @@
 (.)*~smg
+
+~<(\w+)/?>(.)*~smgI
 Capturing subpattern count = 3
 Max back reference = 1
 Partial matching not supported
@@ -5682,59 +5632,62 @@
 No first char
 No need char
 
-/line\nbreak/
+/line\nbreak/I
 Capturing subpattern count = 0
+Contains explicit CR or LF match
 No options
 First char = 'l'
 Need char = 'k'
     this is a line\nbreak
  0: line\x0abreak
-    line one\nthis is a line\nbreak in the second line 
+    line one\nthis is a line\nbreak in the second line
  0: line\x0abreak
 
-/line\nbreak/f
+/line\nbreak/If
 Capturing subpattern count = 0
+Contains explicit CR or LF match
 Options: firstline
 First char = 'l'
 Need char = 'k'
     this is a line\nbreak
  0: line\x0abreak
-    ** Failers 
+    ** Failers
 No match
-    line one\nthis is a line\nbreak in the second line 
+    line one\nthis is a line\nbreak in the second line
 No match
 
-/line\nbreak/mf
+/line\nbreak/Imf
 Capturing subpattern count = 0
+Contains explicit CR or LF match
 Options: multiline firstline
 First char = 'l'
 Need char = 'k'
     this is a line\nbreak
  0: line\x0abreak
-    ** Failers 
+    ** Failers
 No match
-    line one\nthis is a line\nbreak in the second line 
+    line one\nthis is a line\nbreak in the second line
 No match
 
-/ab.cd/P
+/ab.cd/IP
     ab-cd
  0: ab-cd
-    ab=cd 
+    ab=cd
  0: ab=cd
     ** Failers
 No match: POSIX code 17: match failed
     ab\ncd
 No match: POSIX code 17: match failed
 
-/ab.cd/Ps
+/ab.cd/IPs
     ab-cd
  0: ab-cd
-    ab=cd 
+    ab=cd
  0: ab=cd
     ab\ncd
  0: ab\x0acd
 
-/(?i)(?-i)AbCd/
+/(?i)(?-i)AbCd/I
 Capturing subpattern count = 0
 No options
 First char = 'A'
@@ -5743,19 +5696,19 @@
  0: AbCd
     ** Failers
 No match
-    abcd  
+    abcd
 No match
-    
-/a{11111111111111111111}/
+
+/a{11111111111111111111}/I
 Failed: number too big in {} quantifier at offset 22
 
-/(){64294967295}/
+/(){64294967295}/I
 Failed: number too big in {} quantifier at offset 14
 
-/(){2,4294967295}/
+/(){2,4294967295}/I
 Failed: number too big in {} quantifier at offset 15
 
-"(?i:a)(?i:b)(?i:c)(?i:d)(?i:e)(?i:f)(?i:g)(?i:h)(?i:i)(?i:j)(k)(?i:l)A\1B"
+"(?i:a)(?i:b)(?i:c)(?i:d)(?i:e)(?i:f)(?i:g)(?i:h)(?i:i)(?i:j)(k)(?i:l)A\1B"I
 Capturing subpattern count = 1
 Max back reference = 1
 No options
@@ -5765,7 +5718,7 @@
  0: abcdefghijklAkB
  1: k
 
-"(?Pa)(?Pb)(?Pc)(?Pd)(?Pe)(?Pf)(?Pg)(?Ph)(?Pi)(?Pj)(?Pk)(?Pl)A\11B"
+"(?Pa)(?Pb)(?Pc)(?Pd)(?Pe)(?Pf)(?Pg)(?Ph)(?Pi)(?Pj)(?Pk)(?Pl)A\11B"I
 Capturing subpattern count = 12
 Max back reference = 11
 Named capturing subpatterns:
@@ -5799,7 +5752,7 @@
 11: k
 12: l
 
-"(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)A\11B"
+"(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)A\11B"I
 Capturing subpattern count = 12
 Max back reference = 11
 No options
@@ -5820,7 +5773,7 @@
 11: k
 12: l
 
-"(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)"
+"(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)(?Pa)"I
 Capturing subpattern count = 101
 Named capturing subpatterns:
   name0     1
@@ -5945,7 +5898,7 @@
 13: a
 14: a
 
-"(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)"
+"(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)(a)"I
 Capturing subpattern count = 101
 No options
 First char = 'a'
@@ -5968,7 +5921,7 @@
 13: a
 14: a
 
-/[^()]*(?:\((?R)\)[^()]*)*/
+/[^()]*(?:\((?R)\)[^()]*)*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -5976,12 +5929,12 @@
 No need char
     (this(and)that
  0: 
-    (this(and)that) 
+    (this(and)that)
  0: (this(and)that)
     (this(and)that)stuff
  0: (this(and)that)stuff
 
-/[^()]*(?:\((?>(?R))\)[^()]*)*/
+/[^()]*(?:\((?>(?R))\)[^()]*)*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -5989,10 +5942,10 @@
 No need char
     (this(and)that
  0: 
-    (this(and)that) 
+    (this(and)that)
  0: (this(and)that)
-    
-/[^()]*(?:\((?R)\))*[^()]*/
+
+/[^()]*(?:\((?R)\))*[^()]*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -6000,10 +5953,10 @@
 No need char
     (this(and)that
  0: 
-    (this(and)that) 
+    (this(and)that)
  0: (this(and)that)
 
-/(?:\((?R)\))*[^()]*/
+/(?:\((?R)\))*[^()]*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -6011,12 +5964,12 @@
 No need char
     (this(and)that
  0: 
-    (this(and)that) 
+    (this(and)that)
  0: 
-    ((this)) 
+    ((this))
  0: ((this))
 
-/(?:\((?R)\))|[^()]*/
+/(?:\((?R)\))|[^()]*/I
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -6024,34 +5977,34 @@
 No need char
     (this(and)that
  0: 
-    (this(and)that) 
+    (this(and)that)
  0: 
     (this)
  0: (this)
-    ((this)) 
+    ((this))
  0: ((this))
-    
-/a(b)c/PN
+
+/a(b)c/IPN
     abc
 Matched with REG_NOSUB
-    
-/a(?Pb)c/PN
-    abc  
+
+/a(?Pb)c/IPN
+    abc
 Matched with REG_NOSUB
-    
-/\x{100}/ 
+
+/\x{100}/I
 Failed: character value in \x{...} sequence is too large at offset 6
 
-/\x{0000ff}/
+/\x{0000ff}/I
 Capturing subpattern count = 0
 No options
 First char = 255
 No need char
 
-/^((?Pa1)|(?Pa2)b)/
-Failed: two named subpatterns have the same name at offset 18
+/^((?Pa1)|(?Pa2)b)/I
+Failed: two named subpatterns have the same name at offset 17
 
-/^((?Pa1)|(?Pa2)b)/J
+/^((?Pa1)|(?Pa2)b)/IJ
 Capturing subpattern count = 3
 Named capturing subpatterns:
   A   2
@@ -6064,7 +6017,7 @@
  1: a1
  2: a1
   C a1 (2) A
-    a2b\CA 
+    a2b\CA
  0: a2b
  1: a2b
  2: 
@@ -6072,15 +6025,15 @@
   C a2 (2) A
     ** Failers
 No match
-    a1b\CZ\CA 
+    a1b\CZ\CA
 no parentheses with name "Z"
  0: a1
  1: a1
  2: a1
 copy substring Z failed -7
   C a1 (2) A
-    
-/^(?Pa)(?Pb)/J
+
+/^(?Pa)(?Pb)/IJ
 Capturing subpattern count = 2
 Named capturing subpatterns:
   A   1
@@ -6093,8 +6046,8 @@
  1: a
  2: b
   C a (1) A
-    
-/^(?Pa)(?Pb)|cd/J
+
+/^(?Pa)(?Pb)|cd/IJ
 Capturing subpattern count = 2
 Named capturing subpatterns:
   A   1
@@ -6107,11 +6060,11 @@
  1: a
  2: b
   C a (1) A
-    cd\CA 
+    cd\CA
  0: cd
 copy substring A failed -7
-  
-/^(?Pa)(?Pb)|cd(?Pef)(?Pgh)/J
+
+/^(?Pa)(?Pb)|cd(?Pef)(?Pgh)/IJ
 Capturing subpattern count = 4
 Named capturing subpatterns:
   A   1
@@ -6121,15 +6074,15 @@
 Options: dupnames
 No first char
 No need char
-    cdefgh\CA 
+    cdefgh\CA
  0: cdefgh
  1: 
  2: 
  3: ef
  4: gh
   C ef (2) A
-  
-/^((?Pa1)|(?Pa2)b)/J
+
+/^((?Pa1)|(?Pa2)b)/IJ
 Capturing subpattern count = 3
 Named capturing subpatterns:
   A   2
@@ -6142,7 +6095,7 @@
  1: a1
  2: a1
   G a1 (2) A
-    a2b\GA 
+    a2b\GA
  0: a2b
  1: a2b
  2: 
@@ -6150,15 +6103,15 @@
   G a2 (2) A
     ** Failers
 No match
-    a1b\GZ\GA 
+    a1b\GZ\GA
 no parentheses with name "Z"
  0: a1
  1: a1
  2: a1
 copy substring Z failed -7
   G a1 (2) A
-    
-/^(?Pa)(?Pb)/J
+
+/^(?Pa)(?Pb)/IJ
 Capturing subpattern count = 2
 Named capturing subpatterns:
   A   1
@@ -6171,8 +6124,8 @@
  1: a
  2: b
   G a (1) A
-    
-/^(?Pa)(?Pb)|cd/J
+
+/^(?Pa)(?Pb)|cd/IJ
 Capturing subpattern count = 2
 Named capturing subpatterns:
   A   1
@@ -6185,11 +6138,11 @@
  1: a
  2: b
   G a (1) A
-    cd\GA 
+    cd\GA
  0: cd
 copy substring A failed -7
-  
-/^(?Pa)(?Pb)|cd(?Pef)(?Pgh)/J
+
+/^(?Pa)(?Pb)|cd(?Pef)(?Pgh)/IJ
 Capturing subpattern count = 4
 Named capturing subpatterns:
   A   1
@@ -6199,20 +6152,21 @@
 Options: dupnames
 No first char
 No need char
-    cdefgh\GA 
+    cdefgh\GA
  0: cdefgh
  1: 
  2: 
  3: ef
  4: gh
   G ef (2) A
-  
-/(?J)^((?Pa1)|(?Pa2)b)/
+
+/(?J)^((?Pa1)|(?Pa2)b)/I
 Capturing subpattern count = 3
 Named capturing subpatterns:
   A   2
   A   3
 Options: anchored dupnames
+Duplicate name status changes
 No first char
 No need char
     a1b\CA
@@ -6220,25 +6174,25 @@
  1: a1
  2: a1
   C a1 (2) A
-    a2b\CA 
+    a2b\CA
  0: a2b
  1: a2b
  2: 
  3: a2
   C a2 (2) A
-    
-/^(?Pa) (?J:(?Pb)(?Pc)) (?Pd)/
-Failed: two named subpatterns have the same name at offset 38
+
+/^(?Pa) (?J:(?Pb)(?Pc)) (?Pd)/I
+Failed: two named subpatterns have the same name at offset 37
 
 / In this next test, J is not set at the outer level; consequently it isn't
-set in the pattern's options; consequently pcre_get_named_substring() produces 
-a random value. /x
+set in the pattern's options; consequently pcre_get_named_substring() produces
+a random value. /Ix
 Capturing subpattern count = 1
 Options: extended
 First char = 'I'
 Need char = 'e'
 
-/^(?Pa) (?J:(?Pb)(?Pc)) (?Pd)/
+/^(?Pa) (?J:(?Pb)(?Pc)) (?Pd)/I
 Capturing subpattern count = 4
 Named capturing subpatterns:
   A   1
@@ -6246,6 +6200,7 @@
   B   3
   C   4
 Options: anchored
+Duplicate name status changes
 No first char
 No need char
     a bc d\CA\CB\CC
@@ -6258,7 +6213,7 @@
   C b (1) B
   C d (1) C
 
-/^(?Pa)?(?(A)a|b)/
+/^(?Pa)?(?(A)a|b)/I
 Capturing subpattern count = 1
 Named capturing subpatterns:
   A   1
@@ -6272,10 +6227,10 @@
  0: b
     ** Failers
 No match
-    abc   
+    abc
 No match
 
-/(?:(?(ZZ)a|b)(?PX))+/
+/(?:(?(ZZ)a|b)(?PX))+/I
 Capturing subpattern count = 1
 Named capturing subpatterns:
   ZZ   1
@@ -6286,13 +6241,13 @@
  0: bXaX
  1: X
 
-/(?:(?(2y)a|b)(X))+/
+/(?:(?(2y)a|b)(X))+/I
 Failed: reference to non-existent subpattern at offset 9
 
-/(?:(?(ZA)a|b)(?PX))+/
+/(?:(?(ZA)a|b)(?PX))+/I
 Failed: reference to non-existent subpattern at offset 9
 
-/(?:(?(ZZ)a|b)(?(ZZ)a|b)(?PX))+/
+/(?:(?(ZZ)a|b)(?(ZZ)a|b)(?PX))+/I
 Capturing subpattern count = 1
 Named capturing subpatterns:
   ZZ   1
@@ -6303,7 +6258,7 @@
  0: bbXaaX
  1: X
 
-/(?:(?(ZZ)a|\(b\))\\(?PX))+/
+/(?:(?(ZZ)a|\(b\))\\(?PX))+/I
 Capturing subpattern count = 1
 Named capturing subpatterns:
   ZZ   1
@@ -6314,10 +6269,10 @@
  0: (b)\Xa\X
  1: X
 
-/(?PX|Y))+/
+/(?:(?(A)(?P=A)a|b)(?PX|Y))+/I
 Capturing subpattern count = 1
 Max back reference = 1
 Named capturing subpatterns:
@@ -6328,11 +6283,11 @@
     bXXaYYaY
  0: bXXaYYaY
  1: Y
-    bXYaXXaX  
+    bXYaXXaX
  0: bX
  1: X
 
-/()()()()()()()()()(?:(?(A)(?P=A)a|b)(?PX|Y))+/
+/()()()()()()()()()(?:(?(A)(?P=A)a|b)(?PX|Y))+/I
 Capturing subpattern count = 10
 Max back reference = 10
 Named capturing subpatterns:
@@ -6353,10 +6308,10 @@
  9: 
 10: Y
 
-/\777/
+/\777/I
 Failed: octal value is greater than \377 (not in UTF-8 mode) at offset 3
 
-/\s*,\s*/S
+/\s*,\s*/IS
 Capturing subpattern count = 0
 Partial matching not supported
 No options
@@ -6365,10 +6320,10 @@
 Starting byte set: \x09 \x0a \x0c \x0d \x20 , 
     \x0b,\x0b
  0: ,
-    \x0c,\x0d 
+    \x0c,\x0d
  0: \x0c,\x0d
 
-/^abc/m
+/^abc/Im
 Capturing subpattern count = 0
 Options: multiline
 First char at start or follows newline
@@ -6383,7 +6338,7 @@
  0: abc
     xyz\r\nabc\
  0: abc
-    ** Failers 
+    ** Failers
 No match
     xyz\nabc\
 No match
@@ -6395,38 +6350,39 @@
 No match
     xyz\rabc\
 No match
-    
-/abc$/m
+
+/abc$/Im
 Capturing subpattern count = 0
 Options: multiline
+Forced newline sequence: LF
 First char = 'a'
 Need char = 'c'
     xyzabc
  0: abc
-    xyzabc\n 
+    xyzabc\n
  0: abc
-    xyzabc\npqr 
+    xyzabc\npqr
  0: abc
-    xyzabc\r\ 
+    xyzabc\r\
  0: abc
-    xyzabc\rpqr\ 
+    xyzabc\rpqr\
  0: abc
-    xyzabc\r\n\ 
+    xyzabc\r\n\
  0: abc
-    xyzabc\r\npqr\ 
+    xyzabc\r\npqr\
  0: abc
     ** Failers
 No match
-    xyzabc\r 
+    xyzabc\r
 No match
-    xyzabc\rpqr 
+    xyzabc\rpqr
 No match
-    xyzabc\r\n 
+    xyzabc\r\n
 No match
-    xyzabc\r\npqr 
+    xyzabc\r\npqr
 No match
-    
-/^abc/m
+
+/^abc/Im
 Capturing subpattern count = 0
 Options: multiline
 Forced newline sequence: CR
@@ -6436,12 +6392,12 @@
  0: abc
     xyz\nabcdef\
  0: abc
-    ** Failers  
+    ** Failers
 No match
     xyz\nabcdef
 No match
-       
-/^abc/m
+
+/^abc/Im
 Capturing subpattern count = 0
 Options: multiline
 Forced newline sequence: LF
@@ -6451,12 +6407,12 @@
  0: abc
     xyz\rabcdef\
  0: abc
-    ** Failers  
+    ** Failers
 No match
     xyz\rabcdef
 No match
-       
-/^abc/m
+
+/^abc/Im
 Capturing subpattern count = 0
 Options: multiline
 Forced newline sequence: CRLF
@@ -6466,29 +6422,30 @@
  0: abc
     xyz\rabcdef\
  0: abc
-    ** Failers  
+    ** Failers
 No match
     xyz\rabcdef
 No match
-    
-/^abc/m
+
+/^abc/Im
 Unknown newline type at: 
 
 
-/abc/
+/abc/I
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'c'
     xyz\rabc\
 Unknown newline type at: 
-    abc  
+    abc
  0: abc
-       
-/.*/
+
+/.*/I
 Capturing subpattern count = 0
 Partial matching not supported
-No options
+Options:
+Forced newline sequence: LF
 First char at start or follows newline
 No need char
     abc\ndef
@@ -6510,7 +6467,7 @@
     \abc\r\ndef
  0: abc
 
-/\w+(.)(.)?def/s
+/\w+(.)(.)?def/Is
 Capturing subpattern count = 2
 Partial matching not supported
 Options: dotall
@@ -6527,7 +6484,7 @@
  1: \x0d
  2: \x0a
 
-+((?:\s|//.*\\n|/[*](?:\\n|.)*?[*]/)*)+
++((?:\s|//.*\\n|/[*](?:\\n|.)*?[*]/)*)+I
 Capturing subpattern count = 1
 Partial matching not supported
 No options
@@ -6539,7 +6496,7 @@
  0: /* this is a C style comment */
  1: /* this is a C style comment */
 
-/(?P25[0-5]|2[0-4]\d|[01]?\d?\d)(?:\.(?P>B)){3}/
+/(?P25[0-5]|2[0-4]\d|[01]?\d?\d)(?:\.(?P>B)){3}/I
 Capturing subpattern count = 1
 Named capturing subpatterns:
   B   1
@@ -6547,8 +6504,3340 @@
 No first char
 Need char = '.'
 
-/ End of testinput2 /
-Capturing subpattern count = 0
+/()()()()()()()()()()()()()()()()()()()()
+ ()()()()()()()()()()()()()()()()()()()()
+ ()()()()()()()()()()()()()()()()()()()()
+ ()()()()()()()()()()()()()()()()()()()()
+ ()()()()()()()()()()()()()()()()()()()()
+ (.(.))/Ix
+Capturing subpattern count = 102
+Options: extended
+No first char
+No need char
+    XY\O400
+ 0: XY
+ 1: 
+ 2: 
+ 3: 
+ 4: 
+ 5: 
+ 6: 
+ 7: 
+ 8: 
+ 9: 
+10: 
+11: 
+12: 
+13: 
+14: 
+15: 
+16: 
+17: 
+18: 
+19: 
+20: 
+21: 
+22: 
+23: 
+24: 
+25: 
+26: 
+27: 
+28: 
+29: 
+30: 
+31: 
+32: 
+33: 
+34: 
+35: 
+36: 
+37: 
+38: 
+39: 
+40: 
+41: 
+42: 
+43: 
+44: 
+45: 
+46: 
+47: 
+48: 
+49: 
+50: 
+51: 
+52: 
+53: 
+54: 
+55: 
+56: 
+57: 
+58: 
+59: 
+60: 
+61: 
+62: 
+63: 
+64: 
+65: 
+66: 
+67: 
+68: 
+69: 
+70: 
+71: 
+72: 
+73: 
+74: 
+75: 
+76: 
+77: 
+78: 
+79: 
+80: 
+81: 
+82: 
+83: 
+84: 
+85: 
+86: 
+87: 
+88: 
+89: 
+90: 
+91: 
+92: 
+93: 
+94: 
+95: 
+96: 
+97: 
+98: 
+99: 
+100: 
+101: XY
+102: Y
+
+/(a*b|(?i:c*(?-i)d))/IS
+Capturing subpattern count = 1
+Partial matching not supported
 No options
-First char = ' '
-Need char = ' '
+No first char
+No need char
+Starting byte set: C a b c d 
+
+/()[ab]xyz/IS
+Capturing subpattern count = 1
+No options
+No first char
+Need char = 'z'
+Starting byte set: a b 
+
+/(|)[ab]xyz/IS
+Capturing subpattern count = 1
+No options
+No first char
+Need char = 'z'
+Starting byte set: a b 
+
+/(|c)[ab]xyz/IS
+Capturing subpattern count = 1
+No options
+No first char
+Need char = 'z'
+Starting byte set: a b c 
+
+/(|c?)[ab]xyz/IS
+Capturing subpattern count = 1
+No options
+No first char
+Need char = 'z'
+Starting byte set: a b c 
+
+/(d?|c?)[ab]xyz/IS
+Capturing subpattern count = 1
+No options
+No first char
+Need char = 'z'
+Starting byte set: a b c d 
+
+/(d?|c)[ab]xyz/IS
+Capturing subpattern count = 1
+No options
+No first char
+Need char = 'z'
+Starting byte set: a b c d 
+
+/^a*b\d/DZ
+------------------------------------------------------------------
+        Bra
+        ^
+        a*+
+        b
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: anchored
+No first char
+Need char = 'b'
+
+/^a*+b\d/DZ
+------------------------------------------------------------------
+        Bra
+        ^
+        a*+
+        b
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: anchored
+No first char
+Need char = 'b'
+
+/^a*?b\d/DZ
+------------------------------------------------------------------
+        Bra
+        ^
+        a*+
+        b
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: anchored
+No first char
+Need char = 'b'
+
+/^a+A\d/DZ
+------------------------------------------------------------------
+        Bra
+        ^
+        a++
+        A
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: anchored
+No first char
+Need char = 'A'
+    aaaA5
+ 0: aaaA5
+    ** Failers
+No match
+    aaaa5
+No match
+
+/^a*A\d/IiDZ
+------------------------------------------------------------------
+        Bra
+        ^
+        a*
+     NC A
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: anchored caseless
+No first char
+Need char = 'A' (caseless)
+    aaaA5
+ 0: aaaA5
+    aaaa5
+ 0: aaaa5
+
+/(a*|b*)[cd]/IS
+Capturing subpattern count = 1
+Partial matching not supported
+No options
+No first char
+No need char
+Starting byte set: a b c d 
+
+/(a+|b*)[cd]/IS
+Capturing subpattern count = 1
+Partial matching not supported
+No options
+No first char
+No need char
+Starting byte set: a b c d 
+
+/(a*|b+)[cd]/IS
+Capturing subpattern count = 1
+Partial matching not supported
+No options
+No first char
+No need char
+Starting byte set: a b c d 
+
+/(a+|b+)[cd]/IS
+Capturing subpattern count = 1
+Partial matching not supported
+No options
+No first char
+No need char
+Starting byte set: a b 
+
+/((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
+ ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
+ (((
+ a
+ ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+ ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
+ )))
+/Ix
+Capturing subpattern count = 203
+Options: extended
+First char = 'a'
+No need char
+  large nest
+Matched, but too many substrings
+ 0: a
+ 1: a
+ 2: a
+ 3: a
+ 4: a
+ 5: a
+ 6: a
+ 7: a
+ 8: a
+ 9: a
+10: a
+11: a
+12: a
+13: a
+14: a
+
+/a*\d/BZ
+------------------------------------------------------------------
+        Bra
+        a*+
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/a*\D/BZ
+------------------------------------------------------------------
+        Bra
+        a*
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+
+/0*\d/BZ
+------------------------------------------------------------------
+        Bra
+        0*
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/0*\D/BZ
+------------------------------------------------------------------
+        Bra
+        0*+
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+
+/a*\s/BZ
+------------------------------------------------------------------
+        Bra
+        a*+
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+
+/a*\S/BZ
+------------------------------------------------------------------
+        Bra
+        a*
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+
+/ *\s/BZ
+------------------------------------------------------------------
+        Bra
+         *
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+
+/ *\S/BZ
+------------------------------------------------------------------
+        Bra
+         *+
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+
+/a*\w/BZ
+------------------------------------------------------------------
+        Bra
+        a*
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/a*\W/BZ
+------------------------------------------------------------------
+        Bra
+        a*+
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+
+/=*\w/BZ
+------------------------------------------------------------------
+        Bra
+        =*+
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/=*\W/BZ
+------------------------------------------------------------------
+        Bra
+        =*
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*a/BZ
+------------------------------------------------------------------
+        Bra
+        \d*+
+        a
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*2/BZ
+------------------------------------------------------------------
+        Bra
+        \d*
+        2
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*\d/BZ
+------------------------------------------------------------------
+        Bra
+        \d*
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*\D/BZ
+------------------------------------------------------------------
+        Bra
+        \d*+
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*\s/BZ
+------------------------------------------------------------------
+        Bra
+        \d*+
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*\S/BZ
+------------------------------------------------------------------
+        Bra
+        \d*
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*\w/BZ
+------------------------------------------------------------------
+        Bra
+        \d*
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*\W/BZ
+------------------------------------------------------------------
+        Bra
+        \d*+
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+
+/\D*a/BZ
+------------------------------------------------------------------
+        Bra
+        \D*
+        a
+        Ket
+        End
+------------------------------------------------------------------
+
+/\D*2/BZ
+------------------------------------------------------------------
+        Bra
+        \D*+
+        2
+        Ket
+        End
+------------------------------------------------------------------
+
+/\D*\d/BZ
+------------------------------------------------------------------
+        Bra
+        \D*+
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/\D*\D/BZ
+------------------------------------------------------------------
+        Bra
+        \D*
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+
+/\D*\s/BZ
+------------------------------------------------------------------
+        Bra
+        \D*
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+
+/\D*\S/BZ
+------------------------------------------------------------------
+        Bra
+        \D*
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+
+/\D*\w/BZ
+------------------------------------------------------------------
+        Bra
+        \D*
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/\D*\W/BZ
+------------------------------------------------------------------
+        Bra
+        \D*
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*a/BZ
+------------------------------------------------------------------
+        Bra
+        \s*+
+        a
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*2/BZ
+------------------------------------------------------------------
+        Bra
+        \s*+
+        2
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*\d/BZ
+------------------------------------------------------------------
+        Bra
+        \s*+
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*\D/BZ
+------------------------------------------------------------------
+        Bra
+        \s*
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*\s/BZ
+------------------------------------------------------------------
+        Bra
+        \s*
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*\S/BZ
+------------------------------------------------------------------
+        Bra
+        \s*+
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*\w/BZ
+------------------------------------------------------------------
+        Bra
+        \s*+
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*\W/BZ
+------------------------------------------------------------------
+        Bra
+        \s*
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+
+/\S*a/BZ
+------------------------------------------------------------------
+        Bra
+        \S*
+        a
+        Ket
+        End
+------------------------------------------------------------------
+
+/\S*2/BZ
+------------------------------------------------------------------
+        Bra
+        \S*
+        2
+        Ket
+        End
+------------------------------------------------------------------
+
+/\S*\d/BZ
+------------------------------------------------------------------
+        Bra
+        \S*
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/\S*\D/BZ
+------------------------------------------------------------------
+        Bra
+        \S*
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+
+/\S*\s/BZ
+------------------------------------------------------------------
+        Bra
+        \S*+
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+
+/\S*\S/BZ
+------------------------------------------------------------------
+        Bra
+        \S*
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+
+/\S*\w/BZ
+------------------------------------------------------------------
+        Bra
+        \S*
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/\S*\W/BZ
+------------------------------------------------------------------
+        Bra
+        \S*
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w*a/BZ
+------------------------------------------------------------------
+        Bra
+        \w*
+        a
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w*2/BZ
+------------------------------------------------------------------
+        Bra
+        \w*
+        2
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w*\d/BZ
+------------------------------------------------------------------
+        Bra
+        \w*
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w*\D/BZ
+------------------------------------------------------------------
+        Bra
+        \w*
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w*\s/BZ
+------------------------------------------------------------------
+        Bra
+        \w*+
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w*\S/BZ
+------------------------------------------------------------------
+        Bra
+        \w*
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w*\w/BZ
+------------------------------------------------------------------
+        Bra
+        \w*
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w*\W/BZ
+------------------------------------------------------------------
+        Bra
+        \w*+
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+
+/\W*a/BZ
+------------------------------------------------------------------
+        Bra
+        \W*+
+        a
+        Ket
+        End
+------------------------------------------------------------------
+
+/\W*2/BZ
+------------------------------------------------------------------
+        Bra
+        \W*+
+        2
+        Ket
+        End
+------------------------------------------------------------------
+
+/\W*\d/BZ
+------------------------------------------------------------------
+        Bra
+        \W*+
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/\W*\D/BZ
+------------------------------------------------------------------
+        Bra
+        \W*
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+
+/\W*\s/BZ
+------------------------------------------------------------------
+        Bra
+        \W*
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+
+/\W*\S/BZ
+------------------------------------------------------------------
+        Bra
+        \W*
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+
+/\W*\w/BZ
+------------------------------------------------------------------
+        Bra
+        \W*+
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/\W*\W/BZ
+------------------------------------------------------------------
+        Bra
+        \W*
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^a]+a/BZ
+------------------------------------------------------------------
+        Bra
+        [^a]++
+        a
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^a]+a/BZi
+------------------------------------------------------------------
+        Bra
+        [^A]++
+     NC a
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^a]+A/BZi
+------------------------------------------------------------------
+        Bra
+        [^A]++
+     NC A
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^a]+b/BZ
+------------------------------------------------------------------
+        Bra
+        [^a]+
+        b
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^a]+\d/BZ
+------------------------------------------------------------------
+        Bra
+        [^a]+
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/a*[^a]/BZ
+------------------------------------------------------------------
+        Bra
+        a*
+        [^a]
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?Px)(?Py)/I
+Capturing subpattern count = 2
+Named capturing subpatterns:
+  abc   1
+  xyz   2
+No options
+First char = 'x'
+Need char = 'y'
+    xy\Cabc\Cxyz
+ 0: xy
+ 1: x
+ 2: y
+  C x (1) abc
+  C y (1) xyz
+
+/(?x)(?'xyz'y)/I
+Capturing subpattern count = 2
+Named capturing subpatterns:
+  abc   1
+  xyz   2
+No options
+First char = 'x'
+Need char = 'y'
+    xy\Cabc\Cxyz
+ 0: xy
+ 1: x
+ 2: y
+  C x (1) abc
+  C y (1) xyz
+
+/(?x)(?'xyz>y)/I
+Failed: syntax error in subpattern name (missing terminator) at offset 15
+
+/(?P'abc'x)(?Py)/I
+Failed: unrecognized character after (?P at offset 3
+
+/^(?:(?(ZZ)a|b)(?X))+/
+    bXaX
+ 0: bXaX
+ 1: X
+    bXbX
+ 0: bX
+ 1: X
+    ** Failers
+No match
+    aXaX
+No match
+    aXbX
+No match
+
+/^(?P>abc)(?xxx)/
+Failed: reference to non-existent subpattern at offset 8
+
+/^(?P>abc)(?x|y)/
+    xx
+ 0: xx
+ 1: x
+    xy
+ 0: xy
+ 1: y
+    yy
+ 0: yy
+ 1: y
+    yx
+ 0: yx
+ 1: x
+
+/^(?P>abc)(?Px|y)/
+    xx
+ 0: xx
+ 1: x
+    xy
+ 0: xy
+ 1: y
+    yy
+ 0: yy
+ 1: y
+    yx
+ 0: yx
+ 1: x
+
+/^((?(abc)a|b)(?x|y))+/
+    bxay
+ 0: bxay
+ 1: ay
+ 2: y
+    bxby
+ 0: bx
+ 1: bx
+ 2: x
+    ** Failers
+No match
+    axby
+No match
+
+/^(((?P=abc)|X)(?x|y))+/
+    XxXxxx
+ 0: XxXxxx
+ 1: xx
+ 2: x
+ 3: x
+    XxXyyx
+ 0: XxXyyx
+ 1: yx
+ 2: y
+ 3: x
+    XxXyxx
+ 0: XxXy
+ 1: Xy
+ 2: X
+ 3: y
+    ** Failers
+No match
+    x
+No match
+
+/^(?1)(abc)/
+    abcabc
+ 0: abcabc
+ 1: abc
+
+/^(?:(?:\1|X)(a|b))+/
+    Xaaa
+ 0: Xaaa
+ 1: a
+    Xaba
+ 0: Xa
+ 1: a
+
+/^[\E\Qa\E-\Qz\E]+/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        [a-z]+
+        Ket
+        End
+------------------------------------------------------------------
+
+/^[a\Q]bc\E]/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        [\]a-c]
+        Ket
+        End
+------------------------------------------------------------------
+
+/^[a-\Q\E]/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        [\-a]
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(?P>abc)[()](?)/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Once
+        Recurse
+        Ket
+        [()]
+        CBra 1
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/^((?(abc)y)[()](?Px))+/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        CBra 1
+        Cond
+      2 Cond ref
+        y
+        Ket
+        [()]
+        CBra 2
+        x
+        Ket
+        KetRmax
+        Ket
+        End
+------------------------------------------------------------------
+    (xy)x
+ 0: (xy)x
+ 1: y)x
+ 2: x
+
+/^(?P>abc)\Q()\E(?)/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Once
+        Recurse
+        Ket
+        ()
+        CBra 1
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(?P>abc)[a\Q(]\E(](?)/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Once
+        Recurse
+        Ket
+        [(\]a]
+        CBra 1
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(?P>abc) # this is (a comment)
+  (?)/BZx
+------------------------------------------------------------------
+        Bra
+        ^
+        Once
+        Recurse
+        Ket
+        CBra 1
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/^\W*(?:(?(?.)\W*(?&one)\W*\k|)|(?(?.)\W*(?&three)\W*\k'four'|\W*.\W*))\W*$/Ii
+Capturing subpattern count = 4
+Max back reference = 4
+Named capturing subpatterns:
+  four    4
+  one     1
+  three   3
+  two     2
+Partial matching not supported
+Options: anchored caseless
+No first char
+No need char
+    1221
+ 0: 1221
+ 1: 1221
+ 2: 1
+    Satan, oscillate my metallic sonatas!
+ 0: Satan, oscillate my metallic sonatas!
+ 1: 
+ 2: 
+ 3: Satan, oscillate my metallic sonatas
+ 4: S
+    A man, a plan, a canal: Panama!
+ 0: A man, a plan, a canal: Panama!
+ 1: 
+ 2: 
+ 3: A man, a plan, a canal: Panama
+ 4: A
+    Able was I ere I saw Elba.
+ 0: Able was I ere I saw Elba.
+ 1: 
+ 2: 
+ 3: Able was I ere I saw Elba
+ 4: A
+    *** Failers
+No match
+    The quick brown fox
+No match
+
+/(?=(\w+))\1:/I
+Capturing subpattern count = 1
+Max back reference = 1
+Partial matching not supported
+No options
+No first char
+Need char = ':'
+    abcd:
+ 0: abcd:
+ 1: abcd
+
+/(?=(?'abc'\w+))\k:/I
+Capturing subpattern count = 1
+Max back reference = 1
+Named capturing subpatterns:
+  abc   1
+Partial matching not supported
+No options
+No first char
+Need char = ':'
+    abcd:
+ 0: abcd:
+ 1: abcd
+
+/(?'abc'\w+):\k{2}/
+    a:aaxyz
+ 0: a:aa
+ 1: a
+    ab:ababxyz
+ 0: ab:abab
+ 1: ab
+    ** Failers
+No match
+    a:axyz
+No match
+    ab:abxyz
+No match
+
+/(?'abc'a|b)(?d|e)\k{2}/J
+    adaa
+ 0: adaa
+ 1: a
+ 2: d
+    ** Failers
+No match
+    addd
+No match
+    adbb
+No match
+
+/(?'abc'a|b)(?d|e)(?&abc){2}/J
+    bdaa
+ 0: bdaa
+ 1: b
+ 2: d
+    bdab
+ 0: bdab
+ 1: b
+ 2: d
+    ** Failers
+No match
+    bddd
+No match
+
+/^(?a)? (?()b|c) (?('ab')d|e)/x
+    abd
+ 0: abd
+ 1: a
+    ce
+ 0: ce
+
+/(?( (?'B' abc (?(R) (?(R&A)1) (?(R&B)2) X  |  (?1)  (?2)   (?R) ))) /x
+    abcabc1Xabc2XabcXabcabc
+ 0: abcabc1Xabc2XabcX
+ 1: abcabc1Xabc2XabcX
+ 2: abcabc1Xabc2XabcX
+
+/(? (?'B' abc (?(R) (?(R&1)1) (?(R&B)2) X  |  (?1)  (?2)   (?R) ))) /x
+Failed: reference to non-existent subpattern at offset 29
+
+/(?<1> (?'B' abc (?(R) (?(R&1)1) (?(R&B)2) X  |  (?1)  (?2)   (?R) ))) /x
+    abcabc1Xabc2XabcXabcabc
+ 0: abcabc1Xabc2XabcX
+ 1: abcabc1Xabc2XabcX
+ 2: abcabc1Xabc2XabcX
+
+/^(?(DEFINE) (? a) (? b) )  (?&A) (?&B) /x
+    abcd
+ 0: ab
+ 1: 
+ 2: 
+
+/(?(?&NAME_PAT))\s+(?(?&ADDRESS_PAT))
+  (?(DEFINE)
+  (?[a-z]+)
+  (?\d+)
+  )/x
+    metcalfe 33
+ 0: metcalfe 33
+ 1: metcalfe
+ 2: 33
+ 3: 
+ 4: 
+
+/^(?(DEFINE) abc | xyz ) /x
+Failed: DEFINE group contains more than one branch at offset 22
+
+/(?(DEFINE) abc) xyz/xI
+Capturing subpattern count = 0
+Options: extended
+First char = 'x'
+Need char = 'z'
+
+/(?(DEFINE) abc){3} xyz/x
+Failed: repeating a DEFINE group is not allowed at offset 17
+
+/(a|)*\d/
+  \O0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  \O0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+Matched, but too many substrings
+
+/^a.b/
+    a\rb
+ 0: a\x0db
+    a\nb\
+ 0: a\x0ab
+    a\x85b\ 
+ 0: a\x85b
+    ** Failers
+No match
+    a\nb
+No match
+    a\nb\
+No match
+    a\rb\
+No match
+    a\rb\
+No match
+    a\x85b\ 
+No match
+    a\rb\
+No match
+
+/^abc./mgx
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x85abc7 JUNK
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc7
+
+/abc.$/mgx
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc7 abc9
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc9
+
+/a/
+
+/a/
+Failed: inconsistent NEWLINE options at offset 0
+
+/^a\Rb/
+    a\nb
+ 0: a\x0ab
+    a\rb
+ 0: a\x0db
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x0bb
+ 0: a\x0bb
+    a\x0cb
+ 0: a\x0cb
+    a\x85b
+ 0: a\x85b
+    ** Failers
+No match
+    a\n\rb
+No match
+
+/^a\R*b/
+    ab
+ 0: ab
+    a\nb
+ 0: a\x0ab
+    a\rb
+ 0: a\x0db
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x0bb
+ 0: a\x0bb
+    a\x0cb
+ 0: a\x0cb
+    a\x85b
+ 0: a\x85b
+    a\n\rb
+ 0: a\x0a\x0db
+    a\n\r\x85\x0cb
+ 0: a\x0a\x0d\x85\x0cb
+
+/^a\R+b/
+    a\nb
+ 0: a\x0ab
+    a\rb
+ 0: a\x0db
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x0bb
+ 0: a\x0bb
+    a\x0cb
+ 0: a\x0cb
+    a\x85b
+ 0: a\x85b
+    a\n\rb
+ 0: a\x0a\x0db
+    a\n\r\x85\x0cb
+ 0: a\x0a\x0d\x85\x0cb
+    ** Failers
+No match
+    ab
+No match
+
+/^a\R{1,3}b/
+    a\nb
+ 0: a\x0ab
+    a\n\rb
+ 0: a\x0a\x0db
+    a\n\r\x85b
+ 0: a\x0a\x0d\x85b
+    a\r\n\r\nb
+ 0: a\x0d\x0a\x0d\x0ab
+    a\r\n\r\n\r\nb
+ 0: a\x0d\x0a\x0d\x0a\x0d\x0ab
+    a\n\r\n\rb
+ 0: a\x0a\x0d\x0a\x0db
+    a\n\n\r\nb
+ 0: a\x0a\x0a\x0d\x0ab
+    ** Failers
+No match
+    a\n\n\n\rb
+No match
+    a\r
+No match
+
+/^a[\R]b/
+    aRb
+ 0: aRb
+    ** Failers
+No match
+    a\nb
+No match
+
+/(?&abc)X(?P)/I
+Capturing subpattern count = 1
+Named capturing subpatterns:
+  abc   1
+No options
+No first char
+Need char = 'P'
+    abcPXP123
+ 0: PXP
+ 1: P
+
+/(?1)X(?P)/I
+Capturing subpattern count = 1
+Named capturing subpatterns:
+  abc   1
+No options
+No first char
+Need char = 'P'
+    abcPXP123
+ 0: PXP
+ 1: P
+
+/(?(DEFINE)(?2[0-4]\d|25[0-5]|1\d\d|[1-9]?\d))\b(?&byte)(\.(?&byte)){3}/
+    1.2.3.4
+ 0: 1.2.3.4
+ 1: 
+ 2: .4
+    131.111.10.206
+ 0: 131.111.10.206
+ 1: 
+ 2: .206
+    10.0.0.0
+ 0: 10.0.0.0
+ 1: 
+ 2: .0
+    ** Failers
+No match
+    10.6
+No match
+    455.3.4.5
+No match
+
+/\b(?&byte)(\.(?&byte)){3}(?(DEFINE)(?2[0-4]\d|25[0-5]|1\d\d|[1-9]?\d))/
+    1.2.3.4
+ 0: 1.2.3.4
+ 1: .4
+ 2: 
+    131.111.10.206
+ 0: 131.111.10.206
+ 1: .206
+ 2: 
+    10.0.0.0
+ 0: 10.0.0.0
+ 1: .0
+ 2: 
+    ** Failers
+No match
+    10.6
+No match
+    455.3.4.5
+No match
+
+/(?:a(?&abc)b)*(?x)/
+    123axbaxbaxbx456
+ 0: axbaxbaxbx
+ 1: x
+    123axbaxbaxb456
+ 0: x
+ 1: x
+
+/(?:a(?&abc)b){1,5}(?x)/
+    123axbaxbaxbx456
+ 0: axbaxbaxbx
+ 1: x
+
+/(?:a(?&abc)b){2,5}(?x)/
+    123axbaxbaxbx456
+ 0: axbaxbaxbx
+ 1: x
+
+/(?:a(?&abc)b){2,}(?x)/
+    123axbaxbaxbx456
+ 0: axbaxbaxbx
+ 1: x
+
+/(abc)(?i:(?1))/
+   defabcabcxyz
+ 0: abcabc
+ 1: abc
+   DEFabcABCXYZ
+No match
+
+/(abc)(?:(?i)(?1))/
+   defabcabcxyz
+ 0: abcabc
+ 1: abc
+   DEFabcABCXYZ
+No match
+
+/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
+    ababababbbabZXXXX
+ 0: ababababbbabZ
+ 1: ab
+ 2: b
+
+/^(a)\g-2/
+Failed: reference to non-existent subpattern at offset 7
+
+/^(a)\g/
+Failed: a numbered reference must not be zero at offset 5
+
+/^(a)\g{0}/
+Failed: a numbered reference must not be zero at offset 8
+
+/^(a)\g{3/
+Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 8
+
+/^(a)\g{4a}/
+Failed: reference to non-existent subpattern at offset 9
+
+/^a.b/
+    a\rb
+ 0: a\x0db
+    *** Failers
+No match
+    a\nb
+No match
+
+/.+foo/
+    afoo
+ 0: afoo
+    ** Failers
+No match
+    \r\nfoo
+No match
+    \nfoo
+No match
+
+/.+foo/
+    afoo
+ 0: afoo
+    \nfoo
+ 0: \x0afoo
+    ** Failers
+No match
+    \r\nfoo
+No match
+
+/.+foo/
+    afoo
+ 0: afoo
+    ** Failers
+No match
+    \nfoo
+No match
+    \r\nfoo
+No match
+
+/.+foo/s
+    afoo
+ 0: afoo
+    \r\nfoo
+ 0: \x0d\x0afoo
+    \nfoo
+ 0: \x0afoo
+    
+/^$/mg
+    abc\r\rxyz
+ 0: 
+    abc\n\rxyz  
+ 0: 
+    ** Failers 
+No match
+    abc\r\nxyz
+No match
+
+/(?m)^$/g+
+    abc\r\n\r\n
+ 0: 
+ 0+ \x0d\x0a
+
+/(?m)^$|^\r\n/g+ 
+    abc\r\n\r\n
+ 0: 
+ 0+ \x0d\x0a
+ 0: \x0d\x0a
+ 0+ 
+    
+/(?m)$/g+ 
+    abc\r\n\r\n
+ 0: 
+ 0+ \x0d\x0a\x0d\x0a
+ 0: 
+ 0+ \x0d\x0a
+ 0: 
+ 0+ 
+
+/abc.$/mgx
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc9
+ 0: abc1
+ 0: abc4
+ 0: abc5
+ 0: abc9
+
+/^X/m
+    XABC
+ 0: X
+    ** Failers 
+No match
+    XABC\B
+No match
+
+/(ab|c)(?-1)/BZ
+------------------------------------------------------------------
+        Bra
+        CBra 1
+        ab
+        Alt
+        c
+        Ket
+        Once
+        Recurse
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+    abc
+ 0: abc
+ 1: ab
+
+/xy(?+1)(abc)/BZ
+------------------------------------------------------------------
+        Bra
+        xy
+        Once
+        Recurse
+        Ket
+        CBra 1
+        abc
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+    xyabcabc
+ 0: xyabcabc
+ 1: abc
+    ** Failers
+No match
+    xyabc  
+No match
+    
+/x(?-0)y/
+Failed: a numbered reference must not be zero at offset 5
+
+/x(?-1)y/
+Failed: reference to non-existent subpattern at offset 5
+
+/x(?+0)y/ 
+Failed: a numbered reference must not be zero at offset 5
+
+/x(?+1)y/
+Failed: reference to non-existent subpattern at offset 5
+
+/^(abc)?(?(-1)X|Y)/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Brazero
+        CBra 1
+        abc
+        Ket
+        Cond
+      1 Cond ref
+        X
+        Alt
+        Y
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+    abcX
+ 0: abcX
+ 1: abc
+    Y
+ 0: Y
+    ** Failers
+No match
+    abcY   
+No match
+    
+/^((?(+1)X|Y)(abc))+/BZ 
+------------------------------------------------------------------
+        Bra
+        ^
+        CBra 1
+        Cond
+      2 Cond ref
+        X
+        Alt
+        Y
+        Ket
+        CBra 2
+        abc
+        Ket
+        KetRmax
+        Ket
+        End
+------------------------------------------------------------------
+    YabcXabc
+ 0: YabcXabc
+ 1: Xabc
+ 2: abc
+    YabcXabcXabc
+ 0: YabcXabcXabc
+ 1: Xabc
+ 2: abc
+    ** Failers
+No match
+    XabcXabc  
+No match
+
+/(?(-1)a)/BZ
+Failed: reference to non-existent subpattern at offset 6
+
+/((?(-1)a))/BZ
+------------------------------------------------------------------
+        Bra
+        CBra 1
+        Cond
+      1 Cond ref
+        a
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/((?(-2)a))/BZ
+Failed: reference to non-existent subpattern at offset 7
+
+/^(?(+1)X|Y)(.)/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Cond
+      1 Cond ref
+        X
+        Alt
+        Y
+        Ket
+        CBra 1
+        Any
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+    Y!
+ 0: Y!
+ 1: !
+
+/(foo)\Kbar/
+    foobar
+ 0: bar
+ 1: foo
+   
+/(foo)(\Kbar|baz)/
+    foobar
+ 0: bar
+ 1: foo
+ 2: bar
+    foobaz 
+ 0: foobaz
+ 1: foo
+ 2: baz
+
+/(foo\Kbar)baz/
+    foobarbaz
+ 0: barbaz
+ 1: foobar
+
+/(?tom|bon)-\k{A}/
+    tom-tom
+ 0: tom-tom
+ 1: tom
+    bon-bon 
+ 0: bon-bon
+ 1: bon
+    ** Failers
+No match
+    tom-bon  
+No match
+
+/(?tom|bon)-\g{A}/
+    tom-tom
+ 0: tom-tom
+ 1: tom
+    bon-bon 
+ 0: bon-bon
+ 1: bon
+    
+/\g{A/ 
+Failed: syntax error in subpattern name (missing terminator) at offset 4
+
+/(?|(abc)|(xyz))/BZ
+------------------------------------------------------------------
+        Bra
+        Bra
+        CBra 1
+        abc
+        Ket
+        Alt
+        CBra 1
+        xyz
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+   >abc<
+ 0: abc
+ 1: abc
+   >xyz< 
+ 0: xyz
+ 1: xyz
+
+/(x)(?|(abc)|(xyz))(x)/BZ
+------------------------------------------------------------------
+        Bra
+        CBra 1
+        x
+        Ket
+        Bra
+        CBra 2
+        abc
+        Ket
+        Alt
+        CBra 2
+        xyz
+        Ket
+        Ket
+        CBra 3
+        x
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+    xabcx
+ 0: xabcx
+ 1: x
+ 2: abc
+ 3: x
+    xxyzx 
+ 0: xxyzx
+ 1: x
+ 2: xyz
+ 3: x
+
+/(x)(?|(abc)(pqr)|(xyz))(x)/BZ
+------------------------------------------------------------------
+        Bra
+        CBra 1
+        x
+        Ket
+        Bra
+        CBra 2
+        abc
+        Ket
+        CBra 3
+        pqr
+        Ket
+        Alt
+        CBra 2
+        xyz
+        Ket
+        Ket
+        CBra 4
+        x
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+    xabcpqrx
+ 0: xabcpqrx
+ 1: x
+ 2: abc
+ 3: pqr
+ 4: x
+    xxyzx 
+ 0: xxyzx
+ 1: x
+ 2: xyz
+ 3: 
+ 4: x
+
+/(?|(abc)|(xyz))\1/
+    abcabc
+ 0: abcabc
+ 1: abc
+    xyzxyz 
+ 0: xyzxyz
+ 1: xyz
+    ** Failers
+No match
+    abcxyz
+No match
+    xyzabc   
+No match
+    
+/(?|(abc)|(xyz))(?1)/
+    abcabc
+ 0: abcabc
+ 1: abc
+    xyzabc 
+ 0: xyzabc
+ 1: xyz
+    ** Failers 
+No match
+    xyzxyz 
+No match
+ 
+/\H\h\V\v/
+    X X\x0a
+ 0: X X\x0a
+    X\x09X\x0b
+ 0: X\x09X\x0b
+    ** Failers
+No match
+    \xa0 X\x0a   
+No match
+    
+/\H*\h+\V?\v{3,4}/ 
+    \x09\x20\xa0X\x0a\x0b\x0c\x0d\x0a
+ 0: \x09 \xa0X\x0a\x0b\x0c\x0d
+    \x09\x20\xa0\x0a\x0b\x0c\x0d\x0a
+ 0: \x09 \xa0\x0a\x0b\x0c\x0d
+    \x09\x20\xa0\x0a\x0b\x0c
+ 0: \x09 \xa0\x0a\x0b\x0c
+    ** Failers 
+No match
+    \x09\x20\xa0\x0a\x0b
+No match
+     
+/\H{3,4}/
+    XY  ABCDE
+ 0: ABCD
+    XY  PQR ST 
+ 0: PQR
+    
+/.\h{3,4}./
+    XY  AB    PQRS
+ 0: B    P
+
+/\h*X\h?\H+Y\H?Z/
+    >XNNNYZ
+ 0: XNNNYZ
+    >  X NYQZ
+ 0:   X NYQZ
+    ** Failers
+No match
+    >XYZ   
+No match
+    >  X NY Z
+No match
+
+/\v*X\v?Y\v+Z\V*\x0a\V+\x0b\V{2,3}\x0c/
+    >XY\x0aZ\x0aA\x0bNN\x0c
+ 0: XY\x0aZ\x0aA\x0bNN\x0c
+    >\x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+ 0: \x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+
+/[\h]/BZ
+------------------------------------------------------------------
+        Bra
+        [\x09 \xa0]
+        Ket
+        End
+------------------------------------------------------------------
+    >\x09<
+ 0: \x09
+
+/[\h]+/BZ
+------------------------------------------------------------------
+        Bra
+        [\x09 \xa0]+
+        Ket
+        End
+------------------------------------------------------------------
+    >\x09\x20\xa0<
+ 0: \x09 \xa0
+
+/[\v]/BZ
+------------------------------------------------------------------
+        Bra
+        [\x0a-\x0d\x85]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\H]/BZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x08\x0a-\x1f!-\x9f\xa1-\xff]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^\h]/BZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x08\x0a-\x1f!-\x9f\xa1-\xff] (neg)
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\V]/BZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x09\x0e-\x84\x86-\xff]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\x0a\V]/BZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x0a\x0e-\x84\x86-\xff]
+        Ket
+        End
+------------------------------------------------------------------
+
+/\H++X/BZ
+------------------------------------------------------------------
+        Bra
+        \H++
+        X
+        Ket
+        End
+------------------------------------------------------------------
+    ** Failers
+No match
+    XXXX
+No match
+    
+/\H+\hY/BZ
+------------------------------------------------------------------
+        Bra
+        \H++
+        \h
+        Y
+        Ket
+        End
+------------------------------------------------------------------
+    XXXX Y 
+ 0: XXXX Y
+
+/\H+ Y/BZ
+------------------------------------------------------------------
+        Bra
+        \H++
+         Y
+        Ket
+        End
+------------------------------------------------------------------
+
+/\h+A/BZ
+------------------------------------------------------------------
+        Bra
+        \h++
+        A
+        Ket
+        End
+------------------------------------------------------------------
+
+/\v*B/BZ
+------------------------------------------------------------------
+        Bra
+        \v*+
+        B
+        Ket
+        End
+------------------------------------------------------------------
+
+/\V+\x0a/BZ
+------------------------------------------------------------------
+        Bra
+        \V++
+        \x0a
+        Ket
+        End
+------------------------------------------------------------------
+
+/A+\h/BZ
+------------------------------------------------------------------
+        Bra
+        A++
+        \h
+        Ket
+        End
+------------------------------------------------------------------
+
+/ *\H/BZ
+------------------------------------------------------------------
+        Bra
+         *+
+        \H
+        Ket
+        End
+------------------------------------------------------------------
+
+/A*\v/BZ
+------------------------------------------------------------------
+        Bra
+        A*+
+        \v
+        Ket
+        End
+------------------------------------------------------------------
+
+/\x0b*\V/BZ
+------------------------------------------------------------------
+        Bra
+        \x0b*+
+        \V
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d+\h/BZ
+------------------------------------------------------------------
+        Bra
+        \d++
+        \h
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*\v/BZ
+------------------------------------------------------------------
+        Bra
+        \d*+
+        \v
+        Ket
+        End
+------------------------------------------------------------------
+
+/S+\h\S+\v/BZ
+------------------------------------------------------------------
+        Bra
+        S++
+        \h
+        \S++
+        \v
+        Ket
+        End
+------------------------------------------------------------------
+
+/\w{3,}\h\w+\v/BZ
+------------------------------------------------------------------
+        Bra
+        \w{3}
+        \w*+
+        \h
+        \w++
+        \v
+        Ket
+        End
+------------------------------------------------------------------
+
+/\h+\d\h+\w\h+\S\h+\H/BZ
+------------------------------------------------------------------
+        Bra
+        \h++
+        \d
+        \h++
+        \w
+        \h++
+        \S
+        \h++
+        \H
+        Ket
+        End
+------------------------------------------------------------------
+
+/\v+\d\v+\w\v+\S\v+\V/BZ
+------------------------------------------------------------------
+        Bra
+        \v++
+        \d
+        \v++
+        \w
+        \v+
+        \S
+        \v++
+        \V
+        Ket
+        End
+------------------------------------------------------------------
+
+/\H+\h\H+\d/BZ
+------------------------------------------------------------------
+        Bra
+        \H++
+        \h
+        \H+
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/\V+\v\V+\w/BZ
+------------------------------------------------------------------
+        Bra
+        \V++
+        \v
+        \V+
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+
+/\( (?: [^()]* | (?R) )* \)/x
+(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(00)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)
+ 0: (0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(00)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)
+
+/[\E]AAA/
+Failed: missing terminating ] for character class at offset 7
+
+/[\Q\E]AAA/
+Failed: missing terminating ] for character class at offset 9
+
+/[^\E]AAA/
+Failed: missing terminating ] for character class at offset 8
+
+/[^\Q\E]AAA/
+Failed: missing terminating ] for character class at offset 10
+
+/[\E^]AAA/
+Failed: missing terminating ] for character class at offset 8
+
+/[\Q\E^]AAA/
+Failed: missing terminating ] for character class at offset 10
+
+/A(*PRUNE)B(*SKIP)C(*THEN)D(*COMMIT)E(*F)F(*FAIL)G(?!)H(*ACCEPT)I/BZ
+------------------------------------------------------------------
+        Bra
+        A
+        *PRUNE
+        B
+        *SKIP
+        C
+        *THEN
+        D
+        *COMMIT
+        E
+        *FAIL
+        F
+        *FAIL
+        G
+        *FAIL
+        H
+        *ACCEPT
+        I
+        Ket
+        End
+------------------------------------------------------------------
+
+/^a+(*FAIL)/
+    aaaaaa
+No match
+    
+/a+b?c+(*FAIL)/
+    aaabccc
+No match
+
+/a+b?(*PRUNE)c+(*FAIL)/
+    aaabccc
+No match
+
+/a+b?(*COMMIT)c+(*FAIL)/
+    aaabccc
+No match
+    
+/a+b?(*SKIP)c+(*FAIL)/
+    aaabcccaaabccc
+No match
+
+/^(?:aaa(*THEN)\w{6}|bbb(*THEN)\w{5}|ccc(*THEN)\w{4}|\w{3})/
+    aaaxxxxxx
+ 0: aaaxxxxxx
+    aaa++++++ 
+ 0: aaa
+    bbbxxxxx
+ 0: bbbxxxxx
+    bbb+++++ 
+ 0: bbb
+    cccxxxx
+ 0: cccxxxx
+    ccc++++ 
+ 0: ccc
+    dddddddd   
+ 0: ddd
+
+/^(aaa(*THEN)\w{6}|bbb(*THEN)\w{5}|ccc(*THEN)\w{4}|\w{3})/
+    aaaxxxxxx
+ 0: aaaxxxxxx
+ 1: aaaxxxxxx
+    aaa++++++ 
+ 0: aaa
+ 1: aaa
+    bbbxxxxx
+ 0: bbbxxxxx
+ 1: bbbxxxxx
+    bbb+++++ 
+ 0: bbb
+ 1: bbb
+    cccxxxx
+ 0: cccxxxx
+ 1: cccxxxx
+    ccc++++ 
+ 0: ccc
+ 1: ccc
+    dddddddd   
+ 0: ddd
+ 1: ddd
+
+/a+b?(*THEN)c+(*FAIL)/
+    aaabccc
+No match
+
+/(A (A|B(*ACCEPT)|C) D)(E)/x
+    ABX
+ 0: AB
+    AADE
+ 0: AADE
+ 1: AAD
+ 2: A
+ 3: E
+    ACDE
+ 0: ACDE
+ 1: ACD
+ 2: C
+ 3: E
+    ** Failers
+No match
+    AD 
+No match
+        
+/^a+(*FAIL)/C
+    aaaaaa
+--->aaaaaa
+ +0 ^          ^
+ +1 ^          a+
+ +3 ^     ^    (*FAIL)
+ +3 ^    ^     (*FAIL)
+ +3 ^   ^      (*FAIL)
+ +3 ^  ^       (*FAIL)
+ +3 ^ ^        (*FAIL)
+ +3 ^^         (*FAIL)
+No match
+    
+/a+b?c+(*FAIL)/C
+    aaabccc
+--->aaabccc
+ +0 ^           a+
+ +2 ^  ^        b?
+ +4 ^   ^       c+
+ +6 ^      ^    (*FAIL)
+ +6 ^     ^     (*FAIL)
+ +6 ^    ^      (*FAIL)
+ +4 ^  ^        c+
+ +2 ^ ^         b?
+ +4 ^ ^         c+
+ +2 ^^          b?
+ +4 ^^          c+
+ +0  ^          a+
+ +2  ^ ^        b?
+ +4  ^  ^       c+
+ +6  ^     ^    (*FAIL)
+ +6  ^    ^     (*FAIL)
+ +6  ^   ^      (*FAIL)
+ +4  ^ ^        c+
+ +2  ^^         b?
+ +4  ^^         c+
+ +0   ^         a+
+ +2   ^^        b?
+ +4   ^ ^       c+
+ +6   ^    ^    (*FAIL)
+ +6   ^   ^     (*FAIL)
+ +6   ^  ^      (*FAIL)
+ +4   ^^        c+
+No match
+
+/a+b?(*PRUNE)c+(*FAIL)/C
+    aaabccc
+--->aaabccc
+ +0 ^           a+
+ +2 ^  ^        b?
+ +4 ^   ^       (*PRUNE)
++12 ^   ^       c+
++14 ^      ^    (*FAIL)
++14 ^     ^     (*FAIL)
++14 ^    ^      (*FAIL)
+ +0  ^          a+
+ +2  ^ ^        b?
+ +4  ^  ^       (*PRUNE)
++12  ^  ^       c+
++14  ^     ^    (*FAIL)
++14  ^    ^     (*FAIL)
++14  ^   ^      (*FAIL)
+ +0   ^         a+
+ +2   ^^        b?
+ +4   ^ ^       (*PRUNE)
++12   ^ ^       c+
++14   ^    ^    (*FAIL)
++14   ^   ^     (*FAIL)
++14   ^  ^      (*FAIL)
+No match
+
+/a+b?(*COMMIT)c+(*FAIL)/C
+    aaabccc
+--->aaabccc
+ +0 ^           a+
+ +2 ^  ^        b?
+ +4 ^   ^       (*COMMIT)
++13 ^   ^       c+
++15 ^      ^    (*FAIL)
++15 ^     ^     (*FAIL)
++15 ^    ^      (*FAIL)
+No match
+    
+/a+b?(*SKIP)c+(*FAIL)/C
+    aaabcccaaabccc
+--->aaabcccaaabccc
+ +0 ^                  a+
+ +2 ^  ^               b?
+ +4 ^   ^              (*SKIP)
++11 ^   ^              c+
++13 ^      ^           (*FAIL)
++13 ^     ^            (*FAIL)
++13 ^    ^             (*FAIL)
+ +0        ^           a+
+ +2        ^  ^        b?
+ +4        ^   ^       (*SKIP)
++11        ^   ^       c+
++13        ^      ^    (*FAIL)
++13        ^     ^     (*FAIL)
++13        ^    ^      (*FAIL)
+No match
+
+/a+b?(*THEN)c+(*FAIL)/C
+    aaabccc
+--->aaabccc
+ +0 ^           a+
+ +2 ^  ^        b?
+ +4 ^   ^       (*THEN)
++11 ^   ^       c+
++13 ^      ^    (*FAIL)
++13 ^     ^     (*FAIL)
++13 ^    ^      (*FAIL)
+ +0  ^          a+
+ +2  ^ ^        b?
+ +4  ^  ^       (*THEN)
++11  ^  ^       c+
++13  ^     ^    (*FAIL)
++13  ^    ^     (*FAIL)
++13  ^   ^      (*FAIL)
+ +0   ^         a+
+ +2   ^^        b?
+ +4   ^ ^       (*THEN)
++11   ^ ^       c+
++13   ^    ^    (*FAIL)
++13   ^   ^     (*FAIL)
++13   ^  ^      (*FAIL)
+No match
+    
+/a(*PRUNE:XXX)b/
+Failed: (*VERB) with an argument is not supported at offset 8
+
+/a(*MARK)b/ 
+Failed: (*VERB) not recognized at offset 7
+
+/(?i:A{1,}\6666666666)/
+Failed: number is too big at offset 19
+
+/\g6666666666/
+Failed: number is too big at offset 11
+
+/[\g6666666666]/
+Failed: number is too big at offset 12
+
+/(?1)\c[/
+Failed: reference to non-existent subpattern at offset 3
+
+/.+A/
+    \r\nA
+No match
+    
+/\nA/
+    \r\nA 
+ 0: \x0aA
+
+/[\r\n]A/
+    \r\nA 
+ 0: \x0aA
+
+/(\r|\n)A/
+    \r\nA 
+ 0: \x0aA
+ 1: \x0a
+
+/a(*CR)b/
+Failed: (*VERB) not recognized at offset 5
+
+/(*CR)a.b/
+    a\nb
+ 0: a\x0ab
+    ** Failers
+No match
+    a\rb  
+No match
+
+/(*CR)a.b/
+    a\nb
+ 0: a\x0ab
+    ** Failers
+No match
+    a\rb  
+No match
+
+/(*LF)a.b/
+    a\rb
+ 0: a\x0db
+    ** Failers
+No match
+    a\nb  
+No match
+
+/(*CRLF)a.b/
+    a\rb
+ 0: a\x0db
+    a\nb  
+ 0: a\x0ab
+    ** Failers
+No match
+    a\r\nb  
+No match
+
+/(*ANYCRLF)a.b/
+    ** Failers
+No match
+    a\rb
+No match
+    a\nb  
+No match
+    a\r\nb  
+No match
+
+/(*ANY)a.b/
+    ** Failers
+No match
+    a\rb
+No match
+    a\nb  
+No match
+    a\r\nb  
+No match
+    a\x85b 
+No match
+
+/a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_anycrlf
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x0db
+    a\nb
+ 0: a\x0ab
+    a\r\nb
+ 0: a\x0d\x0ab
+    ** Failers
+No match
+    a\x85b
+No match
+    a\x0bb     
+No match
+
+/a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_unicode
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x0db
+    a\nb
+ 0: a\x0ab
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x85b
+ 0: a\x85b
+    a\x0bb     
+ 0: a\x0bb
+    ** Failers 
+No match
+    a\x85b\
+No match
+    a\x0bb\
+No match
+    
+/a\R?b/I
+Capturing subpattern count = 0
+Options: bsr_anycrlf
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x0db
+    a\nb
+ 0: a\x0ab
+    a\r\nb
+ 0: a\x0d\x0ab
+    ** Failers
+No match
+    a\x85b
+No match
+    a\x0bb     
+No match
+
+/a\R?b/I
+Capturing subpattern count = 0
+Options: bsr_unicode
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x0db
+    a\nb
+ 0: a\x0ab
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x85b
+ 0: a\x85b
+    a\x0bb     
+ 0: a\x0bb
+    ** Failers 
+No match
+    a\x85b\
+No match
+    a\x0bb\
+No match
+    
+/a\R{2,4}b/I
+Capturing subpattern count = 0
+Partial matching not supported
+Options: bsr_anycrlf
+First char = 'a'
+Need char = 'b'
+    a\r\n\nb
+ 0: a\x0d\x0a\x0ab
+    a\n\r\rb
+ 0: a\x0a\x0d\x0db
+    a\r\n\r\n\r\n\r\nb
+ 0: a\x0d\x0a\x0d\x0a\x0d\x0a\x0d\x0ab
+    ** Failers
+No match
+    a\x85\85b
+No match
+    a\x0b\0bb     
+No match
+
+/a\R{2,4}b/I
+Capturing subpattern count = 0
+Partial matching not supported
+Options: bsr_unicode
+First char = 'a'
+Need char = 'b'
+    a\r\rb
+ 0: a\x0d\x0db
+    a\n\n\nb
+ 0: a\x0a\x0a\x0ab
+    a\r\n\n\r\rb
+ 0: a\x0d\x0a\x0a\x0d\x0db
+    a\x85\85b
+No match
+    a\x0b\0bb     
+No match
+    ** Failers 
+No match
+    a\r\r\r\r\rb 
+No match
+    a\x85\85b\
+No match
+    a\x0b\0bb\
+No match
+ 
+/(*BSR_ANYCRLF)a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_anycrlf
+First char = 'a'
+Need char = 'b'
+    a\nb
+ 0: a\x0ab
+    a\rb 
+ 0: a\x0db
+
+/(*BSR_UNICODE)a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_unicode
+First char = 'a'
+Need char = 'b'
+    a\x85b
+ 0: a\x85b
+
+/(*BSR_ANYCRLF)(*CRLF)a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_anycrlf
+Forced newline sequence: CRLF
+First char = 'a'
+Need char = 'b'
+    a\nb
+ 0: a\x0ab
+    a\rb 
+ 0: a\x0db
+
+/(*CRLF)(*BSR_UNICODE)a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_unicode
+Forced newline sequence: CRLF
+First char = 'a'
+Need char = 'b'
+    a\x85b
+ 0: a\x85b
+
+/(*CRLF)(*BSR_ANYCRLF)(*CR)ab/I
+Capturing subpattern count = 0
+Options: bsr_anycrlf
+Forced newline sequence: CR
+First char = 'a'
+Need char = 'b'
+
+/(?)(?&)/
+Failed: subpattern name expected at offset 9
+
+/(?)(?&a)/
+Failed: reference to non-existent subpattern at offset 12
+
+/(?)(?&aaaaaaaaaaaaaaaaaaaaaaa)/
+Failed: reference to non-existent subpattern at offset 32
+
+/(?+-a)/
+Failed: digit expected after (?+ at offset 3
+
+/(?-+a)/
+Failed: unrecognized character after (? or (?- at offset 3
+
+/(?(-1))/
+Failed: reference to non-existent subpattern at offset 6
+
+/(?(+10))/
+Failed: reference to non-existent subpattern at offset 7
+
+/(?(10))/
+Failed: reference to non-existent subpattern at offset 6
+
+/(?(+2))()()/
+
+/(?(2))()()/
+
+/\k''/
+Failed: subpattern name expected at offset 3
+
+/\k<>/
+Failed: subpattern name expected at offset 3
+
+/\k{}/
+Failed: subpattern name expected at offset 3
+
+/(?P=)/
+Failed: subpattern name expected at offset 4
+
+/(?P>)/
+Failed: subpattern name expected at offset 4
+
+/(?!\w)(?R)/
+Failed: recursive call could loop indefinitely at offset 9
+
+/(?=\w)(?R)/
+Failed: recursive call could loop indefinitely at offset 9
+
+/(?a|b\gc)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/^(?a|b\g'name'c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/^(a|b\g<1>c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/^(a|b\g'1'c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/^(a|b\g'-1'c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/(^(a|b\g<-1>c))/
+    aaaa
+ 0: a
+ 1: a
+ 2: a
+    bacxxx
+ 0: bac
+ 1: bac
+ 2: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+ 2: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+ 2: bbbaccc
+
+/(^(a|b\g<-1'c))/
+Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 15
+
+/(^(a|b\g{-1}))/
+    bacxxx
+No match
+
+/(?-i:\g)(?i:(?a))/
+    XaaX
+ 0: aa
+ 1: a
+    XAAX 
+ 0: AA
+ 1: A
+
+/(?i:\g)(?-i:(?a))/
+    XaaX
+ 0: aa
+ 1: a
+    ** Failers 
+No match
+    XAAX 
+No match
+
+/(?-i:\g<+1>)(?i:(a))/
+    XaaX
+ 0: aa
+ 1: a
+    XAAX 
+ 0: AA
+ 1: A
+
+/(?=(?(?#simplesyntax)\$(?[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)(?:\[(?[a-zA-Z0-9_\x{7f}-\x{ff}]+|\$\g)\]|->\g(\(.*?\))?)?|(?#simple syntax withbraces)\$\{(?:\g(?\[(?:\g|'(?:\\.|[^'\\])*'|"(?:\g|\\.|[^"\\])*")\])?|\g|\$\{\g\})\}|(?#complexsyntax)\{(?\$(?\g(\g*|\(.*?\))?)(?:->\g)*|\$\g|\$\{\g\})\}))\{/
+
+/(?a|b|c)\g*/
+   abc
+ 0: abc
+ 1: a
+   accccbbb 
+ 0: accccbbb
+ 1: a
+
+/^(?+1)(?x|y){0}z/
+    xzxx
+ 0: xz
+ 1: 
+    yzyy 
+ 0: yz
+ 1: 
+    ** Failers
+No match
+    xxz  
+No match
+
+/(\3)(\1)(a)/
+    cat
+No match
+
+/(\3)(\1)(a)/
+    cat
+ 0: a
+ 1: 
+ 2: 
+ 3: a
+    
+/TA]/
+    The ACTA] comes 
+ 0: TA]
+
+/TA]/
+Failed: ] is an invalid data character in JavaScript compatibility mode at offset 2
+
+/(?2)[]a()b](abc)/
+Failed: reference to non-existent subpattern at offset 3
+
+/(?2)[^]a()b](abc)/
+Failed: reference to non-existent subpattern at offset 3
+
+/(?1)[]a()b](abc)/
+    abcbabc
+ 0: abcbabc
+ 1: abc
+    ** Failers 
+No match
+    abcXabc
+No match
+
+/(?1)[^]a()b](abc)/
+    abcXabc
+ 0: abcXabc
+ 1: abc
+    ** Failers 
+No match
+    abcbabc
+No match
+
+/(?2)[]a()b](abc)(xyz)/
+    xyzbabcxyz
+ 0: xyzbabcxyz
+ 1: abc
+ 2: xyz
+
+/(?&N)[]a(?)](?abc)/
+Failed: reference to non-existent subpattern at offset 4
+
+/(?&N)[]a(?)](abc)/
+Failed: reference to non-existent subpattern at offset 4
+
+/a[]b/
+Failed: missing terminating ] for character class at offset 4
+
+/a[^]b/
+Failed: missing terminating ] for character class at offset 5
+
+/a[]b/
+    ** Failers
+No match
+    ab
+No match
+
+/a[]+b/
+    ** Failers
+No match
+    ab 
+No match
+
+/a[]*+b/
+    ** Failers
+No match
+    ab 
+No match
+
+/a[^]b/
+    aXb
+ 0: aXb
+    a\nb 
+ 0: a\x0ab
+    ** Failers
+No match
+    ab  
+No match
+    
+/a[^]+b/ 
+    aXb
+ 0: aXb
+    a\nX\nXb 
+ 0: a\x0aX\x0aXb
+    ** Failers
+No match
+    ab  
+No match
+
+/a(?!)+b/
+Failed: nothing to repeat at offset 5
+
+/a(*FAIL)+b/
+Failed: nothing to repeat at offset 8
+
+/(abc|pqr|123){0}[xyz]/SI
+Capturing subpattern count = 1
+No options
+No first char
+No need char
+Starting byte set: x y z 
+
+/(?(?=.*b)b|^)/CI
+Capturing subpattern count = 0
+Partial matching not supported
+Options:
+No first char
+No need char
+   adc
+--->adc
+ +0 ^       (?(?=.*b)b|^)
+ +2 ^       (?=.*b)
+ +5 ^       .*
+ +7 ^  ^    b
+ +7 ^ ^     b
+ +7 ^^      b
+ +7 ^       b
++12 ^       )
++13 ^       
+ 0: 
+   abc 
+--->abc
+ +0 ^       (?(?=.*b)b|^)
+ +2 ^       (?=.*b)
+ +5 ^       .*
+ +7 ^  ^    b
+ +7 ^ ^     b
+ +7 ^^      b
+ +8 ^ ^     )
+ +9 ^       b
+ +0  ^      (?(?=.*b)b|^)
+ +2  ^      (?=.*b)
+ +5  ^      .*
+ +7  ^ ^    b
+ +7  ^^     b
+ +7  ^      b
+ +8  ^^     )
+ +9  ^      b
++10  ^^     |
++13  ^^     
+ 0: b
+   
+/(?(?=b).*b|^d)/I
+Capturing subpattern count = 0
+Partial matching not supported
+No options
+No first char
+No need char
+
+/(?(?=.*b).*b|^d)/I
+Capturing subpattern count = 0
+Partial matching not supported
+No options
+First char at start or follows newline
+No need char
+
+/a?|b?/P
+    abc
+ 0: a
+    ** Failers
+ 0: 
+    ddd\N   
+No match: POSIX code 17: match failed
+
+/xyz/C
+  xyz 
+--->xyz
+ +0 ^       x
+ +1 ^^      y
+ +2 ^ ^     z
+ +3 ^  ^    
+ 0: xyz
+  abcxyz 
+--->abcxyz
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+  abcxyz\Y
+--->abcxyz
+ +0 ^          x
+ +0  ^         x
+ +0   ^        x
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+  ** Failers 
+No match
+  abc
+No match
+  abc\Y
+--->abc
+ +0 ^       x
+ +0  ^      x
+ +0   ^     x
+ +0    ^    x
+No match
+  abcxypqr  
+No match
+  abcxypqr\Y  
+--->abcxypqr
+ +0 ^            x
+ +0  ^           x
+ +0   ^          x
+ +0    ^         x
+ +1    ^^        y
+ +2    ^ ^       z
+ +0     ^        x
+ +0      ^       x
+ +0       ^      x
+ +0        ^     x
+ +0         ^    x
+No match
+
+/^"((?(?=[a])[^"])|b)*"$/C
+    "ab"
+--->"ab"
+ +0 ^        ^
+ +1 ^        "
+ +2 ^^       ((?(?=[a])[^"])|b)*
+ +3 ^^       (?(?=[a])[^"])
+ +5 ^^       (?=[a])
+ +8 ^^       [a]
++11 ^ ^      )
++12 ^^       [^"]
++16 ^ ^      )
++17 ^ ^      |
+ +3 ^ ^      (?(?=[a])[^"])
+ +5 ^ ^      (?=[a])
+ +8 ^ ^      [a]
++21 ^ ^      "
++18 ^ ^      b
++19 ^  ^     )
+ +3 ^  ^     (?(?=[a])[^"])
+ +5 ^  ^     (?=[a])
+ +8 ^  ^     [a]
++21 ^  ^     "
++22 ^   ^    $
++23 ^   ^    
+ 0: "ab"
+ 1: 
+
+/^"((?(?=[a])[^"])|b)*"$/
+    "ab"
+ 0: "ab"
+ 1: 
+
+/^X(?5)(a)(?|(b)|(q))(c)(d)(Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: c
+ 4: d
+ 5: Y
+
+/^X(?5)(a)(?|(b)|(q))(c)(d)Y/
+Failed: reference to non-existent subpattern at offset 5
+
+/^X(?&N)(a)(?|(b)|(q))(c)(d)(?Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: c
+ 4: d
+ 5: Y
+ 
+/^X(?7)(a)(?|(b)|(q)(r)(s))(c)(d)(Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: 
+ 4: 
+ 5: c
+ 6: d
+ 7: Y
+
+/^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: 
+ 4: 
+ 5: c
+ 6: d
+ 7: Y
+
+/^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: 
+ 4: 
+ 5: c
+ 6: d
+ 7: Y
+
+/ End of testinput2 /

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput3
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput3	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput3	Mon Jun  8 18:51:30 2009
@@ -146,14 +146,14 @@
     >>>\xba<<< 
  0: ?
     
-/[[:alpha:]][[:lower:]][[:upper:]]/DLfr_FR 
+/[[:alpha:]][[:lower:]][[:upper:]]/DZLfr_FR 
 ------------------------------------------------------------------
-  0 102 Bra 0
-  3     [A-Za-z????-??-??-?]
- 36     [a-z??-??-?]
- 69     [A-Z?-??-?]
-102 102 Ket
-105     End
+        Bra
+        [A-Za-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\xff]
+        [a-z\xb5\xdf-\xf6\xf8-\xff]
+        [A-Z\xc0-\xd6\xd8-\xde]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput4
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput4	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput4	Mon Jun  8 18:51:30 2009
@@ -914,4 +914,179 @@
  0: ab
  1: ab
 
+/a*\x{100}*\w/8
+    a 
+ 0: a
+
+/\S\S/8g
+    A\x{a3}BC
+ 0: A\x{a3}
+ 0: BC
+    
+/\S{2}/8g
+    A\x{a3}BC
+ 0: A\x{a3}
+ 0: BC
+    
+/\W\W/8g
+    +\x{a3}== 
+ 0: +\x{a3}
+ 0: ==
+
+/\W{2}/8g
+    +\x{a3}== 
+ 0: +\x{a3}
+ 0: ==
+
+/\S/8g
+    \x{442}\x{435}\x{441}\x{442}
+ 0: \x{442}
+ 0: \x{435}
+ 0: \x{441}
+ 0: \x{442}
+
+/[\S]/8g
+    \x{442}\x{435}\x{441}\x{442}
+ 0: \x{442}
+ 0: \x{435}
+ 0: \x{441}
+ 0: \x{442}
+
+/\D/8g
+    \x{442}\x{435}\x{441}\x{442}
+ 0: \x{442}
+ 0: \x{435}
+ 0: \x{441}
+ 0: \x{442}
+
+/[\D]/8g
+    \x{442}\x{435}\x{441}\x{442}
+ 0: \x{442}
+ 0: \x{435}
+ 0: \x{441}
+ 0: \x{442}
+
+/\W/8g
+    \x{2442}\x{2435}\x{2441}\x{2442}
+ 0: \x{2442}
+ 0: \x{2435}
+ 0: \x{2441}
+ 0: \x{2442}
+
+/[\W]/8g
+    \x{2442}\x{2435}\x{2441}\x{2442}
+ 0: \x{2442}
+ 0: \x{2435}
+ 0: \x{2441}
+ 0: \x{2442}
+    
+/[\S\s]*/8
+    abc\n\r\x{442}\x{435}\x{441}\x{442}xyz 
+ 0: abc\x{0a}\x{0d}\x{442}\x{435}\x{441}\x{442}xyz
+
+/[\x{41f}\S]/8g
+    \x{442}\x{435}\x{441}\x{442}
+ 0: \x{442}
+ 0: \x{435}
+ 0: \x{441}
+ 0: \x{442}
+
+/.[^\S]./8g
+    abc def\x{442}\x{443}xyz\npqr
+ 0: c d
+ 0: z\x{0a}p
+
+/.[^\S\n]./8g
+    abc def\x{442}\x{443}xyz\npqr
+ 0: c d
+
+/[[:^alnum:]]/8g  
+    +\x{2442}
+ 0: +
+ 0: \x{2442}
+    
+/[[:^alpha:]]/8g 
+    +\x{2442}
+ 0: +
+ 0: \x{2442}
+    
+/[[:^ascii:]]/8g 
+    A\x{442}
+ 0: \x{442}
+    
+/[[:^blank:]]/8g 
+    A\x{442}
+ 0: A
+ 0: \x{442}
+    
+/[[:^cntrl:]]/8g 
+    A\x{442}
+ 0: A
+ 0: \x{442}
+    
+/[[:^digit:]]/8g 
+    A\x{442}
+ 0: A
+ 0: \x{442}
+    
+/[[:^graph:]]/8g 
+    \x19\x{e01ff}
+ 0: \x{19}
+ 0: \x{e01ff}
+    
+/[[:^lower:]]/8g 
+    A\x{422}
+ 0: A
+ 0: \x{422}
+    
+/[[:^print:]]/8g 
+    \x{19}\x{e01ff}
+ 0: \x{19}
+ 0: \x{e01ff}
+    
+/[[:^punct:]]/8g 
+    A\x{442}
+ 0: A
+ 0: \x{442}
+    
+/[[:^space:]]/8g 
+    A\x{442}
+ 0: A
+ 0: \x{442}
+    
+/[[:^upper:]]/8g 
+    a\x{442}
+ 0: a
+ 0: \x{442}
+    
+/[[:^word:]]/8g  
+    +\x{2442}
+ 0: +
+ 0: \x{2442}
+    
+/[[:^xdigit:]]/8g
+    M\x{442}
+ 0: M
+ 0: \x{442}
+
+/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????abcdefghijklmnopqrstuvwxyz???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????\d-_^]/8
+
+/^[^d]*?$/
+    abc
+ 0: abc
+
+/^[^d]*?$/8
+    abc
+ 0: abc
+
+/^[^d]*?$/i
+    abc
+ 0: abc
+
+/^[^d]*?$/8i
+    abc
+ 0: abc
+
+/(?i)[\xc3\xa9\xc3\xbd]|[\xc3\xa9\xc3\xbdA]/8
+
 / End of testinput4 /

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput5
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput5	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput5	Mon Jun  8 18:51:30 2009
@@ -1,114 +1,105 @@
-/\x{100}/8DM
-Memory allocation (code space): 10
+/\x{100}/8DZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{100}
-  6   6 Ket
-  9     End
+        Bra
+        \x{100}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 196
 Need char = 128
 
-/\x{1000}/8DM
-Memory allocation (code space): 11
+/\x{1000}/8DZ
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \x{1000}
-  7   7 Ket
- 10     End
+        Bra
+        \x{1000}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 225
 Need char = 128
 
-/\x{10000}/8DM
-Memory allocation (code space): 12
+/\x{10000}/8DZ
 ------------------------------------------------------------------
-  0   8 Bra 0
-  3     \x{10000}
-  8   8 Ket
- 11     End
+        Bra
+        \x{10000}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 240
 Need char = 128
 
-/\x{100000}/8DM
-Memory allocation (code space): 12
+/\x{100000}/8DZ
 ------------------------------------------------------------------
-  0   8 Bra 0
-  3     \x{100000}
-  8   8 Ket
- 11     End
+        Bra
+        \x{100000}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 244
 Need char = 128
 
-/\x{1000000}/8DM
-Memory allocation (code space): 13
+/\x{1000000}/8DZ
 ------------------------------------------------------------------
-  0   9 Bra 0
-  3     \x{1000000}
-  9   9 Ket
- 12     End
+        Bra
+        \x{1000000}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 249
 Need char = 128
 
-/\x{4000000}/8DM
-Memory allocation (code space): 14
+/\x{4000000}/8DZ
 ------------------------------------------------------------------
-  0  10 Bra 0
-  3     \x{4000000}
- 10  10 Ket
- 13     End
+        Bra
+        \x{4000000}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 252
 Need char = 128
 
-/\x{7fffFFFF}/8DM
-Memory allocation (code space): 14
+/\x{7fffFFFF}/8DZ
 ------------------------------------------------------------------
-  0  10 Bra 0
-  3     \x{7fffffff}
- 10  10 Ket
- 13     End
+        Bra
+        \x{7fffffff}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 253
 Need char = 191
 
-/[\x{ff}]/8DM
-Memory allocation (code space): 10
+/[\x{ff}]/8DZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{ff}
-  6   6 Ket
-  9     End
+        Bra
+        \x{ff}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 195
 Need char = 191
 
-/[\x{100}]/8DM
-Memory allocation (code space): 47
+/[\x{100}]/8DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     [\x{100}]
- 11  11 Ket
- 14     End
+        Bra
+        [\x{100}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -125,36 +116,36 @@
     \x{100}a\x{1234}bcd
  0: \x{100}a\x{1234}
 
-/\x80/8D
+/\x80/8DZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{80}
-  6   6 Ket
-  9     End
+        Bra
+        \x{80}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 194
 Need char = 128
 
-/\xff/8D
+/\xff/8DZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{ff}
-  6   6 Ket
-  9     End
+        Bra
+        \x{ff}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 195
 Need char = 191
 
-/\x{0041}\x{2262}\x{0391}\x{002e}/D8
+/\x{0041}\x{2262}\x{0391}\x{002e}/DZ8
 ------------------------------------------------------------------
-  0  14 Bra 0
-  3     A\x{2262}\x{391}.
- 14  14 Ket
- 17     End
+        Bra
+        A\x{2262}\x{391}.
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -163,12 +154,12 @@
     \x{0041}\x{2262}\x{0391}\x{002e}
  0: A\x{2262}\x{391}.
     
-/\x{D55c}\x{ad6d}\x{C5B4}/D8 
+/\x{D55c}\x{ad6d}\x{C5B4}/DZ8 
 ------------------------------------------------------------------
-  0  15 Bra 0
-  3     \x{d55c}\x{ad6d}\x{c5b4}
- 15  15 Ket
- 18     End
+        Bra
+        \x{d55c}\x{ad6d}\x{c5b4}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -177,12 +168,12 @@
     \x{D55c}\x{ad6d}\x{C5B4} 
  0: \x{d55c}\x{ad6d}\x{c5b4}
 
-/\x{65e5}\x{672c}\x{8a9e}/D8
+/\x{65e5}\x{672c}\x{8a9e}/DZ8
 ------------------------------------------------------------------
-  0  15 Bra 0
-  3     \x{65e5}\x{672c}\x{8a9e}
- 15  15 Ket
- 18     End
+        Bra
+        \x{65e5}\x{672c}\x{8a9e}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -191,74 +182,74 @@
     \x{65e5}\x{672c}\x{8a9e}
  0: \x{65e5}\x{672c}\x{8a9e}
 
-/\x{80}/D8
+/\x{80}/DZ8
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{80}
-  6   6 Ket
-  9     End
+        Bra
+        \x{80}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 194
 Need char = 128
 
-/\x{084}/D8
+/\x{084}/DZ8
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{84}
-  6   6 Ket
-  9     End
+        Bra
+        \x{84}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 194
 Need char = 132
 
-/\x{104}/D8
+/\x{104}/DZ8
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{104}
-  6   6 Ket
-  9     End
+        Bra
+        \x{104}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 196
 Need char = 132
 
-/\x{861}/D8
+/\x{861}/DZ8
 ------------------------------------------------------------------
-  0   7 Bra 0
-  3     \x{861}
-  7   7 Ket
- 10     End
+        Bra
+        \x{861}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 224
 Need char = 161
 
-/\x{212ab}/D8
+/\x{212ab}/DZ8
 ------------------------------------------------------------------
-  0   8 Bra 0
-  3     \x{212ab}
-  8   8 Ket
- 11     End
+        Bra
+        \x{212ab}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 240
 Need char = 171
 
-/.{3,5}X/D8
+/.{3,5}X/DZ8
 ------------------------------------------------------------------
-  0  13 Bra 0
-  3     Any{3}
-  7     Any{0,2}
- 11     X
- 13  13 Ket
- 16     End
+        Bra
+        Any{3}
+        Any{0,2}
+        X
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -269,13 +260,13 @@
  0: \x{212ab}\x{212ab}\x{212ab}\x{861}X
 
 
-/.{3,5}?/D8
+/.{3,5}?/DZ8
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     Any{3}
-  7     Any{0,2}?
- 11  11 Ket
- 14     End
+        Bra
+        Any{3}
+        Any{0,2}?
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -285,11 +276,9 @@
     \x{212ab}\x{212ab}\x{212ab}\x{861}
  0: \x{212ab}\x{212ab}\x{212ab}
 
-/-- These tests are here rather than in testinput4 because Perl 5.6 has --/
-/-- some problems with UTF-8 support, in the area of \x{..} where the   --/
-No match
-/-- value is < 255. It grumbles about invalid UTF-8 strings.            --/
-No match
+/-- These tests are here rather than in testinput4 because Perl 5.6 has some
+problems with UTF-8 support, in the area of \x{..} where the value is < 255. 
+It grumbles about invalid UTF-8 strings. --/
 
 /^[a\x{c0}]b/8
     \x{c0}b
@@ -329,11 +318,9 @@
 /(?<=\C)X/8
 Failed: \C not allowed in lookbehind assertion at offset 6
 
-/-- This one is here not because it's different to Perl, but because the --/
-/-- way the captured single-byte is displayed. (In Perl it becomes a --/
-No match
-/-- character, and you can't tell the difference.) --/
-No match
+/-- This one is here not because it's different to Perl, but because the way
+the captured single-byte is displayed. (In Perl it becomes a character, and you
+can't tell the difference.) --/
     
 /X(\C)(.*)/8
     X\x{1234}
@@ -345,13 +332,13 @@
  1: \x{0a}
  2: abc
     
-/^[ab]/8D
+/^[ab]/8DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [ab]
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [ab]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored utf8
@@ -368,13 +355,13 @@
     \x{100}  
 No match
 
-/^[^ab]/8D
+/^[^ab]/8DZ
 ------------------------------------------------------------------
-  0  37 Bra 0
-  3     ^
-  4     [\x00-`c-\xff] (neg)
- 37  37 Ket
- 40     End
+        Bra
+        ^
+        [\x00-`c-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored utf8
@@ -391,12 +378,12 @@
     aaa
 No match
   
-/[^ab\xC0-\xF0]/8SD
+/[^ab\xC0-\xF0]/8SDZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [\x00-`c-\xbf\xf1-\xff] (neg)
- 36  36 Ket
- 39     End
+        Bra
+        [\x00-`c-\xbf\xf1-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -427,13 +414,13 @@
     \x{f0} 
 No match
 
-/??{3,4}/8SD
+/??{3,4}/8SDZ
 ------------------------------------------------------------------
-  0  13 Bra 0
-  3     \x{100}{3}
-  8     \x{100}{,1}
- 13  13 Ket
- 16     End
+        Bra
+        \x{100}{3}
+        \x{100}?
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -444,16 +431,16 @@
   \x{100}\x{100}\x{100}\x{100\x{100}
  0: \x{100}\x{100}\x{100}
 
-/(\x{100}+|x)/8SD
+/(\x{100}+|x)/8SDZ
 ------------------------------------------------------------------
-  0  17 Bra 0
-  3   6 Bra 1
-  6     \x{100}+
-  9   5 Alt
- 12     x
- 14  11 Ket
- 17  17 Ket
- 20     End
+        Bra
+        CBra 1
+        \x{100}+
+        Alt
+        x
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
@@ -462,17 +449,17 @@
 No need char
 Starting byte set: x \xc4 
 
-/(\x{100}*a|x)/8SD
+/(\x{100}*a|x)/8SDZ
 ------------------------------------------------------------------
-  0  19 Bra 0
-  3   8 Bra 1
-  6     \x{100}*
-  9     a
- 11   5 Alt
- 14     x
- 16  13 Ket
- 19  19 Ket
- 22     End
+        Bra
+        CBra 1
+        \x{100}*+
+        a
+        Alt
+        x
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
@@ -481,17 +468,17 @@
 No need char
 Starting byte set: a x \xc4 
 
-/(\x{100}{0,2}a|x)/8SD
+/(\x{100}{0,2}a|x)/8SDZ
 ------------------------------------------------------------------
-  0  21 Bra 0
-  3  10 Bra 1
-  6     \x{100}{,2}
- 11     a
- 13   5 Alt
- 16     x
- 18  15 Ket
- 21  21 Ket
- 24     End
+        Bra
+        CBra 1
+        \x{100}{0,2}
+        a
+        Alt
+        x
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
@@ -500,18 +487,18 @@
 No need char
 Starting byte set: a x \xc4 
 
-/(\x{100}{1,2}a|x)/8SD
+/(\x{100}{1,2}a|x)/8SDZ
 ------------------------------------------------------------------
-  0  24 Bra 0
-  3  13 Bra 1
-  6     \x{100}
-  9     \x{100}{,1}
- 14     a
- 16   5 Alt
- 19     x
- 21  18 Ket
- 24  24 Ket
- 27     End
+        Bra
+        CBra 1
+        \x{100}
+        \x{100}{0,1}
+        a
+        Alt
+        x
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Partial matching not supported
@@ -544,24 +531,24 @@
     \x{100}\x{100}abcd
 No match
 
-/\x{100}/8D
+/\x{100}/8DZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{100}
-  6   6 Ket
-  9     End
+        Bra
+        \x{100}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 196
 Need char = 128
 
-/\x{100}*/8D
+/\x{100}*/8DZ
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{100}*
-  6   6 Ket
-  9     End
+        Bra
+        \x{100}*
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -569,13 +556,13 @@
 No first char
 No need char
 
-/a\x{100}*/8D
+/a\x{100}*/8DZ
 ------------------------------------------------------------------
-  0   8 Bra 0
-  3     a
-  5     \x{100}*
-  8   8 Ket
- 11     End
+        Bra
+        a
+        \x{100}*
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -583,13 +570,13 @@
 First char = 'a'
 No need char
 
-/ab\x{100}*/8D
+/ab\x{100}*/8DZ
 ------------------------------------------------------------------
-  0  10 Bra 0
-  3     ab
-  7     \x{100}*
- 10  10 Ket
- 13     End
+        Bra
+        ab
+        \x{100}*
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -597,13 +584,13 @@
 First char = 'a'
 Need char = 'b'
 
-/a\x{100}\x{101}*/8D
+/a\x{100}\x{101}*/8DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     a\x{100}
-  8     \x{101}*
- 11  11 Ket
- 14     End
+        Bra
+        a\x{100}
+        \x{101}*
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -611,13 +598,13 @@
 First char = 'a'
 Need char = 128
 
-/a\x{100}\x{101}+/8D
+/a\x{100}\x{101}+/8DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     a\x{100}
-  8     \x{101}+
- 11  11 Ket
- 14     End
+        Bra
+        a\x{100}
+        \x{101}+
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -625,13 +612,13 @@
 First char = 'a'
 Need char = 129
 
-/\x{100}*A/8D
+/\x{100}*A/8DZ
 ------------------------------------------------------------------
-  0   8 Bra 0
-  3     \x{100}*
-  6     A
-  8   8 Ket
- 11     End
+        Bra
+        \x{100}*+
+        A
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -641,16 +628,16 @@
     A
  0: A
 
-/\x{100}*\d(?R)/8D
+/\x{100}*\d(?R)/8DZ
 ------------------------------------------------------------------
-  0  16 Bra 0
-  3     \x{100}*
-  6     \d
-  7   6 Once
- 10   0 Recurse
- 13   6 Ket
- 16  16 Ket
- 19     End
+        Bra
+        \x{100}*+
+        \d
+        Once
+        Recurse
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -658,37 +645,36 @@
 No first char
 No need char
 
-/[^\x{c4}]/D
+/[^\x{c4}]/DZ
 ------------------------------------------------------------------
-  0   5 Bra 0
-  3     [^\xc4]
-  5   5 Ket
-  8     End
+        Bra
+        [^\xc4]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[^\x{c4}]/8D
+/[^\x{c4}]/8DZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [\x00-\xc3\xc5-\xff] (neg)
- 36  36 Ket
- 39     End
+        Bra
+        [\x00-\xc3\xc5-\xff] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 No first char
 No need char
 
-/[\x{100}]/8DM
-Memory allocation (code space): 47
+/[\x{100}]/8DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     [\x{100}]
- 11  11 Ket
- 14     End
+        Bra
+        [\x{100}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -703,13 +689,12 @@
     *** Failers 
 No match
 
-/[Z\x{100}]/8DM
-Memory allocation (code space): 47
+/[Z\x{100}]/8DZ
 ------------------------------------------------------------------
-  0  43 Bra 0
-  3     [Z\x{100}]
- 43  43 Ket
- 46     End
+        Bra
+        [Z\x{100}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -739,24 +724,24 @@
     \x{ff}    
 No match
 
-/[z-\x{100}]/8D
+/[z-\x{100}]/8DZ
 ------------------------------------------------------------------
-  0  12 Bra 0
-  3     [z-\x{100}]
- 12  12 Ket
- 15     End
+        Bra
+        [z-\x{100}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 No first char
 No need char
 
-/[z\Qa-d]??\E]/8D
+/[z\Qa-d]??\E]/8DZ
 ------------------------------------------------------------------
-  0  43 Bra 0
-  3     [\-\]adz\x{100}]
- 43  43 Ket
- 46     End
+        Bra
+        [\-\]adz\x{100}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -767,12 +752,12 @@
     ?? 
  0: \x{100}
 
-/[\xFF]/D
+/[\xFF]/DZ
 ------------------------------------------------------------------
-  0   5 Bra 0
-  3     \xff
-  5   5 Ket
-  8     End
+        Bra
+        \xff
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
@@ -781,12 +766,12 @@
     >\xff<
  0: \xff
 
-/[\xff]/D8
+/[\xff]/DZ8
 ------------------------------------------------------------------
-  0   6 Bra 0
-  3     \x{ff}
-  6   6 Ket
-  9     End
+        Bra
+        \x{ff}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -795,24 +780,24 @@
     >\x{ff}<
  0: \x{ff}
 
-/[^\xFF]/D
+/[^\xFF]/DZ
 ------------------------------------------------------------------
-  0   5 Bra 0
-  3     [^\xff]
-  5   5 Ket
-  8     End
+        Bra
+        [^\xff]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[^\xff]/8D
+/[^\xff]/8DZ
 ------------------------------------------------------------------
-  0  36 Bra 0
-  3     [\x00-\xfe] (neg)
- 36  36 Ket
- 39     End
+        Bra
+        [\x00-\xfe] (neg)
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -852,12 +837,12 @@
 /???xxx/8
 Failed: invalid UTF-8 string at offset 1
 
-/???xxx/8?D
+/???xxx/8?DZ
 ------------------------------------------------------------------
-  0  15 Bra 0
-  3     \X{c0}\X{c0}\X{c0}xxx
- 15  15 Ket
- 18     End
+        Bra
+        \X{c0}\X{c0}\X{c0}xxx
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8 no_utf8_check
@@ -902,178 +887,186 @@
     \xf1\x8f\x80\x80 
 No match
     \xf8\x88\x80\x80\x80  
-No match
+Error -10
     \xf9\x87\x80\x80\x80  
-No match
+Error -10
     \xfc\x84\x80\x80\x80\x80
-No match
+Error -10
     \xfd\x83\x80\x80\x80\x80
+Error -10
+    \?\xf8\x88\x80\x80\x80  
+No match
+    \?\xf9\x87\x80\x80\x80  
+No match
+    \?\xfc\x84\x80\x80\x80\x80
+No match
+    \?\xfd\x83\x80\x80\x80\x80
 No match
 
-/\x{100}abc(xyz(?1))/8D
+/\x{100}abc(xyz(?1))/8DZ
 ------------------------------------------------------------------
-  0  33 Bra 0
-  3     \x{100}abc
- 12  18 Bra 1
- 15     xyz
- 21   6 Once
- 24  12 Recurse
- 27   6 Ket
- 30  18 Ket
- 33  33 Ket
- 36     End
+        Bra
+        \x{100}abc
+        CBra 1
+        xyz
+        Once
+        Recurse
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Options: utf8
 First char = 196
 Need char = 'z'
 
-/[^\x{100}]abc(xyz(?1))/8D
+/[^\x{100}]abc(xyz(?1))/8DZ
 ------------------------------------------------------------------
-  0  38 Bra 0
-  3     [^\x{100}]
- 11     abc
- 17  18 Bra 1
- 20     xyz
- 26   6 Once
- 29  17 Recurse
- 32   6 Ket
- 35  18 Ket
- 38  38 Ket
- 41     End
+        Bra
+        [^\x{100}]
+        abc
+        CBra 1
+        xyz
+        Once
+        Recurse
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Options: utf8
 No first char
 Need char = 'z'
 
-/[ab\x{100}]abc(xyz(?1))/8D
+/[ab\x{100}]abc(xyz(?1))/8DZ
 ------------------------------------------------------------------
-  0  70 Bra 0
-  3     [ab\x{100}]
- 43     abc
- 49  18 Bra 1
- 52     xyz
- 58   6 Once
- 61  49 Recurse
- 64   6 Ket
- 67  18 Ket
- 70  70 Ket
- 73     End
+        Bra
+        [ab\x{100}]
+        abc
+        CBra 1
+        xyz
+        Once
+        Recurse
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Options: utf8
 No first char
 Need char = 'z'
 
-/(\x{100}(b(?2)c))?/D8
+/(\x{100}(b(?2)c))?/DZ8
 ------------------------------------------------------------------
-  0  32 Bra 0
-  3     Brazero
-  4  25 Bra 1
-  7     \x{100}
- 10  16 Bra 2
- 13     b
- 15   6 Once
- 18  10 Recurse
- 21   6 Ket
- 24     c
- 26  16 Ket
- 29  25 Ket
- 32  32 Ket
- 35     End
+        Bra
+        Brazero
+        CBra 1
+        \x{100}
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 Options: utf8
 No first char
 No need char
 
-/(\x{100}(b(?2)c)){0,2}/D8
+/(\x{100}(b(?2)c)){0,2}/DZ8
 ------------------------------------------------------------------
-  0  67 Bra 0
-  3     Brazero
-  4  60 Bra 0
-  7  25 Bra 1
- 10     \x{100}
- 13  16 Bra 2
- 16     b
- 18   6 Once
- 21  13 Recurse
- 24   6 Ket
- 27     c
- 29  16 Ket
- 32  25 Ket
- 35     Brazero
- 36  25 Bra 1
- 39     \x{100}
- 42  16 Bra 2
- 45     b
- 47   6 Once
- 50  13 Recurse
- 53   6 Ket
- 56     c
- 58  16 Ket
- 61  25 Ket
- 64  60 Ket
- 67  67 Ket
- 70     End
+        Bra
+        Brazero
+        Bra
+        CBra 1
+        \x{100}
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Brazero
+        CBra 1
+        \x{100}
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 Options: utf8
 No first char
 No need char
 
-/(\x{100}(b(?1)c))?/D8
+/(\x{100}(b(?1)c))?/DZ8
 ------------------------------------------------------------------
-  0  32 Bra 0
-  3     Brazero
-  4  25 Bra 1
-  7     \x{100}
- 10  16 Bra 2
- 13     b
- 15   6 Once
- 18   4 Recurse
- 21   6 Ket
- 24     c
- 26  16 Ket
- 29  25 Ket
- 32  32 Ket
- 35     End
+        Bra
+        Brazero
+        CBra 1
+        \x{100}
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 Options: utf8
 No first char
 No need char
 
-/(\x{100}(b(?1)c)){0,2}/D8
+/(\x{100}(b(?1)c)){0,2}/DZ8
 ------------------------------------------------------------------
-  0  67 Bra 0
-  3     Brazero
-  4  60 Bra 0
-  7  25 Bra 1
- 10     \x{100}
- 13  16 Bra 2
- 16     b
- 18   6 Once
- 21   7 Recurse
- 24   6 Ket
- 27     c
- 29  16 Ket
- 32  25 Ket
- 35     Brazero
- 36  25 Bra 1
- 39     \x{100}
- 42  16 Bra 2
- 45     b
- 47   6 Once
- 50   7 Recurse
- 53   6 Ket
- 56     c
- 58  16 Ket
- 61  25 Ket
- 64  60 Ket
- 67  67 Ket
- 70     End
+        Bra
+        Brazero
+        Bra
+        CBra 1
+        \x{100}
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Brazero
+        CBra 1
+        \x{100}
+        CBra 2
+        b
+        Once
+        Recurse
+        Ket
+        c
+        Ket
+        Ket
+        Ket
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 Options: utf8
@@ -1094,13 +1087,13 @@
     a\x{1234}b
  0: a\x{1234}b
 
-/^\???/8D
+/^\???/8DZ
 ------------------------------------------------------------------
-  0   8 Bra 0
-  3     ^
-  4     \x{1234}
-  8   8 Ket
- 11     End
+        Bra
+        ^
+        \x{1234}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: anchored utf8
@@ -1119,5 +1112,544 @@
  0: \x{1ff}
   \777 
  0: \x{1ff}
+  
+/\x{100}*\d/8DZ
+------------------------------------------------------------------
+        Bra
+        \x{100}*+
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+No first char
+No need char
+
+/\x{100}*\s/8DZ
+------------------------------------------------------------------
+        Bra
+        \x{100}*+
+        \s
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+No first char
+No need char
+
+/\x{100}*\w/8DZ
+------------------------------------------------------------------
+        Bra
+        \x{100}*+
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+No first char
+No need char
+
+/\x{100}*\D/8DZ
+------------------------------------------------------------------
+        Bra
+        \x{100}*
+        \D
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+No first char
+No need char
+
+/\x{100}*\S/8DZ
+------------------------------------------------------------------
+        Bra
+        \x{100}*
+        \S
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+No first char
+No need char
+
+/\x{100}*\W/8DZ
+------------------------------------------------------------------
+        Bra
+        \x{100}*
+        \W
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+No first char
+No need char
+
+/\x{100}+\x{200}/8DZ
+------------------------------------------------------------------
+        Bra
+        \x{100}++
+        \x{200}
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+First char = 196
+Need char = 128
+
+/\x{100}+X/8DZ
+------------------------------------------------------------------
+        Bra
+        \x{100}++
+        X
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+First char = 196
+Need char = 'X'
+
+/X+\x{200}/8DZ
+------------------------------------------------------------------
+        Bra
+        X++
+        \x{200}
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Partial matching not supported
+Options: utf8
+First char = 'X'
+Need char = 128
+
+/()()()()()()()()()()
+ ()()()()()()()()()()
+ ()()()()()()()()()()
+ ()()()()()()()()()()
+ A (x) (?41) B/8x
+    AxxB     
+Matched, but too many substrings
+ 0: AxxB
+ 1: 
+ 2: 
+ 3: 
+ 4: 
+ 5: 
+ 6: 
+ 7: 
+ 8: 
+ 9: 
+10: 
+11: 
+12: 
+13: 
+14: 
+
+/^[\x{100}\E-\Q\E\x{150}]/BZ8
+------------------------------------------------------------------
+        Bra
+        ^
+        [\x{100}-\x{150}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/^[\Q??\E-\Q??\E]/BZ8
+------------------------------------------------------------------
+        Bra
+        ^
+        [\x{100}-\x{150}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/^[\Q??\E-\Q??\E/BZ8
+Failed: missing terminating ] for character class at offset 15
+
+/^abc./mgx8
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x{0085}abc7 \x{2028}abc8 \x{2029}abc9 JUNK
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc7
+ 0: abc8
+ 0: abc9
+
+/abc.$/mgx8
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x{0085} abc7\x{2028} abc8\x{2029} abc9
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc7
+ 0: abc8
+ 0: abc9
+
+/^a\Rb/8
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0cb
+ 0: a\x{0c}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\x{2028}b 
+ 0: a\x{2028}b
+    a\x{2029}b 
+ 0: a\x{2029}b
+    ** Failers
+No match
+    a\n\rb    
+No match
+
+/^a\R*b/8
+    ab
+ 0: ab
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0c\x{2028}\x{2029}b
+ 0: a\x{0c}\x{2028}\x{2029}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\n\rb    
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}\x0cb 
+ 0: a\x{0a}\x{0d}\x{85}\x{0c}b
+
+/^a\R+b/8
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0c\x{2028}\x{2029}b
+ 0: a\x{0c}\x{2028}\x{2029}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\n\rb    
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}\x0cb 
+ 0: a\x{0a}\x{0d}\x{85}\x{0c}b
+    ** Failers
+No match
+    ab  
+No match
+
+/^a\R{1,3}b/8
+    a\nb
+ 0: a\x{0a}b
+    a\n\rb
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}b
+ 0: a\x{0a}\x{0d}\x{85}b
+    a\r\n\r\nb 
+ 0: a\x{0d}\x{0a}\x{0d}\x{0a}b
+    a\r\n\r\n\r\nb 
+ 0: a\x{0d}\x{0a}\x{0d}\x{0a}\x{0d}\x{0a}b
+    a\n\r\n\rb
+ 0: a\x{0a}\x{0d}\x{0a}\x{0d}b
+    a\n\n\r\nb 
+ 0: a\x{0a}\x{0a}\x{0d}\x{0a}b
+    ** Failers
+No match
+    a\n\n\n\rb
+No match
+    a\r
+No match
+
+/\H\h\V\v/8
+    X X\x0a
+ 0: X X\x{0a}
+    X\x09X\x0b
+ 0: X\x{09}X\x{0b}
+    ** Failers
+No match
+    \x{a0} X\x0a   
+No match
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+ 0: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}\x{0d}
+    \x09\x20\x{a0}\x0a\x0b\x0c\x0d\x0a
+ 0: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}\x{0d}
+    \x09\x20\x{a0}\x0a\x0b\x0c
+ 0: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}
+    ** Failers 
+No match
+    \x09\x20\x{a0}\x0a\x0b
+No match
+     
+/\H\h\V\v/8
+    \x{3001}\x{3000}\x{2030}\x{2028}
+ 0: \x{3001}\x{3000}\x{2030}\x{2028}
+    X\x{180e}X\x{85}
+ 0: X\x{180e}X\x{85}
+    ** Failers
+No match
+    \x{2009} X\x0a   
+No match
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x0c\x0d\x0a
+ 0: \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x{0c}\x{0d}
+    \x09\x{205f}\x{a0}\x0a\x{2029}\x0c\x{2028}\x0a
+ 0: \x{09}\x{205f}\x{a0}\x{0a}\x{2029}\x{0c}\x{2028}
+    \x09\x20\x{202f}\x0a\x0b\x0c
+ 0: \x{09} \x{202f}\x{0a}\x{0b}\x{0c}
+    ** Failers 
+No match
+    \x09\x{200a}\x{a0}\x{2028}\x0b
+No match
+     
+/[\h]/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x09 \xa0\x{1680}\x{180e}\x{2000}-\x{200a}\x{202f}\x{205f}\x{3000}]
+        Ket
+        End
+------------------------------------------------------------------
+    >\x{1680}
+ 0: \x{1680}
+
+/[\h]{3,}/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x09 \xa0\x{1680}\x{180e}\x{2000}-\x{200a}\x{202f}\x{205f}\x{3000}]{3,}
+        Ket
+        End
+------------------------------------------------------------------
+    >\x{1680}\x{180e}\x{2000}\x{2003}\x{200a}\x{202f}\x{205f}\x{3000}<
+ 0: \x{1680}\x{180e}\x{2000}\x{2003}\x{200a}\x{202f}\x{205f}\x{3000}
+
+/[\v]/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x0a-\x0d\x85\x{2028}-\x{2029}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\H]/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x08\x0a-\x1f!-\x9f\xa1-\xff\x{100}-\x{167f}\x{1681}-\x{180d}\x{180f}-\x{1fff}\x{200b}-\x{202e}\x{2030}-\x{205e}\x{2060}-\x{2fff}\x{3001}-\x{7fffffff}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\V]/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x09\x0e-\x84\x86-\xff\x{100}-\x{2027}\x{2029}-\x{7fffffff}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/.*$/8
+    \x{1ec5} 
+ 0: \x{1ec5}
+    
+/-- This tests the stricter UTF-8 check according to RFC 3629. --/ 
+    
+/X/8
+    \x{0}\x{d7ff}\x{e000}\x{10ffff}
+No match
+    \x{d800}
+Error -10
+    \x{d800}\?
+No match
+    \x{da00}
+Error -10
+    \x{da00}\?
+No match
+    \x{dfff}
+Error -10
+    \x{dfff}\?
+No match
+    \x{110000}    
+Error -10
+    \x{110000}\?    
+No match
+    \x{2000000} 
+Error -10
+    \x{2000000}\? 
+No match
+    \x{7fffffff} 
+Error -10
+    \x{7fffffff}\? 
+No match
+
+/a\Rb/I8
+Capturing subpattern count = 0
+Options: bsr_anycrlf utf8
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    ** Failers
+No match
+    a\x{85}b
+No match
+    a\x0bb     
+No match
+
+/a\Rb/I8
+Capturing subpattern count = 0
+Options: bsr_unicode utf8
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x{85}b
+ 0: a\x{85}b
+    a\x0bb     
+ 0: a\x{0b}b
+    ** Failers 
+No match
+    a\x{85}b\
+No match
+    a\x0bb\
+No match
+    
+/a\R?b/I8
+Capturing subpattern count = 0
+Options: bsr_anycrlf utf8
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    ** Failers
+No match
+    a\x{85}b
+No match
+    a\x0bb     
+No match
+
+/a\R?b/I8
+Capturing subpattern count = 0
+Options: bsr_unicode utf8
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x{85}b
+ 0: a\x{85}b
+    a\x0bb     
+ 0: a\x{0b}b
+    ** Failers 
+No match
+    a\x{85}b\
+No match
+    a\x0bb\
+No match
+ 
+/.*a.*=.b.*/8
+    QQQ\x{2029}ABCaXYZ=!bPQR
+ 0: ABCaXYZ=!bPQR
+    ** Failers
+No match
+    a\x{2029}b
+No match
+    \x61\xe2\x80\xa9\x62 
+No match
+
+/[[:a\x{100}b:]]/8
+Failed: unknown POSIX class name at offset 3
+
+/a[^]b/8
+    a\x{1234}b
+ 0: a\x{1234}b
+    a\nb 
+ 0: a\x{0a}b
+    ** Failers
+No match
+    ab  
+No match
+    
+/a[^]+b/8
+    aXb
+ 0: aXb
+    a\nX\nX\x{1234}b 
+ 0: a\x{0a}X\x{0a}X\x{1234}b
+    ** Failers
+No match
+    ab  
+No match
+
+/(\x{de})\1/
+    \x{de}\x{de}
+ 0: \xde\xde
+ 1: \xde
+    \x{123} 
+** Character \x{123} is greater than 255 and UTF-8 mode is not enabled.
+** Truncation will probably give the wrong result.
+No match
+
+/X/8f 
+    A\x{1ec5}ABCXYZ
+ 0: X
+
+/(*UTF8)\x{1234}/
+  abcd\x{1234}pqr
+ 0: \x{1234}
+
+/(*CRLF)(*UTF8)(*BSR_UNICODE)a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_unicode utf8
+Forced newline sequence: CRLF
+First char = 'a'
+Need char = 'b'
 
 / End of testinput5 /

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput6
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput6	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput6	Mon Jun  8 18:51:30 2009
@@ -99,7 +99,7 @@
 No match
   
 /^\p{Cs}/8
-    \x{dfff}
+    \?\x{dfff}
  0: \x{dfff}
     ** Failers
 No match
@@ -113,7 +113,7 @@
 No match
     Z
 No match
-    \x{dfff}  
+    \x{e000}  
 No match
   
 /^\p{Lm}/8
@@ -548,73 +548,72 @@
     WXYZ 
 No match
 
-/[\p{L}]/D
+/[\p{L}]/DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     [\p{L}]
- 11  11 Ket
- 14     End
+        Bra
+        [\p{L}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[\p{^L}]/D
+/[\p{^L}]/DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     [\P{L}]
- 11  11 Ket
- 14     End
+        Bra
+        [\P{L}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[\P{L}]/D
+/[\P{L}]/DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     [\P{L}]
- 11  11 Ket
- 14     End
+        Bra
+        [\P{L}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[\P{^L}]/D
+/[\P{^L}]/DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     [\p{L}]
- 11  11 Ket
- 14     End
+        Bra
+        [\p{L}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
 No first char
 No need char
 
-/[abc\p{L}\x{0660}]/8D
+/[abc\p{L}\x{0660}]/8DZ
 ------------------------------------------------------------------
-  0  46 Bra 0
-  3     [a-c\p{L}\x{660}]
- 46  46 Ket
- 49     End
+        Bra
+        [a-c\p{L}\x{660}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 No first char
 No need char
 
-/[\p{Nd}]/8DM
-Memory allocation (code space): 47
+/[\p{Nd}]/8DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     [\p{Nd}]
- 11  11 Ket
- 14     End
+        Bra
+        [\p{Nd}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
@@ -623,13 +622,12 @@
     1234
  0: 1
 
-/[\p{Nd}+-]+/8DM
-Memory allocation (code space): 48
+/[\p{Nd}+-]+/8DZ
 ------------------------------------------------------------------
-  0  44 Bra 0
-  3     [+\-\p{Nd}]+
- 44  44 Ket
- 47     End
+        Bra
+        [+\-\p{Nd}]+
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Partial matching not supported
@@ -779,48 +777,48 @@
     A\x{391}\x{10427}\x{ff3a}\x{1fb8}
  0: A\x{391}\x{10427}\x{ff3a}\x{1fb8}
 
-/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8iD
+/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8iDZ
 ------------------------------------------------------------------
-  0  21 Bra 0
-  3  NC A\x{391}\x{10427}\x{ff3a}\x{1fb0}
- 21  21 Ket
- 24     End
+        Bra
+     NC A\x{391}\x{10427}\x{ff3a}\x{1fb0}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: caseless utf8
 First char = 'A' (caseless)
 No need char
 
-/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8D
+/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8DZ
 ------------------------------------------------------------------
-  0  21 Bra 0
-  3     A\x{391}\x{10427}\x{ff3a}\x{1fb0}
- 21  21 Ket
- 24     End
+        Bra
+        A\x{391}\x{10427}\x{ff3a}\x{1fb0}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 'A'
 Need char = 176
 
-/AB\x{1fb0}/8D
+/AB\x{1fb0}/8DZ
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3     AB\x{1fb0}
- 11  11 Ket
- 14     End
+        Bra
+        AB\x{1fb0}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: utf8
 First char = 'A'
 Need char = 176
 
-/AB\x{1fb0}/8Di
+/AB\x{1fb0}/8DZi
 ------------------------------------------------------------------
-  0  11 Bra 0
-  3  NC AB\x{1fb0}
- 11  11 Ket
- 14     End
+        Bra
+     NC AB\x{1fb0}
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: caseless utf8
@@ -857,12 +855,12 @@
     \x{e0} 
  0: \x{e0}
 
-/[\x{105}-\x{109}]/8iD
+/[\x{105}-\x{109}]/8iDZ
 ------------------------------------------------------------------
-  0  13 Bra 0
-  3     [\x{104}-\x{109}]
- 13  13 Ket
- 16     End
+        Bra
+        [\x{104}-\x{109}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: caseless utf8
@@ -881,12 +879,12 @@
     \x{10a} 
 No match
     
-/[z-\x{100}]/8iD 
+/[z-\x{100}]/8iDZ 
 ------------------------------------------------------------------
-  0  20 Bra 0
-  3     [Z\x{39c}\x{178}z-\x{101}]
- 20  20 Ket
- 23     End
+        Bra
+        [Z\x{39c}\x{178}z-\x{101}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: caseless utf8
@@ -919,12 +917,12 @@
     y           
 No match
 
-/[z-\x{100}]/8Di
+/[z-\x{100}]/8DZi
 ------------------------------------------------------------------
-  0  20 Bra 0
-  3     [Z\x{39c}\x{178}z-\x{101}]
- 20  20 Ket
- 23     End
+        Bra
+        [Z\x{39c}\x{178}z-\x{101}]
+        Ket
+        End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 Options: caseless utf8
@@ -1410,4 +1408,353 @@
  1: L=abc
  2: abc
 
+/The next two should be Perl-compatible, but it fails to match \x{e0}. PCRE
+will match it only with UCP support, because without that it has no notion
+of case for anything other than the ASCII letters. / 
+
+/((?i)[\x{c0}])/8
+    \x{c0}
+ 0: \x{c0}
+ 1: \x{c0}
+    \x{e0} 
+ 0: \x{e0}
+ 1: \x{e0}
+
+/(?i:[\x{c0}])/8
+    \x{c0}
+ 0: \x{c0}
+    \x{e0} 
+ 0: \x{e0}
+    
+/^\p{Balinese}\p{Cuneiform}\p{Nko}\p{Phags_Pa}\p{Phoenician}/8
+    \x{1b00}\x{12000}\x{7c0}\x{a840}\x{10900}
+ 0: \x{1b00}\x{12000}\x{7c0}\x{a840}\x{10900}
+
+/The next two are special cases where the lengths of the different cases of the 
+same character differ. The first went wrong with heap frame storage; the 2nd
+was broken in all cases./
+
+/^\x{023a}+?(\x{0130}+)/8i
+  \x{023a}\x{2c65}\x{0130}
+ 0: \x{23a}\x{2c65}\x{130}
+ 1: \x{130}
+  
+/^\x{023a}+([^X])/8i
+  \x{023a}\x{2c65}X
+ 0: \x{23a}\x{2c65}
+ 1: \x{2c65}
+
+/Check property support in non-UTF-8 mode/
+ 
+/\p{L}{4}/
+    123abcdefg
+ 0: abcd
+    123abc\xc4\xc5zz
+ 0: abc\xc4
+
+/\X{1,3}\d/
+  \x8aBCD
+No match
+  
+/\X?\d/
+  \x8aBCD 
+No match
+
+/\P{L}?\d/
+  \x8aBCD 
+No match
+
+/[\PPP\x8a]{1,}\x80/
+    A\x80
+ 0: A\x80
+
+/(?:[\PPa*]*){8,}/
+
+/[\P{Any}]/BZ
+------------------------------------------------------------------
+        Bra
+        [\P{Any}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\P{Any}\E]/BZ
+------------------------------------------------------------------
+        Bra
+        [\P{Any}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/(\P{Yi}+\277)/
+
+/(\P{Yi}+\277)?/
+
+/(?<=\P{Yi}{3}A)X/
+
+/\p{Yi}+(\P{Yi}+)(?1)/
+
+/(\P{Yi}{2}\277)?/
+
+/[\P{Yi}A]/
+
+/[\P{Yi}\P{Yi}\P{Yi}A]/
+
+/[^\P{Yi}A]/
+
+/[^\P{Yi}\P{Yi}\P{Yi}A]/
+
+/(\P{Yi}*\277)*/
+
+/(\P{Yi}*?\277)*/
+
+/(\p{Yi}*+\277)*/
+
+/(\P{Yi}?\277)*/
+
+/(\P{Yi}??\277)*/
+
+/(\p{Yi}?+\277)*/
+
+/(\P{Yi}{0,3}\277)*/
+
+/(\P{Yi}{0,3}?\277)*/
+
+/(\p{Yi}{0,3}+\277)*/
+
+/^[\p{Arabic}]/8
+    \x{60e} 
+ 0: \x{60e}
+    \x{656} 
+ 0: \x{656}
+    \x{657} 
+ 0: \x{657}
+    \x{658} 
+ 0: \x{658}
+    \x{659} 
+ 0: \x{659}
+    \x{65a} 
+ 0: \x{65a}
+    \x{65b} 
+ 0: \x{65b}
+    \x{65c} 
+ 0: \x{65c}
+    \x{65d} 
+ 0: \x{65d}
+    \x{65e} 
+ 0: \x{65e}
+    \x{66a} 
+ 0: \x{66a}
+    \x{6e9} 
+ 0: \x{6e9}
+    \x{6ef}
+ 0: \x{6ef}
+    \x{6fa}  
+ 0: \x{6fa}
+    ** Failers
+No match
+    \x{600}
+No match
+    \x{650}
+No match
+    \x{651}  
+No match
+    \x{652}  
+No match
+    \x{653}  
+No match
+    \x{654} 
+No match
+    \x{655} 
+No match
+    \x{65f}  
+No match
+    
+/^\p{Cyrillic}/8
+    \x{1d2b} 
+ 0: \x{1d2b}
+    
+/^\p{Common}/8
+    \x{589}
+ 0: \x{589}
+    \x{60c}
+ 0: \x{60c}
+    \x{61f}  
+ 0: \x{61f}
+    \x{964}
+ 0: \x{964}
+    \x{965}  
+ 0: \x{965}
+    \x{970}  
+ 0: \x{970}
+
+/^\p{Inherited}/8
+    \x{64b}
+ 0: \x{64b}
+    \x{654}
+ 0: \x{654}
+    \x{655}
+ 0: \x{655}
+    \x{200c} 
+ 0: \x{200c}
+    ** Failers
+No match
+    \x{64a}
+No match
+    \x{656}     
+No match
+
+/^\p{Shavian}/8
+    \x{10450}
+ 0: \x{10450}
+    \x{1047f}
+ 0: \x{1047f}
+    
+/^\p{Deseret}/8
+    \x{10400}
+ 0: \x{10400}
+    \x{1044f}
+ 0: \x{1044f}
+    
+/^\p{Osmanya}/8
+    \x{10480}
+ 0: \x{10480}
+    \x{1049d}
+ 0: \x{1049d}
+    \x{104a0}
+ 0: \x{104a0}
+    \x{104a9}
+ 0: \x{104a9}
+    ** Failers
+No match
+    \x{1049e}
+No match
+    \x{1049f}
+No match
+    \x{104aa}           
+No match
+
+/\p{Zl}{2,3}+/8BZ
+------------------------------------------------------------------
+        Bra
+        prop Zl {2}
+        prop Zl ?+
+        Ket
+        End
+------------------------------------------------------------------
+    \xe2\x80\xa8\xe2\x80\xa8
+ 0: \x{2028}\x{2028}
+    \x{2028}\x{2028}\x{2028}
+ 0: \x{2028}\x{2028}\x{2028}
+    
+/\p{Zl}/8BZ
+------------------------------------------------------------------
+        Bra
+        prop Zl
+        Ket
+        End
+------------------------------------------------------------------
+
+/\p{Lu}{3}+/8BZ
+------------------------------------------------------------------
+        Bra
+        prop Lu {3}
+        Ket
+        End
+------------------------------------------------------------------
+
+/\pL{2}+/8BZ
+------------------------------------------------------------------
+        Bra
+        prop L {2}
+        Ket
+        End
+------------------------------------------------------------------
+
+/\p{Cc}{2}+/8BZ
+------------------------------------------------------------------
+        Bra
+        prop Cc {2}
+        Ket
+        End
+------------------------------------------------------------------
+
+/\x{c0}+\x{116}+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+ 0: \x{c0}\x{e0}\x{116}\x{117}
+
+/[\x{c0}\x{116}]+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+ 0: \x{c0}\x{e0}\x{116}\x{117}
+
+/\p{Carian}\p{Cham}\p{Kayah_Li}\p{Lepcha}\p{Lycian}\p{Lydian}\p{Ol_Chiki}\p{Rejang}\p{Saurashtra}\p{Sundanese}\p{Vai}/8
+    \x{102A4}\x{AA52}\x{A91D}\x{1C46}\x{10283}\x{1092E}\x{1C6B}\x{A93B}\x{A8BF}\x{1BA0}\x{A50A}====
+ 0: \x{102a4}\x{aa52}\x{a91d}\x{1c46}\x{10283}\x{1092e}\x{1c6b}\x{a93b}\x{a8bf}\x{1ba0}\x{a50a}
+
+/\x{a77d}\x{1d79}/8i
+    \x{a77d}\x{1d79}
+ 0: \x{a77d}\x{1d79}
+    \x{1d79}\x{a77d} 
+ 0: \x{1d79}\x{a77d}
+
+/\x{a77d}\x{1d79}/8
+    \x{a77d}\x{1d79}
+ 0: \x{a77d}\x{1d79}
+    ** Failers 
+No match
+    \x{1d79}\x{a77d} 
+No match
+
+/(A)\1/8i
+    AA
+ 0: AA
+ 1: A
+    Aa
+ 0: Aa
+ 1: A
+    aa
+ 0: aa
+ 1: a
+    aA
+ 0: aA
+ 1: a
+
+/(\x{de})\1/8i
+    \x{de}\x{de}
+ 0: \x{de}\x{de}
+ 1: \x{de}
+    \x{de}\x{fe}
+ 0: \x{de}\x{fe}
+ 1: \x{de}
+    \x{fe}\x{fe}
+ 0: \x{fe}\x{fe}
+ 1: \x{fe}
+    \x{fe}\x{de}
+ 0: \x{fe}\x{de}
+ 1: \x{fe}
+
+/(\x{10a})\1/8i
+    \x{10a}\x{10a}
+ 0: \x{10a}\x{10a}
+ 1: \x{10a}
+    \x{10a}\x{10b}
+ 0: \x{10a}\x{10b}
+ 1: \x{10a}
+    \x{10b}\x{10b}
+ 0: \x{10b}\x{10b}
+ 1: \x{10b}
+    \x{10b}\x{10a}
+ 0: \x{10b}\x{10a}
+ 1: \x{10b}
+    
+/The next two tests are for property support in non-UTF-8 mode/
+
+/(?:\p{Lu}|\x20)+/
+    \x41\x20\x50\xC2\x54\xC9\x20\x54\x4F\x44\x41\x59
+ 0: A P\xc2T\xc9 TODAY
+
+/[\p{Lu}\x20]+/
+    \x41\x20\x50\xC2\x54\xC9\x20\x54\x4F\x44\x41\x59
+ 0: A P\xc2T\xc9 TODAY
+
 / End of testinput6 /

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput7
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput7	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput7	Mon Jun  8 18:51:30 2009
@@ -2735,7 +2735,7 @@
 No match
 
 /^a	b
-  
    c/x
+      c/x
     abc
  0: abc
 
@@ -2973,7 +2973,7 @@
     {4,5a}bc
  0: {4,5a}bc
 
-/^a.b/
+/^a.b/
     a\rb
  0: a\x0db
     *** Failers
@@ -3039,9 +3039,9 @@
     abcdefghijk\12S
  0: abcdefghijk\x0aS
 
-/ab\gdef/
-    abgdef
- 0: abgdef
+/ab\idef/
+    abidef
+ 0: abidef
 
 /a{0}bc/
     bc
@@ -4573,8 +4573,6 @@
     abq
 No match
 
-/ab{1,}bc/
-
 /ab+bc/
     abbbbc
  0: abbbbc
@@ -6600,7 +6598,7 @@
     xyz\rabc\
 No match
     
-/abc$/m
+/abc$/m
     xyzabc
  0: abc
     xyzabc\n 
@@ -6656,7 +6654,7 @@
     xyz\rabcdef
 No match
     
-/.*/
+/.*/
     abc\ndef
  0: abc
  1: ab
@@ -6728,4 +6726,648 @@
     abc\r\ndef
  0: abc\x0d\x0adef
 
+/^\w+=.*(\\\n.*)*/
+    abc=xyz\\\npqr
+ 0: abc=xyz\\x0apqr
+ 1: abc=xyz\\x0apq
+ 2: abc=xyz\\x0ap
+ 3: abc=xyz\\x0a
+ 4: abc=xyz\
+ 5: abc=xyz
+ 6: abc=xy
+ 7: abc=x
+ 8: abc=
+
+/^(a()*)*/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+ 4: 
+
+/^(?:a(?:(?:))*)*/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+ 4: 
+
+/^(a()+)+/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+
+/^(?:a(?:(?:))+)+/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+
+/(a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/(?>a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/(?:a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/^a.b/
+    a\rb
+ 0: a\x0db
+    a\nb\ 
+ 0: a\x0ab
+    ** Failers
+No match
+    a\nb
+No match
+    a\nb\
+No match
+    a\rb\   
+No match
+    a\rb\   
+No match
+
+/^abc./mgx
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x85abc7 JUNK
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc7
+
+/abc.$/mgx
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc9
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc9
+
+/^a\Rb/
+    a\nb
+ 0: a\x0ab
+    a\rb
+ 0: a\x0db
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x0bb
+ 0: a\x0bb
+    a\x0cb
+ 0: a\x0cb
+    a\x85b   
+ 0: a\x85b
+    ** Failers
+No match
+    a\n\rb    
+No match
+
+/^a\R*b/
+    ab
+ 0: ab
+    a\nb
+ 0: a\x0ab
+    a\rb
+ 0: a\x0db
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x0bb
+ 0: a\x0bb
+    a\x0cb
+ 0: a\x0cb
+    a\x85b   
+ 0: a\x85b
+    a\n\rb    
+ 0: a\x0a\x0db
+    a\n\r\x85\x0cb 
+ 0: a\x0a\x0d\x85\x0cb
+
+/^a\R+b/
+    a\nb
+ 0: a\x0ab
+    a\rb
+ 0: a\x0db
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x0bb
+ 0: a\x0bb
+    a\x0cb
+ 0: a\x0cb
+    a\x85b   
+ 0: a\x85b
+    a\n\rb    
+ 0: a\x0a\x0db
+    a\n\r\x85\x0cb 
+ 0: a\x0a\x0d\x85\x0cb
+    ** Failers
+No match
+    ab  
+No match
+    
+/^a\R{1,3}b/
+    a\nb
+ 0: a\x0ab
+    a\n\rb
+ 0: a\x0a\x0db
+    a\n\r\x85b
+ 0: a\x0a\x0d\x85b
+    a\r\n\r\nb 
+ 0: a\x0d\x0a\x0d\x0ab
+    a\r\n\r\n\r\nb 
+ 0: a\x0d\x0a\x0d\x0a\x0d\x0ab
+    a\n\r\n\rb
+ 0: a\x0a\x0d\x0a\x0db
+    a\n\n\r\nb 
+ 0: a\x0a\x0a\x0d\x0ab
+    ** Failers
+No match
+    a\n\n\n\rb
+No match
+    a\r
+No match
+
+/^a[\R]b/
+    aRb
+ 0: aRb
+    ** Failers
+No match
+    a\nb  
+No match
+
+/.+foo/
+    afoo
+ 0: afoo
+    ** Failers 
+No match
+    \r\nfoo 
+No match
+    \nfoo 
+No match
+
+/.+foo/
+    afoo
+ 0: afoo
+    \nfoo 
+ 0: \x0afoo
+    ** Failers 
+No match
+    \r\nfoo 
+No match
+
+/.+foo/
+    afoo
+ 0: afoo
+    ** Failers 
+No match
+    \nfoo 
+No match
+    \r\nfoo 
+No match
+
+/.+foo/s
+    afoo
+ 0: afoo
+    \r\nfoo 
+ 0: \x0d\x0afoo
+    \nfoo 
+ 0: \x0afoo
+
+/^$/mg
+    abc\r\rxyz
+ 0: 
+    abc\n\rxyz  
+ 0: 
+    ** Failers 
+No match
+    abc\r\nxyz
+No match
+
+/^X/m
+    XABC
+ 0: X
+    ** Failers 
+No match
+    XABC\B
+No match
+
+/(?m)^$/g+
+    abc\r\n\r\n
+ 0: 
+ 0+ \x0d\x0a
+
+/(?m)^$|^\r\n/g+ 
+    abc\r\n\r\n
+ 0: \x0d\x0a
+ 0+ 
+ 1: 
+    
+/(?m)$/g+ 
+    abc\r\n\r\n
+ 0: 
+ 0+ \x0d\x0a\x0d\x0a
+ 0: 
+ 0+ \x0d\x0a
+ 0: 
+ 0+ 
+
+/(?|(abc)|(xyz))/
+   >abc<
+ 0: abc
+   >xyz< 
+ 0: xyz
+
+/(x)(?|(abc)|(xyz))(x)/
+    xabcx
+ 0: xabcx
+    xxyzx 
+ 0: xxyzx
+
+/(x)(?|(abc)(pqr)|(xyz))(x)/
+    xabcpqrx
+ 0: xabcpqrx
+    xxyzx 
+ 0: xxyzx
+
+/(?|(abc)|(xyz))(?1)/
+    abcabc
+ 0: abcabc
+    xyzabc 
+ 0: xyzabc
+    ** Failers 
+No match
+    xyzxyz 
+No match
+ 
+/\H\h\V\v/
+    X X\x0a
+ 0: X X\x0a
+    X\x09X\x0b
+ 0: X\x09X\x0b
+    ** Failers
+No match
+    \xa0 X\x0a   
+No match
+    
+/\H*\h+\V?\v{3,4}/ 
+    \x09\x20\xa0X\x0a\x0b\x0c\x0d\x0a
+ 0: \x09 \xa0X\x0a\x0b\x0c\x0d
+ 1: \x09 \xa0X\x0a\x0b\x0c
+    \x09\x20\xa0\x0a\x0b\x0c\x0d\x0a
+ 0: \x09 \xa0\x0a\x0b\x0c\x0d
+ 1: \x09 \xa0\x0a\x0b\x0c
+    \x09\x20\xa0\x0a\x0b\x0c
+ 0: \x09 \xa0\x0a\x0b\x0c
+    ** Failers 
+No match
+    \x09\x20\xa0\x0a\x0b
+No match
+     
+/\H{3,4}/
+    XY  ABCDE
+ 0: ABCD
+ 1: ABC
+    XY  PQR ST 
+ 0: PQR
+    
+/.\h{3,4}./
+    XY  AB    PQRS
+ 0: B    P
+ 1: B    
+
+/\h*X\h?\H+Y\H?Z/
+    >XNNNYZ
+ 0: XNNNYZ
+    >  X NYQZ
+ 0:   X NYQZ
+    ** Failers
+No match
+    >XYZ   
+No match
+    >  X NY Z
+No match
+
+/\v*X\v?Y\v+Z\V*\x0a\V+\x0b\V{2,3}\x0c/
+    >XY\x0aZ\x0aA\x0bNN\x0c
+ 0: XY\x0aZ\x0aA\x0bNN\x0c
+    >\x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+ 0: \x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+
+/.+A/
+    \r\nA
+No match
+    
+/\nA/
+    \r\nA 
+ 0: \x0aA
+
+/[\r\n]A/
+    \r\nA 
+ 0: \x0aA
+
+/(\r|\n)A/
+    \r\nA 
+ 0: \x0aA
+
+/a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_anycrlf
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x0db
+    a\nb
+ 0: a\x0ab
+    a\r\nb
+ 0: a\x0d\x0ab
+    ** Failers
+No match
+    a\x85b
+No match
+    a\x0bb     
+No match
+
+/a\Rb/I
+Capturing subpattern count = 0
+Options: bsr_unicode
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x0db
+    a\nb
+ 0: a\x0ab
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x85b
+ 0: a\x85b
+    a\x0bb     
+ 0: a\x0bb
+    ** Failers 
+No match
+    a\x85b\
+No match
+    a\x0bb\
+No match
+    
+/a\R?b/I
+Capturing subpattern count = 0
+Options: bsr_anycrlf
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x0db
+    a\nb
+ 0: a\x0ab
+    a\r\nb
+ 0: a\x0d\x0ab
+    ** Failers
+No match
+    a\x85b
+No match
+    a\x0bb     
+No match
+
+/a\R?b/I
+Capturing subpattern count = 0
+Options: bsr_unicode
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x0db
+    a\nb
+ 0: a\x0ab
+    a\r\nb
+ 0: a\x0d\x0ab
+    a\x85b
+ 0: a\x85b
+    a\x0bb     
+ 0: a\x0bb
+    ** Failers 
+No match
+    a\x85b\
+No match
+    a\x0bb\
+No match
+    
+/a\R{2,4}b/I
+Capturing subpattern count = 0
+Partial matching not supported
+Options: bsr_anycrlf
+First char = 'a'
+Need char = 'b'
+    a\r\n\nb
+ 0: a\x0d\x0a\x0ab
+    a\n\r\rb
+ 0: a\x0a\x0d\x0db
+    a\r\n\r\n\r\n\r\nb
+ 0: a\x0d\x0a\x0d\x0a\x0d\x0a\x0d\x0ab
+    ** Failers
+No match
+    a\x85\85b
+No match
+    a\x0b\0bb     
+No match
+
+/a\R{2,4}b/I
+Capturing subpattern count = 0
+Partial matching not supported
+Options: bsr_unicode
+First char = 'a'
+Need char = 'b'
+    a\r\rb
+ 0: a\x0d\x0db
+    a\n\n\nb
+ 0: a\x0a\x0a\x0ab
+    a\r\n\n\r\rb
+ 0: a\x0d\x0a\x0a\x0d\x0db
+    a\x85\85b
+No match
+    a\x0b\0bb     
+No match
+    ** Failers 
+No match
+    a\r\r\r\r\rb 
+No match
+    a\x85\85b\
+No match
+    a\x0b\0bb\
+No match
+    
+/a(?!)|\wbc/
+    abc 
+ 0: abc
+
+/a[]b/
+    ** Failers
+No match
+    ab
+No match
+
+/a[]+b/
+    ** Failers
+No match
+    ab 
+No match
+
+/a[]*+b/
+    ** Failers
+No match
+    ab 
+No match
+
+/a[^]b/
+    aXb
+ 0: aXb
+    a\nb 
+ 0: a\x0ab
+    ** Failers
+No match
+    ab  
+No match
+    
+/a[^]+b/ 
+    aXb
+ 0: aXb
+    a\nX\nXb 
+ 0: a\x0aX\x0aXb
+    ** Failers
+No match
+    ab  
+No match
+
+/X$/E
+    X
+ 0: X
+    ** Failers 
+No match
+    X\n 
+No match
+
+/X$/
+    X
+ 0: X
+    X\n 
+ 0: X
+
+/xyz/C
+  xyz 
+--->xyz
+ +0 ^       x
+ +1 ^^      y
+ +2 ^ ^     z
+ +3 ^  ^    
+ 0: xyz
+  abcxyz 
+--->abcxyz
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+  abcxyz\Y
+--->abcxyz
+ +0 ^          x
+ +0  ^         x
+ +0   ^        x
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+  ** Failers 
+No match
+  abc
+No match
+  abc\Y
+--->abc
+ +0 ^       x
+ +0  ^      x
+ +0   ^     x
+ +0    ^    x
+No match
+  abcxypqr  
+No match
+  abcxypqr\Y  
+--->abcxypqr
+ +0 ^            x
+ +0  ^           x
+ +0   ^          x
+ +0    ^         x
+ +1    ^^        y
+ +2    ^ ^       z
+ +0     ^        x
+ +0      ^       x
+ +0       ^      x
+ +0        ^     x
+ +0         ^    x
+No match
+  
+/(?C)ab/
+  ab
+--->ab
+  0 ^      a
+ 0: ab
+  \C-ab
+ 0: ab
+  
+/ab/C
+  ab
+--->ab
+ +0 ^      a
+ +1 ^^     b
+ +2 ^ ^    
+ 0: ab
+  \C-ab    
+ 0: ab
+
+/^"((?(?=[a])[^"])|b)*"$/C
+    "ab"
+--->"ab"
+ +0 ^        ^
+ +1 ^        "
+ +2 ^^       ((?(?=[a])[^"])|b)*
++21 ^^       "
+ +3 ^^       (?(?=[a])[^"])
++18 ^^       b
+ +5 ^^       (?=[a])
+ +8  ^       [a]
++11  ^^      )
++12 ^^       [^"]
++16 ^ ^      )
++17 ^ ^      |
++21 ^ ^      "
+ +3 ^ ^      (?(?=[a])[^"])
++18 ^ ^      b
+ +5 ^ ^      (?=[a])
+ +8   ^      [a]
++19 ^  ^     )
++21 ^  ^     "
+ +3 ^  ^     (?(?=[a])[^"])
++18 ^  ^     b
+ +5 ^  ^     (?=[a])
+ +8    ^     [a]
++17 ^  ^     |
++22 ^   ^    $
++23 ^   ^    
+ 0: "ab"
+    \C-"ab"
+ 0: "ab"
+
 / End of testinput7 /

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput8
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput8	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput8	Mon Jun  8 18:51:30 2009
@@ -1028,4 +1028,264 @@
     \x{85}
  0: \x{85}
 
+/^abc./mgx8
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x{0085}abc7 \x{2028}abc8 \x{2029}abc9 JUNK
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc7
+ 0: abc8
+ 0: abc9
+
+/abc.$/mgx8
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x{0085} abc7\x{2028} abc8\x{2029} abc9
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc7
+ 0: abc8
+ 0: abc9
+
+/^a\Rb/8
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0cb
+ 0: a\x{0c}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\x{2028}b 
+ 0: a\x{2028}b
+    a\x{2029}b 
+ 0: a\x{2029}b
+    ** Failers
+No match
+    a\n\rb    
+No match
+
+/^a\R*b/8
+    ab
+ 0: ab
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0c\x{2028}\x{2029}b
+ 0: a\x{0c}\x{2028}\x{2029}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\n\rb    
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}\x0cb 
+ 0: a\x{0a}\x{0d}\x{85}\x{0c}b
+
+/^a\R+b/8
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0c\x{2028}\x{2029}b
+ 0: a\x{0c}\x{2028}\x{2029}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\n\rb    
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}\x0cb 
+ 0: a\x{0a}\x{0d}\x{85}\x{0c}b
+    ** Failers
+No match
+    ab  
+No match
+
+/^a\R{1,3}b/8
+    a\nb
+ 0: a\x{0a}b
+    a\n\rb
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}b
+ 0: a\x{0a}\x{0d}\x{85}b
+    a\r\n\r\nb 
+ 0: a\x{0d}\x{0a}\x{0d}\x{0a}b
+    a\r\n\r\n\r\nb 
+ 0: a\x{0d}\x{0a}\x{0d}\x{0a}\x{0d}\x{0a}b
+    a\n\r\n\rb
+ 0: a\x{0a}\x{0d}\x{0a}\x{0d}b
+    a\n\n\r\nb 
+ 0: a\x{0a}\x{0a}\x{0d}\x{0a}b
+    ** Failers
+No match
+    a\n\n\n\rb
+No match
+    a\r
+No match
+
+/\h+\V?\v{3,4}/8 
+    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+ 0: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}\x{0d}
+ 1: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}
+
+/\V?\v{3,4}/8 
+    \x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+ 0: X\x{0a}\x{0b}\x{0c}\x{0d}
+ 1: X\x{0a}\x{0b}\x{0c}
+
+/\h+\V?\v{3,4}/8
+    >\x09\x20\x{a0}X\x0a\x0a\x0a<
+ 0: \x{09} \x{a0}X\x{0a}\x{0a}\x{0a}
+
+/\V?\v{3,4}/8
+    >\x09\x20\x{a0}X\x0a\x0a\x0a<
+ 0: X\x{0a}\x{0a}\x{0a}
+
+/\H\h\V\v/8
+    X X\x0a
+ 0: X X\x{0a}
+    X\x09X\x0b
+ 0: X\x{09}X\x{0b}
+    ** Failers
+No match
+    \x{a0} X\x0a   
+No match
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+ 0: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}\x{0d}
+ 1: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}
+    \x09\x20\x{a0}\x0a\x0b\x0c\x0d\x0a
+ 0: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}\x{0d}
+ 1: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}
+    \x09\x20\x{a0}\x0a\x0b\x0c
+ 0: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}
+    ** Failers 
+No match
+    \x09\x20\x{a0}\x0a\x0b
+No match
+     
+/\H\h\V\v/8
+    \x{3001}\x{3000}\x{2030}\x{2028}
+ 0: \x{3001}\x{3000}\x{2030}\x{2028}
+    X\x{180e}X\x{85}
+ 0: X\x{180e}X\x{85}
+    ** Failers
+No match
+    \x{2009} X\x0a   
+No match
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x0c\x0d\x0a
+ 0: \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x{0c}\x{0d}
+ 1: \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x{0c}
+    \x09\x{205f}\x{a0}\x0a\x{2029}\x0c\x{2028}\x0a
+ 0: \x{09}\x{205f}\x{a0}\x{0a}\x{2029}\x{0c}\x{2028}
+ 1: \x{09}\x{205f}\x{a0}\x{0a}\x{2029}\x{0c}
+    \x09\x20\x{202f}\x0a\x0b\x0c
+ 0: \x{09} \x{202f}\x{0a}\x{0b}\x{0c}
+    ** Failers 
+No match
+    \x09\x{200a}\x{a0}\x{2028}\x0b
+No match
+     
+/a\Rb/I8
+Capturing subpattern count = 0
+Options: bsr_anycrlf utf8
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    ** Failers
+No match
+    a\x{85}b
+No match
+    a\x0bb     
+No match
+
+/a\Rb/I8
+Capturing subpattern count = 0
+Options: bsr_unicode utf8
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x{85}b
+ 0: a\x{85}b
+    a\x0bb     
+ 0: a\x{0b}b
+    ** Failers 
+No match
+    a\x{85}b\
+No match
+    a\x0bb\
+No match
+    
+/a\R?b/I8
+Capturing subpattern count = 0
+Options: bsr_anycrlf utf8
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    ** Failers
+No match
+    a\x{85}b
+No match
+    a\x0bb     
+No match
+
+/a\R?b/I8
+Capturing subpattern count = 0
+Options: bsr_unicode utf8
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x{85}b
+ 0: a\x{85}b
+    a\x0bb     
+ 0: a\x{0b}b
+    ** Failers 
+No match
+    a\x{85}b\
+No match
+    a\x0bb\
+No match
+ 
+/X/8f 
+    A\x{1ec5}ABCXYZ
+ 0: X
+
 / End of testinput 8 / 

Modified: freeswitch/trunk/libs/pcre/testdata/testoutput9
==============================================================================
--- freeswitch/trunk/libs/pcre/testdata/testoutput9	(original)
+++ freeswitch/trunk/libs/pcre/testdata/testoutput9	Mon Jun  8 18:51:30 2009
@@ -271,7 +271,7 @@
 No match
   
 /^\p{Cs}/8
-    \x{dfff}
+    \?\x{dfff}
  0: \x{dfff}
     ** Failers
 No match
@@ -285,7 +285,7 @@
 No match
     Z
 No match
-    \x{dfff}  
+    \x{e000}  
 No match
   
 /^\p{Lm}/8
@@ -1624,4 +1624,50 @@
      AXY      
 No match
 
+/^\x{023a}+?(\x{0130}+)/8i
+  \x{023a}\x{2c65}\x{0130}
+ 0: \x{23a}\x{2c65}\x{130}
+  
+/^\x{023a}+([^X])/8i
+  \x{023a}\x{2c65}X
+ 0: \x{23a}\x{2c65}
+ 
+/\x{c0}+\x{116}+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+ 0: \x{c0}\x{e0}\x{116}\x{117}
+ 1: \x{c0}\x{e0}\x{116}
+
+/[\x{c0}\x{116}]+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+ 0: \x{c0}\x{e0}\x{116}\x{117}
+ 1: \x{c0}\x{e0}\x{116}
+ 2: \x{c0}\x{e0}
+ 3: \x{c0}
+
+/Check property support in non-UTF-8 mode/
+ 
+/\p{L}{4}/
+    123abcdefg
+ 0: abcd
+    123abc\xc4\xc5zz
+ 0: abc\xc4
+
+/\p{Carian}\p{Cham}\p{Kayah_Li}\p{Lepcha}\p{Lycian}\p{Lydian}\p{Ol_Chiki}\p{Rejang}\p{Saurashtra}\p{Sundanese}\p{Vai}/8
+    \x{102A4}\x{AA52}\x{A91D}\x{1C46}\x{10283}\x{1092E}\x{1C6B}\x{A93B}\x{A8BF}\x{1BA0}\x{A50A}====
+ 0: \x{102a4}\x{aa52}\x{a91d}\x{1c46}\x{10283}\x{1092e}\x{1c6b}\x{a93b}\x{a8bf}\x{1ba0}\x{a50a}
+
+/\x{a77d}\x{1d79}/8i
+    \x{a77d}\x{1d79}
+ 0: \x{a77d}\x{1d79}
+    \x{1d79}\x{a77d} 
+ 0: \x{1d79}\x{a77d}
+
+/\x{a77d}\x{1d79}/8
+    \x{a77d}\x{1d79}
+ 0: \x{a77d}\x{1d79}
+    ** Failers 
+No match
+    \x{1d79}\x{a77d} 
+No match
+
 / End / 

Added: freeswitch/trunk/libs/pcre/testdata/wintestinput3
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/testdata/wintestinput3	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,91 @@
+/^[\w]+/
+    *** Failers
+    ?cole
+
+/^[\w]+/Lfrench
+    ?cole
+
+/^[\w]+/
+    *** Failers
+    ?cole
+
+/^[\W]+/
+    ?cole
+
+/^[\W]+/Lfrench
+    *** Failers
+    ?cole
+
+/[\b]/
+    \b
+    *** Failers
+    a
+
+/[\b]/Lfrench
+    \b
+    *** Failers
+    a
+
+/^\w+/
+    *** Failers
+    ?cole
+
+/^\w+/Lfrench
+    ?cole
+
+/(.+)\b(.+)/
+    ?cole
+
+/(.+)\b(.+)/Lfrench
+    *** Failers
+    ?cole
+
+/?cole/i
+    ?cole
+    *** Failers
+    ?cole
+
+/?cole/iLfrench
+    ?cole
+    ?cole
+
+/\w/IS
+
+/\w/ISLfrench
+
+/^[\xc8-\xc9]/iLfrench
+    ?cole
+    ?cole
+
+/^[\xc8-\xc9]/Lfrench
+    ?cole
+    *** Failers 
+    ?cole
+
+/\W+/Lfrench
+    >>>\xaa<<<
+    >>>\xba<<< 
+
+/[\W]+/Lfrench
+    >>>\xaa<<<
+    >>>\xba<<< 
+
+/[^[:alpha:]]+/Lfrench
+    >>>\xaa<<<
+    >>>\xba<<< 
+
+/\w+/Lfrench
+    >>>\xaa<<<
+    >>>\xba<<< 
+
+/[\w]+/Lfrench
+    >>>\xaa<<<
+    >>>\xba<<< 
+
+/[[:alpha:]]+/Lfrench
+    >>>\xaa<<<
+    >>>\xba<<< 
+    
+/[[:alpha:]][[:lower:]][[:upper:]]/DZLfrench 
+
+/ End of testinput3 /

Added: freeswitch/trunk/libs/pcre/testdata/wintestoutput3
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/testdata/wintestoutput3	Mon Jun  8 18:51:30 2009
@@ -0,0 +1,164 @@
+/^[\w]+/
+    *** Failers
+No match
+    ?cole
+No match
+
+/^[\w]+/Lfrench
+    ?cole
+ 0: ?cole
+
+/^[\w]+/
+    *** Failers
+No match
+    ?cole
+No match
+
+/^[\W]+/
+    ?cole
+ 0: \xc9
+
+/^[\W]+/Lfrench
+    *** Failers
+ 0: *** 
+    ?cole
+No match
+
+/[\b]/
+    \b
+ 0: \x08
+    *** Failers
+No match
+    a
+No match
+
+/[\b]/Lfrench
+    \b
+ 0: \x08
+    *** Failers
+No match
+    a
+No match
+
+/^\w+/
+    *** Failers
+No match
+    ?cole
+No match
+
+/^\w+/Lfrench
+    ?cole
+ 0: ?cole
+
+/(.+)\b(.+)/
+    ?cole
+ 0: \xc9cole
+ 1: \xc9
+ 2: cole
+
+/(.+)\b(.+)/Lfrench
+    *** Failers
+ 0: *** Failers
+ 1: *** 
+ 2: Failers
+    ?cole
+No match
+
+/?cole/i
+    ?cole
+ 0: \xc9cole
+    *** Failers
+No match
+    ?cole
+No match
+
+/?cole/iLfrench
+    ?cole
+ 0: ?cole
+    ?cole
+ 0: ?cole
+
+/\w/IS
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+Starting byte set: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P 
+  Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z 
+
+/\w/ISLfrench
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+Starting byte set: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P 
+  Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z 
+  ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 
+  ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 
+  ? ? 
+
+/^[\xc8-\xc9]/iLfrench
+    ?cole
+ 0: ?
+    ?cole
+ 0: ?
+
+/^[\xc8-\xc9]/Lfrench
+    ?cole
+ 0: ?
+    *** Failers 
+No match
+    ?cole
+No match
+
+/\W+/Lfrench
+    >>>\xaa<<<
+ 0: >>>
+    >>>\xba<<< 
+ 0: >>>
+
+/[\W]+/Lfrench
+    >>>\xaa<<<
+ 0: >>>
+    >>>\xba<<< 
+ 0: >>>
+
+/[^[:alpha:]]+/Lfrench
+    >>>\xaa<<<
+ 0: >>>
+    >>>\xba<<< 
+ 0: >>>
+
+/\w+/Lfrench
+    >>>\xaa<<<
+ 0: ?
+    >>>\xba<<< 
+ 0: ?
+
+/[\w]+/Lfrench
+    >>>\xaa<<<
+ 0: ?
+    >>>\xba<<< 
+ 0: ?
+
+/[[:alpha:]]+/Lfrench
+    >>>\xaa<<<
+ 0: ?
+    >>>\xba<<< 
+ 0: ?
+    
+/[[:alpha:]][[:lower:]][[:upper:]]/DZLfrench 
+------------------------------------------------------------------
+        Bra
+        [A-Za-z\x83\x8a\x8c\x8e\x9a\x9c\x9e\x9f\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\xff]
+        [a-z\x83\x9a\x9c\x9e\xaa\xb5\xba\xdf-\xf6\xf8-\xff]
+        [A-Z\x8a\x8c\x8e\x9f\xc0-\xd6\xd8-\xde]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+
+/ End of testinput3 /

Modified: freeswitch/trunk/libs/pcre/ucp.h
==============================================================================
--- freeswitch/trunk/libs/pcre/ucp.h	(original)
+++ freeswitch/trunk/libs/pcre/ucp.h	Mon Jun  8 18:51:30 2009
@@ -6,7 +6,8 @@
 #define _UCP_H
 
 /* This file contains definitions of the property values that are returned by
-the function _pcre_ucp_findprop(). */
+the UCD access macros. New values that are added for new releases of Unicode
+should always be at the end of each enum, for backwards compatibility. */
 
 /* These are the general character categories. */
 
@@ -118,7 +119,25 @@
   ucp_Tibetan,
   ucp_Tifinagh,
   ucp_Ugaritic,
-  ucp_Yi
+  ucp_Yi,
+  /* New for Unicode 5.0: */
+  ucp_Balinese,
+  ucp_Cuneiform,
+  ucp_Nko,
+  ucp_Phags_Pa,
+  ucp_Phoenician,
+  /* New for Unicode 5.1: */
+  ucp_Carian,
+  ucp_Cham,
+  ucp_Kayah_Li,
+  ucp_Lepcha,
+  ucp_Lycian,
+  ucp_Lydian,
+  ucp_Ol_Chiki,
+  ucp_Rejang,
+  ucp_Saurashtra,
+  ucp_Sundanese,
+  ucp_Vai
 };
 
 #endif


From mikej at freeswitch.org  Mon Jun  8 16:52:00 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 18:52:00 -0500
Subject: [Freeswitch-svn] [commit] r13707 - freeswitch/trunk/libs/pcre
Message-ID: 

Author: mikej
Date: Mon Jun  8 18:52:00 2009
New Revision: 13707

Log:
poke

Modified:
   freeswitch/trunk/libs/pcre/.update

Modified: freeswitch/trunk/libs/pcre/.update
==============================================================================
--- freeswitch/trunk/libs/pcre/.update	(original)
+++ freeswitch/trunk/libs/pcre/.update	Mon Jun  8 18:52:00 2009
@@ -1 +1 @@
-Fri Mar 16 17:18:44 EDT 2007
+Mon Jun  8 19:51:53 EDT 2009


From mikej at freeswitch.org  Mon Jun  8 16:59:46 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 18:59:46 -0500
Subject: [Freeswitch-svn] [commit] r13708 - freeswitch/trunk/libs/pcre
Message-ID: 

Author: mikej
Date: Mon Jun  8 18:59:46 2009
New Revision: 13708

Log:
remove generated files

Removed:
   freeswitch/trunk/libs/pcre/Makefile.in
   freeswitch/trunk/libs/pcre/config.h.in
Modified:
   freeswitch/trunk/libs/pcre/   (props changed)


From mikej at freeswitch.org  Mon Jun  8 17:05:46 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 19:05:46 -0500
Subject: [Freeswitch-svn] [commit] r13709 - in freeswitch/trunk: . libs/pcre
	libs/portaudio
Message-ID: 

Author: mikej
Date: Mon Jun  8 19:05:46 2009
New Revision: 13709

Log:
remove generated files

Removed:
   freeswitch/trunk/libs/pcre/mkinstalldirs
Modified:
   freeswitch/trunk/libs/pcre/   (props changed)
   freeswitch/trunk/libs/portaudio/   (props changed)

Changes in other areas also in this revision:
Modified:
   freeswitch/trunk/   (props changed)


From mikej at freeswitch.org  Mon Jun  8 17:32:24 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 19:32:24 -0500
Subject: [Freeswitch-svn] [commit] r13710 - freeswitch/trunk/libs/pcre
Message-ID: 

Author: mikej
Date: Mon Jun  8 19:32:24 2009
New Revision: 13710

Log:
add missing files

Added:
   freeswitch/trunk/libs/pcre/RunGrepTest   (contents, props changed)
   freeswitch/trunk/libs/pcre/RunTest   (contents, props changed)
Modified:
   freeswitch/trunk/libs/pcre/   (props changed)

Added: freeswitch/trunk/libs/pcre/RunGrepTest
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/RunGrepTest	Mon Jun  8 19:32:24 2009
@@ -0,0 +1,280 @@
+#! /bin/sh
+
+# Run pcregrep tests. The assumption is that the PCRE tests check the library
+# itself. What we are checking here is the file handling and options that are
+# supported by pcregrep.
+
+# Set the C locale, so that sort(1) behaves predictably.
+LC_ALL=C
+export LC_ALL
+
+pcregrep=`pwd`/pcregrep
+
+echo " "
+echo "Testing pcregrep"
+$pcregrep -V
+
+cf="diff -ub"
+valgrind=
+
+while [ $# -gt 0 ] ; do
+  case $1 in
+    valgrind) valgrind="valgrind -q --leak-check=no";;
+    *) echo "Unknown argument $1"; exit 1;;
+  esac
+  shift
+done
+
+# If PCRE has been built in a directory other than the source directory, and
+# this test is being run from "make check" as usual, then $(srcdir) will be
+# set. If not, set it to the current directory. We then arrange to run the
+# pcregrep command in the source directory so that the file names that appear
+# in the output are always the same.
+
+if [ -z "$srcdir" -o ! -d "$srcdir/testdata" ] ; then
+  srcdir=.
+fi
+
+# Check for the availability of UTF-8 support
+
+./pcretest -C | ./pcregrep "No UTF-8 support" >/dev/null
+utf8=$?
+
+echo "---------------------------- Test 1 ------------------------------" >testtry
+(cd $srcdir; $valgrind $pcregrep PATTERN ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 2 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep '^PATTERN' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 3 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -in PATTERN ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 4 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -ic PATTERN ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 5 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -in PATTERN ./testdata/grepinput ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 6 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -inh PATTERN ./testdata/grepinput ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 7 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -il PATTERN ./testdata/grepinput ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 8 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -l PATTERN ./testdata/grepinput ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 9 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -q PATTERN ./testdata/grepinput ./testdata/grepinputx) >>testtry
+echo "RC=$?" >>testtry
+
+echo "---------------------------- Test 10 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -q NEVER-PATTERN ./testdata/grepinput ./testdata/grepinputx) >>testtry
+echo "RC=$?" >>testtry
+
+echo "---------------------------- Test 11 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -vn pattern ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 12 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -ix pattern ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 13 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -f./testdata/greplist ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 14 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -w pat ./testdata/grepinput ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 15 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep 'abc^*' ./testdata/grepinput) 2>>testtry >>testtry
+
+echo "---------------------------- Test 16 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep abc ./testdata/grepinput ./testdata/nonexistfile) 2>>testtry >>testtry
+
+echo "---------------------------- Test 17 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -M 'the\noutput' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 18 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -Mn '(the\noutput|dog\.\n--)' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 19 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -Mix 'Pattern' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 20 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -Mixn 'complete pair\nof lines' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 21 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -nA3 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 22 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -nB3 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 23 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -C3 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 24 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -A9 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 25 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -nB9 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 26 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -A9 -B9 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 27 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -A10 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 28 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -nB10 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 29 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -C12 -B10 'four' ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 30 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -inB3 'pattern' ./testdata/grepinput ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 31 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -inA3 'pattern' ./testdata/grepinput ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 32 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -L 'fox' ./testdata/grepinput ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 33 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep 'fox' ./testdata/grepnonexist) >>testtry 2>&1
+echo "RC=$?" >>testtry
+
+echo "---------------------------- Test 34 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -s 'fox' ./testdata/grepnonexist) >>testtry 2>&1
+echo "RC=$?" >>testtry
+
+echo "---------------------------- Test 35 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -L -r --include=grepinputx --exclude_dir='^\.' 'fox' ./testdata) >>testtry
+echo "RC=$?" >>testtry
+
+echo "---------------------------- Test 36 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -L -r --include=grepinput --exclude 'grepinput$' --exclude_dir='^\.' 'fox' ./testdata | sort) >>testtry
+echo "RC=$?" >>testtry
+
+echo "---------------------------- Test 37 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep  '^(a+)*\d' ./testdata/grepinput) >>testtry 2>teststderr
+echo "RC=$?" >>testtry
+echo "======== STDERR ========" >>testtry
+cat teststderr >>testtry
+
+echo "---------------------------- Test 38 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep '>\x00<' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 39 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -A1 'before the binary zero' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 40 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -B1 'after the binary zero' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 41 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -B1 -o '\w+ the binary zero' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 41 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -B1 -onH '\w+ the binary zero' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 42 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -on 'before|zero|after' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 43 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -on -e before -e zero -e after ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 44 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -on -f ./testdata/greplist -e binary ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 45 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -e abc -e '(unclosed' ./testdata/grepinput) 2>>testtry >>testtry
+
+echo "---------------------------- Test 46 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -Fx "AB.VE
+elephant" ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 47 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -F "AB.VE
+elephant" ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 48 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -F -e DATA -e "AB.VE
+elephant" ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 49 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep "^(abc|def|ghi|jkl)" ./testdata/grepinputx) >>testtry
+
+echo "---------------------------- Test 50 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -Mv "brown\sfox" ./testdata/grepinputv) >>testtry
+
+echo "---------------------------- Test 51 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep --colour=always jumps ./testdata/grepinputv) >>testtry
+
+echo "---------------------------- Test 52 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep --file-offsets 'before|zero|after' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 53 ------------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep --line-offsets 'before|zero|after' ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 54 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -f./testdata/greplist --color=always ./testdata/grepinputx) >>testtry
+
+# Now compare the results.
+
+$cf $srcdir/testdata/grepoutput testtry
+if [ $? != 0 ] ; then exit 1; fi
+
+
+# These tests require UTF-8 support
+
+if [ $utf8 -ne 0 ] ; then
+  echo "Testing pcregrep UTF-8 features"
+
+  echo "---------------------------- Test U1 ------------------------------" >testtry
+  (cd $srcdir; $valgrind $pcregrep -n -u --newline=any "^X" ./testdata/grepinput8) >>testtry
+
+  echo "---------------------------- Test U2 ------------------------------" >>testtry
+  (cd $srcdir; $valgrind $pcregrep -n -u -C 3 --newline=any "Match" ./testdata/grepinput8) >>testtry
+
+  $cf $srcdir/testdata/grepoutput8 testtry
+  if [ $? != 0 ] ; then exit 1; fi
+
+else
+  echo "Skipping pcregrep UTF-8 tests: no UTF-8 support in PCRE library"
+fi
+
+
+# We go to some contortions to try to ensure that the tests for the various
+# newline settings will work in environments where the normal newline sequence
+# is not \n. Do not use exported files, whose line endings might be changed.
+# Instead, create an input file using printf so that its contents are exactly
+# what we want. Note the messy fudge to get printf to write a string that
+# starts with a hyphen.
+
+echo "Testing pcregrep newline settings"
+printf "abc\rdef\r\nghi\njkl" >testNinput
+
+printf "%c--------------------------- Test N1 ------------------------------\r\n" - >testtry
+$valgrind $pcregrep -n -N CR "^(abc|def|ghi|jkl)" testNinput >>testtry
+
+printf "%c--------------------------- Test N2 ------------------------------\r\n" - >>testtry
+$valgrind $pcregrep -n --newline=crlf "^(abc|def|ghi|jkl)" testNinput >>testtry
+
+printf "%c--------------------------- Test N3 ------------------------------\r\n" - >>testtry
+pattern=`printf 'def\rjkl'`
+$valgrind $pcregrep -n --newline=cr -F "$pattern" testNinput >>testtry
+
+printf "%c--------------------------- Test N4 ------------------------------\r\n" - >>testtry
+pattern=`printf 'xxx\r\njkl'`
+$valgrind $pcregrep -n --newline=crlf -F "$pattern" testNinput >>testtry
+
+printf "%c--------------------------- Test N5 ------------------------------\r\n" - >>testtry
+$valgrind $pcregrep -n --newline=any "^(abc|def|ghi|jkl)" testNinput >>testtry
+
+printf "%c--------------------------- Test N6 ------------------------------\r\n" - >>testtry
+$valgrind $pcregrep -n --newline=anycrlf "^(abc|def|ghi|jkl)" testNinput >>testtry
+
+$cf $srcdir/testdata/grepoutputN testtry
+if [ $? != 0 ] ; then exit 1; fi
+
+exit 0
+
+# End

Added: freeswitch/trunk/libs/pcre/RunTest
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/pcre/RunTest	Mon Jun  8 19:32:24 2009
@@ -0,0 +1,292 @@
+#! /bin/sh
+
+# Run PCRE tests.
+
+valgrind=
+
+# Set up a suitable "diff" command for comparison. Some systems
+# have a diff that lacks a -u option. Try to deal with this.
+
+if diff -u /dev/null /dev/null; then cf="diff -u"; else cf="diff"; fi
+
+# Find the test data
+
+testdata=testdata
+if [ -n "$srcdir" -a -d "$srcdir" ] ; then
+  testdata="$srcdir/testdata"
+fi
+
+# Find which optional facilities are available
+
+case `./pcretest -C | ./pcregrep 'Internal link size'` in
+  *2) link_size=2;;
+  *3) link_size=3;;
+  *4) link_size=4;;
+   *) echo "Failed to find internal link size"; exit 1;;
+esac
+
+./pcretest -C | ./pcregrep 'No UTF-8 support' >/dev/null
+utf8=$?
+
+./pcretest -C | ./pcregrep 'No Unicode properties support' >/dev/null
+ucp=$?
+
+# Select which tests to run; for those that are explicitly requested, check
+# that the necessary optional facilities are available.
+
+do1=no
+do2=no
+do3=no
+do4=no
+do5=no
+do6=no
+do7=no
+do8=no
+do9=no
+do10=no
+
+while [ $# -gt 0 ] ; do
+  case $1 in
+    1) do1=yes;;
+    2) do2=yes;;
+    3) do3=yes;;
+    4) do4=yes;;
+    5) do5=yes;;
+    6) do6=yes;;
+    7) do7=yes;;
+    8) do8=yes;;
+    9) do9=yes;;
+   10) do10=yes;;
+   valgrind) valgrind="valgrind -q";;
+    *) echo "Unknown test number $1"; exit 1;;
+  esac
+  shift
+done
+
+if [ $utf8 -eq 0 ] ; then
+  if [ $do4 = yes ] ; then
+    echo "Can't run test 4 because UTF-8 support is not configured"
+    exit 1
+  fi
+  if [ $do5 = yes ] ; then
+    echo "Can't run test 5 because UTF-8 support is not configured"
+    exit 1
+  fi
+  if [ $do8 = yes ] ; then
+    echo "Can't run test 8 because UTF-8 support is not configured"
+    exit 1
+  fi
+fi
+
+if [ $ucp -eq 0 ] ; then
+  if [ $do6 = yes ] ; then
+    echo "Can't run test 6 because Unicode property support is not configured"
+    exit 1
+  fi
+  if [ $do9 = yes ] ; then
+    echo "Can't run test 9 because Unicode property support is not configured"
+    exit 1
+  fi
+  if [ $do10 = yes ] ; then
+    echo "Can't run test 10 because Unicode property support is not configured"
+    exit 1
+  fi
+fi
+
+if [ $link_size -ne 2 ] ; then
+  if [ $do10 = yes ] ; then
+    echo "Can't run test 10 because the link size ($link_size) is not 2"
+    exit 1
+  fi
+fi
+
+# If no specific tests were requested, select all that are relevant.
+
+if [ $do1 = no -a $do2 = no -a $do3 = no -a $do4 = no -a \
+     $do5 = no -a $do6 = no -a $do7 = no -a $do8 = no -a \
+     $do9 = no -a $do10 = no ] ; then
+  do1=yes
+  do2=yes
+  do3=yes
+  if [ $utf8 -ne 0 ] ; then do4=yes; fi
+  if [ $utf8 -ne 0 ] ; then do5=yes; fi
+  if [ $utf8 -ne 0 -a $ucp -ne 0 ] ; then do6=yes; fi
+  do7=yes
+  if [ $utf8 -ne 0 ] ; then do8=yes; fi
+  if [ $utf8 -ne 0 -a $ucp -ne 0 ] ; then do9=yes; fi
+  if [ $link_size -eq 2 -a $ucp -ne 0 ] ; then do10=yes; fi
+fi
+
+# Show which release
+
+echo ""
+echo PCRE C library tests
+./pcretest /dev/null
+
+# Primary test, Perl-compatible
+
+if [ $do1 = yes ] ; then
+  echo "Test 1: main functionality (Perl compatible)"
+  $valgrind ./pcretest -q $testdata/testinput1 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput1 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
+  fi
+  echo "OK"
+fi
+
+# PCRE tests that are not Perl-compatible - API & error tests, mostly
+
+if [ $do2 = yes ] ; then
+  echo "Test 2: API and error handling (not Perl compatible)"
+  $valgrind ./pcretest -q $testdata/testinput2 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput2 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else
+    echo " "
+    echo "** Test 2 requires a lot of stack. If it has crashed with a"
+    echo "** segmentation fault, it may be that you do not have enough"
+    echo "** stack available by default. Please see the 'pcrestack' man"
+    echo "** page for a discussion of PCRE's stack usage."
+    echo " "
+    exit 1
+  fi
+  echo "OK"
+fi
+
+# Locale-specific tests, provided that either the "fr_FR" or the "french"
+# locale is available. The former is the Unix-like standard; the latter is
+# for Windows.
+
+if [ $do3 = yes ] ; then
+  locale -a | grep '^fr_FR$' >/dev/null
+  if [ $? -eq 0 ] ; then
+    locale=fr_FR
+    infile=$testdata/testinput3
+    outfile=$testdata/testoutput3
+  else
+    locale -a | grep '^french$' >/dev/null
+    if [ $? -eq 0 ] ; then
+      locale=french
+      sed 's/fr_FR/french/' $testdata/testinput3 >test3input
+      sed 's/fr_FR/french/' $testdata/testoutput3 >test3output
+      infile=test3input
+      outfile=test3output
+    else
+      locale=
+    fi
+  fi
+
+  if [ "$locale" != "" ] ; then
+    echo "Test 3: locale-specific features (using '$locale' locale)"
+    $valgrind ./pcretest -q $infile testtry
+    if [ $? = 0 ] ; then
+      $cf $outfile testtry
+      if [ $? != 0 ] ; then
+        echo " "
+        echo "Locale test did not run entirely successfully."
+        echo "This usually means that there is a problem with the locale"
+        echo "settings rather than a bug in PCRE."
+      else
+      echo "OK"
+      fi
+    else exit 1
+    fi
+  else
+    echo "Cannot test locale-specific features - neither the 'fr_FR' nor the"
+    echo "'french' locale exists, or the \"locale\" command is not available"
+    echo "to check for them."
+    echo " "
+  fi
+fi
+
+# Additional tests for UTF8 support
+
+if [ $do4 = yes ] ; then
+  echo "Test 4: UTF-8 support (Perl compatible)"
+  $valgrind ./pcretest -q $testdata/testinput4 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput4 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
+  fi
+  echo "OK"
+fi
+
+if [ $do5 = yes ] ; then
+  echo "Test 5: API and internals for UTF-8 support (not Perl compatible)"
+  $valgrind ./pcretest -q $testdata/testinput5 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput5 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
+  fi
+  echo "OK"
+fi
+
+if [ $do6 = yes ] ; then
+  echo "Test 6: Unicode property support"
+  $valgrind ./pcretest -q $testdata/testinput6 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput6 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
+  fi
+  echo "OK"
+fi
+
+# Tests for DFA matching support
+
+if [ $do7 = yes ] ; then
+  echo "Test 7: DFA matching"
+  $valgrind ./pcretest -q -dfa $testdata/testinput7 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput7 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
+  fi
+  echo "OK"
+fi
+
+if [ $do8 = yes ] ; then
+  echo "Test 8: DFA matching with UTF-8"
+  $valgrind ./pcretest -q -dfa $testdata/testinput8 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput8 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
+  fi
+  echo "OK"
+fi
+
+if [ $do9 = yes ] ; then
+  echo "Test 9: DFA matching with Unicode properties"
+  $valgrind ./pcretest -q -dfa $testdata/testinput9 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput9 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
+  fi
+  echo "OK"
+fi
+
+# Test of internal offsets and code sizes. This test is run only when there
+# is Unicode property support and the link size is 2. The actual tests are
+# mostly the same as in some of the above, but in this test we inspect some
+# offsets and sizes that require a known link size. This is a doublecheck for
+# the maintainer, just in case something changes unexpectely.
+
+if [ $do10 = yes ] ; then
+  echo "Test 10: Internal offsets and code size tests"
+  $valgrind ./pcretest -q $testdata/testinput10 testtry
+  if [ $? = 0 ] ; then
+    $cf $testdata/testoutput10 testtry
+    if [ $? != 0 ] ; then exit 1; fi
+  else exit 1
+  fi
+  echo "OK"
+fi
+
+# End


From mikej at freeswitch.org  Mon Jun  8 17:40:32 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 19:40:32 -0500
Subject: [Freeswitch-svn] [commit] r13711 - freeswitch/trunk/libs/pcre
Message-ID: 

Author: mikej
Date: Mon Jun  8 19:40:32 2009
New Revision: 13711

Log:
svn:ignore

Modified:
   freeswitch/trunk/libs/pcre/   (props changed)


From mikej at freeswitch.org  Mon Jun  8 18:08:51 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 20:08:51 -0500
Subject: [Freeswitch-svn] [commit] r13712 - freeswitch/trunk/libs/pcre
Message-ID: 

Author: mikej
Date: Mon Jun  8 20:08:51 2009
New Revision: 13712

Log:
remove docs without defined docdir to fix build

Modified:
   freeswitch/trunk/libs/pcre/Makefile.am

Modified: freeswitch/trunk/libs/pcre/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/pcre/Makefile.am	(original)
+++ freeswitch/trunk/libs/pcre/Makefile.am	Mon Jun  8 20:08:51 2009
@@ -1,64 +1,8 @@
 ## Process this file with automake to produce Makefile.in.
 
-dist_doc_DATA = \
-  doc/pcre.txt \
-  doc/pcre-config.txt \
-  doc/pcregrep.txt \
-  doc/pcretest.txt \
-  AUTHORS \
-  COPYING \
-  ChangeLog \
-  LICENCE \
-  NEWS \
-  README
-
-dist_html_DATA = \
-  doc/html/index.html \
-  doc/html/pcre.html \
-  doc/html/pcre-config.html \
-  doc/html/pcre_compile.html \
-  doc/html/pcre_compile2.html \
-  doc/html/pcre_config.html \
-  doc/html/pcre_copy_named_substring.html \
-  doc/html/pcre_copy_substring.html \
-  doc/html/pcre_dfa_exec.html \
-  doc/html/pcre_exec.html \
-  doc/html/pcre_free_substring.html \
-  doc/html/pcre_free_substring_list.html \
-  doc/html/pcre_fullinfo.html \
-  doc/html/pcre_get_named_substring.html \
-  doc/html/pcre_get_stringnumber.html \
-  doc/html/pcre_get_stringtable_entries.html \
-  doc/html/pcre_get_substring.html \
-  doc/html/pcre_get_substring_list.html \
-  doc/html/pcre_info.html \
-  doc/html/pcre_maketables.html \
-  doc/html/pcre_refcount.html \
-  doc/html/pcre_study.html \
-  doc/html/pcre_version.html \
-  doc/html/pcreapi.html \
-  doc/html/pcrebuild.html \
-  doc/html/pcrecallout.html \
-  doc/html/pcrecompat.html \
-  doc/html/pcregrep.html \
-  doc/html/pcrematching.html \
-  doc/html/pcrepartial.html \
-  doc/html/pcrepattern.html \
-  doc/html/pcreperform.html \
-  doc/html/pcreposix.html \
-  doc/html/pcreprecompile.html \
-  doc/html/pcresample.html \
-  doc/html/pcrestack.html \
-  doc/html/pcresyntax.html \
-  doc/html/pcretest.html
-
 pcrecpp_html = doc/html/pcrecpp.html
 dist_noinst_DATA = $(pcrecpp_html)
 
-if WITH_PCRE_CPP
-html_DATA = $(pcrecpp_html)
-endif
-
 # The Libtool libraries to install.  We'll add to this later.
 lib_LTLIBRARIES =
 


From mikej at freeswitch.org  Mon Jun  8 18:41:05 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 20:41:05 -0500
Subject: [Freeswitch-svn] [commit] r13713 - freeswitch/trunk/libs/iksemel/doc
Message-ID: 

Author: mikej
Date: Mon Jun  8 20:41:05 2009
New Revision: 13713

Log:
don't build docs that require new build dep texinfo

Modified:
   freeswitch/trunk/libs/iksemel/doc/Makefile.am

Modified: freeswitch/trunk/libs/iksemel/doc/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/iksemel/doc/Makefile.am	(original)
+++ freeswitch/trunk/libs/iksemel/doc/Makefile.am	Mon Jun  8 20:41:05 2009
@@ -2,4 +2,4 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-info_TEXINFOS = iksemel.texi
+#info_TEXINFOS = iksemel.texi


From mikej at freeswitch.org  Mon Jun  8 19:23:31 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 21:23:31 -0500
Subject: [Freeswitch-svn] [commit] r13714 - in freeswitch/trunk/libs: apr
	apr-util curl iksemel ilbc js js/nsprpub libdingaling libedit
	libsndfile pcre portaudio sofia-sip speex sqlite srtp voipcodecs
Message-ID: 

Author: mikej
Date: Mon Jun  8 21:23:31 2009
New Revision: 13714

Log:
svn:ignore

Modified:
   freeswitch/trunk/libs/apr/   (props changed)
   freeswitch/trunk/libs/apr-util/   (props changed)
   freeswitch/trunk/libs/curl/   (props changed)
   freeswitch/trunk/libs/iksemel/   (props changed)
   freeswitch/trunk/libs/ilbc/   (props changed)
   freeswitch/trunk/libs/js/   (props changed)
   freeswitch/trunk/libs/js/nsprpub/   (props changed)
   freeswitch/trunk/libs/libdingaling/   (props changed)
   freeswitch/trunk/libs/libedit/   (props changed)
   freeswitch/trunk/libs/libsndfile/   (props changed)
   freeswitch/trunk/libs/pcre/   (props changed)
   freeswitch/trunk/libs/portaudio/   (props changed)
   freeswitch/trunk/libs/sofia-sip/   (props changed)
   freeswitch/trunk/libs/speex/   (props changed)
   freeswitch/trunk/libs/sqlite/   (props changed)
   freeswitch/trunk/libs/srtp/   (props changed)
   freeswitch/trunk/libs/voipcodecs/   (props changed)


From mikej at freeswitch.org  Mon Jun  8 19:54:51 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 21:54:51 -0500
Subject: [Freeswitch-svn] [commit] r13715 - freeswitch/trunk/libs/js/nsprpub
Message-ID: 

Author: mikej
Date: Mon Jun  8 21:54:51 2009
New Revision: 13715

Log:
libnspr: fix bsd port packaging (FSBUILD-170)

Modified:
   freeswitch/trunk/libs/js/nsprpub/configure.in

Modified: freeswitch/trunk/libs/js/nsprpub/configure.in
==============================================================================
--- freeswitch/trunk/libs/js/nsprpub/configure.in	(original)
+++ freeswitch/trunk/libs/js/nsprpub/configure.in	Mon Jun  8 21:54:51 2009
@@ -1130,7 +1130,7 @@
     if test "$MOZ_OBJFORMAT" = "elf"; then
         DLL_SUFFIX=so
     else
-        DLL_SUFFIX=so.1.0
+        DLL_SUFFIX=so.1
     fi
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
     DSO_CFLAGS=-fPIC


From mikej at freeswitch.org  Mon Jun  8 20:25:49 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 08 Jun 2009 22:25:49 -0500
Subject: [Freeswitch-svn] [commit] r13716 - freeswitch/trunk/src/mod
Message-ID: 

Author: mikej
Date: Mon Jun  8 22:25:48 2009
New Revision: 13716

Log:
build: clean/uninstall disabled modules as well (FSBUILD-85)

Modified:
   freeswitch/trunk/src/mod/Makefile.am

Modified: freeswitch/trunk/src/mod/Makefile.am
==============================================================================
--- freeswitch/trunk/src/mod/Makefile.am	(original)
+++ freeswitch/trunk/src/mod/Makefile.am	Mon Jun  8 22:25:48 2009
@@ -1,7 +1,7 @@
 all: $(OUR_MODULES)
-clean: $(OUR_CLEAN_MODULES)
+clean: $(OUR_CLEAN_MODULES) $(OUR_DISABLED_CLEAN_MODULES)
 install: $(OUR_INSTALL_MODULES)
-uninstall: $(OUR_UNINSTALL_MODULES)
+uninstall: $(OUR_UNINSTALL_MODULES) $(OUR_DISABLED_UNINSTALL_MODULES)
 
 $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODULES) $(OUR_DISABLED_MODULES) $(OUR_DISABLED_CLEAN_MODULES) $(OUR_DISABLED_INSTALL_MODULES) $(OUR_DISABLED_UNINSTALL_MODULES):
 	@set fnord $$MAKEFLAGS; amf=$$2; \


From andrew at freeswitch.org  Mon Jun  8 22:24:55 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 00:24:55 -0500
Subject: [Freeswitch-svn] [commit] r13717 -
	freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
Message-ID: 

Author: andrew
Date: Tue Jun  9 00:24:55 2009
New Revision: 13717

Log:
Blindly adding winsock support, I'll test it when I get to a windows machine


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	Tue Jun  9 00:24:55 2009
@@ -245,7 +245,11 @@
 	switch_mutex_lock(listen_list.sock_mutex);
 	if (*sock) {
 		shutdown(*sock, SHUT_RDWR);
+#ifdef WIN32
+		closesocket(*sock);
+#else
 		close(*sock);
+#endif
 		sock = NULL;
 	}
 	switch_mutex_unlock(listen_list.sock_mutex);
@@ -1020,7 +1024,11 @@
 	int clientfd;
 
 	if (SWITCH_STATUS_SUCCESS==initialise_ei(&ec)) {
+#ifdef WIN32
+		WSASetLastError(0);
+#else
 		errno = 0;
+#endif
 		if ((clientfd=ei_connect(&ec,node)) < 0) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error connecting to node %s (erl_errno=%d, errno=%d)!\n",node,erl_errno,errno);
 			return NULL;
@@ -1404,6 +1412,23 @@
 	int on = 1;
 	int clientfd;
 	int epmdfd;
+#ifdef WIN32
+	/* borrowed from MSDN, stupid winsock */
+	WORD wVersionRequested;
+	WSADATA wsaData;
+
+	wVersionRequested = MAKEWORD(2, 2);
+	
+	if (WSAStartup(wVersionRequested, &wsaData) != 0) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Winsock initialization failed, oh well\n");
+		return SWITCH_STATUS_TERM;
+	}
+
+	if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Your winsock version doesn't support the 2.2 specification, bailing\n");
+		return SWITCH_STATUS_TERM;
+	}
+#endif
 
 	memset(&listen_list, 0, sizeof(listen_list));
 	config();
@@ -1488,7 +1513,11 @@
 		/* zero out errno because ei_accept doesn't differentiate between a
 		 * failed authentication or a socket failure, or a client version
 		 * mismatch or a godzilla attack */
+#ifdef WIN32
+		WSASetLastError(0);
+#else
 		errno = 0;
+#endif
 		if ((clientfd = ei_accept_tmo(&ec, listen_list.sockfd, &conn, 100)) == ERL_ERROR) {
 			if (prefs.done) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Shutting Down\n");
@@ -1570,6 +1599,10 @@
 		close_socket(&l->sockfd);
 	}
 
+#ifdef WIN32
+	WSACleanup();
+#endif
+
 	switch_mutex_unlock(globals.listener_mutex);
 
 	switch_sleep(1500000); /* sleep for 1.5 seconds */

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h	Tue Jun  9 00:24:55 2009
@@ -143,7 +143,11 @@
 typedef struct globals_struct globals_t;
 
 struct listen_list_struct {
+#ifdef WIN32
+	SOCKET sockfd;
+#else
 	int sockfd;
+#endif
 	switch_mutex_t *sock_mutex;
 	listener_t *listeners;
 	uint8_t ready;
@@ -216,6 +220,10 @@
 		break; \
 }
 
+#ifdef WIN32 /* MSDN suggested hack to fake errno for network operations */
+#define errno WSAGetLastError()
+#endif
+
 /* mod_erlang_event.c */
 session_elem_t* attach_call_to_registered_process(listener_t* listener, char* reg_name, switch_core_session_t *session);
 session_elem_t* attach_call_to_pid(listener_t* listener, erlang_pid* pid, switch_core_session_t *session);


From mrene at freeswitch.org  Tue Jun  9 06:50:11 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 08:50:11 -0500
Subject: [Freeswitch-svn] [commit] r13718 -
	freeswitch/trunk/src/mod/applications/mod_nibblebill
Message-ID: 

Author: mrene
Date: Tue Jun  9 08:50:11 2009
New Revision: 13718

Log:
mod_nibblebill: move return statement inside odbc ifdef

Modified:
   freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c

Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	Tue Jun  9 08:50:11 2009
@@ -363,9 +363,9 @@
 
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,  "Retrieved current balance for account %s (balance = %f)\n", billaccount, balance);
 	}
-
-#endif
+	
 	return balance;
+#endif
 }
 
 /* This is where we actually charge the guy 


From brian at freeswitch.org  Tue Jun  9 07:13:33 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 09:13:33 -0500
Subject: [Freeswitch-svn] [commit] r13719 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: brian
Date: Tue Jun  9 09:13:32 2009
New Revision: 13719

Log:
 MODENDP-225 

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c	Tue Jun  9 09:13:32 2009
@@ -1351,7 +1351,7 @@
 	char *call_id = argv[7];
 	char *expires = argv[10];
 	char *profile_name = argv[13];
-	char *body = argv[14];
+	char *body = argv[15];
 	char *id = NULL;
 	nua_handle_t *nh;
 	int expire_sec = atoi(expires);


From brian at freeswitch.org  Tue Jun  9 07:40:27 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 09:40:27 -0500
Subject: [Freeswitch-svn] [commit] r13720 - freeswitch/trunk/src
Message-ID: 

Author: brian
Date: Tue Jun  9 09:40:27 2009
New Revision: 13720

Log:
 don't let 0.0.0.0 be valid for upnp because some devices that are not internet gateways will return this ie printers 

Modified:
   freeswitch/trunk/src/switch_nat.c

Modified: freeswitch/trunk/src/switch_nat.c
==============================================================================
--- freeswitch/trunk/src/switch_nat.c	(original)
+++ freeswitch/trunk/src/switch_nat.c	Tue Jun  9 09:40:27 2009
@@ -74,6 +74,7 @@
 		}
 		if (!dev) {
 			dev = devlist; /* defaulting to first device */
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No InternetGatewayDevice, using first entry as default.\n");
 		}
 		
 		descXML = miniwget(dev->descURL, &descXMLsize);
@@ -91,6 +92,12 @@
 									   nat_globals.data.servicetype,
 									   nat_globals.pub_addr)) == UPNPCOMMAND_SUCCESS) {
 
+		if (!strcmp(nat_globals.pub_addr, "0.0.0.0")) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 
+							  "uPNP Device (url: %s) returned an invalid external address of 0.0.0.0.  Disabling uPNP\n", nat_globals.urls.controlURL);
+			return -2;
+		}
+
 		nat_globals.nat_type = SWITCH_NAT_TYPE_UPNP;
 		return 0;
 	}


From mikej at freeswitch.org  Tue Jun  9 08:09:39 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 10:09:39 -0500
Subject: [Freeswitch-svn] [commit] r13721 -
	freeswitch/trunk/src/mod/languages/mod_python
Message-ID: 

Author: mikej
Date: Tue Jun  9 10:09:39 2009
New Revision: 13721

Log:
mod_python: fix seg on unload when scripts are running (MODLANG-107)

Modified:
   freeswitch/trunk/src/mod/languages/mod_python/mod_python.c

Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c	(original)
+++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c	Tue Jun  9 10:09:39 2009
@@ -59,7 +59,17 @@
 	char *xml_handler;
 } globals;
 
-static void eval_some_python(const char *funcname, char *args, switch_core_session_t *session, switch_stream_handle_t *stream, switch_event_t *params, char **str)
+struct switch_py_thread {
+	struct switch_py_thread *prev, *next; 
+	char *cmd;
+	char *args;
+	switch_memory_pool_t *pool;
+	PyThreadState *tstate;
+};
+struct switch_py_thread *thread_pool_head = NULL;
+static switch_mutex_t *THREAD_POOL_LOCK = NULL;
+
+static void eval_some_python(const char *funcname, char *args, switch_core_session_t *session, switch_stream_handle_t *stream, switch_event_t *params, char **str, struct switch_py_thread *pt)
 {
 	PyThreadState *tstate = NULL;
 	char *dupargs = NULL;
@@ -110,6 +120,11 @@
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error acquiring tstate\n");
 		goto done;
 	}
+	
+	/* Save state in thread struct so we can terminate it later if needed */
+	if (pt)
+		pt->tstate = tstate;
+
 	// swap in thread state
 	PyEval_AcquireThread(tstate);
 	init_freeswitch();
@@ -178,7 +193,8 @@
 		if (str) {
 			*str = strdup((char *) PyString_AsString(result));
 		}
-	} else {
+	} else if (!PyErr_ExceptionMatches(PyExc_SystemExit)) {
+		// Print error, but ignore SystemExit 
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error calling python script\n");
 		PyErr_Print();
 		PyErr_Clear();
@@ -224,7 +240,7 @@
 
 		switch_assert(mycmd);
 
-		eval_some_python("xml_fetch", mycmd, NULL, NULL, params, &str);
+		eval_some_python("xml_fetch", mycmd, NULL, NULL, params, &str, NULL);
 
 		if (str) {
 			if (switch_strlen_zero(str)) {
@@ -278,21 +294,36 @@
 
 SWITCH_STANDARD_APP(python_function)
 {
-	eval_some_python("handler", (char *) data, session, NULL, NULL, NULL);
+	eval_some_python("handler", (char *) data, session, NULL, NULL, NULL, NULL);
 
 }
 
-struct switch_py_thread {
-	char *args;
-	switch_memory_pool_t *pool;
-};
-
 static void *SWITCH_THREAD_FUNC py_thread_run(switch_thread_t *thread, void *obj)
 {
 	switch_memory_pool_t *pool;
 	struct switch_py_thread *pt = (struct switch_py_thread *) obj;
 
-	eval_some_python("runtime", pt->args, NULL, NULL, NULL, NULL);
+	/* Put thread in pool so we keep track of our threads */
+	switch_mutex_lock(THREAD_POOL_LOCK);
+	pt->next = thread_pool_head;
+	pt->prev = NULL;
+	if (pt->next)
+		pt->next->prev = pt;
+	thread_pool_head = pt;
+	switch_mutex_unlock(THREAD_POOL_LOCK);
+
+	/* Run the python script */
+	eval_some_python("runtime", pt->args, NULL, NULL, NULL, NULL, pt);
+
+	/* Thread is dead, remove from pool */
+	switch_mutex_lock(THREAD_POOL_LOCK);
+	if (pt->next)
+		pt->next->prev = pt->prev;
+	if (pt->prev)
+		pt->prev->next = pt->next;
+	if (thread_pool_head == pt)
+		thread_pool_head = pt->next;
+	switch_mutex_unlock(THREAD_POOL_LOCK);
 
 	pool = pt->pool;
 	switch_core_destroy_memory_pool(&pool);
@@ -303,7 +334,7 @@
 SWITCH_STANDARD_API(api_python)
 {
 	
-	eval_some_python("fsapi", (char *) cmd, session, stream, NULL, NULL);
+	eval_some_python("fsapi", (char *) cmd, session, stream, NULL, NULL, NULL);
 
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -383,6 +414,8 @@
 		PyEval_ReleaseLock();
 	}
 
+	switch_mutex_init(&THREAD_POOL_LOCK, SWITCH_MUTEX_NESTED, pool);
+
 	do_config();
 
 	/* connect my internal structure to the blank pointer passed to me */
@@ -402,6 +435,53 @@
 {
 	PyInterpreterState *mainInterpreterState;
 	PyThreadState *myThreadState;
+	int thread_cnt = 0;
+	struct switch_py_thread *pt = NULL;
+	struct switch_py_thread *nextpt;
+	int i;
+
+	/* Kill all remaining threads */
+	pt = thread_pool_head;
+	PyEval_AcquireLock();
+	while (pt) {
+		thread_cnt ++;
+		nextpt = pt->next;
+		
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 
+						  "Forcibly terminating script [%s]\n", pt->args);
+
+		/* Kill python script */
+		PyThreadState_Swap(pt->tstate);
+		PyThreadState_SetAsyncExc(pt->tstate->thread_id, PyExc_SystemExit);
+
+		pt = nextpt;
+	}
+	PyThreadState_Swap(mainThreadState);
+	PyEval_ReleaseLock();
+	switch_yield(1000000);
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 
+					  "Had to kill %d threads\n", thread_cnt);
+
+	/* Give threads a few seconds to terminate. 
+	   Not using switch_thread_join() since if threads refuse to die
+	   then freeswitch will hang */
+	for (i=0; i < 10 && thread_pool_head; i++) {
+		switch_yield(1000000);
+	}
+	if (thread_pool_head) {
+		/* Not all threads died in time */
+		pt = thread_pool_head;
+		while (pt) {
+			nextpt = pt->next;
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 
+						  "Script [%s] didn't exit in time\n", pt->args);
+			pt = nextpt;
+		}
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, 
+						  "Forcing python shutdown. This might cause freeswitch to crash!\n");
+	}
+
 
 	PyEval_AcquireLock();
 	mainInterpreterState = mainThreadState->interp;


From jmesquita at freeswitch.org  Tue Jun  9 08:36:45 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 10:36:45 -0500
Subject: [Freeswitch-svn] [commit] r13722 - in
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp: . include
Message-ID: 

Author: jmesquita
Date: Tue Jun  9 10:36:45 2009
New Revision: 13722

Log:
Initial checkin of mod_khomp endpoint module


Added:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KDefs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KErrorDefs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KGSM.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KH100Defs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KISDN.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KMixerDefs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KR2D.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KTypeDefs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KVoIP.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3l.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3lVersion.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,4 @@
+MODNAME=mod_khomp
+LOCAL_CFLAGS=-I./include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -lboost_thread -lboost_regex
+
+include ../../../../build/modmake.rules

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KDefs.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KDefs.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,985 @@
+#if !defined KLDEFS_H
+#define KLDEFS_H
+
+#include "KTypeDefs.h"
+#include "KH100Defs.h"
+#include "KMixerDefs.h"
+#include "KR2D.h"
+#include "KErrorDefs.h"
+
+/*
+	Faixa de comandos:
+	0x00 - 0x3F: Comandos de operacao do canal
+	0x40 - 0x5F: Habilitacao de recursos
+	0x60 - 0x7F: Mixer (KMixerDefs.h)
+	0x80 - 0x8F: Especificos para R2 (KR2D.h)
+	0x90 - 0x9F: H100
+	0xA0 - 0xAF: Mais comandos de mixer
+    0xB0 - 0xCF: Vagos
+	0xD0 - 0xDF: Compatiblidade
+	0xF0 - 0xFE: Erros
+	0x8000 - 0xFF00: Configuracao
+*/
+
+
+/******************************************************************************
+Comandos de controle de liga??o
+Call control commands
+******************************************************************************/
+
+#define CM_SEIZE					0x01
+/*	Solicita uma ocupa??o no canal.
+	Requests a seize in the channel.
+
+	K3L_COMMAND.Object = ChannelNumber
+
+	Events: EV_SEIZE_SUCCESS | EV_SEIZE_FAIL
+  Params:
+	[0..20] - ANI (ascii, null terminated)
+*/     
+
+#define CM_SYNC_SEIZE				0x02
+/*	Ocupa um canal, e retorna imediatamente o resultado.
+	Seizes a channel returning synchronously.
+
+    K3L_COMMAND.Object = ChannelNumber
+
+	Events: (synchronous command)
+  Params:
+	[0..20] - ANI (ascii, null terminated)
+*/
+
+#define CM_SIP_REGISTER             0x03
+/*	Registra um usuario sip (somente para sinalizacao SIP)
+	Register a sip user (SIP singnaling only)
+	
+    Events: EV_SIP_REGISTER_INFO
+	Params:
+	A null terminated ascii string with the registration parameters.
+	The expected call parameters are:
+	Parameter:          		Required:	Description:
+	user                   		yes			User name
+	password              		no			User password
+	proxy                  		no			Proxy to register into
+	unregister          		no			Signal to unregister a previously registered user
+*/
+
+#define CM_DIAL_DTMF				0x04
+/*	Disca uma string terminada em 0 em DTMF.
+	Dial a null terminated string, in DTMF.
+
+    K3L_COMMAND.Object = ChannelNumber
+
+	Events: EV_DTMF_SEND_FINISH
+
+  Params:
+	String with the number to dial (ascii)
+*/
+
+#define CM_DISCONNECT				0x05
+/*	Desliga.
+	Disconnects.
+
+	K3L_COMMAND.Object = ChannelNumber
+
+	Events: EV_CHANNEL_FREE
+*/
+
+#define CM_CONNECT					0x06
+/*	Atende uma chamada recebida.
+	Answers a incoming call.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_PRE_CONNECT				0x07
+/*	Habilita audio antes de enviar o comando atendimento (mensagem sem tarifacao).
+	Enable audio before send an answer command (no charged messages).
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_CAS_CHANGE_LINE_STT		0x08
+/*	Para sinalizacao do tipo personalizada, muda o estado dos bits ABCD de saida
+	For custom signaling changes forward ABCD bits state
+
+	K3L_COMMAND.Object = ChannelNumber
+	
+	Params:
+	[0] - New state
+*/
+
+#define CM_CAS_SEND_MFC				0x09
+/*	Para sinalizacao do tipo personalizada, envia uma nova cifra MFC
+	For custom signaling changes, sends a new MFC
+
+	K3L_COMMAND.Object = ChannelNumber
+	
+	Params:
+	[0] - New state
+*/
+
+#define CM_SET_FORWARD_CHANNEL		0x0A
+/*	Programa um canal para ser prosseguir com as ligacoes de outro canal.
+	Sets the a channel to forward call from the actual channel.
+
+	K3L_COMMAND.Object = ChannelNumber
+
+	Params:
+	[0..3] - Pointer to an interger containing the forward channel number
+*/
+
+#define CM_CAS_SET_MFC_DETECT_MODE	0x0B
+/*	Habilita e configura o detector de MFC para filtra sinais de entrada ou saida
+	Enables and configures the MFC detectors to filters incoming ou outgoing signals
+
+	K3L_COMMAND.Object = ChannelNumber
+	Params:
+	[0] - kscFree( 0 )/kcsIncoming( 1 )/kcsOutgoing( 2 )
+*/
+
+#define CM_DROP_COLLECT_CALL		0x0C
+/*	Derruba chamadas a cobrar, desligando a chamada e a atendendendo novamente ap?s o
+    tempo configurado.
+	Drops collect calls by disconnecting and connecting again after the configured delay.
+*/
+
+
+#define CM_MAKE_CALL				0x0D
+/*	Realiza uma chamada (disponivel para sinalizacao SIP)
+	Make a call (available for SIP singnaling)
+	
+	K3L_COMMAND.Object = ChannelNumber
+
+    Events: EV_CALL_SUCCESS | EV_CALL_FAIL
+	Params:
+	A null terminated ascii string with the call parameters.
+	The expected call parameters are:
+	Parameter:          				Required:	Protocol:   Description:
+	dest_addr                           yes         ALL         Destiny's number (address)
+	orig_addr           		        yes         ALL         Caller number (address)
+	sip_to              				no          IP          Destiny's address/ID (same as dest_addr, can be used instead)
+	network_dest_addr   				no          IP          Destiny's/SIP Proxy network address
+	r2_categ_a                          no          R2          Caller Category
+	isdn_orig_type_of_number            no          ISDN        Caller type of number (KQ931TypeOfNumber, KISDN.h)
+	isdn_orig_numbering_plan            no          ISDN        Caller numbering plan (KQ931NumberingPlan, KISDN.h)
+	isdn_orig_presentation              no          ISDN        Callers presentation indicator (KQ931PresentationIndicator, KISDN.h)
+	isdn_dest_type_of_number            no          ISDN        Destiny's type of number
+	isdn_dest_numbering_plan            no          ISDN        Destiny's numbering plan
+*/
+
+#define CM_RINGBACK 				0x0E
+/*  Aceita ou rejeita a chamada entrante em qualquer sinaliza??o, equivalente a CM_SEND_LINE_CONDITION para
+	o R2 Digital.
+	
+    Accepts or reject an incomming call in any signaling, equivalent to CM_SEND_LINE_CONDITION in Digital R2.
+   
+    K3L_COMMAND.Object = ChannelNumber
+    Params:
+    A null terminated ascii string with the parameter to pass or NULL for default
+
+	The expected parameters are:
+	Parameter:			Protocol:	Description:
+	r2_cond_b			R2			Called party category. Note that if CM_SET_LINE_CONDITION was called before it
+									is not needed to call CM_RINGBACK, the category is sent automatically.
+	sip_prov_resp		IP			Sip Response, if present, sends a DISCONNECT with given response (reason),
+									default is to send a ringback to caller.
+	isdn_cause			ISDN		ISDN cause, if present, sends DISCONNECT with given cause, default is to
+									send alerting indication to caller.
+*/
+
+#define CM_USER_INFORMATION         0x0F
+/*  Envia dados sobre o canal HDLC, dispon?vel somente para RDSI.
+
+    K3L_COMMAND.Object = ChannelNumber
+    Params:
+    A pointer to a KUserInformation structure which has the following members:
+
+    ProtocolDescriptor - KQ931UserInfoProtocolDescriptor
+    UserInfoLength - Length of UserInfo data array
+    UserInfo - pointer to the data array to be transmitted
+
+
+
+*/
+
+#define CM_VOIP_SEIZE				0x23
+/*  EM DESUSO: Usar CM_MAKE_CALL
+    DEPRECATED: Use CM_MAKE_CALL instead
+*/
+
+/******************************************************************************
+Bloqueio e desbloqueio de canais (E1)
+Channel locking and unlocking	 (E1)
+******************************************************************************/
+
+#define	CM_LOCK_INCOMING			0x10
+/*	Solicita ? operadora o bloqueio de liga??es entrantes.
+	Requests the central office a lock of incoming calls.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_UNLOCK_INCOMING			0x11
+/*	Solicita ? operadora o desbloqueio de liga??es entrantes.
+	Requests the central office to unlock incoming calls.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_LOCK_OUTGOING			0x12
+/*	Bloqueia liga??es saintes..
+	Locks outgoing calls.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_UNLOCK_OUTGOING			0x13
+/*	Desbloqueia liga??es saintes.
+	Unlocks outgoing calls.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_START_SEND_FAIL			0x14
+/*	Inicia envio de falha na linha.
+	Starts to send a fail signal in the line.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_STOP_SEND_FAIL			0x15
+/*	Para o envio de falha na linha.
+	Stop send a fail signal in the line.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_END_OF_NUMBER            0x16
+/*  Informa a sinalizacao que nao devem ser recebidos mais digitos de discagem
+    Notify singaling to dont receive more digits
+
+    K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_SEND_SIP_DATA			0x17
+/*
+	Envia dados raw atrav?s de uma liga??o SIP(s? funciona com liga??es K3L para K3L)
+	Send raw data throught a SIP call(works only with K3L to K3L calls)
+
+	K3L_COMMAND.Object = ChannelNumber
+    Params:
+    A pointer to a KSipData structure which has the following members:
+
+    DataLength - Length of data array
+    Data       - pointer to the data array to be transmitted
+*/
+
+#define CM_SS_TRANSFER              0x18
+/*  single step transfer, QSig signaling only!
+
+    Params:
+    Events: EV_DISCONNECT | EV_SS_TRANSFER_FAIL
+	Params:
+	A null terminated ascii string with the call parameters.
+	The expected call parameters are:
+	Parameter:          		Required:	Type:       Description:
+    transferred_to              yes         int string  The number to be transferred to
+    await_connect               no          boolean     Await to be connected to the third party, default 0 (false)
+*/
+
+#define CM_GET_SMS                  0x19
+/* Verifica novas mensagens SMS
+   Check for new SMS messages
+
+   K3L_COMMAND.Object = ChannelNumber
+
+   Events: EV_SMS_INFO, EV_SMS_DATA
+*/
+
+#define CM_PREPARE_SMS              0x1A
+/* Armazena o texto a ser enviado via SMS
+   Store SMS text to send
+
+   K3L_COMMAND.Object = ChannelNumber
+   K3L_COMMAND.Params = A null terminated ascii string with the text
+*/
+
+#define CM_SEND_SMS                 0x1B
+/* Envia o ultimo SMS armazenado com CM_PREPARE_SMS
+   Send the last SMS stored with CM_PREPARE_SMS
+
+   K3L_COMMAND.Object = ChannelNumber
+   K3L_COMMAND.Params = A null terminated ascii string with the SMS params
+   Parameter:       Type:           Description:
+   sms_to           int             The number to be send
+   sms_coding       enum:           The message coding (Optional)
+                     iso88591        iso88591 converted to 7-bits GSM alphabet (Default)
+                     user            8-bits user-defined alphabet
+
+   Events: EV_SMS_SEND_RESULT
+*/
+
+#define CM_SEND_TO_MODEM            0x1C
+/* Envia o comando para o Modem
+   Send command to Modem
+
+   K3L_COMMAND.Object = ChannelNumber
+   K3L_COMMAND.Params = A null terminated ascii string with the AT modem command
+*/
+
+#define CM_CHECK_NEW_SMS            0x1D
+/* Consulta sobre novos SMSs
+   Check for new SMSs arrived
+
+   K3L_COMMAND.Object = ChannelNumber
+
+   Events: EV_NEW_SMS
+*/
+
+#define CM_ISDN_SEND_SUBADDRESSES   0x1E
+/* Envia os par?metros de Calling/Called Party Subaddress no SETUP da pr?xima liga??o
+   Sends Calling/Called Party Subaddress information elements in next call's SETUP.
+
+   K3L_COMMAND.Object = ChannelNumber
+   K3L_COMMAND.Params = A pointer to a KISDNSubaddresses structure 
+        containing both Calling and Called Party Subaddress, in the 
+        case of one of them is to be missing in the SETUP message, 
+        Subaddress Information Length should be set to 0 (zero).
+
+   See:
+        CM_MAKE_CALL
+        EV_NEW_CALL
+        EV_ISDN_SUBADDRESSES
+
+*/
+
+/******************************************************************************
+Ativacao de recursos
+Resource enabling
+******************************************************************************/
+#define CM_ENABLE_DTMF_SUPPRESSION	0x30
+/*
+	Habilita a supressao de DTMF
+	Enables dtmf suppression
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_DTMF_SUPPRESSION	0x31
+/*	Desabilita a supressao de DTMF
+	Disables dtmf suppression
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_ENABLE_AUDIO_EVENTS		0x32
+/*	Habilita os eventos de audio.
+	Enable audio events.
+
+    K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_AUDIO_EVENTS		0x33
+/*	Desabilita os eventos de audio.
+	Disable audio events.
+
+    K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_ENABLE_CALL_PROGRESS		0x34
+/*	Habilita o call progress automatico.
+	Enable automatic call progress.
+
+    K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_CALL_PROGRESS	0x35
+/*	Desabilita o call progress automatico.
+	Disable automatic call progress.
+
+    K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_FLASH					0x36
+/*	Flash
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_ENABLE_PULSE_DETECTION	0x37
+/*
+	Habilita a detec??o de Pulso(dec?dica)
+	Enables pulse detection
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_PULSE_DETECTION	0x38
+/*
+	Desabilita a detec??o de Pulso(dec?dica)
+	Disables pulse detection
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_ENABLE_ECHO_CANCELLER	0x39
+/*
+	Habilita o cancelamento de eco.
+	Enables echo cancelation
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_ECHO_CANCELLER	0x3A
+/*
+	Desabilita o cancelador de eco.
+	Disables echo cancelation.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_ENABLE_AGC				0x3B
+/*
+	Habilita o controle de ganho autom?tico do canal.
+	Enable auto gain contol.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_AGC				0x3C
+/*
+	Desabilita o controle de ganho autom?tico do canal.
+	Disable auto gain contol.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_ENABLE_HIGH_IMP_EVENTS	0x3D
+/*
+	Habilita eventos e grava??o de audio com a linha em alta imped?ncia.
+	Enable audio events and record with high impedance line.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_HIGH_IMP_EVENTS	0x3E
+/*
+	Desabilita eventos e grava??o de audio com a linha em alta imped?ncia.
+	Disable audio events and record with high impedance line.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_ENABLE_CALL_ANSWER_INFO  0x40
+/*
+	Desabilita evento de informa??o de atendimento.
+	Disable call answer info event.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_CALL_ANSWER_INFO 0x41
+/*
+	Habilita evento de informa??o de atendimento.
+	Enable call answer info event.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+
+/******************************************************************************
+Comandos de link e da placa (E1)
+Link and board commands (E1)
+******************************************************************************/
+#define CM_RESET_LINK				0xF1
+/*	Reinicia o link inteiro.
+	Resets the entire link.
+
+	K3L_COMMAND.Object = LinkNumber
+*/
+
+#define CM_CLEAR_LINK_ERROR_COUNTER 0xF2
+/*  Clears the error counters for the specified link.
+    Zera os contadores de erro para o link indicado.
+
+    K3L_COMMAND.Object = LinkNumber
+*/
+
+#define CM_SEND_DEVICE_SECURITY_KEY 0xF3
+/*  Usado para liberar placas que estejam utilizando a prote??o de integradores
+    Used to unlock boards that are using integrator protection.
+    
+    Params:
+    	Pointer to an unsigned integer containing the security key for the board.
+    	
+    See:
+    	EV_REQUEST_DEVICE_SECURITY_KEY
+*/
+
+/******************************************************************************
+ Eventos enviados da placa ao host
+ Device to host sent events
+******************************************************************************/
+
+#define EV_CHANNEL_FREE				0x01
+/*	O canal est? livre para uso
+	Channel ready for use
+*/
+
+#define EV_CONNECT					0x03
+/*	A chamada esta completa e os recursos de audio estao ativos.
+	Call completed. Audio resources ready.
+*/
+
+#define EV_DISCONNECT				0x04
+/*	O assinante B desligou.
+	Called part dropped the call.
+	
+	K3L_EVENT.AddInfo = Disconnect Cause (KQ931Cause if signaling is ISDN, zero otherwise)
+*/
+
+#define EV_CALL_SUCCESS				0x05
+/*	A chamada ter? proceguimento. Na sinaliza??o R2, o campo AddInfo informa a condi??o de B (Grupo B).
+	Call will proceed. In R2 signaling, field AddInfo contains B's condition (Group B).
+
+	K3L_EVENT.AddInfo = Called line condition (if in R2D)
+
+	Obs: Eventos consecutivos: EV_CONNECT (atendimento) ou EV_NO_ANSWER (ningu?m atende).
+		 Following events: EV_CONNECT (answering) or EV_NO_ANSWER (nobody answers).
+*/
+
+#define EV_CALL_FAIL				0x06
+/*	A chamada n?o proceder?. O campo AddInfo informa o motivo.
+	Call fails and will not proceed. Field AddInfo indicates the given reason.
+
+	K3L_EVENT.AddInfo = Reason of disconnection.
+
+		R2		- Group B (KSignGroupB, KR2D.h)
+		ISDN	- ISDN cause (KQ931Cause, KISDN.h)
+		Analog 	- Cadence name that has been detected ('A'-'Z')
+
+    Obs: Eventos consecutivos: EV_CHANNEL_FREE
+		 Following events:     EV_CHANNEL_FREE
+*/
+
+#define EV_NO_ANSWER				0x07
+/*	Destino n?o atende.
+	Called does not answer.
+*/
+
+#define EV_BILLING_PULSE			0x08
+/*	Recebido um pulso de cobran?a.
+	A billing pulse was received.
+*/
+
+#define EV_SEIZE_SUCCESS			0x09
+/*	A solicita??o de ocupa??o assincrona foi bem sucedida.
+	The async seizure command was successful.
+*/
+
+#define EV_SEIZE_FAIL				0x0A
+/*	Falhas na ocupa??o assincrona.
+	Async seize fail.
+
+	K3L_EVENT.AddInfo = Fail cause. (enum KSeizeFail)
+*/
+
+#define EV_SEIZURE_START			0x0B
+/*	Notificao de ocupacao do canal, inicio da sinalizacao.
+	Channel seizure notification, begin of signaling.
+*/
+
+#define EV_CAS_LINE_STT_CHANGED		0x0C
+/*	Notificacao de mudanca no estado da linha (ABCD)
+	Line state change notification (ABCD)
+*/
+
+#define EV_CAS_MFC_RECV				0x0D
+/*	Recebimento de cifra MFC
+	MFC digit received
+*/
+
+#define EV_NEW_CALL                 0x0E
+/*  Notifica??o de recebimento de chamada
+    Call arriving notification
+
+  Params:
+		A null terminated ascii string with the call parameters. To easily get the parameters, use
+	the k3lGetEventParam function.
+	The parameters that could be present are:
+	Parameter:					        Protocol:   Description:
+	dest_addr		                    ALL         Destiny's number (address)
+	orig_addr                           ALL         Caller number (address)
+	network_orig_addr                   IP          Caller SIP network address
+	r2_categ_a                          R2          Caller Category
+	isdn_orig_type_of_number            ISDN        Caller type of number (KQ931TypeOfNumber, KISDN.h)
+	isdn_orig_numbering_plan            ISDN        Caller numbering plan (KQ931NumberingPlan, KISDN.h)
+	isdn_orig_presentation              ISDN        Caller presentation indicator (KQ931PresentationIndicator, KISDN.h)
+    isdn_orig_screening                 ISDN        Caller screening indicator (KQ931ScreeningIndicator, KISDN.h)
+	isdn_dest_type_of_number            ISDN        Destiny's type of number
+	isdn_dest_numbering_plan            ISDN        Destiny's numbering plan
+	isdn_redirecting_number             ISDN        "TRUE" if call is being redirected
+	isdn_reverse_charge                 ISDN        "TRUE" if call is reverse charge (collect call)
+    isdn_has_subaddresses               ISDN        "TRUE" if call has subaddresses information (will be
+                                                    sent in EV_ISDN_SUBADDRESSES)
+*/
+
+#define EV_USER_INFORMATION         0x0F
+/*  Notifica??o de dados de usu?rio recebidos pelo HDLC em uma liga??o RDSI.
+    User information received by HDLC in ISDN call.
+
+    Params:
+        A pointer to a KUserInformation structure, containing information and the data itself.
+
+*/
+
+#define EV_DIALED_DIGIT             0x10
+/*  Recebido digito de discagem
+    Dialing digit received
+   
+    K3L_EVENT.AddInfo = Digit (ascii)
+*/
+
+#define EV_SIP_REGISTER_INFO        0x11
+/*  Notifica??o de conclusao de registro
+    Register conclusion notification
+
+  Params:
+        A null terminated ascii string with the registration parameters.
+    The expected call parameters are:
+    Parameter:          		Description:
+    user                   		User name of registration
+    proxy                  		Registration proxy
+	unregister          		Signal that this the event represents a response to an user unregistration
+
+    K3L_EVENT.AddInfo = SIP Response. ( enum KSIP_Failures )
+*/
+
+#define EV_RING_DETECTED            0x12
+/*  Recebido ring em ramal anal?gico
+    Ringing received on analog branch
+
+    Only Available when High Impedance Events are disabled.
+
+    See:
+        CM_ENABLE_HIGH_IMP_EVENTS
+        CM_DISABLE_HIGH_IMP_EVENTS
+*/
+
+#define EV_ISDN_SUBADDRESSES        0x13
+/*  Chamada RDSI possuia informa??o de Subaddress na mensagem  SETUP
+    ISDN Call has subadress information in SETUP message
+
+   Params:
+        A pointer to a KISDNSubaddresses structure containing both
+        Calling and Called Party Subaddress, in the case of one of
+        them is missing in the SETUP message, Subaddress Information
+        Length will be set to 0 (zero).
+
+   See:
+        EV_NEW_CALL
+
+*/
+
+#define EV_CALL_HOLD_START			0x16
+/*  Indica se o canal entrou em espera
+    Indicates if a channel is being held
+*/
+
+#define EV_CALL_HOLD_STOP			0x17
+/*  Indica se o canal saiu da espera
+    Indicates if a channel left hold state
+*/
+
+#define EV_SS_TRANSFER_FAIL         0x18
+/*  Falha na transferencia do QSig!
+    QSig Single Step Transfer Fail   
+*/
+
+#define EV_FLASH                    0x19
+/*  Flash detectado
+    Flash detected
+*/
+
+#define EV_ISDN_PROGRESS_INDICATOR	0x1A
+/*  Recebimento do elemento de informa??o Progress Indicator
+	em canal RDSI.
+	Progress Indicator information element received in a
+	ISDN channel.
+
+	K3L_EVENT.AddInfo = Progress Description (KQ931ProgressIndication, KISDN.h)
+
+*/
+
+#define EV_DTMF_DETECTED			0x20
+/*	Detectado d?gito DTMF.
+	DTMF digit detected.
+
+	K3L_EVENT.AddInfo = Detected digit (ascii)
+*/
+
+#define EV_DTMF_SEND_FINISH			0x21
+/*	Fim da discagem DTMF
+	DTMF dial complete
+*/
+
+#define EV_AUDIO_STATUS				0x22
+/*	Mudan?a no estado do audio do canal.
+	Audio status changed.
+
+	K3L_EVENT.AddInfo = Audio detected. (enum KMixerTone)
+*/
+
+#define EV_CADENCE_RECOGNIZED		0x23
+#define EV_CALL_PROGRESS			EV_CADENCE_RECOGNIZED
+/*	Deteccao de uma cadencia no call progress.
+	Cadenced detected by automatic call progress.
+
+	K3L_EVENT.AddInfo = Cadence index defined in config. file
+*/
+
+#define EV_END_OF_STREAM			0x24
+/*	Encontrado fim de arquivo ou de buffer na reprodu??o de ?udio.
+	End of file or end of buffer reached during a play.
+*/
+
+#define EV_PULSE_DETECTED			0x25
+/*	Detectado d?gito dec?dico.
+	PULSE digit detected.
+
+	K3L_EVENT.AddInfo = Detected digit (ascii)
+*/
+
+#define EV_POLARITY_REVERSAL		0x26
+/*  Detectada inversao de polaridade
+	Polarity reversal detected
+*/
+
+#define EV_CALL_ANSWER_INFO     	0x27
+/*  Indicates information about the call after connection
+	Indica o informa??es sobre a chamada quando ela ? completada
+    Obs.: the indications are not precise in some cases
+          as indica??es n?o s?o precisas em alguns casos
+
+    K3L_EVENT.AddInfo = Call Info ( enum KCallStartInfo );
+*/
+
+#define EV_COLLECT_CALL          	0x28
+/*  Indicates an incoming collect call
+	Indica um liga??o a cobrar entrante
+*/
+
+#define EV_SIP_DTMF_DETECTED        0x29
+/*	Detectado d?gito DTMF out band em canais SIP(RFC2833/SIP EVENT).
+	Out  band DTMF digit detected in SIP channel(RFC2833/SIP EVENT).
+
+	K3L_EVENT.AddInfo = Detected digit (ascii)
+*/
+
+#define EV_SIP_DATA			        0x2A
+/*	Indica recep??o de pacotes de dados enviado com o comando CM_SEND_SIP_DATA.
+	Indicates reception of data sent by CM_SEND_SIP_DATA command.
+
+    Params:
+    A pointer to a KSipData structure which has the following members:
+
+    DataLength - Length of data array
+    Data       - pointer to the data array
+*/
+
+
+#define EV_RECV_FROM_MODEM			0x42
+/* Eventos recebidos do modem
+   Events received from modem
+
+   K3L_EVENT.Params = A null terminated string with the events from modem
+*/
+
+#define EV_NEW_SMS                  0x43
+/* Indica a chegada de um novo SMS
+   Indicates a new SMS arrived
+*/
+
+#define EV_SMS_INFO                 0x44
+/* Recebido mensagem SMS
+   Received SMS message
+
+   K3L_EVENT.Params = A null terminated string with the sms parameters
+    Parameter:      Type    		Description:
+     sms_from       string            The number of sender
+     sms_date       string            Date that the message has been send
+     sms_size       int            Message size
+     sms_coding     enum:           The message alphabet
+                     iso88591        7-bits GSM alphabet converted to iso88591
+                     user            8-bits user-defined alphabet
+*/
+
+#define EV_SMS_DATA                 0x45
+/* Recebido mensagem SMS
+   Received SMS message
+
+   K3L_EVENT.Param = A null terminated string with the sms body
+*/
+
+#define EV_SMS_SEND_RESULT          0x46
+/* Indica o resultado do envio de SMS
+   Indicates de result of SMS send
+
+   K3L_EVENT.AddInfo = Result code (KGsmCallCause)
+*/
+
+/******************************************************************************
+Erros
+Errors
+******************************************************************************/
+#define EV_CHANNEL_FAIL				0x30
+/*	Falhas relacionadas ao sistema.
+	System related fails.
+
+	K3L_EVENT.AddInfo = Fail cause
+		R2		- KChannelFailCause, KErrorDefs.h
+		ISDN	- KQ931Cause, KISDN.h
+*/
+
+#define EV_REFERENCE_FAIL			0x31
+/*	Referncia de rede da mestre secundaria perdida.
+	Secundary master network reference lost.
+*/
+
+#define EV_INTERNAL_FAIL			0x32
+/*	Falha do sistema.
+	System internal fail.
+
+	K3L_EVENT.AddInfo = Fail cause. (enum KInternalFail)
+*/
+
+#define EV_HARDWARE_FAIL			0x33
+/*	Usado apenas internamente.
+	Internal use only.
+*/
+
+#define EV_LINK_STATUS				0x34
+/*	Indica periodicamente varia??o nos contadores de erros dos links, se ocorrerem.
+    Indicates periodically link errors counters variations, if it did happens.
+
+	K3L_EVENT.AddInfo = Cause (enum KE1Status)
+    K3L_EVENT.ObjectId = koiLink
+*/
+
+#define EV_PHYSICAL_LINK_UP			0x35
+/*	Estabelecimento do link E1
+	Link up
+
+    K3L_EVENT.AddInfo = Cause (enum KE1Status)
+    K3L_EVENT.ObjectId = koiLink
+*/
+
+#define EV_PHYSICAL_LINK_DOWN		0x36
+/*	Queda do link
+	Link down
+
+	K3L_EVENT.AddInfo = Cause (enum KE1Status)
+    K3L_EVENT.ObjectId = koiLink
+*/
+
+
+#define EV_CLIENT_RECONNECT		0xF0
+/* Indica que a api cliente reconectou automaticamente com sucesso na api servidora
+   ap?s uma falha de comunica??o.
+
+   Signs that client api successfully connected to the server api after a communication
+   failure.
+*/
+
+#define EV_CLIENT_AUDIOLISTENER_TIMEOUT     0xF1
+/* Indica que a callback registrada para a audio listener foi desativada automaticamente ap?s ficar 3 segundos sem resposta.
+   (somente quando a interface de buffers assincronos n?o est? sendo utilizada)
+
+   Signs that a registered audio listener callback was automaticaly deactivated due to wait 3 seconds without response.
+   (only when assynchronous buffers interface is not used)
+*/
+
+#define EV_CLIENT_BUFFERED_AUDIOLISTENER_OVERFLOW   0xF2
+/* Indica que o buffer da callback de ?udio chegou ao limite e vai descartar alguns dados de ?udio.
+   (somente para interface de buffers assincrona)
+
+   Signs that the audio callback buffer overflowed and will discard some audio samples.
+   (assynchronous buffers interface only)
+*/
+
+#define EV_REQUEST_DEVICE_SECURITY_KEY 0xF3
+/* Indica que a placa est? usando a prote??o dos integradores
+   Indicates that the board is using the integrator protection.
+   
+   Params:
+   		A NULL terminated string the should be use to send the device security key.
+   		
+   See:
+   		CM_SEND_DEVICE_SECURITY_KEY
+
+*/
+
+/******************************************************************************
+Compatibilidade
+Compatibility
+******************************************************************************/
+#define CM_SEND_DTMF				0xD1
+/*	EM DESUSO: Usar CM_DIAL_DTMF
+    Envia um d?gito de discagem (DTMF).
+    DEPRECATED: Use CM_DIAL_DTMF instead
+	Sends a dial digit (DTMF).
+
+	K3L_COMMAND.Object = ChannelNumber
+
+    Events: EV_DTMF_SEND_FINISH
+
+  Params:
+	[0] - Ascii of the digit
+*/
+
+#define CM_STOP_AUDIO 				0xD2
+/*  EM DESUSO: Usar CM_STOP_PLAY ou CM_STOP_RECORD
+	Para a grav??o do canal.
+	DEPRECATED: Use CM_STOP_PLAY or CM_STOP_RECORD instead
+	Stops channel recording.
+
+	K3L_COMMAND.Object = PlayerNumber/ChannelNumber
+
+  Params:
+	[0] - 1 StopPlay (kTx)| 2 StopRx (kRx) | 3 StopBoth (kBoth)
+*/
+
+#define CM_HARD_RESET				0xF0
+/*	Reinicia uma placa.
+	Restarts a board.
+
+	K3L_COMMAND.Object = none
+*/
+
+#define EV_VOIP_SEIZURE					0x40
+/*  EM DESUSO: Usar EV_NEW_CALL
+    Foi solicitada uma ocupa??o de entrada.
+    DEPRECATED: Use EV_NEW_CALL instead
+	There is a incoming seize in a network resource.
+
+   
+  Params:
+	[0..60] - DNIS (dialed number, ascii, null terminated)
+	[61..122] - ANI (dialer number, ascii, null terminated)
+*/
+
+#define EV_SEIZURE					0x41
+/*  EM DESUSO: Usar EV_NEW_CALL  
+	Foi solicitada uma ocupa??o de entrada.
+	DEPRECATED: Use EV_NEW_CALL instead
+	There is a incoming seize in a network resource.
+
+    K3L_EVENT.AddInfo = Category of A (R2)
+
+  Params:
+	[0..20] - DNIS (dialed number, ascii, null terminated)
+	[21..42] - ANI (dialer number, ascii, null terminated)
+*/
+
+#endif
+

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KErrorDefs.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KErrorDefs.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,133 @@
+/******************************************************************************
+Erros e falhas
+Errors and fails
+******************************************************************************/
+// EV_CHANNEL_FAIL
+   #define FC_REMOTE_FAIL			0x01
+/*	Falha remota.
+	Remote fail.
+*/
+   #define FC_LOCAL_FAIL			0x02
+/*	Falha local.
+	Local fail.
+*/ 
+   #define FC_REMOTE_LOCK			0x03
+/*	Canal bloqueado remotamente.
+	Channel remotely locked.
+*/  
+   #define FC_LINE_SIGNAL_FAIL		0x04
+/*	Falha na sinaliza??o de linha.
+	Line signaling fail.
+*/
+   #define FC_ACOUSTIC_SIGNAL_FAIL	0x05
+/*	Falha na sinaliza??o de registro.
+	Register signaling fail.
+*/
+
+enum KChannelFail
+{
+	kfcRemoteFail = FC_REMOTE_FAIL,
+	kfcLocalFail = FC_LOCAL_FAIL,
+	kfcRemoteLock = FC_REMOTE_LOCK,
+	kfcLineSignalFail = FC_LINE_SIGNAL_FAIL,
+	kfcAcousticSignalFail = FC_ACOUSTIC_SIGNAL_FAIL
+};
+
+// EV_INTERNAL_FAIL
+   #define ER_INTERRUPT_CTRL		0x01
+/*  Falha no controlador de interrup??es
+	Interrupt controller fail
+*/
+   #define ER_COMMUNICATION_FAIL	0x02
+/*  Falha na comunica??o com a interface
+	Interface communication fail
+*/
+   #define ER_PROTOCOL_FAIL			0x03
+/*	Falha no tratamento do protocolo de comunica??o
+	Protocol fail
+*/
+   #define ER_INTERNAL_BUFFER		0x04
+/*  Erro interno na API
+	API internal error
+*/
+	#define ER_MONITOR_BUFFER		0x05
+/*	Erro no buffer de monitora??o
+	Monitor buffer error 
+*/
+	#define ER_INITIALIZATION		0x06
+/*	Falha na inicializa??o do sistema
+	Initialization fail
+*/
+	#define ER_INTERFACE_FAIL		0x07
+/*	A interface nao responde
+	Interface is dead
+*/
+	#define ER_CLIENT_COMM_FAIL		0x08
+/*	Falha do cliente na comunicacao cliente/servidor
+	Client fails in client/server communication
+*/
+	#define ER_POLL_CTRL			0x09
+/*	Falha no controle de polling
+	Polling control fail
+*/
+	#define ER_EVT_BUFFER_CTRL		0x0A
+/*	Falha da API no controle de buffer circular de eventos
+	Circular buffer event control fails
+*/
+
+	#define ER_INVALID_CONFIG_VALUE 0x0B
+/*	Valor invalido em arquivo de configuracao
+	Invalid configuration value
+*/
+
+	#define ER_INTERNAL_GENERIC_FAIL 0x0C
+/*	Falha generica. Dados sobre o erro encontrados nos logs
+	Generic fail. See logs for more information
+*/
+
+enum KInternalFail
+{
+	kifInterruptCtrl = ER_INTERRUPT_CTRL,
+	kifCommunicationFail = ER_COMMUNICATION_FAIL,
+	kifProtocolFail = ER_PROTOCOL_FAIL,
+	kifInternalBuffer = ER_INTERNAL_BUFFER,
+	kifMonitorBuffer = ER_MONITOR_BUFFER,
+	kifInitialization = ER_INITIALIZATION,
+	kifInterfaceFail = ER_INTERFACE_FAIL,
+	kifClientCommFail = ER_CLIENT_COMM_FAIL
+};	
+
+// EV_SEIZE_FAIL
+   #define FS_CHANNEL_LOCKED		0x01
+/*	Ocupa??o negada por bloqueio de sa?da.
+	The channel is locally locked for outgoing calls.
+*/
+   #define FS_INCOMING_CHANNEL		0x02
+/*	Canal liberado somente para entrada.
+	Channel is only for income calls.
+*/
+   #define FS_CHANNEL_NOT_FREE		0x03
+/*	Canal ocupado ou com falha.
+	Channel busy.
+*/
+   #define FS_DOUBLE_SEIZE			0x04
+/*	Dupla ocupa??o (canal recebeu uma ocupa??o ao inv?s de uma confirma??o).
+	Double seize (channel receives a seize instead of a seize confirmation).
+*/
+   #define FS_LOCAL_CONGESTION		0x06
+/*	Congestionamento local
+	Local congestion
+*/
+   #define FS_NO_DIAL_TONE			0x07
+/*	Sem tom de discagem (utilizado na analogica)
+	No dial tone (analog lines)
+*/
+enum KSeizeFail
+{
+	ksfChannelLocked = FS_CHANNEL_LOCKED,
+	ksfIncomingChannel = FS_INCOMING_CHANNEL,
+	ksfChannelBusy = FS_CHANNEL_NOT_FREE,
+	ksfDoubleSeizure = FS_DOUBLE_SEIZE,
+	ksfCongestion = FS_LOCAL_CONGESTION,
+	ksfNoDialTone = FS_NO_DIAL_TONE
+};

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KGSM.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KGSM.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,220 @@
+#ifndef KGSM_H
+#define KGSM_H
+
+/*
+ * KGsmCallCause: Causes for Call Fail
+ */
+enum KGsmCallCause
+{
+    kgccNone                      = 0,
+    kgccUnallocatedNumber         = 1,
+    kgccNoRouteToDest             = 3,
+    kgccChannelUnacceptable       = 6,
+    kgccOperatorDeterminedBarring = 8,
+    kgccNormalCallClear           = 16,
+    kgccUserBusy                  = 17,
+    kgccNoUserResponding          = 18,
+    kgccNoAnswerFromUser          = 19,
+    kgccCallRejected              = 21,
+    kgccNumberChanged             = 22,
+    kgccNonSelectedUserClear      = 26,
+    kgccDestinationOutOfOrder     = 27,
+    kgccInvalidNumberFormat       = 28,
+    kgccFacilityRejected          = 29,
+    kgccRespStatusEnquiry         = 30,
+    kgccNormalUnspecified         = 31,
+    kgccNoCircuitChannelAvail     = 34,
+    kgccNetworkOutOfOrder         = 38,
+    kgccTemporaryFailure          = 41,
+    kgccSwitchCongestion          = 42,
+    kgccAccessInfoDiscarded       = 43,
+    kgccRequestedChannelUnav      = 44,
+    kgccResourceUnavailable       = 47,
+    kgccQosUnavailable            = 49,
+    kgccReqFacilityNotSubsc       = 50,
+    kgccCallBarredWitchCUG        = 55,
+    kgccBearerCapabNotAuthor      = 57,
+    kgccBearerCapabNotAvail       = 58,
+    kgccServiceNotAvailable       = 63,
+    kgccBcNotImplemented          = 65,
+    kgccReqFacilityNotImplem      = 69,
+    kgccOnlyRestrictedBcAvail     = 70,
+    kgccServiceNotImplemented     = 79,
+    kgccInvalidCrv                = 81,
+    kgccUserNotMemberOfCUG        = 82,
+    kgccIncompatibleDestination   = 88,
+    kgccInvalidTransitNetSel      = 91,
+    kgccInvalidMessage            = 95,
+    kgccMissingMandatoryIe        = 96,
+    kgccMsgTypeNotImplemented     = 97,
+    kgccMsgIncompatWithState      = 98,
+    kgccIeNotImplemented          = 99,
+    kgccInvalidIe                 = 100,
+    kgccMsgIncompatWithState2     = 101,
+    kgccRecoveryOnTimerExpiry     = 102,
+    kgccProtocolError             = 111,
+    kgccInterworking              = 127,
+};
+
+/*
+ *  KGsmMobileCause: Causes of Mobile Equipment Fail
+ */
+enum KGsmMobileCause
+{
+    kgmcPhoneFailure                = 0,
+    kgmcNoConnectionToPhone         = 1,
+    kgmcPhoneAdaptorLinkReserved    = 2,
+    kgmcOperationNotAllowed         = 3,
+    kgmcOperationNotSupported       = 4,
+    kgmcPH_SIMPINRequired           = 5,
+    kgmcPH_FSIMPINRequired          = 6,
+    kgmcPH_FSIMPUKRequired          = 7,
+    kgmcSIMNotInserted              = 10,
+    kgmcSIMPINRequired              = 11,
+    kgmcSIMPUKRequired              = 12,
+    kgmcSIMFailure                  = 13,
+    kgmcSIMBusy                     = 14,
+    kgmcSIMWrong                    = 15,
+    kgmcIncorrectPassword           = 16,
+    kgmcSIMPIN2Required             = 17,
+    kgmcSIMPUK2Required             = 18,
+    kgmcMemoryFull                  = 20,
+    kgmcInvalidIndex                = 21,
+    kgmcNotFound                    = 22,
+    kgmcMemoryFailure               = 23,
+    kgmcTextStringTooLong           = 24,
+    kgmcInvalidCharInTextString     = 25,
+    kgmcDialStringTooLong           = 26,
+    kgmcInvalidCharInDialString     = 27,
+    kgmcNoNetworkService            = 30,  
+    kgmcNetworkTimeout              = 31,  
+    kgmcNetworkNotAllowed           = 32,
+    kgmcCommandAborted              = 33,
+    kgmcNumParamInsteadTextParam    = 34,
+    kgmcTextParamInsteadNumParam    = 35,
+    kgmcNumericParamOutOfBounds     = 36,
+    kgmcTextStringTooShort          = 37,
+    kgmcNetworkPINRequired          = 40,
+    kgmcNetworkPUKRequired          = 41,
+    kgmcNetworkSubsetPINRequired    = 42,
+    kgmcNetworkSubnetPUKRequired    = 43,
+    kgmcServiceProviderPINRequired  = 44,
+    kgmcServiceProviderPUKRequired  = 45,
+    kgmcCorporatePINRequired        = 46,
+    kgmcCorporatePUKRequired        = 47,
+    kgmcSIMServiceOptNotSupported   = 60,
+    kgmcUnknown                     = 100,
+    kgmcIllegalMS_N3                = 103,
+    kgmcIllegalME_N6                = 106,
+    kgmcGPRSServicesNotAllowed_N7   = 107,
+    kgmcPLMNNotAllowed_No11         = 111,
+    kgmcLocationAreaNotAllowed_N12  = 112,
+    kgmcRoamingNotAllowed_N13       = 113,
+    kgmcServiceOptNotSupported_N32  = 132,
+    kgmcReqServOptNotSubscribed_N33 = 133,
+    kgmcServOptTempOutOfOrder_N34   = 134,
+    kgmcLongContextActivation       = 147,
+    kgmcUnspecifiedGPRSError        = 148,
+    kgmcPDPAuthenticationFailure    = 149,
+    kgmcInvalidMobileClass          = 150,
+    kgmcGPRSDisconnectionTmrActive  = 151,
+    kgmcTooManyActiveCalls          = 256,
+    kgmcCallRejected                = 257,
+    kgmcUnansweredCallPending       = 258,
+    kgmcUnknownCallingError         = 259,
+    kgmcNoPhoneNumRecognized        = 260,
+    kgmcCallStateNotIdle            = 261,
+    kgmcCallInProgress              = 262,
+    kgmcDialStateError              = 263,
+    kgmcUnlockCodeRequired          = 264,
+    kgmcNetworkBusy                 = 265,
+    kgmcInvalidPhoneNumber          = 266,
+    kgmcNumberEntryAlreadyStarted   = 267,
+    kgmcCancelledByUser             = 268,
+    kgmcNumEntryCouldNotBeStarted   = 269,
+    kgmcDataLost                    = 280,
+    kgmcInvalidBessageBodyLength    = 281,
+    kgmcInactiveSocket              = 282,
+    kgmcSocketAlreadyOpen           = 283
+};
+
+/*
+ *  KGsmSmsCause: Causes of SMS Fail
+ */
+enum KGsmSmsCause
+{
+    kgscUnassigned                  = 1,
+    kgscOperatorDeterminedBarring   = 8,
+    kgscCallBarred                  = 10,
+    kgscSMSTransferRejected         = 21,
+    kgscDestinationOutOfService     = 27,
+    kgscUnidentifiedSubscriber      = 28,
+    kgscFacilityRejected            = 29,
+    kgscUnknownSubscriber           = 30,
+    kgscNetworkOutOfOrder           = 38,
+    kgscTemporaryFailure            = 41,
+    kgscCongestion                  = 42,
+    kgscResourcesUnavailable        = 47,
+    kgscFacilityNotSubscribed       = 50,
+    kgscFacilityNotImplemented      = 69,
+    kgscInvalidSMSTransferRefValue  = 81,
+    kgscInvalidMessage              = 95,
+    kgscInvalidMandatoryInformation = 96,
+    kgscMessageTypeNonExistent      = 97,
+    kgscMsgNotCompatWithSMProtState = 98,
+    kgscInformationElementNonExiste = 99,
+    kgscProtocolError               = 111,
+    kgscInterworking                = 127,
+    kgscTelematicInterworkingNotSup = 128,
+    kgscSMSTypeZeroNotSupported     = 129,
+    kgscCannotReplaceSMS            = 130,
+    kgscUnspecifiedTPPIDError       = 143,
+    kgscAlphabetNotSupported        = 144,
+    kgscMessageClassNotSupported    = 145,
+    kgscUnspecifiedTPDCSError       = 159,
+    kgscCommandCannotBeActioned     = 160,
+    kgscCommandUnsupported          = 161,
+    kgscUnspecifiedTPCommandError   = 175,
+    kgscTPDUNotSupported            = 176,
+    kgscSCBusy                      = 192,
+    kgscNoSCSubscription            = 193,
+    kgscSCSystemFailure             = 194,
+    kgscInvalidSMEAddress           = 195,
+    kgscDestinationSMEBarred        = 196,
+    kgscSMRejectedDuplicateSM       = 197,
+    kgscTPVPFNotSupported           = 198,
+    kgscTPVPNotSupported            = 199,
+    kgscSIMSMSStorageFull           = 208,
+    kgscNoSMSStorageCapabilityInSIM = 209,
+    kgscErrorInMS                   = 210,
+    kgscMemoryCapacityExceeded      = 211,
+    kgscSIMDataDownloadError        = 213,
+    kgscUnspecifiedError            = 255,
+    kgscPhoneFailure                = 300,
+    kgscSmsServiceReserved          = 301,
+    kgscOperationNotAllowed         = 302,
+    kgscOperationNotSupported       = 303,
+    kgscInvalidPDUModeParameter     = 304,
+    kgscInvalidTextModeParameter    = 305,
+    kgscSIMNotInserted              = 310,
+    kgscSIMPINNecessary             = 311,
+    kgscPH_SIMPINNecessary          = 312,
+    kgscSIMFailure                  = 313,
+    kgscSIMBusy                     = 314,
+    kgscSIMWrong                    = 315,
+    kgscMemoryFailure               = 320,
+    kgscInvalidMemoryIndex          = 321,
+    kgscMemoryFull                  = 322,
+    kgscSMSCAddressUnknown          = 330,
+    kgscNoNetworkService            = 331,
+    kgscNetworkTimeout              = 332,
+    kgscUnknownError                = 500,
+    kgscNetworkBusy                 = 512,
+    kgscInvalidDestinationAddress   = 513,
+    kgscInvalidMessageBodyLength    = 514,
+    kgscPhoneIsNotInService         = 515,
+    kgscInvalidPreferredMemStorage  = 516,
+    kgscUserTerminated              = 517
+};
+
+#endif

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KH100Defs.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KH100Defs.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,186 @@
+#if !defined KH100DEFS_H
+#define KH100DEFS_H
+
+/******************************************************************************
+Comandos do H100
+H100 commands
+******************************************************************************/
+
+#define CM_SEND_TO_CTBUS			0x90
+/*
+	Liga o TX do canal especificado a um determinado Stream/Timeslot do ctbus.
+	Link the TX of the specified channel to the specified ctbus stream/timeslot
+	K3L_COMMAND.Object = ChannelNumber
+  Params:
+	[0] - Ctbus stream
+	[1] - Ctbus timeslot
+	[2] - Start/Stop
+*/
+
+#define CM_RECV_FROM_CTBUS			0x91
+/*	Liga o RX do canal especificado a um determinado Stream/Timeslot do ctbus.
+	Link the RX of the specified channel to the specified ctbus stream/timeslot
+	K3L_COMMAND.Object = ChannelNumber
+	Params:
+	[0] - Ctbus stream
+	[1] - Ctbus timeslot
+	[2] - Start/Stop
+*/
+
+#define CM_SEND_RANGE_TO_CTBUS		0x92
+/*
+	Liga o TX dos canais especificados aos determinados Stream/Timeslots do ctbus.
+	Link the TX of the specified channels to the specified ctbus stream/timeslots
+	
+    K3L_COMMAND.Object = First channel to be used in the block
+
+  Params:
+	A null terminated ascii string with the command parameters.
+	The expected call parameters are:
+	Parameter:          		Required:	Description:
+	range_count           		yes			Number of channels in the block
+	stream              		yes			Stream of the H100 BUS
+	first_timeslot     		    yes		    First timeslot, it?s linked with the first channel
+    enabled                     no          if true enable the transmission, else disable it. Default value is true.
+*/
+
+
+#define CM_SETUP_H100				0x93
+/*	Este comando est? obsoleto e n?o ? mais processado pela API, a configura??o 
+    deve ser feita utilizando o aplicativo KConfig.
+
+	This command is deprecated and is no longer supported, this configuration 
+	should be done using KConfig.
+
+	------
+	Configura a itera??o entre a placa e o ctbus
+	Sets up the iteration between the board and the ctbus
+	
+	K3L_COMMAND.Object = Command*
+  Params:
+    [0] - Params*
+
+  * See documentation 
+	Command definitions will be finded in KH100Defs.h
+*/
+
+
+enum KH100ConfigIndex
+{
+	khciDeviceMode = 0,
+	khciMasterGenClock = 1,
+	khciCTNetRefEnable = 4,
+	khciSCbusEnable = 6,
+	khciHMVipEnable = 7,
+	khciMVip90Enable = 8,
+	khciCTbusDataEnable = 9,
+	khciCTbusFreq03_00 = 10,
+	khciCTbusFreq07_04 = 11,
+	khciCTbusFreq11_08 = 12,
+	khciCTbusFreq15_12 = 13,
+	khciMax = 14,
+	khciMasterDevId = 20,
+	khciSecMasterDevId = 21,
+	khciCtNetrefDevId = 22,
+    khciMaxH100ConfigIndex
+};	
+
+// enumerados usados juntamente a estrutura K3L_H100_STATUS
+enum KMasterPLLClockReference
+{
+    h100_Ref_FreeRun = 0,
+    h100_Ref_holdover = 1,
+	h100_Automatic = 2,
+    h100_Ref_ctnetref = 7,
+    h100_Ref_link0 = 8,
+    h100_Ref_link1 = 9
+};
+
+enum KSlavePLLClockReference
+{
+    h100_PllLoc_ClkA = 0,
+    h100_PllLoc_ClkB = 1,
+    h100_PllLoc_SCBus = 2,
+    h100_PllLoc_MVIP90 = 3,
+    h100_PllLoc_Link0 = 4,
+    h100_PllLoc_Link1 = 5,
+    h100_PllLoc_Error = 6
+};
+
+
+/******************************************************************************
+CM_SETUP_H100
+Configura o H100. Este comando ? na verdade um grupo de comandos de configura??o.
+*******************************************************************************/
+#define H100_DEVICE_MODE				khciDeviceMode
+// Define o modo de opera??o da placa.
+	enum KH100Mode
+	{
+		h100_Slave,
+		h100_Master,
+		h100_StandbyMaster,
+		h100_Diagnostic,
+		h100_NotConnected
+	};
+
+#define H100_MASTER_GEN_CLOCK			khciMasterGenClock
+// Define qual o clock a ser gerado (A ou B) no CTbus caso a placa seja ou venha a ser a master
+	enum KH100SelectCtbusClock
+	{
+		h100_scClockA,
+		h100_scClockB
+	};
+
+// trier - changes... :)
+#define H100_CT_NETREF_ENABLE			khciCTNetRefEnable
+// Habilita ou desabilita e programa a freq. de gera??o do CT_NETREF. 
+	enum KH100CtNetref
+	{
+		h100_nrOff,
+		h100_nrEnable
+	};
+
+#define	H100_SCBUS_ENABLE				khciSCbusEnable
+// Habilita ou desabilita e configura o clock da gera??o da refer?ncia do scbus.
+	enum KH100ScbusEnable
+	{
+		h100_seOff,
+		h100_seOn2Mhz,
+		h100_seOn4Mhz,
+		h100_seOn8Mhz
+	};
+
+#define H100_HMVIP_ENABLE				khciHMVipEnable
+// Habilita ou desabilita a gera??o da refer?ncia do HMVIP.
+// 1 - On, 0 - Off KH100Enable
+
+#define H100_MVIP90_ENABLE				khciMVip90Enable
+// Habilita ou desabilita a gera??o da refer?ncia do MVIP90.
+// 1 - On, 0 - Off KH100Enable
+
+#define H100_CTBUS_DATA_ENABLE			khciCTbusDataEnable
+// Habilita ou desabilita a transmissao de dados no CTbus.
+// 1 - On, 0 - Off KH100Enable
+
+enum KH100Enable
+{
+	h100_On = 0x01,
+	h100_Off = 0x00
+};
+	
+#define H100_CTBUS_FREQ_03_00			khciCTbusFreq03_00
+#define H100_CTBUS_FREQ_07_04			khciCTbusFreq07_04
+#define H100_CTBUS_FREQ_11_08			khciCTbusFreq11_08
+#define H100_CTBUS_FREQ_15_12			khciCTbusFreq15_12
+// Configura a frequ?ncia de gera??o dos clocks do ctbus em blocos de 4 streams conforme a
+// especifica??o do H100. Bloco 0, streams de 0 a 3, bloco 1, de 4 a 7, etc..
+// As stream de 16 a 31 estar?o sempre em 8Mhz conforme especifica??o.
+enum KH100CtbusFreq
+{
+	h100_cf_2Mhz	=	0,
+	h100_cf_4Mhz	=	1,
+	h100_cf_8Mhz	=	2 
+};
+
+
+#endif

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KISDN.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KISDN.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,211 @@
+#ifndef _KISDN_H_
+#define _KISDN_H_
+
+#define KMAX_USER_USER_LEN              32
+#define KMAX_SUBADRESS_INFORMATION_LEN  20 
+
+/**
+    KQ931Cause: Causes for disconnection and/or fails.
+ */
+enum KQ931Cause
+{
+    kq931cNone                    			= 0,
+    kq931cUnallocatedNumber       			= 1,
+    kq931cNoRouteToTransitNet     			= 2,
+    kq931cNoRouteToDest           			= 3,
+	kq931cSendSpecialInfoTone				= 4,
+	kq931cMisdialedTrunkPrefix				= 5,
+    kq931cChannelUnacceptable     			= 6,
+    kq931cCallAwarded             			= 7,
+	kq931cPreemption						= 8,
+	kq931cPreemptionCircuitReuse			= 9,
+	kq931cQoR_PortedNumber					= 14,
+    kq931cNormalCallClear         			= 16,
+    kq931cUserBusy                			= 17,
+    kq931cNoUserResponding        			= 18,
+    kq931cNoAnswerFromUser        			= 19,
+	kq931cSubscriberAbsent					= 20,
+    kq931cCallRejected            			= 21,
+    kq931cNumberChanged           			= 22,
+	kq931cRedirectionToNewDest				= 23,
+	kq931cCallRejectedFeatureDest			= 24,
+	kq931cExchangeRoutingError				= 25,
+    kq931cNonSelectedUserClear    			= 26,
+    kq931cDestinationOutOfOrder   			= 27,
+    kq931cInvalidNumberFormat     			= 28,
+    kq931cFacilityRejected        			= 29,
+    kq931cRespStatusEnquiry       			= 30,
+    kq931cNormalUnspecified       			= 31,
+    kq931cNoCircuitChannelAvail   			= 34,
+    kq931cNetworkOutOfOrder       			= 38,
+	kq931cPermanentFrameConnOutOfService	= 39,
+	kq931cPermanentFrameConnOperational		= 40,
+    kq931cTemporaryFailure          		= 41,
+    kq931cSwitchCongestion          		= 42,
+    kq931cAccessInfoDiscarded       		= 43,
+    kq931cRequestedChannelUnav      		= 44,
+	kq931cPrecedenceCallBlocked				= 46,
+    kq931cResourceUnavailable       		= 47,
+    kq931cQosUnavailable            		= 49,
+    kq931cReqFacilityNotSubsc       		= 50,
+	kq931cOutCallsBarredWithinCUG			= 53,
+	kq931cInCallsBarredWithinCUG			= 55,
+    kq931cBearerCapabNotAuthor      		= 57,
+    kq931cBearerCapabNotAvail       		= 58,
+	kq931cInconsistency						= 62,
+    kq931cServiceNotAvailable       		= 63,
+    kq931cBcNotImplemented          		= 65,
+    kq931cChannelTypeNotImplem      		= 66,
+    kq931cReqFacilityNotImplem      		= 69,
+    kq931cOnlyRestrictedBcAvail     		= 70,
+    kq931cServiceNotImplemented     		= 79,
+    kq931cInvalidCrv                		= 81,
+    kq931cChannelDoesNotExist       		= 82,
+    kq931cCallIdDoesNotExist        		= 83,
+    kq931cCallIdInUse               		= 84,
+    kq931cNoCallSuspended           		= 85,
+    kq931cCallIdCleared             		= 86,
+	kq931cUserNotMemberofCUG				= 87,
+    kq931cIncompatibleDestination   		= 88,
+    kq931cInvalidTransitNetSel      		= 91,
+    kq931cInvalidMessage            		= 95,
+    kq931cMissingMandatoryIe        		= 96,
+    kq931cMsgTypeNotImplemented     		= 97,
+    kq931cMsgIncompatWithState      		= 98,
+    kq931cIeNotImplemented          		= 99,
+    kq931cInvalidIe                 		= 100,
+    kq931cMsgIncompatWithState2     		= 101,
+    kq931cRecoveryOnTimerExpiry     		= 102,
+    kq931cProtocolError             		= 103,
+	kq931cMessageWithUnrecognizedParam		= 110,
+	kq931cProtocolErrorUnspecified			= 111,
+    kq931cInterworking              		= 127,
+    kq931cCallConnected             		= 128,
+    kq931cCallTimedOut              		= 129,
+    kq931cCallNotFound              		= 130,
+    kq931cCantReleaseCall           		= 131,
+    kq931cNetworkFailure            		= 132,
+    kq931cNetworkRestart            		= 133,
+    kq931cLastValidCause            		= kq931cNetworkRestart,
+
+};
+
+/**
+    KQ931ProgressIndication: Used internally to indicate and to be informed of the 
+    presence of call control tones in band.
+ */
+enum KQ931ProgressIndication
+{
+    kq931pTonesMaybeAvailable       = 1,
+    kq931pDestinationIsNonIsdn      = 2,
+    kq931pOriginationIsNonIsdn      = 3,
+    kq931pCallReturnedToIsdn        = 4,
+    kq931pTonesAvailable            = 8,
+};
+
+/**
+    KQ931Hlc: High Layer compatibility: Used internally to indicate the call content
+    ('kq931hTelefony' is always sent).
+ */
+enum KQ931Hlc
+{
+    kq931hTelefony                  = 0x81,
+    k1931hFaxGroup23                = 0x84,
+    k1931hFaxGroup4                 = 0xa1,
+    kq931hTeletexF184               = 0xa4,
+    kq931hTeletexF220               = 0xa8,
+    kq931hTeletexf200               = 0xb1,
+    kq931hVideotex                  = 0xb2,
+    kq931hTelexF60                  = 0xb5,
+    kq931hMhs                       = 0xb8,
+    kq931hOsiApp                    = 0xc1,
+    kq931hMaintenance               = 0xde,
+    kq931hManagement                = 0xdf,
+};
+
+
+/**
+    KQ931BearerCapability: Used internally to indicate the call bearer's capability
+    (can be changed in KConfig).
+ */
+enum KQ931BearerCapability
+{
+    kq931bSpeech                    = 0x00,
+    kq931bUnrestrictedDigital       = 0x08,
+    kq931bAudio31kHz                = 0x10,
+    kq931bAudio7kHz                 = 0x11,
+    kq931bVideo                     = 0x18,
+};
+
+
+/**
+    KQ931TypeOfNumber: Indicates the caller/called party type of number. Defaults to
+    'kq931tUnknownNumber', but can be changed by a parameter in CM_MAKE_CALL.
+*/
+enum KQ931TypeOfNumber
+{
+    kq931tUnknownNumber             = 0x00,
+    kq931tInternationalNumber       = 0x10,
+    kq931tNationalNumber            = 0x20,
+    kq931tNetworkSpecificNumber     = 0x30,
+    kq931tSubscriberNumber          = 0x40,
+    kq931tAbbreviatedNumber         = 0x60,
+    kq931tReservedNumber            = 0x70,
+    kq931tDefaultNumber             = kq931tUnknownNumber,
+};
+
+/**
+    KQ931NumberingPlan: Indicates the caller/called party numbering plan. Defaults to
+    'kq931pUnknownPlan', but can be changed by a parameter in CM_MAKE_CALL.
+ */
+enum KQ931NumberingPlan
+{
+    kq931pUnknownPlan               = 0x00,
+    kq931pIsdnPlan                  = 0x01,
+    kq931pDataPlan                  = 0x03,
+    kq931pTelexPlan                 = 0x04,
+    kq931pNationalPlan              = 0x08,
+    kq931pPrivatePlan               = 0x09,
+    kq931pReservedPlan              = 0x0F,
+    kq931pDefaultPlan               = kq931pUnknownPlan,
+};
+
+/**
+    KQ931UserInfoProtocolDescriptor: Used in 'struct KUserInformation' (declared in k3l.h) to indicate
+    the protocol that is being used with the CM_USER_INFORMATION command.
+ */
+enum KQ931UserInfoProtocolDescriptor
+{
+    kq931uuUserSpecific             = 0x00,
+    kq931uuOSI_HighLayer            = 0x01,
+    kq931uuX244                     = 0x02,
+    kq931uuIA5_Chars                = 0x04,
+    kq931uuX208_X209                = 0x05,
+    kq931uuV120                     = 0x07,
+    kq931uuQ931_CallControl         = 0x08,
+    kq931uuNational                 = 0x40 //MASK
+};
+
+enum KQ931PresentationIndicator
+{
+	kq931piPresentationAllowed					= 0x00,
+	kq931piPresentationRestricted				= 0x01,
+	kq931piNumberNotAvailableDueToInterworking	= 0x02,
+};
+
+enum KQ931ScreeningIndicator
+{
+	kq931siUserProvidedNotScreened				= 0x00,
+	kq931siUserProvidedVerifiedAndPassed		= 0x01,
+	kq931siUserProvidedVerifiedAndFailed		= 0x02,
+	kq931siNetworkProvided						= 0x03,
+};
+
+enum KQ931TypeOfSubaddress
+{
+    kq931tsNSAP                                 = 0x00,
+    kq931tsUserSpecified                        = 0x01,
+};
+
+#endif //_KISDN_H_
+

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KMixerDefs.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KMixerDefs.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,324 @@
+/******************************************************************************
+Comandos de controle do mixer
+Mixer control commands
+******************************************************************************/
+
+#define CM_MIXER					0x60
+/*	Envia um comando para o mixer associado ao canal.
+	Sends a command to a channel associated mixer.
+	
+	K3L_COMMAND.Object = MixerNumber
+
+  Params:
+  	A pointer to a KMixerCommand strutcture which has the following members
+  	
+	Track - Track index
+	Source - Audio source (KMixerSource, k3l.h)
+	SourceIndex - Channel number or generator code
+
+*/
+
+#define CM_CLEAR_MIXER				0x61
+/*	Coloca todas as trilhas do mixer em sil?ncio.
+	Sets all mixer tracks to silent.
+	
+	K3L_COMMAND.Object = MixerNumber
+*/
+
+#define CM_PLAY_FROM_FILE			0x62
+/*	Reproduz um arquivo de audio
+	Play an audio file
+	
+	K3L_COMMAND.Object = PlayerNumber
+
+    Events: EV_END_OF_STREAM
+
+  Params: 
+	FileName (null terminated)
+*/
+
+#define CM_RECORD_TO_FILE			0x63
+/*	Inicia grava?ao de audio em arquivo
+	Starts audio recording in file
+
+	K3L_COMMAND.Object = PlayerNumber
+
+  Params: 
+	FileName (null terminated)
+*/	
+
+#define CM_PLAY_FROM_STREAM			0x64 
+/*	Reproduz um buffer de audio
+	Play an audio buffer
+	
+	K3L_COMMAND.Object = PlayerNumber
+
+    Events: EV_END_OF_STREAM
+
+  Params: 
+    struct KPlayFromStreamCommand
+	Buffer     - Pointer to the buffer
+	BufferSize - Buffer size
+*/
+
+#define CM_INTERNAL_PLAY			0x65 
+/*	Used internally
+*/
+
+#define CM_STOP_PLAY				0x66
+/*	Para o reprodutor.
+	Stops player.
+
+	K3L_COMMAND.Object = PlayerNumber
+*/
+
+#define CM_STOP_RECORD				0x67
+/*	Para a grav??o do canal.
+	Stops channel recording.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_PAUSE_PLAY				0x68
+/*	Pausa a reproducao de audio de um player
+	Pauses a player
+
+    K3L_COMMAND.Object = PlayerNumber
+*/
+
+#define CM_PAUSE_RECORD				0x69
+/*	Pausa a gravacao de audio de um canal
+	Pauses recording of a channel
+
+    K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_RESUME_PLAY				0x6A
+/*	Continua um play anteriormente pausado
+	Resumes a paused play
+
+	K3L_COMMAND.Object = PlayerNumber
+*/
+
+#define CM_RESUME_RECORD			0x6B
+/*	Continua um play anteriormente pausado
+	Resumes a paused play
+
+	K3L_COMMAND.Object = PlayerNumber
+*/
+
+#define CM_INCREASE_VOLUME			0x6C
+/*	Aumenta o volume na saida do mixer
+	Increases volume on mixer out
+
+	K3L_COMMAND.Object = MixerNumber
+*/
+
+#define CM_DECREASE_VOLUME			0x6D
+/*	Diminui o volume na saida do mixer
+	Decreases volume on mixer out
+
+	K3L_COMMAND.Object = MixerNumber
+*/
+
+#define CM_LISTEN					0x6E
+/*	Inicia o processo de transmissao de audio para reconhecimento de voz.
+	Starts audio transmission process for voice recognition.
+
+	K3L_COMMAND.Object = MixerNumber
+
+  Params:
+	[0..3] - Inteiro contendo a quantidade de milisegundos de audio em chamada da callback
+*/
+
+#define CM_STOP_LISTEN				0x6F
+/*	Para o processo de transmissao de audio e para a gravacao do buffer de guarda.
+	Stops audio tranmission process, and stops the buffer guard recoring..
+
+	K3L_COMMAND.Object = MixerNumber
+*/
+
+#define CM_PREPARE_FOR_LISTEN		0x70
+/*	Inicia a gravacao do buffer de guarda.
+	Start guard buffer recording.
+
+	K3L_COMMAND.Object = MixerNumber
+
+  Params:
+	[0..3] - Inteiro contendo o tamanho do buffer de guarda em milisegundos
+*/
+
+#define CM_PLAY_SOUND_CARD			0x71
+/*	Inicia o play de canal na placa de som
+	Starts the sound card channel player
+	
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_STOP_SOUND_CARD			0x72
+/*	Para o play de canal na placa de som
+	Stops the sound card channel player
+	
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_MIXER_CTBUS				0x73
+/*	Envia um comando para o mixer associado ao de interconexao. Soh para placas com CTbus
+	Sends a command to a inteconnect channel associated mixer. Only for boards with CTbus
+	
+	K3L_COMMAND.Object = CtbusMixerNumber
+
+  Params:
+	[0] - Mixer index
+	[1] - Audio source
+	[2] - Channel number or generator code
+
+	kmsChannel - Channel
+	kmsPlay - Play
+	kmsGenerator - Signal
+	kmsCTbus - another mixer channel
+*/
+
+
+#define CM_PLAY_FROM_STREAM_EX			0x74 
+/*	Reproduz um buffer de audio
+	Play an audio buffer
+	
+	K3L_COMMAND.Object = PlayerNumber
+
+    Events: EV_END_OF_STREAM
+
+  Params: 
+    struct KPlayFromStreamCommand
+	Buffer     - Pointer to the buffer
+	BufferSize - Buffer size
+	CodecIndex - 0 = 8Khz ALAW, 1 = 8Khz PCM, 2 = 11khz PCM
+*/
+
+#define CM_INTERNAL_PLAY_EX			0x75 
+/*	Used internally
+*/
+
+#define CM_ENABLE_PLAYER_AGC		0x76
+/*
+	Habilita o controle de ganho autom?tico do player.
+	Enable player automatic gain contol.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+#define CM_DISABLE_PLAYER_AGC		0x77
+/*
+	Desabilita o controle de ganho autom?tico do player.
+	Disable player automatic gain contol.
+
+	K3L_COMMAND.Object = ChannelNumber
+*/
+
+
+#define CM_START_STREAM_BUFFER		0x78
+/*	Inicia um play de buffer cont?uo
+	Start continuous play buffer
+	
+	K3L_COMMAND.Object = PlayerNumber
+*/
+
+#define CM_ADD_STREAM_BUFFER		0x79
+/*	Adiciona dados a um stream de buffer cont?nuo
+	Add data to a continuous play buffer
+	
+	K3L_COMMAND.Object = PlayerNumber
+
+  Params: 
+	[0..3] - Pointer to the buffer
+	[4..7] - Buffer size
+*/
+
+#define CM_STOP_STREAM_BUFFER		0x7A
+/*	Para um play de buffer cont?nuo
+	Stop a continuous play buffer
+	
+	K3L_COMMAND.Object = PlayerNumber
+*/
+
+#define CM_SEND_BEEP				0x7B
+/*	Envia um bip no canal
+	Sends a beep
+
+	K3L_COMMAND.Object = PlayerNumber
+*/
+
+#define CM_SEND_BEEP_CONF			0x7C
+/*	Envia um bip na conferencia
+	Sends a beep
+
+	K3L_COMMAND.Object = PlayerNumber
+*/
+
+#define CM_ADD_TO_CONF				0x7D
+/*	Adiciona um canal a uma conferencia
+	Adds a channel to a specified conference
+
+	K3L_COMMAND.Object = MixerNumber
+  Params:
+	[0] - Conference index
+*/
+
+#define CM_REMOVE_FROM_CONF			0x7E
+/*	Retira um canal de uma conferencia
+	Adds a channel to a specified conference
+
+	K3L_COMMAND.Object = MixerNumber
+*/
+
+#define CM_RECORD_TO_FILE_EX		0x7F
+/*	Inicia grava?ao de audio em arquivo, utilizando codec espec?fico
+	Starts audio recording in file, using specific codec
+
+	K3L_COMMAND.Object = PlayerNumber
+
+	Params:
+	A null terminated ascii string with the parameters.
+	The expected command parameters are:
+	Par?meter:    Description:
+	file_name     File name for use in recording
+	codec         Codec index(defined in KCodecIndex enum) for audio compression
+                  if ommited ALaw 8khz will be used
+*/
+
+#define CM_SET_VOLUME				0xA0
+/*	Configura o volume de sa?da do mixer para um valor na vaixa de -10 a +10. Zero reseta o volume.
+	Sets output volume from mixer channel to a values between -10 and +10. Zero resets the volume.
+
+	K3L_COMMAND.Object = MixerNumber
+
+	Params:
+	A null terminated ascii string with the parameters.
+	The expected command parameters are:
+	Par?meter:    Description:
+	volume        File name for use in recording
+	type          Defines if is the "input" or "output" volume to be changed
+*/
+
+#define CM_START_CADENCE			0xA1
+/*	Inicia a reprodu??o da cad?ncia especificada com tom de 425Hz.
+	Starts to play the specified 425Hz tone cadence.
+
+	K3L_COMMAND.Object = MixerNumber
+
+	Params:
+	A null terminated ascii string with the parameters.
+	The expected command parameters are:
+	Par?meter:			Description:
+	cadence_times		A comma separated list of times (in milliseconds) for dialtone 
+						and silence (in pairs), or "continuous" for continuous dialtone.
+	mixer_track			The mixer track that sould be used to play the cadence. "0" (zero)
+						is the default mixer track.
+*/
+
+#define CM_STOP_CADENCE				0xA2
+/*	P?ra a cad?ncia iniciada com o comando CM_START_CADENCE.
+	Stops the cadence started with CM_START_CADENCE.
+
+	K3L_COMMAND.Object = MixerNumber
+*/

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KR2D.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KR2D.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,384 @@
+#if !defined KR2D_H
+#define KR2D_H
+
+/******************************************************************************
+Comandos de controle de liga??o especiais
+Special call control commands
+******************************************************************************/
+#define CM_SET_LINE_CONDITION		0x80
+/*	Programa a condi??o do ramal. Programar para kgbNone para enviar manualmente.
+	Program called subscriber condition. Sets to kgbNone to sends it manually.
+
+	K3L_COMMAND.Object = ChannelNumber
+
+  Params:
+	[0] - Subscriber Line Condition (Group B)
+*/
+
+#define CM_SEND_LINE_CONDITION		0x81
+/*	Envia a condicao do ramal.
+	Sends subscriber line condition.
+
+	K3L_COMMAND.Object = ChannelNumber
+
+  Params:
+	[0] - Subscriber Line Condition (Group B)
+*/
+
+
+#define CM_SET_CALLER_CATEGORY		0x82
+/*	Configura a categoria do assinante chamador enviada na ocupa??o do canal.
+	Sets caller subscriber category.
+
+	K3L_COMMAND.Object = ChannelNumber
+
+  Params:
+	[0] - Subscriber category, group II
+*/      
+	
+#define CM_DIAL_MFC					0x83
+/*	Disca uma string terminada em 0 em MFC. M?ximo 20 d?gitos.
+	Dial a null terminated string, in MFC. Maximum 20 digits.
+
+    K3L_COMMAND.Object = ChannelNumber
+
+	Events: (syncronous command)
+  Params:
+	String with the number to dial (ascii)
+*/
+
+/* 
+	A condicao do ramal em uma ligacao sainte vem nos eventos 
+EV_CALL_SUCCESS  ou EV_CALL_FAIL, no campo AddInfo.
+
+	A categoria do assinante chamador numa ligacao entrante vem no evento
+EV_SEIZURE, no campo AddInfo.
+
+*/
+
+/******************************************************************************
+Defini??es para sinaliza??o (Brasil)
+Signaling definitions (Brazil)
+******************************************************************************/
+/*
+ *  Category of A    (MFC signaling, group II)
+ */
+enum KSignGroupII_Brazil
+{
+	kg2BrOrdinary		        = 0x01,     //	Subscriber without priority.
+	kg2BrPriority		        = 0x02,     //	Subscriber with priority.
+	kg2BrMaintenance	        = 0x03,     //	Maintenance equipment.
+	kg2BrLocalPayPhone	        = 0x04,     //	Local pay phone.
+	kg2BrTrunkOperator	        = 0x05,     //	Trunk operator.
+	kg2BrDataTrans	            = 0x06,     //	Data transmission.
+	kg2BrNonLocalPayPhone       = 0x07,     //	Non-local pay phone.
+	kg2BrCollectCall	        = 0x08,     //	Collect call.
+	kg2BrOrdinaryInter	        = 0x09,     //	International ordinary subscriber.
+	kg2BrTransfered		        = 0x0B,     //	Transfered call.
+};
+
+/*
+ *  Condition of B   (MFC signaling, group B)
+ */
+enum KSignGroupB_Brazil
+{
+	kgbBrLineFreeCharged		= 0x01,     //	Line free and charged.
+	kgbBrBusy					= 0x02,     //	Line busy.
+	kgbBrNumberChanged			= 0x03,     //	B number was changed.
+	kgbBrCongestion				= 0x04,     //	Congestion.
+	kgbBrLineFreeNotCharged		= 0x05,     //	Line free and not charged.
+	kgbBrLineFreeChargedLPR		= 0x06,     //	Line free, charged, last party released.
+	kgbBrInvalidNumber			= 0x07,     //	Unallocated number.
+	kgbBrLineOutOfOrder			= 0x08,     //	Called line is out of order.
+	kgbBrNone					= 0xFF      //	Used when a manual send of the condition is required.
+};
+
+
+/******************************************************************************
+Defini??es para sinaliza??o (Argentina)
+Signaling definitions (Argentina)
+******************************************************************************/
+/*
+ *  Category of A    (MFC signaling, group II)
+ */
+enum KSignGroupII_Argentina
+{
+	kg2ArOrdinary		        = 0x01,     //	Subscriber without priority.
+	kg2ArPriority		        = 0x02,     //	Subscriber with priority.
+	kg2ArMaintenance	        = 0x03,     //	Maintenance equipment.
+	kg2ArLocalPayPhone	        = 0x04,     //	Local pay phone.
+	kg2ArTrunkOperator	        = 0x05,     //	Trunk operator.
+	kg2ArDataTrans	            = 0x06,     //	Data transmission.
+    kg2ArCPTP                   = 0x0B,     //  C.P.T.P
+    kg2ArSpecialLine            = 0x0C,     //  Special Subcriber Line
+    kg2ArMobileUser             = 0x0D,     //  Mobile User
+    kg2ArPrivateRedLine         = 0x0E,     //  Virtual Private Red Line
+    kg2ArSpecialPayPhoneLine    = 0x0F,     //  Special Pay Phone Line
+};
+
+/*
+ *  Condition of B   (MFC signaling, group B)
+ */
+enum KSignGroupB_Argentina
+{
+	kgbArNumberChanged			= 0x02,     //	B number was changed.
+	kgbArBusy					= 0x03,     //	Line busy.
+	kgbArCongestion				= 0x04,     //	Congestion.
+	kgbArInvalidNumber			= 0x05,     //	Unallocated number.
+	kgbArLineFreeCharged		= 0x06,     //	Line free and charged.
+	kgbArLineFreeNotCharged		= 0x07,     //	Line free and not charged.
+	kgbArLineOutOfOrder			= 0x08,     //	Called line is out of order.
+	kgbArNone					= 0xFF      //	Used when a manual send of the condition is required.
+};
+
+
+/******************************************************************************
+Defini??es para sinaliza??o (Chile)
+Signaling definitions (Chile)
+******************************************************************************/
+/*
+ *  Category of A    (MFC signaling, group II)
+ */
+enum KSignGroupII_Chile
+{
+    kg2ClOrdinary		        = 0x01,     //	Subscriber without priority.
+	kg2ClPriority		        = 0x02,     //	Subscriber with priority.
+	kg2ClMaintenance	        = 0x03,     //	Maintenance equipment.
+	kg2ClTrunkOperator	        = 0x05,     //	Trunk operator.
+	kg2ClDataTrans	            = 0x06,     //	Data transmission.
+    kg2ClUnidentifiedSubscriber = 0x0B,     //  Unidentified subscriber.
+};
+
+/*
+ *  Condition of B   (MFC signaling, group B)
+ */
+enum KSignGroupB_Chile
+{
+	kgbClNumberChanged			= 0x02,     //	B number was changed.
+	kgbClBusy					= 0x03,     //	Line busy.
+	kgbClCongestion				= 0x04,     //	Congestion.
+	kgbClInvalidNumber			= 0x05,     //	Unallocated number.
+	kgbClLineFreeCharged		= 0x06,     //	Line free and charged.
+	kgbClLineFreeNotCharged		= 0x07,     //	Line free and not charged.
+	kgbClLineOutOfOrder			= 0x08,     //	Called line is out of order.
+	kgbClNone					= 0xFF      //	Used when a manual send of the condition is required.
+};
+
+
+/******************************************************************************
+Defini??es para sinaliza??o (Mexico)
+Signaling definitions (Mexico)
+******************************************************************************/
+/*
+ *  Category of A    (MFC signaling, group II)
+ */
+enum KSignGroupII_Mexico
+{
+	kg2MxTrunkOperator	        = 0x01,     //	Trunk operator.
+	kg2MxOrdinary		        = 0x02,     //	Subscriber without priority.
+	kg2MxMaintenance	        = 0x06,     //	Maintenance equipment.
+};
+
+/*
+ *  Condition of B   (MFC signaling, group B)
+ */
+enum KSignGroupB_Mexico
+{
+	kgbMxLineFreeCharged		= 0x01,     //	Line free and charged.
+	kgbMxBusy					= 0x02,     //	Line busy.
+	kgbMxLineFreeNotCharged		= 0x05,     //	Line free and not charged.
+	kgbMxNone				    = 0xFF      //	Used when a manual send of the condition is required.
+};
+
+
+/******************************************************************************
+Defini??es para sinaliza??o (Uruguai)
+Signaling definitions (Uruguay)
+******************************************************************************/
+/*
+ *  Category of A    (MFC signaling, group II)
+ */
+enum KSignGroupII_Uruguay
+{
+	kg2UyOrdinary		        = 0x01,     //	Subscriber without priority.
+	kg2UyPriority		        = 0x02,     //	Subscriber with priority.
+	kg2UyMaintenance	        = 0x03,     //	Maintenance equipment.
+	kg2UyLocalPayPhone	        = 0x04,     //	Local pay phone.
+	kg2UyTrunkOperator	        = 0x05,     //	Trunk operator.
+	kg2UyDataTrans	            = 0x06,     //	Data transmission.
+    kg2UyInternSubscriber       = 0x07,     //  Internacional subscriber.
+};
+
+/*
+ *  Condition of B   (MFC signaling, group B)
+ */
+enum KSignGroupB_Uruguay
+{
+	kgbUyNumberChanged			= 0x02,     //	B number was changed.
+	kgbUyBusy					= 0x03,     //	Line busy.
+	kgbUyCongestion				= 0x04,     //	Congestion.
+	kgbUyInvalidNumber			= 0x05,     //	Unallocated number.
+	kgbUyLineFreeCharged		= 0x06,     //	Line free and charged.
+	kgbUyLineFreeNotCharged		= 0x07,     //	Line free and not charged.
+	kgbUyLineOutOfOrder			= 0x08,     //	Called line is out of order.
+	kgbUyNone					= 0xFF      //	Used when a manual send of the condition is required.
+};
+
+
+
+/******************************************************************************
+Defini??es para sinaliza??o (Venezuela)
+Signaling definitions (Venezuela)
+******************************************************************************/
+/*
+ *  Category of A    (MFC signaling, group II)
+ */
+enum KSignGroupII_Venezuela
+{
+	kg2VeOrdinary		        = 0x01,     //	Subscriber without priority.
+	kg2VePriority		        = 0x02,     //	Subscriber with priority.
+	kg2VeMaintenance	        = 0x03,     //	Maintenance equipment.
+	kg2VeLocalPayPhone	        = 0x04,     //	Local pay phone.
+	kg2VeTrunkOperator	        = 0x05,     //	Trunk operator.
+	kg2VeDataTrans	            = 0x06,     //	Data transmission.
+    kg2VeNoTransferFacility     = 0x07,     //  Subscriber without transfer facility
+};
+
+/*
+ *  Condition of B   (MFC signaling, group B)
+ */
+enum KSignGroupB_Venezuela
+{
+	kgbVeLineFreeChargedLPR		= 0x01,     //	Line free, charged, last party released.
+	kgbVeNumberChanged			= 0x02,     //	B number was changed.
+	kgbVeBusy					= 0x03,     //	Line busy.
+	kgbVeCongestion				= 0x04,     //	Congestion.
+	kgbVeInformationTone		= 0x05,     //	Special Information Tone.
+	kgbVeLineFreeCharged		= 0x06,     //	Line free and charged.
+	kgbVeLineFreeNotCharged		= 0x07,     //	Line free and not charged.
+    kgbVeLineBlocked            = 0x08,     //  Blocked for input trafic.
+    kgbVeIntercepted            = 0x09,     //  Intercepted.
+    kgbVeDataTrans              = 0x0A,     //  Data Transmission Equipment
+	kgbVeNone					= 0xFF      //	Used when a manual send of the condition is required.
+};
+
+
+
+
+
+
+/******************************************************************************
+OBSOLETO
+DEPRECATED
+******************************************************************************/
+
+// Grupo B
+// Group B
+enum KSignGroupB
+{
+	kgbLineFreeCharged			= 0x01,
+/*	Livre com tarifa??o.
+	Line free and charged.
+*/
+	kgbLineFreeNotCharged		= 0x05,
+/*	Livre sem tarifa??o.
+	Line free with no charge.
+*/
+	kgbLineFreeChargedLPR		= 0x06,
+/*	Livre com tarifa?ao. Reten??o sob controle de assinante chamado.
+	Line free, charged, last party released.
+*/
+	kgbBusy						= 0x02,
+/*	Linha assinante B ocupado.
+	Line busy.
+*/
+	kgbNumberChanged			= 0x03,
+/*	N?mero de B foi mudado.
+	B number was changed.
+*/
+	kgbCongestion				= 0x04,
+/*	Congestionamento.
+	Congestion.
+*/
+	kgbInvalidNumber			= 0x07,
+/*	N?vel ou n?mero vago.
+	Unallocated number.
+*/
+	kgbLineOutOfOrder			= 0x08,
+/*	Assinante B fora de servi?o.
+	Called line is out of order.
+*/
+	kgbNone						= 0xFF
+/*  Este valor deve ser atribuido quando a for necessario enviar a condicao manualmente
+	This value is used when a manual send of the condition is required
+*/
+};
+
+#define STT_GB_LINEFREE_CHARGED				0x01
+#define STT_GB_LINEFREE_NOTCHARGED			0x05
+#define STT_GB_LINEFREE_CHARGED_LPR			0x06
+#define	STT_GB_BUSY							0x02
+#define STT_GB_NUMBER_CHANGED				0x03
+#define STT_GB_CONGESTION					0x04
+#define STT_GB_UNALLOCATED_NUMBER			0x07
+#define STT_GB_LINE_OUT_OF_ORDER			0x08
+#define STT_GB_NONE							0xFF
+
+// Grupo II
+// Group II
+enum KSignGroupII
+{
+	kg2Ordinary			= 0x01,
+/*	Assinante comum.
+	Ordinalry subscriber.
+*/
+	kg2Priority			= 0x02,
+/*	Assinante com tarifa??o especial.
+	Subscriber with priority.
+*/
+	kg2Maintenance		= 0x03,
+/*	Equipamento de manuten??o.
+	Maintenance equipment.
+*/
+	kg2LocalPayPhone	= 0x04,
+/*	Telefone p?blico local.
+	Local pay phone.
+*/
+	kg2TrunkOperator	= 0x05,
+/*	Telefonista.
+	Trunk operator.
+*/
+	kg2DataTrans		= 0x06,
+/*	Comunica??o de dados.
+	Data transmission.
+*/
+	kg2NonLocalPayPhone = 0x07,
+/*	Telefone p?blico interurbando.
+	Non-local pay phone.
+*/
+	kg2CollectCall		= 0x08,
+/*	Chamada a cobrar.
+	Collect call.
+*/
+	kg2OrdinaryInter	= 0x09,
+/*	Assinante comum, entrante internacional.
+	International ordinary subscriber.
+*/
+	kg2Transfered		= 0x0B,
+/*	Chamada transferida.
+	Transfered call.
+*/
+};
+
+#define STT_GII_ORDINARY					0x01
+#define STT_GII_PRIORITY					0x02
+#define STT_GII_MAINTENANCE					0x03
+#define STT_GII_LOCAL_PAY_PHONE				0x04
+#define STT_GII_TRUNK_OPERATOR				0x05
+#define STT_GII_DATA_TRANS					0x06
+#define STT_GII_NON_LOCAL_PAY_PHONE			0x07		
+#define STT_GII_COLLECT_CALL				0x08
+#define STT_GII_ORDINARY_INTERNATIONAL		0x09
+#define STT_GII_TRANSFERED					0x0B
+
+#endif

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KTypeDefs.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KTypeDefs.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,79 @@
+#if !defined KLTYPEDEFS_H
+#define KLTYPEDEFS_H
+
+#if defined( _WINDOWS ) || defined( _Windows ) || defined( _WIN32 )
+	#ifndef KWIN32
+	#define KWIN32 1
+	#endif
+#endif
+
+// Khomp defined types
+#ifdef KWIN32
+	typedef __int64				int64;
+	typedef unsigned __int64	uint64;
+	#define Kstdcall __stdcall
+#else
+	typedef long long				int64;
+	typedef unsigned long long		uint64;
+	#define Kstdcall 
+#endif
+
+typedef int					int32;
+typedef unsigned int		uint32;
+
+typedef uint64			    intptr;
+typedef intptr              stackint;
+
+typedef short int			int16;
+typedef unsigned short int	uint16;
+
+typedef char				int8;
+typedef unsigned char		uint8;
+
+typedef unsigned char		byte;
+typedef char				sbyte;
+
+typedef double				float64;
+typedef float				float32;
+
+typedef int32				stt_code;
+
+
+enum KLibraryStatus 
+{
+	ksSuccess =			0,
+	ksFail =			1,
+	ksTimeOut =			2,
+	ksBusy =			3,
+	ksLocked =			4,
+	ksInvalidParams =	5,
+	ksEndOfFile =		6,
+	ksInvalidState =	7,
+	ksServerCommFail =	8,
+	ksOverflow =		9,
+    ksUnderrun =        10,
+	ksNotFound =		11,
+    ksNotAvailable =    12
+};	
+
+enum KTxRx
+{
+	kNoTxRx	= 0x0,
+	kTx		= 0x1,
+	kRx		= 0x2,
+	kBoth	= 0x3
+}; 
+
+
+#define KMAX_SERIAL_NUMBER			12 
+#define KMAX_E1_CHANNELS			30
+#define KMAX_DIAL_NUMBER	        20
+#define KMAX_ADDRESS				60
+#define KMAX_DSP_NAME		        8
+#define KMAX_STR_VERSION	        80
+#define KMAX_BUFFER_ADDRESSES		16
+#define KMAX_LOG                    1024
+#define KMAX_SIP_DATA               248
+
+#endif
+

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KVoIP.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KVoIP.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,96 @@
+#if !defined KVOIPDEFS_H
+#define KVOIPDEFS_H
+
+enum KRejectReason
+{
+	UserBusy = 0,
+	UserNotFound,
+	NoAnswer,
+	Decline,
+	ServiceUnavailable,
+	ServerInternalError,
+	UnknownRejectReason
+};
+
+enum KSIP_Failures
+{
+	kveResponse_200_OK_Success             		= 200,
+
+    kveRedirection_300_MultipleChoices			= 300,
+	kveRedirection_301_MovedPermanently			= 301,
+	kveRedirection_302_MovedTemporarily			= 302,
+	kveRedirection_305_UseProxy					= 305,
+	kveRedirection_380_AlternativeService		= 380,
+
+	kveFailure_400_BadRequest					= 400,
+	kveFailure_401_Unauthorized					= 401,
+	kveFailure_402_PaymentRequired				= 402,
+	kveFailure_403_Forbidden					= 403,
+	kveFailure_404_NotFound						= 404,
+	kveFailure_405_MethodNotAllowed				= 405,
+	kveFailure_406_NotAcceptable				= 406,
+	kveFailure_407_ProxyAuthenticationRequired	= 407,
+	kveFailure_408_RequestTimeout				= 408,
+	kveFailure_410_Gone							= 410,
+	kveFailure_413_RequestEntityTooLarge		= 413,
+	kveFailure_414_RequestURI_TooLong			= 414,
+	kveFailure_415_UnsupportedMediaType			= 415,
+	kveFailure_416_UnsupportedURI_Scheme		= 416,
+	kveFailure_420_BadExtension					= 420,
+	kveFailure_421_ExtensionRequired			= 421,
+	kveFailure_423_IntervalTooBrief				= 423,
+	kveFailure_480_TemporarilyUnavailable		= 480,
+	kveFailure_481_CallDoesNotExist				= 481,
+	kveFailure_482_LoopDetected					= 482,
+	kveFailure_483_TooManyHops					= 483,
+	kveFailure_484_AddressIncomplete			= 484,
+	kveFailure_485_Ambiguous					= 485,
+	kveFailure_486_BusyHere						= 486,
+	kveFailure_487_RequestTerminated			= 487,
+	kveFailure_488_NotAcceptableHere			= 488,
+	kveFailure_491_RequestPending				= 491,
+	kveFailure_493_Undecipherable				= 493,
+
+	kveServer_500_InternalError					= 500,
+	kveServer_501_NotImplemented				= 501,
+	kveServer_502_BadGateway					= 502,
+	kveServer_503_ServiceUnavailable			= 503,
+	kveServer_504_TimeOut						= 504,
+	kveServer_505_VersionNotSupported			= 505,
+	kveServer_513_MessageTooLarge				= 513,
+
+	kveGlobalFailure_600_BusyEverywhere			= 600,
+	kveGlobalFailure_603_Decline				= 603,
+	kveGlobalFailure_604_DoesNotExistAnywhere	= 604,
+	kveGlobalFailure_606_NotAcceptable			= 606
+};
+
+enum KVoIPRegTypes
+{
+   kvrtRegister    =   0,
+   kvrtUnregister  =   1
+};
+
+// Below structures are deprecated
+struct KVoIPCallParams
+{
+	sbyte ToUser[ KMAX_ADDRESS + 1 ];
+	sbyte FromUser[ KMAX_ADDRESS + 1 ];
+    sbyte FromUserIP[ KMAX_ADDRESS + 1 ];
+};
+
+struct KVoIPEvRegisterParams
+{
+    KVoIPRegTypes Register;
+	sbyte User[ KMAX_ADDRESS + 1 ];
+	sbyte ProxyIP[ KMAX_ADDRESS + 1 ];
+};
+
+struct KVoIPSeize 
+{
+	sbyte FromUser[ KMAX_ADDRESS + 1 ];
+	sbyte ToUser[ KMAX_ADDRESS + 1 ];
+    sbyte ProxyIP[ KMAX_ADDRESS + 1 ];
+};
+
+#endif

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3l.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3l.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,583 @@
+#if !defined K3L_H
+#define K3L_H
+
+#include "k3lVersion.h"
+#include "KDefs.h"
+#include "KTypeDefs.h"
+#include "KVoIP.h"
+#include "KISDN.h"
+#include "KGSM.h"
+
+enum KDeviceType
+{
+	kdtE1     = 0,
+	kdtFXO    = 1,
+	kdtConf   = 2,
+	kdtPR     = 3,
+	kdtE1GW   = 4,
+	kdtFXOVoIP = 5,
+	kdtE1IP	  = 6,
+	kdtE1Spx  = 7,
+    kdtGWIP   = 8,
+    kdtFXS    = 9,
+    kdtFXSSpx = 10,
+    kdtGSM    = 11,
+    kdtGSMSpx = 12
+};
+
+enum KSignaling
+{
+	ksigInactive		= 0,
+	ksigR2Digital		= 1,
+	ksigContinuousEM	= 2,
+	ksigPulsedEM		= 3,
+	ksigUserR2Digital	= 4,
+	ksigAnalog			= 5,
+	ksigOpenCAS			= 6,
+	ksigOpenR2			= 7,
+	ksigSIP 			= 8,
+    ksigOpenCCS         = 9,
+    ksigPRI_EndPoint    = 10,
+    ksigAnalogTerminal  = 11,
+    ksigPRI_Network     = 12,
+    ksigPRI_Passive     = 13,
+	ksigLineSide  		= 14,
+	ksigCAS_EL7			= 15,
+    ksigGSM             = 16,
+	ksigE1LC			= 17,
+};
+
+enum KE1DeviceModel
+{
+	kdmE1600	= 0,
+	kdmE1600E	= 1,
+	kdmE1600EX  = 2
+};
+
+enum KE1GWDeviceModel //Mirror of KE1DeviceModel
+{
+	kdmE1GW640   = 1,
+    kdmE1GW640EX = 2
+};
+
+enum KE1IPDeviceModel //Mirror of KE1DeviceModel
+{
+	kdmE1IP   = 1,
+    kdmE1IPEX = 2
+};
+
+enum KGWIPDeviceModel //Mirror of KE1DeviceModel
+{
+	kdmGWIP   = 1,
+	kdmGWIPEX = 2
+};
+
+enum KFXODeviceModel
+{
+	kdmFXO80    = 0,
+	kdmFXOHI    = 1,
+	kdmFXO160HI = 2
+};
+
+enum KFXOVoIPDeviceModel //Mirror of KFXDeviceModel
+{
+	kdmFXGW180 = kdmFXO80
+};
+
+enum KConfDeviceModel
+{
+	kdmConf240   = 0,
+	kdmConf120   = 1,
+	kdmConf240EX = 2,
+	kdmConf120EX = 3
+};
+
+enum KPRDeviceModel
+{
+	kdmPR300v1         = 0,
+    kdmPR300           = 1,
+	kdmPR300SpxBased   = 2,
+    kdmPR300EX         = 3
+};
+
+enum KFXSDeviceModel
+{
+    kdmFXS300   = 1,
+    kdmFXS300EX = 2
+};
+
+enum KFXSSpxDeviceModel
+{
+    kdmFXSSpx300      = 0,
+    kdmFXSSpx2E1Based = 1,
+    kdmFXSSpx300EX    = 2
+};
+
+enum KE1SpxDeviceModel
+{
+	kdmE1Spx    = 0,
+	kdm2E1Based = 1,
+    kdmE1SpxEX  = 2
+};
+
+enum KGSMDeviceModel
+{
+    kdmGSM      = 0
+};
+
+enum KGSMSpxDeviceModel
+{
+    kdmGSMSpx   = 0
+};
+
+enum KSystemObject
+{
+	ksoLink		= 0x00,		// K3L_LINK_STATUS, K3L_LINK_CONFIG (ksoLink + LinkNumber).
+	ksoLinkMon	= 0x20,		// K3L_LINK_ERROR_COUNTER.
+	ksoChannel	= 0x1000,	// K3L_CHANNEL_STATUS, K3L_CHANNEL_CONFIG (ksoChannel + ChannelNumber).
+	ksoH100		= 0x200,	// H100 individual configs. Used by adding the same value passed to CM_SETUP_H100.
+	ksoFirmware = 0x80,		// Structures described below (ksoFirmware + KFirmwareId).
+	ksoDevice	= 0x100,	// K3L_DEVICE_CONFIG
+	ksoAPI		= 0x150		// K3L_API_CONFIG
+};
+
+enum KFirmwareId
+{
+	kfiE1600A,				// K3L_E1600A_FW_CONFIG
+	kfiE1600B,				// K3L_E1600B_FW_CONFIG
+	kfiFXO80,				// K3L_FX80_FW_CONFIG
+    kfiGSM40                // K3L_GSM40_FW_CONFIG
+};
+
+enum KE1Status
+{
+	kesOk					= 0x00,		// Link OK
+	kesSignalLost			= 0x01,		// Lost of signal
+	kesNetworkAlarm			= 0x02,		// Central office reporting a fail in some point
+	kesFrameSyncLost		= 0x04,		// Frame is out of sync
+	kesMultiframeSyncLost	= 0x08,		// Multiframe alingment fail
+	kesRemoteAlarm			= 0x10,		// Central office reporting fail
+	kesHighErrorRate		= 0x20,		// Excessive error rate
+	kesUnknownAlarm			= 0x40,		// Unknown alarm
+	kesE1Error				= 0x80,		// E1 controller damaged
+    kesNotInitialized       = 0xFF      // Framer not initilialized
+};
+
+enum KE1ChannelStatus
+{
+	kecsFree			= 0x00,			// Channel is free for use
+	kecsBusy			= 0x01,			// Channel busy (not free)
+	kecsOutgoing		= 0x02,			// Channel busy by outgoing call
+	kecsIncoming		= 0x04,			// Channel busy by incoming call
+	kecsLocked			= 0x06,			// Channel locked
+	kecsOutgoingLock	= 0x10,			// Channel locked for outgoing calls
+	kecsLocalFail		= 0x20,			// Channel fail
+	kecsIncomingLock	= 0x40,			// Channel locked for incoming calls
+	kecsRemoteLock		= 0x80			// Channel remotelly locked
+};
+
+enum KVoIPChannelStatus
+{
+	kipcsFree			= kecsFree,		
+	kipcsOutgoingLock	= kecsOutgoingLock,
+	kipcsIncomingLock	= kecsIncomingLock
+};
+
+enum KFXOChannelStatus
+{
+	kfcsDisabled	= 0x00,		// Channel is not activated
+	kfcsEnabled		= 0x01		// Channel is actived		
+};
+
+enum KFXSChannelStatus
+{
+    kfxsOnHook,
+    kfxsOffHook,
+    kfxsRinging,
+    kfxsFail
+};
+
+enum KGsmChannelStatus
+{
+    kgsmIdle,
+    kgsmCallInProgress,
+    kgsmSMSInProgress,
+    kgsmModemError,
+    kgsmSIMCardError,
+    kgsmNetworkError,
+    kgsmNotReady
+};
+
+enum KCallStatus
+{
+	kcsFree		= 0x00,				// Channel is free for use
+	kcsIncoming = 0x01,				// Channel in incoming call
+	kcsOutgoing = 0x02,				// Channel in outgoing call
+	kcsFail		= 0x04				// Channel fail
+};
+
+enum KCallStartInfo
+{
+    kcsiHumanAnswer,
+    kcsiAnsweringMachine,
+    kcsiCellPhoneMessageBox,
+    kcsiUnknown,
+    kcsiCarrierMessage
+};
+
+enum KChannelFeatures
+{
+	kcfDtmfSuppression	= 0x0001,
+	kcfCallProgress		= 0x0002,
+	kcfPulseDetection	= 0x0004,
+	kcfAudioNotification= 0x0008,
+	kcfEchoCanceller	= 0x0010,
+	kcfAutoGainControl	= 0x0020,
+	kcfHighImpEvents	= 0x0080,
+    kcfCallAnswerInfo   = 0x0100,
+    kcfOutputVolume     = 0x0200,
+    kcfPlayerAGC        = 0x0400
+};
+
+enum KMixerSource
+{
+	kmsChannel,
+	kmsPlay,
+	kmsGenerator,
+	kmsCTbus,
+    kmsNoDelayChannel
+};
+
+struct KMixerCommand
+{
+    int32 Track;
+    int32 Source;        // KMixerSource
+    int32 SourceIndex;
+};
+
+struct KPlayFromStreamCommand
+{
+	void *Buffer;
+	uint32 BufferSize;
+	int32 CodecIndex;
+};
+
+struct KBufferParam
+{
+	void *Buffer;
+	uint32 BufferSize;
+};
+
+enum KMixerTone
+{
+	kmtSilence	= 0x00,	// geracao/deteccao
+	kmtDial		= 0x01, // geracao/deteccao
+	kmtBusy		= 0x02, // geracao
+	kmtFax		= 0x03, // geracao/deteccao
+	kmtVoice	= 0x04, // deteccao
+	kmtEndOf425 = 0x05,	// deteccao
+    kmtCollect  = 0x06, // deteccao
+    kmtEndOfDtmf= 0x07, // deteccao
+};
+
+struct K3L_CHANNEL_STATUS
+{
+ 	KCallStatus CallStatus;
+	KMixerTone AudioStatus;
+	int32 AddInfo;			// KE1ChannelStatus for E1 Channels, KFXOChannelStatus for Analog...
+	int32 EnabledFeatures;	// KChannelFeatures bitwise
+};
+
+struct K3L_LINK_STATUS
+{
+	int16 E1; // (KE1Status) int16 used for compatibility between different memory aligniments
+	byte Channels[ KMAX_E1_CHANNELS ];	// (KE1ChannelStatus) Channel number indexed vector with firmware information.
+};
+
+enum KPllErrors
+{
+	kpeClockAError    = 0x01,
+	kpeClockBError    = 0x02,
+	kpeSCbusError     = 0x04,
+	kpeMVIPError	  = 0x08,
+	kpeMasterPllError = 0x10,
+	kpeModeError      = 0x20,
+	kpeLocalRefError  = 0x40,
+	kpeInternalError  = 0x80
+
+};
+
+struct K3L_H100_STATUS
+{
+	int32 Mode;
+	int32 MasterClock;
+	int32 Enable;
+	int32 Reference;
+
+	int32 SCbus;
+	int32 HMVIP;
+	int32 MVIP90;
+	int32 CT_NETREF;
+	int32 PllLocalRef;
+
+	int32 PllErrors;		// bitwise, defined in KPllErrors
+};
+
+enum KEchoLocation
+{
+	kelNetwork	= 0x0,
+	kelCtBus	= 0x1
+};
+
+enum KCodecIndex
+{
+	kci8kHzALAW	= 0x00,
+	kci8kHzPCM	= 0x01,  // not suitable for CM_RECORD_TO_FILE_EX
+	kci11kHzPCM	= 0x02,  // not suitable for CM_RECORD_TO_FILE_EX
+	kci8kHzGSM	= 0x03, 
+	kci8kHzADPCM= 0x04, 
+	kci8kHzULAW	= 0x05,
+	kciLastCodecEntryMark
+};
+
+enum KEchoCancellerConfig
+{
+    keccNotPresent,
+    keccOneSingleBank,
+    keccOneDoubleBank,
+    keccTwoSingleBank,
+    keccTwoDoubleBank,
+    keccFail
+};
+
+struct K3L_DEVICE_CONFIG
+{
+	int32 LinkCount;
+	int32 ChannelCount;
+	int32 EnabledChannelCount;
+	int32 MixerCount;
+	int32 MixerCapacity;
+	int32 WorkStatus;
+	int32 DeviceModel;		// KE1DeviceModel, KFXODeviceModel...
+	int32 H100_Mode;		// KH100Mode
+	int32 PciBus;
+	int32 PciSlot;
+	int32 PlayerCount;
+	int32 VoIPChannelCount;
+    int32 CTbusCount;
+    KEchoCancellerConfig EchoConfig;
+    KEchoLocation EchoLocation;
+	sbyte SerialNumber[ KMAX_SERIAL_NUMBER ];
+};
+
+// Compatibility
+typedef K3L_DEVICE_CONFIG K3L_E1_DEVICE_CONFIG;
+typedef K3L_DEVICE_CONFIG K3L_FX_DEVICE_CONFIG;
+
+struct K3L_API_CONFIG
+{
+	int32 MajorVersion;
+	int32 MinorVersion;
+	int32 BuildVersion;
+    int32 SvnRevision;
+	int32 RawCmdLogging;
+	int32 VpdVersionNeeded;
+	sbyte StrVersion[ KMAX_STR_VERSION ];
+};
+
+struct K3L_LINK_CONFIG
+{
+	KSignaling Signaling;
+	int32 IncomingDigitsRequest;
+	int32 IdentificationRequestPos;
+	int32 ChannelCount;
+	int32 ReceivingClock;
+	sbyte NumberA[ KMAX_DIAL_NUMBER + 1 + 3 ]; // +3 = compatibility between different memory alignments
+};
+
+struct K3L_CHANNEL_CONFIG
+{
+	KSignaling Signaling;
+    int32 AutoEnableFeatures;   // KChannelFeatures bitwise
+    int32 CapableFeatures;      // future implementation
+};
+
+struct K3L_E1600A_FW_CONFIG
+{
+	int32 MfcExchangersCount;
+	int32 MonitorBufferSize;
+	sbyte FwVersion[ KMAX_STR_VERSION ];
+	sbyte DspVersion[ KMAX_DSP_NAME ];
+};
+
+struct K3L_E1600B_FW_CONFIG
+{
+	int32 AudioBufferSize;
+	int32 FilterCount;
+	int32 MixerCount;
+	int32 MixerCapacity;
+	sbyte FwVersion[ KMAX_STR_VERSION ];
+	sbyte DspVersion[ KMAX_DSP_NAME ];
+};
+
+typedef K3L_E1600B_FW_CONFIG K3L_GSM40_FW_CONFIG;
+typedef K3L_E1600B_FW_CONFIG K3L_FXO80_FW_CONFIG;
+
+struct K3L_COMMAND
+{
+	int32 Object;			// Object index, dependent of the context
+	int32 Cmd;				// Command code
+	byte *Params;			// pointer to parameters
+};
+
+// Used to specify the object passed in the first parameter when executing the
+// event handler callback function.
+enum KEventObjectId
+{
+	koiDevice		= 0x00,
+	koiChannel		= 0x01,
+	koiPlayer		= 0x02,
+	koiLink			= 0x03
+};
+
+
+struct K3L_EVENT
+{
+	int32 Code;				// API code
+	int32 AddInfo;			// Parameter 1
+	int32 DeviceId;			// Hardware information
+	int32 ObjectInfo;		// Additional object information
+	void *Params;			// Pointer to the parameter buffer
+	int32 ParamSize;		// Size of parameter buffer
+	int32 ObjectId;			// KEventObjectId: Event thrower object id
+};
+
+struct KIncomingSeizeParams
+{
+	sbyte NumberB[ KMAX_DIAL_NUMBER + 1 ];
+	sbyte NumberA[ KMAX_DIAL_NUMBER + 1 ];
+
+	sbyte Padding[2];  // for compatibility between different memory alignments
+};
+
+struct KCtbusCommand
+{
+	int32 Stream;
+	int32 TimeSlot;
+	int32 Enable;
+};
+
+struct KUserInformation
+{
+    int32 ProtocolDescriptor;
+    int32 UserInfoLength;
+    byte  UserInfo[ KMAX_USER_USER_LEN ];
+};
+
+struct KISDNSubaddressInformation
+{
+    KQ931TypeOfSubaddress TypeOfSubaddress;
+    bool  OddNumberOfSignals;
+    int32 InformationLength;
+    byte  Information[ KMAX_SUBADRESS_INFORMATION_LEN ];
+};
+
+struct KISDNSubaddresses
+{
+    KISDNSubaddressInformation Called;
+    KISDNSubaddressInformation Calling;
+};
+
+enum KLinkErrorCounter
+{
+	klecChangesToLock		=  0,
+	klecLostOfSignal		=  1,
+	klecAlarmNotification   =  2,
+	klecLostOfFrame         =  3,
+	klecLostOfMultiframe    =  4,
+	klecRemoteAlarm			=  5,
+	klecUnknowAlarm			=  6,
+	klecPRBS				=  7,
+	klecWrogrBits			=  8,
+	klecJitterVariation		=  9,
+	klecFramesWithoutSync	= 10,
+	klecMultiframeSignal	= 11,
+	klecFrameError			= 12,
+	klecBipolarViolation	= 13,
+	klecCRC4				= 14,
+	klecCount				= 15
+};
+
+struct K3L_LINK_ERROR_COUNTER
+{
+	int32 ErrorCounters[ klecCount ];
+};
+
+struct KSipData
+{
+    int32 DataLength;
+    byte  Data[ KMAX_SIP_DATA ];
+};
+
+
+enum KLibParams
+{
+	klpDebugFirmware,           // starts low level depuration
+    klpResetFwOnStartup,		// force firmware (re)boot on startup
+    klpResetFwOnShutdown,       // force board reset on exit
+    klpSeizureEventCompat,      // keep compatibility of EV_SEIZURE/EV_VOIP_SEIZURE instead of the new EV_NEW_CALL
+    klpDisableTDMBufferWarnings,// don't log TDM buffer warning messages.
+    klpDisableInternalVoIP,     // disables ALL VoIP channels!
+    klpLogCallControl,        // starts k3l's call control logging
+	klpMaxParams
+};
+
+// Definition of K3L_CALLBACK
+typedef stt_code ( Kstdcall K3L_CALLBACK )();
+typedef stt_code ( Kstdcall K3L_MONITOR_CALLBACK )( byte *, byte );
+typedef stt_code ( Kstdcall K3L_EVENT_CALLBACK )( int32 Object, K3L_EVENT * );
+typedef stt_code ( Kstdcall *K3L_THREAD_CALLBACK )( void * );
+typedef void	 ( Kstdcall K3L_AUDIO_CALLBACK )( int32 DevId, int32 Channel, byte *Buffer, int32 Size );
+
+#if __GNUC__ >= 4
+#pragma GCC visibility push(default)
+#endif
+
+extern "C"
+{
+
+sbyte *Kstdcall k3lStart( int32 Major, int32 Minor, int32 Build );
+
+void Kstdcall k3lStop();
+
+void Kstdcall k3lRegisterEventHandler( K3L_EVENT_CALLBACK *Function );
+
+void Kstdcall k3lRegisterAudioListener( K3L_AUDIO_CALLBACK *Player, K3L_AUDIO_CALLBACK *Recorder );
+
+int32 Kstdcall k3lSendCommand( int32 DeviceId, K3L_COMMAND *Cmd );
+
+int32 Kstdcall k3lSendRawCommand( int32 DeviceId, int32 IntfId, void *Command, int32 CmdSize );
+
+int32 Kstdcall k3lRegisterMonitor( K3L_MONITOR_CALLBACK *EventMonitor, K3L_MONITOR_CALLBACK *CommandMonitor, K3L_MONITOR_CALLBACK *BufferMonitor );
+
+int32 Kstdcall k3lGetDeviceConfig( int32 DeviceId, int32 Object, void *Data, int32 DataSize );
+
+int32 Kstdcall k3lGetDeviceStatus( int32 DeviceId, int32 Object, void *Data, int32 DataSize );
+
+int32 Kstdcall k3lGetDeviceCount();
+
+int32 Kstdcall k3lGetDeviceType( int32 DeviceId );
+
+int32 Kstdcall k3lGetEventParam( K3L_EVENT *Evt, const sbyte *Name, sbyte *Buffer, int32 BufferSize );
+
+int32 Kstdcall k3lSetGlobalParam( int32 ParamIndex, int32 ParamValue );
+
+}
+
+#if __GNUC__ >= 4
+#pragma GCC visibility pop
+#endif
+
+#endif
+
+

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3lVersion.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3lVersion.h	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,9 @@
+#ifndef k3lVersion_h
+#define k3lVersion_h
+
+#define k3lApiMajorVersion	2
+#define k3lApiMinorVersion	0
+#define k3lApiBuildVersion	0
+
+#endif
+

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Tue Jun  9 10:36:45 2009
@@ -0,0 +1,646 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II 
+ *
+ * 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
+ * Anthony Minessale II 
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Joao Mesquita 
+ *
+ *
+ * mod_khomp.c -- Khomp board Endpoint Module
+ *
+ */
+
+/* Our includes */
+#include "k3l.h"
+
+extern "C"
+{
+    #include 
+}
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown);
+//SWITCH_MODULE_RUNTIME_FUNCTION(mod_khomp_runtime);
+SWITCH_MODULE_DEFINITION(mod_khomp, mod_khomp_load, mod_khomp_shutdown, NULL);	//mod_khomp_runtime);
+
+
+switch_endpoint_interface_t *khomp_endpoint_interface;
+static switch_memory_pool_t *module_pool = NULL;
+static int running = 1;
+
+
+typedef enum {
+	TFLAG_IO = (1 << 0),
+	TFLAG_INBOUND = (1 << 1),
+	TFLAG_OUTBOUND = (1 << 2),
+	TFLAG_DTMF = (1 << 3),
+	TFLAG_VOICE = (1 << 4),
+	TFLAG_HANGUP = (1 << 5),
+	TFLAG_LINEAR = (1 << 6),
+	TFLAG_CODEC = (1 << 7),
+	TFLAG_BREAK = (1 << 8)
+} TFLAGS;
+
+typedef enum {
+	GFLAG_MY_CODEC_PREFS = (1 << 0)
+} GFLAGS;
+
+
+static struct {
+	int debug;
+	char *ip;
+	int port;
+	char *dialplan;
+	char *codec_string;
+	char *codec_order[SWITCH_MAX_CODECS];
+	int codec_order_last;
+	char *codec_rates_string;
+	char *codec_rates[SWITCH_MAX_CODECS];
+	int codec_rates_last;
+	unsigned int flags;
+	int calls;
+	switch_mutex_t *mutex;
+} globals;
+
+struct private_object {
+	unsigned int flags;
+	switch_codec_t read_codec;
+	switch_codec_t write_codec;
+	switch_frame_t read_frame;
+	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
+	switch_core_session_t *session;
+	switch_caller_profile_t *caller_profile;
+	switch_mutex_t *mutex;
+	switch_mutex_t *flag_mutex;
+	//switch_thread_cond_t *cond;
+};
+
+typedef struct private_object private_t;
+
+
+SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan);
+SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string);
+SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string);
+SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ip, globals.ip);
+
+
+
+static switch_status_t channel_on_init(switch_core_session_t *session);
+static switch_status_t channel_on_hangup(switch_core_session_t *session);
+static switch_status_t channel_on_routing(switch_core_session_t *session);
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
+static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
+													switch_caller_profile_t *outbound_profile,
+													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
+static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
+static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
+static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
+
+
+
+static void tech_init(private_t *tech_pvt, switch_core_session_t *session)
+{
+	tech_pvt->read_frame.data = tech_pvt->databuf;
+	tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
+	switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
+	switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
+	switch_core_session_set_private(session, tech_pvt);
+	tech_pvt->session = session;
+}
+
+/* 
+   State methods they get called when the state changes to the specific state 
+   returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
+   so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
+*/
+static switch_status_t channel_on_init(switch_core_session_t *session)
+{
+	switch_channel_t *channel;
+	private_t *tech_pvt = NULL;
+
+	tech_pvt = static_cast< private_t* >(switch_core_session_get_private(session));
+	assert(tech_pvt != NULL);
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+	switch_set_flag_locked(tech_pvt, TFLAG_IO);
+
+	/* Move channel's state machine to ROUTING. This means the call is trying
+	   to get from the initial start where the call because, to the point
+	   where a destination has been identified. If the channel is simply
+	   left in the initial state, nothing will happen. */
+	switch_channel_set_state(channel, CS_ROUTING);
+	switch_mutex_lock(globals.mutex);
+	globals.calls++;
+	switch_mutex_unlock(globals.mutex);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_on_routing(switch_core_session_t *session)
+{
+	switch_channel_t *channel = NULL;
+	private_t *tech_pvt = NULL;
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+
+	tech_pvt = static_cast(switch_core_session_get_private(session));
+	assert(tech_pvt != NULL);
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_on_execute(switch_core_session_t *session)
+{
+
+	switch_channel_t *channel = NULL;
+	private_t *tech_pvt = NULL;
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+
+	tech_pvt = static_cast(switch_core_session_get_private(session));
+	assert(tech_pvt != NULL);
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
+
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_on_hangup(switch_core_session_t *session)
+{
+	switch_channel_t *channel = NULL;
+	private_t *tech_pvt = NULL;
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+
+	tech_pvt = static_cast(switch_core_session_get_private(session));
+	assert(tech_pvt != NULL);
+
+	switch_clear_flag_locked(tech_pvt, TFLAG_IO);
+	switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
+	//switch_thread_cond_signal(tech_pvt->cond);
+
+	if (tech_pvt->read_codec.implementation) {
+		switch_core_codec_destroy(&tech_pvt->read_codec);
+	}
+
+	if (tech_pvt->write_codec.implementation) {
+		switch_core_codec_destroy(&tech_pvt->write_codec);
+	}
+
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
+	switch_mutex_lock(globals.mutex);
+	globals.calls--;
+	if (globals.calls < 0) {
+		globals.calls = 0;
+	}
+	switch_mutex_unlock(globals.mutex);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
+{
+	switch_channel_t *channel = NULL;
+	private_t *tech_pvt = NULL;
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+
+	tech_pvt = static_cast(switch_core_session_get_private(session));
+	assert(tech_pvt != NULL);
+
+	switch (sig) {
+	case SWITCH_SIG_KILL:
+		switch_clear_flag_locked(tech_pvt, TFLAG_IO);
+		switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
+		switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+		//switch_thread_cond_signal(tech_pvt->cond);
+		break;
+	case SWITCH_SIG_BREAK:
+		switch_set_flag_locked(tech_pvt, TFLAG_BREAK);
+		break;
+	default:
+		break;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
+{
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf)
+{
+	private_t *tech_pvt = static_cast(switch_core_session_get_private(session));
+	switch_assert(tech_pvt != NULL);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
+{
+	switch_channel_t *channel = NULL;
+	private_t *tech_pvt = NULL;
+	//switch_time_t started = switch_time_now();
+	//unsigned int elapsed;
+	switch_byte_t *data;
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+
+	tech_pvt = static_cast(switch_core_session_get_private(session));
+	assert(tech_pvt != NULL);
+	tech_pvt->read_frame.flags = SFF_NONE;
+	*frame = NULL;
+
+	while (switch_test_flag(tech_pvt, TFLAG_IO)) {
+
+		if (switch_test_flag(tech_pvt, TFLAG_BREAK)) {
+			switch_clear_flag(tech_pvt, TFLAG_BREAK);
+			goto cng;
+		}
+
+		if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
+			return SWITCH_STATUS_FALSE;
+		}
+
+		if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) {
+			switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
+			if (!tech_pvt->read_frame.datalen) {
+				continue;
+			}
+			*frame = &tech_pvt->read_frame;
+#ifdef BIGENDIAN
+			if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
+				switch_swap_linear((*frame)->data, (int) (*frame)->datalen / 2);
+			}
+#endif
+			return SWITCH_STATUS_SUCCESS;
+		}
+
+		switch_cond_next();
+	}
+
+
+	return SWITCH_STATUS_FALSE;
+
+  cng:
+	data = (switch_byte_t *) tech_pvt->read_frame.data;
+	data[0] = 65;
+	data[1] = 0;
+	tech_pvt->read_frame.datalen = 2;
+	tech_pvt->read_frame.flags = SFF_CNG;
+	*frame = &tech_pvt->read_frame;
+	return SWITCH_STATUS_SUCCESS;
+
+}
+
+static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
+{
+	switch_channel_t *channel = NULL;
+	private_t *tech_pvt = NULL;
+	//switch_frame_t *pframe;
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+
+	tech_pvt = static_cast(switch_core_session_get_private(session));
+	assert(tech_pvt != NULL);
+
+	if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
+		return SWITCH_STATUS_FALSE;
+	}
+#ifdef BIGENDIAN
+	if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
+		switch_swap_linear(frame->data, (int) frame->datalen / 2);
+	}
+#endif
+
+
+	return SWITCH_STATUS_SUCCESS;
+
+}
+
+static switch_status_t channel_answer_channel(switch_core_session_t *session)
+{
+	private_t *tech_pvt;
+	switch_channel_t *channel = NULL;
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+
+	tech_pvt = static_cast(switch_core_session_get_private(session));
+	assert(tech_pvt != NULL);
+
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+
+static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
+{
+	switch_channel_t *channel;
+	private_t *tech_pvt;
+
+	channel = switch_core_session_get_channel(session);
+	assert(channel != NULL);
+
+	tech_pvt = (private_t *) switch_core_session_get_private(session);
+	assert(tech_pvt != NULL);
+
+	switch (msg->message_id) {
+	case SWITCH_MESSAGE_INDICATE_ANSWER:
+		{
+			channel_answer_channel(session);
+		}
+		break;
+	default:
+		break;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
+   that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
+*/
+static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
+													switch_caller_profile_t *outbound_profile,
+													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags)
+{
+	if ((*new_session = switch_core_session_request(khomp_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
+		private_t *tech_pvt;
+		switch_channel_t *channel;
+		switch_caller_profile_t *caller_profile;
+
+		switch_core_session_add_stream(*new_session, NULL);
+		if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) {
+			channel = switch_core_session_get_channel(*new_session);
+			tech_init(tech_pvt, *new_session);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
+			switch_core_session_destroy(new_session);
+			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+		}
+
+		if (outbound_profile) {
+			char name[128];
+
+			snprintf(name, sizeof(name), "Khomp/%s", outbound_profile->destination_number);
+			switch_channel_set_name(channel, name);
+
+			caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
+			switch_channel_set_caller_profile(channel, caller_profile);
+			tech_pvt->caller_profile = caller_profile;
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n");
+			switch_core_session_destroy(new_session);
+			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+		}
+
+
+
+		switch_channel_set_flag(channel, CF_OUTBOUND);
+		switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
+		switch_channel_set_state(channel, CS_INIT);
+		return SWITCH_CAUSE_SUCCESS;
+	}
+
+	return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+
+}
+
+static switch_status_t channel_receive_event(switch_core_session_t *session, switch_event_t *event)
+{
+	struct private_object *tech_pvt = static_cast(switch_core_session_get_private(session));
+	char *body = switch_event_get_body(event);
+	switch_assert(tech_pvt != NULL);
+
+	if (!body) {
+		body = "";
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+
+
+switch_state_handler_table_t khomp_state_handlers = {
+	/*.on_init */ channel_on_init,
+	/*.on_routing */ channel_on_routing,
+	/*.on_execute */ channel_on_execute,
+	/*.on_hangup */ channel_on_hangup,
+	/*.on_exchange_media */ channel_on_exchange_media,
+	/*.on_soft_execute */ channel_on_soft_execute
+};
+
+switch_io_routines_t khomp_io_routines = {
+	/*.outgoing_channel */ channel_outgoing_channel,
+	/*.read_frame */ channel_read_frame,
+	/*.write_frame */ channel_write_frame,
+	/*.kill_channel */ channel_kill_channel,
+	/*.send_dtmf */ channel_send_dtmf,
+	/*.receive_message */ channel_receive_message,
+	/*.receive_event */ channel_receive_event
+};
+
+static switch_status_t load_config(void)
+{
+	char *cf = "khomp.conf";
+	switch_xml_t cfg, xml, settings, param;
+
+	memset(&globals, 0, sizeof(globals));
+	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool);
+	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
+		return SWITCH_STATUS_TERM;
+	}
+
+	if ((settings = switch_xml_child(cfg, "settings"))) {
+		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
+			char *var = (char *) switch_xml_attr_soft(param, "name");
+			char *val = (char *) switch_xml_attr_soft(param, "value");
+
+			if (!strcmp(var, "debug")) {
+				globals.debug = atoi(val);
+			} else if (!strcmp(var, "port")) {
+				globals.port = atoi(val);
+			} else if (!strcmp(var, "ip")) {
+				set_global_ip(val);
+			} else if (!strcmp(var, "codec-master")) {
+				if (!strcasecmp(val, "us")) {
+					switch_set_flag(&globals, GFLAG_MY_CODEC_PREFS);
+				}
+			} else if (!strcmp(var, "dialplan")) {
+				set_global_dialplan(val);
+			} else if (!strcmp(var, "codec-prefs")) {
+				set_global_codec_string(val);
+				globals.codec_order_last = switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
+			} else if (!strcmp(var, "codec-rates")) {
+				set_global_codec_rates_string(val);
+				globals.codec_rates_last = switch_separate_string(globals.codec_rates_string, ',', globals.codec_rates, SWITCH_MAX_CODECS);
+			}
+		}
+	}
+
+	if (!globals.dialplan) {
+		set_global_dialplan("default");
+	}
+
+	if (!globals.port) {
+		globals.port = 4569;
+	}
+
+	switch_xml_free(xml);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+bool start_k3l(void)
+{
+    k3lSetGlobalParam (klpResetFwOnStartup, 1);
+    k3lSetGlobalParam (klpDisableInternalVoIP, 1);
+
+	sbyte *Erro = k3lStart( 2,0,0 );
+
+	if ( Erro )	{
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "loading K3L API failed: %s.\n", Erro);
+		return false;
+	}		
+
+	int _boardCount = k3lGetDeviceCount();
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Number of boards: %d.\n", _boardCount);
+
+	/* No boards */
+	if(_boardCount == 0){
+		k3lStop();
+		return false;
+	}
+
+/*	_boards = new Board*[ _boardCount ];
+
+	for( int i = 0; i < _boardCount; i++ )
+		_boards[ i ] = new Board( i );
+
+	
+	if(handler) 
+		RegisterHandler((void *)EventCallBack);		*/
+
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API have been started!\n");
+
+	bool is_ok = true;
+
+	if (!is_ok)
+		return false;
+
+	return true;
+};
+
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load)
+{
+
+	module_pool = pool;
+
+	memset(&globals, 0, sizeof(globals));
+
+	load_config();
+
+	*module_interface = switch_loadable_module_create_module_interface(pool, "mod_khomp");
+	khomp_endpoint_interface = static_cast(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE));
+	khomp_endpoint_interface->interface_name = "khomp";
+	khomp_endpoint_interface->io_routines = &khomp_io_routines;
+	khomp_endpoint_interface->state_handler = &khomp_state_handlers;
+
+	if (!start_k3l()) {
+		return SWITCH_STATUS_FALSE;
+	}
+
+	/* indicate that the module should continue to be loaded */
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/*
+SWITCH_MODULE_RUNTIME_FUNCTION(mod_khomp_runtime)
+{
+	return SWITCH_STATUS_TERM;
+}
+*/
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown)
+{
+	int x = 0;
+
+	running = -1;
+
+	while (running) {
+		if (x++ > 100) {
+			break;
+		}
+		switch_yield(20000);
+	}
+	
+	/* Free dynamically allocated strings */
+	switch_safe_free(globals.dialplan);
+	switch_safe_free(globals.codec_string);
+	switch_safe_free(globals.codec_rates_string);
+	switch_safe_free(globals.ip);
+
+	/* Finnish him! */
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stopping K3L...\n");
+	k3lStop();
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API have been stopped!\n");
+	
+	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 expandtab:
+ */


From brian at freeswitch.org  Tue Jun  9 09:10:13 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 11:10:13 -0500
Subject: [Freeswitch-svn] [commit] r13723 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: brian
Date: Tue Jun  9 11:10:12 2009
New Revision: 13723

Log:
 you know don't store the transport on the aor becuase then everyone has to match... bad bad bad 

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c	Tue Jun  9 11:10:12 2009
@@ -154,8 +154,7 @@
 	 */
 
 	/* We always store the AOR as the sipip and not the request so SLA works with NAT inside out */
-	aor = switch_mprintf("sip:%s@%s;transport=%s", sip->sip_contact->m_url->url_user,
-						 profile->sipip, sofia_glue_transport2str(transport));
+	aor = switch_mprintf("sip:%s@%s", sip->sip_contact->m_url->url_user, profile->sipip);
 
 	/*
 	 * ok, and now that we HAVE the AOR, we REALLY should go check in the XML config and see if this particular
@@ -293,8 +292,7 @@
 
 	/* calculate the AOR we're trying to tell people about. should probably double-check before derferencing XXX MTK */
 	/* We always store the AOR as the sipip and not the request so SLA works with NAT inside out */
-	aor = switch_mprintf("sip:%s@%s;transport=%s", sip->sip_to->a_url->url_user,
-						 profile->sipip, sofia_glue_transport2str(transport));
+	aor = switch_mprintf("sip:%s@%s", sip->sip_to->a_url->url_user, profile->sipip);
 
 	/* this isn't sufficient because on things like the polycom, the subscriber is the 'main' ext number, but the
 	 * 'main' ext number isn't in ANY of the headers they send us in the notify. of course.


From mikej at freeswitch.org  Tue Jun  9 09:33:33 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 11:33:33 -0500
Subject: [Freeswitch-svn] [commit] r13724 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: mikej
Date: Tue Jun  9 11:33:33 2009
New Revision: 13724

Log:
strip_uri -> sofia_glue_strip_uri

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	Tue Jun  9 11:33:33 2009
@@ -832,6 +832,7 @@
 char * sofia_glue_find_parameter(const char *str, const char *param);
 char *sofia_glue_create_via(switch_core_session_t *session, const char *ip, switch_port_t port, sofia_transport_t transport);
 char *sofia_glue_create_external_via(switch_core_session_t *session, sofia_profile_t *profile, sofia_transport_t transport);
+char *sofia_glue_strip_uri(const char *str);
 int sofia_glue_check_nat(sofia_profile_t *profile, const char *network_ip);
 int sofia_glue_transport_has_tls(const sofia_transport_t tp);
 const char *sofia_glue_get_unknown_header(sip_t const *sip, const char *name);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Tue Jun  9 11:33:33 2009
@@ -844,6 +844,24 @@
 	}
 }
 
+char *sofia_glue_strip_uri(const char *str)
+{
+	char *p;
+	char *r;
+
+	if ((p = strchr(str, '<'))) {
+		p++;
+		r = strdup(p);
+		if ((p = strchr(r, '>'))) {
+			*p = '\0';
+		}
+	} else {
+		r = strdup(str);
+	}
+
+	return r;
+}
+
 int sofia_glue_check_nat(sofia_profile_t *profile, const char *network_ip)
 {
 	return (network_ip && 

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_sla.c	Tue Jun  9 11:33:33 2009
@@ -49,24 +49,6 @@
 	return 0;
 }
 
-char *strip_uri(const char *str)
-{
-	char *p;
-	char *r;
-
-	if ((p = strchr(str, '<'))) {
-		p++;
-		r = strdup(p);
-		if ((p = strchr(r, '>'))) {
-			*p = '\0';
-		}
-	} else {
-		r = strdup(str);
-	}
-
-	return r;
-}
-
 void sofia_sla_handle_register(nua_t *nua, sofia_profile_t *profile, sip_t const *sip, long exptime, const char *full_contact)
 {
 	nua_handle_t *nh = NULL;
@@ -74,7 +56,7 @@
 	char my_contact[256] = "";
 	char *sql;
 	struct sla_helper sh = { { 0 } };
-	char *contact_str = strip_uri(full_contact);
+	char *contact_str = sofia_glue_strip_uri(full_contact);
 	sofia_transport_t transport = sofia_glue_url2transport(sip->sip_contact->m_url);
 	char network_ip[80];
 	int network_port = 0;
@@ -235,7 +217,7 @@
 		char *full_contact = sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_contact);
 		time_t expires = switch_epoch_time_now(NULL);
 		char *sql;
-		char *contact_str = strip_uri(full_contact);
+		char *contact_str = sofia_glue_strip_uri(full_contact);
 
 		if (sip && sip->sip_expires) {
 			expires += sip->sip_expires->ex_delta + 30;


From mikej at freeswitch.org  Tue Jun  9 09:38:48 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 11:38:48 -0500
Subject: [Freeswitch-svn] [commit] r13725 - in freeswitch/trunk/src/mod:
	applications/mod_vmd say/mod_say_ru say/mod_say_zh
Message-ID: 

Author: mikej
Date: Tue Jun  9 11:38:48 2009
New Revision: 13725

Log:
svn:ignore

Modified:
   freeswitch/trunk/src/mod/applications/mod_vmd/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_ru/   (props changed)
   freeswitch/trunk/src/mod/say/mod_say_zh/   (props changed)


From brian at freeswitch.org  Tue Jun  9 10:25:21 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 12:25:21 -0500
Subject: [Freeswitch-svn] [commit] r13726 - freeswitch/trunk/src
Message-ID: 

Author: brian
Date: Tue Jun  9 12:25:20 2009
New Revision: 13726

Log:
 fix memory leak 

Modified:
   freeswitch/trunk/src/switch_utils.c

Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c	(original)
+++ freeswitch/trunk/src/switch_utils.c	Tue Jun  9 12:25:20 2009
@@ -756,6 +756,7 @@
 
 		if (s && m && s->sin_addr.s_addr == me->sin_addr.s_addr) {
 			*mask = m->sin_addr.s_addr;
+			freeifaddrs(ifaddrs);
 			return 0;
 		}
 	}


From anthm at freeswitch.org  Tue Jun  9 10:26:16 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 12:26:16 -0500
Subject: [Freeswitch-svn] [commit] r13727 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Tue Jun  9 12:26:15 2009
New Revision: 13727

Log:
increase cond_next time to 10ms

Modified:
   freeswitch/trunk/src/switch_time.c

Modified: freeswitch/trunk/src/switch_time.c
==============================================================================
--- freeswitch/trunk/src/switch_time.c	(original)
+++ freeswitch/trunk/src/switch_time.c	Tue Jun  9 12:26:15 2009
@@ -193,7 +193,7 @@
 SWITCH_DECLARE(void) switch_cond_next(void)
 {
 #ifdef DISABLE_1MS_COND
-	do_sleep(1000);
+	do_sleep(10000);
 #else
 	if (globals.RUNNING != 1 || !runtime.timestamp || globals.use_cond_yield != 1) {
 		do_sleep(1000);


From mcollins at freeswitch.org  Tue Jun  9 10:29:02 2009
From: mcollins at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 12:29:02 -0500
Subject: [Freeswitch-svn] [commit] r13728 - freeswitch/trunk/docs
Message-ID: 

Author: mcollins
Date: Tue Jun  9 12:29:01 2009
New Revision: 13728

Log:
Update Changelog through r13725

Modified:
   freeswitch/trunk/docs/ChangeLog

Modified: freeswitch/trunk/docs/ChangeLog
==============================================================================
--- freeswitch/trunk/docs/ChangeLog	(original)
+++ freeswitch/trunk/docs/ChangeLog	Tue Jun  9 12:29:01 2009
@@ -64,6 +64,11 @@
 	build: add mod_nibblebill (r:13462)
 	build: fix msvc build (r:13467/FSBUILD-165)
 	build: add siren to the default build and install (r:13470)
+	build: add upnp to windows build (r:13535)
+	build: fix msvc 64 bit build regression from upnp build (r:13538/FSBUILD-167)
+	build: Check for ifaddrs.h before including it (r:13600/FSBUILD-168)
+	build: fix jobserver unavailable bug in make -j (r:13623/FSBUILD-6)
+	build: clean/uninstall disabled modules as well (r:13716/FSBUILD-85)
 	config: default config, calling own extension no longer goes to voicemail (r:12596)
 	config: default config, 1000-1019 uses $${default_password} instead of hard-coded 1234 (FSCONFIG-5/r:12838)
 	config: tweak the configs to bind siptrace on and off to F10 and F11 (r:12938)
@@ -79,6 +84,8 @@
 	config: clear up docs (r:13468)
 	config: clarify zrtp docs in vars.xml and give link on where to get more info  (r:13469)
 	config: tweaks to codecs in default config (r:13485)
+	config: Add example of sending SAS from b-leg to display on a-leg's phone (r:13500)
+	config: commit config options for new auto nat (r:13595)
 	core: fix suncc visibility support in libteletone (r:12154-12157)
 	core: fix crash on FS shutdown with "..." (FSCORE-297/r:12173,12361,12402)
 	core: add separate mutex for state related methods (r:12191)
@@ -194,15 +201,25 @@
 	core: zrtp_secure_media=true will have to be set to true in order for your zrtp to work moving forward similar to how srtp_secure_media works.(r:13461)
 	core: prevent zrtp and srtp at the same time (r:13486)
 	core: add CALL_SECURE event (r:13487)
+	core: add show secure channel status in "show channels" output (r:13502/FSRTP-2)
+	core: add CHANNEL_HANGUP_COMPLETE event to take the place of CHANNEL_HANGUP, CHANNEL_HANGUP now fires as soon as the channel is hungup but you must wait for CHANNEL_HANGUP_COMPLETE for the CDR data (r:13505)
+	core: fix core dump when calling session.execute (r:13508/FSCORE-373)
+	core: add netmask detection for nat discovery work (r:13549)
+	core: fix order of ops to enable logging sooner (r:13556)
+	core: add hunt_caller_profile (r:13625,13626)
+	core: add usec delta to log (r:13647)
+	core: add padding to cycles on session_record (r:13648)
 	docs: Fix filename references in phrase_en.xml (r:12976)
 	docs: Update phrase_en.xml to include v1.0.8 sound prompts (r:13041)
 	docs: Updates to phrase_es.xml (r:13067)
 	docs: Latest revision of Spanish prompts file (r:13115)
 	docs: switch_core.h doxygen update (r:13181)
 	docs: Add ZRTP phrases to phrase_en.xml (r:13488,13489,13490)
+	docs: Add Stephane Alnet's French translations to phrase_fr.xml (r:13624)
 	formats: add mod_portaudio_stream to get audio from any dev (MODFORM-25/r:12178)
 	fs_cli: fix solaris build (r:12160)
 	ivr: make tts-engine and tts-voice valid attributes on the menu xml (r:12278)
+	libapr: fix solaris build (r:13671/FSBUILD-169)
 	libapr-util: add xml/expat stuff back to apr-utils (requires re-bootstrap) (r:13289,13290)
 	libdingaling: hijack gcrypt init call to fix threadsafe race in dingaling and fix buffer overrun in iksemel (r:12575)
 	libdingaling: add ldl_handle_running (r:13085)
@@ -235,6 +252,9 @@
 	libesl: add Ruby example for ESL (ESL-15/r:13235)
 	libesl: add INFO example for Perl (r:13293)
 	libiksemel: let return 0 be a failure on read in iks to avoid cpu race (r:13123,13124,13133)
+	libnatpmp: add (r:13510)
+	libnspr: fix bsd port packaging (r:13715/FSBUILD-170)
+	libpcre: update to pcre 7.9 (r:13706)
 	libsndfile: add executable permissions to libs/libsndfile/src/create_symbols_file.py (FSBUILD-134/r:12535)
 	libsndfile: update to 1.0.19 (r:13415/LBSNDF-7) 
 	libsofiasip: su.h - define su_family via struct sockaddr (r:12260)
@@ -243,10 +263,13 @@
 	libsofiasip: make info work out of dialog (r:13087)
 	libsofiasip: silence solaris warning from missing braces (SFSIP-132/r:13369)
 	libsofiasip: subscription-state subexp-params missing (r:13439/SFSIP-148)
+	libsofiasip: fix re-register after 423 w/ Min-Expires (r:13619/SFSIP-143)
+	libsofiasip: use addres, id, and version from user sdp if they exist (r:13621)
 	libspandsp: update to snapshot 20090308 (r:12514)
 	libspandsp: update to snapshot spandsp-20090421 (r:13086)
 	libspandsp: update to snapshot spandsp-20090427 (r:13177)
 	libspandsp: update to spandsp-0.0.6pre12 (r:13311)
+	libspandsp: use __cdecl calling convention for span_rx_handler_t and span_tx_handler_t type functions (r:13509)
 	libspeex: Add visibility support for suncc on solaris (r:13117,13118)
 	libteletone: update api visibility macros for windows
 	libtiff: add libtiff, v3.8.2
@@ -265,6 +288,7 @@
 	mod_commands: add show channels like %foo% (no % in the string implies wrapped in %, no spaces allowed in match string (r:13193)
 	mod_commands: Add max-sessions to status (MODAPP-254/r:13373)
 	mod_commands: remove double safe_free's (r:13453,13454,13455)
+	mod_commands: add nat_map API (r:13531)
 	mod_conference: fix read terminating on single digit when called from a meta-app inside a conference (MODAPP-226/r:12466)
 	mod_conference: recording members should be invisible to commands (MODAPP-233/r:12582)
 	mod_conference: add lock caller_control (r:12787)
@@ -284,6 +308,8 @@
 	mod_console: Fix mod_console (missing FD_ZERO before FD_SET) (r:13126)
 	mod_conference: add conference wait-mod flags and member moderator flag to delay starting a conference until someone with a moderator flag has joined (r:13442)
 	mod_conference: add member-type header to relevant events (r:13471)
+	mod_conference: make endconf count cumulative (r:13526)
+	mod_conference: don't transfer back to the same conference (r:13638)
 	mod_dahdi_codec: delay init of resources until the first time they are actually used to avoid unnecessary waste of resources in hardware codec (r:12962)
 	mod_dahdi_codec: set mod_dahdi_codec dahdi transcoding device sockets to non-blocking to avoid hanging when there is no data and just return 0 bytes frame (MODCODEC-8/r:13257)
 	mod_dahdi_codec: added proper waiting (up to 10ms) for the DAHDI transcoder output frame (r:13262)
@@ -315,6 +341,7 @@
 	mod_event_socket: disallow unloading mod_event_socket from event socket (r:12326,12334)
 	mod_event_socket: fix api_exec crash on OSX (MODEVENT-40,r:12349)
 	mod_event_socket: move connect command to always work on outbound socket not just the first time (r:12723)
+	mod_event_socket: add nat-map option to mod_event_socket (r:13567)
 	mod_fax: can't print base 8 number that has a 9 in it.. use stringified version instead (r:13312)
 	mod_fifo: consumer callback waiting an option in fifo.conf.xml (r:12685)
 	mod_fifo: add fire events on bridge in fifo (r:12791)
@@ -332,6 +359,7 @@
 	mod_lcr: allow channel vars in custom_sql (r:12198)
 	mod_lcr: Add ifdefs around odbc calls in shutdown function (r:13268)
 	mod_lcr: Adjust handling of strip parameters so entire number can be stripped (MODAPP-279/r:13365)
+	mod_lcr: honor effective_caller_id_number for CID override (r:13611)
 	mod_limit: Add events and a shutdown function (r:12497)
 	mod_limit: close odbc handle (r:12632)
 	mod_limit: Add more error checking to hash api/app (r:13007)
@@ -353,6 +381,7 @@
 	mod_lua: fix visibility support (FSCORE-302/r:12239-12240)
 	mod_lua: fix windows build (FSBUILD-149/r:12919)
 	mod_lua: fix memory leak (MODLANG-111/r:13298)
+	mod_managed: fix recursive file record during file playback issue (r:13551/IRC-00)
 	mod_memcache: add new module, mod_memcache; API for memcached (r:12871)
 	mod_memcache: make -ERR for API call less verbose  (r:12949)
 	mod_memcache: add hook reloadxml event (r:12950)
@@ -363,6 +392,7 @@
 	mod_nibblebill: Updated mod_nibblebill to work properly w/ postgres fields  (r:13031)
 	mod_nibblebill: Added feature mod_nibblebill to check balance and transfer the caller to an alternate dialplan context & extension if they deplete their funds. (r:13432)
 	mod_nibblebill: cleanup, fix leak (r:13463)
+	mod_nibblebill: fix segfault (MODAPP-286/r:13662)
 	mod_opal: Fixed transmission of Q.931 Calling-Party-Number, and DisplayName on H.323 Setup (r:12347)
 	mod_opal: allocate frame from session pool so it will not go out of scope (r:12811)
 	mod_opal: disable visibility support broken in newer gcc (MODENDP-190/r:12923)
@@ -378,6 +408,7 @@
 	mod_python: fix core dump when using startup script (MODLANG-106/r:12648)
 	mod_python: fix python failing during loading startup modules (MODLANG-105/r:12658)
 	mod_python: fix EventConsumer::pop() can deadlock mod_python (MODLANG-109/r:12849)
+	mod_python: fix seg on unload when scripts are running (MODLANG-107/r:13721)
 	mod_say_en: fix missing "at" in time readback, change from cardinal to ordinal numbers on dates, e.g. "January 20th" vs. "January 20" (MODAPP-263/r:13099)
 	mod_say_es: Add stub phrase_es.xml (r:13019)
 	mod_say_ru: add Russian language say module and config files (r:12966-12971)
@@ -395,6 +426,9 @@
 	mod_skypiax: modified configs/startskype.sh to specify which unix user will start the Skype client instance (r:12937)
 	mod_skypiax: fixed assignment before declaration on Windows VC++ (r:12956)
 	mod_skypiax: great startup speedup in Windows (using only one Broadcast sendmessage for each interface hunting) (r:13083)
+	skypiax: when repeatedly you try to connect to non-existing Skype account in a short period, the Skype client send you back the two halves of the message 'ERROR 92 CALL: Unrecognised identity' inverted in a way that breaks the flux of the API messages. Maybe an anti-spam feature? Anyway, let's try to work around it and restore sanity with a 1 second delay (r:13663)
+	skypiax: the Skype client sends us BOTH inband and out_of_band DTMFs, no way to shut the inbands. Let's intercept the out_of_bands ONLY if we are not bridged (eg: IVR, so not to waste CPU in detecting inband), but not propagate the out_of_band DTMFs if we are bridged (inband ones will be propagated) (r:13664)
+	skypiax: now it manages the REMOTEHOLD status, when the remote party puts the call on-hold (r:13667)
 	mod_spidermonkey: fix segfaults on dtmf callback (FSCORE-327/r:12577)
 	mod_spidermonkey: fix error loading mod_spidermonkey due to missing PR_* symbols (r:12934,12939)
 	mod_spidermonkey: add destroy method to js (r:13016)
@@ -454,14 +488,19 @@
 	mod_sofia: Allow sending the flush/reboot all the registration of a domain (MODENDP-187/r:13363)
 	mod_sofia: Fix double re-register problem (SFSIP-143/r:13384)
 	mod_sofia: make autoflush on bridge the default (r:13389)
-	mod_sofia: add contact-user profile param to override default contact username for a profile (r:13397/MODSOFIA-8)
+	mod_sofia: add contact-user profile param to override default contact username for a profile (MODSOFIA-8/r:13397)
 	mod_sofia: add proxy-follow-redirect flag (experimental) (r:13402)
 	mod_sofia: add proxy-follow-redirect flag (experimental) (r:13403)
+	mod_sofia: Update CID on Polycom when doing an Attended transfer, Make send_display work with Polycom and others, add patch with mods from SFSIP-111 (r:13492/SFSIP-111)
+	mod_sofia: handle vegastream broken sip info packets (r:13506)
+	mod_sofia: Rewrite sofia_glue_get_user_host (r:13543)
+	mod_sofia: Move siptrace to loglevel INFO (r:13615)
+	mod_sofia: Fix NOTIFY message sending incorrect information (MODENDP-225/r:13719)
 	mod_spy: add new module, mod_spy (MODAPP-260/r:13035,13036)
 	mod_syslog: Keep the indent string in memory (LOGGER-1/r:12852)
 	mod_t38gateway: Introduction of the skeleton of a media bug implementing a T.38 gateway, so the
 	related infrastructure work can take place around it (r:13082)
-	mod_voicemail: remove endless loop on leaving message (MODAPP-233,r:12315-12316)
+	mod_voicemail: remove endless loop on leaving message (MODAPP-233/r:12315-12316)
 	mod_voicemail: add indexes to mod_voicemail (r:12341)
 	mod_voicemail: fix audio cutoffs in voicemail_leave_main (MODAPP-225/r:12367)
 	mod_voicemail: fix profile id mismatch when changing password via menu (MODAPP-236/r:12602)


From mikej at freeswitch.org  Tue Jun  9 10:35:48 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 12:35:48 -0500
Subject: [Freeswitch-svn] [commit] r13729 - in freeswitch/trunk/libs: pcre
	win32/pcre
Message-ID: 

Author: mikej
Date: Tue Jun  9 12:35:48 2009
New Revision: 13729

Log:
fix msvc pcre build for pcre 7.9

Modified:
   freeswitch/trunk/libs/pcre/pcre_ucp_searchfuncs.c
   freeswitch/trunk/libs/win32/pcre/config.h
   freeswitch/trunk/libs/win32/pcre/dftables.c
   freeswitch/trunk/libs/win32/pcre/libpcre.2008.vcproj
   freeswitch/trunk/libs/win32/pcre/libpcre.vcproj
   freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj
   freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj

Modified: freeswitch/trunk/libs/pcre/pcre_ucp_searchfuncs.c
==============================================================================
--- freeswitch/trunk/libs/pcre/pcre_ucp_searchfuncs.c	(original)
+++ freeswitch/trunk/libs/pcre/pcre_ucp_searchfuncs.c	Tue Jun  9 12:35:48 2009
@@ -41,6 +41,10 @@
 /* This module contains code for searching the table of Unicode character
 properties. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pcre_internal.h"
 
 #include "ucp.h"               /* Category definitions */

Modified: freeswitch/trunk/libs/win32/pcre/config.h
==============================================================================
--- freeswitch/trunk/libs/win32/pcre/config.h	(original)
+++ freeswitch/trunk/libs/win32/pcre/config.h	Tue Jun  9 12:35:48 2009
@@ -1,159 +1,313 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* On Unix-like systems config.in is converted by "configure" into config.h.
+
+/* On Unix-like systems config.h.in is converted by "configure" into config.h.
 Some other environments also support the use of "configure". PCRE is written in
 Standard C, but there are a few non-standard things it can cope with, allowing
 it to run on SunOS4 and other "close to standard" systems.
 
-On a non-Unix-like system you should just copy this file into config.h, and set
-up the macros the way you need them. You should normally change the definitions
-of HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because of the way
-autoconf works, these cannot be made the defaults. If your system has bcopy()
-and not memmove(), change the definition of HAVE_BCOPY instead of HAVE_MEMMOVE.
-If your system has neither bcopy() nor memmove(), leave them both as 0; an
-emulation function will be used. */
+If you are going to build PCRE "by hand" on a system without "configure" you
+should copy the distributed config.h.generic to config.h, and then set up the
+macro definitions the way you need them. You must then add -DHAVE_CONFIG_H to
+all of your compile commands, so that config.h is included at the start of
+every source.
+
+Alternatively, you can avoid editing by using -D on the compiler command line
+to set the macro values. In this case, you do not have to set -DHAVE_CONFIG_H.
+
+PCRE uses memmove() if HAVE_MEMMOVE is set to 1; otherwise it uses bcopy() if
+HAVE_BCOPY is set to 1. If your system has neither bcopy() nor memmove(), set
+them both to 0; an emulation function will be used. */
+
+/* By default, the \R escape sequence matches any Unicode line ending
+   character or sequence of characters. If BSR_ANYCRLF is defined, this is
+   changed so that backslash-R matches only CR, LF, or CRLF. The build- time
+   default can be overridden by the user of PCRE at runtime. On systems that
+   support it, "configure" can be used to override the default. */
+/* #undef BSR_ANYCRLF */
 
 /* If you are compiling for a system that uses EBCDIC instead of ASCII
-character codes, define this macro as 1. On systems that can use "configure",
-this can be done via --enable-ebcdic. */
+   character codes, define this macro as 1. On systems that can use
+   "configure", this can be done via --enable-ebcdic. PCRE will then assume
+   that all input strings are in EBCDIC. If you do not define this macro, PCRE
+   will assume input strings are ASCII or UTF-8 Unicode. It is not possible to
+   build a version of PCRE that supports both EBCDIC and UTF-8. */
+/* #undef EBCDIC */
 
-#ifndef EBCDIC
-#define EBCDIC 0
+/* Define to 1 if you have the `bcopy' function. */
+#ifndef HAVE_BCOPY
+#define HAVE_BCOPY 1
 #endif
 
-/* If you are compiling for a system other than a Unix-like system or Win32,
-and it needs some magic to be inserted before the definition of a function that
-is exported by the library, define this macro to contain the relevant magic. If
-you do not define this macro, it defaults to "extern" for a C compiler and
-"extern C" for a C++ compiler on non-Win32 systems. This macro apears at the
-start of every exported function that is part of the external API. It does not
-appear on functions that are "external" in the C sense, but which are internal
-to the library. */
+/* Define to 1 if you have the  header file. */
+/* #undef HAVE_BITS_TYPE_TRAITS_H */
 
-/* #define PCRE_DATA_SCOPE */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_BZLIB_H
+#define HAVE_BZLIB_H 1
+#endif
 
-/* Define the following macro to empty if the "const" keyword does not work. */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_DIRENT_H
+#define HAVE_DIRENT_H 1
+#endif
 
-/* #undef const */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_DLFCN_H
+#define HAVE_DLFCN_H 1
+#endif
 
-/* Define the following macro to "unsigned" if  does not define
-size_t. */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_INTTYPES_H
+#define HAVE_INTTYPES_H 1
+#endif
 
-/* #undef size_t */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_LIMITS_H
+#define HAVE_LIMITS_H 1
+#endif
 
-/* The following two definitions are mainly for the benefit of SunOS4, which
-does not have the strerror() or memmove() functions that should be present in
-all Standard C libraries. The macros HAVE_STRERROR and HAVE_MEMMOVE should
-normally be defined with the value 1 for other systems, but unfortunately we
-cannot make this the default because "configure" files generated by autoconf
-will only change 0 to 1; they won't change 1 to 0 if the functions are not
-found. */
+/* Define to 1 if the system has the type `long long'. */
+#ifndef HAVE_LONG_LONG
+#define HAVE_LONG_LONG 1
+#endif
 
-#define HAVE_STRERROR 1
+/* Define to 1 if you have the `memmove' function. */
+#ifndef HAVE_MEMMOVE
 #define HAVE_MEMMOVE 1
-#define HAVE_WIN32API 1
+#endif
 
-/* There are some non-Unix-like systems that don't even have bcopy(). If this
-macro is false, an emulation is used. If HAVE_MEMMOVE is set to 1, the value of
-HAVE_BCOPY is not relevant. */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_MEMORY_H
+#define HAVE_MEMORY_H 1
+#endif
 
-#define HAVE_BCOPY 1
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_READLINE_HISTORY_H
+#define HAVE_READLINE_HISTORY_H 1
+#endif
 
-/* The value of NEWLINE determines the newline character. The default is to
-leave it up to the compiler, but some sites want to force a particular value.
-On Unix-like systems, "configure" can be used to override this default. */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_READLINE_READLINE_H
+#define HAVE_READLINE_READLINE_H 1
+#endif
 
-#ifndef NEWLINE
-#define NEWLINE '\n'
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_STDINT_H
+#define HAVE_STDINT_H 1
 #endif
 
-/* The value of LINK_SIZE determines the number of bytes used to store links as
-offsets within the compiled regex. The default is 2, which allows for compiled
-patterns up to 64K long. This covers the vast majority of cases. However, PCRE
-can also be compiled to use 3 or 4 bytes instead. This allows for longer
-patterns in extreme cases. On systems that support it, "configure" can be used
-to override this default. */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
+#endif
 
-#ifndef LINK_SIZE
-#define LINK_SIZE   2
+/* Define to 1 if you have the `strerror' function. */
+#ifndef HAVE_STRERROR
+#define HAVE_STRERROR 1
 #endif
 
-/* When calling PCRE via the POSIX interface, additional working storage is
-required for holding the pointers to capturing substrings because PCRE requires
-three integers per substring, whereas the POSIX interface provides only two. If
-the number of expected substrings is small, the wrapper function uses space on
-the stack, because this is faster than using malloc() for each call. The
-threshold above which the stack is no longer used is defined by POSIX_MALLOC_
-THRESHOLD. On systems that support it, "configure" can be used to override this
-default. */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_STRING
+#define HAVE_STRING 1
+#endif
 
-#ifndef POSIX_MALLOC_THRESHOLD
-#define POSIX_MALLOC_THRESHOLD 10
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_STRINGS_H
+#define HAVE_STRINGS_H 1
 #endif
 
-/* PCRE uses recursive function calls to handle backtracking while matching.
-This can sometimes be a problem on systems that have stacks of limited size.
-Define NO_RECURSE to get a version that doesn't use recursion in the match()
-function; instead it creates its own stack by steam using pcre_recurse_malloc()
-to obtain memory from the heap. For more detail, see the comments and other
-stuff just above the match() function. On systems that support it, "configure"
-can be used to set this in the Makefile (use --disable-stack-for-recursion). */
-
-/* #define NO_RECURSE */
-
-/* The value of MATCH_LIMIT determines the default number of times the internal
-match() function can be called during a single execution of pcre_exec(). There
-is a runtime interface for setting a different limit. The limit exists in order
-to catch runaway regular expressions that take for ever to determine that they
-do not match. The default is set very large so that it does not accidentally
-catch legitimate cases. On systems that support it, "configure" can be used to
-override this default default. */
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_STRING_H
+#define HAVE_STRING_H 1
+#endif
+
+/* Define to 1 if you have the `strtoll' function. */
+/* #undef HAVE_STRTOLL */
+
+/* Define to 1 if you have the `strtoq' function. */
+#ifndef HAVE_STRTOQ
+#define HAVE_STRTOQ 1
+#endif
+
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_SYS_STAT_H
+#define HAVE_SYS_STAT_H 1
+#endif
+
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_SYS_TYPES_H
+#define HAVE_SYS_TYPES_H 1
+#endif
 
+/* Define to 1 if you have the  header file. */
+/* #undef HAVE_TYPE_TRAITS_H */
+
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
+#endif
+
+/* Define to 1 if the system has the type `unsigned long long'. */
+#ifndef HAVE_UNSIGNED_LONG_LONG
+#define HAVE_UNSIGNED_LONG_LONG 1
+#endif
+
+/* Define to 1 if you have the  header file. */
+#define HAVE_WINDOWS_H 1
+
+/* Define to 1 if you have the  header file. */
+#ifndef HAVE_ZLIB_H
+#define HAVE_ZLIB_H 1
+#endif
+
+/* Define to 1 if you have the `_strtoi64' function. */
+/* #undef HAVE__STRTOI64 */
+
+/* The value of LINK_SIZE determines the number of bytes used to store links
+   as offsets within the compiled regex. The default is 2, which allows for
+   compiled patterns up to 64K long. This covers the vast majority of cases.
+   However, PCRE can also be compiled to use 3 or 4 bytes instead. This allows
+   for longer patterns in extreme cases. On systems that support it,
+   "configure" can be used to override this default. */
+#ifndef LINK_SIZE
+#define LINK_SIZE 2
+#endif
+
+/* The value of MATCH_LIMIT determines the default number of times the
+   internal match() function can be called during a single execution of
+   pcre_exec(). There is a runtime interface for setting a different limit.
+   The limit exists in order to catch runaway regular expressions that take
+   for ever to determine that they do not match. The default is set very large
+   so that it does not accidentally catch legitimate cases. On systems that
+   support it, "configure" can be used to override this default default. */
 #ifndef MATCH_LIMIT
 #define MATCH_LIMIT 10000000
 #endif
 
 /* The above limit applies to all calls of match(), whether or not they
-increase the recursion depth. In some environments it is desirable to limit the
-depth of recursive calls of match() more strictly, in order to restrict the
-maximum amount of stack (or heap, if NO_RECURSE is defined) that is used. The
-value of MATCH_LIMIT_RECURSION applies only to recursive calls of match(). To
-have any useful effect, it must be less than the value of MATCH_LIMIT. There is
-a runtime method for setting a different limit. On systems that support it,
-"configure" can be used to override this default default. */
-
+   increase the recursion depth. In some environments it is desirable to limit
+   the depth of recursive calls of match() more strictly, in order to restrict
+   the maximum amount of stack (or heap, if NO_RECURSE is defined) that is
+   used. The value of MATCH_LIMIT_RECURSION applies only to recursive calls of
+   match(). To have any useful effect, it must be less than the value of
+   MATCH_LIMIT. The default is to use the same value as MATCH_LIMIT. There is
+   a runtime method for setting a different limit. On systems that support it,
+   "configure" can be used to override the default. */
 #ifndef MATCH_LIMIT_RECURSION
 #define MATCH_LIMIT_RECURSION MATCH_LIMIT
 #endif
 
-/* These three limits are parameterized just in case anybody ever wants to
-change them. Care must be taken if they are increased, because they guard
-against integer overflow caused by enormously large patterns. */
+/* This limit is parameterized just in case anybody ever wants to change it.
+   Care must be taken if it is increased, because it guards against integer
+   overflow caused by enormously large patterns. */
+#ifndef MAX_NAME_COUNT
+#define MAX_NAME_COUNT 10000
+#endif
 
+/* This limit is parameterized just in case anybody ever wants to change it.
+   Care must be taken if it is increased, because it guards against integer
+   overflow caused by enormously large patterns. */
 #ifndef MAX_NAME_SIZE
 #define MAX_NAME_SIZE 32
 #endif
 
-#ifndef MAX_NAME_COUNT
-#define MAX_NAME_COUNT 10000
+/* The value of NEWLINE determines the newline character sequence. On systems
+   that support it, "configure" can be used to override the default, which is
+   10. The possible values are 10 (LF), 13 (CR), 3338 (CRLF), -1 (ANY), or -2
+   (ANYCRLF). */
+#ifndef NEWLINE
+#define NEWLINE 10
 #endif
 
-#ifndef MAX_DUPLENGTH
-#define MAX_DUPLENGTH 30000
-#endif
+/* PCRE uses recursive function calls to handle backtracking while matching.
+   This can sometimes be a problem on systems that have stacks of limited
+   size. Define NO_RECURSE to get a version that doesn't use recursion in the
+   match() function; instead it creates its own stack by steam using
+   pcre_recurse_malloc() to obtain memory from the heap. For more detail, see
+   the comments and other stuff just above the match() function. On systems
+   that support it, "configure" can be used to set this in the Makefile (use
+   --disable-stack-for-recursion). */
+/* #undef NO_RECURSE */
+
+/* Name of package */
+#define PACKAGE "pcre"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "PCRE"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "PCRE 7.9"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "pcre"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "7.9"
+
+
+/* If you are compiling for a system other than a Unix-like system or
+   Win32, and it needs some magic to be inserted before the definition
+   of a function that is exported by the library, define this macro to
+   contain the relevant magic. If you do not define this macro, it
+   defaults to "extern" for a C compiler and "extern C" for a C++
+   compiler on non-Win32 systems. This macro apears at the start of
+   every exported function that is part of the external API. It does
+   not appear on functions that are "external" in the C sense, but
+   which are internal to the library. */
+/* #undef PCRE_EXP_DEFN */
 
-#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES (-1L)
+/* Define if linking statically (TODO: make nice with Libtool) */
+/* #undef PCRE_STATIC */
+
+/* When calling PCRE via the POSIX interface, additional working storage is
+   required for holding the pointers to capturing substrings because PCRE
+   requires three integers per substring, whereas the POSIX interface provides
+   only two. If the number of expected substrings is small, the wrapper
+   function uses space on the stack, because this is faster than using
+   malloc() for each call. The threshold above which the stack is no longer
+   used is defined by POSIX_MALLOC_THRESHOLD. On systems that support it,
+   "configure" can be used to override this default. */
+#ifndef POSIX_MALLOC_THRESHOLD
+#define POSIX_MALLOC_THRESHOLD 10
 #endif
 
-#if (_MSC_VER >= 1400) // VC8+
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
+/* Define to 1 if you have the ANSI C header files. */
+#ifndef STDC_HEADERS
+#define STDC_HEADERS 1
 #endif
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE
+
+/* Define to allow pcregrep to be linked with libbz2, so that it is able to
+   handle .bz2 files. */
+/* #undef SUPPORT_LIBBZ2 */
+
+/* Define to allow pcretest to be linked with libreadline. */
+/* #undef SUPPORT_LIBREADLINE */
+
+/* Define to allow pcregrep to be linked with libz, so that it is able to
+   handle .gz files. */
+/* #undef SUPPORT_LIBZ */
+
+/* Define to enable support for Unicode properties */
+/* #undef SUPPORT_UCP */
+
+/* Define to enable support for the UTF-8 Unicode encoding. This will work
+   even in an EBCDIC environment, but it is incompatible with the EBCDIC
+   macro. That is, PCRE can support *either* EBCDIC code *or* ASCII/UTF-8, but
+   not both at once. */
+/* #undef SUPPORT_UTF8 */
+
+/* Version number of package */
+#ifndef VERSION
+#define VERSION "7.9"
 #endif
-#endif // VC8+
 
-#pragma warning(disable: 4005 4003 4018)
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
 
-/* End */
+/* Define to `unsigned int' if  does not define. */
+/* #undef size_t */

Modified: freeswitch/trunk/libs/win32/pcre/dftables.c
==============================================================================
--- freeswitch/trunk/libs/win32/pcre/dftables.c	(original)
+++ freeswitch/trunk/libs/win32/pcre/dftables.c	Tue Jun  9 12:35:48 2009
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2005 University of Cambridge
+           Copyright (c) 1997-2008 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -38,14 +38,19 @@
 */
 
 
-/* This is a freestanding support program to generate a file containing default
-character tables for PCRE. The tables are built according to the default C
+/* This is a freestanding support program to generate a file containing
+character tables for PCRE. The tables are built according to the current
 locale. Now that pcre_maketables is a function visible to the outside world, we
 make use of its code from here in order to be consistent. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
+#include 
 
 #include "pcre_internal.h"
 
@@ -55,38 +60,60 @@
 
 int main(int argc, char **argv)
 {
-int i;
 FILE *f;
-const unsigned char *tables = pcre_maketables();
-const unsigned char *base_of_tables = tables;
+int i = 1;
+const unsigned char *tables;
+const unsigned char *base_of_tables;
+
+/* By default, the default C locale is used rather than what the building user
+happens to have set. However, if the -L option is given, set the locale from
+the LC_xxx environment variables. */
 
-if (argc != 2)
+if (argc > 1 && strcmp(argv[1], "-L") == 0)
+  {
+  setlocale(LC_ALL, "");        /* Set from environment variables */
+  i++;
+  }
+
+if (argc < i + 1)
   {
   fprintf(stderr, "dftables: one filename argument is required\n");
   return 1;
   }
 
-f = fopen(argv[1], "wb");
+tables = pcre_maketables();
+base_of_tables = tables;
+
+f = fopen(argv[i], "wb");
 if (f == NULL)
   {
   fprintf(stderr, "dftables: failed to open %s for writing\n", argv[1]);
   return 1;
   }
 
-/* There are two fprintf() calls here, because gcc in pedantic mode complains
-about the very long string otherwise. */
+/* There are several fprintf() calls here, because gcc in pedantic mode
+complains about the very long string otherwise. */
 
 fprintf(f,
   "/*************************************************\n"
   "*      Perl-Compatible Regular Expressions       *\n"
   "*************************************************/\n\n"
-  "/* This file is automatically written by the dftables auxiliary \n"
-  "program. If you edit it by hand, you might like to edit the Makefile to \n"
-  "prevent its ever being regenerated.\n\n");
+  "/* This file was automatically written by the dftables auxiliary\n"
+  "program. It contains character tables that are used when no external\n"
+  "tables are passed to PCRE by the application that calls it. The tables\n"
+  "are used only for characters whose code values are less than 256.\n\n");
+fprintf(f,
+  "The following #includes are present because without them gcc 4.x may remove\n"
+  "the array definition from the final binary if PCRE is built into a static\n"
+  "library and dead code stripping is activated. This leads to link errors.\n"
+  "Pulling in the header ensures that the array gets flagged as \"someone\n"
+  "outside this compilation unit might reference this\" and so it will always\n"
+  "be supplied to the linker. */\n\n"
+  "#ifdef HAVE_CONFIG_H\n"
+  "#include \"config.h\"\n"
+  "#endif\n\n"
+  "#include \"pcre_internal.h\"\n\n");
 fprintf(f,
-  "This file contains the default tables for characters with codes less than\n"
-  "128 (ASCII characters). These tables are used when no external tables are\n"
-  "passed to PCRE. */\n\n"
   "const unsigned char _pcre_default_tables[] = {\n\n"
   "/* This table is a lower casing table. */\n\n");
 
@@ -162,7 +189,7 @@
   else fprintf(f, "%3d-", i-8);
 if (isprint(i-1)) fprintf(f, " %c ", i-1);
   else fprintf(f, "%3d", i-1);
-fprintf(f, " */\n\n/* End of chartables.c */\n");
+fprintf(f, " */\n\n/* End of pcre_chartables.c */\n");
 
 fclose(f);
 free((void *)base_of_tables);

Modified: freeswitch/trunk/libs/win32/pcre/libpcre.2008.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/pcre/libpcre.2008.vcproj	(original)
+++ freeswitch/trunk/libs/win32/pcre/libpcre.2008.vcproj	Tue Jun  9 12:35:48 2009
@@ -55,8 +55,8 @@
 			
 		
 		
 			
 			
 			
 			
 			
 		
 		
@@ -215,61 +215,49 @@
 			/>
 			
 			
 			
 			
 			
 			
 			
 			
-			
 			
 			
-			
 		
 		
@@ -318,7 +303,7 @@
 				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\Release/libpcre.tlb"
 				HeaderFileName=""
 			/>
@@ -326,8 +311,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="./"
-				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;DLL_EXPORT"
+				AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\pcre""
+				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;PCRE_STATIC;HAVE_CONFIG_H"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -350,25 +335,14 @@
 				Name="VCPreLinkEventTool"
 			/>
 			
 			
 			
-			
 			
 			
-			
 		
 		
@@ -417,15 +388,15 @@
 				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="3"
+				TargetEnvironment="1"
 				TypeLibraryName=".\Debug/libpcre.tlb"
 				HeaderFileName=""
 			/>
 			
 			
 			
 			
+			
 			
 			
+			
 		
 		
@@ -499,49 +485,61 @@
 			/>
 			
 			
 			
 			
 			
 			
 			
 			
+			
 			
 			
+			
 		
 		
 			
 			
 			
 			
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-			
-			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 		
 		
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 			
-				
-					
-				
-				
-					
-				
-				
-					
-				
-				
-					
-				
 			
 		
 		
 		
 		
 			
 			
 			
 			
 		
 		
 			
 			
 			
 			

Author: mikej
Date: Tue Jun  9 12:40:07 2009
New Revision: 13730

Log:
fix msvc build

Modified:
   freeswitch/trunk/src/switch_core_asr.c
   freeswitch/trunk/src/switch_core_speech.c

Modified: freeswitch/trunk/src/switch_core_asr.c
==============================================================================
--- freeswitch/trunk/src/switch_core_asr.c	(original)
+++ freeswitch/trunk/src/switch_core_asr.c	Tue Jun  9 12:40:07 2009
@@ -125,8 +125,9 @@
 	/* set ASR params */
 	if (!switch_strlen_zero(param_string)) {
 		char *param[256] = { 0 };
+		int i;
 		switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0])));
-		for (int i = 0; param[i]; ++i) {
+		for (i = 0; param[i]; ++i) {
 			char *param_pair[2] = { 0 };
 			if(switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) {
 				switch_core_asr_text_param(ah, param_pair[0], param_pair[1]);

Modified: freeswitch/trunk/src/switch_core_speech.c
==============================================================================
--- freeswitch/trunk/src/switch_core_speech.c	(original)
+++ freeswitch/trunk/src/switch_core_speech.c	Tue Jun  9 12:40:07 2009
@@ -136,8 +136,9 @@
 	/* set TTS params */
 	if (!switch_strlen_zero(param_string)) {
 		char *param[256] = { 0 };
+		int i;
 		switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0])));
-		for (int i = 0; param[i]; ++i) {
+		for (i = 0; param[i]; ++i) {
 			char *param_pair[2] = { 0 };
 			if(switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) {
 				switch_core_speech_text_param_tts(sh, param_pair[0], param_pair[1]);


From mikej at freeswitch.org  Tue Jun  9 10:51:25 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 12:51:25 -0500
Subject: [Freeswitch-svn] [commit] r13731 - freeswitch/trunk/libs/win32/pcre
Message-ID: 

Author: mikej
Date: Tue Jun  9 12:51:25 2009
New Revision: 13731

Log:
add missing files to msvc pcre build

Modified:
   freeswitch/trunk/libs/win32/pcre/libpcre.2008.vcproj
   freeswitch/trunk/libs/win32/pcre/libpcre.vcproj

Modified: freeswitch/trunk/libs/win32/pcre/libpcre.2008.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/pcre/libpcre.2008.vcproj	(original)
+++ freeswitch/trunk/libs/win32/pcre/libpcre.2008.vcproj	Tue Jun  9 12:51:25 2009
@@ -825,6 +825,14 @@
 				>
 			
 			
+			
+			
+			
+			
 			

Modified: freeswitch/trunk/libs/win32/pcre/libpcre.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/pcre/libpcre.vcproj	(original)
+++ freeswitch/trunk/libs/win32/pcre/libpcre.vcproj	Tue Jun  9 12:51:25 2009
@@ -454,6 +454,14 @@
 				>
 			
 			
+			
+			
+			
+			
 			


From brian at freeswitch.org  Tue Jun  9 11:22:48 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 13:22:48 -0500
Subject: [Freeswitch-svn] [commit] r13732 -
	freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
Message-ID: 

Author: brian
Date: Tue Jun  9 13:22:48 2009
New Revision: 13732

Log:
 pass 302 and 305 to callback

Modified:
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c	Tue Jun  9 13:22:48 2009
@@ -1124,7 +1124,7 @@
 {
   nua_handle_t *nh = cr->cr_owner;
   nta_outgoing_t *orq;
-
+#if 0
   if (status == 302 || status == 305) {
     sip_route_t r[1];
 
@@ -1150,7 +1150,7 @@
       break;
     }
   }
-
+#endif
 
   if (status == 423) {
     unsigned my_expires = 0;


From mrene at freeswitch.org  Tue Jun  9 12:00:15 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 14:00:15 -0500
Subject: [Freeswitch-svn] [commit] r13733 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: mrene
Date: Tue Jun  9 14:00:15 2009
New Revision: 13733

Log:
Revert 13615

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Tue Jun  9 14:00:15 2009
@@ -1003,9 +1003,9 @@
 static void logger(void *logarg, char const *fmt, va_list ap)
 {
 	if (fmt && ap) {
-		switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, fmt, ap);
+		switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, fmt, ap);
 	} else if (fmt && !ap) {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "%s", fmt);
+		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "%s", fmt);
 	}
 }
 


From brian at freeswitch.org  Tue Jun  9 12:05:12 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 14:05:12 -0500
Subject: [Freeswitch-svn] [commit] r13734 - in freeswitch/trunk:
	conf/sip_profiles src/mod/endpoints/mod_sofia
Message-ID: 

Author: brian
Date: Tue Jun  9 14:05:11 2009
New Revision: 13734

Log:
 improve handling of 302 redirect and add option to handle them in the dialplan if needed.  Also all redirects back to ourself will be transfered to the dialplan automatically now bypassing the loop.

Modified:
   freeswitch/trunk/conf/sip_profiles/internal.xml
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c

Modified: freeswitch/trunk/conf/sip_profiles/internal.xml
==============================================================================
--- freeswitch/trunk/conf/sip_profiles/internal.xml	(original)
+++ freeswitch/trunk/conf/sip_profiles/internal.xml	Tue Jun  9 14:05:11 2009
@@ -134,7 +134,9 @@
     
     
-    
+    
+    
+    
     
     
     

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	Tue Jun  9 14:05:11 2009
@@ -191,7 +191,7 @@
 	PFLAG_AUTOFIX_TIMING,
 	PFLAG_MESSAGE_QUERY_ON_REGISTER,
 	PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE,
-	PFLAG_PROXY_FOLLOW_REDIRECT,
+	PFLAG_MANUAL_REDIRECT,
 	PFLAG_AUTO_NAT,
 	/* No new flags below this line */
 	PFLAG_MAX
@@ -621,6 +621,7 @@
 	switch_codec_implementation_t read_impl;
 	switch_codec_implementation_t write_impl;
 	char *user_via;
+	char *redirected;
 };
 
 struct callback_t {

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Tue Jun  9 14:05:11 2009
@@ -1591,11 +1591,11 @@
 						} else {
 							sofia_clear_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE);
 						}
-					} else if (!strcasecmp(var, "proxy-follow-redirect")) {
+					} else if (!strcasecmp(var, "manual-redirect")) {
 						if (switch_true(val)) {
-							sofia_set_pflag(profile, PFLAG_PROXY_FOLLOW_REDIRECT);
+							sofia_set_pflag(profile, PFLAG_MANUAL_REDIRECT);
 						} else {
-							sofia_clear_pflag(profile, PFLAG_PROXY_FOLLOW_REDIRECT);
+							sofia_clear_pflag(profile, PFLAG_MANUAL_REDIRECT);
 						}
 					} else if (!strcasecmp(var, "outbound-use-uuid-as-callid")) {
 						if (switch_true(val)) {
@@ -2109,11 +2109,11 @@
 						} else {
 							sofia_clear_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE);
 						}
-					} else if (!strcasecmp(var, "proxy-follow-redirect")) {
+					} else if (!strcasecmp(var, "manual-redirect")) {
 						if (switch_true(val)) {
-							sofia_set_pflag(profile, PFLAG_PROXY_FOLLOW_REDIRECT);
+							sofia_set_pflag(profile, PFLAG_MANUAL_REDIRECT);
 						} else {
-							sofia_clear_pflag(profile, PFLAG_PROXY_FOLLOW_REDIRECT);
+							sofia_clear_pflag(profile, PFLAG_MANUAL_REDIRECT);
 						}
 					} else if (!strcasecmp(var, "inbound-proxy-media") && switch_true(val)) {
 						sofia_set_flag(profile, TFLAG_PROXY_MEDIA);
@@ -2968,42 +2968,134 @@
 			}
 		}
 
-		if (channel && sip && status == 100 && switch_channel_test_flag(channel, CF_OUTBOUND)) {
+		if (channel && sip && (status == 302 || status == 305) && switch_channel_test_flag(channel, CF_OUTBOUND)) {
 			sip_contact_t * p_contact = sip->sip_contact;
 			int i = 0;
 			char var_name[80];	
+			const char *diversion_header;
+			char *full_contact = NULL;
+			char *invite_contact;
+			const char *br;
 			
-			if (sofia_test_pflag(profile, PFLAG_PROXY_FOLLOW_REDIRECT) && tech_pvt->route_uri && p_contact && p_contact->m_url) {
-				if (p_contact->m_url->url_port) {
-					tech_pvt->route_uri = switch_core_session_sprintf(tech_pvt->session, "sip:%s@%s:%s", 
-																	  p_contact->m_url->url_user, p_contact->m_url->url_host, p_contact->m_url->url_port);
-				} else {
-					tech_pvt->route_uri = switch_core_session_sprintf(tech_pvt->session, "sip:%s@%s", 
-																	  p_contact->m_url->url_user, p_contact->m_url->url_host);
-				}
+			if ((br = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) {
+				switch_xml_t root = NULL, domain = NULL;
+				switch_core_session_t *a_session;
+				switch_channel_t *a_channel;
 
-				nua_set_hparams(tech_pvt->nh, NUTAG_PROXY(tech_pvt->route_uri), TAG_END());
-			}
+				const char *sip_redirect_profile, *sip_redirect_context, *sip_redirect_dialplan, *sip_redirect_fork;
 
-			while (p_contact) {
-				if (p_contact->m_url) {
-					if (p_contact->m_url->url_user) {
-						switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_user_%d", i);
-						switch_channel_set_variable_partner(channel, var_name, p_contact->m_url->url_user);
-						switch_channel_set_variable(channel, var_name, p_contact->m_url->url_user);
+				if ((a_session = switch_core_session_locate(br)) && (a_channel = switch_core_session_get_channel(a_session))) { 
+					switch_stream_handle_t stream = { 0 };
+					char separator[2] = "|";
+					char *redirect_dialstring;
+					su_home_t *home = su_home_new(sizeof(*home));
+					switch_assert(home != NULL);
+
+					SWITCH_STANDARD_STREAM(stream);
+
+					if (!(sip_redirect_profile = switch_channel_get_variable(channel, "sip_redirect_profile"))) {
+						sip_redirect_profile = profile->name;
+					}
+					if (!(sip_redirect_context = switch_channel_get_variable(channel, "sip_redirect_context"))) {
+						sip_redirect_context = "redirected";
+					}
+					if (!(sip_redirect_dialplan = switch_channel_get_variable(channel, "sip_redirect_dialplan"))) {
+						sip_redirect_dialplan = "XML";
+					}
+
+					sip_redirect_fork = switch_channel_get_variable(channel, "sip_redirect_fork");
+					
+					if (switch_true(sip_redirect_fork)) {
+						*separator = ',';
+					}
+
+					for (p_contact = sip->sip_contact; p_contact; p_contact = p_contact->m_next) {
+						if (p_contact->m_url) {
+							full_contact = sip_header_as_string(home, (void *) sip->sip_contact);
+							invite_contact = sofia_glue_strip_uri(full_contact);
+							
+							switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_%d", i);
+							switch_channel_set_variable(a_channel, var_name, full_contact);
+							
+							if (i == 0) {
+								switch_channel_set_variable(channel, "sip_redirected_to", full_contact);
+								switch_channel_set_variable(a_channel, "sip_redirected_to", full_contact);
+							}
+							
+							if (p_contact->m_url->url_user) {
+								switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_user_%d", i);
+								switch_channel_set_variable(channel, var_name, p_contact->m_url->url_user);
+								switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_user);
+							}
+							if (p_contact->m_url->url_host) {
+								switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_host_%d", i);
+								switch_channel_set_variable(channel, var_name, p_contact->m_url->url_host);
+								switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_host);
+							}
+							if (p_contact->m_url->url_params) {
+								switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_params_%d", i);
+								switch_channel_set_variable(channel, var_name, p_contact->m_url->url_params);
+								switch_channel_set_variable(a_channel, var_name, p_contact->m_url->url_params);
+							}
+							
+							switch_snprintf(var_name, sizeof(var_name), "sip_redirect_dialstring_%d", i);
+							switch_channel_set_variable_printf(channel, var_name, "sofia/%s/%s", sip_redirect_profile, invite_contact);
+							switch_channel_set_variable_printf(a_channel, var_name, "sofia/%s/%s", sip_redirect_profile, invite_contact);
+							stream.write_function(&stream, "%ssofia/%s/%s", i ? separator : "", sip_redirect_profile, invite_contact);
+							free(invite_contact);
+							i++;
+						}
+					}
+					
+					redirect_dialstring = stream.data;
+					
+					switch_channel_set_variable(channel, "sip_redirect_dialstring", redirect_dialstring);
+					switch_channel_set_variable(a_channel, "sip_redirect_dialstring", redirect_dialstring);
+					
+					p_contact = sip->sip_contact;
+					full_contact = sip_header_as_string(home, (void *) sip->sip_contact);
+					
+					if ((diversion_header = sofia_glue_get_unknown_header(sip, "diversion"))) {
+						switch_channel_set_variable(channel, "sip_redirected_by", diversion_header);
+						switch_channel_set_variable(a_channel, "sip_redirected_by", diversion_header);
 					}
-					if (p_contact->m_url->url_host) {
-						switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_host_%d", i);
-						switch_channel_set_variable_partner(channel, var_name, p_contact->m_url->url_host);
-						switch_channel_set_variable(channel, var_name, p_contact->m_url->url_host);
+					
+					if (sofia_test_pflag(profile, PFLAG_MANUAL_REDIRECT)) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirect: Transfering to %s %s %s\n", 
+										  p_contact->m_url->url_user, sip_redirect_dialplan, sip_redirect_context);
+						switch_ivr_session_transfer(a_session, p_contact->m_url->url_user, sip_redirect_dialplan, sip_redirect_context);					
+					} else if ((!strcmp(profile->sipip, p_contact->m_url->url_host))
+							   || (!strcmp(profile->extsipip, p_contact->m_url->url_host))
+							   || (switch_xml_locate_domain(p_contact->m_url->url_host, NULL, &root, &domain) == SWITCH_STATUS_SUCCESS)) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirect: Transfering to %s\n", p_contact->m_url->url_user);
+						switch_ivr_session_transfer(a_session, p_contact->m_url->url_user, NULL, NULL);
+					} else {
+						invite_contact = sofia_glue_strip_uri(full_contact);
+						tech_pvt->redirected = switch_core_session_strdup(session, invite_contact);
+						free(invite_contact);
 					}
-					if (p_contact->m_url->url_params) {
-						switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_params_%d", i);
-						switch_channel_set_variable_partner(channel, var_name, p_contact->m_url->url_params);
-						switch_channel_set_variable(channel, var_name, p_contact->m_url->url_params);
+					
+					if (home) {
+						su_home_unref(home);
+						home = NULL;
 					}
-					p_contact = p_contact->m_next;
-					i++;
+
+					free(stream.data);
+					switch_core_session_rwunlock(a_session);
+				}
+			} else {
+				su_home_t *home = su_home_new(sizeof(*home));
+				switch_assert(home != NULL);
+				full_contact = sip_header_as_string(home, (void *) sip->sip_contact);
+				invite_contact = sofia_glue_strip_uri(full_contact);
+
+				tech_pvt->redirected = switch_core_session_strdup(session, invite_contact);
+
+				free(invite_contact);
+
+				if (home) {
+					su_home_unref(home);
+					home = NULL;
 				}
 			}
 		}
@@ -3084,6 +3176,22 @@
 			SIPTAG_REPLACES_STR_REF(replaces_str), SOATAG_LOCAL_SDP_STR_REF(l_sdp), SOATAG_REMOTE_SDP_STR_REF(r_sdp), TAG_END());
 	
 	if (ss_state == nua_callstate_terminated) {
+
+		if ((status == 302 || status == 305) && session) {
+			channel = switch_core_session_get_channel(session);
+			tech_pvt = switch_core_session_get_private(session);
+			
+			if (!tech_pvt || !tech_pvt->nh) {
+				goto done;
+			}
+			
+
+			if (tech_pvt->redirected) {
+				sofia_glue_do_invite(session);
+				goto done;
+			}
+		}
+
 		if (sofia_private) {
 			sofia_private->destroy_me = 1;
 		}
@@ -3493,7 +3601,7 @@
 			sdp_session_t *sdp;
 			uint8_t match = 0;
 			int is_ok = 1;
-			
+
 			sofia_clear_flag_locked(tech_pvt, TFLAG_NOSDP_REINVITE);
 
 			if (tech_pvt->num_codecs) {

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Tue Jun  9 14:05:11 2009
@@ -1705,6 +1705,7 @@
 	nua_invite(tech_pvt->nh,
 			   NUTAG_AUTOANSWER(0),
 			   NUTAG_SESSION_TIMER(session_timeout),
+			   TAG_IF(tech_pvt->redirected, NUTAG_URL(tech_pvt->redirected)),
 			   TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
 			   TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_REMOTE_PARTY_ID_STR(tech_pvt->rpid)),
 			   TAG_IF(!switch_strlen_zero(tech_pvt->preferred_id), SIPTAG_P_PREFERRED_IDENTITY_STR(tech_pvt->preferred_id)),
@@ -1724,6 +1725,7 @@
 			   SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), SOATAG_HOLD(holdstr), TAG_END());
 
 	switch_safe_free(stream.data);
+	tech_pvt->redirected = NULL;
 
 	return SWITCH_STATUS_SUCCESS;
 }


From anthm at freeswitch.org  Tue Jun  9 12:52:08 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 14:52:08 -0500
Subject: [Freeswitch-svn] [commit] r13735 - in freeswitch/trunk/src: .
	mod/endpoints/mod_sofia
Message-ID: 

Author: anthm
Date: Tue Jun  9 14:52:07 2009
New Revision: 13735

Log:
add sofia tracelevel  and tracelevel param in 

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/switch_log.c
   freeswitch/trunk/src/switch_utils.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Tue Jun  9 14:52:07 2009
@@ -2441,6 +2441,12 @@
 		func = cmd_status;
 	} else if (!strcasecmp(argv[0], "xmlstatus")) {
 		func = cmd_xml_status;
+	} else if (!strcasecmp(argv[0], "tracelevel")) {
+		if (argv[1]) {
+			mod_sofia_globals.tracelevel = switch_log_str2level(argv[1]);
+		}
+		stream->write_function(stream, "+OK tracelevel is %s", switch_log_level2str(mod_sofia_globals.tracelevel));
+        goto done;
 	} else if (!strcasecmp(argv[0], "loglevel")) {
 		if (argc > 2 && argv[2] && switch_is_number(argv[2])) {
 			int level = atoi(argv[2]);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	Tue Jun  9 14:52:07 2009
@@ -274,6 +274,7 @@
 	int debug_presence;
 	int auto_restart;
 	int auto_nat;
+	int tracelevel;
 };
 extern struct mod_sofia_globals mod_sofia_globals;
 

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Tue Jun  9 14:52:07 2009
@@ -1003,9 +1003,9 @@
 static void logger(void *logarg, char const *fmt, va_list ap)
 {
 	if (fmt && ap) {
-		switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, fmt, ap);
+		switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, mod_sofia_globals.tracelevel, fmt, ap);
 	} else if (fmt && !ap) {
-		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "%s", fmt);
+		switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, mod_sofia_globals.tracelevel, "%s", fmt);
 	}
 }
 
@@ -1521,6 +1521,8 @@
 					char *val = (char *) switch_xml_attr_soft(param, "value");
 					if (!strcasecmp(var, "debug")) {
 						profile->debug = atoi(val);
+					} else if (!strcasecmp(var, "tracelevel")) {
+						mod_sofia_globals.tracelevel = switch_log_str2level(val);
 					} else if (!strcasecmp(var, "sip-trace")) {
 						if (switch_true(val)) {
 							sofia_set_flag(profile, TFLAG_TPORT_LOG);

Modified: freeswitch/trunk/src/switch_log.c
==============================================================================
--- freeswitch/trunk/src/switch_log.c	(original)
+++ freeswitch/trunk/src/switch_log.c	Tue Jun  9 14:52:07 2009
@@ -120,6 +120,19 @@
 	int x = 0;
 	switch_log_level_t level = SWITCH_LOG_INVALID;
 
+	if (switch_is_number(str)) {
+		x = atoi(str);
+
+		if (x > SWITCH_LOG_INVALID) {
+			return SWITCH_LOG_INVALID -1;
+		} else if (x < 0) {
+			return 0;
+		} else {
+			return x;
+		}
+	}
+
+
 	for (x = 0;; x++) {
 		if (!LEVELS[x]) {
 			break;

Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c	(original)
+++ freeswitch/trunk/src/switch_utils.c	Tue Jun  9 14:52:07 2009
@@ -690,6 +690,10 @@
 	const char *p;
 	switch_bool_t r = SWITCH_TRUE;
 
+	if (*str == '-' || *str == '+') {
+		str++;
+	}
+
 	for (p = str; p && *p; p++) {
 		if (!(*p == '.' || (*p > 47 && *p < 58))) {
 			r = SWITCH_FALSE;


From brian at freeswitch.org  Tue Jun  9 13:16:02 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 15:16:02 -0500
Subject: [Freeswitch-svn] [commit] r13736 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: brian
Date: Tue Jun  9 15:16:01 2009
New Revision: 13736

Log:
 SFSIP-151 thanks good catch

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Tue Jun  9 15:16:01 2009
@@ -4806,7 +4806,7 @@
 							tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url,
 																				  sofia_glue_transport2str(transport));
 						} else {
-							tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url,
+							tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url,
 																				  sofia_glue_transport2str(transport));
 						}
 					} else {
@@ -4827,7 +4827,7 @@
 					tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url,
 																		  sofia_glue_transport2str(transport));
 				} else {
-					tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url,
+					tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url,
 																		  sofia_glue_transport2str(transport));
 				}
 			} else {


From brian at freeswitch.org  Tue Jun  9 16:17:51 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 18:17:51 -0500
Subject: [Freeswitch-svn] [commit] r13737 - freeswitch/trunk/src
Message-ID: 

Author: brian
Date: Tue Jun  9 18:17:50 2009
New Revision: 13737

Log:
costmetic change so outbound srtp doesn't show up as (null)

Modified:
   freeswitch/trunk/src/switch_rtp.c

Modified: freeswitch/trunk/src/switch_rtp.c
==============================================================================
--- freeswitch/trunk/src/switch_rtp.c	(original)
+++ freeswitch/trunk/src/switch_rtp.c	Tue Jun  9 18:17:50 2009
@@ -948,16 +948,25 @@
 	rtp_session->crypto_keys[direction] = crypto_key;
 
 	memset(policy, 0, sizeof(*policy));
-
+	
 	switch (crypto_key->type) {
 	case AES_CM_128_HMAC_SHA1_80:
 		crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy->rtp);
+		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+			switch_channel_set_variable(channel, "sip_has_crypto", "AES_CM_128_HMAC_SHA1_80");
+		}
 		break;
 	case AES_CM_128_HMAC_SHA1_32:
 		crypto_policy_set_aes_cm_128_hmac_sha1_32(&policy->rtp);
+		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+			switch_channel_set_variable(channel, "sip_has_crypto", "AES_CM_128_HMAC_SHA1_32");
+		}
 		break;
 	case AES_CM_128_NULL_AUTH:
 		crypto_policy_set_aes_cm_128_null_auth(&policy->rtp);
+		if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+			switch_channel_set_variable(channel, "sip_has_crypto", "AES_CM_128_NULL_AUTH");
+		}
 		break;
 	default:
 		break;


From mrene at freeswitch.org  Tue Jun  9 17:04:30 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 19:04:30 -0500
Subject: [Freeswitch-svn] [commit] r13738 - in freeswitch/trunk/src: .
	include
Message-ID: 

Author: mrene
Date: Tue Jun  9 19:04:29 2009
New Revision: 13738

Log:
Export swtich_inet_ntop so modules can use it

Modified:
   freeswitch/trunk/src/include/switch_utils.h
   freeswitch/trunk/src/switch_utils.c

Modified: freeswitch/trunk/src/include/switch_utils.h
==============================================================================
--- freeswitch/trunk/src/include/switch_utils.h	(original)
+++ freeswitch/trunk/src/include/switch_utils.h	Tue Jun  9 19:04:29 2009
@@ -577,6 +577,12 @@
 #endif
 #endif
 
+#ifndef _MSC_VER
+#define switch_inet_ntop inet_ntop
+#else
+
+SWITCH_DECLARE(const char *) switch_inet_ntop(int af, void const *src, char *dst, size_t size);
+
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:

Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c	(original)
+++ freeswitch/trunk/src/switch_utils.c	Tue Jun  9 19:04:29 2009
@@ -1080,9 +1080,6 @@
 
 static char RFC2833_CHARS[] = "0123456789*#ABCDF";
 
-#ifndef _MSC_VER
-#define switch_inet_ntop inet_ntop
-#else
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -1125,7 +1122,7 @@
  * author:
  *	Paul Vixie, 1996.
  */
-const char *switch_inet_ntop(int af, void const *src, char *dst, size_t size)
+SWITCH_DECLARE(const char *) switch_inet_ntop(int af, void const *src, char *dst, size_t size)
 {
 
 	switch (af) {


From mrene at freeswitch.org  Tue Jun  9 17:07:10 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 19:07:10 -0500
Subject: [Freeswitch-svn] [commit] r13739 - in freeswitch/trunk/src: .
	include
Message-ID: 

Author: mrene
Date: Tue Jun  9 19:07:10 2009
New Revision: 13739

Log:
doh

Modified:
   freeswitch/trunk/src/include/switch_utils.h
   freeswitch/trunk/src/switch_utils.c

Modified: freeswitch/trunk/src/include/switch_utils.h
==============================================================================
--- freeswitch/trunk/src/include/switch_utils.h	(original)
+++ freeswitch/trunk/src/include/switch_utils.h	Tue Jun  9 19:07:10 2009
@@ -580,8 +580,8 @@
 #ifndef _MSC_VER
 #define switch_inet_ntop inet_ntop
 #else
-
 SWITCH_DECLARE(const char *) switch_inet_ntop(int af, void const *src, char *dst, size_t size);
+#endif
 
 SWITCH_END_EXTERN_C
 #endif

Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c	(original)
+++ freeswitch/trunk/src/switch_utils.c	Tue Jun  9 19:07:10 2009
@@ -1080,6 +1080,7 @@
 
 static char RFC2833_CHARS[] = "0123456789*#ABCDF";
 
+#ifdef _MSC_VER
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any


From mrene at freeswitch.org  Tue Jun  9 17:14:11 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 19:14:11 -0500
Subject: [Freeswitch-svn] [commit] r13740 - freeswitch/trunk/src/include
Message-ID: 

Author: mrene
Date: Tue Jun  9 19:14:11 2009
New Revision: 13740

Log:
fix switch_false() logic for numbers

Modified:
   freeswitch/trunk/src/include/switch_utils.h

Modified: freeswitch/trunk/src/include/switch_utils.h
==============================================================================
--- freeswitch/trunk/src/include/switch_utils.h	(original)
+++ freeswitch/trunk/src/include/switch_utils.h	Tue Jun  9 19:14:11 2009
@@ -161,7 +161,7 @@
 !strcasecmp(expr, "disabled") ||\
 !strcasecmp(expr, "inactive") ||\
 !strcasecmp(expr, "disallow") ||\
-!(switch_is_number(expr) && atoi(expr)))) ? SWITCH_TRUE : SWITCH_FALSE)
+(switch_is_number(expr) && !atoi(expr)))) ? SWITCH_TRUE : SWITCH_FALSE)
 
 
 /*!


From mrene at freeswitch.org  Tue Jun  9 17:48:35 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 19:48:35 -0500
Subject: [Freeswitch-svn] [commit] r13741 - in freeswitch/trunk/src: .
	include
Message-ID: 

Author: mrene
Date: Tue Jun  9 19:48:35 2009
New Revision: 13741

Log:
Also export switch_inet_pton

Modified:
   freeswitch/trunk/src/include/switch_utils.h
   freeswitch/trunk/src/inet_pton.c
   freeswitch/trunk/src/switch_utils.c

Modified: freeswitch/trunk/src/include/switch_utils.h
==============================================================================
--- freeswitch/trunk/src/include/switch_utils.h	(original)
+++ freeswitch/trunk/src/include/switch_utils.h	Tue Jun  9 19:48:35 2009
@@ -561,7 +561,7 @@
 
 #define switch_test_subnet(_ip, _net, _mask) (_mask ? ((_net & _mask) == (_ip & _mask)) : _net ? _net == _ip : 1)
 
-int switch_inet_pton(int af, const char *src, void *dst);
+SWITCH_DECLARE(int) switch_inet_pton(int af, const char *src, void *dst)
 
 /* malloc or DIE macros */
 #ifdef NDEBUG

Modified: freeswitch/trunk/src/inet_pton.c
==============================================================================
--- freeswitch/trunk/src/inet_pton.c	(original)
+++ freeswitch/trunk/src/inet_pton.c	Tue Jun  9 19:48:35 2009
@@ -66,7 +66,7 @@
  * author:
  *      Paul Vixie, 1996.
  */
-int
+SWITCH_DECLARE(int)
 switch_inet_pton(int af, const char *src, void *dst)
 {
   switch (af) {

Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c	(original)
+++ freeswitch/trunk/src/switch_utils.c	Tue Jun  9 19:48:35 2009
@@ -57,7 +57,7 @@
 };
 
 #ifndef WIN32
-int switch_inet_pton(int af, const char *src, void *dst)
+SWITCH_DECLARE(int) switch_inet_pton(int af, const char *src, void *dst)
 {
 	return inet_pton(af, src, dst);
 }


From mrene at freeswitch.org  Tue Jun  9 17:55:55 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 19:55:55 -0500
Subject: [Freeswitch-svn] [commit] r13742 - freeswitch/trunk/src/include
Message-ID: 

Author: mrene
Date: Tue Jun  9 19:55:55 2009
New Revision: 13742

Log:
sigh

Modified:
   freeswitch/trunk/src/include/switch_utils.h

Modified: freeswitch/trunk/src/include/switch_utils.h
==============================================================================
--- freeswitch/trunk/src/include/switch_utils.h	(original)
+++ freeswitch/trunk/src/include/switch_utils.h	Tue Jun  9 19:55:55 2009
@@ -561,7 +561,7 @@
 
 #define switch_test_subnet(_ip, _net, _mask) (_mask ? ((_net & _mask) == (_ip & _mask)) : _net ? _net == _ip : 1)
 
-SWITCH_DECLARE(int) switch_inet_pton(int af, const char *src, void *dst)
+SWITCH_DECLARE(int) switch_inet_pton(int af, const char *src, void *dst);
 
 /* malloc or DIE macros */
 #ifdef NDEBUG


From mrene at freeswitch.org  Tue Jun  9 18:02:49 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 09 Jun 2009 20:02:49 -0500
Subject: [Freeswitch-svn] [commit] r13743 - freeswitch/trunk/src
Message-ID: 

Author: mrene
Date: Tue Jun  9 20:02:48 2009
New Revision: 13743

Log:
inet_pton.c needs switch.h for SWITCH_DECLARE

Modified:
   freeswitch/trunk/src/inet_pton.c

Modified: freeswitch/trunk/src/inet_pton.c
==============================================================================
--- freeswitch/trunk/src/inet_pton.c	(original)
+++ freeswitch/trunk/src/inet_pton.c	Tue Jun  9 20:02:48 2009
@@ -45,6 +45,8 @@
 #define EAFNOSUPPORT    WSAEAFNOSUPPORT
 #endif
 
+#include 
+
 /*
  * WARNING: Don't even consider trying to compile this on a system where
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.


From mrene at freeswitch.org  Tue Jun  9 22:03:08 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 00:03:08 -0500
Subject: [Freeswitch-svn] [commit] r13744 - freeswitch/trunk/src
Message-ID: 

Author: mrene
Date: Wed Jun 10 00:03:07 2009
New Revision: 13744

Log:
switch_xml_locate: don't parse the binding section at every iteration

Modified:
   freeswitch/trunk/src/switch_xml.c

Modified: freeswitch/trunk/src/switch_xml.c
==============================================================================
--- freeswitch/trunk/src/switch_xml.c	(original)
+++ freeswitch/trunk/src/switch_xml.c	Wed Jun 10 00:03:07 2009
@@ -1538,12 +1538,11 @@
 	switch_xml_t xml = NULL;
 	switch_xml_binding_t *binding;
 	uint8_t loops = 0;
+	switch_xml_section_t sections = BINDINGS ? switch_xml_parse_section_string(section) : 0;
 
 	switch_thread_rwlock_rdlock(B_RWLOCK);
 
 	for (binding = BINDINGS; binding; binding = binding->next) {
-		switch_xml_section_t sections = switch_xml_parse_section_string(section);
-
 		if (binding->sections && !(sections & binding->sections)) {
 			continue;
 		}


From mrene at freeswitch.org  Tue Jun  9 22:08:54 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 00:08:54 -0500
Subject: [Freeswitch-svn] [commit] r13745 - freeswitch/trunk/src/include
Message-ID: 

Author: mrene
Date: Wed Jun 10 00:08:53 2009
New Revision: 13745

Log:
Add SWITCH_XML_SECTION_MAX to switch_xml_section_enum_t

Modified:
   freeswitch/trunk/src/include/switch_types.h

Modified: freeswitch/trunk/src/include/switch_types.h
==============================================================================
--- freeswitch/trunk/src/include/switch_types.h	(original)
+++ freeswitch/trunk/src/include/switch_types.h	Wed Jun 10 00:08:53 2009
@@ -406,7 +406,10 @@
 	SWITCH_XML_SECTION_CONFIG = (1 << 0),
 	SWITCH_XML_SECTION_DIRECTORY = (1 << 1),
 	SWITCH_XML_SECTION_DIALPLAN = (1 << 2),
-	SWITCH_XML_SECTION_PHRASES = (1 << 3)
+	SWITCH_XML_SECTION_PHRASES = (1 << 3),
+	
+	/* Nothing after this line */
+	SWITCH_XML_SECTION_MAX = (1 << 4)
 } switch_xml_section_enum_t;
 typedef uint32_t switch_xml_section_t;
 


From mrene at freeswitch.org  Tue Jun  9 23:39:09 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 01:39:09 -0500
Subject: [Freeswitch-svn] [commit] r13746 -
	freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
Message-ID: 

Author: mrene
Date: Wed Jun 10 01:39:08 2009
New Revision: 13746

Log:
FSCORE-379

Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	Wed Jun 10 01:39:08 2009
@@ -998,6 +998,7 @@
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n");
 		return NULL;
 	}
+	memset(listener, 0, sizeof(*listener));
 
 	switch_thread_rwlock_create(&listener->rwlock, listener_pool);
 	switch_queue_create(&listener->event_queue, SWITCH_CORE_QUEUE_LEN, listener_pool);
@@ -1039,126 +1040,145 @@
 	return listener;
 }
 
+static switch_status_t state_handler(switch_core_session_t *session)
+{
+	switch_channel_t *channel = switch_core_session_get_channel(session);
+	switch_channel_state_t state = switch_channel_get_state(channel);
+	
+	if (state >= CS_HANGUP)  {
+		session_elem_t *session_element = switch_channel_get_private(channel, "_erlang_session_");
+		listener_t* listener = switch_channel_get_private(channel, "_erlang_listener_");
+		
+		if (session_element && listener) {
+			remove_session_elem_from_listener(listener, session_element);
+		}
+
+		switch_core_event_hook_remove_state_change(session, state_handler);
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+session_elem_t *session_elem_create(listener_t* listener, switch_core_session_t *session) 
+{
+	/* create a session list element */
+	session_elem_t* session_element = switch_core_session_alloc(session, sizeof(*session_element));
+	switch_channel_t *channel = switch_core_session_get_channel(session);
+
+	memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH);
+	
+	switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session));
+	switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
+	
+	switch_channel_set_private(channel, "_erlang_session_", session_element);
+	switch_channel_set_private(channel, "_erlang_listener_", listener);
+	
+	switch_core_event_hook_add_state_change(session, state_handler);
+	
+	return session_element;
+}
 
 session_elem_t* attach_call_to_registered_process(listener_t* listener, char* reg_name, switch_core_session_t *session)
 {
 	/* create a session list element */
-	session_elem_t* session_element = NULL;
-	if (!(session_element = switch_core_session_alloc(session, sizeof(*session_element)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate session element\n");
-	} else {
-		memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH);
-		session_element->process.type = ERLANG_REG_PROCESS;
-		session_element->process.reg_name = switch_core_strdup(switch_core_session_get_pool(session),reg_name);
-		switch_set_flag(session_element, LFLAG_SESSION_ALIVE);
-		switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT);
-		switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session));
-		switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-		/* attach the session to the listener */
-		add_session_elem_to_listener(listener,session_element);
-	}
+	session_elem_t* session_element = session_elem_create(listener, session);
+
+    session_element->process.type = ERLANG_REG_PROCESS;
+    session_element->process.reg_name = switch_core_session_strdup(session, reg_name);
+    switch_set_flag(session_element, LFLAG_SESSION_ALIVE);
+    /* attach the session to the listener */
+    add_session_elem_to_listener(listener,session_element);
+
 	return session_element;
 }
 
 session_elem_t* attach_call_to_pid(listener_t* listener, erlang_pid* pid, switch_core_session_t *session)
 {
 	/* create a session list element */
-	session_elem_t* session_element = NULL;
-	if (!(session_element = switch_core_session_alloc(session, sizeof(*session_element)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate session element\n");
-	} else {
-		memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH);
-		session_element->process.type = ERLANG_PID;
-		memcpy(&session_element->process.pid, pid, sizeof(erlang_pid));
-		switch_set_flag(session_element, LFLAG_SESSION_ALIVE);
-		switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT);
-		switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session));
-		switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-		/* attach the session to the listener */
-		add_session_elem_to_listener(listener,session_element);
-
-		ei_link(listener, ei_self(listener->ec), pid);
-	}
+	session_elem_t* session_element = session_elem_create(listener, session);
+	
+	session_element->process.type = ERLANG_PID;
+	memcpy(&session_element->process.pid, pid, sizeof(erlang_pid));
+	switch_set_flag(session_element, LFLAG_SESSION_ALIVE);
+	/* attach the session to the listener */
+	add_session_elem_to_listener(listener,session_element);
+	ei_link(listener, ei_self(listener->ec), pid);
+	
 	return session_element;
 }
 
 session_elem_t* attach_call_to_spawned_process(listener_t* listener, char *module, char *function, switch_core_session_t *session)
 {
 	/* create a session list element */
-	session_elem_t* session_element=NULL;
-	if (!(session_element = switch_core_session_alloc(session, sizeof(*session_element)))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate session element\n");
-	} else {
-		char hash[100];
-		int i = 0;
-		void *p = NULL;
-
-		memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH);
-		erlang_pid *pid;
-		erlang_ref ref;
-
-		switch_set_flag(session_element, LFLAG_WAITING_FOR_PID);
-		switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session));
-		switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
-		/* attach the session to the listener */
-		add_session_elem_to_listener(listener,session_element);
-
-		ei_init_ref(listener->ec, &ref);
-		ei_hash_ref(&ref, hash);
-		/* insert the waiting marker */
-		switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.WAITING);
-
-		if (!strcmp(function, "!")) {
-			/* send a message to request a pid */
-			ei_x_buff rbuf;
-			ei_x_new_with_version(&rbuf);
-
-			ei_x_encode_tuple_header(&rbuf, 3);
-			ei_x_encode_atom(&rbuf, "new_pid");
-			ei_x_encode_ref(&rbuf, &ref);
-			ei_x_encode_pid(&rbuf, ei_self(listener->ec));
-			/* should lock with mutex? */
-			ei_reg_send(listener->ec, listener->sockfd, module, rbuf.buff, rbuf.index);
+	session_elem_t* session_element = session_elem_create(listener, session);
+	char hash[100];
+	int i = 0;
+	void *p = NULL;
+	erlang_pid *pid;
+	erlang_ref ref;
+
+	switch_set_flag(session_element, LFLAG_WAITING_FOR_PID);
+	
+	/* attach the session to the listener */
+	add_session_elem_to_listener(listener,session_element);
+
+	ei_init_ref(listener->ec, &ref);
+	ei_hash_ref(&ref, hash);
+	/* insert the waiting marker */
+	switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.WAITING);
+
+	if (!strcmp(function, "!")) {
+		/* send a message to request a pid */
+		ei_x_buff rbuf;
+		ei_x_new_with_version(&rbuf);
+
+		ei_x_encode_tuple_header(&rbuf, 3);
+		ei_x_encode_atom(&rbuf, "new_pid");
+		ei_x_encode_ref(&rbuf, &ref);
+		ei_x_encode_pid(&rbuf, ei_self(listener->ec));
+		/* should lock with mutex? */
+		ei_reg_send(listener->ec, listener->sockfd, module, rbuf.buff, rbuf.index);
 #ifdef EI_DEBUG
-			ei_x_print_reg_msg(&rbuf, module, 1);
+		ei_x_print_reg_msg(&rbuf, module, 1);
 #endif
-			ei_x_free(&rbuf);
-		} else {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rpc call: %s:%s(Ref)\n", module, function);
-			/* should lock with mutex? */
-			ei_pid_from_rpc(listener->ec, listener->sockfd, &ref, module, function);
-			/*
-			   char *argv[1];
-			   ei_spawn(listener->ec, listener->sockfd, &ref, module, function, 0, argv);
-			   */
-		}
-
-		/* loop until either we timeout or we get a value that's not the waiting marker */
-		while (!(p = switch_core_hash_find(listener->spawn_pid_hash, hash)) || p == &globals.WAITING) {
-			if (i > 50) { /* half a second timeout */
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n");
-				remove_session_elem_from_listener(listener,session_element);
-				switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */
-				return NULL;
-			}
-			i++;
-			switch_yield(10000); /* 10ms */
+		ei_x_free(&rbuf);
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rpc call: %s:%s(Ref)\n", module, function);
+		/* should lock with mutex? */
+		ei_pid_from_rpc(listener->ec, listener->sockfd, &ref, module, function);
+		/*
+		   char *argv[1];
+		   ei_spawn(listener->ec, listener->sockfd, &ref, module, function, 0, argv);
+		   */
+	}
+
+	/* loop until either we timeout or we get a value that's not the waiting marker */
+	while (!(p = switch_core_hash_find(listener->spawn_pid_hash, hash)) || p == &globals.WAITING) {
+		if (i > 50) { /* half a second timeout */
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n");
+			remove_session_elem_from_listener(listener,session_element);
+			switch_core_hash_insert(listener->spawn_pid_hash, hash, &globals.TIMEOUT); /* TODO lock this? */
+			return NULL;
 		}
+		i++;
+		switch_yield(10000); /* 10ms */
+	}
 
-		switch_core_hash_delete(listener->spawn_pid_hash, hash);
+	switch_core_hash_delete(listener->spawn_pid_hash, hash);
 
-		pid = (erlang_pid *) p;
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got pid!\n");
+	pid = (erlang_pid *) p;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got pid!\n");
 
-		session_element->process.type = ERLANG_PID;
-		memcpy(&session_element->process.pid, pid, sizeof(erlang_pid));
-		switch_set_flag(session_element, LFLAG_SESSION_ALIVE);
-		switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT);
-		switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID);
+	session_element->process.type = ERLANG_PID;
+	memcpy(&session_element->process.pid, pid, sizeof(erlang_pid));
+	
+	switch_set_flag(session_element, LFLAG_SESSION_ALIVE);
+	switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT);
+	switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID);
+
+	ei_link(listener, ei_self(listener->ec), pid);
+	switch_safe_free(pid); /* malloced in handle_ref_tuple */
 
-		ei_link(listener, ei_self(listener->ec), pid);
-		switch_safe_free(pid); /* malloced in handle_ref_tuple */
-	}
 	return session_element;
 }
 


From brian at freeswitch.org  Wed Jun 10 07:51:16 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 09:51:16 -0500
Subject: [Freeswitch-svn] [commit] r13747 -
	freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
Message-ID: 

Author: brian
Date: Wed Jun 10 09:51:15 2009
New Revision: 13747

Log:
 ok now you can specify the dictionary to use in the config file 

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c	Wed Jun 10 09:51:15 2009
@@ -45,6 +45,7 @@
 static struct {
 	char *model8k;
 	char *model16k;
+	char *dictionary;
 	uint32_t thresh;
 	uint32_t silence_hits;
 	uint32_t listen_hits;
@@ -134,7 +135,7 @@
 		model = switch_mprintf("%s%smodel%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, globals.model16k);
 	}
 
-	dic = switch_mprintf("%s%sdefault.dic", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR);
+	dic = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, globals.dictionary);
 
 	if (switch_file_exists(dic, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open dictionary %s.\n", dic); 
@@ -443,6 +444,8 @@
 				globals.model8k = switch_core_strdup(globals.pool, val);
 			} else if (!strcasecmp(var, "wideband-model")) {
 				globals.model16k = switch_core_strdup(globals.pool, val);
+			} else if (!strcasecmp(var, "dictionary")) {
+				globals.dictionary = switch_core_strdup(globals.pool, val);
 			}
 		}
 	}
@@ -455,6 +458,10 @@
 		globals.model16k = switch_core_strdup(globals.pool, "wsj1");
 	}
 
+	if (!globals.dictionary) {
+		globals.dictionary = switch_core_strdup(globals.pool, "default.dic");
+	}
+
  done:
 	if (xml) {
 		switch_xml_free(xml);


From brian at freeswitch.org  Wed Jun 10 07:52:53 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 09:52:53 -0500
Subject: [Freeswitch-svn] [commit] r13748 -
	freeswitch/trunk/conf/autoload_configs
Message-ID: 

Author: brian
Date: Wed Jun 10 09:52:52 2009
New Revision: 13748

Log:
 update config file option 

Modified:
   freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml

Modified: freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml	Wed Jun 10 09:52:52 2009
@@ -6,5 +6,6 @@
     
     
     
+    
   
 


From mikej at freeswitch.org  Wed Jun 10 08:24:34 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 10:24:34 -0500
Subject: [Freeswitch-svn] [commit] r13749 - in
	freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
Message-ID: 

Author: mikej
Date: Wed Jun 10 10:24:34 2009
New Revision: 13749

Log:
libsofia: handle mid-line comments in resolv.conf patch from Lee Verberne (SFSIP-152)

Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Jun 10 10:24:34 2009
@@ -1 +1 @@
-Thu Jun  4 16:10:50 CDT 2009
+Wed Jun 10 11:14:52 EDT 2009

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c	Wed Jun 10 10:24:34 2009
@@ -2270,11 +2270,11 @@
       /* Skip whitespace at the beginning ...*/
       b = buf + strspn(buf, " \t");
 
-      /* ... and at the end of line */
-      for (len = strlen(b); len > 0 && strchr(" \t\r\n", b[len - 1]); len--)
+      /* ... and comments + whitespace at the end */
+      for (len = strcspn(b, "#;"); len > 0 && strchr(" \t\r\n", b[len - 1]); len--)
 	;
 
-      if (len == 0 || b[0] == '#') 	/* Empty line or comment */
+      if (len == 0) 	/* Empty line or comment */
 	continue;
 
       b[len] = '\0';


From mikej at freeswitch.org  Wed Jun 10 11:02:09 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 13:02:09 -0500
Subject: [Freeswitch-svn] [commit] r13750 - freeswitch/trunk/src
Message-ID: 

Author: mikej
Date: Wed Jun 10 13:02:08 2009
New Revision: 13750

Log:
bounds checking (FSCORE-380)

Modified:
   freeswitch/trunk/src/switch_core_asr.c
   freeswitch/trunk/src/switch_core_speech.c

Modified: freeswitch/trunk/src/switch_core_asr.c
==============================================================================
--- freeswitch/trunk/src/switch_core_asr.c	(original)
+++ freeswitch/trunk/src/switch_core_asr.c	Wed Jun 10 13:02:08 2009
@@ -126,8 +126,8 @@
 	if (!switch_strlen_zero(param_string)) {
 		char *param[256] = { 0 };
 		int i;
-		switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0])));
-		for (i = 0; param[i]; ++i) {
+		int argc = switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0])));
+		for (i = 0; i < argc && param[i]; ++i) {
 			char *param_pair[2] = { 0 };
 			if(switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) {
 				switch_core_asr_text_param(ah, param_pair[0], param_pair[1]);

Modified: freeswitch/trunk/src/switch_core_speech.c
==============================================================================
--- freeswitch/trunk/src/switch_core_speech.c	(original)
+++ freeswitch/trunk/src/switch_core_speech.c	Wed Jun 10 13:02:08 2009
@@ -137,8 +137,8 @@
 	if (!switch_strlen_zero(param_string)) {
 		char *param[256] = { 0 };
 		int i;
-		switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0])));
-		for (i = 0; param[i]; ++i) {
+		int argc = switch_separate_string(param_string, ',', param, (sizeof(param) / sizeof(param[0])));
+		for (i = 0; i < argc && param[i]; ++i) {
 			char *param_pair[2] = { 0 };
 			if(switch_separate_string(param[i], '=', param_pair, (sizeof(param_pair) / sizeof(param_pair[0]))) == 2) {
 				switch_core_speech_text_param_tts(sh, param_pair[0], param_pair[1]);


From andrew at freeswitch.org  Wed Jun 10 14:17:42 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 16:17:42 -0500
Subject: [Freeswitch-svn] [commit] r13751 -
	freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
Message-ID: 

Author: andrew
Date: Wed Jun 10 16:17:42 2009
New Revision: 13751

Log:
Use SWITCH_XML_SECTION_MAX


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	Wed Jun 10 16:17:42 2009
@@ -110,7 +110,7 @@
 
 	switch_mutex_lock(globals.listener_mutex);
 
-	switch_xml_set_binding_sections(bindings.search_binding, (1 << sizeof(switch_xml_section_enum_t)));
+	switch_xml_set_binding_sections(bindings.search_binding, SWITCH_XML_SECTION_MAX);
 
 	for (ptr = bindings.head; ptr; lst = ptr, ptr = ptr->next) {
 		if ((listener && ptr->listener == listener) ||
@@ -1400,7 +1400,7 @@
 
 	memset(&bindings, 0, sizeof(bindings));
 
-	if (switch_xml_bind_search_function_ret(erlang_fetch, (1 << sizeof(switch_xml_section_enum_t)), NULL, &bindings.search_binding) != SWITCH_STATUS_SUCCESS) {
+	if (switch_xml_bind_search_function_ret(erlang_fetch, SWITCH_XML_SECTION_MAX, NULL, &bindings.search_binding) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
 		close_socket(&listen_list.sockfd);
 		return SWITCH_STATUS_GENERR;


From mikej at freeswitch.org  Wed Jun 10 14:45:27 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 16:45:27 -0500
Subject: [Freeswitch-svn] [commit] r13752 - freeswitch/trunk
Message-ID: 

Author: mikej
Date: Wed Jun 10 16:45:27 2009
New Revision: 13752

Log:
remove gnu grepisms breaking test on solaris

Modified:
   freeswitch/trunk/bootstrap.sh

Modified: freeswitch/trunk/bootstrap.sh
==============================================================================
--- freeswitch/trunk/bootstrap.sh	(original)
+++ freeswitch/trunk/bootstrap.sh	Wed Jun 10 16:45:27 2009
@@ -289,7 +289,8 @@
 
       LTTEST=`grep "AC_PROG_LIBTOOL" ${CFFILE}`
       LTTEST2=`grep "AM_PROG_LIBTOOL" ${CFFILE}`
-      AMTEST=`grep "AM_INIT_AUTOMAKE\|AC_PROG_INSTALL" ${CFFILE}`
+      AMTEST=`grep "AM_INIT_AUTOMAKE" ${CFFILE}`
+      AMTEST2=`grep "AC_PROG_INSTALL" ${CFFILE}`
       AHTEST=`grep "AC_CONFIG_HEADERS" ${CFFILE}`
 
       echo "Creating aclocal.m4"
@@ -315,7 +316,7 @@
       fi
 
 #run if AM_INIT_AUTOMAKE / AC_PROG_INSTALL is in configure.in/configure.ac
-      if [ ! -z "${AMTEST}" ]; then
+      if [ ! -z "${AMTEST}" -o "${AMTEST2}" ] ; then
           echo "Creating Makefile.in"
           ${AUTOMAKE:-automake} --no-force --add-missing --copy ;
       fi


From dschreiber at freeswitch.org  Wed Jun 10 19:59:24 2009
From: dschreiber at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 21:59:24 -0500
Subject: [Freeswitch-svn] [commit] r13753 -
	freeswitch/trunk/src/mod/applications/mod_nibblebill
Message-ID: 

Author: dschreiber
Date: Wed Jun 10 21:59:24 2009
New Revision: 13753

Log:
Fixed nibblebill to bill on call start

Modified:
   freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c

Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	Wed Jun 10 21:59:24 2009
@@ -420,6 +420,23 @@
 
 	if (profile->times->answered < 1) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not billing %s - call is not in answered state\n", billaccount);
+
+		float balance;
+
+		/* See if this person has enough money left to continue the call */
+		balance = get_balance(billaccount);
+switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup balance of %f\n", balance, globals.nobal_amt);
+		if (balance <= globals.nobal_amt) {
+			/* Not enough money - reroute call to nobal location */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
+
+			/* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */
+			/* in nibblebill checking the call again in the routing process for an allowed balance! */
+			/* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */
+			nibblebill_pause(session);
+			transfer_call(session, globals.nobal_action);
+		}
+
 		return SWITCH_STATUS_SUCCESS;
 	}
 
@@ -485,22 +502,22 @@
 
 	/* Save this location, but only if the channel/session are not hungup (otherwise, we're done) */
 	if (channel && switch_channel_get_state(channel) != CS_HANGUP) {
-		float balance;
-
 		switch_channel_set_private(channel, "_nibble_data_", nibble_data);
+        }
 
-		/* See if this person has enough money left to continue the call */
-		balance = get_balance(billaccount);
-		if (balance < globals.nobal_amt) {
-			/* Not enough money - reroute call to nobal location */
+	float balance;
+
+	/* See if this person has enough money left to continue the call */
+	balance = get_balance(billaccount);
+	if (balance <= globals.nobal_amt) {
+		/* Not enough money - reroute call to nobal location */
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
 
-			/* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */
-			/* in nibblebill checking the call again in the routing process for an allowed balance! */
-			/* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */
-			nibblebill_pause(session);
-			transfer_call(session, globals.nobal_action);
-		}
+		/* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */
+		/* in nibblebill checking the call again in the routing process for an allowed balance! */
+		/* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */
+		nibblebill_pause(session);
+		transfer_call(session, globals.nobal_action);
 	}
 
 	/* Done changing - release lock */
@@ -820,7 +837,7 @@
 switch_state_handler_table_t nibble_state_handler =
 {
 	/* on_init */   	NULL,
-	/* on_routing */   	NULL,	/* Need to add a check here for anything in their account before routing */
+	/* on_routing */   	process_hangup,	/* Need to add a check here for anything in their account before routing */
 	/* on_execute */   	sched_billing,  /* Turn on heartbeat for this session and do an initial account check */
 	/* on_hangup */   	process_hangup, /* On hangup - most important place to go bill */
 	/* on_exch_media */   	NULL,


From dschreiber at freeswitch.org  Wed Jun 10 20:42:01 2009
From: dschreiber at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 10 Jun 2009 22:42:01 -0500
Subject: [Freeswitch-svn] [commit] r13754 -
	freeswitch/trunk/src/mod/applications/mod_nibblebill
Message-ID: 

Author: dschreiber
Date: Wed Jun 10 22:42:01 2009
New Revision: 13754

Log:
Fix a deadlock in last commit

Modified:
   freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c

Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	Wed Jun 10 22:42:01 2009
@@ -430,10 +430,6 @@
 			/* Not enough money - reroute call to nobal location */
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
 
-			/* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */
-			/* in nibblebill checking the call again in the routing process for an allowed balance! */
-			/* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */
-			nibblebill_pause(session);
 			transfer_call(session, globals.nobal_action);
 		}
 
@@ -503,22 +499,23 @@
 	/* Save this location, but only if the channel/session are not hungup (otherwise, we're done) */
 	if (channel && switch_channel_get_state(channel) != CS_HANGUP) {
 		switch_channel_set_private(channel, "_nibble_data_", nibble_data);
-        }
 
-	float balance;
+		float balance;
+
+		/* See if this person has enough money left to continue the call */
+		balance = get_balance(billaccount);
+		if (balance <= globals.nobal_amt) {
+			/* Not enough money - reroute call to nobal location */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
+
+			/* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */
+			/* in nibblebill checking the call again in the routing process for an allowed balance! */
+			/* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */
+			nibblebill_pause(session);
+			transfer_call(session, globals.nobal_action);
+		}
+        }
 
-	/* See if this person has enough money left to continue the call */
-	balance = get_balance(billaccount);
-	if (balance <= globals.nobal_amt) {
-		/* Not enough money - reroute call to nobal location */
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
-
-		/* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */
-		/* in nibblebill checking the call again in the routing process for an allowed balance! */
-		/* If you intend to give the user the option to re-up their balance, you must clear & resume billing once the balance is updated! */
-		nibblebill_pause(session);
-		transfer_call(session, globals.nobal_action);
-	}
 
 	/* Done changing - release lock */
 	if (globals.mutex) {
@@ -840,7 +837,7 @@
 	/* on_routing */   	process_hangup,	/* Need to add a check here for anything in their account before routing */
 	/* on_execute */   	sched_billing,  /* Turn on heartbeat for this session and do an initial account check */
 	/* on_hangup */   	process_hangup, /* On hangup - most important place to go bill */
-	/* on_exch_media */   	NULL,
+	/* on_exch_media */   	sched_billing,
 	/* on_soft_exec */   	NULL,
 	/* on_consume_med */   	NULL,
 	/* on_hibernate */   	NULL,


From mikej at freeswitch.org  Thu Jun 11 08:59:09 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 10:59:09 -0500
Subject: [Freeswitch-svn] [commit] r13755 -
	freeswitch/trunk/src/mod/applications/mod_nibblebill
Message-ID: 

Author: mikej
Date: Thu Jun 11 10:59:08 2009
New Revision: 13755

Log:
code before declaration (FSBUILD-172)

Modified:
   freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c

Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c	Thu Jun 11 10:59:08 2009
@@ -386,6 +386,7 @@
 	switch_time_exp_t tm;
 	const char *billrate;
 	const char *billaccount;
+	float balance;
 
 	if (!session) {
 		/* Why are we here? */
@@ -421,8 +422,6 @@
 	if (profile->times->answered < 1) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not billing %s - call is not in answered state\n", billaccount);
 
-		float balance;
-
 		/* See if this person has enough money left to continue the call */
 		balance = get_balance(billaccount);
 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup balance of %f\n", balance, globals.nobal_amt);
@@ -500,8 +499,6 @@
 	if (channel && switch_channel_get_state(channel) != CS_HANGUP) {
 		switch_channel_set_private(channel, "_nibble_data_", nibble_data);
 
-		float balance;
-
 		/* See if this person has enough money left to continue the call */
 		balance = get_balance(billaccount);
 		if (balance <= globals.nobal_amt) {


From jmesquita at freeswitch.org  Thu Jun 11 09:10:03 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 11:10:03 -0500
Subject: [Freeswitch-svn] [commit] r13756 -
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
Message-ID: 

Author: jmesquita
Date: Thu Jun 11 11:10:03 2009
New Revision: 13756

Log:
My first API to show board information

Modified:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile	Thu Jun 11 11:10:03 2009
@@ -1,4 +1,6 @@
 MODNAME=mod_khomp
-LOCAL_CFLAGS=-I./include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -lboost_thread -lboost_regex
+LOCAL_CFLAGS=-I./include -I./commons/include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DKHOMP_COMMONS_WITH_CHANNEL -lboost_thread -lboost_regex
+
+LOCAL_OBJS= ./commons/k3lapi.o
 
 include ../../../../build/modmake.rules

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Thu Jun 11 11:10:03 2009
@@ -30,8 +30,10 @@
  *
  */
 
+#define KHOMP_SYNTAX "khomp [status]"
+
 /* Our includes */
-#include "k3l.h"
+#include "k3lapi.hpp"
 
 extern "C"
 {
@@ -48,6 +50,8 @@
 static switch_memory_pool_t *module_pool = NULL;
 static int running = 1;
 
+static K3LAPI * k3l;
+
 
 typedef enum {
 	TFLAG_IO = (1 << 0),
@@ -103,6 +107,8 @@
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string);
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ip, globals.ip);
 
+/* Macros to define specific API functions */
+SWITCH_STANDARD_API(khomp);
 
 
 static switch_status_t channel_on_init(switch_core_session_t *session);
@@ -534,49 +540,6 @@
 	return SWITCH_STATUS_SUCCESS;
 }
 
-bool start_k3l(void)
-{
-    k3lSetGlobalParam (klpResetFwOnStartup, 1);
-    k3lSetGlobalParam (klpDisableInternalVoIP, 1);
-
-	sbyte *Erro = k3lStart( 2,0,0 );
-
-	if ( Erro )	{
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "loading K3L API failed: %s.\n", Erro);
-		return false;
-	}		
-
-	int _boardCount = k3lGetDeviceCount();
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Number of boards: %d.\n", _boardCount);
-
-	/* No boards */
-	if(_boardCount == 0){
-		k3lStop();
-		return false;
-	}
-
-/*	_boards = new Board*[ _boardCount ];
-
-	for( int i = 0; i < _boardCount; i++ )
-		_boards[ i ] = new Board( i );
-
-	
-	if(handler) 
-		RegisterHandler((void *)EventCallBack);		*/
-
-
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API have been started!\n");
-
-	bool is_ok = true;
-
-	if (!is_ok)
-		return false;
-
-	return true;
-};
-
-
 SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load)
 {
 
@@ -586,15 +549,33 @@
 
 	load_config();
 
+	switch_api_interface_t *api_interface;
+
 	*module_interface = switch_loadable_module_create_module_interface(pool, "mod_khomp");
 	khomp_endpoint_interface = static_cast(switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE));
 	khomp_endpoint_interface->interface_name = "khomp";
 	khomp_endpoint_interface->io_routines = &khomp_io_routines;
 	khomp_endpoint_interface->state_handler = &khomp_state_handlers;
 
-	if (!start_k3l()) {
-		return SWITCH_STATUS_FALSE;
-	}
+    /* 
+       Spawn our k3l global var that will be used along the module
+       for sending info to the boards
+    */
+    k3l = new K3LAPI();
+
+    /* Start the API and connect to KServer */
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting K3L...\n");
+    try {
+        k3l->start();
+    } catch (...) {
+        /* TODO: Catch the proper error and display it. */
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "K3L not started.");
+        return SWITCH_STATUS_TERM;
+    }
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "K3L started.\n");
+
+    /* Add all the specific API functions */
+    SWITCH_ADD_API(api_interface, "khomp", "Khomp Menu", khomp, KHOMP_SYNTAX);
 
 	/* indicate that the module should continue to be loaded */
 	return SWITCH_STATUS_SUCCESS;
@@ -628,12 +609,149 @@
 
 	/* Finnish him! */
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stopping K3L...\n");
-	k3lStop();
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API have been stopped!\n");
+    k3l->stop();
+    delete k3l;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API has been stopped!\n");
 	
 	return SWITCH_STATUS_SUCCESS;
 }
 
+/* 
+   khomp API
+   Only displays board information right now
+*/
+
+SWITCH_STANDARD_API(khomp)
+{
+   	char *argv[10] = { 0 };
+	int argc = 0;
+	void *val;
+	char *myarg = NULL;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+
+    /* We should not ever get a session here */
+	if (session) return status;
+
+	if (switch_strlen_zero(cmd) || !(myarg = strdup(cmd))) {
+		stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX);
+		return SWITCH_STATUS_FALSE;
+	}
+
+	if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 1) {
+		stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX);
+		goto done;
+	}
+
+	if (argv[0] && !strncasecmp(argv[0], "status", 6)) {
+        K3L_API_CONFIG apiCfg;
+
+        stream->write_function(stream," ------------------------------------------------------------------\n");
+        stream->write_function(stream, "|---------------------- Khomp System Summary ----------------------|\n");
+        stream->write_function(stream, "|------------------------------------------------------------------|\n");
+
+        if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess)
+        {
+            stream->write_function(stream, "| K3L API %d.%d.%d [m.VPD %d] - %-38s |\n"
+                         , apiCfg.MajorVersion , apiCfg.MinorVersion , apiCfg.BuildVersion
+                         , apiCfg.VpdVersionNeeded , apiCfg.StrVersion);
+        }
+
+        for (unsigned int i = 0; i < k3l->device_count(); i++)
+        {
+            K3L_DEVICE_CONFIG & devCfg = k3l->device_config(i);
+
+            stream->write_function(stream, " ------------------------------------------------------------------\n");
+
+            switch (k3l->device_type(i))
+            {
+                /* E1 boards */
+                case kdtE1:
+                case kdtConf:
+                case kdtPR:
+                case kdtE1GW:
+                case kdtE1IP:
+                case kdtE1Spx:
+                case kdtGWIP:
+                case kdtFXS:
+                case kdtFXSSpx:
+                {
+                    K3L_E1600A_FW_CONFIG dspAcfg;
+                    K3L_E1600B_FW_CONFIG dspBcfg;
+
+                    if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) &&
+                        (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess))
+                    {
+                        stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels, %d links.|\n"
+                                    , i , "E1" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount , devCfg.LinkCount);
+                        stream->write_function(stream, "| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|\n"
+                                    , dspAcfg.DspVersion , dspBcfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
+                                    , std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' ').c_str());
+                        stream->write_function(stream, "| * %-62s |\n" , dspAcfg.FwVersion);
+                        stream->write_function(stream, "| * %-62s |\n" , dspBcfg.FwVersion);
+
+                    }
+
+                    break;
+                }
+
+                /* analog boards */
+                case kdtFXO:
+                case kdtFXOVoIP:
+                {
+                    K3L_FXO80_FW_CONFIG dspCfg;
+
+                    if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess)
+                    {
+                        stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n"
+                                    , i , "KFXO80" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount
+                                    , std::string(26 - 6, ' ').c_str());
+                        stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n"
+                                    , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
+                                    , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str());
+                        stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion);
+                    }
+
+                }
+
+                case kdtGSM:
+                case kdtGSMSpx:
+                {
+                    K3L_GSM40_FW_CONFIG dspCfg;
+
+                    if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess)
+                    {
+                        stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n"
+                            , i , "KGSM" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount
+                            , std::string(26 - 4, ' ').c_str());
+
+                        stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n"
+                                    , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
+                                    , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str());
+
+                        stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion);
+                    }
+
+                    break;
+                }
+                default:
+                    stream->write_function(stream, "| [[ %02d ]] Unknown type '%02d'! Please contact Khomp support for help! |\n"
+                        , i , k3l->device_type(i));
+                    break;
+            }
+        }
+
+        stream->write_function(stream, " ------------------------------------------------------------------\n");
+
+	} else {
+		stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX);
+	}
+
+done:
+	switch_safe_free(myarg);
+	return status;
+
+}
+
 /* For Emacs:
  * Local Variables:
  * mode:c


From jmesquita at freeswitch.org  Thu Jun 11 09:10:52 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 11:10:52 -0500
Subject: [Freeswitch-svn] [commit] r13757 - in
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons:
	. include
Message-ID: 

Author: jmesquita
Date: Thu Jun 11 11:10:52 2009
New Revision: 13757

Log:
Forgot to add a few things b4 commit

Added:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp	Thu Jun 11 11:10:52 2009
@@ -0,0 +1,201 @@
+#include 
+
+#include 
+
+#ifndef KHOMP_COMMONS_WITH_CHANNEL
+# include 
+#endif
+
+#ifdef __GNUC_PREREQ
+#if __GNUC_PREREQ(4,3)
+#include 
+#endif
+#endif
+
+#ifndef INCLUDED_K3LAPI_HPP
+#define INCLUDED_K3LAPI_HPP
+
+struct K3LAPI
+{
+	/* exceptions */
+
+	struct start_failed
+	{
+		start_failed(const char * _msg) : msg(_msg) {};
+		std::string msg;
+	};
+	
+	struct failed_command
+	{
+		failed_command(int32 _code, unsigned int _dev, unsigned int _obj, int32 _rc)
+		: code(_code), dev(_dev), obj(_obj), rc(_rc) {};
+		
+		int32         code;
+		unsigned int  dev;
+		unsigned int  obj;
+		int32         rc;
+	};
+
+	struct failed_raw_command
+	{
+		failed_raw_command(unsigned int _dev, unsigned int _dsp, int32 _rc)
+		: dev(_dev), dsp(_dsp), rc(_rc) {};
+		
+		unsigned int  dev;
+		unsigned int  dsp;
+		int32         rc;
+	};
+
+	struct invalid_device
+	{
+		invalid_device(unsigned int _device)
+		: device(_device) {};
+		
+		unsigned int device;
+	};
+
+	struct invalid_channel
+	{
+		invalid_channel(unsigned int _device, unsigned int _channel)
+		: device(_device), channel(_channel) {};
+
+		unsigned int device, channel;
+	};
+
+	struct invalid_link
+	{
+		invalid_link(unsigned int _device, unsigned int _link)
+		: device(_device), link(_link) {};
+
+		unsigned int device, link;
+	};
+
+	struct get_param_failed
+	{
+		get_param_failed(std::string _name, int32 _rc)
+		: name(_name), rc((KLibraryStatus)_rc) {};
+
+		std::string name;
+		KLibraryStatus rc;
+	};
+	
+	typedef K3L_DEVICE_CONFIG          device_conf_type;
+	typedef K3L_CHANNEL_CONFIG        channel_conf_type;
+	typedef K3L_CHANNEL_CONFIG *  channel_ptr_conf_type;
+	typedef K3L_LINK_CONFIG              link_conf_type;
+	typedef K3L_LINK_CONFIG *        link_ptr_conf_type;
+
+	/* constructors/destructors */
+	
+	K3LAPI();
+	~K3LAPI();
+
+	/* (init|final)ialize the whole thing! */
+	
+	void start(void);
+	void stop(void);
+
+	/* verificacao de intervalos */
+	
+	inline bool valid_device( unsigned int dev )
+	{
+    	return (dev < _device_count);
+	}
+
+	inline bool valid_channel( unsigned int dev, unsigned int obj )
+	{
+	    return (valid_device(dev) && obj < _channel_count[dev]);
+	}
+
+	inline bool valid_link( unsigned int dev, unsigned int obj )
+	{
+	    return (valid_device(dev) && obj < _link_count[dev]);
+	}
+
+	/* envio de comandos para placa */
+	
+	void mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index);
+	void mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index);
+	void command (int32 dev, int32 obj, int32 code, std::string & str);
+	void command (int32 dev, int32 obj, int32 code, const char * parms = NULL);
+	void raw_command(int32 dev, int32 dsp, std::string & str);
+	void raw_command(int32 dev, int32 dsp, const char * cmds, int32 size);
+
+	/* obter dados 'cacheados' */
+	
+	inline unsigned int device_count(void)
+	{
+		return _device_count;
+	}
+
+	inline unsigned int channel_count(unsigned int dev)
+	{
+		if (!valid_device(dev))
+			throw invalid_device(dev);
+
+		return _channel_count[dev];
+	}
+
+	inline unsigned int link_count(unsigned int dev)
+	{
+		if (!valid_device(dev))
+			throw invalid_device(dev);
+
+		return _link_count[dev];
+	}
+
+	KDeviceType device_type(unsigned int dev)
+	{
+		if (!valid_device(dev))
+			throw invalid_device(dev);
+		
+		return _device_type[dev];
+	}
+	
+
+	K3L_DEVICE_CONFIG & device_config(unsigned int dev)
+	{
+		if (!valid_device(dev))
+			throw invalid_device(dev);
+
+		return _device_config[dev];
+	}
+
+	K3L_CHANNEL_CONFIG & channel_config(unsigned int dev, unsigned int obj)
+	{
+		if (!valid_channel(dev, obj))
+			throw invalid_channel(dev, obj);
+
+		return _channel_config[dev][obj];
+	}
+
+	K3L_LINK_CONFIG & link_config(unsigned int dev, unsigned int obj)
+	{
+		if (!valid_channel(dev, obj))
+			throw invalid_channel(dev, obj);
+
+		return _link_config[dev][obj];
+	}
+
+	/* pega valores em strings de eventos */
+
+	KLibraryStatus get_param(K3L_EVENT *ev, const char *name, std::string &res);
+	std::string get_param(K3L_EVENT *ev, const char *name);
+
+	/* inicializa valores em cache */
+
+	void init(void);
+
+ protected:
+
+	unsigned int           _device_count;
+	unsigned int *        _channel_count;
+	unsigned int *           _link_count;
+	
+	     device_conf_type *   _device_config;
+	channel_ptr_conf_type *  _channel_config;
+	   link_ptr_conf_type *     _link_config;
+	          KDeviceType *     _device_type;
+};
+
+#endif /* INCLUDED_K3LAPI_HPP */

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp	Thu Jun 11 11:10:52 2009
@@ -0,0 +1,171 @@
+#include 
+
+K3LAPI::K3LAPI()
+: _device_count(0),  _channel_count(0),  _link_count(0),
+  _device_config(0), _channel_config(0), _link_config(0)
+{}
+
+K3LAPI::~K3LAPI()
+{
+	_device_count = 0;
+		
+	if (_device_type)    { delete[] _device_type;       _device_type = NULL; }
+	if (_device_config)  { delete[] _device_config;   _device_config = NULL; }
+	if (_channel_config) { delete[] _channel_config; _channel_config = NULL; }
+	if (_link_config)    { delete[] _link_config;       _link_config = NULL; }
+	if (_channel_count)  { delete[] _channel_count;   _channel_count = NULL; }
+	if (_link_count)     { delete[] _link_count;         _link_count = NULL; }
+}
+
+/* initialize the whole thing! */
+	
+void K3LAPI::start(void)
+{
+	/* tie the used k3l to the compiled k3l version */
+	char *ret = k3lStart(k3lApiMajorVersion, k3lApiMinorVersion, 0); //k3lApiBuildVersion);
+	
+	if (ret && *ret)
+		throw start_failed(ret);
+			
+	/* call init automagically */
+	init();
+}
+
+void K3LAPI::stop(void)
+{
+	k3lStop();
+}
+
+/* envio de comandos para placa */
+	
+void K3LAPI::mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index)
+{
+   	KMixerCommand mix;
+
+    mix.Track = track;
+   	mix.Source = src;
+    mix.SourceIndex = index;
+
+   	command(dev, obj, CM_MIXER, (const char *) &mix);
+}
+
+void K3LAPI::mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index)
+{
+   	KMixerCommand mix;
+
+    mix.Track = track;
+   	mix.Source = src;
+    mix.SourceIndex = index;
+
+   	command(dev, obj, CM_MIXER_CTBUS, (const char *) &mix);
+}
+
+void K3LAPI::command(int32 dev, int32 obj, int32 code, std::string & str)
+{
+	command(dev, obj, code, str.c_str());
+}
+
+void K3LAPI::command (int32 dev, int32 obj, int32 code, const char * parms)
+{
+    K3L_COMMAND cmd;
+
+   	cmd.Cmd = code;
+    cmd.Object = obj;
+   	cmd.Params = (byte *)parms;
+
+	int32 rc = k3lSendCommand(dev, &cmd);
+		
+	if (rc != ksSuccess)
+		throw failed_command(code, dev, obj, rc);
+}
+
+void K3LAPI::raw_command(int32 dev, int32 dsp, std::string & str)
+{
+	raw_command(dev, dsp, str.data(), str.size());
+}
+
+void K3LAPI::raw_command(int32 dev, int32 dsp, const char * cmds, int32 size)
+{
+    std::string str(cmds, size);
+
+	int32 rc = k3lSendRawCommand(dev, dsp, (void *)cmds, size);
+
+	if (rc != ksSuccess)
+		throw failed_raw_command(dev, dsp, rc);
+}
+
+KLibraryStatus K3LAPI::get_param(K3L_EVENT *ev, const char *name, std::string &res)
+{
+	char tmp_param[256];
+	memset((void*)tmp_param, 0, sizeof(tmp_param));
+
+	int32 rc = k3lGetEventParam (ev, (sbyte *)name, (sbyte *)tmp_param, sizeof(tmp_param)-1);
+		
+	if (rc != ksSuccess)
+		return (KLibraryStatus)rc;
+
+	res.append(tmp_param, strlen(tmp_param));
+	return ksSuccess;
+}
+	
+std::string K3LAPI::get_param(K3L_EVENT *ev, const char *name)
+{
+	std::string res;
+
+	KLibraryStatus rc = get_param(ev, name, res);
+
+	if (rc != ksSuccess)
+		throw get_param_failed(name, rc);
+			
+	return res;
+}
+
+void K3LAPI::init(void)
+{
+	if (_device_count != 0) return;
+
+	_device_count = k3lGetDeviceCount();
+
+	_device_type	= new KDeviceType[_device_count];
+	_device_config  = new device_conf_type[_device_count];
+	_channel_config = new channel_ptr_conf_type[_device_count];
+	_link_config    = new link_ptr_conf_type[_device_count];
+	_channel_count	= new unsigned int[_device_count];
+	_link_count		= new unsigned int[_device_count];
+		
+	for (unsigned int dev = 0; dev < _device_count; dev++)
+	{
+		_device_type[dev] = (KDeviceType) k3lGetDeviceType(dev);
+			
+		/* caches each device config */
+		if (k3lGetDeviceConfig(dev, ksoDevice + dev, &(_device_config[dev]), sizeof(_device_config[dev])) != ksSuccess)
+			throw start_failed("k3lGetDeviceConfig(device)");
+
+		/* adjust channel/link count for device */
+		_channel_count[dev] = _device_config[dev].ChannelCount;
+		_link_count[dev] = _device_config[dev].LinkCount;
+			
+		/* caches each channel config */
+		_channel_config[dev] = new channel_conf_type[_channel_count[dev]];
+
+		for (unsigned int obj = 0; obj < _channel_count[dev]; obj++)
+		{
+			if (k3lGetDeviceConfig(dev, ksoChannel + obj, &(_channel_config[dev][obj]), 
+									sizeof(_channel_config[dev][obj])) != ksSuccess)
+				throw start_failed("k3lGetDeviceConfig(channel)");
+		}
+
+		/* adjust link count for device */
+		_link_count[dev] = _device_config[dev].LinkCount;
+			
+		/* caches each link config */
+		_link_config[dev] = new link_conf_type[_link_count[dev]];
+
+		for (unsigned int obj = 0; obj < _link_count[dev]; obj++)
+		{
+			if (k3lGetDeviceConfig(dev, ksoLink + obj, &(_link_config[dev][obj]), 
+									sizeof(_link_config[dev][obj])) != ksSuccess)
+				throw start_failed("k3lGetDeviceConfig(link)");
+		}
+	}
+}


From jmesquita at freeswitch.org  Thu Jun 11 09:38:51 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 11:38:51 -0500
Subject: [Freeswitch-svn] [commit] r13758 -
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
Message-ID: 

Author: jmesquita
Date: Thu Jun 11 11:38:51 2009
New Revision: 13758

Log:
Make API more sane, since we are going to display lots of other things.

Modified:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Thu Jun 11 11:38:51 2009
@@ -30,7 +30,7 @@
  *
  */
 
-#define KHOMP_SYNTAX "khomp [status]"
+#define KHOMP_SYNTAX "khomp [show]"
 
 /* Our includes */
 #include "k3lapi.hpp"
@@ -123,6 +123,9 @@
 static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
 static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
 
+/* My function prototypes */
+static void printBoardsInfo(switch_stream_handle_t*);
+
 
 
 static void tech_init(private_t *tech_pvt, switch_core_session_t *session)
@@ -642,116 +645,122 @@
 		goto done;
 	}
 
-	if (argv[0] && !strncasecmp(argv[0], "status", 6)) {
-        K3L_API_CONFIG apiCfg;
+	if (argv[0] && !strncasecmp(argv[0], "show", 6)) {
+        printBoardsInfo(stream);
 
-        stream->write_function(stream," ------------------------------------------------------------------\n");
-        stream->write_function(stream, "|---------------------- Khomp System Summary ----------------------|\n");
-        stream->write_function(stream, "|------------------------------------------------------------------|\n");
+	} else {
+		stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX);
+	}
 
-        if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess)
-        {
-            stream->write_function(stream, "| K3L API %d.%d.%d [m.VPD %d] - %-38s |\n"
-                         , apiCfg.MajorVersion , apiCfg.MinorVersion , apiCfg.BuildVersion
-                         , apiCfg.VpdVersionNeeded , apiCfg.StrVersion);
-        }
+done:
+	switch_safe_free(myarg);
+	return status;
 
-        for (unsigned int i = 0; i < k3l->device_count(); i++)
-        {
-            K3L_DEVICE_CONFIG & devCfg = k3l->device_config(i);
+}
 
-            stream->write_function(stream, " ------------------------------------------------------------------\n");
+static void printBoardsInfo(switch_stream_handle_t* stream) {
 
-            switch (k3l->device_type(i))
-            {
-                /* E1 boards */
-                case kdtE1:
-                case kdtConf:
-                case kdtPR:
-                case kdtE1GW:
-                case kdtE1IP:
-                case kdtE1Spx:
-                case kdtGWIP:
-                case kdtFXS:
-                case kdtFXSSpx:
-                {
-                    K3L_E1600A_FW_CONFIG dspAcfg;
-                    K3L_E1600B_FW_CONFIG dspBcfg;
+    K3L_API_CONFIG apiCfg;
 
-                    if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) &&
-                        (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess))
-                    {
-                        stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels, %d links.|\n"
-                                    , i , "E1" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount , devCfg.LinkCount);
-                        stream->write_function(stream, "| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|\n"
-                                    , dspAcfg.DspVersion , dspBcfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
-                                    , std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' ').c_str());
-                        stream->write_function(stream, "| * %-62s |\n" , dspAcfg.FwVersion);
-                        stream->write_function(stream, "| * %-62s |\n" , dspBcfg.FwVersion);
+    stream->write_function(stream," ------------------------------------------------------------------\n");
+    stream->write_function(stream, "|---------------------- Khomp System Summary ----------------------|\n");
+    stream->write_function(stream, "|------------------------------------------------------------------|\n");
+
+    if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess)
+    {
+        stream->write_function(stream, "| K3L API %d.%d.%d [m.VPD %d] - %-38s |\n"
+                     , apiCfg.MajorVersion , apiCfg.MinorVersion , apiCfg.BuildVersion
+                     , apiCfg.VpdVersionNeeded , apiCfg.StrVersion);
+    }
 
-                    }
+    for (unsigned int i = 0; i < k3l->device_count(); i++)
+    {
+        K3L_DEVICE_CONFIG & devCfg = k3l->device_config(i);
 
-                    break;
-                }
+        stream->write_function(stream, " ------------------------------------------------------------------\n");
 
-                /* analog boards */
-                case kdtFXO:
-                case kdtFXOVoIP:
-                {
-                    K3L_FXO80_FW_CONFIG dspCfg;
+        switch (k3l->device_type(i))
+        {
+            /* E1 boards */
+            case kdtE1:
+            case kdtConf:
+            case kdtPR:
+            case kdtE1GW:
+            case kdtE1IP:
+            case kdtE1Spx:
+            case kdtGWIP:
+            case kdtFXS:
+            case kdtFXSSpx:
+            {
+                K3L_E1600A_FW_CONFIG dspAcfg;
+                K3L_E1600B_FW_CONFIG dspBcfg;
 
-                    if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess)
-                    {
-                        stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n"
-                                    , i , "KFXO80" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount
-                                    , std::string(26 - 6, ' ').c_str());
-                        stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n"
-                                    , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
-                                    , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str());
-                        stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion);
-                    }
+                if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) &&
+                    (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess))
+                {
+                    stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels, %d links.|\n"
+                                , i , "E1" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount , devCfg.LinkCount);
+                    stream->write_function(stream, "| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|\n"
+                                , dspAcfg.DspVersion , dspBcfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
+                                , std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' ').c_str());
+                    stream->write_function(stream, "| * %-62s |\n" , dspAcfg.FwVersion);
+                    stream->write_function(stream, "| * %-62s |\n" , dspBcfg.FwVersion);
 
                 }
 
-                case kdtGSM:
-                case kdtGSMSpx:
-                {
-                    K3L_GSM40_FW_CONFIG dspCfg;
-
-                    if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess)
-                    {
-                        stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n"
-                            , i , "KGSM" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount
-                            , std::string(26 - 4, ' ').c_str());
-
-                        stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n"
-                                    , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
-                                    , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str());
+                break;
+            }
 
-                        stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion);
-                    }
+            /* analog boards */
+            case kdtFXO:
+            case kdtFXOVoIP:
+            {
+                K3L_FXO80_FW_CONFIG dspCfg;
 
-                    break;
+                if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess)
+                {
+                    stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n"
+                                , i , "KFXO80" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount
+                                , std::string(26 - 6, ' ').c_str());
+                    stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n"
+                                , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
+                                , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str());
+                    stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion);
                 }
-                default:
-                    stream->write_function(stream, "| [[ %02d ]] Unknown type '%02d'! Please contact Khomp support for help! |\n"
-                        , i , k3l->device_type(i));
-                    break;
+
             }
-        }
 
-        stream->write_function(stream, " ------------------------------------------------------------------\n");
+            case kdtGSM:
+            case kdtGSMSpx:
+            {
+                K3L_GSM40_FW_CONFIG dspCfg;
 
-	} else {
-		stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX);
-	}
+                if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess)
+                {
+                    stream->write_function(stream, "| [[ %02d ]] %s, serial '%04d', %02d channels. %s|\n"
+                        , i , "KGSM" , atoi(devCfg.SerialNumber) , devCfg.ChannelCount
+                        , std::string(26 - 4, ' ').c_str());
+
+                    stream->write_function(stream, "| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|\n"
+                                , dspCfg.DspVersion , devCfg.PciBus , devCfg.PciSlot
+                                , std::string(30 - strlen(dspCfg.DspVersion), ' ').c_str());
 
-done:
-	switch_safe_free(myarg);
-	return status;
+                    stream->write_function(stream, "| * %-62s |\n" , dspCfg.FwVersion);
+                }
 
+                break;
+            }
+            default:
+                stream->write_function(stream, "| [[ %02d ]] Unknown type '%02d'! Please contact Khomp support for help! |\n"
+                    , i , k3l->device_type(i));
+                break;
+        }
+    }
+
+    stream->write_function(stream, " ------------------------------------------------------------------\n");
 }
 
+
 /* For Emacs:
  * Local Variables:
  * mode:c


From anthm at freeswitch.org  Thu Jun 11 10:17:53 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 12:17:53 -0500
Subject: [Freeswitch-svn] [commit] r13759 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: anthm
Date: Thu Jun 11 12:17:52 2009
New Revision: 13759

Log:
increase compat on NDLB-to-in-200-contact to handle NAT

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Thu Jun 11 12:17:52 2009
@@ -4758,7 +4758,8 @@
 		url_set_chanvars(session, sip->sip_to->a_url, sip_to);
 		if (switch_channel_get_variable(channel, "sip_to_uri")) {
 			const char *ipv6;
-
+			const char *url = NULL;
+			
 			host = switch_channel_get_variable(channel, "sip_to_host");
 			user = switch_channel_get_variable(channel, "sip_to_user");
 
@@ -4783,37 +4784,33 @@
 					port,
 					sofia_glue_transport2str(transport));
 
-			if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) {
-				if (strchr(tech_pvt->to_uri, '>')) {
-					tech_pvt->reply_contact = tech_pvt->to_uri;
-				} else {
-					tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s>", tech_pvt->to_uri);
+			if (sofia_glue_check_nat(profile, tech_pvt->remote_ip)) {
+				url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_public_url : profile->public_url;
+			} else { 
+				url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url;
+			}			
+			
+			if ((profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) || sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) {
+				char *at;
+				char *tmp = sofia_overcome_sip_uri_weakness(session, url, transport, SWITCH_TRUE, NULL);
+				if ((at = strchr(tmp, '@'))) {
+					url = switch_core_session_sprintf(session, "sip:%s%s", user, at);
 				}
-			} else {
-				if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) {
-					tech_pvt->reply_contact = switch_core_session_sprintf(session, "", user, host);
+			}
+
+
+			if (url) {
+				if (strchr(url, '>')) {
+					tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url,
+																		  sofia_glue_transport2str(transport));
 				} else {
-					const char *url = NULL;
-					
-					if (sofia_glue_check_nat(profile, tech_pvt->remote_ip)) {
-						url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_public_url : profile->public_url;
-					} else { 
-						url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url;
-					}			
-
-					if (url) {
-						if (strchr(url, '>')) {
-							tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url,
-																				  sofia_glue_transport2str(transport));
-						} else {
-							tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url,
-																				  sofia_glue_transport2str(transport));
-						}
-					} else {
-						switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-					}
+					tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url,
+																		  sofia_glue_transport2str(transport));
 				}
+			} else {
+				switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 			}
+			
 		} else {
 			const char *url = NULL;
 			if (sofia_glue_check_nat(profile, tech_pvt->remote_ip)) {


From mikej at freeswitch.org  Thu Jun 11 10:21:52 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 12:21:52 -0500
Subject: [Freeswitch-svn] [commit] r13760 - freeswitch/trunk/libs/portaudio
Message-ID: 

Author: mikej
Date: Thu Jun 11 12:21:52 2009
New Revision: 13760

Log:
fix braindead portaudio trying to build with -shared when we specified --disable-shared

Modified:
   freeswitch/trunk/libs/portaudio/Makefile.in

Modified: freeswitch/trunk/libs/portaudio/Makefile.in
==============================================================================
--- freeswitch/trunk/libs/portaudio/Makefile.in	(original)
+++ freeswitch/trunk/libs/portaudio/Makefile.in	Thu Jun 11 12:21:52 2009
@@ -40,7 +40,9 @@
 PALIB = libportaudio.la
 PAINC = include/portaudio.h
 
-PA_LDFLAGS = $(LDFLAGS) $(SHARED_FLAGS) -rpath $(libdir) -no-undefined -export-symbols-regex "(Pa|PaMacCore)_.*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+PA_LDFLAGS = $(LDFLAGS) -rpath $(libdir) -no-undefined -export-symbols-regex "(Pa|PaMacCore)_.*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+# we are building disable-shared but its still inserting flags for shared libs???
+# $(SHARED_FLAGS)
 #MAKEFILE = Makefile
 
 COMMON_OBJS = \


From mikej at freeswitch.org  Thu Jun 11 10:34:27 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 12:34:27 -0500
Subject: [Freeswitch-svn] [commit] r13761 - in freeswitch/trunk/libs:
	libnatpmp miniupnpc
Message-ID: 

Author: mikej
Date: Thu Jun 11 12:34:27 2009
New Revision: 13761

Log:
fix braindead SLES 10 core build (FSBUILD-173)

Modified:
   freeswitch/trunk/libs/libnatpmp/natpmp.c
   freeswitch/trunk/libs/miniupnpc/miniupnpc.c

Modified: freeswitch/trunk/libs/libnatpmp/natpmp.c
==============================================================================
--- freeswitch/trunk/libs/libnatpmp/natpmp.c	(original)
+++ freeswitch/trunk/libs/libnatpmp/natpmp.c	Thu Jun 11 12:34:27 2009
@@ -14,6 +14,9 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+#ifdef __linux__
+#define _BSD_SOURCE 1
+#endif
 #include 
 #include 
 #ifndef _MSC_VER

Modified: freeswitch/trunk/libs/miniupnpc/miniupnpc.c
==============================================================================
--- freeswitch/trunk/libs/miniupnpc/miniupnpc.c	(original)
+++ freeswitch/trunk/libs/miniupnpc/miniupnpc.c	Thu Jun 11 12:34:27 2009
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #define closesocket close
 #endif
 #include "miniupnpc.h"


From intralanman at freeswitch.org  Thu Jun 11 11:04:17 2009
From: intralanman at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 13:04:17 -0500
Subject: [Freeswitch-svn] [commit] r13762 - freeswitch/trunk/libs/esl/php
Message-ID: 

Author: intralanman
Date: Thu Jun 11 13:04:17 2009
New Revision: 13762

Log:
fix php dependencies that aren't package dependencies but maybe should be

Modified:
   freeswitch/trunk/libs/esl/php/Makefile

Modified: freeswitch/trunk/libs/esl/php/Makefile
==============================================================================
--- freeswitch/trunk/libs/esl/php/Makefile	(original)
+++ freeswitch/trunk/libs/esl/php/Makefile	Thu Jun 11 13:04:17 2009
@@ -1,6 +1,6 @@
 LOCAL_CFLAGS=$(shell php-config --includes)
 PHP_LDFLAGS=$(shell php-config --ldflags)
-PHP_LIBS=$(shell php-config --libs)
+PHP_LIBS=$(shell php-config --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err)//g')
 LOCAL_LDFLAGS=$(PHP_LDFLAGS) $(PHP_LIBS)
 WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function
 


From intralanman at freeswitch.org  Thu Jun 11 14:20:42 2009
From: intralanman at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 16:20:42 -0500
Subject: [Freeswitch-svn] [commit] r13763 -
	freeswitch/trunk/src/mod/applications/mod_lcr
Message-ID: 

Author: intralanman
Date: Thu Jun 11 16:20:42 2009
New Revision: 13763

Log:
remove pre_order stuff which was an "abortive attempt to avoid custom sql" :-)

Modified:
   freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c

Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	Thu Jun 11 16:20:42 2009
@@ -125,7 +125,6 @@
 	char *name;
 	uint16_t id;
 	char *order_by;
-	char *pre_order;
 	char *custom_sql;
 	switch_bool_t custom_sql_has_percent;
 	switch_bool_t custom_sql_has_vars;
@@ -788,7 +787,6 @@
 			char *name = (char *) switch_xml_attr_soft(x_profile, "name");
 			char *comma = ", ";
 			switch_stream_handle_t order_by = { 0 };
-			switch_stream_handle_t pre_order = { 0 };
 			switch_stream_handle_t *thisorder = NULL;
 			char *reorder_by_rate = NULL;
 			char *quote_in_list = NULL;
@@ -799,7 +797,6 @@
 			char *argv[4] = { 0 };
 			
 			SWITCH_STANDARD_STREAM(order_by);
-			SWITCH_STANDARD_STREAM(pre_order);
 
 			for (param = switch_xml_child(x_profile, "param"); param; param = param->next) {
 				char *var, *val;
@@ -807,13 +804,8 @@
 				var = (char *) switch_xml_attr_soft(param, "name");
 				val = (char *) switch_xml_attr_soft(param, "value");
 				
-				if ((!strcasecmp(var, "order_by") || !strcasecmp(var, "pre_order"))  && !switch_strlen_zero(val)) {
-					if (!strcasecmp(var, "order_by")) {
-						thisorder = &order_by;
-					} else if (!strcasecmp(var, "pre_order")) {
-						thisorder = &pre_order;
-						comma = ""; /* don't want leading comma */
-					}
+				if (!strcasecmp(var, "order_by")  && !switch_strlen_zero(val)) {
+					thisorder = &order_by;
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param val is %s\n", val);
 					if ((argc = switch_separate_string(val, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {
 						for (x=0; xorder_by = ", rate";
 				}
-				if (!switch_strlen_zero((char *)pre_order.data)) {
-					profile->pre_order = switch_core_strdup(globals.pool, (char *)pre_order.data);
-				} else {
-					/* default to rate */
-					profile->pre_order = "";
-				}
 
 				if (!switch_strlen_zero(id_s)) {
 					profile->id = (uint16_t)atoi(id_s);
@@ -901,9 +887,7 @@
 					if (profile->id > 0) {
 						sql_stream.write_function(&sql_stream, "AND lcr_profile=%d ", profile->id);
 					}
-					sql_stream.write_function(&sql_stream, "ORDER BY %s%s digits DESC%s", 
-															profile->pre_order,
-															switch_strlen_zero(profile->pre_order)? "" : ",",
+					sql_stream.write_function(&sql_stream, "ORDER BY digits DESC%s", 
 															profile->order_by);
 					if (db_random) {
 						sql_stream.write_function(&sql_stream, ", %s", db_random);
@@ -948,7 +932,6 @@
 				
 			}
 			switch_safe_free(order_by.data);
-			switch_safe_free(pre_order.data);
 			switch_safe_free(sql_stream.data);
 		}
 	} else {
@@ -961,7 +944,6 @@
 		memset(profile, 0, sizeof(profile_t));
 		profile->name = "global_default";
 		profile->order_by = ", rate";
-		profile->pre_order = "";
 		globals.default_profile = profile;
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Setting system defined default profile.");
 	}
@@ -1309,9 +1291,6 @@
 				if (switch_strlen_zero(profile->custom_sql)) {
 					stream->write_function(stream, " ID:\t\t%d\n", profile->id);
 					stream->write_function(stream, " order by:\t%s\n", profile->order_by);
-					if (!switch_strlen_zero(profile->pre_order)) {
-						stream->write_function(stream, " pre_order:\t%s\n", profile->pre_order);
-					}
 				} else {
 					stream->write_function(stream, " custom sql:\t%s\n", profile->custom_sql);
 					stream->write_function(stream, " has %%:\t\t%s\n", profile->custom_sql_has_percent ? "true" : "false");


From andrew at freeswitch.org  Thu Jun 11 15:29:37 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 17:29:37 -0500
Subject: [Freeswitch-svn] [commit] r13764 -
	freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
Message-ID: 

Author: andrew
Date: Thu Jun 11 17:29:37 2009
New Revision: 13764

Log:
Add sorta working win32 support

Added:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj
Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/   (props changed)
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c	Thu Jun 11 17:29:37 2009
@@ -143,9 +143,9 @@
 /* function to spawn a process on a remote node */
 int ei_spawn(struct ei_cnode_s *ec, int sockfd, erlang_ref *ref, char *module, char *function, int argc, char **argv)
 {
+	int i;
 	ei_x_buff buf;
 	ei_x_new_with_version(&buf);
-	int i;
 
 	ei_x_encode_tuple_header(&buf, 3);
 	ei_x_encode_atom(&buf, "$gen_call");
@@ -323,7 +323,7 @@
 	memset(&server_addr, 0, sizeof(server_addr));
 	
 	/* convert the configured IP to network byte order, handing errors */
-	rv = inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr);
+	rv = switch_inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr);
 	if (rv == 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not parse invalid ip address: %s\n", prefs.ip);
 		return SWITCH_STATUS_FALSE;
@@ -336,7 +336,11 @@
 	server_addr.sin_family = AF_INET;
 	server_addr.sin_port = htons(prefs.port);
 	
-	 if ((nodehost = gethostbyaddr(&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET)))
+#ifdef WIN32
+	 if ((nodehost = gethostbyaddr((const char*)&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET)))
+#else
+	if ((nodehost = gethostbyaddr((const char*)&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET)))
+#endif
 		memcpy(thishostname, nodehost->h_name, EI_MAXHOSTNAMELEN);
 	
 	if (switch_strlen_zero_buf(thishostname)) {

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c	Thu Jun 11 17:29:37 2009
@@ -79,10 +79,11 @@
 		switch_event_t *event;
 
 		if (switch_event_create(&event, SWITCH_EVENT_BACKGROUND_JOB) == SWITCH_STATUS_SUCCESS) {
+			ei_x_buff ebuf;
+
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Job-UUID", acs->uuid_str);
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Job-Command", acs->api_cmd);
 
-			ei_x_buff ebuf;
 			ei_x_new_with_version(&ebuf);
 
 			if (acs->arg) {
@@ -250,20 +251,22 @@
 	else {
 		int custom = 0;
 		switch_event_types_t type;
+		int i = 0;
 		
 		if (!switch_test_flag(listener, LFLAG_EVENTS)) {
 			switch_set_flag_locked(listener, LFLAG_EVENTS);
 		}
 		
-		for (int i = 1; i < arity; i++) {
+		for (i = 1; i < arity; i++) {
 			if (!ei_decode_atom(buf->buff, &buf->index, atom)) {
 				
 				if (custom) {
 					switch_core_hash_insert(listener->event_hash, atom, MARKER);
 				} else if (switch_name_event(atom, &type) == SWITCH_STATUS_SUCCESS) {
 					if (type == SWITCH_EVENT_ALL) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ALL events enabled\n");
 						uint32_t x = 0;
+
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ALL events enabled\n");
 						for (x = 0; x < SWITCH_EVENT_ALL; x++) {
 							listener->event_list[x] = 1;
 						}
@@ -295,9 +298,10 @@
 	}
 	else {
 		int custom = 0;
+		int i = 0;
 		switch_event_types_t type;
 		
-		for (int i = 1; i < arity; i++) {
+		for (i = 1; i < arity; i++) {
 			if (!ei_decode_atom(buf->buff, &buf->index, atom)) {
 				
 				if (custom) {

Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj	Thu Jun 11 17:29:37 2009
@@ -0,0 +1,299 @@
+
+
+	
+		
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	Thu Jun 11 17:29:37 2009
@@ -240,14 +240,19 @@
 }
 
 
+#ifdef WIN32
+static void close_socket(SOCKET *sock)
+#else
 static void close_socket(int *sock)
+#endif
 {
 	switch_mutex_lock(listen_list.sock_mutex);
 	if (*sock) {
-		shutdown(*sock, SHUT_RDWR);
 #ifdef WIN32
+		shutdown(*sock, SD_BOTH);
 		closesocket(*sock);
 #else
+		shutdown(*sock, SHUT_RDWR);
 		close(*sock);
 #endif
 		sock = NULL;
@@ -357,21 +362,22 @@
 static switch_xml_t erlang_fetch(const char *sectionstr, const char *tag_name, const char *key_name, const char *key_value,
 								switch_event_t *params, void *user_data)
 {
-	switch_xml_t xml = NULL;
-	struct erlang_binding *ptr;
-	switch_uuid_t uuid;
 	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1];
 	int type, size;
 	int i = 0;
 	void *p = NULL;
 	char *xmlstr;
+	struct erlang_binding *ptr;
+	switch_uuid_t uuid;
+	switch_xml_section_t section;
+	switch_xml_t xml = NULL;
 	ei_x_buff *rep;
 	ei_x_buff buf;
 	ei_x_new_with_version(&buf);
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "looking for bindings\n");
 
-	switch_xml_section_t section = switch_xml_parse_section_string((char *) sectionstr);
+	section = switch_xml_parse_section_string((char *) sectionstr);
 
 	for (ptr = bindings.head; ptr && ptr->section != section; ptr = ptr->next); /* just get the first match */
 
@@ -459,6 +465,7 @@
 	switch_core_session_t *session;
 	switch_event_t *call_event=NULL;
 	switch_channel_t *channel=NULL;
+	ei_x_buff lbuf;
 
 	/* Send a message to the associated registered process to let it know there is a call.
 	   Message is a tuple of the form {call, }
@@ -480,7 +487,6 @@
 	switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Content-Type", "command/reply");
 	switch_event_add_header_string(call_event, SWITCH_STACK_BOTTOM, "Reply-Text", "+OK\n");
 	
-	ei_x_buff lbuf;
 	ei_x_new_with_version(&lbuf);
 	ei_x_encode_tuple_header(&lbuf, 2);
 	ei_x_encode_atom(&lbuf, "call");
@@ -709,11 +715,10 @@
 
 	while ((status >= 0 || erl_errno == ETIMEDOUT || erl_errno == EAGAIN) && !prefs.done) {
 		erlang_msg msg;
-
 		ei_x_buff buf;
-		ei_x_new(&buf);
-
 		ei_x_buff rbuf;
+		
+		ei_x_new(&buf);
 		ei_x_new_with_version(&rbuf);
 
 		/* do we need the mutex when reading? */
@@ -1464,7 +1469,7 @@
 	memset(&server_addr, 0, sizeof(server_addr));
 
 	/* convert the configured IP to network byte order, handing errors */
-	rv = inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr);
+	rv = switch_inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr);
 	if (rv == 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not parse invalid ip address: %s\n", prefs.ip);
 		goto init_failed;
@@ -1485,7 +1490,11 @@
 			goto sock_fail;
 		}
 
+#ifdef WIN32
+		if (setsockopt(listen_list.sockfd, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on))) {
+#else
 		if (setsockopt(listen_list.sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on))) {
+#endif
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to enable SO_REUSEADDR for socket on %s:%u : %s\n", prefs.ip, prefs.port, strerror(errno));
 			goto sock_fail;
 		}
@@ -1500,7 +1509,7 @@
 			goto sock_fail;
 		}
 
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket up listening on %s:%u\n", prefs.ip, prefs.port);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket %d up listening on %s:%u\n", listen_list.sockfd, prefs.ip, prefs.port);
 		break;
 	  sock_fail:
 		switch_yield(100000);
@@ -1538,13 +1547,18 @@
 #else
 		errno = 0;
 #endif
-		if ((clientfd = ei_accept_tmo(&ec, listen_list.sockfd, &conn, 100)) == ERL_ERROR) {
+		if ((clientfd = ei_accept_tmo(&ec, (int)listen_list.sockfd, &conn, 100)) == ERL_ERROR) {
 			if (prefs.done) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Shutting Down\n");
 			} else if (erl_errno == ETIMEDOUT) {
 				continue;
+#ifdef WIN32
+			} else if (WSAGetLastError()) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error %d %d\n", erl_errno, WSAGetLastError());
+#else
 			} else if (errno) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error %d %d\n", erl_errno, errno);
+#endif
 			} else {
 				/* if errno didn't get set, assume nothing *too* horrible occured */
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
@@ -1557,7 +1571,7 @@
 		listener = new_listener(&ec,clientfd);
 		if (listener) {
 			/* store the IP and node name we are talking with */
-			inet_ntop(AF_INET, conn.ipadr, listener->remote_ip, sizeof(listener->remote_ip));
+			switch_inet_ntop(AF_INET, conn.ipadr, listener->remote_ip, sizeof(listener->remote_ip));
 			listener->peer_nodename = switch_core_strdup(listener->pool,conn.nodename);
 
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Launching listener, connection from node %s, ip %s\n", conn.nodename, listener->remote_ip);

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h	Thu Jun 11 17:29:37 2009
@@ -81,7 +81,11 @@
    5 call sessions will be "attached" to the same listener.
  */
 struct listener {
+#ifdef WIN32
+	SOCKET sockfd;
+#else
 	int sockfd;
+#endif
 	struct ei_cnode_s *ec;
 	struct erlang_process log_process;
 	struct erlang_process event_process;
@@ -221,7 +225,7 @@
 }
 
 #ifdef WIN32 /* MSDN suggested hack to fake errno for network operations */
-#define errno WSAGetLastError()
+/*#define errno WSAGetLastError()*/
 #endif
 
 /* mod_erlang_event.c */


From jmesquita at freeswitch.org  Thu Jun 11 16:03:23 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 18:03:23 -0500
Subject: [Freeswitch-svn] [commit] r13765 -
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
Message-ID: 

Author: jmesquita
Date: Thu Jun 11 18:03:23 2009
New Revision: 13765

Log:
Added  api command

Modified:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile	Thu Jun 11 18:03:23 2009
@@ -1,5 +1,5 @@
 MODNAME=mod_khomp
-LOCAL_CFLAGS=-I./include -I./commons/include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DKHOMP_COMMONS_WITH_CHANNEL -lboost_thread -lboost_regex
+LOCAL_CFLAGS=-I./include -I./commons/include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DKHOMP_COMMONS_WITH_CHANNEL
 
 LOCAL_OBJS= ./commons/k3lapi.o
 

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Thu Jun 11 18:03:23 2009
@@ -30,7 +30,7 @@
  *
  */
 
-#define KHOMP_SYNTAX "khomp [show]"
+#define KHOMP_SYNTAX "khomp show [info|links]"
 
 /* Our includes */
 #include "k3lapi.hpp"
@@ -38,6 +38,7 @@
 extern "C"
 {
     #include 
+    #include "k3l.h"
 }
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load);
@@ -125,6 +126,7 @@
 
 /* My function prototypes */
 static void printBoardsInfo(switch_stream_handle_t*);
+static const char* linkStatus(unsigned int device, unsigned int link);
 
 
 
@@ -493,7 +495,7 @@
 
 static switch_status_t load_config(void)
 {
-	char *cf = "khomp.conf";
+	const char *cf = "khomp.conf";
 	switch_xml_t cfg, xml, settings, param;
 
 	memset(&globals, 0, sizeof(globals));
@@ -620,10 +622,8 @@
 }
 
 /* 
-   khomp API
-   Only displays board information right now
+   khomp API definition
 */
-
 SWITCH_STANDARD_API(khomp)
 {
    	char *argv[10] = { 0 };
@@ -640,13 +640,34 @@
 		return SWITCH_STATUS_FALSE;
 	}
 
-	if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 1) {
+	if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) {
 		stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX);
 		goto done;
 	}
 
-	if (argv[0] && !strncasecmp(argv[0], "show", 6)) {
-        printBoardsInfo(stream);
+    /* Below show ... */
+	if (argv[0] && !strncasecmp(argv[0], "show", 4)) {
+        /* Show the API summary and information */
+        if (argv[1] && !strncasecmp(argv[1], "info", 4)) {
+            printBoardsInfo(stream);
+        }
+        /* Show all the links and their status */
+        if (argv[1] && !strncasecmp(argv[1], "links", 5)) {
+            for(int device=0 ; device < k3l->device_count() ; device++)
+            {
+                stream->write_function(stream, "___________________________________________\n");
+                stream->write_function(stream, "|--------------Khomp Links----------------|\n");
+                stream->write_function(stream, "|----Board----|----Link----|----Status----|\n");
+                for(int link=0 ; link < k3l->link_count(device) ; link++)
+                {
+                    stream->write_function(stream, "|%13d|%12d|%s|\n"
+                                            , device
+                                            , link
+                                            , linkStatus(device, link));
+                }
+            }
+            stream->write_function(stream, "-------------------------------------------\n");
+        }
 
 	} else {
 		stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX);
@@ -658,6 +679,64 @@
 
 }
 
+/* Helper functions */
+static const char * linkStatus(unsigned int device, unsigned int link)
+{
+
+    K3L_LINK_CONFIG & config = k3l->link_config(device, link);
+    K3L_LINK_STATUS   status;
+    
+    KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (device, link + ksoLink, &status, sizeof(status));
+
+    if (ret == ksSuccess)
+    {
+        switch (config.Signaling)
+        {
+            case ksigInactive:
+                return "[ksigInactive]";
+
+            case ksigAnalog:
+                return "[ksigAnalog]";
+
+            case ksigSIP:
+                return "[ksigSIP]";
+
+            case ksigOpenCAS:
+            case ksigOpenR2:
+            case ksigR2Digital:
+            case ksigUserR2Digital:
+            case ksigOpenCCS:
+            case ksigPRI_EndPoint:
+            case ksigPRI_Network:
+            case ksigPRI_Passive:
+            case ksigLineSide:
+            case ksigCAS_EL7:
+            case ksigAnalogTerminal:
+                if (kesOk == status.E1)
+                {
+                    return "kesOk";
+                }
+                else
+                {
+                    if (kesSignalLost & status.E1)         return "SignalLost";
+                    if (kesNetworkAlarm & status.E1)       return "NetworkAlarm";
+                    if (kesFrameSyncLost & status.E1)      return "FrameSyncLost";
+                    if (kesMultiframeSyncLost & status.E1) return "MultiframeSyncLost";
+                    if (kesRemoteAlarm & status.E1)        return "RemoteAlarm";
+                    if (kesHighErrorRate & status.E1)      return "HighErrorRate";
+                    if (kesUnknownAlarm & status.E1)       return "UnknownAlarm";
+                    if (kesE1Error & status.E1)            return "E1Error";
+
+                }
+            default:
+                return "NotImplementedBoard";
+        }
+    }
+
+    return "";
+}
+
+
 static void printBoardsInfo(switch_stream_handle_t* stream) {
 
     K3L_API_CONFIG apiCfg;
@@ -759,6 +838,7 @@
 
     stream->write_function(stream, " ------------------------------------------------------------------\n");
 }
+/* End of helper functions */
 
 
 /* For Emacs:


From andrew at freeswitch.org  Thu Jun 11 16:48:08 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 11 Jun 2009 18:48:08 -0500
Subject: [Freeswitch-svn] [commit] r13766 -
	freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
Message-ID: 

Author: andrew
Date: Thu Jun 11 18:48:08 2009
New Revision: 13766

Log:
Huh, I guess that was a socket not a file descriptor

Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.2008.vcproj	Thu Jun 11 18:48:08 2009
@@ -119,7 +119,7 @@
 			/>
 			

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	Thu Jun 11 18:48:08 2009
@@ -1586,7 +1586,7 @@
 
 	/* cleanup epmd registration */
 	ei_unpublish(&ec);
-	close(epmdfd);
+	close_socket(&epmdfd);
 
 init_failed:
 	close_socket(&listen_list.sockfd);


From anthm at freeswitch.org  Fri Jun 12 08:59:20 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 12 Jun 2009 10:59:20 -0500
Subject: [Freeswitch-svn] [commit] r13767 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Fri Jun 12 10:59:19 2009
New Revision: 13767

Log:
record_sample_rate variable influences the rate record app will use

Modified:
   freeswitch/trunk/src/switch_ivr_play_say.c

Modified: freeswitch/trunk/src/switch_ivr_play_say.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_play_say.c	(original)
+++ freeswitch/trunk/src/switch_ivr_play_say.c	Fri Jun 12 10:59:19 2009
@@ -416,6 +416,17 @@
 	fh->channels = read_impl.number_of_channels;
 	fh->native_rate = read_impl.actual_samples_per_second;
 
+	if ((vval = switch_channel_get_variable(channel, "record_sample_rate"))) {
+		int tmp = 0;
+
+		tmp = atoi(vval);
+
+		if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) {
+			fh->samplerate = tmp;
+		}
+	}
+
+
 	if ((vval = switch_channel_get_variable(channel, "record_waste_resources"))) {
 	
 		if (switch_true(vval)) {


From anthm at freeswitch.org  Fri Jun 12 09:02:23 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 12 Jun 2009 11:02:23 -0500
Subject: [Freeswitch-svn] [commit] r13768 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Fri Jun 12 11:02:23 2009
New Revision: 13768

Log:
record_sample_rate variable influences the rate record app will use

Modified:
   freeswitch/trunk/src/switch_ivr_async.c

Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c	(original)
+++ freeswitch/trunk/src/switch_ivr_async.c	Fri Jun 12 11:02:23 2009
@@ -973,6 +973,17 @@
 	rh->file = switch_core_session_strdup(session, file);
 	rh->lead_in = LEAD_IN;
 
+
+	if ((vval = switch_channel_get_variable(channel, "record_sample_rate"))) {
+		int tmp = 0;
+
+		tmp = atoi(vval);
+
+		if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) {
+			rh->fh->samplerate = tmp;
+		}
+	}
+
 	if ((status = switch_core_media_bug_add(session, record_callback, rh, to, flags, &bug)) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error adding media bug for file %s\n", file);
 		switch_core_file_close(fh);


From anthm at freeswitch.org  Fri Jun 12 09:06:35 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 12 Jun 2009 11:06:35 -0500
Subject: [Freeswitch-svn] [commit] r13769 - in freeswitch/trunk/src: .
	include mod/applications/mod_voicemail
Message-ID: 

Author: anthm
Date: Fri Jun 12 11:06:34 2009
New Revision: 13769

Log:
record_sample_rate variable influences the rate record app will use

Modified:
   freeswitch/trunk/src/include/switch_utils.h
   freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c
   freeswitch/trunk/src/switch_ivr_async.c
   freeswitch/trunk/src/switch_ivr_play_say.c

Modified: freeswitch/trunk/src/include/switch_utils.h
==============================================================================
--- freeswitch/trunk/src/include/switch_utils.h	(original)
+++ freeswitch/trunk/src/include/switch_utils.h	Fri Jun 12 11:06:34 2009
@@ -86,6 +86,7 @@
 	return SWITCH_TRUE;
 }
 
+#define switch_is_valid_rate(_tmp) (_tmp == 8000 || _tmp == 16000 || _tmp == 32000 || _tmp == 11025 || _tmp == 22050 || _tmp == 44100 || _tmp == 48000)
 
 static inline int switch_string_has_escaped_data(const char *in)
 {

Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c	Fri Jun 12 11:06:34 2009
@@ -587,7 +587,7 @@
 				if (!switch_strlen_zero(val)) {
 					tmp = atoi(val);
 				}
-				if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) {
+				if (switch_is_valid_rate(tmp)) {
 					record_sample_rate = tmp;
 				} else {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid samplerate %s\n", val);

Modified: freeswitch/trunk/src/switch_ivr_async.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_async.c	(original)
+++ freeswitch/trunk/src/switch_ivr_async.c	Fri Jun 12 11:06:34 2009
@@ -979,7 +979,7 @@
 
 		tmp = atoi(vval);
 
-		if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) {
+		if (switch_is_valid_rate(tmp)) {
 			rh->fh->samplerate = tmp;
 		}
 	}

Modified: freeswitch/trunk/src/switch_ivr_play_say.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_play_say.c	(original)
+++ freeswitch/trunk/src/switch_ivr_play_say.c	Fri Jun 12 11:06:34 2009
@@ -421,7 +421,7 @@
 
 		tmp = atoi(vval);
 
-		if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 11025 || tmp == 22050 || tmp == 44100) {
+		if (switch_is_valid_rate(tmp)) {
 			fh->samplerate = tmp;
 		}
 	}


From anthm at freeswitch.org  Fri Jun 12 15:57:13 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 12 Jun 2009 17:57:13 -0500
Subject: [Freeswitch-svn] [commit] r13770 - in freeswitch/trunk/libs/esl:
	lua perl php python ruby src src/include
Message-ID: 

Author: anthm
Date: Fri Jun 12 17:57:13 2009
New Revision: 13770

Log:
add socketDescriptor() method to ESL::Connection obj

Modified:
   freeswitch/trunk/libs/esl/lua/esl_wrap.cpp
   freeswitch/trunk/libs/esl/perl/ESL.pm
   freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
   freeswitch/trunk/libs/esl/php/ESL.php
   freeswitch/trunk/libs/esl/php/esl_wrap.cpp
   freeswitch/trunk/libs/esl/php/php_ESL.h
   freeswitch/trunk/libs/esl/python/ESL.py
   freeswitch/trunk/libs/esl/python/esl_wrap.cpp
   freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp
   freeswitch/trunk/libs/esl/src/esl_oop.cpp
   freeswitch/trunk/libs/esl/src/include/esl_oop.h

Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp	Fri Jun 12 17:57:13 2009
@@ -2275,6 +2275,31 @@
 }
 
 
+static int _wrap_ESLconnection_socketDescriptor(lua_State* L) {
+  int SWIG_arg = -1;
+  ESLconnection *arg1 = (ESLconnection *) 0 ;
+  int result;
+  
+  SWIG_check_num_args("socketDescriptor",1,1)
+  if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("socketDescriptor",1,"ESLconnection *");
+  
+  if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLconnection,0))){
+    SWIG_fail_ptr("ESLconnection_socketDescriptor",1,SWIGTYPE_p_ESLconnection);
+  }
+  
+  result = (int)(arg1)->socketDescriptor();
+  SWIG_arg=0;
+  lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
+  return SWIG_arg;
+  
+  if(0) SWIG_fail;
+  
+fail:
+  lua_error(L);
+  return SWIG_arg;
+}
+
+
 static int _wrap_ESLconnection_connected(lua_State* L) {
   int SWIG_arg = -1;
   ESLconnection *arg1 = (ESLconnection *) 0 ;
@@ -2756,6 +2781,7 @@
 delete arg1;
 }
 static swig_lua_method swig_ESLconnection_methods[] = {
+    {"socketDescriptor", _wrap_ESLconnection_socketDescriptor}, 
     {"connected", _wrap_ESLconnection_connected}, 
     {"getInfo", _wrap_ESLconnection_getInfo}, 
     {"send", _wrap_ESLconnection_send}, 

Modified: freeswitch/trunk/libs/esl/perl/ESL.pm
==============================================================================
--- freeswitch/trunk/libs/esl/perl/ESL.pm	(original)
+++ freeswitch/trunk/libs/esl/perl/ESL.pm	Fri Jun 12 17:57:13 2009
@@ -128,6 +128,7 @@
     }
 }
 
+*socketDescriptor = *ESLc::ESLconnection_socketDescriptor;
 *connected = *ESLc::ESLconnection_connected;
 *getInfo = *ESLc::ESLconnection_getInfo;
 *send = *ESLc::ESLconnection_send;

Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp	Fri Jun 12 17:57:13 2009
@@ -2745,6 +2745,34 @@
 }
 
 
+XS(_wrap_ESLconnection_socketDescriptor) {
+  {
+    ESLconnection *arg1 = (ESLconnection *) 0 ;
+    int result;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: ESLconnection_socketDescriptor(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_ESLconnection, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_socketDescriptor" "', argument " "1"" of type '" "ESLconnection *""'"); 
+    }
+    arg1 = reinterpret_cast< ESLconnection * >(argp1);
+    result = (int)(arg1)->socketDescriptor();
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_ESLconnection_connected) {
   {
     ESLconnection *arg1 = (ESLconnection *) 0 ;
@@ -3514,6 +3542,7 @@
 {"ESLc::ESLevent_nextHeader", _wrap_ESLevent_nextHeader},
 {"ESLc::new_ESLconnection", _wrap_new_ESLconnection},
 {"ESLc::delete_ESLconnection", _wrap_delete_ESLconnection},
+{"ESLc::ESLconnection_socketDescriptor", _wrap_ESLconnection_socketDescriptor},
 {"ESLc::ESLconnection_connected", _wrap_ESLconnection_connected},
 {"ESLc::ESLconnection_getInfo", _wrap_ESLconnection_getInfo},
 {"ESLc::ESLconnection_send", _wrap_ESLconnection_send},

Modified: freeswitch/trunk/libs/esl/php/ESL.php
==============================================================================
--- freeswitch/trunk/libs/esl/php/ESL.php	(original)
+++ freeswitch/trunk/libs/esl/php/ESL.php	Fri Jun 12 17:57:13 2009
@@ -121,6 +121,10 @@
 		$this->_cPtr=$r;
 	}
 
+	function socketDescriptor() {
+		return ESLconnection_socketDescriptor($this->_cPtr);
+	}
+
 	function connected() {
 		return ESLconnection_connected($this->_cPtr);
 	}

Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/php/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp	Fri Jun 12 17:57:13 2009
@@ -1821,6 +1821,32 @@
 }
 
 
+ZEND_NAMED_FUNCTION(_wrap_ESLconnection_socketDescriptor) {
+  ESLconnection *arg1 = (ESLconnection *) 0 ;
+  int result;
+  zval **args[1];
+  
+  SWIG_ResetError();
+  if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {
+    WRONG_PARAM_COUNT;
+  }
+  
+  {
+    if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_ESLconnection, 0) < 0) {
+      SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of ESLconnection_socketDescriptor. Expected SWIGTYPE_p_ESLconnection");
+    }
+  }
+  if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
+  result = (int)(arg1)->socketDescriptor();
+  {
+    ZVAL_LONG(return_value,result);
+  }
+  return;
+fail:
+  zend_error(SWIG_ErrorCode(),SWIG_ErrorMsg());
+}
+
+
 ZEND_NAMED_FUNCTION(_wrap_ESLconnection_connected) {
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   int result;
@@ -2454,6 +2480,7 @@
  SWIG_ZEND_NAMED_FE(eslevent_firstheader,_wrap_ESLevent_firstHeader,NULL)
  SWIG_ZEND_NAMED_FE(eslevent_nextheader,_wrap_ESLevent_nextHeader,NULL)
  SWIG_ZEND_NAMED_FE(new_eslconnection,_wrap_new_ESLconnection,NULL)
+ SWIG_ZEND_NAMED_FE(eslconnection_socketdescriptor,_wrap_ESLconnection_socketDescriptor,NULL)
  SWIG_ZEND_NAMED_FE(eslconnection_connected,_wrap_ESLconnection_connected,NULL)
  SWIG_ZEND_NAMED_FE(eslconnection_getinfo,_wrap_ESLconnection_getInfo,NULL)
  SWIG_ZEND_NAMED_FE(eslconnection_send,_wrap_ESLconnection_send,NULL)

Modified: freeswitch/trunk/libs/esl/php/php_ESL.h
==============================================================================
--- freeswitch/trunk/libs/esl/php/php_ESL.h	(original)
+++ freeswitch/trunk/libs/esl/php/php_ESL.h	Fri Jun 12 17:57:13 2009
@@ -50,6 +50,7 @@
 ZEND_NAMED_FUNCTION(_wrap_ESLevent_firstHeader);
 ZEND_NAMED_FUNCTION(_wrap_ESLevent_nextHeader);
 ZEND_NAMED_FUNCTION(_wrap_new_ESLconnection);
+ZEND_NAMED_FUNCTION(_wrap_ESLconnection_socketDescriptor);
 ZEND_NAMED_FUNCTION(_wrap_ESLconnection_connected);
 ZEND_NAMED_FUNCTION(_wrap_ESLconnection_getInfo);
 ZEND_NAMED_FUNCTION(_wrap_ESLconnection_send);

Modified: freeswitch/trunk/libs/esl/python/ESL.py
==============================================================================
--- freeswitch/trunk/libs/esl/python/ESL.py	(original)
+++ freeswitch/trunk/libs/esl/python/ESL.py	Fri Jun 12 17:57:13 2009
@@ -77,6 +77,7 @@
         except: self.this = this
     __swig_destroy__ = _ESL.delete_ESLconnection
     __del__ = lambda self : None;
+    def socketDescriptor(*args): return apply(_ESL.ESLconnection_socketDescriptor, args)
     def connected(*args): return apply(_ESL.ESLconnection_connected, args)
     def getInfo(*args): return apply(_ESL.ESLconnection_getInfo, args)
     def send(*args): return apply(_ESL.ESLconnection_send, args)

Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/python/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp	Fri Jun 12 17:57:13 2009
@@ -3659,6 +3659,28 @@
 }
 
 
+SWIGINTERN PyObject *_wrap_ESLconnection_socketDescriptor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ESLconnection *arg1 = (ESLconnection *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ESLconnection_socketDescriptor",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ESLconnection, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_socketDescriptor" "', argument " "1"" of type '" "ESLconnection *""'"); 
+  }
+  arg1 = reinterpret_cast< ESLconnection * >(argp1);
+  result = (int)(arg1)->socketDescriptor();
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_ESLconnection_connected(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ESLconnection *arg1 = (ESLconnection *) 0 ;
@@ -4307,6 +4329,7 @@
 	 { (char *)"ESLevent_swigregister", ESLevent_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_ESLconnection", _wrap_new_ESLconnection, METH_VARARGS, NULL},
 	 { (char *)"delete_ESLconnection", _wrap_delete_ESLconnection, METH_VARARGS, NULL},
+	 { (char *)"ESLconnection_socketDescriptor", _wrap_ESLconnection_socketDescriptor, METH_VARARGS, NULL},
 	 { (char *)"ESLconnection_connected", _wrap_ESLconnection_connected, METH_VARARGS, NULL},
 	 { (char *)"ESLconnection_getInfo", _wrap_ESLconnection_getInfo, METH_VARARGS, NULL},
 	 { (char *)"ESLconnection_send", _wrap_ESLconnection_send, METH_VARARGS, NULL},

Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp	(original)
+++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp	Fri Jun 12 17:57:13 2009
@@ -2781,6 +2781,30 @@
 }
 
 SWIGINTERN VALUE
+_wrap_ESLconnection_socketDescriptor(int argc, VALUE *argv, VALUE self) {
+  ESLconnection *arg1 = (ESLconnection *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ESLconnection, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ESLconnection *","socketDescriptor", 1, self )); 
+  }
+  arg1 = reinterpret_cast< ESLconnection * >(argp1);
+  result = (int)(arg1)->socketDescriptor();
+  vresult = SWIG_From_int(static_cast< int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_ESLconnection_connected(int argc, VALUE *argv, VALUE self) {
   ESLconnection *arg1 = (ESLconnection *) 0 ;
   int result;
@@ -3729,6 +3753,7 @@
   SWIG_TypeClientData(SWIGTYPE_p_ESLconnection, (void *) &cESLconnection);
   rb_define_alloc_func(cESLconnection.klass, _wrap_ESLconnection_allocate);
   rb_define_method(cESLconnection.klass, "initialize", VALUEFUNC(_wrap_new_ESLconnection), -1);
+  rb_define_method(cESLconnection.klass, "socketDescriptor", VALUEFUNC(_wrap_ESLconnection_socketDescriptor), -1);
   rb_define_method(cESLconnection.klass, "connected", VALUEFUNC(_wrap_ESLconnection_connected), -1);
   rb_define_method(cESLconnection.klass, "getInfo", VALUEFUNC(_wrap_ESLconnection_getInfo), -1);
   rb_define_method(cESLconnection.klass, "send", VALUEFUNC(_wrap_ESLconnection_send), -1);

Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_oop.cpp	(original)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp	Fri Jun 12 17:57:13 2009
@@ -33,6 +33,16 @@
 
 }
 
+int ESLconnection::socketDescriptor()
+{
+	if (handle.connected) {
+        return (int) handle.sock;
+    }
+
+	return -1;
+}
+
+
 int ESLconnection::disconnect()
 {
 	if (handle.connected) {

Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h
==============================================================================
--- freeswitch/trunk/libs/esl/src/include/esl_oop.h	(original)
+++ freeswitch/trunk/libs/esl/src/include/esl_oop.h	Fri Jun 12 17:57:13 2009
@@ -76,6 +76,7 @@
 	ESLconnection(const char *host, const char *port, const char *password);
 	ESLconnection(int socket);
 	virtual ~ESLconnection();
+	int socketDescriptor();
 	int connected();
 	ESLevent *getInfo();
 	int send(const char *cmd);


From jmesquita at freeswitch.org  Fri Jun 12 22:08:59 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Sat, 13 Jun 2009 00:08:59 -0500
Subject: [Freeswitch-svn] [commit] r13771 -
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
Message-ID: 

Author: jmesquita
Date: Sat Jun 13 00:08:59 2009
New Revision: 13771

Log:
We are on the way of making a successful outgoing call

Modified:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Sat Jun 13 00:08:59 2009
@@ -98,6 +98,9 @@
 	switch_mutex_t *mutex;
 	switch_mutex_t *flag_mutex;
 	//switch_thread_cond_t *cond;
+    unsigned int Kdevice;    // Represent de board we are making the call from
+    unsigned int Klink;      // Represent the link we are making the call from
+    unsigned int Kchannel;   // Represent the channel we are making the call from
 };
 
 typedef struct private_object private_t;
@@ -130,7 +133,8 @@
 
 
 
-static void tech_init(private_t *tech_pvt, switch_core_session_t *session)
+/* Will init part of our private structure and setup all the read/write buffers */
+static switch_status_t tech_init(private_t *tech_pvt, switch_core_session_t *session)
 {
 	tech_pvt->read_frame.data = tech_pvt->databuf;
 	tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
@@ -138,6 +142,40 @@
 	switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
 	switch_core_session_set_private(session, tech_pvt);
 	tech_pvt->session = session;
+
+    if (switch_core_codec_init(&tech_pvt->read_codec,
+							   "PCMA",
+							   NULL,
+							   8000,
+							   20,
+							   1,
+							   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
+							   NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
+		return SWITCH_STATUS_GENERR;
+	} else {
+		if (switch_core_codec_init(&tech_pvt->write_codec,
+								   "PCMA",
+								   NULL,
+								   8000,
+								   20,
+								   1,
+								   SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
+								   NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
+			switch_core_codec_destroy(&tech_pvt->read_codec);
+			return SWITCH_STATUS_GENERR;
+		}
+	}
+
+	switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
+	switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec);
+	switch_set_flag_locked(tech_pvt, TFLAG_CODEC);
+	tech_pvt->read_frame.codec = &tech_pvt->read_codec;
+	switch_set_flag_locked(tech_pvt, TFLAG_IO);
+
+	return SWITCH_STATUS_SUCCESS;
+
 }
 
 /* 
@@ -226,6 +264,15 @@
 		switch_core_codec_destroy(&tech_pvt->write_codec);
 	}
 
+    try {
+        k3l->command(tech_pvt->Kchannel, CM_DISCONNECT, NULL);
+    }
+    catch(K3LAPI::failed_command & e)
+    {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "WE COULD NOT HANGUP THE CHANNEL! rc:%d\n", e.rc);
+        return SWITCH_STATUS_TERM;
+    }
+
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
 	switch_mutex_lock(globals.mutex);
@@ -302,6 +349,9 @@
 	tech_pvt->read_frame.flags = SFF_NONE;
 	*frame = NULL;
 
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Are we being called?");
+
+
 	while (switch_test_flag(tech_pvt, TFLAG_IO)) {
 
 		if (switch_test_flag(tech_pvt, TFLAG_BREAK)) {
@@ -350,6 +400,8 @@
 	private_t *tech_pvt = NULL;
 	//switch_frame_t *pframe;
 
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Are we being called?");
+
 	channel = switch_core_session_get_channel(session);
 	assert(channel != NULL);
 
@@ -417,6 +469,10 @@
 													switch_caller_profile_t *outbound_profile,
 													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags)
 {
+
+   	char *argv[4] = { 0 };
+	int argc = 0;
+
 	if ((*new_session = switch_core_session_request(khomp_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
 		private_t *tech_pvt;
 		switch_channel_t *channel;
@@ -438,6 +494,24 @@
 			snprintf(name, sizeof(name), "Khomp/%s", outbound_profile->destination_number);
 			switch_channel_set_name(channel, name);
 
+            /* Let's setup our own vars on tech_pvt */
+            if ((argc = switch_separate_string(outbound_profile->destination_number, '/', argv, (sizeof(argv) / sizeof(argv[0])))) < 4)
+            {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid dial string. Should be on the format:[Khomp/BOARD/LINK/CHANNEL]\n");
+                return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+            }
+            else
+            {
+                tech_pvt->Kdevice = atoi(argv[0]);
+                tech_pvt->Klink = atoi(argv[1]);
+                tech_pvt->Kchannel = atoi(argv[2]);
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Dialing out from Board:%d, Link:%d, Channel:%d.\n",
+                                                                    tech_pvt->Kdevice,
+                                                                    tech_pvt->Klink,
+                                                                    tech_pvt->Kchannel);
+
+            }
+
 			caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
 			switch_channel_set_caller_profile(channel, caller_profile);
 			tech_pvt->caller_profile = caller_profile;
@@ -452,6 +526,21 @@
 		switch_channel_set_flag(channel, CF_OUTBOUND);
 		switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
 		switch_channel_set_state(channel, CS_INIT);
+
+        try {
+            /* Lets make the call! */
+            char params[ 255 ];
+            sprintf(params, "dest_addr=\"%s\"", argv[3]);
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "We are calling with params: %s.\n", params);
+            k3l->command(tech_pvt->Kdevice,tech_pvt->Kchannel, CM_MAKE_CALL, params); 
+        }
+        /* TODO: Cmon learn how to catch already! */
+        catch(K3LAPI::failed_command & e)
+        {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not place call! Cause: code%d and rc%d.\n", e.code, e.rc);
+            return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+        }
+
 		return SWITCH_CAUSE_SUCCESS;
 	}
 


From jmesquita at freeswitch.org  Sat Jun 13 23:07:17 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Sun, 14 Jun 2009 01:07:17 -0500
Subject: [Freeswitch-svn] [commit] r13772 -
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
Message-ID: 

Author: jmesquita
Date: Sun Jun 14 01:07:17 2009
New Revision: 13772

Log:
We are able to see the board events already. We see the call getting to the far end! But... still no audio treatment.

Modified:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Sun Jun 14 01:07:17 2009
@@ -130,6 +130,7 @@
 /* My function prototypes */
 static void printBoardsInfo(switch_stream_handle_t*);
 static const char* linkStatus(unsigned int device, unsigned int link);
+static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e);
 
 
 
@@ -661,13 +662,14 @@
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting K3L...\n");
     try {
         k3l->start();
-    } catch (...) {
-        /* TODO: Catch the proper error and display it. */
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "K3L not started.");
+    } catch (K3LAPI::start_failed & e) {
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "K3L not started. Reason:%s.\n", e.msg.c_str());
         return SWITCH_STATUS_TERM;
     }
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "K3L started.\n");
 
+    k3lRegisterEventHandler( EventCallBack );
+
     /* Add all the specific API functions */
     SWITCH_ADD_API(api_interface, "khomp", "Khomp Menu", khomp, KHOMP_SYNTAX);
 
@@ -930,6 +932,27 @@
 /* End of helper functions */
 
 
+static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e)
+{				
+    /* TODO: We should hash things to make it statful */
+    switch(e->Code)
+    {
+        case EV_NEW_CALL:   
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New call on %u to %s.\n", obj, k3l->get_param(e, "dest_addr").c_str());
+            break;
+        case EV_DISCONNECT:   
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Called party dropped the call on: %u. Releasing channel.\n", obj);
+            k3l->command(e->DeviceId, obj, CM_DISCONNECT, NULL);
+            break;
+        default:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New Event has just arrived on %u with untreated code: %x\n", obj, e->Code);
+            break;
+    }
+
+    return ksSuccess;
+}
+
+
 /* For Emacs:
  * Local Variables:
  * mode:c


From jmesquita at freeswitch.org  Sun Jun 14 21:08:53 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Sun, 14 Jun 2009 23:08:53 -0500
Subject: [Freeswitch-svn] [commit] r13773 -
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp
Message-ID: 

Author: jmesquita
Date: Sun Jun 14 23:08:52 2009
New Revision: 13773

Log:
Add [khomp show channels].

Modified:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Sun Jun 14 23:08:52 2009
@@ -30,7 +30,7 @@
  *
  */
 
-#define KHOMP_SYNTAX "khomp show [info|links]"
+#define KHOMP_SYNTAX "khomp show [info|links|channels]"
 
 /* Our includes */
 #include "k3lapi.hpp"
@@ -127,9 +127,11 @@
 static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
 static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
 
-/* My function prototypes */
-static void printBoardsInfo(switch_stream_handle_t*);
+/* Helper function prototypes */
+static void printSystemSummary(switch_stream_handle_t*);
 static const char* linkStatus(unsigned int device, unsigned int link);
+static void printChannels(switch_stream_handle_t* stream, unsigned int device, unsigned int link);
+/* Handles callbacks and events from the boards */
 static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e);
 
 
@@ -266,7 +268,7 @@
 	}
 
     try {
-        k3l->command(tech_pvt->Kchannel, CM_DISCONNECT, NULL);
+        k3l->command(tech_pvt->Kdevice, tech_pvt->Kchannel, CM_DISCONNECT, NULL);
     }
     catch(K3LAPI::failed_command & e)
     {
@@ -275,7 +277,7 @@
     }
 
 
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s Originator Hangup.\n", switch_channel_get_name(channel));
 	switch_mutex_lock(globals.mutex);
 	globals.calls--;
 	if (globals.calls < 0) {
@@ -434,6 +436,7 @@
 	tech_pvt = static_cast(switch_core_session_get_private(session));
 	assert(tech_pvt != NULL);
 
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "When the fuck is this called?.\n");
 
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -444,6 +447,8 @@
 	switch_channel_t *channel;
 	private_t *tech_pvt;
 
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "When the fuck is this called?.\n");
+
 	channel = switch_core_session_get_channel(session);
 	assert(channel != NULL);
 
@@ -535,10 +540,9 @@
             switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "We are calling with params: %s.\n", params);
             k3l->command(tech_pvt->Kdevice,tech_pvt->Kchannel, CM_MAKE_CALL, params); 
         }
-        /* TODO: Cmon learn how to catch already! */
         catch(K3LAPI::failed_command & e)
         {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not place call! Cause: code%d and rc%d.\n", e.code, e.rc);
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not place call! Cause: code%x and rc%d.\n", e.code, e.rc);
             return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
         }
 
@@ -740,7 +744,7 @@
 	if (argv[0] && !strncasecmp(argv[0], "show", 4)) {
         /* Show the API summary and information */
         if (argv[1] && !strncasecmp(argv[1], "info", 4)) {
-            printBoardsInfo(stream);
+            printSystemSummary(stream);
         }
         /* Show all the links and their status */
         if (argv[1] && !strncasecmp(argv[1], "links", 5)) {
@@ -759,6 +763,10 @@
             }
             stream->write_function(stream, "-------------------------------------------\n");
         }
+        // Show all channels from all boards and all links
+        if (argv[1] && !strncasecmp(argv[1], "channels", 8)) {
+            printChannels(stream, NULL, NULL);
+        }
 
 	} else {
 		stream->write_function(stream, "USAGE: %s\n", KHOMP_SYNTAX);
@@ -771,6 +779,64 @@
 }
 
 /* Helper functions */
+static void printChannels(switch_stream_handle_t* stream, unsigned int device, unsigned int link) {
+    if (!device) {
+        // Print all channels from all boards and links
+		stream->write_function(stream, "|--------- Khomp ----------|\n");
+		stream->write_function(stream, "| Board | Channel | Status |\n");
+        for (int board=0 ; board < k3l->device_count() ; board++) {
+            for (int channel=0 ; channel < k3l->channel_count(board) ; channel++) {
+                try {
+                    K3L_CHANNEL_CONFIG channelConfig;
+                    channelConfig = k3l->channel_config( board, channel );
+                }
+                catch (...){
+                    stream->write_function(stream, "OOOPSS. Something went wrong, cleanup this mess!\n");
+                    return;
+                }
+                K3L_CHANNEL_STATUS status;
+                if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) {
+                    stream->write_function(stream, "Damn, again something bad happened.\n");
+                    return;
+                }
+                switch(status.AddInfo) {
+                    case kecsFree: 
+                        stream->write_function(stream, "| %6u| %8u| Free |\n", board, channel);
+                        break;
+                    case kecsBusy: 
+                        stream->write_function(stream, "| %6u| %8u| Busy |\n", board, channel);
+                        break;
+                    case kecsOutgoing: 
+                        stream->write_function(stream, "| %6u| %8u| Outgoing |\n", board, channel);
+                        break;
+                    case kecsIncoming: 
+                        stream->write_function(stream, "| %6u| %8u| Incoming |\n", board, channel);
+                        break;
+                    case kecsLocked:
+                        stream->write_function(stream, "| %6u| %8u| Locked |\n", board, channel);
+                        break;
+                    case kecsOutgoingLock:
+                        stream->write_function(stream, "| %6u| %8u| OutgoingLock |\n", board, channel);
+                        break;
+                    case kecsLocalFail:
+                        stream->write_function(stream, "| %6u| %8u| LocalFail |\n", board, channel);
+                        break;
+                    case kecsIncomingLock:
+                        stream->write_function(stream, "| %6u| %8u| IncomingLock |\n", board, channel);
+                        break;
+                    case kecsRemoteLock:
+                        stream->write_function(stream, "| %6u| %8u| RemoteLock |\n", board, channel);
+                        break;
+                    default:
+                        stream->write_function(stream, "| %6u| %8u| UNKNOWN : %x |\n", board, channel, status.AddInfo);
+                }
+                        
+            }
+        }
+        stream->write_function(stream, "----------------------------\n");
+    }
+}
+
 static const char * linkStatus(unsigned int device, unsigned int link)
 {
 
@@ -828,7 +894,7 @@
 }
 
 
-static void printBoardsInfo(switch_stream_handle_t* stream) {
+static void printSystemSummary(switch_stream_handle_t* stream) {
 
     K3L_API_CONFIG apiCfg;
 
@@ -934,11 +1000,20 @@
 
 static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e)
 {				
-    /* TODO: We should hash things to make it statful */
+    /* TODO: We should hash things to make it stateful */
     switch(e->Code)
     {
         case EV_NEW_CALL:   
             switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New call on %u to %s.\n", obj, k3l->get_param(e, "dest_addr").c_str());
+            try {
+                k3l->command(e->DeviceId, obj, CM_RINGBACK, NULL); 
+                k3l->command(e->DeviceId, obj, CM_CONNECT, NULL); 
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Accepeted the call.\n");
+            }
+            catch (K3LAPI::failed_command & err)
+            {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Something went wrong here!\n");
+            }
             break;
         case EV_DISCONNECT:   
             switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Called party dropped the call on: %u. Releasing channel.\n", obj);


From anthm at freeswitch.org  Mon Jun 15 09:01:45 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 15 Jun 2009 11:01:45 -0500
Subject: [Freeswitch-svn] [commit] r13774 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: anthm
Date: Mon Jun 15 11:01:45 2009
New Revision: 13774

Log:
FSCORE-382

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Mon Jun 15 11:01:45 2009
@@ -1395,10 +1395,14 @@
 					sofia_set_flag_locked(tech_pvt, TFLAG_BYE);
 				}
 			} else if (code == 302 && !switch_strlen_zero(msg->string_arg)) {
-				char * p = strchr(msg->string_arg, ' ');
-				*p++ = '\0';
+				char *p;
+
+				if ((p = strchr(msg->string_arg, ' '))) {
+					*p = '\0';
+					msg->string_arg = p;
+				}
+				
 				msg->message_id = SWITCH_MESSAGE_INDICATE_REDIRECT;
-				msg->string_arg = p;
 				switch_core_session_receive_message(session, msg);
 				goto end_lock;
 			} else {


From anthm at freeswitch.org  Mon Jun 15 11:10:27 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 15 Jun 2009 13:10:27 -0500
Subject: [Freeswitch-svn] [commit] r13775 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Mon Jun 15 13:10:27 2009
New Revision: 13775

Log:
tweak to rtp timing

Modified:
   freeswitch/trunk/src/switch_rtp.c

Modified: freeswitch/trunk/src/switch_rtp.c
==============================================================================
--- freeswitch/trunk/src/switch_rtp.c	(original)
+++ freeswitch/trunk/src/switch_rtp.c	Mon Jun 15 13:10:27 2009
@@ -1774,8 +1774,9 @@
 			if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) &&
 				rtp_session->read_pollfd) {
 				if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) {
-					if (++rtp_session->hot_hits >= 10) {
+					if (++rtp_session->hot_hits >= 5) {
 						hot_socket = 1;
+						rtp_session->hot_hits = 0;
 					}
 				} else {
 					rtp_session->hot_hits = 0;


From jmesquita at freeswitch.org  Mon Jun 15 13:15:42 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 15 Jun 2009 15:15:42 -0500
Subject: [Freeswitch-svn] [commit] r13776 -
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include
Message-ID: 

Author: jmesquita
Date: Mon Jun 15 15:15:41 2009
New Revision: 13776

Log:
Proper includes...

Added:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3l.h
Removed:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KDefs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KErrorDefs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KGSM.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KH100Defs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KISDN.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KMixerDefs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KR2D.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KTypeDefs.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/KVoIP.h
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3lVersion.h

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3l.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3l.h	Mon Jun 15 15:15:41 2009
@@ -0,0 +1,1787 @@
+/*  
+    KHOMP channel provider for Asterisk PBX
+    Copyright (C) 2007-2008 Khomp Ind. & Com.  
+  
+  This library is free software; you can redistribute it and/or  
+  modify it under the terms of the GNU Lesser General Public  
+  License as published by the Free Software Foundation; either  
+  version 2.1 of the License, or (at your option) any later version.  
+  
+  This library is distributed in the hope that it will be useful,  
+  but WITHOUT ANY WARRANTY; without even the implied warranty of  
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
+  Lesser General Public License for more details.  
+  
+  You should have received a copy of the GNU Lesser General Public  
+  License along with this library; if not, write to the Free Software  
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  
+*/
+
+#ifndef INCLUDED_K3LDEFS_H
+#define INCLUDED_K3LDEFS_H
+#if !defined KLTYPEDEFS_H
+#define KLTYPEDEFS_H
+#if defined( _WINDOWS ) || defined( _Windows ) || defined( _WIN32 )
+	#ifndef KWIN32
+	#define KWIN32 1
+	#endif
+#endif
+
+#ifdef KWIN32
+	typedef __int64				int64;
+	typedef unsigned __int64	uint64;
+	#define Kstdcall __stdcall
+#else
+	typedef long long				int64;
+	typedef unsigned long long		uint64;
+	#define Kstdcall 
+#endif
+typedef int					int32;
+typedef unsigned int		uint32;
+typedef unsigned long long  intptr;
+typedef long                stackint;
+typedef short int			int16;
+typedef unsigned short int	uint16;
+typedef char				int8;
+typedef unsigned char		uint8;
+typedef unsigned char		byte;
+typedef char				sbyte;
+typedef double				float64;
+typedef float				float32;
+typedef int32				stt_code;
+
+enum KLibraryStatus 
+{
+	ksSuccess =			0,
+	ksFail =			1,
+	ksTimeOut =			2,
+	ksBusy =			3,
+	ksLocked =			4,
+	ksInvalidParams =	5,
+	ksEndOfFile =		6,
+	ksInvalidState =	7,
+	ksServerCommFail =	8,
+	ksOverflow =		9,
+    ksUnderrun =        10,
+	ksNotFound =		11,
+    ksNotAvailable =    12
+};	
+enum KTxRx
+{
+	kNoTxRx	= 0x0,
+	kTx		= 0x1,
+	kRx		= 0x2,
+	kBoth	= 0x3
+}; 
+
+#define KMAX_SERIAL_NUMBER			12 
+#define KMAX_E1_CHANNELS			30
+#define KMAX_DIAL_NUMBER	        20
+#define KMAX_ADDRESS				60
+#define KMAX_DSP_NAME		        8
+#define KMAX_STR_VERSION	        80
+#define KMAX_BUFFER_ADDRESSES		16
+#define KMAX_LOG                    1024
+#define KMAX_SIP_DATA               248
+#endif
+#if !defined KVOIPDEFS_H
+#define KVOIPDEFS_H
+enum KRejectReason
+{
+	UserBusy = 0,
+	UserNotFound,
+	NoAnswer,
+	Decline,
+	ServiceUnavailable,
+	ServerInternalError,
+	UnknownRejectReason
+};
+enum KSIP_Failures
+{
+	kveResponse_200_OK_Success             		= 200,
+    kveRedirection_300_MultipleChoices			= 300,
+	kveRedirection_301_MovedPermanently			= 301,
+	kveRedirection_302_MovedTemporarily			= 302,
+	kveRedirection_305_UseProxy					= 305,
+	kveRedirection_380_AlternativeService		= 380,
+	kveFailure_400_BadRequest					= 400,
+	kveFailure_401_Unauthorized					= 401,
+	kveFailure_402_PaymentRequired				= 402,
+	kveFailure_403_Forbidden					= 403,
+	kveFailure_404_NotFound						= 404,
+	kveFailure_405_MethodNotAllowed				= 405,
+	kveFailure_406_NotAcceptable				= 406,
+	kveFailure_407_ProxyAuthenticationRequired	= 407,
+	kveFailure_408_RequestTimeout				= 408,
+	kveFailure_410_Gone							= 410,
+	kveFailure_413_RequestEntityTooLarge		= 413,
+	kveFailure_414_RequestURI_TooLong			= 414,
+	kveFailure_415_UnsupportedMediaType			= 415,
+	kveFailure_416_UnsupportedURI_Scheme		= 416,
+	kveFailure_420_BadExtension					= 420,
+	kveFailure_421_ExtensionRequired			= 421,
+	kveFailure_423_IntervalTooBrief				= 423,
+	kveFailure_480_TemporarilyUnavailable		= 480,
+	kveFailure_481_CallDoesNotExist				= 481,
+	kveFailure_482_LoopDetected					= 482,
+	kveFailure_483_TooManyHops					= 483,
+	kveFailure_484_AddressIncomplete			= 484,
+	kveFailure_485_Ambiguous					= 485,
+	kveFailure_486_BusyHere						= 486,
+	kveFailure_487_RequestTerminated			= 487,
+	kveFailure_488_NotAcceptableHere			= 488,
+	kveFailure_491_RequestPending				= 491,
+	kveFailure_493_Undecipherable				= 493,
+	kveServer_500_InternalError					= 500,
+	kveServer_501_NotImplemented				= 501,
+	kveServer_502_BadGateway					= 502,
+	kveServer_503_ServiceUnavailable			= 503,
+	kveServer_504_TimeOut						= 504,
+	kveServer_505_VersionNotSupported			= 505,
+	kveServer_513_MessageTooLarge				= 513,
+	kveGlobalFailure_600_BusyEverywhere			= 600,
+	kveGlobalFailure_603_Decline				= 603,
+	kveGlobalFailure_604_DoesNotExistAnywhere	= 604,
+	kveGlobalFailure_606_NotAcceptable			= 606
+};
+enum KVoIPRegTypes
+{
+   kvrtRegister    =   0,
+   kvrtUnregister  =   1
+};
+
+struct KVoIPCallParams
+{
+	sbyte ToUser[ KMAX_ADDRESS + 1 ];
+	sbyte FromUser[ KMAX_ADDRESS + 1 ];
+    sbyte FromUserIP[ KMAX_ADDRESS + 1 ];
+};
+struct KVoIPEvRegisterParams
+{
+    KVoIPRegTypes Register;
+	sbyte User[ KMAX_ADDRESS + 1 ];
+	sbyte ProxyIP[ KMAX_ADDRESS + 1 ];
+};
+struct KVoIPSeize 
+{
+	sbyte FromUser[ KMAX_ADDRESS + 1 ];
+	sbyte ToUser[ KMAX_ADDRESS + 1 ];
+    sbyte ProxyIP[ KMAX_ADDRESS + 1 ];
+};
+#endif
+#if !defined KLDEFS_H
+#define KLDEFS_H
+
+
+
+#define CM_SEIZE					0x01
+     
+#define CM_SYNC_SEIZE				0x02
+
+#define CM_SIP_REGISTER             0x03
+
+#define CM_DIAL_DTMF				0x04
+
+#define CM_DISCONNECT				0x05
+
+#define CM_CONNECT					0x06
+
+#define CM_PRE_CONNECT				0x07
+
+#define CM_CAS_CHANGE_LINE_STT		0x08
+
+#define CM_CAS_SEND_MFC				0x09
+
+#define CM_SET_FORWARD_CHANNEL		0x0A
+
+#define CM_CAS_SET_MFC_DETECT_MODE	0x0B
+
+#define CM_DROP_COLLECT_CALL		0x0C
+
+#define CM_MAKE_CALL				0x0D
+
+#define CM_RINGBACK 				0x0E
+
+#define CM_USER_INFORMATION         0x0F
+
+#define CM_VOIP_SEIZE				0x23
+
+
+#define	CM_LOCK_INCOMING			0x10
+
+#define CM_UNLOCK_INCOMING			0x11
+
+#define CM_LOCK_OUTGOING			0x12
+
+#define CM_UNLOCK_OUTGOING			0x13
+
+#define CM_START_SEND_FAIL			0x14
+
+#define CM_STOP_SEND_FAIL			0x15
+
+#define CM_END_OF_NUMBER            0x16
+
+#define CM_SEND_SIP_DATA			0x17
+
+#define CM_SS_TRANSFER              0x18
+
+#define CM_GET_SMS                  0x19
+
+#define CM_PREPARE_SMS              0x1A
+
+#define CM_SEND_SMS                 0x1B
+
+#define CM_SEND_TO_MODEM            0x1C
+
+#define CM_CHECK_NEW_SMS            0x1D
+
+#define CM_ISDN_SEND_SUBADDRESSES   0x1E
+
+#define CM_ENABLE_DTMF_SUPPRESSION	0x30
+
+#define CM_DISABLE_DTMF_SUPPRESSION	0x31
+
+#define CM_ENABLE_AUDIO_EVENTS		0x32
+
+#define CM_DISABLE_AUDIO_EVENTS		0x33
+
+#define CM_ENABLE_CALL_PROGRESS		0x34
+
+#define CM_DISABLE_CALL_PROGRESS	0x35
+
+#define CM_FLASH					0x36
+
+#define CM_ENABLE_PULSE_DETECTION	0x37
+
+#define CM_DISABLE_PULSE_DETECTION	0x38
+
+#define CM_ENABLE_ECHO_CANCELLER	0x39
+
+#define CM_DISABLE_ECHO_CANCELLER	0x3A
+
+#define CM_ENABLE_AGC				0x3B
+
+#define CM_DISABLE_AGC				0x3C
+
+#define CM_ENABLE_HIGH_IMP_EVENTS	0x3D
+
+#define CM_DISABLE_HIGH_IMP_EVENTS	0x3E
+
+#define CM_ENABLE_CALL_ANSWER_INFO  0x40
+
+#define CM_DISABLE_CALL_ANSWER_INFO 0x41
+
+#define CM_HOLD_SWITCH             0x4A
+
+#define CM_MPTY_CONF               0x4B
+
+#define CM_MPTY_SPLIT              0x4C
+
+#define CM_START_FAX_TX				0x50
+
+#define CM_CANCEL_FAX_TX			0x51
+
+#define CM_ADD_FAX_FILE				0x52
+
+
+#define CM_RESET_LINK				0xF1
+
+#define CM_CLEAR_LINK_ERROR_COUNTER 0xF2
+
+#define CM_SEND_DEVICE_SECURITY_KEY 0xF3
+
+#define CM_RESET_MODEM              0xF4
+
+
+#define EV_CHANNEL_FREE				0x01
+
+#define EV_CONNECT					0x03
+
+#define EV_DISCONNECT				0x04
+
+#define EV_CALL_SUCCESS				0x05
+
+#define EV_CALL_FAIL				0x06
+
+#define EV_NO_ANSWER				0x07
+
+#define EV_BILLING_PULSE			0x08
+
+#define EV_SEIZE_SUCCESS			0x09
+
+#define EV_SEIZE_FAIL				0x0A
+
+#define EV_SEIZURE_START			0x0B
+
+#define EV_CAS_LINE_STT_CHANGED		0x0C
+
+#define EV_CAS_MFC_RECV				0x0D
+
+#define EV_NEW_CALL                 0x0E
+
+#define EV_USER_INFORMATION         0x0F
+
+#define EV_DIALED_DIGIT             0x10
+
+#define EV_SIP_REGISTER_INFO        0x11
+
+#define EV_RING_DETECTED            0x12
+
+#define EV_ISDN_SUBADDRESSES        0x13
+
+#define EV_CALL_HOLD_START			0x16
+
+#define EV_CALL_HOLD_STOP			0x17
+
+#define EV_SS_TRANSFER_FAIL         0x18
+
+#define EV_FLASH                    0x19
+
+#define EV_ISDN_PROGRESS_INDICATOR	0x1A
+
+#define EV_DTMF_DETECTED			0x20
+
+#define EV_DTMF_SEND_FINISH			0x21
+
+#define EV_AUDIO_STATUS				0x22
+
+#define EV_CADENCE_RECOGNIZED		0x23
+#define EV_CALL_PROGRESS			EV_CADENCE_RECOGNIZED
+
+#define EV_END_OF_STREAM			0x24
+
+#define EV_PULSE_DETECTED			0x25
+
+#define EV_POLARITY_REVERSAL		0x26
+
+#define EV_CALL_ANSWER_INFO     	0x27
+
+#define EV_COLLECT_CALL          	0x28
+
+#define EV_SIP_DTMF_DETECTED        0x29
+
+#define EV_SIP_DATA			        0x2A
+
+#define EV_RECV_FROM_MODEM			0x42
+
+#define EV_NEW_SMS                  0x43
+
+#define EV_SMS_INFO                 0x44
+
+#define EV_SMS_DATA                 0x45
+
+#define EV_SMS_SEND_RESULT          0x46
+
+#define EV_CALL_MPTY_START			0x47
+
+#define EV_CALL_MPTY_STOP			0x48
+
+#define EV_GSM_COMMAND_STATUS		0x49
+
+
+#define EV_CHANNEL_FAIL				0x30
+
+#define EV_REFERENCE_FAIL			0x31
+
+#define EV_INTERNAL_FAIL			0x32
+
+#define EV_HARDWARE_FAIL			0x33
+
+#define EV_LINK_STATUS				0x34
+
+#define EV_PHYSICAL_LINK_UP			0x35
+
+#define EV_PHYSICAL_LINK_DOWN		0x36
+
+#define EV_CLIENT_RECONNECT		0xF0
+
+#define EV_CLIENT_AUDIOLISTENER_TIMEOUT     0xF1
+
+#define EV_CLIENT_BUFFERED_AUDIOLISTENER_OVERFLOW   0xF2
+
+#define EV_REQUEST_DEVICE_SECURITY_KEY 0xF3
+
+#define EV_DISK_IS_FULL		0xF4
+
+
+#define CM_SEND_DTMF				0xD1
+
+#define CM_STOP_AUDIO 				0xD2
+
+#define CM_HARD_RESET				0xF0
+
+#define EV_VOIP_SEIZURE					0x40
+
+#define EV_SEIZURE					0x41
+
+#define EV_FAX_CHANNEL_FREE			0x50
+#define EV_FAX_FILE_SENT			0x51
+#define EV_FAX_FILE_FAIL			0x52
+#endif
+
+   #define FC_REMOTE_FAIL			0x01
+   #define FC_LOCAL_FAIL			0x02
+ 
+   #define FC_REMOTE_LOCK			0x03
+  
+   #define FC_LINE_SIGNAL_FAIL		0x04
+   #define FC_ACOUSTIC_SIGNAL_FAIL	0x05
+
+enum KChannelFail
+{
+	kfcRemoteFail = FC_REMOTE_FAIL,
+	kfcLocalFail = FC_LOCAL_FAIL,
+	kfcRemoteLock = FC_REMOTE_LOCK,
+	kfcLineSignalFail = FC_LINE_SIGNAL_FAIL,
+	kfcAcousticSignalFail = FC_ACOUSTIC_SIGNAL_FAIL
+};
+
+   #define ER_INTERRUPT_CTRL		0x01
+   #define ER_COMMUNICATION_FAIL	0x02
+   #define ER_PROTOCOL_FAIL			0x03
+   #define ER_INTERNAL_BUFFER		0x04
+	#define ER_MONITOR_BUFFER		0x05
+	#define ER_INITIALIZATION		0x06
+	#define ER_INTERFACE_FAIL		0x07
+	#define ER_CLIENT_COMM_FAIL		0x08
+	#define ER_POLL_CTRL			0x09
+	#define ER_EVT_BUFFER_CTRL		0x0A
+
+	#define ER_INVALID_CONFIG_VALUE 0x0B
+
+	#define ER_INTERNAL_GENERIC_FAIL 0x0C
+
+enum KInternalFail
+{
+	kifInterruptCtrl = ER_INTERRUPT_CTRL,
+	kifCommunicationFail = ER_COMMUNICATION_FAIL,
+	kifProtocolFail = ER_PROTOCOL_FAIL,
+	kifInternalBuffer = ER_INTERNAL_BUFFER,
+	kifMonitorBuffer = ER_MONITOR_BUFFER,
+	kifInitialization = ER_INITIALIZATION,
+	kifInterfaceFail = ER_INTERFACE_FAIL,
+	kifClientCommFail = ER_CLIENT_COMM_FAIL
+};	
+
+   #define FS_CHANNEL_LOCKED		0x01
+   #define FS_INCOMING_CHANNEL		0x02
+   #define FS_CHANNEL_NOT_FREE		0x03
+   #define FS_DOUBLE_SEIZE			0x04
+   #define FS_LOCAL_CONGESTION		0x06
+   #define FS_NO_DIAL_TONE			0x07
+enum KSeizeFail
+{
+	ksfChannelLocked = FS_CHANNEL_LOCKED,
+	ksfIncomingChannel = FS_INCOMING_CHANNEL,
+	ksfChannelBusy = FS_CHANNEL_NOT_FREE,
+	ksfDoubleSeizure = FS_DOUBLE_SEIZE,
+	ksfCongestion = FS_LOCAL_CONGESTION,
+	ksfNoDialTone = FS_NO_DIAL_TONE
+};
+#if !defined KH100DEFS_H
+#define KH100DEFS_H
+
+#define CM_SEND_TO_CTBUS			0x90
+
+#define CM_RECV_FROM_CTBUS			0x91
+
+#define CM_SEND_RANGE_TO_CTBUS		0x92
+
+#define CM_SETUP_H100				0x93
+
+enum KH100ConfigIndex
+{
+	khciDeviceMode = 0,
+	khciMasterGenClock = 1,
+	khciCTNetRefEnable = 4,
+	khciSCbusEnable = 6,
+	khciHMVipEnable = 7,
+	khciMVip90Enable = 8,
+	khciCTbusDataEnable = 9,
+	khciCTbusFreq03_00 = 10,
+	khciCTbusFreq07_04 = 11,
+	khciCTbusFreq11_08 = 12,
+	khciCTbusFreq15_12 = 13,
+	khciMax = 14,
+	khciMasterDevId = 20,
+	khciSecMasterDevId = 21,
+	khciCtNetrefDevId = 22,
+    khciMaxH100ConfigIndex
+};	
+
+enum KMasterPLLClockReference
+{
+    h100_Ref_FreeRun = 0,
+    h100_Ref_holdover = 1,
+	h100_Automatic = 2,
+    h100_Ref_ctnetref = 7,
+    h100_Ref_link0 = 8,
+    h100_Ref_link1 = 9
+};
+enum KSlavePLLClockReference
+{
+    h100_PllLoc_ClkA = 0,
+    h100_PllLoc_ClkB = 1,
+    h100_PllLoc_SCBus = 2,
+    h100_PllLoc_MVIP90 = 3,
+    h100_PllLoc_Link0 = 4,
+    h100_PllLoc_Link1 = 5,
+    h100_PllLoc_Error = 6
+};
+
+#define H100_DEVICE_MODE				khciDeviceMode
+	enum KH100Mode
+	{
+		h100_Slave,
+		h100_Master,
+		h100_StandbyMaster,
+		h100_Diagnostic,
+		h100_NotConnected
+	};
+#define H100_MASTER_GEN_CLOCK			khciMasterGenClock
+	enum KH100SelectCtbusClock
+	{
+		h100_scClockA,
+		h100_scClockB
+	};
+
+#define H100_CT_NETREF_ENABLE			khciCTNetRefEnable
+	enum KH100CtNetref
+	{
+		h100_nrOff,
+		h100_nrEnable
+	};
+#define	H100_SCBUS_ENABLE				khciSCbusEnable
+	enum KH100ScbusEnable
+	{
+		h100_seOff,
+		h100_seOn2Mhz,
+		h100_seOn4Mhz,
+		h100_seOn8Mhz
+	};
+#define H100_HMVIP_ENABLE				khciHMVipEnable
+
+#define H100_MVIP90_ENABLE				khciMVip90Enable
+
+#define H100_CTBUS_DATA_ENABLE			khciCTbusDataEnable
+
+enum KH100Enable
+{
+	h100_On = 0x01,
+	h100_Off = 0x00
+};
+	
+#define H100_CTBUS_FREQ_03_00			khciCTbusFreq03_00
+#define H100_CTBUS_FREQ_07_04			khciCTbusFreq07_04
+#define H100_CTBUS_FREQ_11_08			khciCTbusFreq11_08
+#define H100_CTBUS_FREQ_15_12			khciCTbusFreq15_12
+
+enum KH100CtbusFreq
+{
+	h100_cf_2Mhz	=	0,
+	h100_cf_4Mhz	=	1,
+	h100_cf_8Mhz	=	2 
+};
+
+#endif
+
+#define CM_MIXER					0x60
+
+#define CM_CLEAR_MIXER				0x61
+
+#define CM_PLAY_FROM_FILE			0x62
+
+#define CM_RECORD_TO_FILE			0x63
+	
+#define CM_PLAY_FROM_STREAM			0x64 
+
+#define CM_INTERNAL_PLAY			0x65 
+
+#define CM_STOP_PLAY				0x66
+
+#define CM_STOP_RECORD				0x67
+
+#define CM_PAUSE_PLAY				0x68
+
+#define CM_PAUSE_RECORD				0x69
+
+#define CM_RESUME_PLAY				0x6A
+
+#define CM_RESUME_RECORD			0x6B
+
+#define CM_INCREASE_VOLUME			0x6C
+
+#define CM_DECREASE_VOLUME			0x6D
+
+#define CM_LISTEN					0x6E
+
+#define CM_STOP_LISTEN				0x6F
+
+#define CM_PREPARE_FOR_LISTEN		0x70
+
+#define CM_PLAY_SOUND_CARD			0x71
+
+#define CM_STOP_SOUND_CARD			0x72
+
+#define CM_MIXER_CTBUS				0x73
+
+#define CM_PLAY_FROM_STREAM_EX			0x74 
+
+#define CM_INTERNAL_PLAY_EX			0x75 
+
+#define CM_ENABLE_PLAYER_AGC		0x76
+
+#define CM_DISABLE_PLAYER_AGC		0x77
+
+#define CM_START_STREAM_BUFFER		0x78
+
+#define CM_ADD_STREAM_BUFFER		0x79
+
+#define CM_STOP_STREAM_BUFFER		0x7A
+
+#define CM_SEND_BEEP				0x7B
+
+#define CM_SEND_BEEP_CONF			0x7C
+
+#define CM_ADD_TO_CONF				0x7D
+
+#define CM_REMOVE_FROM_CONF			0x7E
+
+#define CM_RECORD_TO_FILE_EX		0x7F
+
+#define CM_SET_VOLUME				0xA0
+
+#define CM_START_CADENCE			0xA1
+
+#define CM_STOP_CADENCE				0xA2
+#if !defined KR2D_H
+#define KR2D_H
+
+#define CM_SET_LINE_CONDITION		0x80
+
+#define CM_SEND_LINE_CONDITION		0x81
+
+#define CM_SET_CALLER_CATEGORY		0x82
+      
+	
+#define CM_DIAL_MFC					0x83
+
+
+
+enum KSignGroupII_Brazil
+{
+	kg2BrOrdinary		        = 0x01,     
+	kg2BrPriority		        = 0x02,     
+	kg2BrMaintenance	        = 0x03,     
+	kg2BrLocalPayPhone	        = 0x04,     
+	kg2BrTrunkOperator	        = 0x05,     
+	kg2BrDataTrans	            = 0x06,     
+	kg2BrNonLocalPayPhone       = 0x07,     
+	kg2BrCollectCall	        = 0x08,     
+	kg2BrOrdinaryInter	        = 0x09,     
+	kg2BrTransfered		        = 0x0B,     
+};
+
+enum KSignGroupB_Brazil
+{
+	kgbBrLineFreeCharged		= 0x01,     
+	kgbBrBusy					= 0x02,     
+	kgbBrNumberChanged			= 0x03,     
+	kgbBrCongestion				= 0x04,     
+	kgbBrLineFreeNotCharged		= 0x05,     
+	kgbBrLineFreeChargedLPR		= 0x06,     
+	kgbBrInvalidNumber			= 0x07,     
+	kgbBrLineOutOfOrder			= 0x08,     
+	kgbBrNone					= 0xFF      
+};
+
+
+enum KSignGroupII_Argentina
+{
+	kg2ArOrdinary		        = 0x01,     
+	kg2ArPriority		        = 0x02,     
+	kg2ArMaintenance	        = 0x03,     
+	kg2ArLocalPayPhone	        = 0x04,     
+	kg2ArTrunkOperator	        = 0x05,     
+	kg2ArDataTrans	            = 0x06,     
+    kg2ArCPTP                   = 0x0B,     
+    kg2ArSpecialLine            = 0x0C,     
+    kg2ArMobileUser             = 0x0D,     
+    kg2ArPrivateRedLine         = 0x0E,     
+    kg2ArSpecialPayPhoneLine    = 0x0F,     
+};
+
+enum KSignGroupB_Argentina
+{
+	kgbArNumberChanged			= 0x02,     
+	kgbArBusy					= 0x03,     
+	kgbArCongestion				= 0x04,     
+	kgbArInvalidNumber			= 0x05,     
+	kgbArLineFreeCharged		= 0x06,     
+	kgbArLineFreeNotCharged		= 0x07,     
+	kgbArLineOutOfOrder			= 0x08,     
+	kgbArNone					= 0xFF      
+};
+
+
+enum KSignGroupII_Chile
+{
+    kg2ClOrdinary		        = 0x01,     
+	kg2ClPriority		        = 0x02,     
+	kg2ClMaintenance	        = 0x03,     
+	kg2ClTrunkOperator	        = 0x05,     
+	kg2ClDataTrans	            = 0x06,     
+    kg2ClUnidentifiedSubscriber = 0x0B,     
+};
+
+enum KSignGroupB_Chile
+{
+	kgbClNumberChanged			= 0x02,     
+	kgbClBusy					= 0x03,     
+	kgbClCongestion				= 0x04,     
+	kgbClInvalidNumber			= 0x05,     
+	kgbClLineFreeCharged		= 0x06,     
+	kgbClLineFreeNotCharged		= 0x07,     
+	kgbClLineOutOfOrder			= 0x08,     
+	kgbClNone					= 0xFF      
+};
+
+
+enum KSignGroupII_Mexico
+{
+	kg2MxTrunkOperator	        = 0x01,     
+	kg2MxOrdinary		        = 0x02,     
+	kg2MxMaintenance	        = 0x06,     
+};
+
+enum KSignGroupB_Mexico
+{
+	kgbMxLineFreeCharged		= 0x01,     
+	kgbMxBusy					= 0x02,     
+	kgbMxLineFreeNotCharged		= 0x05,     
+	kgbMxNone				    = 0xFF      
+};
+
+
+enum KSignGroupII_Uruguay
+{
+	kg2UyOrdinary		        = 0x01,     
+	kg2UyPriority		        = 0x02,     
+	kg2UyMaintenance	        = 0x03,     
+	kg2UyLocalPayPhone	        = 0x04,     
+	kg2UyTrunkOperator	        = 0x05,     
+	kg2UyDataTrans	            = 0x06,     
+    kg2UyInternSubscriber       = 0x07,     
+};
+
+enum KSignGroupB_Uruguay
+{
+	kgbUyNumberChanged			= 0x02,     
+	kgbUyBusy					= 0x03,     
+	kgbUyCongestion				= 0x04,     
+	kgbUyInvalidNumber			= 0x05,     
+	kgbUyLineFreeCharged		= 0x06,     
+	kgbUyLineFreeNotCharged		= 0x07,     
+	kgbUyLineOutOfOrder			= 0x08,     
+	kgbUyNone					= 0xFF      
+};
+
+
+enum KSignGroupII_Venezuela
+{
+	kg2VeOrdinary		        = 0x01,     
+	kg2VePriority		        = 0x02,     
+	kg2VeMaintenance	        = 0x03,     
+	kg2VeLocalPayPhone	        = 0x04,     
+	kg2VeTrunkOperator	        = 0x05,     
+	kg2VeDataTrans	            = 0x06,     
+    kg2VeNoTransferFacility     = 0x07,     
+};
+
+enum KSignGroupB_Venezuela
+{
+	kgbVeLineFreeChargedLPR		= 0x01,     
+	kgbVeNumberChanged			= 0x02,     
+	kgbVeBusy					= 0x03,     
+	kgbVeCongestion				= 0x04,     
+	kgbVeInformationTone		= 0x05,     
+	kgbVeLineFreeCharged		= 0x06,     
+	kgbVeLineFreeNotCharged		= 0x07,     
+    kgbVeLineBlocked            = 0x08,     
+    kgbVeIntercepted            = 0x09,     
+    kgbVeDataTrans              = 0x0A,     
+	kgbVeNone					= 0xFF      
+};
+
+
+
+
+
+enum KSignGroupB
+{
+	kgbLineFreeCharged			= 0x01,
+	kgbLineFreeNotCharged		= 0x05,
+	kgbLineFreeChargedLPR		= 0x06,
+	kgbBusy						= 0x02,
+	kgbNumberChanged			= 0x03,
+	kgbCongestion				= 0x04,
+	kgbInvalidNumber			= 0x07,
+	kgbLineOutOfOrder			= 0x08,
+	kgbNone						= 0xFF
+};
+#define STT_GB_LINEFREE_CHARGED				0x01
+#define STT_GB_LINEFREE_NOTCHARGED			0x05
+#define STT_GB_LINEFREE_CHARGED_LPR			0x06
+#define	STT_GB_BUSY							0x02
+#define STT_GB_NUMBER_CHANGED				0x03
+#define STT_GB_CONGESTION					0x04
+#define STT_GB_UNALLOCATED_NUMBER			0x07
+#define STT_GB_LINE_OUT_OF_ORDER			0x08
+#define STT_GB_NONE							0xFF
+
+enum KSignGroupII
+{
+	kg2Ordinary			= 0x01,
+	kg2Priority			= 0x02,
+	kg2Maintenance		= 0x03,
+	kg2LocalPayPhone	= 0x04,
+	kg2TrunkOperator	= 0x05,
+	kg2DataTrans		= 0x06,
+	kg2NonLocalPayPhone = 0x07,
+	kg2CollectCall		= 0x08,
+	kg2OrdinaryInter	= 0x09,
+	kg2Transfered		= 0x0B,
+};
+#define STT_GII_ORDINARY					0x01
+#define STT_GII_PRIORITY					0x02
+#define STT_GII_MAINTENANCE					0x03
+#define STT_GII_LOCAL_PAY_PHONE				0x04
+#define STT_GII_TRUNK_OPERATOR				0x05
+#define STT_GII_DATA_TRANS					0x06
+#define STT_GII_NON_LOCAL_PAY_PHONE			0x07		
+#define STT_GII_COLLECT_CALL				0x08
+#define STT_GII_ORDINARY_INTERNATIONAL		0x09
+#define STT_GII_TRANSFERED					0x0B
+#endif
+#ifndef _KISDN_H_
+#define _KISDN_H_
+#define KMAX_USER_USER_LEN              32
+#define KMAX_SUBADRESS_INFORMATION_LEN  20 
+
+enum KQ931Cause
+{
+    kq931cNone                    			= 0,
+    kq931cUnallocatedNumber       			= 1,
+    kq931cNoRouteToTransitNet     			= 2,
+    kq931cNoRouteToDest           			= 3,
+	kq931cSendSpecialInfoTone				= 4,
+	kq931cMisdialedTrunkPrefix				= 5,
+    kq931cChannelUnacceptable     			= 6,
+    kq931cCallAwarded             			= 7,
+	kq931cPreemption						= 8,
+	kq931cPreemptionCircuitReuse			= 9,
+	kq931cQoR_PortedNumber					= 14,
+    kq931cNormalCallClear         			= 16,
+    kq931cUserBusy                			= 17,
+    kq931cNoUserResponding        			= 18,
+    kq931cNoAnswerFromUser        			= 19,
+	kq931cSubscriberAbsent					= 20,
+    kq931cCallRejected            			= 21,
+    kq931cNumberChanged           			= 22,
+	kq931cRedirectionToNewDest				= 23,
+	kq931cCallRejectedFeatureDest			= 24,
+	kq931cExchangeRoutingError				= 25,
+    kq931cNonSelectedUserClear    			= 26,
+    kq931cDestinationOutOfOrder   			= 27,
+    kq931cInvalidNumberFormat     			= 28,
+    kq931cFacilityRejected        			= 29,
+    kq931cRespStatusEnquiry       			= 30,
+    kq931cNormalUnspecified       			= 31,
+    kq931cNoCircuitChannelAvail   			= 34,
+    kq931cNetworkOutOfOrder       			= 38,
+	kq931cPermanentFrameConnOutOfService	= 39,
+	kq931cPermanentFrameConnOperational		= 40,
+    kq931cTemporaryFailure          		= 41,
+    kq931cSwitchCongestion          		= 42,
+    kq931cAccessInfoDiscarded       		= 43,
+    kq931cRequestedChannelUnav      		= 44,
+	kq931cPrecedenceCallBlocked				= 46,
+    kq931cResourceUnavailable       		= 47,
+    kq931cQosUnavailable            		= 49,
+    kq931cReqFacilityNotSubsc       		= 50,
+	kq931cOutCallsBarredWithinCUG			= 53,
+	kq931cInCallsBarredWithinCUG			= 55,
+    kq931cBearerCapabNotAuthor      		= 57,
+    kq931cBearerCapabNotAvail       		= 58,
+	kq931cInconsistency						= 62,
+    kq931cServiceNotAvailable       		= 63,
+    kq931cBcNotImplemented          		= 65,
+    kq931cChannelTypeNotImplem      		= 66,
+    kq931cReqFacilityNotImplem      		= 69,
+    kq931cOnlyRestrictedBcAvail     		= 70,
+    kq931cServiceNotImplemented     		= 79,
+    kq931cInvalidCrv                		= 81,
+    kq931cChannelDoesNotExist       		= 82,
+    kq931cCallIdDoesNotExist        		= 83,
+    kq931cCallIdInUse               		= 84,
+    kq931cNoCallSuspended           		= 85,
+    kq931cCallIdCleared             		= 86,
+	kq931cUserNotMemberofCUG				= 87,
+    kq931cIncompatibleDestination   		= 88,
+    kq931cInvalidTransitNetSel      		= 91,
+    kq931cInvalidMessage            		= 95,
+    kq931cMissingMandatoryIe        		= 96,
+    kq931cMsgTypeNotImplemented     		= 97,
+    kq931cMsgIncompatWithState      		= 98,
+    kq931cIeNotImplemented          		= 99,
+    kq931cInvalidIe                 		= 100,
+    kq931cMsgIncompatWithState2     		= 101,
+    kq931cRecoveryOnTimerExpiry     		= 102,
+    kq931cProtocolError             		= 103,
+	kq931cMessageWithUnrecognizedParam		= 110,
+	kq931cProtocolErrorUnspecified			= 111,
+    kq931cInterworking              		= 127,
+    kq931cCallConnected             		= 128,
+    kq931cCallTimedOut              		= 129,
+    kq931cCallNotFound              		= 130,
+    kq931cCantReleaseCall           		= 131,
+    kq931cNetworkFailure            		= 132,
+    kq931cNetworkRestart            		= 133,
+    kq931cLastValidCause            		= kq931cNetworkRestart,
+};
+
+enum KQ931ProgressIndication
+{
+    kq931pTonesMaybeAvailable       = 1,
+    kq931pDestinationIsNonIsdn      = 2,
+    kq931pOriginationIsNonIsdn      = 3,
+    kq931pCallReturnedToIsdn        = 4,
+    kq931pTonesAvailable            = 8,
+};
+
+enum KQ931Hlc
+{
+    kq931hTelefony                  = 0x81,
+    k1931hFaxGroup23                = 0x84,
+    k1931hFaxGroup4                 = 0xa1,
+    kq931hTeletexF184               = 0xa4,
+    kq931hTeletexF220               = 0xa8,
+    kq931hTeletexf200               = 0xb1,
+    kq931hVideotex                  = 0xb2,
+    kq931hTelexF60                  = 0xb5,
+    kq931hMhs                       = 0xb8,
+    kq931hOsiApp                    = 0xc1,
+    kq931hMaintenance               = 0xde,
+    kq931hManagement                = 0xdf,
+};
+
+enum KQ931BearerCapability
+{
+    kq931bSpeech                    = 0x00,
+    kq931bUnrestrictedDigital       = 0x08,
+    kq931bAudio31kHz                = 0x10,
+    kq931bAudio7kHz                 = 0x11,
+    kq931bVideo                     = 0x18,
+};
+
+enum KQ931TypeOfNumber
+{
+    kq931tUnknownNumber             = 0x00,
+    kq931tInternationalNumber       = 0x10,
+    kq931tNationalNumber            = 0x20,
+    kq931tNetworkSpecificNumber     = 0x30,
+    kq931tSubscriberNumber          = 0x40,
+    kq931tAbbreviatedNumber         = 0x60,
+    kq931tReservedNumber            = 0x70,
+    kq931tDefaultNumber             = kq931tUnknownNumber,
+};
+
+enum KQ931NumberingPlan
+{
+    kq931pUnknownPlan               = 0x00,
+    kq931pIsdnPlan                  = 0x01,
+    kq931pDataPlan                  = 0x03,
+    kq931pTelexPlan                 = 0x04,
+    kq931pNationalPlan              = 0x08,
+    kq931pPrivatePlan               = 0x09,
+    kq931pReservedPlan              = 0x0F,
+    kq931pDefaultPlan               = kq931pUnknownPlan,
+};
+
+enum KQ931UserInfoProtocolDescriptor
+{
+    kq931uuUserSpecific             = 0x00,
+    kq931uuOSI_HighLayer            = 0x01,
+    kq931uuX244                     = 0x02,
+    kq931uuIA5_Chars                = 0x04,
+    kq931uuX208_X209                = 0x05,
+    kq931uuV120                     = 0x07,
+    kq931uuQ931_CallControl         = 0x08,
+    kq931uuNational                 = 0x40 
+};
+enum KQ931PresentationIndicator
+{
+	kq931piPresentationAllowed					= 0x00,
+	kq931piPresentationRestricted				= 0x01,
+	kq931piNumberNotAvailableDueToInterworking	= 0x02,
+};
+enum KQ931ScreeningIndicator
+{
+	kq931siUserProvidedNotScreened				= 0x00,
+	kq931siUserProvidedVerifiedAndPassed		= 0x01,
+	kq931siUserProvidedVerifiedAndFailed		= 0x02,
+	kq931siNetworkProvided						= 0x03,
+};
+enum KQ931TypeOfSubaddress
+{
+    kq931tsNSAP                                 = 0x00,
+    kq931tsUserSpecified                        = 0x01,
+};
+#endif 
+#ifndef KGSM_H
+#define KGSM_H
+
+enum KGsmCallCause
+{
+    kgccNone                      = 0,
+    kgccUnallocatedNumber         = 1,
+    kgccNoRouteToDest             = 3,
+    kgccChannelUnacceptable       = 6,
+    kgccOperatorDeterminedBarring = 8,
+    kgccNormalCallClear           = 16,
+    kgccUserBusy                  = 17,
+    kgccNoUserResponding          = 18,
+    kgccNoAnswerFromUser          = 19,
+    kgccCallRejected              = 21,
+    kgccNumberChanged             = 22,
+    kgccNonSelectedUserClear      = 26,
+    kgccDestinationOutOfOrder     = 27,
+    kgccInvalidNumberFormat       = 28,
+    kgccFacilityRejected          = 29,
+    kgccRespStatusEnquiry         = 30,
+    kgccNormalUnspecified         = 31,
+    kgccNoCircuitChannelAvail     = 34,
+    kgccNetworkOutOfOrder         = 38,
+    kgccTemporaryFailure          = 41,
+    kgccSwitchCongestion          = 42,
+    kgccAccessInfoDiscarded       = 43,
+    kgccRequestedChannelUnav      = 44,
+    kgccResourceUnavailable       = 47,
+    kgccQosUnavailable            = 49,
+    kgccReqFacilityNotSubsc       = 50,
+    kgccCallBarredWitchCUG        = 55,
+    kgccBearerCapabNotAuthor      = 57,
+    kgccBearerCapabNotAvail       = 58,
+    kgccServiceNotAvailable       = 63,
+    kgccBcNotImplemented          = 65,
+    kgccReqFacilityNotImplem      = 69,
+    kgccOnlyRestrictedBcAvail     = 70,
+    kgccServiceNotImplemented     = 79,
+    kgccInvalidCrv                = 81,
+    kgccUserNotMemberOfCUG        = 82,
+    kgccIncompatibleDestination   = 88,
+    kgccInvalidTransitNetSel      = 91,
+    kgccInvalidMessage            = 95,
+    kgccMissingMandatoryIe        = 96,
+    kgccMsgTypeNotImplemented     = 97,
+    kgccMsgIncompatWithState      = 98,
+    kgccIeNotImplemented          = 99,
+    kgccInvalidIe                 = 100,
+    kgccMsgIncompatWithState2     = 101,
+    kgccRecoveryOnTimerExpiry     = 102,
+    kgccProtocolError             = 111,
+    kgccInterworking              = 127,
+};
+
+enum KGsmMobileCause
+{
+    kgmcPhoneFailure                = 0,
+    kgmcNoConnectionToPhone         = 1,
+    kgmcPhoneAdaptorLinkReserved    = 2,
+    kgmcOperationNotAllowed         = 3,
+    kgmcOperationNotSupported       = 4,
+    kgmcPH_SIMPINRequired           = 5,
+    kgmcPH_FSIMPINRequired          = 6,
+    kgmcPH_FSIMPUKRequired          = 7,
+    kgmcSIMNotInserted              = 10,
+    kgmcSIMPINRequired              = 11,
+    kgmcSIMPUKRequired              = 12,
+    kgmcSIMFailure                  = 13,
+    kgmcSIMBusy                     = 14,
+    kgmcSIMWrong                    = 15,
+    kgmcIncorrectPassword           = 16,
+    kgmcSIMPIN2Required             = 17,
+    kgmcSIMPUK2Required             = 18,
+    kgmcMemoryFull                  = 20,
+    kgmcInvalidIndex                = 21,
+    kgmcNotFound                    = 22,
+    kgmcMemoryFailure               = 23,
+    kgmcTextStringTooLong           = 24,
+    kgmcInvalidCharInTextString     = 25,
+    kgmcDialStringTooLong           = 26,
+    kgmcInvalidCharInDialString     = 27,
+    kgmcNoNetworkService            = 30,  
+    kgmcNetworkTimeout              = 31,  
+    kgmcNetworkNotAllowed           = 32,
+    kgmcCommandAborted              = 33,
+    kgmcNumParamInsteadTextParam    = 34,
+    kgmcTextParamInsteadNumParam    = 35,
+    kgmcNumericParamOutOfBounds     = 36,
+    kgmcTextStringTooShort          = 37,
+    kgmcNetworkPINRequired          = 40,
+    kgmcNetworkPUKRequired          = 41,
+    kgmcNetworkSubsetPINRequired    = 42,
+    kgmcNetworkSubnetPUKRequired    = 43,
+    kgmcServiceProviderPINRequired  = 44,
+    kgmcServiceProviderPUKRequired  = 45,
+    kgmcCorporatePINRequired        = 46,
+    kgmcCorporatePUKRequired        = 47,
+    kgmcSIMServiceOptNotSupported   = 60,
+    kgmcUnknown                     = 100,
+    kgmcIllegalMS_N3                = 103,
+    kgmcIllegalME_N6                = 106,
+    kgmcGPRSServicesNotAllowed_N7   = 107,
+    kgmcPLMNNotAllowed_No11         = 111,
+    kgmcLocationAreaNotAllowed_N12  = 112,
+    kgmcRoamingNotAllowed_N13       = 113,
+    kgmcServiceOptNotSupported_N32  = 132,
+    kgmcReqServOptNotSubscribed_N33 = 133,
+    kgmcServOptTempOutOfOrder_N34   = 134,
+    kgmcLongContextActivation       = 147,
+    kgmcUnspecifiedGPRSError        = 148,
+    kgmcPDPAuthenticationFailure    = 149,
+    kgmcInvalidMobileClass          = 150,
+    kgmcGPRSDisconnectionTmrActive  = 151,
+    kgmcTooManyActiveCalls          = 256,
+    kgmcCallRejected                = 257,
+    kgmcUnansweredCallPending       = 258,
+    kgmcUnknownCallingError         = 259,
+    kgmcNoPhoneNumRecognized        = 260,
+    kgmcCallStateNotIdle            = 261,
+    kgmcCallInProgress              = 262,
+    kgmcDialStateError              = 263,
+    kgmcUnlockCodeRequired          = 264,
+    kgmcNetworkBusy                 = 265,
+    kgmcInvalidPhoneNumber          = 266,
+    kgmcNumberEntryAlreadyStarted   = 267,
+    kgmcCancelledByUser             = 268,
+    kgmcNumEntryCouldNotBeStarted   = 269,
+    kgmcDataLost                    = 280,
+    kgmcInvalidBessageBodyLength    = 281,
+    kgmcInactiveSocket              = 282,
+    kgmcSocketAlreadyOpen           = 283
+};
+
+enum KGsmSmsCause
+{
+    kgscUnassigned                  = 1,
+    kgscOperatorDeterminedBarring   = 8,
+    kgscCallBarred                  = 10,
+    kgscSMSTransferRejected         = 21,
+    kgscDestinationOutOfService     = 27,
+    kgscUnidentifiedSubscriber      = 28,
+    kgscFacilityRejected            = 29,
+    kgscUnknownSubscriber           = 30,
+    kgscNetworkOutOfOrder           = 38,
+    kgscTemporaryFailure            = 41,
+    kgscCongestion                  = 42,
+    kgscResourcesUnavailable        = 47,
+    kgscFacilityNotSubscribed       = 50,
+    kgscFacilityNotImplemented      = 69,
+    kgscInvalidSMSTransferRefValue  = 81,
+    kgscInvalidMessage              = 95,
+    kgscInvalidMandatoryInformation = 96,
+    kgscMessageTypeNonExistent      = 97,
+    kgscMsgNotCompatWithSMProtState = 98,
+    kgscInformationElementNonExiste = 99,
+    kgscProtocolError               = 111,
+    kgscInterworking                = 127,
+    kgscTelematicInterworkingNotSup = 128,
+    kgscSMSTypeZeroNotSupported     = 129,
+    kgscCannotReplaceSMS            = 130,
+    kgscUnspecifiedTPPIDError       = 143,
+    kgscAlphabetNotSupported        = 144,
+    kgscMessageClassNotSupported    = 145,
+    kgscUnspecifiedTPDCSError       = 159,
+    kgscCommandCannotBeActioned     = 160,
+    kgscCommandUnsupported          = 161,
+    kgscUnspecifiedTPCommandError   = 175,
+    kgscTPDUNotSupported            = 176,
+    kgscSCBusy                      = 192,
+    kgscNoSCSubscription            = 193,
+    kgscSCSystemFailure             = 194,
+    kgscInvalidSMEAddress           = 195,
+    kgscDestinationSMEBarred        = 196,
+    kgscSMRejectedDuplicateSM       = 197,
+    kgscTPVPFNotSupported           = 198,
+    kgscTPVPNotSupported            = 199,
+    kgscSIMSMSStorageFull           = 208,
+    kgscNoSMSStorageCapabilityInSIM = 209,
+    kgscErrorInMS                   = 210,
+    kgscMemoryCapacityExceeded      = 211,
+    kgscSIMDataDownloadError        = 213,
+    kgscUnspecifiedError            = 255,
+    kgscPhoneFailure                = 300,
+    kgscSmsServiceReserved          = 301,
+    kgscOperationNotAllowed         = 302,
+    kgscOperationNotSupported       = 303,
+    kgscInvalidPDUModeParameter     = 304,
+    kgscInvalidTextModeParameter    = 305,
+    kgscSIMNotInserted              = 310,
+    kgscSIMPINNecessary             = 311,
+    kgscPH_SIMPINNecessary          = 312,
+    kgscSIMFailure                  = 313,
+    kgscSIMBusy                     = 314,
+    kgscSIMWrong                    = 315,
+    kgscMemoryFailure               = 320,
+    kgscInvalidMemoryIndex          = 321,
+    kgscMemoryFull                  = 322,
+    kgscSMSCAddressUnknown          = 330,
+    kgscNoNetworkService            = 331,
+    kgscNetworkTimeout              = 332,
+    kgscUnknownError                = 500,
+    kgscNetworkBusy                 = 512,
+    kgscInvalidDestinationAddress   = 513,
+    kgscInvalidMessageBodyLength    = 514,
+    kgscPhoneIsNotInService         = 515,
+    kgscInvalidPreferredMemStorage  = 516,
+    kgscUserTerminated              = 517
+};
+#endif
+#ifndef k3lVersion_h
+#define k3lVersion_h
+#define k3lApiMajorVersion	2
+#define k3lApiMinorVersion	1
+#define k3lApiBuildVersion	0
+#endif
+#if !defined K3L_H
+#define K3L_H
+
+enum KDeviceType
+{
+	kdtE1     = 0,
+	kdtFXO    = 1,
+	kdtConf   = 2,
+	kdtPR     = 3,
+	kdtE1GW   = 4,
+	kdtFXOVoIP = 5,
+	kdtE1IP	  = 6,
+	kdtE1Spx  = 7,
+    kdtGWIP   = 8,
+    kdtFXS    = 9,
+    kdtFXSSpx = 10,
+    kdtGSM    = 11,
+    kdtGSMSpx = 12,
+	kdtFax    = 13,
+	kdtDevTypeCount
+};
+enum KSignaling
+{
+	ksigInactive		= 0,
+	ksigR2Digital		= 1,
+	ksigContinuousEM	= 2,
+	ksigPulsedEM		= 3,
+	ksigUserR2Digital	= 4,
+	ksigAnalog			= 5,
+	ksigOpenCAS			= 6,
+	ksigOpenR2			= 7,
+	ksigSIP 			= 8,
+    ksigOpenCCS         = 9,
+    ksigPRI_EndPoint    = 10,
+    ksigAnalogTerminal  = 11,
+    ksigPRI_Network     = 12,
+    ksigPRI_Passive     = 13,
+	ksigLineSide  		= 14,
+	ksigCAS_EL7			= 15,
+    ksigGSM             = 16,
+	ksigE1LC			= 17,
+	ksigISUP			= 18,
+	ksigFax				= 19,
+};
+enum KE1DeviceModel
+{
+	kdmE1600	= 0,
+	kdmE1600E	= 1,
+	kdmE1600EX  = 2
+};
+enum KE1GWDeviceModel 
+{
+	kdmE1GW640   = 1,
+    kdmE1GW640EX = 2
+};
+enum KE1IPDeviceModel 
+{
+	kdmE1IP   = 1,
+    kdmE1IPEX = 2
+};
+enum KGWIPDeviceModel 
+{
+	kdmGWIP   = 1,
+	kdmGWIPEX = 2
+};
+enum KFXODeviceModel
+{
+	kdmFXO80    = 0,
+	kdmFXOHI    = 1,
+	kdmFXO160HI = 2
+};
+enum KFXOVoIPDeviceModel 
+{
+	kdmFXGW180 = kdmFXO80
+};
+enum KConfDeviceModel
+{
+	kdmConf240   = 0,
+	kdmConf120   = 1,
+	kdmConf240EX = 2,
+	kdmConf120EX = 3
+};
+enum KPRDeviceModel
+{
+	kdmPR300v1         = 0,
+    kdmPR300           = 1,
+	kdmPR300SpxBased   = 2,
+    kdmPR300EX         = 3
+};
+enum KFXSDeviceModel
+{
+    kdmFXS300   = 1,
+    kdmFXS300EX = 2
+};
+enum KFXSSpxDeviceModel
+{
+    kdmFXSSpx300      = 0,
+    kdmFXSSpx2E1Based = 1,
+    kdmFXSSpx300EX    = 2
+};
+enum KE1SpxDeviceModel
+{
+	kdmE1Spx    = 0,
+	kdm2E1Based = 1,
+    kdmE1SpxEX  = 2
+};
+enum KGSMDeviceModel
+{
+    kdmGSM      = 0
+};
+enum KGSMSpxDeviceModel
+{
+    kdmGSMSpx   = 0
+};
+enum KFaxDeviceModel
+{
+	kdmFax   = 0,
+	kdmFaxEX = 1
+};
+enum KSystemObject
+{
+	ksoLink		= 0x00,		
+	ksoLinkMon	= 0x20,		
+	ksoChannel	= 0x1000,	
+	ksoH100		= 0x200,	
+	ksoFirmware = 0x80,		
+	ksoDevice	= 0x100,	
+	ksoAPI		= 0x150		
+};
+enum KFirmwareId
+{
+	kfiE1600A,				
+	kfiE1600B,				
+	kfiFXO80,				
+    kfiGSM40                
+};
+enum KE1Status
+{
+	kesOk					= 0x00,		
+	kesSignalLost			= 0x01,		
+	kesNetworkAlarm			= 0x02,		
+	kesFrameSyncLost		= 0x04,		
+	kesMultiframeSyncLost	= 0x08,		
+	kesRemoteAlarm			= 0x10,		
+	kesHighErrorRate		= 0x20,		
+	kesUnknownAlarm			= 0x40,		
+	kesE1Error				= 0x80,		
+    kesNotInitialized       = 0xFF      
+};
+enum KE1ChannelStatus
+{
+	kecsFree			= 0x00,			
+	kecsBusy			= 0x01,			
+	kecsOutgoing		= 0x02,			
+	kecsIncoming		= 0x04,			
+	kecsLocked			= 0x06,			
+	kecsOutgoingLock	= 0x10,			
+	kecsLocalFail		= 0x20,			
+	kecsIncomingLock	= 0x40,			
+	kecsRemoteLock		= 0x80			
+};
+enum KVoIPChannelStatus
+{
+	kipcsFree			= kecsFree,		
+	kipcsOutgoingLock	= kecsOutgoingLock,
+	kipcsIncomingLock	= kecsIncomingLock
+};
+enum KFXOChannelStatus
+{
+	kfcsDisabled	= 0x00,		
+	kfcsEnabled		= 0x01		
+};
+enum KFXSChannelStatus
+{
+    kfxsOnHook,
+    kfxsOffHook,
+    kfxsRinging,
+    kfxsFail
+};
+enum KGsmChannelStatus
+{
+    kgsmIdle,
+    kgsmCallInProgress,
+    kgsmSMSInProgress,
+    kgsmModemError,
+    kgsmSIMCardError,
+    kgsmNetworkError,
+    kgsmNotReady
+};
+enum KCallStatus
+{
+	kcsFree		= 0x00,				
+	kcsIncoming = 0x01,				
+	kcsOutgoing = 0x02,				
+	kcsFail		= 0x04				
+};
+enum KCallStartInfo
+{
+    kcsiHumanAnswer,
+    kcsiAnsweringMachine,
+    kcsiCellPhoneMessageBox,
+    kcsiUnknown,
+    kcsiCarrierMessage
+};
+enum KChannelFeatures
+{
+	kcfDtmfSuppression	= 0x0001,
+	kcfCallProgress		= 0x0002,
+	kcfPulseDetection	= 0x0004,
+	kcfAudioNotification= 0x0008,
+	kcfEchoCanceller	= 0x0010,
+	kcfAutoGainControl	= 0x0020,
+	kcfHighImpEvents	= 0x0080,
+    kcfCallAnswerInfo   = 0x0100,
+    kcfOutputVolume     = 0x0200,
+    kcfPlayerAGC        = 0x0400
+};
+enum KMixerSource
+{
+	kmsChannel,
+	kmsPlay,
+	kmsGenerator,
+	kmsCTbus,
+    kmsNoDelayChannel
+};
+struct KMixerCommand
+{
+    int32 Track;
+    int32 Source;        
+    int32 SourceIndex;
+};
+struct KPlayFromStreamCommand
+{
+	void *Buffer;
+	uint32 BufferSize;
+	int32 CodecIndex;
+};
+struct KBufferParam
+{
+	void *Buffer;
+	uint32 BufferSize;
+};
+enum KMixerTone
+{
+	kmtSilence	= 0x00,	
+	kmtDial		= 0x01, 
+	kmtBusy		= 0x02, 
+	kmtFax		= 0x03, 
+	kmtVoice	= 0x04, 
+	kmtEndOf425 = 0x05,	
+    kmtCollect  = 0x06, 
+    kmtEndOfDtmf= 0x07, 
+};
+struct K3L_CHANNEL_STATUS
+{
+ 	KCallStatus CallStatus;
+	KMixerTone AudioStatus;
+	int32 AddInfo;			
+	int32 EnabledFeatures;	
+};
+struct K3L_LINK_STATUS
+{
+	int16 E1; 
+	byte Channels[ KMAX_E1_CHANNELS ];	
+};
+enum KPllErrors
+{
+	kpeClockAError    = 0x01,
+	kpeClockBError    = 0x02,
+	kpeSCbusError     = 0x04,
+	kpeMVIPError	  = 0x08,
+	kpeMasterPllError = 0x10,
+	kpeModeError      = 0x20,
+	kpeLocalRefError  = 0x40,
+	kpeInternalError  = 0x80
+};
+struct K3L_H100_STATUS
+{
+	int32 Mode;
+	int32 MasterClock;
+	int32 Enable;
+	int32 Reference;
+	int32 SCbus;
+	int32 HMVIP;
+	int32 MVIP90;
+	int32 CT_NETREF;
+	int32 PllLocalRef;
+	int32 PllErrors;		
+};
+enum KEchoLocation
+{
+	kelNetwork	= 0x0,
+	kelCtBus	= 0x1
+};
+enum KCodecIndex
+{
+	kci8kHzALAW	= 0x00,
+	kci8kHzPCM	= 0x01,  
+	kci11kHzPCM	= 0x02,  
+	kci8kHzGSM	= 0x03, 
+	kci8kHzADPCM= 0x04, 
+	kci8kHzULAW	= 0x05,
+	kci8kHzG729 = 0x06,
+	kci8kHziLBC = 0x07,
+	kciLastCodecEntryMark
+};
+enum KEchoCancellerConfig
+{
+    keccNotPresent,
+    keccOneSingleBank,
+    keccOneDoubleBank,
+    keccTwoSingleBank,
+    keccTwoDoubleBank,
+    keccFail
+};
+struct K3L_DEVICE_CONFIG
+{
+	int32 LinkCount;
+	int32 ChannelCount;
+	int32 EnabledChannelCount;
+	int32 MixerCount;
+	int32 MixerCapacity;
+	int32 WorkStatus;
+	int32 DeviceModel;		
+	int32 H100_Mode;		
+	int32 PciBus;
+	int32 PciSlot;
+	int32 PlayerCount;
+	int32 VoIPChannelCount;
+    int32 CTbusCount;
+    KEchoCancellerConfig EchoConfig;
+    KEchoLocation EchoLocation;
+	sbyte SerialNumber[ KMAX_SERIAL_NUMBER ];
+};
+
+typedef K3L_DEVICE_CONFIG K3L_E1_DEVICE_CONFIG;
+typedef K3L_DEVICE_CONFIG K3L_FX_DEVICE_CONFIG;
+struct K3L_API_CONFIG
+{
+	int32 MajorVersion;
+	int32 MinorVersion;
+	int32 BuildVersion;
+    int32 SvnRevision;
+	int32 RawCmdLogging;
+	int32 VpdVersionNeeded;
+	sbyte StrVersion[ KMAX_STR_VERSION ];
+};
+struct K3L_LINK_CONFIG
+{
+	KSignaling Signaling;
+	int32 IncomingDigitsRequest;
+	int32 IdentificationRequestPos;
+	int32 ChannelCount;
+	int32 ReceivingClock;
+	sbyte NumberA[ KMAX_DIAL_NUMBER + 1 + 3 ]; 
+};
+struct K3L_CHANNEL_CONFIG
+{
+	KSignaling Signaling;
+    int32 AutoEnableFeatures;   
+    int32 CapableFeatures;      
+};
+struct K3L_E1600A_FW_CONFIG
+{
+	int32 MfcExchangersCount;
+	int32 MonitorBufferSize;
+	sbyte FwVersion[ KMAX_STR_VERSION ];
+	sbyte DspVersion[ KMAX_DSP_NAME ];
+};
+struct K3L_E1600B_FW_CONFIG
+{
+	int32 AudioBufferSize;
+	int32 FilterCount;
+	int32 MixerCount;
+	int32 MixerCapacity;
+	sbyte FwVersion[ KMAX_STR_VERSION ];
+	sbyte DspVersion[ KMAX_DSP_NAME ];
+};
+typedef K3L_E1600B_FW_CONFIG K3L_GSM40_FW_CONFIG;
+typedef K3L_E1600B_FW_CONFIG K3L_FXO80_FW_CONFIG;
+struct K3L_COMMAND
+{
+	int32 Object;			
+	int32 Cmd;				
+	byte *Params;			
+};
+
+enum KEventObjectId
+{
+	koiDevice		= 0x00,
+	koiChannel		= 0x01,
+	koiPlayer		= 0x02,
+	koiLink			= 0x03,
+    koiSystem       = 0x04
+};
+
+struct K3L_EVENT
+{
+	int32 Code;				
+	int32 AddInfo;			
+	int32 DeviceId;			
+	int32 ObjectInfo;		
+	void *Params;			
+	int32 ParamSize;		
+	int32 ObjectId;			
+};
+struct KIncomingSeizeParams
+{
+	sbyte NumberB[ KMAX_DIAL_NUMBER + 1 ];
+	sbyte NumberA[ KMAX_DIAL_NUMBER + 1 ];
+	sbyte Padding[2];  
+};
+struct KCtbusCommand
+{
+	int32 Stream;
+	int32 TimeSlot;
+	int32 Enable;
+};
+struct KUserInformation
+{
+    int32 ProtocolDescriptor;
+    int32 UserInfoLength;
+    byte  UserInfo[ KMAX_USER_USER_LEN ];
+};
+struct KISDNSubaddressInformation
+{
+    KQ931TypeOfSubaddress TypeOfSubaddress;
+    bool  OddNumberOfSignals;
+    int32 InformationLength;
+    byte  Information[ KMAX_SUBADRESS_INFORMATION_LEN ];
+};
+struct KISDNSubaddresses
+{
+    KISDNSubaddressInformation Called;
+    KISDNSubaddressInformation Calling;
+};
+enum KLinkErrorCounter
+{
+	klecChangesToLock		=  0,
+	klecLostOfSignal		=  1,
+	klecAlarmNotification   =  2,
+	klecLostOfFrame         =  3,
+	klecLostOfMultiframe    =  4,
+	klecRemoteAlarm			=  5,
+	klecUnknowAlarm			=  6,
+	klecPRBS				=  7,
+	klecWrogrBits			=  8,
+	klecJitterVariation		=  9,
+	klecFramesWithoutSync	= 10,
+	klecMultiframeSignal	= 11,
+	klecFrameError			= 12,
+	klecBipolarViolation	= 13,
+	klecCRC4				= 14,
+	klecCount				= 15
+};
+struct K3L_LINK_ERROR_COUNTER
+{
+	int32 ErrorCounters[ klecCount ];
+};
+struct KSipData
+{
+    int32 DataLength;
+    byte  Data[ KMAX_SIP_DATA ];
+};
+
+enum KLibParams
+{
+	klpDebugFirmware,           
+    klpResetFwOnStartup,		
+    klpResetFwOnShutdown,       
+    klpSeizureEventCompat,      
+    klpDisableTDMBufferWarnings,
+    klpDisableInternalVoIP,     
+    klpLogCallControl,          
+    klpDoNotLogApiInterface,    
+	klpMaxParams
+};
+
+typedef stt_code ( Kstdcall K3L_CALLBACK )();
+typedef stt_code ( Kstdcall K3L_MONITOR_CALLBACK )( byte *, byte );
+typedef stt_code ( Kstdcall K3L_EVENT_CALLBACK )( int32 Object, K3L_EVENT * );
+typedef stt_code ( Kstdcall *K3L_THREAD_CALLBACK )( void * );
+typedef void	 ( Kstdcall K3L_AUDIO_CALLBACK )( int32 DevId, int32 Channel, byte *Buffer, int32 Size );
+#if __GNUC__ >= 4
+#pragma GCC visibility push(default)
+#endif
+extern "C"
+{
+sbyte *Kstdcall k3lStart( int32 Major, int32 Minor, int32 Build );
+void Kstdcall k3lStop();
+void Kstdcall k3lRegisterEventHandler( K3L_EVENT_CALLBACK *Function );
+void Kstdcall k3lRegisterAudioListener( K3L_AUDIO_CALLBACK *Player, K3L_AUDIO_CALLBACK *Recorder );
+int32 Kstdcall k3lSendCommand( int32 DeviceId, K3L_COMMAND *Cmd );
+int32 Kstdcall k3lSendRawCommand( int32 DeviceId, int32 IntfId, void *Command, int32 CmdSize );
+int32 Kstdcall k3lRegisterMonitor( K3L_MONITOR_CALLBACK *EventMonitor, K3L_MONITOR_CALLBACK *CommandMonitor, K3L_MONITOR_CALLBACK *BufferMonitor );
+int32 Kstdcall k3lGetDeviceConfig( int32 DeviceId, int32 Object, void *Data, int32 DataSize );
+int32 Kstdcall k3lGetDeviceStatus( int32 DeviceId, int32 Object, void *Data, int32 DataSize );
+int32 Kstdcall k3lGetDeviceCount();
+int32 Kstdcall k3lGetDeviceType( int32 DeviceId );
+int32 Kstdcall k3lGetEventParam( K3L_EVENT *Evt, const sbyte *Name, sbyte *Buffer, int32 BufferSize );
+int32 Kstdcall k3lSetGlobalParam( int32 ParamIndex, int32 ParamValue );
+}
+#if __GNUC__ >= 4
+#pragma GCC visibility pop
+#endif
+#endif
+
+
+enum KISDNDebugFlag
+{
+    kidfQ931                        = 0x01,
+    kidfLAPD                        = 0x02,
+    kidfSystem                      = 0x04,
+    kidfInvalid                     = 0x08,
+};
+
+#define CM_VOIP_START_DEBUG      0x20
+#define CM_VOIP_STOP_DEBUG       0x21
+#define CM_VOIP_DUMP_STAT        0x22
+
+#define CM_ISDN_DEBUG            0x24
+
+#define CM_PING     0x123456
+#define EV_PONG     0x654321
+
+#define CM_LOG_REQUEST                  0x100
+#define CM_LOG_CREATE_DISPATCHER        0x101
+#define CM_LOG_DESTROY_DISPATCHER       0x102
+
+#endif /* INCLUDED_K3LDEFS_H */


From brian at freeswitch.org  Mon Jun 15 14:20:02 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 15 Jun 2009 16:20:02 -0500
Subject: [Freeswitch-svn] [commit] r13777 - freeswitch/trunk/src
Message-ID: 

Author: brian
Date: Mon Jun 15 16:20:01 2009
New Revision: 13777

Log:
 revert as per anthm 

Modified:
   freeswitch/trunk/src/switch_rtp.c

Modified: freeswitch/trunk/src/switch_rtp.c
==============================================================================
--- freeswitch/trunk/src/switch_rtp.c	(original)
+++ freeswitch/trunk/src/switch_rtp.c	Mon Jun 15 16:20:01 2009
@@ -1774,9 +1774,8 @@
 			if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) &&
 				rtp_session->read_pollfd) {
 				if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) {
-					if (++rtp_session->hot_hits >= 5) {
+					if (++rtp_session->hot_hits >= 10) {
 						hot_socket = 1;
-						rtp_session->hot_hits = 0;
 					}
 				} else {
 					rtp_session->hot_hits = 0;


From jmesquita at freeswitch.org  Mon Jun 15 21:12:09 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 15 Jun 2009 23:12:09 -0500
Subject: [Freeswitch-svn] [commit] r13778 - in
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp: .
	commons commons/include include
Message-ID: 

Author: jmesquita
Date: Mon Jun 15 23:12:08 2009
New Revision: 13778

Log:
* Added the KChannel -> session relationship so I always know what is what
* Added handlers for almost all events sent by the board
* Cleaned up the code a little bit more


Added:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3lVersion.h
Modified:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/Makefile	Mon Jun 15 23:12:08 2009
@@ -1,5 +1,5 @@
 MODNAME=mod_khomp
-LOCAL_CFLAGS=-I./include -I./commons/include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DKHOMP_COMMONS_WITH_CHANNEL
+LOCAL_CFLAGS=-I./include -I./commons/include -lk3l -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM
 
 LOCAL_OBJS= ./commons/k3lapi.o
 

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp	Mon Jun 15 23:12:08 2009
@@ -1,10 +1,7 @@
 #include 
 
 #include 
-
-#ifndef KHOMP_COMMONS_WITH_CHANNEL
-# include 
-#endif
+#include 
 
 #ifdef __GNUC_PREREQ
 #if __GNUC_PREREQ(4,3)
@@ -15,6 +12,12 @@
 #ifndef INCLUDED_K3LAPI_HPP
 #define INCLUDED_K3LAPI_HPP
 
+/* FreeSWITCH include */
+extern "C" {
+    #include "switch.h"
+}
+
+
 struct K3LAPI
 {
 	/* exceptions */
@@ -78,12 +81,29 @@
 		std::string name;
 		KLibraryStatus rc;
 	};
+
+    struct KChannel {
+        public:
+            KChannel() : _session(NULL){};
+            void setSession(switch_core_session_t * session)
+            {
+                _session = session;
+            }
+            switch_core_session_t * getSession()
+            {
+                return _session;
+            }
+        protected:
+            switch_core_session_t * _session;
+    };
 	
 	typedef K3L_DEVICE_CONFIG          device_conf_type;
 	typedef K3L_CHANNEL_CONFIG        channel_conf_type;
 	typedef K3L_CHANNEL_CONFIG *  channel_ptr_conf_type;
 	typedef K3L_LINK_CONFIG              link_conf_type;
 	typedef K3L_LINK_CONFIG *        link_ptr_conf_type;
+    typedef KChannel                         KChannel_t;
+    typedef KChannel_t *                 KChannel_ptr_t;
 
 	/* constructors/destructors */
 	
@@ -186,12 +206,27 @@
 
 	void init(void);
 
+    void setSession(unsigned int boardId, unsigned int chanId, switch_core_session_t * session)
+    {
+		if (!valid_channel(boardId, chanId))
+			throw invalid_channel(boardId, chanId);
+        _KChannel[boardId][chanId].setSession(session);
+    }
+
+    switch_core_session_t * getSession(unsigned int boardId, unsigned int chanId)
+    {
+		if (!valid_channel(boardId, chanId))
+			throw invalid_channel(boardId, chanId);
+        return _KChannel[boardId][chanId].getSession();
+    }
+
  protected:
 
-	unsigned int           _device_count;
-	unsigned int *        _channel_count;
-	unsigned int *           _link_count;
-	
+	unsigned int              _device_count;
+	unsigned int *           _channel_count;
+	unsigned int *              _link_count;
+
+           KChannel_ptr_t *        _KChannel;
 	     device_conf_type *   _device_config;
 	channel_ptr_conf_type *  _channel_config;
 	   link_ptr_conf_type *     _link_config;

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/k3lapi.cpp	Mon Jun 15 23:12:08 2009
@@ -22,7 +22,7 @@
 void K3LAPI::start(void)
 {
 	/* tie the used k3l to the compiled k3l version */
-	char *ret = k3lStart(k3lApiMajorVersion, k3lApiMinorVersion, 0); //k3lApiBuildVersion);
+	char *ret = k3lStart(2, 0, 0); //k3lApiMajorVersion, k3lApiMinorVersion, 0); //k3lApiBuildVersion);
 	
 	if (ret && *ret)
 		throw start_failed(ret);
@@ -129,6 +129,7 @@
 	_device_type	= new KDeviceType[_device_count];
 	_device_config  = new device_conf_type[_device_count];
 	_channel_config = new channel_ptr_conf_type[_device_count];
+	_KChannel       = new KChannel_ptr_t[_device_count];
 	_link_config    = new link_ptr_conf_type[_device_count];
 	_channel_count	= new unsigned int[_device_count];
 	_link_count		= new unsigned int[_device_count];
@@ -147,12 +148,15 @@
 			
 		/* caches each channel config */
 		_channel_config[dev] = new channel_conf_type[_channel_count[dev]];
+        _KChannel[dev] = new KChannel_t[_channel_count[dev]];
 
 		for (unsigned int obj = 0; obj < _channel_count[dev]; obj++)
 		{
 			if (k3lGetDeviceConfig(dev, ksoChannel + obj, &(_channel_config[dev][obj]), 
 									sizeof(_channel_config[dev][obj])) != ksSuccess)
+            {
 				throw start_failed("k3lGetDeviceConfig(channel)");
+            }
 		}
 
 		/* adjust link count for device */

Added: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3lVersion.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/include/k3lVersion.h	Mon Jun 15 23:12:08 2009
@@ -0,0 +1,9 @@
+#ifndef k3lVersion_h
+#define k3lVersion_h
+
+#define k3lApiMajorVersion	2
+#define k3lApiMinorVersion	0
+#define k3lApiBuildVersion	0
+
+#endif
+

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Mon Jun 15 23:12:08 2009
@@ -98,9 +98,8 @@
 	switch_mutex_t *mutex;
 	switch_mutex_t *flag_mutex;
 	//switch_thread_cond_t *cond;
-    unsigned int Kdevice;    // Represent de board we are making the call from
-    unsigned int Klink;      // Represent the link we are making the call from
-    unsigned int Kchannel;   // Represent the channel we are making the call from
+    unsigned int KDeviceId;    // Represent de board we are making the call from
+    unsigned int KChannel;   // Represent the channel we are making the call from
 };
 
 typedef struct private_object private_t;
@@ -128,8 +127,8 @@
 static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
 
 /* Helper function prototypes */
-static void printSystemSummary(switch_stream_handle_t*);
-static const char* linkStatus(unsigned int device, unsigned int link);
+static void printSystemSummary(switch_stream_handle_t* stream);
+static void printLinks(switch_stream_handle_t* stream, unsigned int device, unsigned int link);
 static void printChannels(switch_stream_handle_t* stream, unsigned int device, unsigned int link);
 /* Handles callbacks and events from the boards */
 static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e);
@@ -268,7 +267,7 @@
 	}
 
     try {
-        k3l->command(tech_pvt->Kdevice, tech_pvt->Kchannel, CM_DISCONNECT, NULL);
+        k3l->command(tech_pvt->KDeviceId, tech_pvt->KChannel, CM_DISCONNECT, NULL);
     }
     catch(K3LAPI::failed_command & e)
     {
@@ -352,8 +351,6 @@
 	tech_pvt->read_frame.flags = SFF_NONE;
 	*frame = NULL;
 
-    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Are we being called?");
-
 
 	while (switch_test_flag(tech_pvt, TFLAG_IO)) {
 
@@ -403,8 +400,6 @@
 	private_t *tech_pvt = NULL;
 	//switch_frame_t *pframe;
 
-    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Are we being called?");
-
 	channel = switch_core_session_get_channel(session);
 	assert(channel != NULL);
 
@@ -436,8 +431,6 @@
 	tech_pvt = static_cast(switch_core_session_get_private(session));
 	assert(tech_pvt != NULL);
 
-    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "When the fuck is this called?.\n");
-
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -476,7 +469,7 @@
 													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags)
 {
 
-   	char *argv[4] = { 0 };
+   	char *argv[3] = { 0 };
 	int argc = 0;
 
 	if ((*new_session = switch_core_session_request(khomp_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
@@ -501,20 +494,19 @@
 			switch_channel_set_name(channel, name);
 
             /* Let's setup our own vars on tech_pvt */
-            if ((argc = switch_separate_string(outbound_profile->destination_number, '/', argv, (sizeof(argv) / sizeof(argv[0])))) < 4)
+            if ((argc = switch_separate_string(outbound_profile->destination_number, '/', argv, (sizeof(argv) / sizeof(argv[0])))) < 3)
             {
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid dial string. Should be on the format:[Khomp/BOARD/LINK/CHANNEL]\n");
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid dial string. Should be on the format:[Khomp/BOARD/CHANNEL]\n");
                 return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
             }
             else
             {
-                tech_pvt->Kdevice = atoi(argv[0]);
-                tech_pvt->Klink = atoi(argv[1]);
-                tech_pvt->Kchannel = atoi(argv[2]);
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Dialing out from Board:%d, Link:%d, Channel:%d.\n",
-                                                                    tech_pvt->Kdevice,
-                                                                    tech_pvt->Klink,
-                                                                    tech_pvt->Kchannel);
+                tech_pvt->KDeviceId = atoi(argv[0]);
+                tech_pvt->KChannel = atoi(argv[1]);
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Dialing to %s out from Board:%u, Channel:%u.\n",
+                                                                    argv[2],
+                                                                    tech_pvt->KDeviceId,
+                                                                    tech_pvt->KChannel);
 
             }
 
@@ -524,6 +516,8 @@
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n");
 			switch_core_session_destroy(new_session);
+            /* Destroy the channel session */
+            k3l->setSession(tech_pvt->KDeviceId, tech_pvt->KChannel, NULL);
 			return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
 		}
 
@@ -536,9 +530,9 @@
         try {
             /* Lets make the call! */
             char params[ 255 ];
-            sprintf(params, "dest_addr=\"%s\"", argv[3]);
+            sprintf(params, "dest_addr=\"%s\"", argv[2]);
             switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "We are calling with params: %s.\n", params);
-            k3l->command(tech_pvt->Kdevice,tech_pvt->Kchannel, CM_MAKE_CALL, params); 
+            k3l->command(tech_pvt->KDeviceId,tech_pvt->KChannel, CM_MAKE_CALL, params); 
         }
         catch(K3LAPI::failed_command & e)
         {
@@ -546,6 +540,9 @@
             return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
         }
 
+        /* Add the new session the the channel's info */
+        k3l->setSession(tech_pvt->KDeviceId, tech_pvt->KChannel, *new_session);
+
 		return SWITCH_CAUSE_SUCCESS;
 	}
 
@@ -718,6 +715,7 @@
 
 /* 
    khomp API definition
+   TODO: Add as xml modifier
 */
 SWITCH_STANDARD_API(khomp)
 {
@@ -748,23 +746,12 @@
         }
         /* Show all the links and their status */
         if (argv[1] && !strncasecmp(argv[1], "links", 5)) {
-            for(int device=0 ; device < k3l->device_count() ; device++)
-            {
-                stream->write_function(stream, "___________________________________________\n");
-                stream->write_function(stream, "|--------------Khomp Links----------------|\n");
-                stream->write_function(stream, "|----Board----|----Link----|----Status----|\n");
-                for(int link=0 ; link < k3l->link_count(device) ; link++)
-                {
-                    stream->write_function(stream, "|%13d|%12d|%s|\n"
-                                            , device
-                                            , link
-                                            , linkStatus(device, link));
-                }
-            }
-            stream->write_function(stream, "-------------------------------------------\n");
+            /* TODO: Let show specific boards/links */
+            printLinks(stream, NULL, NULL);
         }
         // Show all channels from all boards and all links
         if (argv[1] && !strncasecmp(argv[1], "channels", 8)) {
+            /* TODO: Let show specific channels */
             printChannels(stream, NULL, NULL);
         }
 
@@ -799,34 +786,16 @@
                     stream->write_function(stream, "Damn, again something bad happened.\n");
                     return;
                 }
-                switch(status.AddInfo) {
-                    case kecsFree: 
+                switch(status.CallStatus) {
+                    case kcsFree: 
                         stream->write_function(stream, "| %6u| %8u| Free |\n", board, channel);
                         break;
-                    case kecsBusy: 
-                        stream->write_function(stream, "| %6u| %8u| Busy |\n", board, channel);
-                        break;
-                    case kecsOutgoing: 
+                    case kcsOutgoing: 
                         stream->write_function(stream, "| %6u| %8u| Outgoing |\n", board, channel);
                         break;
-                    case kecsIncoming: 
+                    case kcsIncoming: 
                         stream->write_function(stream, "| %6u| %8u| Incoming |\n", board, channel);
                         break;
-                    case kecsLocked:
-                        stream->write_function(stream, "| %6u| %8u| Locked |\n", board, channel);
-                        break;
-                    case kecsOutgoingLock:
-                        stream->write_function(stream, "| %6u| %8u| OutgoingLock |\n", board, channel);
-                        break;
-                    case kecsLocalFail:
-                        stream->write_function(stream, "| %6u| %8u| LocalFail |\n", board, channel);
-                        break;
-                    case kecsIncomingLock:
-                        stream->write_function(stream, "| %6u| %8u| IncomingLock |\n", board, channel);
-                        break;
-                    case kecsRemoteLock:
-                        stream->write_function(stream, "| %6u| %8u| RemoteLock |\n", board, channel);
-                        break;
                     default:
                         stream->write_function(stream, "| %6u| %8u| UNKNOWN : %x |\n", board, channel, status.AddInfo);
                 }
@@ -837,60 +806,98 @@
     }
 }
 
-static const char * linkStatus(unsigned int device, unsigned int link)
+static void printLinks(switch_stream_handle_t* stream, unsigned int device, unsigned int link)
 {
 
-    K3L_LINK_CONFIG & config = k3l->link_config(device, link);
-    K3L_LINK_STATUS   status;
-    
-    KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (device, link + ksoLink, &status, sizeof(status));
+    stream->write_function(stream, "___________________________________________\n");
+    stream->write_function(stream, "|--------------Khomp Links----------------|\n");
+    stream->write_function(stream, "|----Board----|----Link----|----Status----|\n");
 
-    if (ret == ksSuccess)
-    {
-        switch (config.Signaling)
+    // We want to see all links from all devices
+    if (!device) {
+        for(int device=0 ; device < k3l->device_count() ; device++)
         {
-            case ksigInactive:
-                return "[ksigInactive]";
+            K3L_LINK_CONFIG & config = k3l->link_config(device, link);
+            K3L_LINK_STATUS   status;
 
-            case ksigAnalog:
-                return "[ksigAnalog]";
-
-            case ksigSIP:
-                return "[ksigSIP]";
-
-            case ksigOpenCAS:
-            case ksigOpenR2:
-            case ksigR2Digital:
-            case ksigUserR2Digital:
-            case ksigOpenCCS:
-            case ksigPRI_EndPoint:
-            case ksigPRI_Network:
-            case ksigPRI_Passive:
-            case ksigLineSide:
-            case ksigCAS_EL7:
-            case ksigAnalogTerminal:
-                if (kesOk == status.E1)
+            for(int link=0 ; link < k3l->link_count(device) ; link++)
+            {
+                const char * E1Status = "";
+                if (k3lGetDeviceStatus (device, link + ksoLink, &status, sizeof(status)) == ksSuccess)
                 {
-                    return "kesOk";
+                    switch (config.Signaling)
+                    {
+                        case ksigInactive:
+                            E1Status = "[ksigInactive]";
+                            break;
+
+                        case ksigAnalog:
+                            E1Status = "[ksigAnalog]";
+                            break;
+
+                        case ksigSIP:
+                            E1Status = "[ksigSIP]";
+                            break;
+
+                        case ksigOpenCAS:
+                        case ksigOpenR2:
+                        case ksigR2Digital:
+                        case ksigUserR2Digital:
+                        case ksigOpenCCS:
+                        case ksigPRI_EndPoint:
+                        case ksigPRI_Network:
+                        case ksigPRI_Passive:
+                        case ksigLineSide:
+                        case ksigCAS_EL7:
+                        case ksigAnalogTerminal:
+                            switch (status.E1) {
+
+                                case (kesOk):
+                                    E1Status = "kesOk";
+                                    break;
+                                case (kesSignalLost):
+                                    E1Status = "kesSignalLost";
+                                    break;
+                                case (kesNetworkAlarm):
+                                    E1Status = "kesNetworkAlarm";
+                                    break;
+                                case (kesFrameSyncLost):
+                                    E1Status = "kesFrameSyncLost";
+                                    break;
+                                case (kesMultiframeSyncLost):
+                                    E1Status = "kesMultiframeSyncLost";
+                                    break;
+                                case (kesRemoteAlarm):
+                                    E1Status = "kesRemoteAlarm";
+                                    break;
+                                case (kesHighErrorRate):
+                                    E1Status = "kesHighErrorRate";
+                                    break;
+                                case (kesUnknownAlarm):
+                                    E1Status = "kesUnknownAlarm";
+                                    break;
+                                case (kesE1Error):
+                                    E1Status = "kesE1Error";
+                                    break;
+                                case (kesNotInitialized):
+                                    E1Status = "kesNotInitialized";
+                                    break;
+                                default:
+                                    E1Status = "UnknownE1Status";
+                            }
+                            break;
+                        default:
+                            E1Status = "NotImplementedBoard";
+                    }
                 }
-                else
-                {
-                    if (kesSignalLost & status.E1)         return "SignalLost";
-                    if (kesNetworkAlarm & status.E1)       return "NetworkAlarm";
-                    if (kesFrameSyncLost & status.E1)      return "FrameSyncLost";
-                    if (kesMultiframeSyncLost & status.E1) return "MultiframeSyncLost";
-                    if (kesRemoteAlarm & status.E1)        return "RemoteAlarm";
-                    if (kesHighErrorRate & status.E1)      return "HighErrorRate";
-                    if (kesUnknownAlarm & status.E1)       return "UnknownAlarm";
-                    if (kesE1Error & status.E1)            return "E1Error";
-
-                }
-            default:
-                return "NotImplementedBoard";
+                stream->write_function(stream, "|%13d|%12d|%s|\n"
+                                        , device
+                                        , link
+                                        , E1Status);
+            }
         }
     }
-
-    return "";
+    stream->write_function(stream, "-------------------------------------------\n");
 }
 
 
@@ -1000,28 +1007,139 @@
 
 static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e)
 {				
-    /* TODO: We should hash things to make it stateful */
+    /* TODO: How do we make sure channels inside FreeSWITCH only change to valid states on K3L? */
     switch(e->Code)
     {
         case EV_NEW_CALL:   
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New call on %u to %s.\n", obj, k3l->get_param(e, "dest_addr").c_str());
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "New call on %u to %s. [EV_NEW_CALL]\n", obj, k3l->get_param(e, "dest_addr").c_str());
             try {
                 k3l->command(e->DeviceId, obj, CM_RINGBACK, NULL); 
                 k3l->command(e->DeviceId, obj, CM_CONNECT, NULL); 
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Accepeted the call.\n");
             }
             catch (K3LAPI::failed_command & err)
             {
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Something went wrong here!\n");
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not set board channel status! [EV_NEW_CALL]\n");
             }
             break;
         case EV_DISCONNECT:   
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Called party dropped the call on: %u. Releasing channel.\n", obj);
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Called party dropped the call on: %u. Releasing channel. [EV_DISCONNECT]\n", obj);
+            /* Do we need to release on the board? */
             k3l->command(e->DeviceId, obj, CM_DISCONNECT, NULL);
+            try {
+                k3l->setSession(e->DeviceId, obj, NULL);
+            }
+            catch(K3LAPI::invalid_channel & err)
+            {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Called party dropped the call on: %u. Releasing channel. [EV_DISCONNECT]\n", obj);
+            }
             break;
-        default:
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "New Event has just arrived on %u with untreated code: %x\n", obj, e->Code);
+        case EV_CONNECT:
+            switch_channel_t *channel;
+            /* TODO: We should check if the session is there before getting the channel. */
+            channel = switch_core_session_get_channel(k3l->getSession(e->DeviceId ,obj));
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Call will be answered on board %u, channel %u. [EV_CONNECT]\n", e->DeviceId, obj);
+            switch_channel_mark_answered(channel);
+            break;
+        case EV_CALL_SUCCESS:
+            /* TODO: Should we bridge here? Maybe check a certain variable if we should generate ringback? */
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Call on board %u, channel %u is ringing. [EV_CALL_SUCESS]\n", e->DeviceId, obj);
+            break;
+        case EV_CHANNEL_FREE:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Channel %u on board %u is now free. [EV_CHANNEL_FREE]\n", obj, e->DeviceId);
+            break;
+        case EV_NO_ANSWER:
+            /* TODO: Destroy sessions and channels */
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No one answered the call on board %u channel %u. [EV_NO_ANSWER]\n", e->DeviceId, obj);
             break;
+        case EV_CALL_ANSWER_INFO:
+            {
+                /* TODO: Set channel variable if we get this event */
+                /* TODO: Fire an event so ESL can get it? */
+                /* Call Analyser has to be enabled on k3lconfig */
+                const char * startInfo = "";
+                switch (e->AddInfo)
+                {
+                    case (kcsiHumanAnswer):
+                        startInfo = "kcsiHumanAnswer";
+                        break;
+                    case (kcsiAnsweringMachine):
+                        startInfo = "kcsiAnsweringMachine";
+                        break;
+                    case (kcsiCellPhoneMessageBox):
+                        startInfo = "kcsiCellPhoneMessageBox";
+                        break;
+                    case (kcsiUnknown):
+                        startInfo = "kcsiUnknown";
+                        break;
+                    case (kcsiCarrierMessage):
+                        startInfo = "kcsiCarrierMessage";
+                        break;
+                    default:
+                        startInfo = "Error or unknown code!";
+
+                }
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %u, board %u detected: \"%s\". [EV_CALL_ANSWER_INFO]\n", e->DeviceId, obj, startInfo);
+                    break;
+            }
+        case EV_DTMF_DETECTED:
+            /* TODO: What to do with DTMF? */
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Board %u detected DTMF (%d) on channel %u. [EV_DTMF_DETECTED]\n", e->DeviceId, e->AddInfo, obj);
+            break;
+        case EV_DTMF_SEND_FINISH:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %u on board %u has sucessfully generated DTMF. [EV_DTMF_SEND_FINNISH]\n", obj, e->DeviceId);
+            break;
+        case EV_CALL_FAIL:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Channel %u on board %u reported call fail. [EV_CALL_FAIL]\n", obj, e->DeviceId);
+            break;
+        case EV_CHANNEL_FAIL:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel %u on board %u reported failure. [EV_CHANNEL_FAIL]\n", obj, e->DeviceId);
+            break;
+        case EV_LINK_STATUS:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Link %u on board %u changed. [EV_LINK_STATUS]\n", e->DeviceId, obj);
+            break;
+        case EV_PHYSICAL_LINK_DOWN:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Link %u on board %u is DOWN. [EV_PHYSICAL_LINK_DOWN]\n", e->DeviceId, obj);
+            break;
+        case EV_PHYSICAL_LINK_UP:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Link %u on board %u is UP. [EV_PHYSICAL_LINK_UP]\n", e->DeviceId, obj);
+            break;
+        case EV_INTERNAL_FAIL:
+            {
+                const char * msg = "";
+                switch(e->AddInfo)
+                {
+                    case kifInterruptCtrl:
+                        msg = "kifInterruptCtrl";
+                        break;
+                    case kifCommunicationFail:
+                        msg = "kifCommunicationFail";
+                        break;
+                    case kifProtocolFail:
+                        msg = "kifProtocolFail";
+                        break;
+                    case kifInternalBuffer:
+                        msg = "kifInternalBuffer";
+                        break;
+                    case kifMonitorBuffer:
+                        msg = "kifMonitorBuffer";
+                        break;
+                    case kifInitialization:
+                        msg = "kifInitialization";
+                        break;
+                    case kifInterfaceFail:
+                        msg = "kifInterfaceFail";
+                        break;
+                    case kifClientCommFail:
+                        msg = "kifClientCommFail";
+                        break;
+                    default:
+                        msg = "UnknownError";
+                }
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This is a fatal error and we will not recover. Reason: %s. [EV_INTERNAL_FAIL]\n", msg);
+                break;
+            }
+        default:
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Event has just arrived on %u with untreated code: %x\n", obj, e->Code);
     }
 
     return ksSuccess;


From greenlizard at freeswitch.org  Tue Jun 16 01:50:38 2009
From: greenlizard at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 03:50:38 -0500
Subject: [Freeswitch-svn] [commit] r13779 -
	freeswitch/trunk/scripts/socket/freepy
Message-ID: 

Author: greenlizard
Date: Tue Jun 16 03:50:37 2009
New Revision: 13779

Log:
transfer was renamed to uuid_transfer in fs api and this method was not updated

Modified:
   freeswitch/trunk/scripts/socket/freepy/__init__.py

Modified: freeswitch/trunk/scripts/socket/freepy/__init__.py
==============================================================================
--- freeswitch/trunk/scripts/socket/freepy/__init__.py	(original)
+++ freeswitch/trunk/scripts/socket/freepy/__init__.py	Tue Jun 16 03:50:37 2009
@@ -338,10 +338,10 @@
         transfer  [-bleg|-both] 
         """
         if bgapi == True:
-            msg = "bgapi transfer %s %s %s" % (uuid, legs, dest_ext)
+            msg = "bgapi uuid_transfer %s %s %s" % (uuid, legs, dest_ext)
             req = request.BgApiRequest()
         else:
-            msg = "api transfer %s %s %s" % (uuid, legs, dest_ext)
+            msg = "api uuid_transfer %s %s %s" % (uuid, legs, dest_ext)
             req = request.ApiRequest()
         self.requestq.put(req)
         self.transport.write("%s\n\n" % msg)


From greenlizard at freeswitch.org  Tue Jun 16 02:17:11 2009
From: greenlizard at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 04:17:11 -0500
Subject: [Freeswitch-svn] [commit] r13780 -
	freeswitch/trunk/scripts/socket/freepy
Message-ID: 

Author: greenlizard
Date: Tue Jun 16 04:17:10 2009
New Revision: 13780

Log:
rename killchan to uuid_kill and broadcast to uuid_broadcast

Modified:
   freeswitch/trunk/scripts/socket/freepy/__init__.py

Modified: freeswitch/trunk/scripts/socket/freepy/__init__.py
==============================================================================
--- freeswitch/trunk/scripts/socket/freepy/__init__.py	(original)
+++ freeswitch/trunk/scripts/socket/freepy/__init__.py	Tue Jun 16 04:17:10 2009
@@ -311,10 +311,10 @@
 
     def killchan(self, uuid, bgapi = False):
         if bgapi == True:
-            msg = "bgapi killchan %s" % (uuid)
+            msg = "bgapi uuid_kill %s" % (uuid)
             req = request.BgApiRequest()
         else:
-            msg = "api killchan %s" % (uuid)            
+            msg = "api uuid_kill %s" % (uuid)            
             req = request.ApiRequest()
         self.requestq.put(req)
         self.transport.write("%s\n\n" % msg)
@@ -323,10 +323,10 @@
 
     def broadcast(self, uuid, path, legs, bgapi = False):
         if bgapi == True:
-            msg = "bgapi broadcast %s %s %s" % (uuid, path, legs)
+            msg = "bgapi uuid_broadcast %s %s %s" % (uuid, path, legs)
             req = request.BgApiRequest()
         else:
-            msg = "api broadcast %s %s %s" % (uuid, path, legs)            
+            msg = "api uuid_broadcast %s %s %s" % (uuid, path, legs)
             req = request.ApiRequest()
         self.requestq.put(req)
         self.transport.write("%s\n\n" % msg)


From mikej at freeswitch.org  Tue Jun 16 06:41:01 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 08:41:01 -0500
Subject: [Freeswitch-svn] [commit] r13781 - in freeswitch/trunk/src: .
	mod/endpoints/mod_sofia
Message-ID: 

Author: mikej
Date: Tue Jun 16 08:41:01 2009
New Revision: 13781

Log:
fix seg in some edge cases

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
   freeswitch/trunk/src/switch_utils.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Tue Jun 16 08:41:01 2009
@@ -1662,7 +1662,7 @@
 		sofia_glue_tech_patch_sdp(tech_pvt);
 	}
 
-	if (tech_pvt->dest && (route = strstr(tech_pvt->dest, ";fs_path="))) {
+	if (tech_pvt->dest && (route = strstr(tech_pvt->dest, ";fs_path=")) && (*(route + 9))) {
 		char *p;
 
 		route = switch_core_session_strdup(tech_pvt->session, route + 9);
@@ -1686,6 +1686,8 @@
 		}
 		
 		route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL);
+	} else {
+		route = NULL;
 	}
 
 	if ((val = switch_channel_get_variable(channel, "sip_route_uri"))) {
@@ -1715,7 +1717,7 @@
 			   TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
 			   TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)),
 			   TAG_IF(tech_pvt->route_uri, NUTAG_PROXY(tech_pvt->route_uri)),
-			   TAG_IF(route, SIPTAG_ROUTE_STR(route)),
+			   TAG_IF(!switch_strlen_zero(route), SIPTAG_ROUTE_STR(route)),
 			   TAG_IF(!switch_strlen_zero(sendto), NUTAG_PROXY(sendto)),
 			   SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip),
 			   SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),

Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c	(original)
+++ freeswitch/trunk/src/switch_utils.c	Tue Jun 16 08:41:01 2009
@@ -1688,6 +1688,10 @@
 	char *o;
 	unsigned int tmp;
 
+	if (switch_strlen_zero(s)) {
+		return s;
+	}
+
 	for (o = s; *s; s++, o++) {
 		if (*s == '%' && strlen(s) > 2 && sscanf(s + 1, "%2x", &tmp) == 1) {
 			*o = (char) tmp;


From brian at freeswitch.org  Tue Jun 16 07:02:22 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 09:02:22 -0500
Subject: [Freeswitch-svn] [commit] r13782 - in
	freeswitch/trunk/src/mod/languages/mod_managed: . managed
Message-ID: 

Author: brian
Date: Tue Jun 16 09:02:21 2009
New Revision: 13782

Log:
 swig all 

Modified:
   freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx
   freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs

Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx	(original)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx	Tue Jun 16 09:02:21 2009
@@ -7791,6 +7791,54 @@
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_asr_start_input_timers(void * jarg1) {
+  int jresult ;
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  result = (switch_status_t)switch_core_asr_start_input_timers(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_text_param(void * jarg1, char * jarg2, char * jarg3) {
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  switch_core_asr_text_param(arg1,arg2,(char const *)arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_numeric_param(void * jarg1, char * jarg2, int jarg3) {
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (int)jarg3; 
+  switch_core_asr_numeric_param(arg1,arg2,arg3);
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_asr_float_param(void * jarg1, char * jarg2, double jarg3) {
+  switch_asr_handle_t *arg1 = (switch_asr_handle_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  double arg3 ;
+  
+  arg1 = (switch_asr_handle_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (double)jarg3; 
+  switch_core_asr_float_param(arg1,arg2,arg3);
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_directory_open(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, void * jarg6) {
   int jresult ;
   switch_directory_handle_t *arg1 = (switch_directory_handle_t *) 0 ;
@@ -14282,6 +14330,98 @@
 }
 
 
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*arg2)(switch_asr_handle_t *) = (switch_status_t (*)(switch_asr_handle_t *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (switch_status_t (*)(switch_asr_handle_t *))jarg2; 
+  if (arg1) (arg1)->asr_start_input_timers = arg2;
+  
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_start_input_timers_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  switch_status_t (*result)(switch_asr_handle_t *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (switch_status_t (*)(switch_asr_handle_t *)) ((arg1)->asr_start_input_timers);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_text_param_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*arg2)(switch_asr_handle_t *,char *,char const *) = (void (*)(switch_asr_handle_t *,char *,char const *)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (void (*)(switch_asr_handle_t *,char *,char const *))jarg2; 
+  if (arg1) (arg1)->asr_text_param = arg2;
+  
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_text_param_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*result)(switch_asr_handle_t *,char *,char const *) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (void (*)(switch_asr_handle_t *,char *,char const *)) ((arg1)->asr_text_param);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_numeric_param_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*arg2)(switch_asr_handle_t *,char *,int) = (void (*)(switch_asr_handle_t *,char *,int)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (void (*)(switch_asr_handle_t *,char *,int))jarg2; 
+  if (arg1) (arg1)->asr_numeric_param = arg2;
+  
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_numeric_param_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*result)(switch_asr_handle_t *,char *,int) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (void (*)(switch_asr_handle_t *,char *,int)) ((arg1)->asr_numeric_param);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_asr_float_param_set(void * jarg1, void * jarg2) {
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*arg2)(switch_asr_handle_t *,char *,double) = (void (*)(switch_asr_handle_t *,char *,double)) 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  arg2 = (void (*)(switch_asr_handle_t *,char *,double))jarg2; 
+  if (arg1) (arg1)->asr_float_param = arg2;
+  
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_asr_interface_asr_float_param_get(void * jarg1) {
+  void * jresult ;
+  switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
+  void (*result)(switch_asr_handle_t *,char *,double) = 0 ;
+  
+  arg1 = (switch_asr_interface *)jarg1; 
+  result = (void (*)(switch_asr_handle_t *,char *,double)) ((arg1)->asr_float_param);
+  jresult = (void *)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_asr_interface_rwlock_set(void * jarg1, void * jarg2) {
   switch_asr_interface *arg1 = (switch_asr_interface *) 0 ;
   switch_thread_rwlock_t *arg2 = (switch_thread_rwlock_t *) 0 ;

Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs	(original)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs	Tue Jun 16 09:02:21 2009
@@ -1750,13 +1750,13 @@
     return ret;
   }
 
-  public static switch_status_t switch_core_asr_load_grammar(switch_asr_handle ah, string grammar, string path) {
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_load_grammar(switch_asr_handle.getCPtr(ah), grammar, path);
+  public static switch_status_t switch_core_asr_load_grammar(switch_asr_handle ah, string grammar, string name) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_load_grammar(switch_asr_handle.getCPtr(ah), grammar, name);
     return ret;
   }
 
-  public static switch_status_t switch_core_asr_unload_grammar(switch_asr_handle ah, string grammar) {
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_unload_grammar(switch_asr_handle.getCPtr(ah), grammar);
+  public static switch_status_t switch_core_asr_unload_grammar(switch_asr_handle ah, string name) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_unload_grammar(switch_asr_handle.getCPtr(ah), name);
     return ret;
   }
 
@@ -1770,6 +1770,23 @@
     return ret;
   }
 
+  public static switch_status_t switch_core_asr_start_input_timers(switch_asr_handle ah) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_asr_start_input_timers(switch_asr_handle.getCPtr(ah));
+    return ret;
+  }
+
+  public static void switch_core_asr_text_param(switch_asr_handle ah, string param, string val) {
+    freeswitchPINVOKE.switch_core_asr_text_param(switch_asr_handle.getCPtr(ah), param, val);
+  }
+
+  public static void switch_core_asr_numeric_param(switch_asr_handle ah, string param, int val) {
+    freeswitchPINVOKE.switch_core_asr_numeric_param(switch_asr_handle.getCPtr(ah), param, val);
+  }
+
+  public static void switch_core_asr_float_param(switch_asr_handle ah, string param, double val) {
+    freeswitchPINVOKE.switch_core_asr_float_param(switch_asr_handle.getCPtr(ah), param, val);
+  }
+
   public static switch_status_t switch_core_directory_open(switch_directory_handle dh, string module_name, string source, string dsn, string passwd, SWIGTYPE_p_apr_pool_t pool) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_directory_open(switch_directory_handle.getCPtr(dh), module_name, source, dsn, passwd, SWIGTYPE_p_apr_pool_t.getCPtr(pool));
     return ret;
@@ -3082,8 +3099,8 @@
     return ret;
   }
 
-  public static switch_status_t switch_ivr_detect_speech(SWIGTYPE_p_switch_core_session session, string mod_name, string grammar, string path, string dest, switch_asr_handle ah) {
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech(SWIGTYPE_p_switch_core_session.getCPtr(session), mod_name, grammar, path, dest, switch_asr_handle.getCPtr(ah));
+  public static switch_status_t switch_ivr_detect_speech(SWIGTYPE_p_switch_core_session session, string mod_name, string grammar, string name, string dest, switch_asr_handle ah) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech(SWIGTYPE_p_switch_core_session.getCPtr(session), mod_name, grammar, name, dest, switch_asr_handle.getCPtr(ah));
     return ret;
   }
 
@@ -3102,13 +3119,13 @@
     return ret;
   }
 
-  public static switch_status_t switch_ivr_detect_speech_load_grammar(SWIGTYPE_p_switch_core_session session, string grammar, string path) {
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech_load_grammar(SWIGTYPE_p_switch_core_session.getCPtr(session), grammar, path);
+  public static switch_status_t switch_ivr_detect_speech_load_grammar(SWIGTYPE_p_switch_core_session session, string grammar, string name) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech_load_grammar(SWIGTYPE_p_switch_core_session.getCPtr(session), grammar, name);
     return ret;
   }
 
-  public static switch_status_t switch_ivr_detect_speech_unload_grammar(SWIGTYPE_p_switch_core_session session, string grammar) {
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech_unload_grammar(SWIGTYPE_p_switch_core_session.getCPtr(session), grammar);
+  public static switch_status_t switch_ivr_detect_speech_unload_grammar(SWIGTYPE_p_switch_core_session session, string name) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech_unload_grammar(SWIGTYPE_p_switch_core_session.getCPtr(session), name);
     return ret;
   }
 
@@ -6329,6 +6346,18 @@
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_asr_resume")]
   public static extern int switch_core_asr_resume(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_asr_start_input_timers")]
+  public static extern int switch_core_asr_start_input_timers(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_asr_text_param")]
+  public static extern void switch_core_asr_text_param(HandleRef jarg1, string jarg2, string jarg3);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_asr_numeric_param")]
+  public static extern void switch_core_asr_numeric_param(HandleRef jarg1, string jarg2, int jarg3);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_asr_float_param")]
+  public static extern void switch_core_asr_float_param(HandleRef jarg1, string jarg2, double jarg3);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_directory_open")]
   public static extern int switch_core_directory_open(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, HandleRef jarg6);
 
@@ -7895,6 +7924,30 @@
   [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_get_results_get")]
   public static extern IntPtr switch_asr_interface_asr_get_results_get(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_start_input_timers_set")]
+  public static extern void switch_asr_interface_asr_start_input_timers_set(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_start_input_timers_get")]
+  public static extern IntPtr switch_asr_interface_asr_start_input_timers_get(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_text_param_set")]
+  public static extern void switch_asr_interface_asr_text_param_set(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_text_param_get")]
+  public static extern IntPtr switch_asr_interface_asr_text_param_get(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_numeric_param_set")]
+  public static extern void switch_asr_interface_asr_numeric_param_set(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_numeric_param_get")]
+  public static extern IntPtr switch_asr_interface_asr_numeric_param_get(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_float_param_set")]
+  public static extern void switch_asr_interface_asr_float_param_set(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_asr_float_param_get")]
+  public static extern IntPtr switch_asr_interface_asr_float_param_get(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_asr_interface_rwlock_set")]
   public static extern void switch_asr_interface_rwlock_set(HandleRef jarg1, HandleRef jarg2);
 
@@ -11873,6 +11926,96 @@
 using System;
 using System.Runtime.InteropServices;
 
+public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void {
+  private HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void(IntPtr cPtr, bool futureUse) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void() {
+    swigCPtr = new HandleRef(null, IntPtr.Zero);
+  }
+
+  internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.35
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
+public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void {
+  private HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void(IntPtr cPtr, bool futureUse) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void() {
+    swigCPtr = new HandleRef(null, IntPtr.Zero);
+  }
+
+  internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.35
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
+public class SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void {
+  private HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void(IntPtr cPtr, bool futureUse) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void() {
+    swigCPtr = new HandleRef(null, IntPtr.Zero);
+  }
+
+  internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.35
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
 public class SWIGTYPE_p_f_p_switch_asr_handle_p_p_char_p_unsigned_long__switch_status_t {
   private HandleRef swigCPtr;
 
@@ -16459,6 +16602,50 @@
     } 
   }
 
+  public SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t asr_start_input_timers {
+    set {
+      freeswitchPINVOKE.switch_asr_interface_asr_start_input_timers_set(swigCPtr, SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t.getCPtr(value));
+    } 
+    get {
+      IntPtr cPtr = freeswitchPINVOKE.switch_asr_interface_asr_start_input_timers_get(swigCPtr);
+      SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_asr_handle__switch_status_t(cPtr, false);
+      return ret;
+    } 
+  }
+
+  public SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void asr_text_param {
+    set {
+      freeswitchPINVOKE.switch_asr_interface_asr_text_param_set(swigCPtr, SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void.getCPtr(value));
+    } 
+    get {
+      IntPtr cPtr = freeswitchPINVOKE.switch_asr_interface_asr_text_param_get(swigCPtr);
+      SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_asr_handle_p_char_p_q_const__char__void(cPtr, false);
+      return ret;
+    } 
+  }
+
+  public SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void asr_numeric_param {
+    set {
+      freeswitchPINVOKE.switch_asr_interface_asr_numeric_param_set(swigCPtr, SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void.getCPtr(value));
+    } 
+    get {
+      IntPtr cPtr = freeswitchPINVOKE.switch_asr_interface_asr_numeric_param_get(swigCPtr);
+      SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_asr_handle_p_char_int__void(cPtr, false);
+      return ret;
+    } 
+  }
+
+  public SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void asr_float_param {
+    set {
+      freeswitchPINVOKE.switch_asr_interface_asr_float_param_set(swigCPtr, SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void.getCPtr(value));
+    } 
+    get {
+      IntPtr cPtr = freeswitchPINVOKE.switch_asr_interface_asr_float_param_get(swigCPtr);
+      SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_asr_handle_p_char_double__void(cPtr, false);
+      return ret;
+    } 
+  }
+
   public SWIGTYPE_p_switch_thread_rwlock_t rwlock {
     set {
       freeswitchPINVOKE.switch_asr_interface_rwlock_set(swigCPtr, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(value));
@@ -26093,7 +26280,8 @@
   SWITCH_XML_SECTION_CONFIG = (1 << 0),
   SWITCH_XML_SECTION_DIRECTORY = (1 << 1),
   SWITCH_XML_SECTION_DIALPLAN = (1 << 2),
-  SWITCH_XML_SECTION_PHRASES = (1 << 3)
+  SWITCH_XML_SECTION_PHRASES = (1 << 3),
+  SWITCH_XML_SECTION_MAX = (1 << 4)
 }
 
 }


From mikej at freeswitch.org  Tue Jun 16 09:06:37 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 11:06:37 -0500
Subject: [Freeswitch-svn] [commit] r13783 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: mikej
Date: Tue Jun 16 11:06:37 2009
New Revision: 13783

Log:
attempt to fix SFSIP-150

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Tue Jun 16 11:06:37 2009
@@ -2676,7 +2676,7 @@
 		if (!strncasecmp(dest, "sip:", 4) || !strncasecmp(dest, "sips:", 5)) {
 			tech_pvt->dest = switch_core_session_strdup(nsession, dest);
 		} else if ((host = strchr(dest, '%'))) {
-			char buf[128];
+			char buf[1024];
 			*host = '@';
 			tech_pvt->e_dest = switch_core_session_strdup(nsession, dest);
 			*host++ = '\0';
@@ -2689,7 +2689,7 @@
 				goto error;
 			}
 		} else if (!(host = strchr(dest, '@'))) {
-			char buf[128];
+			char buf[1024];
 			tech_pvt->e_dest = switch_core_session_strdup(nsession, dest);
 			if (sofia_reg_find_reg_url(profile, dest, profile_name, buf, sizeof(buf))) {
 				tech_pvt->dest = switch_core_session_strdup(nsession, buf);


From anthm at freeswitch.org  Tue Jun 16 10:39:03 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 12:39:03 -0500
Subject: [Freeswitch-svn] [commit] r13784 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Tue Jun 16 12:39:03 2009
New Revision: 13784

Log:
declinatio mortuus obfirmo

Modified:
   freeswitch/trunk/src/switch_core_asr.c
   freeswitch/trunk/src/switch_core_speech.c

Modified: freeswitch/trunk/src/switch_core_asr.c
==============================================================================
--- freeswitch/trunk/src/switch_core_asr.c	(original)
+++ freeswitch/trunk/src/switch_core_asr.c	Tue Jun 16 12:39:03 2009
@@ -77,7 +77,14 @@
 	ah->rate = rate;
 	ah->name = switch_core_strdup(ah->memory_pool, module_name);
 
-	return ah->asr_interface->asr_open(ah, codec, rate, dest, flags);
+	status = ah->asr_interface->asr_open(ah, codec, rate, dest, flags);
+
+	if (status != SWITCH_STATUS_SUCCESS) {
+		UNPROTECT_INTERFACE(ah->asr_interface);
+	}
+
+	return status;
+
 }
 
 SWITCH_DECLARE(switch_status_t) switch_core_asr_load_grammar(switch_asr_handle_t *ah, const char *grammar, const char *name)

Modified: freeswitch/trunk/src/switch_core_speech.c
==============================================================================
--- freeswitch/trunk/src/switch_core_speech.c	(original)
+++ freeswitch/trunk/src/switch_core_speech.c	Tue Jun 16 12:39:03 2009
@@ -86,6 +86,8 @@
 
 	if ((status = sh->speech_interface->speech_open(sh, voice_name, rate, flags)) == SWITCH_STATUS_SUCCESS) {
 		switch_set_flag(sh, SWITCH_SPEECH_FLAG_OPEN);
+	} else {
+		UNPROTECT_INTERFACE(sh->speech_interface);
 	}
 
 	return status;


From greenlizard at freeswitch.org  Tue Jun 16 11:11:44 2009
From: greenlizard at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 13:11:44 -0500
Subject: [Freeswitch-svn] [commit] r13785 -
	freeswitch/trunk/scripts/socket/freepy
Message-ID: 

Author: greenlizard
Date: Tue Jun 16 13:11:44 2009
New Revision: 13785

Log:
refactor to fix some major DRY violations

Modified:
   freeswitch/trunk/scripts/socket/freepy/__init__.py

Modified: freeswitch/trunk/scripts/socket/freepy/__init__.py
==============================================================================
--- freeswitch/trunk/scripts/socket/freepy/__init__.py	(original)
+++ freeswitch/trunk/scripts/socket/freepy/__init__.py	Tue Jun 16 13:11:44 2009
@@ -76,6 +76,20 @@
         debug(">> %s" % msg)
         return req.getDeferred()
 
+    def _sendCommand(self, command, bgapi):
+        """
+        there is a lot of duplication in this object, and as many
+        methods as possible should be changed to use this method
+        rather than repeating the code
+        """
+        command = ("bgapi %s" if bgapi else "api %s") % command
+        req = (request.BgDialoutRequest if bgapi else
+               request.DialoutRequest)()
+        self.requestq.put(req)
+        self.transport.write("%s\n\n" % command)
+        debug(">> %s" % command)
+        return req.getDeferred()
+
     def confdialout(self, conf_name, sofia_url, bgapi=True):
         """
         Instruct conference to join a particular user via dialout
@@ -161,18 +175,9 @@
 
                   TODO: add this        
         """
-        if bgapi == True:
-            msg = "bgapi conference %s dtmf %s %s" % \
-                  (conf_name, member_id, dtmf)
-            req = request.BgApiRequest()
-        else:
-            msg = "api conference %s dtmf %s %s" % \
-                  (conf_name, member_id, dtmf)
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)                        
-        return req.getDeferred()
+        msg = "conference %s dtmf %s %s" % \
+              (conf_name, member_id, dtmf)        
+        return self._sendCommand(msg, bgapi)
 
     def confsay(self, conf_name, text2speak, bgapi=False):
         """
@@ -184,18 +189,8 @@
 
                   TODO: add this        
         """
-        if bgapi == True:
-            msg = "bgapi conference %s say %s" % \
-                  (conf_name, text2speak)
-            req = request.BgApiRequest()
-        else:
-            msg = "api conference %s say %s" % \
-                  (conf_name, text2speak)
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)                                
-        return req.getDeferred()
+        msg = "conference %s say %s" % (conf_name, text2speak)        
+        return self._sendCommand(msg, bgapi)
 
     def confplay(self, conf_name, snd_url, bgapi=False):
         """
@@ -207,18 +202,8 @@
 
                   TODO: add this        
         """
-        if bgapi == True:
-            msg = "bgapi conference %s play %s" % \
-                  (conf_name, snd_url)
-            req = request.BgApiRequest()
-        else:
-            msg = "api conference %s play %s" % \
-                  (conf_name, snd_url)
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)                                        
-        return req.getDeferred()
+        msg = "conference %s play %s" % (conf_name, snd_url)        
+        return self._sendCommand(msg, bgapi)
 
     def confstop(self, conf_name, bgapi=False):
         """
@@ -229,19 +214,8 @@
 
                   TODO: add this        
         """
-        if bgapi == True:
-            msg = "bgapi conference %s stop" % \
-                  (conf_name)
-            req = request.BgApiRequest()
-        else:
-            msg = "api conference %s stop" % \
-                  (conf_name)
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)                                        
-        return req.getDeferred()
-
+        msg = "conference %s stop" % (conf_name)        
+        return self._sendCommand(msg, bgapi)
 
     def showchannels(self, bgapi=False):
         """
@@ -269,84 +243,32 @@
           ...
         
         """
-        if bgapi == True:
-            msg = "bgapi show channels as xml"
-            req = request.BgApiRequest()            
-        else:
-            msg = "api show channels as xml"            
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)                                                
-        return req.getDeferred()
+        msg = "show channels as xml"        
+        return self._sendCommand(msg, bgapi)
 
     def sofia_status_profile(self, profile_name, bgapi=False):
-        # DO NOT USE - TOTALLY BROKEN
-        # FS DOES NOT RETURN XML IN THIS CASE
-        if bgapi == True:
-            msg = "bgapi sofia status profile %s as xml" % (profile_name)
-            req = request.BgApiRequest()
-        else:
-            msg = "api sofia status profile %s as xml" % (profile_name)
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        debug("sending to fs: %s" % msg)
-        self.transport.write("%s\n\n" % msg)
-        return req.getDeferred()
-        
+        msg = "sofia status profile %s as xml" % (profile_name)        
+        return self._sendCommand(msg, bgapi)
+
     def sofia_profile_restart(self, sofia_profile_name, bgapi = False):
-        if bgapi == True:
-            msg = "bgapi sofia profile %s restart" % \
-                  (sofia_profile_name)
-            req = request.BgApiRequest()
-        else:
-            msg = "api sofia profile %s restart" % \
-                  (sofia_profile_name)
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)                                                        
-        return req.getDeferred()
 
+        msg = "sofia profile %s restart" % (sofia_profile_name)
+        return self._sendCommand(msg, bgapi)
 
     def killchan(self, uuid, bgapi = False):
-        if bgapi == True:
-            msg = "bgapi uuid_kill %s" % (uuid)
-            req = request.BgApiRequest()
-        else:
-            msg = "api uuid_kill %s" % (uuid)            
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)        
-        return req.getDeferred()
+        return self._sendCommand("uuid_kill %s" % (uuid), bgapi)
 
     def broadcast(self, uuid, path, legs, bgapi = False):
-        if bgapi == True:
-            msg = "bgapi uuid_broadcast %s %s %s" % (uuid, path, legs)
-            req = request.BgApiRequest()
-        else:
-            msg = "api uuid_broadcast %s %s %s" % (uuid, path, legs)
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)                
-        return req.getDeferred()
-
+        msg = "uuid_broadcast %s %s %s" % (uuid, path, legs)
+        return self._sendCommand(msg, bgapi)
+    
     def transfer(self, uuid, dest_ext, legs, bgapi = False):
         """
         transfer  [-bleg|-both] 
         """
-        if bgapi == True:
-            msg = "bgapi uuid_transfer %s %s %s" % (uuid, legs, dest_ext)
-            req = request.BgApiRequest()
-        else:
-            msg = "api uuid_transfer %s %s %s" % (uuid, legs, dest_ext)
-            req = request.ApiRequest()
-        self.requestq.put(req)
-        self.transport.write("%s\n\n" % msg)
-        debug(">> %s" % msg)                        
-        return req.getDeferred()
+        msg = "uuid_transfer %s %s %s" % (uuid, legs, dest_ext)        
+        return self._sendCommand(msg, bgapi)
+
         
     def lineReceived(self, line):
         debug("<< %s" % line)                                


From andrew at freeswitch.org  Tue Jun 16 11:46:28 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 13:46:28 -0500
Subject: [Freeswitch-svn] [commit] r13786 - in freeswitch/trunk/src/mod:
	endpoints/mod_sofia event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Tue Jun 16 13:46:28 2009
New Revision: 13786

Log:
Fix multicast replication of sofia registrations (OKed by anthm)


Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Tue Jun 16 13:46:28 2009
@@ -590,15 +590,15 @@
 		char *exp_str = switch_event_get_header(event, "orig-expires");
 		char *rpid = switch_event_get_header(event, "orig-rpid");
 		char *call_id = switch_event_get_header(event, "orig-call-id");
-		char *user_agent = switch_event_get_header(event, "user-agent");
+		char *user_agent = switch_event_get_header(event, "orig-user-agent");
 		long expires = (long) switch_epoch_time_now(NULL);
 		char *profile_name = switch_event_get_header(event, "orig-profile-name");
 		char *to_user = switch_event_get_header(event, "orig-to-user");
-		char *presence_hosts = switch_event_get_header(event, "presence-hosts");
-		char *network_ip = switch_event_get_header(event, "network-ip");
-		char *network_port = switch_event_get_header(event, "network-port");
-		char *username = switch_event_get_header(event, "username");
-		char *realm = switch_event_get_header(event, "realm");
+		char *presence_hosts = switch_event_get_header(event, "orig-presence-hosts");
+		char *network_ip = switch_event_get_header(event, "orig-network-ip");
+		char *network_port = switch_event_get_header(event, "orig-network-port");
+		char *username = switch_event_get_header(event, "orig-username");
+		char *realm = switch_event_get_header(event, "orig-realm");
 
 		
 		sofia_profile_t *profile = NULL;
@@ -628,11 +628,11 @@
 		
 		switch_find_local_ip(guess_ip4, sizeof(guess_ip4), NULL, AF_INET);
 		sql = switch_mprintf("insert into sip_registrations "
-							 "(call_id,sip_user,sip_host,presence_hosts,contact,status,rpid,expires,"
-							 "user_agent,server_user,server_host,profile_name,hostname,network_ip,network_port,sip_username,sip_realm) "
-							 "values ('%q', '%q','%q','%q','Registered', '%q', %ld, '%q', '%q', '%q','%q','%q','%q','%q','%q','%q')",
+							 "(call_id, sip_user, sip_host, presence_hosts, contact, status, rpid, expires,"
+							 "user_agent, server_user, server_host, profile_name, hostname, network_ip, network_port, sip_username, sip_realm) "
+							 "values ('%q','%q','%q','%q','%q','Registered','%q',%ld, '%q','%q','%q','%q','%q','%q','%q','%q','%q')",
 							 call_id, from_user, from_host, presence_hosts, contact_str, rpid, expires, user_agent, to_user, guess_ip4, 
-							 profile_name,mod_sofia_globals.hostname, network_ip, network_port, username, realm);
+							 profile_name, mod_sofia_globals.hostname, network_ip, network_port, username, realm);
 
 		if (sql) {
 			sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	Tue Jun 16 13:46:28 2009
@@ -1126,6 +1126,7 @@
 			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "network-port", network_port_c);
 			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "username", username);
 			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "realm", realm);
+			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "user-agent", agent);
 			switch_event_fire(&s_event);
 		}
 

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	Tue Jun 16 13:46:28 2009
@@ -326,6 +326,7 @@
 							term++;
 						}
 					}
+					switch_url_decode(val);
 					switch_snprintf(tmpname, sizeof(tmpname), "Orig-%s", var);
 					switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, tmpname, val);
 					var = term + 1;


From anthm at freeswitch.org  Tue Jun 16 14:33:31 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 16:33:31 -0500
Subject: [Freeswitch-svn] [commit] r13787 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Tue Jun 16 16:33:31 2009
New Revision: 13787

Log:
init buffer in lead out on speak

Modified:
   freeswitch/trunk/src/switch_ivr_play_say.c

Modified: freeswitch/trunk/src/switch_ivr_play_say.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_play_say.c	(original)
+++ freeswitch/trunk/src/switch_ivr_play_say.c	Tue Jun 16 16:33:31 2009
@@ -1888,6 +1888,9 @@
 		status = switch_core_speech_read_tts(sh, abuf, &ilen, &flags);
 
 		if (status != SWITCH_STATUS_SUCCESS) {
+			write_frame.datalen = (uint32_t) codec->implementation->decoded_bytes_per_packet;
+			write_frame.samples = (uint32_t) (write_frame.datalen / 2);
+			memset(write_frame.data, 0, write_frame.datalen);
 			for (x = 0; !done && x < lead_in_out; x++) {
 				switch_yield(codec->implementation->microseconds_per_packet);
 				if (timer) {


From brian at freeswitch.org  Tue Jun 16 14:57:00 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 16:57:00 -0500
Subject: [Freeswitch-svn] [commit] r13788 - in freeswitch/trunk:
	conf/autoload_configs conf/mrcp_profiles src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: brian
Date: Tue Jun 16 16:56:59 2009
New Revision: 13788

Log:
Adding mod_unimrcp still needs more testing and some tweaks to config engine... do not forget to come to ClueCON http://www.cluecon.com

Added:
   freeswitch/trunk/conf/autoload_configs/unimrcp.conf.xml
   freeswitch/trunk/conf/mrcp_profiles/
   freeswitch/trunk/conf/mrcp_profiles/profiles.xml
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Added: freeswitch/trunk/conf/autoload_configs/unimrcp.conf.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/conf/autoload_configs/unimrcp.conf.xml	Tue Jun 16 16:56:59 2009
@@ -0,0 +1,20 @@
+
+  
+    
+    
+    
+    
+    
+    
+
+    
+    
+  
+
+  
+    
+  
+
+
+

Added: freeswitch/trunk/conf/mrcp_profiles/profiles.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/conf/mrcp_profiles/profiles.xml	Tue Jun 16 16:56:59 2009
@@ -0,0 +1,72 @@
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+

Added: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile	Tue Jun 16 16:56:59 2009
@@ -0,0 +1,27 @@
+BASE=../../../../
+
+UNIMRCP_DIR=$(switch_srcdir)/libs/unimrcp
+UNIMRCPLA=$(UNIMRCP_DIR)/platforms/libunimrcp-client/libunimrcpclient.la
+LOCAL_CFLAGS=-I.
+LOCAL_CFLAGS+=-I$(switch_srcdir)/libs/apr/include
+LOCAL_CFLAGS+=-I$(switch_srcdir)/libs/apr-util/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/platforms/libunimrcp-client/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/modules/mrcp-sofiasip/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/modules/mrcp-unirtsp/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp-client/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp-signaling/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcpv2-transport/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp/message/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp/control/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp/resources/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mpf/include
+LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/apr-toolkit/include
+LOCAL_LIBADD=$(UNIMRCPLA)
+
+include $(BASE)/build/modmake.rules
+
+$(UNIMRCPLA): $(UNIMRCP_DIR)
+	cd $(UNIMRCP_DIR) && $(MAKE)
+	$(TOUCH_TARGET)
+

Added: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Tue Jun 16 16:56:59 2009
@@ -0,0 +1,3446 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2009, Anthony Minessale II 
+ *
+ * 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 mod_unimrcp
+ *
+ * The Initial Developer of the Original Code is
+ * Christopher M. Rienzo 
+ *
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Brian West 
+ *
+ * mod_unimrcp.c -- UniMRCP module (MRCP client)
+ *
+ */
+#include 
+
+/* undefine to use UniMRCP's "conf/unimrcpclient.xml" style config */
+#undef MOD_UNIMRCP_FREESWITCH_CONFIG
+
+/* UniMRCP includes */
+#include "apt.h"
+#include "apt_log.h"
+#include "unimrcp_client.h"
+#include "mrcp_application.h"
+#include "mrcp_session.h"
+#include "mrcp_message.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_synth_header.h"
+#include "mrcp_synth_resource.h"
+#include "mrcp_recog_header.h"
+#include "mrcp_recog_resource.h"
+
+#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
+#include "mrcp_default_factory.h"
+#include "mpf_engine.h"
+#include "mpf_codec_manager.h"
+#include "mpf_rtp_termination_factory.h"
+#include "mrcp_sofiasip_client_agent.h"
+#include "mrcp_unirtsp_client_agent.h"
+#include "mrcp_client_connection.h"
+#include "apt_net.h"
+#endif
+
+/*********************************************************************************************************************************************
+ * mod_unimrcp : module interface to FreeSWITCH
+ */
+
+/* module name */
+#define MOD_UNIMRCP "unimrcp"
+/* module config file */
+#define CONFIG_FILE "unimrcp.conf"
+
+/**
+ * A UniMRCP application.
+ */
+struct mod_unimrcp_application {
+	/** UniMRCP application */
+	mrcp_application_t *app;
+	/** MRCP callbacks from UniMRCP to this module's application */
+	mrcp_app_message_dispatcher_t dispatcher;
+	/** Audio callbacks from UniMRCP to this module's application */
+	mpf_audio_stream_vtable_t audio_stream_vtable;
+	/** maps FreeSWITCH param to MRCP param name */
+	switch_hash_t *fs_param_map;
+	/** maps MRCP header to unimrcp header handler function */
+	switch_hash_t *param_id_map;
+};
+typedef struct mod_unimrcp_application mod_unimrcp_application_t;
+
+/**
+ * module globals
+ */
+struct mod_unimrcp_globals {
+#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
+	/** max-connection-count config */
+	char *unimrcp_max_connection_count;
+	/** offer-new-connection config */
+	char *unimrcp_offer_new_connection;
+#else
+	/** mrcp-profile-path config */
+	char *unimrcp_dir;
+#endif
+	/** default-tts-profile config */
+	char *unimrcp_default_synth_profile;
+	/** default-asr-profile config */
+	char *unimrcp_default_recog_profile;
+	/** log level for UniMRCP library */	
+	char *unimrcp_log_level;
+	/** UniMRCP directory layout */
+	apt_dir_layout_t *unimrcp_dir_layout;
+	/** the MRCP client stack */
+	mrcp_client_t *mrcp_client;
+	/** synthesizer application */
+	mod_unimrcp_application_t synth;
+	/** recognizer application */
+	mod_unimrcp_application_t recog;
+	/** synchronize access for speech channel numbering */
+	switch_mutex_t *mutex;
+	/** next available speech channel number */
+	int speech_channel_number;
+};
+typedef struct mod_unimrcp_globals mod_unimrcp_globals_t;
+
+/** Module global variables */
+static mod_unimrcp_globals_t globals;
+
+/**
+ * Defines XML parsing instructions
+ */
+static switch_xml_config_item_t instructions[] = {
+#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
+	SWITCH_CONFIG_ITEM_STRING_STRDUP("max-connection-count", CONFIG_REQUIRED, &globals.unimrcp_max_connection_count, "100", "", "The max MRCPv2 connections to manage"),
+	/* TODO figure out what this param does */
+	SWITCH_CONFIG_ITEM_STRING_STRDUP("offer-new-connection", CONFIG_REQUIRED, &globals.unimrcp_offer_new_connection, "1", "", ""),
+#else
+	SWITCH_CONFIG_ITEM_STRING_STRDUP("mrcp-profile-path", CONFIG_REQUIRED, &globals.unimrcp_dir, "../", "", "The root path for conf/unimrcpclient.xml"),
+#endif
+	SWITCH_CONFIG_ITEM_STRING_STRDUP("default-tts-profile", CONFIG_REQUIRED, &globals.unimrcp_default_synth_profile, "default", "", "The default profile to use for TTS"), 
+	SWITCH_CONFIG_ITEM_STRING_STRDUP("default-asr-profile", CONFIG_REQUIRED, &globals.unimrcp_default_recog_profile, "default", "", "The default profile to use for ASR"),
+	SWITCH_CONFIG_ITEM_STRING_STRDUP("log-level", CONFIG_REQUIRED, &globals.unimrcp_log_level, "WARNING", "EMERGENCY|ALERT|CRITICAL|ERROR|WARNING|NOTICE|INFO|DEBUG", "Logging level for UniMRCP"),
+	SWITCH_CONFIG_ITEM_END()
+};
+
+/* mod_unimrcp interface to FreeSWITCH */
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_unimrcp_shutdown);
+SWITCH_MODULE_RUNTIME_FUNCTION(mod_unimrcp_runtime);
+SWITCH_MODULE_LOAD_FUNCTION(mod_unimrcp_load);
+SWITCH_MODULE_DEFINITION(mod_unimrcp, mod_unimrcp_load, mod_unimrcp_shutdown, NULL);
+
+static switch_status_t mod_unimrcp_do_config();
+#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
+static mrcp_client_t *mod_unimrcp_client_create();
+static int process_rtp_config(mrcp_client_t *client, mpf_rtp_config_t *rtp_config, const char *param, const char *val, apr_pool_t *pool);
+static int process_mrcpv1_config(rtsp_client_config_t *config, const char *param, const char *val, apr_pool_t *pool);
+static int process_mrcpv2_config(mrcp_sofia_client_config_t *config, const char *param, const char *val, apr_pool_t *pool);
+#endif
+
+/* UniMRCP <--> FreeSWITCH logging bridge */
+static apt_bool_t unimrcp_log(const char *file, int line, const char *id, apt_log_priority_e priority, const char *format, va_list arg_ptr);
+static apt_log_priority_e str_to_log_level(const char *level);
+
+static int get_next_speech_channel_number(void);
+
+#define XML_ID  " FreeSWITCH audio buffering
+ */
+
+/* size of the buffer */
+#define AUDIO_QUEUE_SIZE (1024 * 32)
+
+/* Define to enable read/write logging and dumping of queue data to file */
+#undef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+
+/**
+ * Audio queue internals 
+ */
+struct audio_queue {
+#ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+	/** debug file for tx operations */
+	switch_file_t *file_write;
+	/** debug file name */
+	char file_write_name[30];
+	/** debug file for rx operations */
+	switch_file_t *file_read;
+	/** debug file name */
+	char file_read_name[30];
+#endif
+	/** the buffer of audio data */
+	switch_buffer_t *buffer;
+	/** synchronizes access to queue */
+	switch_mutex_t *mutex;
+	/** signaling for blocked readers/writers */
+	switch_thread_cond_t *cond;
+	/** total bytes written */
+	unsigned int write_bytes;
+	/** total bytes read */
+	unsigned int read_bytes;
+	/** number of bytes reader is waiting for */
+	int waiting;
+	/** name of this queue (for logging) */
+	char *name;
+};
+typedef struct audio_queue audio_queue_t;
+
+static switch_status_t audio_queue_create(audio_queue_t **queue, const char *name, switch_memory_pool_t *pool);
+static switch_status_t audio_queue_write(audio_queue_t *queue, void *data, switch_size_t *data_len);
+static switch_status_t audio_queue_read(audio_queue_t *queue, void *data, switch_size_t *data_len, int block);
+static switch_status_t audio_queue_clear(audio_queue_t *queue);
+static switch_status_t audio_queue_destroy(audio_queue_t *queue);
+
+/*********************************************************************************************************************************************
+ * SPEECH_CHANNEL : speech functions common to recognizer and synthesizer
+ */
+
+/* how long to wait for UniMRCP to process requests */
+#define SPEECH_CHANNEL_TIMEOUT_USEC (10 * 1000000)
+
+/**
+ * Type of MRCP channel
+ */
+enum speech_channel_type {
+	SPEECH_CHANNEL_SYNTHESIZER,
+	SPEECH_CHANNEL_RECOGNIZER
+};
+typedef enum speech_channel_type speech_channel_type_t;
+
+/**
+ * channel states
+ */
+enum speech_channel_state {
+	/** closed */
+	SPEECH_CHANNEL_CLOSED,
+	/** ready for speech request */
+	SPEECH_CHANNEL_READY,
+	/** processing speech request */
+	SPEECH_CHANNEL_PROCESSING,
+	/** error opening channel */
+	SPEECH_CHANNEL_ERROR
+};
+typedef enum speech_channel_state speech_channel_state_t;
+
+
+
+/**
+ * An MRCP speech channel
+ */
+struct speech_channel {
+	/** the name of this channel (for logging) */
+	char *name;
+	/** type of channel */
+	speech_channel_type_t type;
+	/** application this channel is running */
+	mod_unimrcp_application_t *application;
+	/** UniMRCP session */
+	mrcp_session_t *unimrcp_session;
+	/** UniMRCP channel */
+	mrcp_channel_t *unimrcp_channel;
+	/** memory pool */
+	switch_memory_pool_t *memory_pool;
+	/** synchronizes channel state */
+	switch_mutex_t *mutex;
+	/** wait on channel states */
+	switch_thread_cond_t *cond;
+	/** channel state */
+	speech_channel_state_t state;
+	/** UniMRCP <--> FreeSWITCH audio buffer */
+	audio_queue_t *audio_queue;
+	/** codec */
+	char *codec;
+	/** rate */
+	unsigned int rate;
+	/** silence byte */
+	int silence;
+	/** speech channel params */
+	switch_hash_t *params;
+	/** app specific data */
+	void *data;
+};
+typedef struct speech_channel speech_channel_t;
+
+/* speech channel interface for UniMRCP */
+static apt_bool_t speech_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t speech_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+static apt_bool_t speech_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+
+/* speech_channel funcs */
+static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, const char *codec, unsigned int rate, switch_memory_pool_t *pool);
+static switch_status_t speech_channel_open(speech_channel_t *schannel, const char *profile_name);
+static switch_status_t speech_channel_destroy(speech_channel_t *schannel);
+static switch_status_t speech_channel_stop(speech_channel_t *schannel);
+static switch_status_t speech_channel_set_param(speech_channel_t *schannel, const char *name, const char *val);
+static switch_status_t speech_channel_write(speech_channel_t *schannel, void *data, switch_size_t *len);
+static switch_status_t speech_channel_read(speech_channel_t *schannel, void *data, switch_size_t *len, int block);
+static switch_status_t speech_channel_set_state(speech_channel_t *schannel, speech_channel_state_t state);
+static const char *speech_channel_state_to_string(speech_channel_state_t state);
+static const char *speech_channel_type_to_string(speech_channel_type_t type);
+
+
+/*********************************************************************************************************************************************
+ * SYNTHESIZER : UniMRCP <--> FreeSWITCH tts interface
+ */
+
+/* synthesis languages */
+#define MIME_TYPE_SSML_XML "application/ssml+xml"
+#define MIME_TYPE_PLAIN_TEXT "text/plain"
+
+static switch_status_t synth_load(switch_loadable_module_interface_t *module_interface, switch_memory_pool_t *pool);
+static switch_status_t synth_shutdown();
+
+/* synthesizer's interface for FreeSWITCH */
+static switch_status_t synth_speech_open(switch_speech_handle_t *sh, const char *voice_name, int rate, switch_speech_flag_t *flags);
+static switch_status_t synth_speech_close(switch_speech_handle_t *sh, switch_speech_flag_t *flags);
+static switch_status_t synth_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags);
+static switch_status_t synth_speech_read_tts(switch_speech_handle_t *sh, void *data, switch_size_t *datalen, switch_speech_flag_t *flags);
+static void synth_speech_flush_tts(switch_speech_handle_t *sh);
+static void synth_speech_text_param_tts(switch_speech_handle_t *sh, char *param, const char *val);
+static void synth_speech_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val);
+static void synth_speech_float_param_tts(switch_speech_handle_t *sh, char *param, double val);
+
+/* synthesizer's interface for UniMRCP */
+static apt_bool_t synth_message_handler(const mrcp_app_message_t *app_message);
+static apt_bool_t synth_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message);
+static apt_bool_t synth_stream_write(mpf_audio_stream_t *stream, const mpf_frame_t *frame);
+
+/* synthesizer specific speech_channel funcs */
+static switch_status_t synth_channel_speak(speech_channel_t *schannel, const char *text);
+static switch_status_t synth_channel_set_params(speech_channel_t *schannel, mrcp_message_t *msg, mrcp_generic_header_t *gen_hdr, mrcp_synth_header_t *synth_hdr);
+static switch_status_t synth_channel_set_header(speech_channel_t *schannel, int id, char *val, mrcp_message_t *msg, mrcp_synth_header_t *synth_hdr);
+
+/*********************************************************************************************************************************************
+ * GRAMMAR : recognizer grammar management 
+ */
+
+/**
+ * type of the grammar
+ */
+enum grammar_type {
+	GRAMMAR_TYPE_UNKNOWN,
+	/* text/uri-list */
+	GRAMMAR_TYPE_URI,
+	/* application/srgs */
+	GRAMMAR_TYPE_SRGS,
+	/* application/srgs+xml */
+	GRAMMAR_TYPE_SRGS_XML,
+	/* application/x-nuance-gsl */
+	GRAMMAR_TYPE_NUANCE_GSL,
+	/* application/x-jsgf */
+	GRAMMAR_TYPE_JSGF
+};
+typedef enum grammar_type grammar_type_t;
+
+/**
+ * A grammar for recognition
+ */
+struct grammar {
+	/** name of this grammar */
+	char *name;
+	/** grammar MIME type */
+	grammar_type_t type;
+	/** the grammar or its URI, depending on type */
+	char *data;
+};
+typedef struct grammar grammar_t;
+
+static switch_status_t grammar_create(grammar_t **grammar, const char *name, grammar_type_t type, const char *data, switch_memory_pool_t *pool);
+static const char *grammar_type_to_mime(grammar_type_t type);
+
+/*********************************************************************************************************************************************
+ * RECOGNIZER : UniMRCP <--> FreeSWITCH asr interface
+ */
+
+/**
+ * Data specific to the recognizer
+ */
+struct recognizer_data {
+	/** the speech recognition grammar */
+	grammar_t *grammar;
+	/** recognize result */
+	char *result;
+	/** true, if voice has started */
+	int start_of_input;
+};
+typedef struct recognizer_data recognizer_data_t;
+
+static switch_status_t recog_load(switch_loadable_module_interface_t *module_interface, switch_memory_pool_t *pool);
+static switch_status_t recog_shutdown() ;
+
+/* recognizer's interface for FreeSWITCH */
+static switch_status_t recog_asr_open(switch_asr_handle_t *ah, const char *codec, int rate, const char *dest, switch_asr_flag_t *flags);
+static switch_status_t recog_asr_load_grammar(switch_asr_handle_t *ah, const char *grammar, const char *name);
+static switch_status_t recog_asr_unload_grammar(switch_asr_handle_t *ah, const char *name);
+static switch_status_t recog_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags);
+static switch_status_t recog_asr_feed(switch_asr_handle_t *ah, void *data, unsigned int len, switch_asr_flag_t *flags);
+static switch_status_t recog_asr_resume(switch_asr_handle_t *ah);
+static switch_status_t recog_asr_pause(switch_asr_handle_t *ah);
+static switch_status_t recog_asr_check_results(switch_asr_handle_t *ah, switch_asr_flag_t *flags);
+static switch_status_t recog_asr_get_results(switch_asr_handle_t *ah, char **xmlstr, switch_asr_flag_t *flags);
+static switch_status_t recog_asr_start_input_timers(switch_asr_handle_t *ah);
+static void recog_asr_text_param(switch_asr_handle_t *ah, char *param, const char *val);
+static void recog_asr_numeric_param(switch_asr_handle_t *ah, char *param, int val);
+static void recog_asr_float_param(switch_asr_handle_t *ah, char *param, double val);
+
+/* recognizer's interface for UniMRCP */
+static apt_bool_t recog_message_handler(const mrcp_app_message_t *app_message);
+static apt_bool_t recog_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message);
+static apt_bool_t recog_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame);
+
+/* recognizer specific speech_channel_funcs */
+static switch_status_t recog_channel_start(speech_channel_t *schannel);
+static switch_status_t recog_channel_load_grammar(speech_channel_t *schannel, const char *name, grammar_type_t type, const char *data);
+static switch_status_t recog_channel_unload_grammar(speech_channel_t *schannel, const char *name);
+static switch_status_t recog_channel_check_results(speech_channel_t *schannel);
+static switch_status_t recog_channel_set_start_of_input(speech_channel_t *schannel);
+static switch_status_t recog_channel_start_input_timers(speech_channel_t *schannel);
+static switch_status_t recog_channel_set_results(speech_channel_t *schannel, const char *results);
+static switch_status_t recog_channel_get_results(speech_channel_t *schannel, char **results);
+static switch_status_t recog_channel_set_params(speech_channel_t *schannel, mrcp_message_t *msg, mrcp_generic_header_t *gen_hdr, mrcp_recog_header_t *recog_hdr);
+static switch_status_t recog_channel_set_header(speech_channel_t *schannel, int id, char *val, mrcp_message_t *msg, mrcp_recog_header_t *recog_hdr);
+/**
+ * Inspect text to determine if its first non-whitespace text matches "match"
+ * @param text the text to inspect.
+ * @param match the text to match
+ * @return true if matches
+ */
+static int text_starts_with(const char *text, const char *match)
+{
+	int result = 0;
+
+	if (!switch_strlen_zero(text)) {
+		/* find first non-space character */
+		while (switch_isspace(*text)) {
+			text++;
+		}
+		size_t textlen = strlen(text);
+		size_t matchlen = strlen(match);
+		/* is there a match? */
+		result = textlen > matchlen && !strncmp(match, text, matchlen);
+	}
+	
+	return result;
+}
+
+/**
+ * Create the audio queue
+ *
+ * @param audio_queue the created queue
+ * @param name the name of this queue (for logging)
+ * @param pool memory pool to allocate queue from 
+ * @return SWITCH_STATUS_SUCCESS if successful.  SWITCH_STATUS_FALSE if unable to allocate queue
+ */
+static switch_status_t audio_queue_create(audio_queue_t **audio_queue, const char *name, switch_memory_pool_t *pool)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	audio_queue_t *laudio_queue = NULL;
+#ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+	int flags;
+#endif
+	char *lname = "";
+	*audio_queue = NULL;
+
+	if (switch_strlen_zero(name)) {
+		lname = "";
+	} else {
+		lname = switch_core_strdup(pool, name);
+	}
+
+	if ((laudio_queue = switch_core_alloc(pool, sizeof(audio_queue_t))) == NULL) {		
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue\n", lname);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	laudio_queue->name = lname;
+
+	if (switch_buffer_create(pool, &laudio_queue->buffer, AUDIO_QUEUE_SIZE) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue buffer\n", laudio_queue->name);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+    }
+
+	if (switch_mutex_init(&laudio_queue->mutex, SWITCH_MUTEX_UNNESTED, pool) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue mutex\n", laudio_queue->name);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	if (switch_thread_cond_create(&laudio_queue->cond, pool) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue condition variable\n", laudio_queue->name);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+#ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+	flags = SWITCH_FOPEN_CREATE | SWITCH_FOPEN_WRITE | SWITCH_FOPEN_TRUNCATE | SWITCH_FOPEN_BINARY;
+	strcpy(laudio_queue->file_read_name, "/tmp/mod_unimrcp_rx_XXXXXX");	
+	if (switch_file_mktemp(&laudio_queue->file_read, laudio_queue->file_read_name, flags, pool) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue read file\n", laudio_queue->name);
+		laudio_queue->file_read = NULL;
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) queue rx saved to %s\n", laudio_queue->name, laudio_queue->file_read_name);
+	}
+	strcpy(laudio_queue->file_write_name, "/tmp/mod_unimrcp_tx_XXXXXX");
+	if (switch_file_mktemp(&laudio_queue->file_write, laudio_queue->file_write_name, flags, pool) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue write file\n", laudio_queue->name);
+		laudio_queue->file_write = NULL;
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) queue tx saved to %s\n", laudio_queue->name, laudio_queue->file_read_name);
+	}
+#endif
+
+	laudio_queue->write_bytes = 0;
+	laudio_queue->read_bytes = 0;
+	laudio_queue->waiting = 0;
+	*audio_queue = laudio_queue;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue created\n", laudio_queue->name);
+
+ done:
+
+	if(status != SWITCH_STATUS_SUCCESS) {
+		audio_queue_destroy(laudio_queue);
+	}
+	return status;
+}
+
+/**
+ * Write to the audio queue
+ *
+ * @param queue the queue to write to
+ * @param data the data to write
+ * @param data_len the number of octets to write
+ */
+static switch_status_t audio_queue_write(audio_queue_t *queue, void *data, switch_size_t *data_len)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_mutex_lock(queue->mutex);
+
+#ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+	switch_size_t len = *data_len;
+	if(queue->file_write) {
+		switch_file_write(queue->file_write, data, &len);
+	}
+#endif
+
+	if (switch_buffer_write(queue->buffer, data, *data_len) > 0) {
+		queue->write_bytes = queue->write_bytes + *data_len;
+#ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue write bytes = %d\trequested = %d\n", queue->name, (int)queue->write_bytes, (int)*data_len);
+#endif
+		if (queue->waiting <= switch_buffer_inuse(queue->buffer)) {
+			switch_thread_cond_signal(queue->cond);
+		}
+	} else {
+		*data_len = 0;
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue overflow!\n", queue->name);
+		status = SWITCH_STATUS_FALSE;
+	}
+
+	switch_mutex_unlock(queue->mutex);
+	return status;
+}
+
+/**
+ * Read from the audio queue
+ *
+ * @param queue the queue to read from 
+ * @param data the read data
+ * @oaram data_len the amount of data requested / actual amount of data read (returned)
+ * @param block 1 if blocking is allowed
+ * @return SWITCH_STATUS_SUCCESS if successful.  SWITCH_STATUS_FALSE if the queue is not allocated
+ */
+static switch_status_t audio_queue_read(audio_queue_t *queue, void *data, switch_size_t *data_len, int block)
+{
+	switch_size_t requested = *data_len;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_mutex_lock(queue->mutex);
+
+	/* wait for data, if allowed */
+	if (block) {
+		if (switch_buffer_inuse(queue->buffer) < requested) {
+			queue->waiting = requested;
+			switch_thread_cond_timedwait(queue->cond, queue->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
+			if (switch_buffer_inuse(queue->buffer) < requested) {
+				requested = switch_buffer_inuse(queue->buffer);	
+			}
+		}
+		queue->waiting = 0;
+	} else {
+		if (switch_buffer_inuse(queue->buffer) < requested) {
+			requested = switch_buffer_inuse(queue->buffer);
+		}
+	}
+
+	if (requested == 0) {
+		*data_len = 0;
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* read the data */
+	*data_len = switch_buffer_read(queue->buffer, data, requested);
+
+	queue->read_bytes = queue->read_bytes + *data_len;
+#ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue bytes total = %d\tread = %d\trequested = %d\n", queue->name, (int)queue->read_bytes, (int)*data_len, (int)requested);
+	switch_size_t len = *data_len;
+	if (queue->file_read) {
+		switch_file
+_write(queue->file_read, data, &len);
+	}
+#endif
+
+ done:
+
+	switch_mutex_unlock(queue->mutex);
+	return status;
+}
+
+/**
+ * Empty the queue
+ * 
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t audio_queue_clear(audio_queue_t *queue)
+{
+	switch_mutex_lock(queue->mutex);
+	switch_buffer_zero(queue->buffer);
+	switch_thread_cond_signal(queue->cond);
+	switch_mutex_unlock(queue->mutex);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Destroy the audio queue
+ *
+ * @param queue the queue to clean up
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t audio_queue_destroy(audio_queue_t *queue)
+{
+	if (queue) {
+		char *name = queue->name;
+		if (switch_strlen_zero(name)) {
+			name = "";
+		}
+		if (queue->buffer) {
+			switch_buffer_destroy(&queue->buffer);
+		}
+		if (queue->mutex) {
+			switch_mutex_destroy(queue->mutex);
+			queue->mutex = NULL;
+		}
+		if (queue->cond) {
+			switch_thread_cond_destroy(queue->cond);
+			queue->cond = NULL;
+		}
+#ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+		if (queue->file_read) {
+			switch_file_close(queue->file_read);
+			queue->file_read = NULL;
+		}
+		if (queue->file_write) {
+			switch_file_close(queue->file_write);
+			queue->file_write = NULL;
+		}
+#endif
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue destroyed\n", name);
+	}
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Create a speech channel
+ *
+ * @param schannel the created channel
+ * @param name the name of the channel
+ * @param type the type of channel to create
+ * @param app the application
+ * @param codec the codec to use
+ * @param rate the rate to use
+ * @param pool the memory pool to use
+ * @return SWITCH_STATUS_SUCCESS if successful.  SWITCH_STATUS_FALSE if the channel cannot be allocated.
+ */
+static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, const char *codec, unsigned int rate, switch_memory_pool_t *pool)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	speech_channel_t *schan = NULL;
+	*schannel = NULL;
+
+	if ((schan = switch_core_alloc(pool, sizeof(speech_channel_t))) == NULL) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	
+	if (switch_mutex_init(&schan->mutex, SWITCH_MUTEX_UNNESTED, pool) != SWITCH_STATUS_SUCCESS || 
+		switch_thread_cond_create(&schan->cond, pool) != SWITCH_STATUS_SUCCESS ||
+		audio_queue_create(&schan->audio_queue, name, pool) != SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	schan->type = type;
+	schan->application = app;
+	schan->state = SPEECH_CHANNEL_CLOSED;
+	schan->memory_pool = pool;
+	schan->params = NULL;
+	schan->rate = rate;
+	schan->codec = switch_core_strdup(pool, codec);
+	if (!strcmp("L16", schan->codec)) {
+		schan->silence = 0;
+	} else {
+		/* 8-bit PCMU, PCMA */
+		schan->silence = 128;
+	}
+	switch_core_hash_init(&schan->params, pool);
+	schan->data = NULL;
+	if (switch_strlen_zero(name)) {
+		schan->name = "";
+	} else {
+		schan->name = switch_core_strdup(pool, name);
+	}
+	*schannel = schan;
+
+ done:
+
+	return status;
+}
+
+/**
+ * Destroy the speech channel
+ *
+ * @param schannel the channel to destroy
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t speech_channel_destroy(speech_channel_t *schannel)
+{
+	/* destroy the channel and session if not already done */
+	switch_mutex_lock(schannel->mutex);
+	if (schannel->state != SPEECH_CHANNEL_CLOSED) {
+		mrcp_application_channel_remove(schannel->unimrcp_session, schannel->unimrcp_channel);
+		switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
+		audio_queue_destroy(schannel->audio_queue);
+		if (schannel->state != SPEECH_CHANNEL_CLOSED) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Failed to destroy channel.  Continuing\n", schannel->name);
+		}
+	}
+	switch_mutex_unlock(schannel->mutex);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Open the speech channel
+ *
+ * @param schannel the channel to open
+ * @param profile_name the profile to use
+ * @return SWITCH_STATUS_FALSE if failed, SWITCH_STATUS_RESTART if retry can be attempted with another profile, SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t speech_channel_open(speech_channel_t *schannel, const char *profile_name)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	mpf_termination_t *termination = NULL;
+	mrcp_resource_type_e resource_type;
+
+	switch_mutex_lock(schannel->mutex);
+
+	/* make sure we can open channel */
+	if (schannel->state != SPEECH_CHANNEL_CLOSED) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* create MRCP session */
+	if ((schannel->unimrcp_session = mrcp_application_session_create(schannel->application->app, profile_name, schannel)) == NULL) {	
+		/* profile doesn't exist? */
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Unable to create session with %s\n", schannel->name, profile_name);
+		status = SWITCH_STATUS_RESTART;
+		goto done;
+	}
+
+	/* create RTP endpoint and link to session channel */
+	mpf_codec_descriptor_t *codec = NULL;
+	codec = apr_palloc(schannel->unimrcp_session->pool, sizeof(mpf_codec_descriptor_t));
+	mpf_codec_descriptor_init(codec);
+	codec->channel_count = 1;
+	codec->payload_type = 96;
+	codec->sampling_rate = schannel->rate;
+	apt_string_set(&codec->name, schannel->codec);
+	/* see RFC 1890 for payload types */
+	if (!strcmp(schannel->codec, "PCMU") && schannel->rate == 8000) {
+		codec->payload_type = 0;
+	} else if (!strcmp(schannel->codec, "PCMA") && schannel->rate == 8000) {
+		codec->payload_type = 8;
+	} else if (!strcmp(schannel->codec, "L16") && schannel->rate == 44100) {
+		codec->payload_type = 11;
+	}
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) requesting codec %s/%d/%d\n", schannel->name, schannel->codec, codec->payload_type, codec->sampling_rate);
+	if(schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {	
+		termination = mrcp_application_sink_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
+	} else {
+		termination = mrcp_application_source_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
+	}
+	if(termination == NULL) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Unable to create termination with %s\n", schannel->name, profile_name);
+		mrcp_application_session_destroy(schannel->unimrcp_session);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
+		resource_type = MRCP_SYNTHESIZER_RESOURCE;
+	} else {
+		resource_type = MRCP_RECOGNIZER_RESOURCE;
+	}
+	if ((schannel->unimrcp_channel = mrcp_application_channel_create(schannel->unimrcp_session, resource_type, termination, NULL, schannel)) == NULL) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Unable to create channel with %s\n", schannel->name, profile_name);
+		mrcp_application_session_destroy(schannel->unimrcp_session);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* add channel to session... this establishes the connection to the MRCP server */
+	if (mrcp_application_channel_add(schannel->unimrcp_session, schannel->unimrcp_channel) != TRUE) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Unable to add channel to session with %s\n", schannel->name, profile_name);
+		mrcp_application_session_destroy(schannel->unimrcp_session);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* wait for channel to be ready */
+	switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
+	if (schannel->state == SPEECH_CHANNEL_READY) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) channel is ready\n", schannel->name);
+	}
+	else if (schannel->state == SPEECH_CHANNEL_CLOSED) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Timed out waiting for channel to be ready\n", schannel->name);
+		/* can't retry */
+		status = SWITCH_STATUS_FALSE;
+	} else if (schannel->state == SPEECH_CHANNEL_ERROR) {
+		/* Wait for session to be cleaned up */
+		switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
+		if (schannel->state != SPEECH_CHANNEL_CLOSED) {
+			/* major issue... can't retry */
+			status = SWITCH_STATUS_FALSE;
+		} else {
+			/* failed to open profile, retry is allowed */
+			status = SWITCH_STATUS_RESTART;
+		}
+	}
+
+ done:
+
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Send SPEAK request to synthesizer
+ *
+ * @param schannel the synthesizer channel
+ * @param text the text to speak
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t synth_channel_speak(speech_channel_t *schannel, const char *text)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	mrcp_message_t *mrcp_message = NULL;
+	mrcp_generic_header_t *generic_header = NULL;
+	mrcp_synth_header_t *synth_header = NULL;
+
+	switch_mutex_lock(schannel->mutex);
+	if (schannel->state != SPEECH_CHANNEL_READY) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, SYNTHESIZER_SPEAK);
+	if (mrcp_message == NULL) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Failed to create SPEAK message\n", schannel->name);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* set generic header fields (content-type) */
+	if ((generic_header = mrcp_generic_header_prepare(mrcp_message)) == NULL) {	
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* good enough way of determining SSML or plain text body */
+	if (text_starts_with(text, XML_ID)) {
+		apt_string_assign(&generic_header->content_type, MIME_TYPE_SSML_XML, mrcp_message->pool);
+	} else {
+		apt_string_assign(&generic_header->content_type, MIME_TYPE_PLAIN_TEXT, mrcp_message->pool);
+	}
+	mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_TYPE);
+
+	/* set synthesizer header fields (voice, rate, etc.) */
+	if ((synth_header = mrcp_resource_header_prepare(mrcp_message)) == NULL) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* add params to MRCP message */
+	synth_channel_set_params(schannel, mrcp_message, generic_header, synth_header);
+
+	/* set body (plain text or SSML) */
+	apt_string_assign(&mrcp_message->body, text, schannel->memory_pool);
+
+	/* Empty audio queue and send SPEAK to MRCP server */
+	audio_queue_clear(schannel->audio_queue);
+	if (mrcp_application_message_send(schannel->unimrcp_session, schannel->unimrcp_channel, mrcp_message) == FALSE) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	/* wait for IN PROGRESS */
+	switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
+	if (schannel->state != SPEECH_CHANNEL_PROCESSING) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+ done:
+
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Set parameters in a synthesizer MRCP header
+ *
+ * @param schannel the speech channel containing the params
+ * @param msg the MRCP message to set
+ * @param gen_hdr the generic headers to set
+ * @param synth_hdr the synthesizer headers to set
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t synth_channel_set_params(speech_channel_t *schannel, mrcp_message_t *msg, mrcp_generic_header_t *gen_hdr, mrcp_synth_header_t *synth_hdr)
+{
+	/* loop through each param and add to synth header or vendor-specific-params */
+	switch_hash_index_t *hi = NULL;
+	for (hi = switch_hash_first(NULL, schannel->params); hi; hi = switch_hash_next(hi)) {
+		char *param_name = NULL, *param_val = NULL;
+		const void *key;
+		void *val;
+		switch_hash_this(hi, &key, NULL, &val);
+		param_name = (char *)key;
+		param_val = (char *)val;
+		if (!switch_strlen_zero(param_name) && !switch_strlen_zero(param_val)) {
+			unimrcp_param_id_t *id = switch_core_hash_find(schannel->application->param_id_map, param_name);
+			if (id) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) %s: %s\n", schannel->name, param_name, param_val);
+				synth_channel_set_header(schannel, id->id, param_val, msg, synth_hdr);
+			} else {
+				/* this is probably a vendor-specific MRCP param */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) (vendor-specific value) %s: %s\n", schannel->name, param_name, param_val);
+				apt_str_t apt_param_name = { 0 };
+				apt_str_t apt_param_val = { 0 };
+				apt_string_set(&apt_param_name, param_name); /* copy isn't necessary since apt_pair_array_append will do it */
+				apt_string_set(&apt_param_val, param_val);
+				if (!gen_hdr->vendor_specific_params) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) creating vendor specific pair array\n", schannel->name);
+					gen_hdr->vendor_specific_params = apt_pair_array_create(10, msg->pool);
+				}
+				apt_pair_array_append(gen_hdr->vendor_specific_params, &apt_param_name, &apt_param_val, msg->pool);
+			}
+		}
+	}
+	
+	if (gen_hdr->vendor_specific_params) {
+		mrcp_generic_header_property_add(msg, GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS);
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Set parameter in a synthesizer MRCP header
+ *
+ * @param schannel the speech channel containing the param
+ * @param id the UniMRCP header enum
+ * @param val the value to set
+ * @param msg the MRCP message to set
+ * @param synth_hdr the synthesizer header to set
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t synth_channel_set_header(speech_channel_t *schannel, int id, char *val, mrcp_message_t *msg, mrcp_synth_header_t *synth_hdr)
+{
+	switch (id) {
+	case SYNTHESIZER_HEADER_VOICE_GENDER:
+		if (!strcasecmp("male", val)) {
+			synth_hdr->voice_param.gender = VOICE_GENDER_MALE;
+		} else if (!strcasecmp("female", val)) {
+			synth_hdr->voice_param.gender = VOICE_GENDER_FEMALE;
+		} else if (!strcasecmp("neutral", val)) {
+			synth_hdr->voice_param.gender = VOICE_GENDER_NEUTRAL;
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) ignoring invalid voice gender, %s\n", schannel->name, val);
+			break;
+		}
+		mrcp_resource_header_property_add(msg, SYNTHESIZER_HEADER_VOICE_GENDER);
+		break;
+
+	case SYNTHESIZER_HEADER_VOICE_AGE: {
+		int age = atoi(val);
+		if (age > 0 && age < 1000) {
+			synth_hdr->voice_param.age = age;
+			mrcp_resource_header_property_add(msg, SYNTHESIZER_HEADER_VOICE_AGE);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) ignoring invalid voice age, %s\n", schannel->name, val);
+		}
+		break;
+	}
+
+	case SYNTHESIZER_HEADER_VOICE_VARIANT: {
+		int variant = atoi(val);
+		if (variant > 0) {
+			synth_hdr->voice_param.variant = variant;
+			mrcp_resource_header_property_add(msg, SYNTHESIZER_HEADER_VOICE_VARIANT);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) ignoring invalid voice variant, %s\n", schannel->name, val);
+		}
+		break;
+	}
+
+	case SYNTHESIZER_HEADER_VOICE_NAME:
+		apt_string_assign(&synth_hdr->voice_param.name, val, msg->pool);
+		mrcp_resource_header_property_add(msg, SYNTHESIZER_HEADER_VOICE_NAME);
+		break;
+
+	case SYNTHESIZER_HEADER_KILL_ON_BARGE_IN:
+		synth_hdr->kill_on_barge_in = !strcasecmp("true", val);
+		mrcp_resource_header_property_add(msg, SYNTHESIZER_HEADER_KILL_ON_BARGE_IN);
+		break;
+
+	case SYNTHESIZER_HEADER_PROSODY_VOLUME:
+		if (switch_isdigit(*val) || *val == '.') {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_NUMERIC;
+			synth_hdr->prosody_param.volume.value.numeric = atof(val);
+		} else if (*val == '+' || *val == '-') {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_RELATIVE_CHANGE;
+			synth_hdr->prosody_param.volume.value.relative = atof(val);
+		} else if (!strcasecmp("silent", val)) {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_LABEL;
+			synth_hdr->prosody_param.volume.value.label = PROSODY_VOLUME_SILENT;
+		} else if (!strcasecmp("x-soft", val)) {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_LABEL;
+			synth_hdr->prosody_param.volume.value.label = PROSODY_VOLUME_XSOFT;
+		} else if (!strcasecmp("soft", val)) {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_LABEL;
+			synth_hdr->prosody_param.volume.value.label = PROSODY_VOLUME_SOFT;
+		} else if (!strcasecmp("medium", val)) {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_LABEL;
+			synth_hdr->prosody_param.volume.value.label = PROSODY_VOLUME_MEDIUM;
+		} else if (!strcasecmp("loud", val)) {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_LABEL;
+			synth_hdr->prosody_param.volume.value.label = PROSODY_VOLUME_LOUD;
+		} else if (!strcasecmp("x-loud", val)) {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_LABEL;
+			synth_hdr->prosody_param.volume.value.label = PROSODY_VOLUME_XLOUD;
+		} else if (!strcasecmp("default", val)) {
+			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_LABEL;
+			synth_hdr->prosody_param.volume.value.label = PROSODY_VOLUME_DEFAULT;
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) ignoring invalid prosody volume, %s\n", schannel->name, val);
+			break;
+		}
+		mrcp_resource_header_property_add(msg, SYNTHESIZER_HEADER_PROSODY_VOLUME);
+		break;
+
+	case SYNTHESIZER_HEADER_PROSODY_RATE:
+		if (switch_isdigit(*val) || *val == '.') {
+			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_RELATIVE_CHANGE;
+			synth_hdr->prosody_param.rate.value.relative = atof(val);
+		} else if (!strcasecmp("x-slow", val)) {
+			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_LABEL;
+			synth_hdr->prosody_param.rate.value.label = PROSODY_RATE_XSLOW;
+		} else if (!strcasecmp("slow", val)) {
+			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_LABEL;
+			synth_hdr->prosody_param.rate.value.label = PROSODY_RATE_SLOW;
+		} else if (!strcasecmp("medium", val)) {
+			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_LABEL;
+			synth_hdr->prosody_param.rate.value.label = PROSODY_RATE_MEDIUM;
+		} else if (!strcasecmp("fast", val)) {
+			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_LABEL;
+			synth_hdr->prosody_param.rate.value.label = PROSODY_RATE_FAST;
+		} else if (!strcasecmp("x-fast", val)) {
+			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_LABEL;
+			synth_hdr->prosody_param.rate.value.label = PROSODY_RATE_XFAST;
+		} else if (!strcasecmp("default", val)) {
+			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_LABEL;
+			synth_hdr->prosody_param.rate.value.label = PROSODY_RATE_DEFAULT;
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) ignoring invalid prosody rate, %s\n", schannel->name, val);
+			break;
+		}
+		mrcp_resource_header_property_add(msg, SYNTHESIZER_HEADER_PROSODY_RATE);
+		break;
+
+	case SYNTHESIZER_HEADER_SPEECH_LANGUAGE:
+		apt_string_assign(&synth_hdr->speech_language, val, msg->pool);
+		mrcp_resource_header_property_add(msg, SYNTHESIZER_HEADER_SPEECH_LANGUAGE);
+		break;
+
+	/* unsupported by this module */
+	case SYNTHESIZER_HEADER_JUMP_SIZE:
+	case SYNTHESIZER_HEADER_SPEAKER_PROFILE:
+	case SYNTHESIZER_HEADER_COMPLETION_CAUSE:
+	case SYNTHESIZER_HEADER_COMPLETION_REASON:
+	case SYNTHESIZER_HEADER_SPEECH_MARKER:
+	case SYNTHESIZER_HEADER_FETCH_HINT:
+	case SYNTHESIZER_HEADER_AUDIO_FETCH_HINT:
+	case SYNTHESIZER_HEADER_FAILED_URI:
+	case SYNTHESIZER_HEADER_FAILED_URI_CAUSE:
+	case SYNTHESIZER_HEADER_SPEAK_RESTART:
+	case SYNTHESIZER_HEADER_SPEAK_LENGTH:
+	case SYNTHESIZER_HEADER_LOAD_LEXICON:
+	case SYNTHESIZER_HEADER_LEXICON_SEARCH_ORDER:
+	default:
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unsupported SYNTHESIZER_HEADER type\n", schannel->name);
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Stop SPEAK/RECOGNIZE request on speech channel
+ * 
+ * @param schannel the channel
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */ 
+static switch_status_t speech_channel_stop(speech_channel_t *schannel)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_mutex_lock(schannel->mutex);
+
+	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
+		mrcp_method_id method;
+		if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
+			method = SYNTHESIZER_STOP;
+		} else {
+			method = RECOGNIZER_STOP;
+		} 
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Stopping %s\n", schannel->name, speech_channel_type_to_string(schannel->type));
+		/* Send STOP to MRCP server */
+		mrcp_message_t *mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, method);
+		if (mrcp_message == NULL) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Failed to create STOP message\n", schannel->name);
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		mrcp_application_message_send(schannel->unimrcp_session, schannel->unimrcp_channel, mrcp_message);
+		switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
+
+		if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Timed out waiting for session to close.  Continuing.\n", schannel->name);
+			schannel->state = SPEECH_CHANNEL_ERROR;
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		} else if (schannel->state == SPEECH_CHANNEL_ERROR) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Channel error\n", schannel->name);
+			schannel->state = SPEECH_CHANNEL_ERROR;
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) %s stopped\n", schannel->name, speech_channel_type_to_string(schannel->type));
+	}
+
+ done:
+
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Convert speech channel type into a string
+ *
+ * @param type the speech channel type
+ * @return the speech channel type as a string
+ */
+static const char *speech_channel_type_to_string(speech_channel_type_t type)
+{
+	switch(type) {
+		case SPEECH_CHANNEL_SYNTHESIZER: return "SYNTHESIZER";
+		case SPEECH_CHANNEL_RECOGNIZER: return "RECOGNIZER";
+	}
+
+	return "UNKNOWN";
+}
+
+/**
+ * Set parameter
+ *
+ * @param schannel the speech channel
+ * @param param the parameter to set
+ * @param val the parameter value
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t speech_channel_set_param(speech_channel_t *schannel, const char *param, const char *val)
+{
+	switch_mutex_lock(schannel->mutex);
+	if (!switch_strlen_zero(param) && val != NULL) {
+		/* check if this is a FreeSWITCH param that needs to be translated to an MRCP param: e.g. voice ==> voice-name */
+		char *mrcp_param = switch_core_hash_find(schannel->application->fs_param_map, param);
+		char *lcparam = NULL;
+		if (switch_strlen_zero(mrcp_param)) {
+			lcparam = switch_lc_strdup(param);
+			mrcp_param = lcparam;
+		}
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) param = %s, val = %s\n", schannel->name, mrcp_param, val);
+		switch_core_hash_insert(schannel->params, mrcp_param, val);
+		switch_safe_free(lcparam);
+	}
+	switch_mutex_unlock(schannel->mutex);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Write synthesized speech / speech to be recognized
+ *
+ * @param schannel the speech channel
+ * @param data the speech data
+ * @param the number of octets to write / actual number written
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t speech_channel_write(speech_channel_t *schannel, void *data, switch_size_t *len)
+{
+	audio_queue_t *queue = schannel->audio_queue;
+	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
+		audio_queue_write(queue, data, len);
+	}
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Read synthesized speech / speech to be recognized
+ *
+ * @param schannel the speech channel
+ * @param data the speech data
+ * @param the number of octets to read / actual number read
+ * @param block 1 if blocking is allowed
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t speech_channel_read(speech_channel_t *schannel, void *data, switch_size_t *len, int block)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	audio_queue_t *queue = schannel->audio_queue;
+	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
+		audio_queue_read(queue, data, len, block);
+	} else {
+		status = SWITCH_STATUS_BREAK;
+	}
+	return status;
+}
+
+/**
+ * Convert channel state to string
+ *
+ * @param state the channel state
+ * @return string representation of the state
+ */
+static const char *speech_channel_state_to_string(speech_channel_state_t state) 
+{
+	switch(state) {
+		case SPEECH_CHANNEL_CLOSED: return "CLOSED";
+		case SPEECH_CHANNEL_READY: return "READY";
+		case SPEECH_CHANNEL_PROCESSING: return "PROCESSING";
+		case SPEECH_CHANNEL_ERROR: return "ERROR";
+	}
+
+	return "UNKNOWN";
+}
+
+/**
+ * Set the current channel state
+ *
+ * @param schannel the channel
+ * @param state the new channel state
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t speech_channel_set_state(speech_channel_t *schannel, speech_channel_state_t state)
+{
+	if (schannel->state == SPEECH_CHANNEL_PROCESSING && state != SPEECH_CHANNEL_PROCESSING) {
+		/* wake anyone waiting for audio data */
+		audio_queue_clear(schannel->audio_queue);	
+	}
+
+	switch_mutex_lock(schannel->mutex);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) %s ==> %s\n", schannel->name, speech_channel_state_to_string(schannel->state), speech_channel_state_to_string(state));
+	schannel->state = state;
+	switch_thread_cond_signal(schannel->cond);
+	switch_mutex_unlock(schannel->mutex);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Process speech_open request from FreeSWITCH.  This is expected to be called before every tts request made
+ * with synth_speech_feed_tts(), though the FreeSWITCH code has the option to cache the speech handle between
+ * TTS requests.
+ *
+ * @param sh the FreeSWITCH speech handle
+ * @param voice_name the voice to use
+ * @param rate the sampling rate requested
+ * @param flags other options
+ * @return SWITCH_STATUS_SUCCESS if successful, otherwise SWITCH_STATUS_FALSE
+ */
+static switch_status_t synth_speech_open(switch_speech_handle_t *sh, const char *voice_name, int rate, switch_speech_flag_t *flags)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	speech_channel_t *schannel = NULL;
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "speech_handle: name = %s, rate = %d, speed = %d, samples = %d, voice = %s, engine = %s, param = %s\n",
+						sh->name, sh->rate, sh->speed, sh->samples, sh->voice, sh->engine, sh->param); 
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "voice = %s, rate = %d\n", voice_name, rate);
+
+	/* It would be nice if FreeSWITCH let us know which session owns this handle, but it doesn't.  So, lets
+		make our own unique name */
+	int speech_channel_number = get_next_speech_channel_number();
+	char name[200] = { 0 };
+	switch_snprintf(name, sizeof(name) - 1, "TTS-%d", speech_channel_number);
+	name[sizeof(name) - 1] = '\0';
+	
+	/* create channel container with L16 codec (what FreeSWITCH needs) */
+	if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_SYNTHESIZER, &globals.synth, "L16", rate, sh->memory_pool) != SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	sh->private_info = schannel;
+
+	/* try to open an MRCP channel */
+	const char *profile = globals.unimrcp_default_synth_profile;
+	if (speech_channel_open(schannel, profile) != SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* Set session TTS params */
+	if (!switch_strlen_zero(voice_name)) {
+		speech_channel_set_param(schannel, "Voice-Name", voice_name);
+	}
+
+ done:
+
+	return status;
+}
+
+/**
+ * Process speech_close request from FreeSWITCH.  This is called after the TTS request has completed
+ * and FreeSWITCH does not wish to cache the speech handle for another request.
+ *
+ * @param sh the FreeSWITCH speech handle
+ * @param flags other options
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t synth_speech_close(switch_speech_handle_t *sh, switch_speech_flag_t *flags)
+{
+	speech_channel_t *schannel = (speech_channel_t *)sh->private_info;
+	speech_channel_stop(schannel);
+	speech_channel_destroy(schannel);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Process feed_tts request from FreeSWITCH.  This is called by FreeSWITCH after speech_open_tts.
+ * Send SPEAK request to MRCP server.
+ *
+ * @param sh the FreeSWITCH speech handle
+ * @param text the text to speak.  This could be plain text, ssml, vxml, etc...  this function will figure it out.
+ * @param flags other options
+ * @return SWITCH_STATUS_SUCCESS if TTS started successfully, SWITCH_STATUS_FALSE otherwise.
+ */
+static switch_status_t synth_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	speech_channel_t *schannel = (speech_channel_t *)sh->private_info;
+	
+	if (switch_strlen_zero(text)) {
+		status = SWITCH_STATUS_FALSE;
+	} else {
+		status = synth_channel_speak(schannel, text);
+	}
+	return status;
+}
+
+/**
+ * Process read_tts request from FreeSWITCH.  FreeSWITCH is expecting L16 host byte ordered data.  We must return
+ * exactly what is requested, otherwise FreeSWITCH won't play any audio.  Pad the data with silence, if necessary.
+ *
+ * @param sh the FreeSWITCH speech handle
+ * @param data the read data
+ * @param datalen the amount of data requested / amount of data read
+ * @param flags other options
+ * @return SWITCH_STATUS_SUCCESS if data was read, SWITCH_STATUS_BREAK if TTS is done
+ */
+static switch_status_t synth_speech_read_tts(switch_speech_handle_t *sh, void *data, switch_size_t *datalen, switch_speech_flag_t *flags)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_size_t bytes_read;
+	speech_channel_t *schannel = (speech_channel_t *) sh->private_info;
+	bytes_read = *datalen;
+	if (speech_channel_read(schannel, data, &bytes_read, (*flags & SWITCH_SPEECH_FLAG_BLOCKING)) == SWITCH_STATUS_SUCCESS) {
+		/* pad data, if not enough read */
+		if (bytes_read < *datalen) {
+			memset((uint8_t *)data + bytes_read, bytes_read - *datalen, schannel->silence);
+		}
+	} else {
+		*datalen = 0;
+		status = SWITCH_STATUS_BREAK;
+	}
+
+	return status;
+}
+
+/**
+ * Process flush_tts request from FreeSWITCH.  Interrupt current TTS request with STOP.
+ * This method is called by FreeSWITCH after a TTS request has finished, or if a request needs to be interrupted.
+ *
+ * @param sh the FreeSWITCH speech handle
+ */
+static void synth_speech_flush_tts(switch_speech_handle_t *sh)
+{
+	speech_channel_t *schannel = (speech_channel_t *)sh->private_info;
+	speech_channel_stop(schannel);
+}
+
+/**
+ * Process text_param_tts request from FreeSWITCH.
+ * Update MRCP session text parameters.
+ *
+ * @param sh the FreeSWITCH speech handle
+ * @param param the parameter to set
+ * @param val the value to set the parameter to
+ */
+static void synth_speech_text_param_tts(switch_speech_handle_t *sh, char *param, const char *val)
+{
+	speech_channel_t *schannel = (speech_channel_t *)sh->private_info;
+	speech_channel_set_param(schannel, param, val);
+}
+
+/**
+ * Process numeric_param_tts request from FreeSWITCH.
+ * Update MRCP session numeric parameters
+ *
+ * @param sh the FreeSWITCH speech handle
+ * @param param the parameter to set
+ * @param val the value to set the parameter to
+ */
+static void synth_speech_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val)
+{
+	speech_channel_t *schannel = (speech_channel_t *)sh->private_info;
+	char *val_str = switch_mprintf("%d", val);
+	speech_channel_set_param(schannel, param, val_str);
+	switch_safe_free(val_str);
+}
+
+/**
+ * Process float_param_tts request from FreeSWITCH.
+ * Update MRCP session float parameters
+ *
+ * @param sh the FreeSWITCH speech handle
+ * @param param the parameter to set
+ * @param val the value to set the parameter to
+ */
+static void synth_speech_float_param_tts(switch_speech_handle_t *sh, char *param, double val)
+{
+	speech_channel_t *schannel = (speech_channel_t *)sh->private_info;
+	char *val_str = switch_mprintf("%f", val);
+	speech_channel_set_param(schannel, param, val_str);
+	switch_safe_free(val_str);
+}
+
+/**
+ * Process UniMRCP messages for the synthesizer application.  All MRCP synthesizer callbacks start here first.
+ *
+ * @param app_message the application message
+ */
+static apt_bool_t synth_message_handler(const mrcp_app_message_t *app_message)
+{
+	/* call the appropriate callback in the dispatcher function table based on the app_message received */
+	return mrcp_application_message_dispatch(&globals.synth.dispatcher, app_message);
+}
+
+/**
+ * Handle the UniMRCP responses sent to session terminate requests 
+ *
+ * @param application the MRCP application
+ * @param session the MRCP session
+ * @param status the result of the session terminate request
+ * @return TRUE
+ */
+static apt_bool_t speech_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status)
+{
+	speech_channel_t *schannel = (speech_channel_t *)mrcp_application_session_object_get(session);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Destroying MRCP session\n", schannel->name);
+	mrcp_application_session_destroy(session);
+	speech_channel_set_state(schannel, SPEECH_CHANNEL_CLOSED);
+
+	return TRUE;
+}
+
+/**
+ * Handle the UniMRCP responses sent to channel add requests 
+ *
+ * @param application the MRCP application
+ * @param session the MRCP session
+ * @param channel the MRCP channel
+ * @param status the result of the channel add request
+ * @return TRUE
+ */
+static apt_bool_t speech_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
+{
+	speech_channel_t *schannel =  mrcp_application_channel_object_get(channel);
+	if (session && schannel && status == MRCP_SIG_STATUS_CODE_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is ready\n", schannel->name, speech_channel_type_to_string(schannel->type));
+		speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
+	}
+	else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) %s channel error!\n", schannel->name, speech_channel_type_to_string(schannel->type));
+		if (session) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Terminating MRCP session\n");
+			speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+			mrcp_application_session_terminate(session);
+		}
+	}
+
+	return TRUE;
+}
+
+/**
+ * Handle the UniMRCP responses sent to channel remove requests
+ *
+ * @param application the MRCP application
+ * @param session the MRCP session
+ * @param channel the MRCP channel
+ * @param status the result of the channel remove request
+ * @return TRUE
+ */
+static apt_bool_t speech_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
+{
+	speech_channel_t *schannel =  mrcp_application_channel_object_get(channel);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is removed\n", schannel->name, speech_channel_type_to_string(schannel->type));
+	schannel->unimrcp_channel = NULL;
+	
+	if (session) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Terminating MRCP session\n", schannel->name);
+		mrcp_application_session_terminate(session);
+	}
+
+	return TRUE;
+}
+
+/**
+ * Handle the MRCP synthesizer responses/events from UniMRCP
+ *
+ * @param application the MRCP application
+ * @param session the MRCP session
+ * @param channel the MRCP channel
+ * @param message the MRCP message
+ * @return TRUE
+ */
+static apt_bool_t synth_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	speech_channel_t *schannel = (speech_channel_t *)mrcp_application_channel_object_get(channel);
+	if (message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		/* received MRCP response */
+		if (message->start_line.method_id == SYNTHESIZER_SPEAK) {
+			/* received the response to SPEAK request */
+			if (message->start_line.request_state == MRCP_REQUEST_STATE_INPROGRESS) {
+				/* waiting for SPEAK-COMPLETE event */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) REQUEST IN PROGRESS\n", schannel->name);
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_PROCESSING);
+			} else {
+				/* received unexpected request_state */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected SPEAK response, request_state = %d\n", schannel->name, message->start_line.request_state);
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+			}
+		} else if (message->start_line.method_id == SYNTHESIZER_STOP) {
+			/* received response to the STOP request */
+			if (message->start_line.request_state == MRCP_REQUEST_STATE_COMPLETE) {
+				/* got COMPLETE */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) COMPLETE\n", schannel->name);
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
+			} else {
+				/* received unexpected request state */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected STOP response, request_state = %d\n", schannel->name, message->start_line.request_state);
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+			}
+		} else {
+			/* received unexpected response */
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected response, method_id = %d\n", schannel->name, (int)message->start_line.method_id);
+			speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+		}
+	} else if (message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		/* received MRCP event */
+		if (message->start_line.method_id == SYNTHESIZER_SPEAK_COMPLETE) {
+			/* got SPEAK-COMPLETE */
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) SPEAK-COMPLETE\n", schannel->name);
+			speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected event, method_id = %d\n", schannel->name, (int)message->start_line.method_id);
+			speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+		}
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected message type, message_type = %d\n", schannel->name, message->start_line.message_type);
+		speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+	}
+
+	return TRUE;
+}
+
+/**
+ * Incoming TTS data from UniMRCP
+ * 
+ * @param stream the audio stream sending data
+ * @param frame the data
+ * @return TRUE
+ */
+static apt_bool_t synth_stream_write(mpf_audio_stream_t *stream, const mpf_frame_t *frame)
+{
+	switch_size_t size = frame->codec_frame.size;
+	speech_channel_t *schannel = (speech_channel_t *)stream->obj;
+	speech_channel_write(schannel, frame->codec_frame.buffer, &size);
+	return TRUE;
+}
+
+/**
+ * Link the synthesizer module interface to FreeSWITCH and UniMRCP
+ *
+ * @param module_interface mod_unimrcp's interface
+ * @param pool the memory pool to use for all allocations
+ * @return SWITCH_STATUS_SUCCESS if successful, SWITCH_STATUS_FALSE otherwise
+ */
+static switch_status_t synth_load(switch_loadable_module_interface_t *module_interface, switch_memory_pool_t *pool)
+{
+	/* link to FreeSWITCH ASR / TTS callbacks */
+	switch_speech_interface_t *speech_interface = NULL;
+	if ((speech_interface = switch_loadable_module_create_interface(module_interface, SWITCH_SPEECH_INTERFACE)) == NULL) {
+		return SWITCH_STATUS_FALSE;
+	}
+	speech_interface->interface_name = MOD_UNIMRCP;
+	speech_interface->speech_open = synth_speech_open;
+	speech_interface->speech_close = synth_speech_close;
+	speech_interface->speech_feed_tts = synth_speech_feed_tts;
+	speech_interface->speech_read_tts = synth_speech_read_tts;
+	speech_interface->speech_flush_tts = synth_speech_flush_tts;
+	speech_interface->speech_text_param_tts = synth_speech_text_param_tts;
+	speech_interface->speech_numeric_param_tts = synth_speech_numeric_param_tts;
+	speech_interface->speech_float_param_tts = synth_speech_float_param_tts;
+
+	/* Create the synthesizer application and link its callbacks to UniMRCP */
+	if ((globals.synth.app = mrcp_application_create(synth_message_handler, (void *)0, pool)) == NULL) {
+		return SWITCH_STATUS_FALSE;
+	}
+	globals.synth.dispatcher.on_session_update = NULL;
+	globals.synth.dispatcher.on_session_terminate = speech_on_session_terminate;
+	globals.synth.dispatcher.on_channel_add = speech_on_channel_add;
+	globals.synth.dispatcher.on_channel_remove = speech_on_channel_remove;
+	globals.synth.dispatcher.on_message_receive = synth_on_message_receive;
+	globals.synth.audio_stream_vtable.destroy = NULL;
+	globals.synth.audio_stream_vtable.open_rx = NULL;
+	globals.synth.audio_stream_vtable.close_rx = NULL;
+	globals.synth.audio_stream_vtable.read_frame = NULL;
+	globals.synth.audio_stream_vtable.open_tx = NULL;
+	globals.synth.audio_stream_vtable.close_tx =  NULL;
+	globals.synth.audio_stream_vtable.write_frame = synth_stream_write;
+	mrcp_client_application_register(globals.mrcp_client, globals.synth.app, "synth");
+
+	/* map FreeSWITCH params to MRCP param */
+	switch_core_hash_init_case(&globals.synth.fs_param_map, pool, SWITCH_FALSE /* case_sensitive */);
+	switch_core_hash_insert(globals.synth.fs_param_map, "voice", "voice-name");
+
+	/* map MRCP params to UniMRCP ID */
+	switch_core_hash_init_case(&globals.synth.param_id_map, pool, SWITCH_FALSE /* case_sensitive */);
+	switch_core_hash_insert(globals.synth.param_id_map, "jump-size", unimrcp_param_id_create(SYNTHESIZER_HEADER_JUMP_SIZE, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "kill-on-barge-in", unimrcp_param_id_create(SYNTHESIZER_HEADER_KILL_ON_BARGE_IN, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "speaker-profile", unimrcp_param_id_create(SYNTHESIZER_HEADER_SPEAKER_PROFILE, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "completion-cause", unimrcp_param_id_create(SYNTHESIZER_HEADER_COMPLETION_CAUSE, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "completion-reason", unimrcp_param_id_create(SYNTHESIZER_HEADER_COMPLETION_REASON, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "voice-gender", unimrcp_param_id_create(SYNTHESIZER_HEADER_VOICE_GENDER, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "voice-age", unimrcp_param_id_create(SYNTHESIZER_HEADER_VOICE_AGE, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "voice-variant", unimrcp_param_id_create(SYNTHESIZER_HEADER_VOICE_VARIANT, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "voice-name", unimrcp_param_id_create(SYNTHESIZER_HEADER_VOICE_NAME, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "prosody-volume", unimrcp_param_id_create(SYNTHESIZER_HEADER_PROSODY_VOLUME, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "prosody-rate", unimrcp_param_id_create(SYNTHESIZER_HEADER_PROSODY_RATE, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "speech-marker", unimrcp_param_id_create(SYNTHESIZER_HEADER_SPEECH_MARKER, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "speech-language", unimrcp_param_id_create(SYNTHESIZER_HEADER_SPEECH_LANGUAGE, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "fetch-hint", unimrcp_param_id_create(SYNTHESIZER_HEADER_FETCH_HINT, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "audio-fetch-hint", unimrcp_param_id_create(SYNTHESIZER_HEADER_AUDIO_FETCH_HINT, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "failed-uri", unimrcp_param_id_create(SYNTHESIZER_HEADER_FAILED_URI, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "failed-uri-cause", unimrcp_param_id_create(SYNTHESIZER_HEADER_FAILED_URI_CAUSE, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "speak-restart", unimrcp_param_id_create(SYNTHESIZER_HEADER_SPEAK_RESTART, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "speak-length", unimrcp_param_id_create(SYNTHESIZER_HEADER_SPEAK_LENGTH, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "load-lexicon", unimrcp_param_id_create(SYNTHESIZER_HEADER_LOAD_LEXICON, pool));
+	switch_core_hash_insert(globals.synth.param_id_map, "lexicon-search-order", unimrcp_param_id_create(SYNTHESIZER_HEADER_LEXICON_SEARCH_ORDER, pool));
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Shut down the synthesizer
+ *
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t synth_shutdown() 
+{
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Create a grammar object to reference in recognition requests
+ *
+ * @param grammar the grammar
+ * @param name the name of the grammar
+ * @param type the type of the grammar (URI, SRGS, or GSL)
+ * @param data the grammar data (or URI)
+ * @param pool memory pool to allocate from
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t grammar_create(grammar_t **grammar, const char *name, grammar_type_t type, const char *data, switch_memory_pool_t *pool)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	grammar_t *g = switch_core_alloc(pool, sizeof(grammar_t));
+	if (g == NULL) {
+		status = SWITCH_STATUS_FALSE;
+		*grammar = NULL;
+	} else {
+		g->name = switch_core_strdup(pool, name);
+		g->type = type;
+		g->data = switch_core_strdup(pool, data);
+		*grammar = g;
+	}
+
+	return status;
+}
+
+/**
+ * Get the MIME type for this grammar type
+ * @param type the grammar type
+ * @return the MIME type
+ */
+static const char *grammar_type_to_mime(grammar_type_t type)
+{
+	switch(type) {
+		case GRAMMAR_TYPE_UNKNOWN: return "";
+		case GRAMMAR_TYPE_URI: return "text/uri-list";
+		case GRAMMAR_TYPE_SRGS: return "application/srgs";
+		case GRAMMAR_TYPE_SRGS_XML: return "application/srgs+xml";
+		case GRAMMAR_TYPE_NUANCE_GSL: return "application/x-nuance-gsl";
+		case GRAMMAR_TYPE_JSGF: return "application/x-jsgf";
+	}
+	return "";
+}
+
+/**
+ * Start RECOGNIZE request
+ *
+ * @param schannel the channel to start
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t recog_channel_start(speech_channel_t *schannel)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	mrcp_message_t *mrcp_message;
+	mrcp_recog_header_t *recog_header;
+	mrcp_generic_header_t *generic_header;
+
+	switch_mutex_lock(schannel->mutex);
+	if (schannel->state != SPEECH_CHANNEL_READY) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	if (schannel->data == NULL) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	r->result = NULL;
+	r->start_of_input = 0;
+
+	/* create MRCP message */
+	mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, RECOGNIZER_RECOGNIZE);
+	if (mrcp_message == NULL) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* allocate generic header */
+	generic_header = mrcp_generic_header_prepare(mrcp_message);
+	if (generic_header == NULL) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* set Content-Type */
+	const char *mime_type = grammar_type_to_mime(r->grammar->type);
+	if (switch_strlen_zero(mime_type)) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	apt_string_assign(&generic_header->content_type, mime_type, mrcp_message->pool);
+	mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_TYPE);
+
+	/* set Content-ID for inline grammars */
+	if (r->grammar->type != GRAMMAR_TYPE_URI) {
+		apt_string_assign(&generic_header->content_id, r->grammar->name, mrcp_message->pool);
+		mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_ID);
+	}
+
+	/* allocate recognizer-specific header */
+	recog_header = mrcp_resource_header_prepare(mrcp_message);
+	if (recog_header == NULL) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* set Cancel-If-Queue */
+	if (mrcp_message->start_line.version == MRCP_VERSION_2) {	
+		recog_header->cancel_if_queue = FALSE;
+		mrcp_resource_header_property_add(mrcp_message, RECOGNIZER_HEADER_CANCEL_IF_QUEUE);
+	}
+
+	/* set parameters */
+	recog_channel_set_params(schannel, mrcp_message, generic_header, recog_header);
+
+	/* set message body */
+	apt_string_assign(&mrcp_message->body, r->grammar->data, mrcp_message->pool);
+
+	/* Empty audio queue and send RECOGNIZE to MRCP server */
+	audio_queue_clear(schannel->audio_queue);
+	if (mrcp_application_message_send(schannel->unimrcp_session, schannel->unimrcp_channel, mrcp_message) == FALSE) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	/* wait for IN PROGRESS */
+	switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
+	if (schannel->state != SPEECH_CHANNEL_PROCESSING) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+ done:
+
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Load speech recognition grammar
+ *
+ * @param schannel the recognizer channel
+ * @param name the name of this grammar
+ * @param type the grammar type
+ * @param data the grammar data (or URI)
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t recog_channel_load_grammar(speech_channel_t *schannel, const char *name, grammar_type_t type, const char *data)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Loading grammar %s, data = %s\n", schannel->name, name, data);
+	grammar_t *g = NULL;
+	char *ldata = NULL;
+
+	switch_mutex_lock(schannel->mutex);
+	if (schannel->state != SPEECH_CHANNEL_READY) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* if inline, use DEFINE-GRAMMAR to cache it on the server */
+	if (type != GRAMMAR_TYPE_URI) {
+		mrcp_message_t *mrcp_message;
+		mrcp_generic_header_t *generic_header;
+
+		/* create MRCP message */
+		mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, RECOGNIZER_DEFINE_GRAMMAR);
+		if (mrcp_message == NULL) {
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+	
+		/* set Content-Type and Content-ID in message */
+		generic_header = mrcp_generic_header_prepare(mrcp_message);
+		if (generic_header == NULL) {
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		const char *mime_type = grammar_type_to_mime(type);
+		if (switch_strlen_zero(mime_type)) {
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		apt_string_assign(&generic_header->content_type, mime_type, mrcp_message->pool);
+		mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_TYPE);
+		apt_string_assign(&generic_header->content_id, name, mrcp_message->pool);
+		mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_ID);
+	
+		/* put grammar in message body */
+		apt_string_assign(&mrcp_message->body, data, mrcp_message->pool);
+
+		/* send message and wait for response */
+		switch_mutex_unlock(schannel->mutex);
+		speech_channel_set_state(schannel, SPEECH_CHANNEL_PROCESSING);
+		switch_mutex_lock(schannel->mutex);
+		if (mrcp_application_message_send(schannel->unimrcp_session, schannel->unimrcp_channel, mrcp_message) == FALSE) {
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		switch_thread_cond_timedwait(schannel->cond, schannel->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
+		if (schannel->state != SPEECH_CHANNEL_READY) {
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+
+		/* set up name, type for future RECOGNIZE requests.  We'll reference this cached grammar by name */
+		ldata = switch_mprintf("session:%s", name);
+		data = ldata;
+		type = GRAMMAR_TYPE_URI;
+	}
+
+	/* Create the grammar and save it */
+	if ((status = grammar_create(&g, name, type, data, schannel->memory_pool)) == SWITCH_STATUS_SUCCESS) {
+		recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+		r->grammar = g;
+	}
+
+ done:
+	
+	switch_mutex_unlock(schannel->mutex);
+	switch_safe_free(ldata);
+
+	return status;
+}
+
+/**
+ * Unload speech recognition grammar
+ *
+ * @param schannel the recognizer channel
+ * @param grammar_name the name of the grammar to unload
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t recog_channel_unload_grammar(speech_channel_t *schannel, const char *grammar_name)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+
+	if (switch_strlen_zero(grammar_name)) {
+		status = SWITCH_STATUS_FALSE;
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Unloading grammar %s\n", schannel->name, grammar_name);
+		recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+		r->grammar = NULL;
+	}
+
+	return status;
+}
+
+/**
+ * Check if recognition is complete
+ *
+ * @return SWITCH_STATUS_SUCCESS if results available or start of input
+ */
+static switch_status_t recog_channel_check_results(speech_channel_t *schannel) 
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_mutex_lock(schannel->mutex);
+	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	if (!switch_strlen_zero(r->result)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) SUCCESS, have result\n", schannel->name);
+	} else if (r->start_of_input) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) SUCCESS, start of input\n", schannel->name);
+	} else {
+		status = SWITCH_STATUS_FALSE;
+	}
+
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Start recognizer's input timers
+ *
+ * @return SWITCH_STATUS_SUCCESS if timers were started
+ */
+static switch_status_t recog_channel_start_input_timers(speech_channel_t *schannel)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_mutex_lock(schannel->mutex);
+
+	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Starting input timers\n", schannel->name);
+		/* Send START-INPUT-TIMERS to MRCP server */
+		mrcp_message_t *mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, RECOGNIZER_START_INPUT_TIMERS);
+		if (mrcp_message == NULL) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Failed to create START-INPUT-TIMERS message\n", schannel->name);
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		/* set it and forget it */
+		mrcp_application_message_send(schannel->unimrcp_session, schannel->unimrcp_channel, mrcp_message);
+	}
+
+ done:
+
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Flag that input has started
+ *
+ * @param schannel the channel that has heard input
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t recog_channel_set_start_of_input(speech_channel_t *schannel)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_mutex_lock(schannel->mutex);
+	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	r->start_of_input = 1;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) start of input\n", schannel->name);
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Set the recognition results
+ *
+ * @param schannel the channel whose results are set
+ * @param result the results
+ * @return SWITCH_STATUS_SUCCESS if successful
+ */
+static switch_status_t recog_channel_set_results(speech_channel_t *schannel, const char *result)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_mutex_lock(schannel->mutex);
+	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	if (!switch_strlen_zero(r->result)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) result is already set\n", schannel->name);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	if (switch_strlen_zero(result)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) result is NULL\n", schannel->name);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) result:\n\n%s\n", schannel->name, result);
+	r->result = switch_core_strdup(schannel->memory_pool, result);
+
+ done:
+
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Get the recognition results.
+ *
+ * @param schannel the channel to get results from
+ * @param result the results.  free() the results when finished with them.
+ * @return SWITCH_STATUS_SUCCESS if there are results, SWITCH_STATUS_BREAK if start of input
+ */
+static switch_status_t recog_channel_get_results(speech_channel_t *schannel, char **result)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	switch_mutex_lock(schannel->mutex);
+	if (!switch_strlen_zero(r->result)) {
+		*result = strdup(r->result);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) result:\n\n%s\n", schannel->name, *result);
+		r->result = NULL;
+		r->start_of_input = 0;
+	} else if (r->start_of_input) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) start of input\n", schannel->name);
+		status = SWITCH_STATUS_BREAK;
+		r->start_of_input = 0;
+	} else {
+		status = SWITCH_STATUS_FALSE;
+	}
+	
+	switch_mutex_unlock(schannel->mutex);
+	return status;
+}
+
+/**
+ * Set parameters in a recognizer MRCP header
+ *
+ * @param schannel the speech channel containing the params
+ * @param msg the MRCP message to set
+ * @param gen_hdr the generic headers to set
+ * @param recog_hdr the recognizer headers to set
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t recog_channel_set_params(speech_channel_t *schannel, mrcp_message_t *msg, mrcp_generic_header_t *gen_hdr, mrcp_recog_header_t *recog_hdr)
+{
+	/* loop through each param and add to recog header or vendor-specific-params */
+	switch_hash_index_t *hi = NULL;
+	for (hi = switch_hash_first(NULL, schannel->params); hi; hi = switch_hash_next(hi)) {
+		char *param_name = NULL, *param_val = NULL;
+		const void *key;
+		void *val;
+		switch_hash_this(hi, &key, NULL, &val);
+		param_name = (char *)key;
+		param_val = (char *)val;
+		if (!switch_strlen_zero(param_name) && !switch_strlen_zero(param_val)) {
+			unimrcp_param_id_t *id = switch_core_hash_find(schannel->application->param_id_map, param_name);
+			if (id) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) \"%s\": \"%s\"\n", schannel->name, param_name, param_val);
+				recog_channel_set_header(schannel, id->id, param_val, msg, recog_hdr);
+			} else {
+				/* this is probably a vendor-specific MRCP param */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) (vendor-specific value) %s: %s\n", schannel->name, param_name, param_val);
+				apt_str_t apt_param_name = { 0 };
+				apt_str_t apt_param_val = { 0 };
+				apt_string_set(&apt_param_name, param_name); /* copy isn't necessary since apt_pair_array_append will do it */
+				apt_string_set(&apt_param_val, param_val);
+				if (!gen_hdr->vendor_specific_params) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) creating vendor specific pair array\n", schannel->name);
+					gen_hdr->vendor_specific_params = apt_pair_array_create(10, msg->pool);
+				}
+				apt_pair_array_append(gen_hdr->vendor_specific_params, &apt_param_name, &apt_param_val, msg->pool);
+			}
+		}
+	}
+	
+	if (gen_hdr->vendor_specific_params) {
+		mrcp_generic_header_property_add(msg, GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS);
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Set parameter in a recognizer MRCP header
+ *
+ * @param schannel the speech channel containing the param
+ * @param id the UniMRCP header enum
+ * @param val the value to set
+ * @param msg the MRCP message to set
+ * @param recog_hdr the recognizer header to set
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t recog_channel_set_header(speech_channel_t *schannel, int id, char *val, mrcp_message_t *msg, mrcp_recog_header_t *recog_hdr)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+
+	switch (id) {
+	case RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD:
+		recog_hdr->confidence_threshold = atof(val);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD);
+		break;
+
+	case RECOGNIZER_HEADER_SENSITIVITY_LEVEL:
+		recog_hdr->sensitivity_level = atof(val);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_SENSITIVITY_LEVEL);
+		break;
+
+	case RECOGNIZER_HEADER_SPEED_VS_ACCURACY:
+		recog_hdr->speed_vs_accuracy = atof(val);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_SPEED_VS_ACCURACY);
+		break;
+
+	case RECOGNIZER_HEADER_N_BEST_LIST_LENGTH: {
+		int n_best_list_length = atoi(val);
+		if (n_best_list_length > 0) {
+			recog_hdr->n_best_list_length = n_best_list_length;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_N_BEST_LIST_LENGTH);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid n best list length, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_NO_INPUT_TIMEOUT: {
+		int no_input_timeout = atoi(val);
+		if (no_input_timeout >= 0) {
+			recog_hdr->no_input_timeout = no_input_timeout;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_NO_INPUT_TIMEOUT);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid no input timeout, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_RECOGNITION_TIMEOUT: { 
+		int recognition_timeout = atoi(val);
+		if (recognition_timeout >= 0) {
+			recog_hdr->recognition_timeout = recognition_timeout;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_RECOGNITION_TIMEOUT);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid recognition timeout, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_START_INPUT_TIMERS:
+		recog_hdr->start_input_timers = !strcasecmp("true", val);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_START_INPUT_TIMERS);
+		break;
+		case RECOGNIZER_HEADER_SPEECH_COMPLETE_TIMEOUT: {
+		int speech_complete_timeout = atoi(val);
+		if (speech_complete_timeout >= 0) {
+			recog_hdr->speech_complete_timeout = speech_complete_timeout;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_SPEECH_COMPLETE_TIMEOUT);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid speech complete timeout, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_SPEECH_INCOMPLETE_TIMEOUT: {
+		int speech_incomplete_timeout = atoi(val);
+		if (speech_incomplete_timeout >= 0) {
+			recog_hdr->speech_incomplete_timeout = speech_incomplete_timeout;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_SPEECH_INCOMPLETE_TIMEOUT);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid speech incomplete timeout, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_DTMF_INTERDIGIT_TIMEOUT: {
+		int dtmf_interdigit_timeout = atoi(val);
+		if (dtmf_interdigit_timeout >= 0) {
+			recog_hdr->dtmf_interdigit_timeout = dtmf_interdigit_timeout;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_DTMF_INTERDIGIT_TIMEOUT);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid dtmf interdigit timeout, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_DTMF_TERM_TIMEOUT: {
+		int dtmf_term_timeout = atoi(val);
+		if (dtmf_term_timeout >= 0) {
+			recog_hdr->dtmf_term_timeout = dtmf_term_timeout;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_DTMF_TERM_TIMEOUT);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid dtmf term timeout, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_DTMF_TERM_CHAR:
+		if (strlen(val) == 1) {
+			recog_hdr->dtmf_term_char = *val;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_DTMF_TERM_CHAR);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid dtmf term char, \"%s\"\n", schannel->name, val);
+		}
+		break;
+
+	case RECOGNIZER_HEADER_SAVE_WAVEFORM:
+		recog_hdr->save_waveform = !strcasecmp("true", val);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_SAVE_WAVEFORM);
+		break;
+
+	case RECOGNIZER_HEADER_NEW_AUDIO_CHANNEL:
+		recog_hdr->new_audio_channel = !strcasecmp("true", val);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_NEW_AUDIO_CHANNEL);
+		break;
+
+	case RECOGNIZER_HEADER_SPEECH_LANGUAGE:
+		apt_string_assign(&recog_hdr->speech_language, val, msg->pool);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_SPEECH_LANGUAGE);
+		break;
+
+	case RECOGNIZER_HEADER_RECOGNITION_MODE:
+		apt_string_assign(&recog_hdr->recognition_mode, val, msg->pool);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_RECOGNITION_MODE);
+		break;
+
+	case RECOGNIZER_HEADER_HOTWORD_MAX_DURATION: {
+		int hotword_max_duration = atoi(val);
+		if (hotword_max_duration >= 0) {
+			recog_hdr->hotword_max_duration = hotword_max_duration;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_HOTWORD_MAX_DURATION);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid hotword max duration, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_HOTWORD_MIN_DURATION: {
+		int hotword_min_duration = atoi(val);
+		if (hotword_min_duration >= 0) {
+			recog_hdr->hotword_min_duration = hotword_min_duration;
+			mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_HOTWORD_MIN_DURATION);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) Ignoring invalid hotword min duration, \"%s\"\n", schannel->name, val);
+		}
+		break;
+	}
+	case RECOGNIZER_HEADER_CLEAR_DTMF_BUFFER:
+		recog_hdr->clear_dtmf_buffer = !strcasecmp("true", val);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_CLEAR_DTMF_BUFFER);
+		break;
+
+	case RECOGNIZER_HEADER_EARLY_NO_MATCH:
+		recog_hdr->early_no_match = !strcasecmp("true", val);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_EARLY_NO_MATCH);
+		break;
+
+	case RECOGNIZER_HEADER_INPUT_WAVEFORM_URI:
+		apt_string_assign(&recog_hdr->input_waveform_uri, val, msg->pool);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_INPUT_WAVEFORM_URI);
+		break;
+
+	case RECOGNIZER_HEADER_MEDIA_TYPE:
+		apt_string_assign(&recog_hdr->media_type, val, msg->pool);
+		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_MEDIA_TYPE);
+		break;
+
+	/* Unsupported headers */
+
+	/* MRCP server headers */
+	case RECOGNIZER_HEADER_WAVEFORM_URI:
+	case RECOGNIZER_HEADER_COMPLETION_CAUSE:
+	case RECOGNIZER_HEADER_FAILED_URI:
+	case RECOGNIZER_HEADER_FAILED_URI_CAUSE:
+	case RECOGNIZER_HEADER_INPUT_TYPE:
+	case RECOGNIZER_HEADER_COMPLETION_REASON:
+	/* module handles this automatically */
+	case RECOGNIZER_HEADER_CANCEL_IF_QUEUE:
+	/* GET-PARAMS method only */
+	case RECOGNIZER_HEADER_RECOGNIZER_CONTEXT_BLOCK:
+	case RECOGNIZER_HEADER_DTMF_BUFFER_TIME:
+
+	/* INTERPRET method only */
+	case RECOGNIZER_HEADER_INTERPRET_TEXT:
+
+	/* unknown */
+	case RECOGNIZER_HEADER_VER_BUFFER_UTTERANCE:
+
+	default:
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "(%s) unsupported RECOGNIZER header\n", schannel->name);
+	}
+
+	return status;
+}
+
+/**
+ * Process asr_open request from FreeSWITCH.
+ *
+ * @param ah the FreeSWITCH speech rec handle
+ * @param codec the codec to use
+ * @param rate the sample rate of the codec
+ * @param dest the profile to use
+ * @param flags other flags
+ * @return SWITCH_STATUS_SUCCESS if successful, otherwise SWITCH_STATUS_FALSE
+ */
+static switch_status_t recog_asr_open(switch_asr_handle_t *ah, const char *codec, int rate, const char *dest, switch_asr_flag_t *flags)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	speech_channel_t *schannel = NULL;
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "asr_handle: name = %s, codec = %s, rate = %d, grammar = %s, param = %s\n",
+		ah->name, ah->codec, ah->rate, ah->grammar, ah->param);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "codec = %s, rate = %d, dest = %s\n", codec, rate, dest);
+
+	/* It would be nice if FreeSWITCH let us know which session owns this handle, but it doesn't.  So, lets
+		make our own unique name */
+	int speech_channel_number = get_next_speech_channel_number();
+	char name[200] = { 0 };
+	switch_snprintf(name, sizeof(name) - 1, "ASR-%d", speech_channel_number);
+	name[sizeof(name) - 1] = '\0';
+
+	if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_RECOGNIZER, &globals.recog, "L16", rate, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	ah->private_info = schannel;
+	schannel->data = switch_core_alloc(ah->memory_pool, sizeof(recognizer_data_t));
+	memset(schannel->data, 0, sizeof(recognizer_data_t));
+
+	/* try to open an MRCP channel */
+	const char *profile = switch_strlen_zero(dest) ? globals.unimrcp_default_recog_profile : dest;
+	status = speech_channel_open(schannel, profile);
+
+ done:
+
+	return status;
+}
+
+/**
+ * Process asr_load_grammar request from FreeSWITCH.
+ *
+ * FreeSWITCH sends this request to start recognition.
+ * @param ah the FreeSWITCH speech recognition handle
+ * @param grammar the grammar data.  This can be an absolute file path, a URI, or the grammar text.
+ * @param name used to reference grammar for unloading or for subsequent recognition requests
+ */
+static switch_status_t recog_asr_load_grammar(switch_asr_handle_t *ah, const char *grammar, const char *name)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	const char *grammar_data = NULL;
+	char *grammar_file_data = NULL;
+	switch_file_t *grammar_file = NULL;
+	switch_size_t grammar_file_size = 0, to_read = 0;
+	grammar_type_t type = GRAMMAR_TYPE_UNKNOWN;
+	const char *lname = switch_strlen_zero(name) ? "grammar" : name;
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) grammar = %s, name = %s\n", schannel->name, grammar, name);
+
+	if (switch_strlen_zero(grammar)) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	
+	/* stop recognition */
+	if (speech_channel_stop(schannel) != SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	/* check for local file grammar or URI grammar */
+	if (text_starts_with(grammar, HTTP_ID) || text_starts_with(grammar, SESSION_ID) || text_starts_with(grammar, BUILTIN_ID)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Grammar is URI\n", schannel->name);
+		type = GRAMMAR_TYPE_URI;
+		grammar_data = grammar;
+	} else if (switch_is_file_path(grammar)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Grammar is inside file\n", schannel->name);
+		/* grammar points to file containing the grammar text.  We assume the MRCP server can't get to this file
+		 * so read the data from the file and cache it */
+		grammar_data = NULL;
+
+		if (switch_file_open(&grammar_file, grammar, SWITCH_FOPEN_READ, 0, schannel->memory_pool) != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read grammar file: %s\n", schannel->name, grammar);
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		grammar_file_size = switch_file_get_size(grammar_file);
+		if (grammar_file_size == 0) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file is empty: %s\n", schannel->name, grammar);
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		grammar_file_data = (char *)switch_core_alloc(schannel->memory_pool, grammar_file_size + 1);
+		to_read = grammar_file_size;
+		if (switch_file_read(grammar_file, grammar_file_data, &to_read) != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar file read error: %s\n", schannel->name, grammar);
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		if (to_read != grammar_file_size) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Could not read entire grammar file: %s\n", schannel->name, grammar);
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+		grammar_file_data[to_read] = '\0';
+		grammar_data = grammar_file_data;
+	} else {
+		/* assume inline grammar */
+		grammar_data = grammar;
+	}
+
+	/* determine content type of file grammar or inline grammar */
+	if (type == GRAMMAR_TYPE_UNKNOWN) {
+		if (text_starts_with(grammar_data, XML_ID)) {
+			type = GRAMMAR_TYPE_SRGS_XML;
+		} else if (text_starts_with(grammar_data, GSL_ID)) {
+			type = GRAMMAR_TYPE_NUANCE_GSL;
+		} else if (text_starts_with(grammar_data, ABNF_ID)) {
+			type = GRAMMAR_TYPE_SRGS;
+		} else if (text_starts_with(grammar_data, JSGF_ID)) {
+			type = GRAMMAR_TYPE_JSGF;
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to determine grammar type: %s\n", schannel->name, grammar_data);
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+	}
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) grammar is %s\n", schannel->name, grammar_type_to_mime(type));
+
+	/* load the grammar and start recognition */
+	if (recog_channel_load_grammar(schannel, lname, type, grammar_data) != SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+	
+	status = recog_channel_start(schannel);
+
+ done:
+
+	if (grammar_file) {
+		switch_file_close(grammar_file);
+	}
+	return status;
+}
+
+/**
+ * Process asr_unload_grammar request from FreeSWITCH.
+ *
+ * FreeSWITCH sends this request to stop recognition on this grammar.
+ * @param ah the FreeSWITCH speech recognition handle
+ * @param name the grammar name.
+ */
+static switch_status_t recog_asr_unload_grammar(switch_asr_handle_t *ah, const char *name)
+{
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	const char *lname = switch_strlen_zero(name) ? "grammar" : name;
+	if (speech_channel_stop(schannel) != SWITCH_STATUS_SUCCESS ||
+		recog_channel_unload_grammar(schannel, lname) != SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_FALSE;
+	}
+	return status;
+}
+
+/**
+ * Process asr_close request from FreeSWITCH
+ *
+ * @param ah the FreeSWITCH speech recognition handle
+ */
+static switch_status_t recog_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags)
+{
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	speech_channel_stop(schannel);
+	speech_channel_destroy(schannel);
+
+	/* this lets FreeSWITCH's speech_thread know the handle is closed */
+    switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Process asr_feed request from FreeSWITCH
+ *
+ * @param ah the FreeSWITCH speech recognition handle
+ */
+static switch_status_t recog_asr_feed(switch_asr_handle_t *ah, void *data, unsigned int len, switch_asr_flag_t *flags)
+{
+	switch_size_t slen = len;
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	return speech_channel_write(schannel, data, &slen);
+}
+
+/**
+ * Process asr_resume request from FreeSWITCH
+ *
+ * @param ah the FreeSWITCH speech recognition handle
+ */
+static switch_status_t recog_asr_resume(switch_asr_handle_t *ah)
+{
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	return recog_channel_start(schannel);
+}
+
+/**
+ * Process asr_pause request from FreeSWITCH
+ *
+ * @param ah the FreeSWITCH speech recognition handle
+ */
+static switch_status_t recog_asr_pause(switch_asr_handle_t *ah)
+{
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	return speech_channel_stop(schannel);
+}
+
+/**
+ * Process asr_check_results request from FreeSWITCH
+ * This method is polled by FreeSWITCH until we return SWITCH_STATUS_SUCCESS.  Then
+ * the results are fetched.
+ *
+ * @param ah the FreeSWITCH speech recognition handle
+ * @param flags other flags
+ */
+static switch_status_t recog_asr_check_results(switch_asr_handle_t *ah, switch_asr_flag_t *flags)
+{
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	return recog_channel_check_results(schannel);
+}
+
+/**
+ * Process asr_get_results request from FreeSWITCH.  Return the XML string back
+ * to FreeSWITCH.  FreeSWITCH will free() the xmlstr.
+ *
+ * @param ah the FreeSWITCH speech recognition handle
+ * @param flags other flags
+ */
+static switch_status_t recog_asr_get_results(switch_asr_handle_t *ah, char **xmlstr, switch_asr_flag_t *flags)
+{
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	return recog_channel_get_results(schannel, xmlstr);
+}
+
+/**
+ * Send START-INPUT-TIMERS to executing recognition request
+ * @param ah the handle to start timers on
+ * @return SWITCH_STATUS_SUCCESS
+ */
+static switch_status_t recog_asr_start_input_timers(switch_asr_handle_t *ah)
+{
+	speech_channel_t *schannel = ah->private_info;
+	return recog_channel_start_input_timers(schannel);
+}
+
+/**
+ * Process text_param request from FreeSWITCH.
+ * Update MRCP session text parameters.
+ *
+ * @param ah the FreeSWITCH asr handle
+ * @param param the parameter to set
+ * @param val the value to set the parameter to
+ */
+static void recog_asr_text_param(switch_asr_handle_t *ah, char *param, const char *val)
+{
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	speech_channel_set_param(schannel, param, val);
+}
+
+/**
+ * Process numeric_param request from FreeSWITCH.
+ * Update MRCP session numeric parameters
+ *
+ * @param ah the FreeSWITCH asr handle
+ * @param param the parameter to set
+ * @param val the value to set the parameter to
+ */
+static void recog_asr_numeric_param(switch_asr_handle_t *ah, char *param, int val)
+{
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	char *val_str = switch_mprintf("%d", val);
+	speech_channel_set_param(schannel, param, val_str);
+	switch_safe_free(val_str);
+}
+
+/**
+ * Process float_param request from FreeSWITCH.
+ * Update MRCP session float parameters
+ *
+ * @param ah the FreeSWITCH asr handle
+ * @param param the parameter to set
+ * @param val the value to set the parameter to
+ */
+static void recog_asr_float_param(switch_asr_handle_t *ah, char *param, double val)
+{
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
+	char *val_str = switch_mprintf("%f", val);
+	speech_channel_set_param(schannel, param, val_str);
+	switch_safe_free(val_str);
+}
+
+/**
+ * Process messages from UniMRCP for the recognizer application
+ */
+static apt_bool_t recog_message_handler(const mrcp_app_message_t *app_message)
+{
+	return mrcp_application_message_dispatch(&globals.recog.dispatcher, app_message);
+}
+
+/**
+ * Handle the MRCP responses/events
+ */
+static apt_bool_t recog_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	speech_channel_t *schannel = (speech_channel_t *)mrcp_application_channel_object_get(channel);
+	mrcp_recog_header_t *recog_hdr = mrcp_resource_header_get(message);
+	if (message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		/* received MRCP response */
+		if (message->start_line.method_id == RECOGNIZER_RECOGNIZE) {
+			/* received the response to RECOGNIZE request */
+			if (message->start_line.request_state == MRCP_REQUEST_STATE_INPROGRESS) {
+				/* RECOGNIZE in progress */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) RECOGNIZE IN PROGRESS\n", schannel->name);
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_PROCESSING);
+			} else if (message->start_line.request_state == MRCP_REQUEST_STATE_COMPLETE) {
+				/* RECOGNIZE failed to start */
+				if (recog_hdr->completion_cause == RECOGNIZER_COMPLETION_CAUSE_UNKNOWN) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) RECOGNIZE failed: status = %d\n", schannel->name, 	message->start_line.status_code);
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) RECOGNIZE failed: status = %d, completion-cause = %03d\n", schannel->name, message->start_line.status_code, recog_hdr->completion_cause);
+				}
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+			} else if (message->start_line.request_state == MRCP_REQUEST_STATE_PENDING) {
+				/* RECOGNIZE is queued */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) RECOGNIZE PENDING\n", schannel->name);
+			} else {
+				/* received unexpected request_state */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected RECOGNIZE request state: %d\n", schannel->name, message->start_line.request_state);
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+			}
+		} else if (message->start_line.method_id == RECOGNIZER_STOP) {
+			/* received response to the STOP request */
+			if (message->start_line.request_state == MRCP_REQUEST_STATE_COMPLETE) {
+				/* got COMPLETE */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) RECOGNIZE STOPPED\n", schannel->name);
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
+			} else {
+				/* received unexpected request state */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected STOP request state: %d\n", schannel->name, message->start_line.request_state);
+				speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+				}
+		} else if (message->start_line.method_id == RECOGNIZER_START_INPUT_TIMERS) {
+			/* received response to START-INPUT-TIMERS request */
+			if (message->start_line.request_state == MRCP_REQUEST_STATE_COMPLETE) {
+				if (message->start_line.status_code >= 200 && message->start_line.status_code <= 299) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) timers started\n", schannel->name);
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) timers failed to start, status code = %d\n", schannel->name, message->start_line.status_code);
+				}
+			}
+		} else if (message->start_line.method_id == RECOGNIZER_DEFINE_GRAMMAR) {
+			/* received response to DEFINE-GRAMMAR request */
+			if (message->start_line.request_state == MRCP_REQUEST_STATE_COMPLETE) {
+				if (message->start_line.status_code >= 200 && message->start_line.status_code <= 299) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) grammar loaded\n", schannel->name);
+					speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) grammar failed to load, status code = %d\n", schannel->name, message->start_line.status_code);
+					speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+				}
+			}
+		} else {
+			/* received unexpected response */
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected response, method_id = %d\n", schannel->name, (int)message->start_line.method_id);
+			speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+		}
+	} else if (message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		/* received MRCP event */
+		if (message->start_line.method_id == RECOGNIZER_RECOGNITION_COMPLETE) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) RECOGNITION COMPLETE, Completion-Cause: %03d\n", schannel->name, recog_hdr->completion_cause);
+			if (message->body.length > 0) {
+				if (message->body.buf[message->body.length - 1] == '\0') {
+					recog_channel_set_results(schannel, message->body.buf);
+				} else {
+					/* string is not null terminated */
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Recognition result is not null-terminated.  Appending null terminator.\n", schannel->name);
+					char *result = (char *)switch_core_alloc(schannel->memory_pool, message->body.length + 1);
+					strncpy(result, message->body.buf, message->body.length);
+					result[message->body.length] = '\0';
+					recog_channel_set_results(schannel, result);
+				}
+			} else {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) No result\n", schannel->name);
+				char *completion_cause = switch_mprintf("Completion-Cause: %03d", recog_hdr->completion_cause);
+				recog_channel_set_results(schannel, completion_cause);
+				switch_safe_free(completion_cause);
+			}
+			speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
+		} else if (message->start_line.method_id == RECOGNIZER_START_OF_INPUT) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) START OF INPUT\n", schannel->name);
+			recog_channel_set_start_of_input(schannel);
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected event, method_id = %d\n", schannel->name, (int)message->start_line.method_id);
+			speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+		}
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) unexpected message type, message_type = %d\n", schannel->name, message->start_line.message_type);
+		speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
+	}
+
+	return TRUE;
+}
+
+/** 
+ * UniMRCP callback requesting next frame for speech recognition
+ *
+ * @param stream the UniMRCP stream
+ * @param frame the frame to fill
+ * @return TRUE
+ */
+static apt_bool_t recog_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame)
+{
+	speech_channel_t *schannel = (speech_channel_t *)stream->obj;
+	switch_size_t to_read = frame->codec_frame.size;
+	switch_mutex_lock(schannel->mutex);
+
+	/* are we ready for data? */
+	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {	
+		/* grab the data.  pad it if there isn't enough */
+		speech_channel_read(schannel, frame->codec_frame.buffer, &to_read, 0);
+		if (to_read < frame->codec_frame.size) {
+			memset((uint8_t *)frame->codec_frame.buffer + to_read, schannel->silence, frame->codec_frame.size - to_read);
+		}
+		frame->type |= MEDIA_FRAME_TYPE_AUDIO;
+	}
+
+	switch_mutex_unlock(schannel->mutex);
+	return TRUE;
+}
+
+/**
+ * Link the recognizer module interface to FreeSWITCH and UniMRCP
+ */
+static switch_status_t recog_load(switch_loadable_module_interface_t *module_interface, switch_memory_pool_t *pool)
+{
+	/* link to FreeSWITCH ASR / TTS callbacks */
+	switch_asr_interface_t *asr_interface = NULL;
+	if ((asr_interface = switch_loadable_module_create_interface(module_interface, SWITCH_ASR_INTERFACE)) == NULL) {
+		return SWITCH_STATUS_FALSE;
+	}
+	asr_interface->interface_name = MOD_UNIMRCP;
+	asr_interface->asr_open = recog_asr_open;
+	asr_interface->asr_load_grammar = recog_asr_load_grammar;
+	asr_interface->asr_unload_grammar = recog_asr_unload_grammar;
+	asr_interface->asr_close = recog_asr_close;
+	asr_interface->asr_feed = recog_asr_feed;
+	asr_interface->asr_resume = recog_asr_resume;
+	asr_interface->asr_pause = recog_asr_pause;
+	asr_interface->asr_check_results = recog_asr_check_results;
+	asr_interface->asr_get_results = recog_asr_get_results;
+	asr_interface->asr_start_input_timers = recog_asr_start_input_timers;
+	asr_interface->asr_text_param = recog_asr_text_param;
+	asr_interface->asr_numeric_param = recog_asr_numeric_param;
+	asr_interface->asr_float_param = recog_asr_float_param;
+	
+	/* Create the recognizer application and link its callbacks */
+	if ((globals.recog.app = mrcp_application_create(recog_message_handler, (void *)0, pool)) == NULL) {
+		return SWITCH_STATUS_FALSE;
+	}
+	globals.recog.dispatcher.on_session_update = NULL;
+	globals.recog.dispatcher.on_session_terminate = speech_on_session_terminate;
+	globals.recog.dispatcher.on_channel_add = speech_on_channel_add;
+	globals.recog.dispatcher.on_channel_remove = speech_on_channel_remove;
+	globals.recog.dispatcher.on_message_receive = recog_on_message_receive;
+	globals.recog.audio_stream_vtable.destroy = NULL;
+	globals.recog.audio_stream_vtable.open_rx = NULL;
+	globals.recog.audio_stream_vtable.close_rx = NULL;
+	globals.recog.audio_stream_vtable.read_frame = recog_stream_read;
+	globals.recog.audio_stream_vtable.open_tx = NULL;
+	globals.recog.audio_stream_vtable.close_tx = NULL;
+	globals.recog.audio_stream_vtable.write_frame = NULL;
+	mrcp_client_application_register(globals.mrcp_client, globals.recog.app, "recog");
+	
+	/* map FreeSWITCH params or old params to MRCPv2 param */
+	switch_core_hash_init_case(&globals.recog.fs_param_map, pool, SWITCH_FALSE /* case_sensitive */);
+	/* MRCPv1 param */
+	switch_core_hash_insert(globals.recog.fs_param_map, "recognizer-start-timers", "start-input-timers");
+	
+	/* map MRCP params to UniMRCP ID */
+	switch_core_hash_init_case(&globals.recog.param_id_map, pool, SWITCH_FALSE /* case_sensitive */);
+	switch_core_hash_insert(globals.recog.param_id_map, "Confidence-Threshold", unimrcp_param_id_create(RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Sensitivity-Level", unimrcp_param_id_create(RECOGNIZER_HEADER_SENSITIVITY_LEVEL, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Speed-Vs-Accuracy", unimrcp_param_id_create(RECOGNIZER_HEADER_SPEED_VS_ACCURACY, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "N-Best-List-Length", unimrcp_param_id_create(RECOGNIZER_HEADER_N_BEST_LIST_LENGTH, pool));	
+	switch_core_hash_insert(globals.recog.param_id_map, "No-Input-Timeout", unimrcp_param_id_create(RECOGNIZER_HEADER_NO_INPUT_TIMEOUT, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Recognition-Timeout", unimrcp_param_id_create(RECOGNIZER_HEADER_RECOGNITION_TIMEOUT, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Waveform-Url", unimrcp_param_id_create(RECOGNIZER_HEADER_WAVEFORM_URI, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Completion-Cause", unimrcp_param_id_create(RECOGNIZER_HEADER_COMPLETION_CAUSE, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Recognizer-Context-Block", unimrcp_param_id_create(RECOGNIZER_HEADER_RECOGNIZER_CONTEXT_BLOCK, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Start-Input-Timers", unimrcp_param_id_create(RECOGNIZER_HEADER_START_INPUT_TIMERS, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Speech-Complete-Timeout", unimrcp_param_id_create(RECOGNIZER_HEADER_SPEECH_COMPLETE_TIMEOUT, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Speech-Incomplete-Timeout", unimrcp_param_id_create(RECOGNIZER_HEADER_SPEECH_INCOMPLETE_TIMEOUT, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "DTMF-Interdigit-Timeout", unimrcp_param_id_create(RECOGNIZER_HEADER_DTMF_INTERDIGIT_TIMEOUT, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "DTMF-Term-Timeout", unimrcp_param_id_create(RECOGNIZER_HEADER_DTMF_TERM_TIMEOUT, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "DTMF-Term-Char", unimrcp_param_id_create(RECOGNIZER_HEADER_DTMF_TERM_CHAR, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Failed-Uri", unimrcp_param_id_create(RECOGNIZER_HEADER_FAILED_URI, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Failed-Uri-Cause", unimrcp_param_id_create(RECOGNIZER_HEADER_FAILED_URI_CAUSE, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Save-Waveform", unimrcp_param_id_create(RECOGNIZER_HEADER_SAVE_WAVEFORM, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "New-Audio-Channel", unimrcp_param_id_create(RECOGNIZER_HEADER_NEW_AUDIO_CHANNEL, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Speech-Language", unimrcp_param_id_create(RECOGNIZER_HEADER_SPEECH_LANGUAGE, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Input-Type", unimrcp_param_id_create(RECOGNIZER_HEADER_INPUT_TYPE, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Input-Waveform-Uri", unimrcp_param_id_create(RECOGNIZER_HEADER_INPUT_WAVEFORM_URI, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Completion-Reason", unimrcp_param_id_create(RECOGNIZER_HEADER_COMPLETION_REASON, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Media-Type", unimrcp_param_id_create(RECOGNIZER_HEADER_MEDIA_TYPE, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Ver-Buffer-Utterance", unimrcp_param_id_create(RECOGNIZER_HEADER_VER_BUFFER_UTTERANCE, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Recognition-Mode", unimrcp_param_id_create(RECOGNIZER_HEADER_RECOGNITION_MODE, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Cancel-If-Queue", unimrcp_param_id_create(RECOGNIZER_HEADER_CANCEL_IF_QUEUE, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Hotword-Max-Duration", unimrcp_param_id_create(RECOGNIZER_HEADER_HOTWORD_MAX_DURATION, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Hotword-Min-Duration", unimrcp_param_id_create(RECOGNIZER_HEADER_HOTWORD_MIN_DURATION, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Interpret-Text", unimrcp_param_id_create(RECOGNIZER_HEADER_INTERPRET_TEXT, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "DTMF-Buffer-Time", unimrcp_param_id_create(RECOGNIZER_HEADER_DTMF_BUFFER_TIME, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Clear-DTMF-Buffer", unimrcp_param_id_create(RECOGNIZER_HEADER_CLEAR_DTMF_BUFFER, pool));
+	switch_core_hash_insert(globals.recog.param_id_map, "Early-No-Match", unimrcp_param_id_create(RECOGNIZER_HEADER_EARLY_NO_MATCH, pool));
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Shutdown the recognizer
+ */
+static switch_status_t recog_shutdown()
+{
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Process the XML configuration for this module
+ * Uses the instructions[] defined in this module to process the configuration. 
+ *
+ * @return SWITCH_STATUS_SUCCESS if the configuration is OK
+ */
+static switch_status_t mod_unimrcp_do_config()
+{
+	switch_xml_t cfg, xml, settings;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+
+	if (!(xml = switch_xml_open_cfg(CONFIG_FILE, &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open %s\n", CONFIG_FILE);
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
+
+	if ((settings = switch_xml_child(cfg, "settings"))) {
+		if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"Config parsed ok!\n");
+			goto done;
+		}
+	}
+
+ done:
+
+	if (xml) {
+		switch_xml_free(xml);
+	}
+
+	return status;
+}
+
+#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
+
+#define DEFAULT_LOCAL_IP_ADDRESS  "127.0.0.1"
+#define DEFAULT_REMOTE_IP_ADDRESS "127.0.0.1"
+#define DEFAULT_SIP_LOCAL_PORT    5090
+#define DEFAULT_SIP_REMOTE_PORT   5060
+#define DEFAULT_RTP_PORT_MIN      4000
+#define DEFAULT_RTP_PORT_MAX      5000
+
+#define DEFAULT_SOFIASIP_UA_NAME  "FreeSWITCH"
+#define DEFAULT_SDP_ORIGIN        "FreeSWITCH"
+#define DEFAULT_RESOURCE_LOCATION "media"
+
+/**
+ * Get IP address from IP address value
+ *
+ * @param value "auto" or IP address
+ * @param pool the memory pool to use
+ * @return IP address
+ */
+static char *ip_addr_get(const char *value, apr_pool_t *pool)
+{
+	if(!value || strcasecmp(value,"auto") == 0) {
+		char *addr = DEFAULT_LOCAL_IP_ADDRESS;
+		apt_ip_get(&addr,pool);
+		return addr;
+	}
+	return apr_pstrdup(pool,value);
+}
+
+/**
+ * set RTP config struct with param, val pair 
+ * @param client the MRCP client
+ * @param rtp_config the config struct to set
+ * @param param the param name
+ * @param val the param value
+ * @param pool memory pool to use
+ * @return true if this param belongs to RTP config
+ */
+static int process_rtp_config(mrcp_client_t *client, mpf_rtp_config_t *rtp_config, const char *param, const char *val, apr_pool_t *pool)
+{
+	int mine = 1;
+	if (strcasecmp(param, "rtp-ip") == 0) {
+		apt_string_set(&rtp_config->ip, ip_addr_get(val, pool));
+	} else if (strcasecmp(param, "rtp-ext-ip") == 0) {
+		apt_string_set(&rtp_config->ext_ip, ip_addr_get(val, pool));
+	} else if (strcasecmp(param, "rtp-port-min") == 0) {
+		rtp_config->rtp_port_min = (apr_port_t)atol(val);
+	} else if (strcasecmp(param, "rtp-port-max") == 0) {
+		rtp_config->rtp_port_max = (apr_port_t)atol(val);
+	} else if (strcasecmp(param, "playout-delay") == 0) {
+		rtp_config->jb_config.initial_playout_delay = atol(val);
+	} else if (strcasecmp(param, "min-playout-delay") == 0) {
+		rtp_config->jb_config.min_playout_delay = atol(val);
+	} else if (strcasecmp(param, "max-playout-delay") == 0) {
+		rtp_config->jb_config.max_playout_delay = atol(val);
+	} else if (strcasecmp(param, "codecs") == 0) {
+		const mpf_codec_manager_t *codec_manager = mrcp_client_codec_manager_get(client);
+		if(codec_manager) {
+			mpf_codec_manager_codec_list_load(codec_manager, &rtp_config->codec_list, val, pool);
+		}
+	} else if (strcasecmp(param, "ptime") == 0) {
+		rtp_config->ptime = (apr_uint16_t)atol(val);
+	} else {
+		mine = 0;
+	}
+
+	return mine;
+}
+
+/**
+ * set RTSP client config struct with param, val pair
+ * @param config the config struct to set
+ * @param param the param name
+ * @param val the param value
+ * @param pool memory pool to use
+ * @return true if this param belongs to RTSP config 
+ */
+static int process_mrcpv1_config(rtsp_client_config_t *config, const char *param, const char *val, apr_pool_t *pool)
+{
+	int mine = 1;
+	if (strcasecmp(param, "server-ip") == 0) {
+		config->server_ip = ip_addr_get(val, pool);
+	} else if (strcasecmp(param, "server-port") == 0) {
+		config->server_port = (apr_port_t)atol(val);
+	} else if (strcasecmp(param, "resource-location") == 0) {
+		config->resource_location = apr_pstrdup(pool, val);
+	} else if (strcasecmp(param, "sdp-origin") == 0) {
+		config->origin = apr_pstrdup(pool, val);
+	} else if (strcasecmp(param, "max-connection-count") == 0) {
+		config->max_connection_count = atol(val);
+	} else if (strcasecmp(param, "force-destination") == 0) {
+		config->force_destination = atoi(val);
+	} else if (strcasecmp(param, "speechsynth") == 0 || strcasecmp(param, "speechrecog") == 0) {
+		apr_table_set(config->resource_map, param, val);
+	} else {
+		mine = 0;
+	}
+	return mine;
+}
+
+/**
+ * set SofiaSIP client config struct with param, val pair
+ * @param config the config struct to set
+ * @param param the param name
+ * @param val the param value
+ * @param pool memory pool to use
+ * @return true if this param belongs to SofiaSIP config
+ */
+static int process_mrcpv2_config(mrcp_sofia_client_config_t *config, const char *param, const char *val, apr_pool_t *pool)
+{
+	int mine = 1;
+	if (strcasecmp(param, "client-ip") == 0) {
+		config->local_ip = ip_addr_get(val, pool);
+	} else if (strcasecmp(param,"client-ext-ip") == 0) {
+		config->ext_ip = ip_addr_get(val, pool);
+	} else if (strcasecmp(param,"client-port") == 0) {
+		config->local_port = (apr_port_t)atol(val);
+	} else if (strcasecmp(param, "server-ip") == 0) {
+		config->remote_ip = ip_addr_get(val, pool);
+	} else if (strcasecmp(param, "server-port") == 0) {
+		config->remote_port = (apr_port_t)atol(val);
+	} else if (strcasecmp(param, "server-username") == 0) {
+		config->remote_user_name = apr_pstrdup(pool, val);
+	} else if (strcasecmp(param, "force-destination") == 0) {
+		config->force_destination = atoi(val);
+	} else if (strcasecmp(param, "sip-transport") == 0) {
+		config->transport = apr_pstrdup(pool, val);
+	} else if (strcasecmp(param, "ua-name") == 0) {
+		config->user_agent_name = apr_pstrdup(pool, val);
+	} else if (strcasecmp(param, "sdp-origin") == 0) {
+		config->origin = apr_pstrdup(pool, val);
+	} else {
+		mine = 0;
+	}
+	return mine;
+}
+
+/**
+ * Create the MRCP client and configure it with profiles defined in FreeSWITCH XML config
+ *
+ * Some code and ideas borrowed from unimrcp-client.c
+ * Please check libs/unimrcp/platform/libunimrcp-client/src/unimrcp-client.c when upgrading
+ * the UniMRCP library to ensure nothing new needs to be set up.
+ *
+ * @return the MRCP client
+ */
+static mrcp_client_t *mod_unimrcp_client_create()
+{
+	switch_xml_t cfg = NULL, xml = NULL, profiles = NULL, profile = NULL;
+	mrcp_client_t *client = NULL;
+	apr_pool_t *pool = NULL;
+	mrcp_resource_factory_t *resource_factory = NULL;
+	mpf_codec_manager_t *codec_manager = NULL;
+
+	/* create the client */
+	client = mrcp_client_create(globals.unimrcp_dir_layout);
+	if (!client)
+		goto done;
+	
+	pool = mrcp_client_memory_pool_get(client);
+	if (!pool)
+		goto done;
+
+	resource_factory = mrcp_default_factory_create(pool);
+	if (resource_factory) {
+		mrcp_client_resource_factory_register(client, resource_factory);
+	}
+
+	codec_manager = mpf_engine_codec_manager_create(pool);
+	if (codec_manager) {
+		mrcp_client_codec_manager_register(client, codec_manager);
+	}
+
+	/* set up MRCPv2 connection agent that will be shared with all profiles */
+	apr_size_t max_connection_count = 0;
+	if (!switch_strlen_zero(globals.unimrcp_max_connection_count)) {
+		max_connection_count = atoi(globals.unimrcp_max_connection_count);
+	}
+	if (max_connection_count <= 0) {
+		max_connection_count = 100;
+	}
+	apt_bool_t offer_new_connection = FALSE;
+	if (!switch_strlen_zero(globals.unimrcp_offer_new_connection)) {
+		offer_new_connection = strcasecmp("true", globals.unimrcp_offer_new_connection);
+	}
+	mrcp_connection_agent_t *connection_agent = mrcp_client_connection_agent_create(max_connection_count, offer_new_connection, pool);
+	if (connection_agent) {
+		mrcp_client_connection_agent_register(client, connection_agent, "MRCPv2ConnectionAgent");
+	}
+
+	/* Set up the media engine that will be shared with all profiles */
+	mpf_engine_t *media_engine = mpf_engine_create(pool);
+	if (media_engine) {
+		mrcp_client_media_engine_register(client, media_engine, "MediaEngine");
+	}
+
+	/* configure the client profiles */
+	if (!(xml = switch_xml_open_cfg(CONFIG_FILE, &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open %s\n", CONFIG_FILE);
+		client = NULL;
+		goto done;
+	}
+	if ((profiles = switch_xml_child(cfg, "profiles"))) {
+		for (profile = switch_xml_child(profiles, "profile"); profile; profile = switch_xml_next(profile)) {
+			/* a profile is a signaling agent + termination factory + media engine + connection agent (MRCPv2 only) */
+			mrcp_sig_agent_t *agent = NULL;
+			mpf_termination_factory_t *termination_factory = NULL;
+			mrcp_profile_t * mprofile = NULL;
+			
+			/* get profile attributes */
+			const char *name = switch_xml_attr(profile, "name");
+			const char *version = switch_xml_attr(profile, "version");
+			if (switch_strlen_zero(name) || switch_strlen_zero(version)) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, " missing name or version attribute\n");
+				client = NULL;
+				goto done;
+			}
+
+			/* create RTP config, common to MRCPv1 and MRCPv2 */
+			mpf_rtp_config_t *rtp_config = NULL;
+			rtp_config = mpf_rtp_config_create(pool);
+			rtp_config->rtp_port_min = DEFAULT_RTP_PORT_MIN;
+			rtp_config->rtp_port_max = DEFAULT_RTP_PORT_MAX;
+			apt_string_set(&rtp_config->ip, DEFAULT_LOCAL_IP_ADDRESS);
+			
+			if (strcmp("1", version) == 0) {
+				/* MRCPv1 configuration */
+				rtsp_client_config_t *config = mrcp_unirtsp_client_config_alloc(pool);
+				switch_xml_t param = NULL;
+				config->origin = DEFAULT_SDP_ORIGIN;
+				config->resource_location = DEFAULT_RESOURCE_LOCATION;
+
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading MRCPv1 profile: %s\n", name);
+				for (param = switch_xml_child(profile, "param"); param; param = switch_xml_next(param)) {
+					const char *param_name = switch_xml_attr(param, "name");
+					const char *param_value = switch_xml_attr(param, "value");
+					if (switch_strlen_zero(param_name)) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing param name\n");
+						client = NULL;
+						goto done;
+					}
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading Param %s:%s", param_name, param_value);
+					if (!process_mrcpv1_config(config, param_name, param_value, pool) && 
+						!process_rtp_config(client, rtp_config, param_name, param_value, pool)) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown param %s\n", param_name);
+					}
+				}
+				agent = mrcp_unirtsp_client_agent_create(config, pool);
+			} else if (strcmp("2", version) == 0) {
+				/* MRCPv2 configuration */
+				mrcp_sofia_client_config_t *config = mrcp_sofiasip_client_config_alloc(pool);
+				switch_xml_t param = NULL;
+				config->local_ip = DEFAULT_LOCAL_IP_ADDRESS;
+				config->local_port = DEFAULT_SIP_LOCAL_PORT;
+				config->remote_ip = DEFAULT_REMOTE_IP_ADDRESS;
+				config->remote_port = DEFAULT_SIP_REMOTE_PORT;
+				config->ext_ip = NULL;
+				config->user_agent_name = DEFAULT_SOFIASIP_UA_NAME;
+				config->origin = DEFAULT_SDP_ORIGIN;
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading MRCPv2 profile: %s\n", name);
+				for (param = switch_xml_child(profile, "param"); param; param = switch_xml_next(param)) {
+					const char *param_name = switch_xml_attr(param, "name");
+					const char *param_value = switch_xml_attr(param, "value");
+					if (switch_strlen_zero(param_name)) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing param name\n");
+						client = NULL;
+						goto done;
+					}
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading Param %s:%s", param_name, param_value);
+					if (!process_mrcpv2_config(config, param_name, param_value, pool) &&
+						!process_rtp_config(client, rtp_config, param_name, param_value, pool)) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown param %s\n", param_name);
+					}
+				}
+				agent = mrcp_sofiasip_client_agent_create(config, pool);
+			} else {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "version must be either \"1\" or \"2\"\n");
+				client = NULL;
+				goto done;
+			}
+
+			termination_factory = mpf_rtp_termination_factory_create(rtp_config, pool); 
+			if (termination_factory) {
+				mrcp_client_rtp_factory_register(client, termination_factory, name);
+			}
+			if (agent) {
+				mrcp_client_signaling_agent_register(client, agent, name);
+			}
+
+			/* create the profile and register it */
+			mprofile = mrcp_client_profile_create(NULL, agent, connection_agent, media_engine, termination_factory, pool);
+			if (mprofile) {
+				mrcp_client_profile_register(client, mprofile, name);
+			}
+		}
+	}
+
+ done:
+
+	if (xml) {
+		switch_xml_free(xml);
+	}
+
+	return client;
+}
+#endif
+
+/**
+ * Macro expands to: switch_status_t mod_unimrcp_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) 
+ */
+SWITCH_MODULE_LOAD_FUNCTION(mod_unimrcp_load)
+{
+	/* connect my internal structure to the blank pointer passed to me */
+	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+
+	memset(&globals, 0, sizeof(globals));
+
+	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_UNNESTED, pool);
+	globals.speech_channel_number = 0;
+
+	/* get MRCP module configuration */
+	mod_unimrcp_do_config();
+#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
+	if ((globals.unimrcp_dir_layout = apt_default_dir_layout_create("../", pool)) == NULL) {
+#else
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mrcp-profile-path = %s\n", globals.unimrcp_dir);
+	if ((globals.unimrcp_dir_layout = apt_default_dir_layout_create(globals.unimrcp_dir, pool)) == NULL) {
+#endif
+		return SWITCH_STATUS_FALSE;
+	}
+	if (switch_strlen_zero(globals.unimrcp_default_synth_profile)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing default-tts-profile\n");
+		return SWITCH_STATUS_FALSE;
+	}
+	if (switch_strlen_zero(globals.unimrcp_default_recog_profile)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing default-asr-profile\n");
+		return SWITCH_STATUS_FALSE;
+	}
+
+	/* link UniMRCP logs to FreeSWITCH */
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "UniMRCP log level = %s\n", globals.unimrcp_log_level);
+	if (apt_log_instance_create(APT_LOG_OUTPUT_NONE, str_to_log_level(globals.unimrcp_log_level), pool) == FALSE) {
+		/* already created */
+		apt_log_priority_set(str_to_log_level(globals.unimrcp_log_level));
+	}
+	apt_log_ext_handler_set(unimrcp_log);
+
+	/* Create the MRCP client */
+#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
+	if ((globals.mrcp_client = mod_unimrcp_client_create()) == NULL) {
+#else
+	if ((globals.mrcp_client = unimrcp_client_create(globals.unimrcp_dir_layout)) == NULL) {
+#endif
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create mrcp client\n");
+		return SWITCH_STATUS_FALSE;
+	}
+
+	/* Create the synthesizer interface */
+	if (synth_load(*module_interface, pool) != SWITCH_STATUS_SUCCESS) {
+		return SWITCH_STATUS_FALSE;
+	}
+
+	/* Create the recognizer interface */
+	if (recog_load(*module_interface, pool) != SWITCH_STATUS_SUCCESS) {
+		return SWITCH_STATUS_FALSE;
+	}
+
+	/* Start the client stack */
+	mrcp_client_start(globals.mrcp_client);
+
+	/* indicate that the module should continue to be loaded */
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * Called when the system shuts down
+ * Macro expands to: switch_status_t mod_unimrcp_shutdown() 
+ */
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_unimrcp_shutdown)
+{
+	synth_shutdown();
+	recog_shutdown();
+
+	/* Stop the MRCP client stack */
+	mrcp_client_shutdown(globals.mrcp_client);
+	mrcp_client_destroy(globals.mrcp_client);
+	globals.mrcp_client = 0;
+
+	switch_mutex_destroy(globals.mutex);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
+ * If it exists, this is called in it's own thread when the module-load completes
+ * If it returns anything but SWITCH_STATUS_TERM it will be called again automatically
+ * Macro expands to: switch_status_t mod_unimrcp_runtime()
+ */
+SWITCH_MODULE_RUNTIME_FUNCTION(mod_unimrcp_runtime)
+{
+	return SWITCH_STATUS_TERM;
+}
+
+/**
+ * Translate log level string to enum
+ * @param level log level string
+ * @return log level enum
+ */
+static apt_log_priority_e str_to_log_level(const char *level)
+{
+	if (strcmp(level, "EMERGENCY") == 0) {
+		return APT_PRIO_EMERGENCY;
+	} else if (strcmp(level, "ALERT") == 0) {
+		return APT_PRIO_ALERT;
+	} else if (strcmp(level, "CRITICAL") == 0) {
+		return APT_PRIO_CRITICAL;
+	} else if (strcmp(level, "ERROR") == 0) {
+		return APT_PRIO_ERROR;
+	} else if (strcmp(level, "WARNING") == 0) {
+		return APT_PRIO_WARNING;
+	} else if (strcmp(level, "NOTICE") == 0) {
+		return APT_PRIO_NOTICE;
+	} else if (strcmp(level, "INFO") == 0) {
+		return APT_PRIO_INFO;
+	} else if (strcmp(level, "DEBUG") == 0) {
+		return APT_PRIO_DEBUG;
+	}
+	return APT_PRIO_DEBUG;
+}
+
+/**
+ * Connects UniMRCP logging to FreeSWITCH
+ * @return TRUE
+ */
+static apt_bool_t unimrcp_log(const char *file, int line, const char *id, apt_log_priority_e priority, const char *format, va_list arg_ptr)
+{
+	switch_log_level_t level;
+	char log_message[4096] = { 0 }; /* same size as MAX_LOG_ENTRY_SIZE in UniMRCP apt_log.c */
+
+	if (switch_strlen_zero(format)) {
+		return TRUE;
+	}
+
+	switch(priority) {
+	case APT_PRIO_EMERGENCY:
+		/* pass through */
+	case APT_PRIO_ALERT:
+		/* pass through */
+	case APT_PRIO_CRITICAL:
+		level = SWITCH_LOG_CRIT;
+		break;
+	case APT_PRIO_ERROR:
+		level = SWITCH_LOG_ERROR;
+		break;
+	case APT_PRIO_WARNING:
+		level = SWITCH_LOG_WARNING;
+		break;
+	case APT_PRIO_NOTICE:
+		level = SWITCH_LOG_NOTICE;
+		break;
+	case APT_PRIO_INFO:
+		level = SWITCH_LOG_INFO;
+		break;
+	case APT_PRIO_DEBUG:
+		/* pass through */
+	default:
+		level = SWITCH_LOG_DEBUG;
+		break;
+	}
+	
+	/* apr_vsnprintf supports format extensions required by UniMRCP */ 
+	apr_vsnprintf(log_message, sizeof(log_message), format, arg_ptr);
+	if (!switch_strlen_zero(log_message)) {
+		size_t msglen = strlen(log_message);
+		if (msglen >= 2 && log_message[msglen - 2] == '\\' && log_message[msglen - 1] == 'n') {
+			/* log_message already ends in \n */
+			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, id, level, "%s", log_message);
+		} else {
+			/* log message needs \n appended */
+			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, id, level, "%s\n", log_message);
+		}
+	}
+	
+	return TRUE;
+}
+
+/**
+ * @return the next number to assign the channel
+ */
+static int get_next_speech_channel_number(void)
+{
+	int num;
+	switch_mutex_lock(globals.mutex);
+	num = globals.speech_channel_number;
+	if (globals.speech_channel_number == INT_MAX) {
+		globals.speech_channel_number = 0;
+	} else {
+		globals.speech_channel_number++;
+	}
+	switch_mutex_unlock(globals.mutex);
+
+	return num;
+}
+
+/**
+ * Create a parameter id
+ * 
+ * @param id the UniMRCP ID
+ * @return the pair
+ */
+static unimrcp_param_id_t *unimrcp_param_id_create(int id, switch_memory_pool_t *pool)
+{
+	unimrcp_param_id_t *param = switch_core_alloc(pool, sizeof(unimrcp_param_id_t));
+	if (param) {
+		param->id = id;
+	}
+	return param;
+}
+
+
+/* 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:
+ */


From mikej at freeswitch.org  Tue Jun 16 15:14:59 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 17:14:59 -0500
Subject: [Freeswitch-svn] [commit] r13789 - freeswitch/trunk/libs/unimrcp
Message-ID: 

Author: mikej
Date: Tue Jun 16 17:14:59 2009
New Revision: 13789

Log:
stub dir

Added:
   freeswitch/trunk/libs/unimrcp/


From mikej at freeswitch.org  Tue Jun 16 15:31:19 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 17:31:19 -0500
Subject: [Freeswitch-svn] [commit] r13790 - in
	freeswitch/trunk/libs/unimrcp: . build build/acmacros
	build/pkgconfig build/tools build/vsprops build/vsprops/sdk
	conf data docs libs libs/apr-toolkit libs/apr-toolkit/include
	libs/apr-toolkit/src libs/mpf libs/mpf/codecs
	libs/mpf/codecs/g711 libs/mpf/include libs/mpf/src libs/mrcp
	libs/mrcp-client libs/mrcp-client/include
	libs/mrcp-client/src libs/mrcp-engine
	libs/mrcp-engine/include libs/mrcp-engine/src
	libs/mrcp-server libs/mrcp-server/include
	libs/mrcp-server/src libs/mrcp-signaling
	libs/mrcp-signaling/include libs/mrcp-signaling/src
	libs/mrcp/control libs/mrcp/control/include
	libs/mrcp/control/src libs/mrcp/include libs/mrcp/message
	libs/mrcp/message/include libs/mrcp/message/src
	libs/mrcp/resources libs/mrcp/resources/include
	libs/mrcp/resources/src libs/mrcpv2-transport
	libs/mrcpv2-transport/include libs/mrcpv2-transport/src
	libs/uni-rtsp libs/uni-rtsp/include libs/uni-rtsp/src modules
	modules/mrcp-sofiasip modules/mrcp-sofiasip/include
	modules/mrcp-sofiasip/src modules/mrcp-unirtsp
	modules/mrcp-unirtsp/include modules/mrcp-unirtsp/src
	packages packages/inno-setup platforms platforms/libunimrcp-client
	platforms/libunimrcp-client/include
	platforms/libunimrcp-client/src platforms/libunimrcp-server
	platforms/libunimrcp-server/include
	platforms/libunimrcp-server/src platforms/unimrcp-client
	platforms/unimrcp-client/include platforms/unimrcp-client/src
	platforms/unimrcp-server platforms/unimrcp-server/src plugins
	plugins/demo-recog plugins/demo-recog/src plugins/demo-synth
	plugins/demo-synth/src plugins/mrcp-cepstral
	plugins/mrcp-cepstral/src tests tests/apttest
	tests/apttest/src tests/mpftest tests/mpftest/src
	tests/mrcptest tests/mrcptest/src tests/mrcptest/v1
	tests/mrcptest/v2 tests/rtsptest tests/rtsptest/msg
	tests/rtsptest/src tests/sipp tests/strtablegen
	tests/strtablegen/src
Message-ID: 

Author: mikej
Date: Tue Jun 16 17:31:19 2009
New Revision: 13790

Log:
inital checkin of unimrcp svn revision 985 from  http://unimrcp.googlecode.com/svn/trunk/

Added:
   freeswitch/trunk/libs/unimrcp/AUTHORS
   freeswitch/trunk/libs/unimrcp/INSTALL
   freeswitch/trunk/libs/unimrcp/LICENSE
   freeswitch/trunk/libs/unimrcp/Makefile.am
   freeswitch/trunk/libs/unimrcp/README
   freeswitch/trunk/libs/unimrcp/bootstrap   (contents, props changed)
   freeswitch/trunk/libs/unimrcp/build/
   freeswitch/trunk/libs/unimrcp/build/Makefile.am
   freeswitch/trunk/libs/unimrcp/build/acmacros/
   freeswitch/trunk/libs/unimrcp/build/acmacros/apr.m4
   freeswitch/trunk/libs/unimrcp/build/acmacros/apu.m4
   freeswitch/trunk/libs/unimrcp/build/acmacros/find_apr.m4
   freeswitch/trunk/libs/unimrcp/build/acmacros/find_apu.m4
   freeswitch/trunk/libs/unimrcp/build/acmacros/sofia-sip.m4
   freeswitch/trunk/libs/unimrcp/build/acmacros/swift.m4
   freeswitch/trunk/libs/unimrcp/build/get-version.sh   (contents, props changed)
   freeswitch/trunk/libs/unimrcp/build/pkgconfig/
   freeswitch/trunk/libs/unimrcp/build/pkgconfig/Makefile.am
   freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpclient.pc.in
   freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpplugin.pc.in
   freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpserver.pc.in
   freeswitch/trunk/libs/unimrcp/build/tools/
   freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
   freeswitch/trunk/libs/unimrcp/build/tools/unimrcp_service.c
   freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.exe.manifest
   freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
   freeswitch/trunk/libs/unimrcp/build/uni_version.h
   freeswitch/trunk/libs/unimrcp/build/vsprops/
   freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/apt.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/cepstral.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/mpf.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/mrcp.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpclient.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpengine.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpserver.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpsignaling.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpv2transport.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/
   freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpclient.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpplugin.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpsdk.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpserver.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unibase.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unidebug.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpclient.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpplugin.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpserver.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unirelease.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unirtsp.vsprops
   freeswitch/trunk/libs/unimrcp/conf/
   freeswitch/trunk/libs/unimrcp/conf/unimrcpclient.xml
   freeswitch/trunk/libs/unimrcp/conf/unimrcpserver.xml
   freeswitch/trunk/libs/unimrcp/configure.ac
   freeswitch/trunk/libs/unimrcp/data/
   freeswitch/trunk/libs/unimrcp/data/demo.pcm   (contents, props changed)
   freeswitch/trunk/libs/unimrcp/data/grammar.xml
   freeswitch/trunk/libs/unimrcp/data/one.pcm   (contents, props changed)
   freeswitch/trunk/libs/unimrcp/data/result.xml
   freeswitch/trunk/libs/unimrcp/data/speak.xml
   freeswitch/trunk/libs/unimrcp/docs/
   freeswitch/trunk/libs/unimrcp/docs/doxygen.conf
   freeswitch/trunk/libs/unimrcp/libs/
   freeswitch/trunk/libs/unimrcp/libs/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_consumer_task.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_cyclic_queue.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_dir_layout.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_log.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net_client_task.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net_server_task.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_obj_list.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pair.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pollset.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pool.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_string.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_string_table.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_task.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_task_msg.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_test_suite.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_text_stream.h
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_consumer_task.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_cyclic_queue.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_dir_layout.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_log.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net_client_task.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net_server_task.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_obj_list.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pair.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pollset.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pool.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_string_table.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_task.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_task_msg.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_test_suite.c
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_text_stream.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/
   freeswitch/trunk/libs/unimrcp/libs/mpf/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/mpf/codecs/
   freeswitch/trunk/libs/unimrcp/libs/mpf/codecs/g711/
   freeswitch/trunk/libs/unimrcp/libs/mpf/codecs/g711/g711.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/codecs/g711/g711.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_activity_detector.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_audio_file_descriptor.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_audio_file_stream.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_bridge.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_buffer.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_descriptor.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_manager.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_context.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_decoder.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_encoder.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_engine.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_file_termination_factory.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_frame.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_jitter_buffer.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_media_descriptor.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_message.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_object.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_attribs.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_defs.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_descriptor.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_header.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_stat.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_stream.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_termination_factory.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_stream.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_stream_mode.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_termination.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_timer.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_types.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_user.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_activity_detector.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_audio_file_stream.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_bridge.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_buffer.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_descriptor.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_g711.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_linear.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_manager.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_context.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_decoder.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_encoder.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_engine.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_file_termination_factory.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_jitter_buffer.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_attribs.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_stream.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_termination_factory.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_termination.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_timer.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_application.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client_session.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client_types.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/src/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/src/mrcp_client.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/src/mrcp_client_session.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/include/mrcp_resource_engine.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/include/mrcp_resource_plugin.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/src/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/src/mrcp_resource_engine.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server_session.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server_types.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/src/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/src/mrcp_server.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/src/mrcp_server_session.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_session.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_session_descriptor.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_sig_agent.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_sig_types.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/src/
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/src/mrcp_session_descriptor.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/src/mrcp_sig_agent.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_resource.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_resource_factory.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_state_machine.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_stream.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/src/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/src/mrcp_resource_factory.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/control/src/mrcp_stream.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/include/mrcp.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/include/mrcp_types.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_generic_header.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_header_accessor.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_message.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_generic_header.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_header_accessor.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_message.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_default_factory.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_header.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_resource.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_state_machine.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_header.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_resource.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_state_machine.h
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_default_factory.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_client_state_machine.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_header.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_resource.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_server_state_machine.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_client_state_machine.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_header.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_resource.c
   freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_server_state_machine.c
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_client_connection.h
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_connection.h
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_connection_types.h
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_control_descriptor.h
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_server_connection.h
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_client_connection.c
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_connection.c
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_control_descriptor.c
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_server_connection.c
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/Makefile.am
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp.h
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_client.h
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_header.h
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_message.h
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_server.h
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_start_line.h
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_stream.h
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_client.c
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_header.c
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_message.c
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_server.c
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_start_line.c
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_stream.c
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/modules/
   freeswitch/trunk/libs/unimrcp/modules/Makefile.am
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sdp.h
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sofiasip_client_agent.h
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sofiasip_server_agent.h
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sdp.c
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_client_agent.h
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_sdp.h
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_server_agent.h
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_client_agent.c
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_sdp.c
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_server_agent.c
   freeswitch/trunk/libs/unimrcp/packages/
   freeswitch/trunk/libs/unimrcp/packages/inno-setup/
   freeswitch/trunk/libs/unimrcp/packages/inno-setup/setup.iss
   freeswitch/trunk/libs/unimrcp/packages/inno-setup/unimrcp-sdk.iss
   freeswitch/trunk/libs/unimrcp/packages/inno-setup/unimrcp.iss
   freeswitch/trunk/libs/unimrcp/platforms/
   freeswitch/trunk/libs/unimrcp/platforms/Makefile.am
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/Makefile.am
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/include/
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/include/unimrcp_client.h
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/src/
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/src/unimrcp_client.c
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/Makefile.am
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/include/
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/include/unimrcp_server.h
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/src/
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/src/unimrcp_server.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_application.h
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_framework.h
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_util.h
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_bypass_application.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_discover_application.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_framework.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_recog_application.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_synth_application.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_util.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/main.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/main.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_cmdline.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_daemon.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_service.c
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/
   freeswitch/trunk/libs/unimrcp/plugins/Makefile.am
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/Makefile.am
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/src/
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/src/demo_recog_engine.c
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/Makefile.am
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/src/
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/src/demo_synth_engine.c
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/Makefile.am
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/src/
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/src/mrcp_swift.c
   freeswitch/trunk/libs/unimrcp/tests/
   freeswitch/trunk/libs/unimrcp/tests/Makefile.am
   freeswitch/trunk/libs/unimrcp/tests/apttest/
   freeswitch/trunk/libs/unimrcp/tests/apttest/Makefile.am
   freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/apttest/src/
   freeswitch/trunk/libs/unimrcp/tests/apttest/src/consumer_task_suite.c
   freeswitch/trunk/libs/unimrcp/tests/apttest/src/main.c
   freeswitch/trunk/libs/unimrcp/tests/apttest/src/task_suite.c
   freeswitch/trunk/libs/unimrcp/tests/mpftest/
   freeswitch/trunk/libs/unimrcp/tests/mpftest/Makefile.am
   freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mpftest/src/
   freeswitch/trunk/libs/unimrcp/tests/mpftest/src/main.c
   freeswitch/trunk/libs/unimrcp/tests/mpftest/src/mpf_suite.c
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/Makefile.am
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/main.c
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/parse_gen_suite.c
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/set_get_suite.c
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/definegrammar.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/getparams.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/multi.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/pause.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/recognitioncomplete.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/recognize.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/response.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/resume.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/setparams.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/speak.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/speakcomplete.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/stop.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/definegrammar.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/getparams.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/recognitioncomplete.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/recognize.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/setparams.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/speak.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/speakcomplete.msg
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/stop.msg
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/Makefile.am
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/announce.msg
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/ok.msg
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/re-ok.msg
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/re-setup.msg
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/setup.msg
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/teardown.msg
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/ultimate.msg
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/src/
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/src/main.c
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/src/parse_gen_suite.c
   freeswitch/trunk/libs/unimrcp/tests/sipp/
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_multi
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_recog
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_synth
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_unknown
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_update
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_recog
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_reject
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_synth
   freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_unknown
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/Makefile.am
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/src/
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/src/main.c
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/stringtable.in
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj
   freeswitch/trunk/libs/unimrcp/unimrcp.sln
Modified:
   freeswitch/trunk/libs/unimrcp/   (props changed)

Added: freeswitch/trunk/libs/unimrcp/AUTHORS
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/AUTHORS	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,12 @@
+Author(s):
+   Arsen Chaloyan 
+
+
+Contributor(s):
+   Kamil Shakirov 
+   Anthony Masse 
+   Vlad Socaciu 
+   Garmt 
+   Patrick 
+   Bayram 
+   Mahmoud Hassan 
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/INSTALL
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/INSTALL	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,103 @@
+BUILD REQUIREMENTS
+==================
+UniMRCP depends on a number of third party tools and libraries,
+which must be installed prior to UniMRCP build.
+
+1. Apache Portable Runtime [>=1.2.x] (http://apr.apache.org/)
+Whenever you want to build any part of UniMRCP, you need the
+Apache Portable Runtime (APR) and the APR Utility (APR-util)
+libraries.
+
+2. Sofia-SIP [>=1.12.6] (http://sofia-sip.sourceforge.net/)
+Sofia-SIP library is used to implement MRCPv2 specification
+compliant SIP signaling. Sofia-SIP is an open-source SIP User-Agent
+library, compliant with the IETF RFC3261 specification.
+
+Use the link below to download one of known to work and 
+ready to use packages of APR and Sofia-SIP libraries.
+    http://www.unimrcp.org/dependencies/
+
+
+GNU BUILD
+===================
+Additional requirements
+- autoconf 2.57 or newer
+- automake
+- libtool 1.4 or newer
+- gcc
+- pkg-config
+
+Build procedure
+$ ./bootstrap
+$ ./configure
+$ make
+$ make install
+
+Installed directory layout
+bin      - binaries (unimrcpserver, unimrcpclient)
+conf     - configuration files
+include  - header files
+libs     - shared (convenient) libraries
+plugins  - run-time loadable modules
+
+There are a couple of options to "./configure".
+To specify where to look for the APR and APR-util libraries
+use the "--with-apr=" and "--with-apr-util=" options.
+For example
+$ ./configure --with-apr=/usr/local/apr \
+              --with-apr-util=/usr/local/apr
+
+To specify  where to look for the Sofia-SIP library
+use the "--with-sofia-sip=" option. 
+For example
+$ ./configure --with-sofia-sip=/usr/local/sofia-sip
+
+To install the default configuration use
+$ make def-conf
+
+To generate doxygen documentation from the sources use
+$ make dox
+
+To build distribution tarball use
+$ make dist
+
+
+WINDOWS BUILD
+======================
+Additional requirements
+- Microsoft Visual Studio 2005
+
+One-time pre-build preparation
+You may need to adjust the paths for 3-rd party libraries
+in appropriate property sheets to match your local installation,
+while below are the defaults (build/vsprops).
+
+apr.vsprops
+	
+	
+	
+sofiasip.vsprops
+	
+
+Build procedure
+Open unimrcp.sln solution file and build the solution (Build -> Build Solution).
+
+One-time pre-run output directory preparation
+Build prepare.vcproj utility project (right click on tools -> prebuild in 
+Solution Explorer and select Build from context menu). This is a one-time 
+output directory preparation. It copies all the required APR and SofiaSIP 
+libraries and the default configuration to the output directory. 
+
+Output directory layout
+bin      - binaries (unimrcpserver, unimrcpclient) and all the required dlls
+conf     - configuration files
+plugins  - run-time loadable modules
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/LICENSE
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/LICENSE	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: freeswitch/trunk/libs/unimrcp/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,42 @@
+macrodir		= @ac_macro_dir@
+auxdir			= @ac_aux_dir@
+AUX_DIST		= $(auxdir)/config.guess \
+                          $(auxdir)/config.sub \
+                          $(auxdir)/install-sh \
+                          $(auxdir)/ltconfig \
+                          $(auxdir)/ltmain.sh \
+                          $(auxdir)/depcomp \
+                          $(auxdir)/missing
+EXTRA_DIST		= bootstrap
+
+AUTOMAKE_OPTIONS 	= foreign
+MAINTAINERCLEANFILES 	= Makefile.in aclocal.m4 configure $(AUX_DIST)
+
+ACLOCAL			= aclocal -I $(macrodir)
+
+SUBDIRS                 = libs modules plugins platforms build
+if TEST_SUITES
+SUBDIRS                += tests
+endif
+
+dox:
+	doxygen $(top_srcdir)/docs/doxygen.conf
+
+def-conf:
+	test -d $(confdir) || $(mkinstalldirs) $(confdir)
+	for conffile in `find conf -name \*.xml` ; do \
+	    filename=`echo $$conffile | sed -e 's|^.*/||'`; \
+	    $(INSTALL) -m 644 conf/$$filename $(confdir); \
+	done
+
+def-data:
+	test -d $(datadir) || $(mkinstalldirs) $(datadir)
+	for datafile in `find data -name *.pcm -o -name *.xml` ; do \
+	    filename=`echo $$datafile | sed -e 's|^.*/||'`; \
+	    $(INSTALL) -m 644 data/$$filename $(datadir); \
+	done
+           
+install-data-local:
+	test -d $(confdir) || $(MAKE) def-conf
+	test -d $(datadir) || $(MAKE) def-data
+	test -d $(logdir)  || $(mkinstalldirs) $(logdir)

Added: freeswitch/trunk/libs/unimrcp/README
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/README	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,51 @@
+INTRODUCTION
+============
+UniMRCP - Open Source Media Resource Control Protocol Stack.
+
+
+INSTALLATION
+============
+See the file "INSTALLATION" for installation tips.
+
+
+DOCUMENTATION
+=============
+See the directory "docs/dox" for doxygen generated documentation.
+See the directory "docs/ea" for UML based design concepts
+   (Enterpise Architect generated HTML pages).
+
+
+REFERENCES
+==========
+Website:
+   http://www.unimrcp.org
+
+Project Home:
+   http://code.google.com/p/unimrcp/
+
+Wiki:
+   http://code.google.com/p/unimrcp/w/list
+
+Issue Tracker:
+   http://code.google.com/p/unimrcp/issues/list
+
+Discussion Group:
+   http://groups.google.com/group/unimrcp
+
+Version Control Repository (SVN):
+   http://unimrcp.googlecode.com/svn/trunk/
+
+UML Documentation File (Enterpise Architect):
+   http://unimrcp.googlecode.com/svn/misc/unimrcp.eap
+
+Commit Monitor:
+   http://code.google.com/p/unimrcp/source/list
+   http://groups.google.com/group/unimrcp-svn-commits
+
+
+LICENSING
+=========
+UniMRCP is licensed under terms of the Apache 2.0 license.
+See the file "LICENSE" for more information.
+
+Copyright 2008 Arsen Chaloyan

Added: freeswitch/trunk/libs/unimrcp/bootstrap
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/bootstrap	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+case `uname` in
+    Darwin) libtoolize=glibtoolize ;;
+    *)      libtoolize=libtoolize  ;;
+esac
+
+set -x
+$libtoolize --force --automake --copy
+aclocal -I build/acmacros
+automake --foreign --add-missing --copy
+autoconf
+
+rm -rf autom4te.cache

Added: freeswitch/trunk/libs/unimrcp/build/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+SUBDIRS                = pkgconfig

Added: freeswitch/trunk/libs/unimrcp/build/acmacros/apr.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/acmacros/apr.m4	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,44 @@
+dnl  UNIMRCP_CHECK_APR
+
+AC_DEFUN([UNIMRCP_CHECK_APR],
+[
+  AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
+
+  APR_FIND_APR("", "", 1, 1)
+
+  if test $apr_found = "no"; then
+    AC_MSG_WARN([APR not found])
+    UNIMRCP_DOWNLOAD_APR
+  fi
+
+  if test $apr_found = "reconfig"; then
+    AC_MSG_WARN([APR reconfig])
+  fi
+
+  dnl check APR version number
+
+  apr_version="`$apr_config --version`"
+  AC_MSG_RESULT([$apr_version])
+
+  dnl Get build information from APR
+
+  CPPFLAGS="$CPPFLAGS `$apr_config --cppflags`"
+  CFLAGS="$CFLAGS `$apr_config --cflags`"
+  LDFLAGS="$LDFLAGS `$apr_config --ldflags`"
+
+  UNIMRCP_APR_INCLUDES="`$apr_config --includes`"
+  UNIMRCP_APR_LIBS="`$apr_config --link-libtool --libs`"
+
+  AC_SUBST(UNIMRCP_APR_INCLUDES)
+  AC_SUBST(UNIMRCP_APR_LIBS)
+])
+
+dnl UNIMRCP_DOWNLOAD_APR
+dnl no apr found, print out a message telling the user what to do
+AC_DEFUN([UNIMRCP_DOWNLOAD_APR],
+[
+  echo "The Apache Portable Runtime (APR) library cannot be found."
+  echo "Please install APR on this system and supply the appropriate"
+  echo "--with-apr option to 'configure'"
+  AC_MSG_ERROR([no suitable APR found])
+])

Added: freeswitch/trunk/libs/unimrcp/build/acmacros/apu.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/acmacros/apu.m4	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,42 @@
+dnl  UNIMRCP_CHECK_APU
+
+AC_DEFUN([UNIMRCP_CHECK_APU],
+[
+  AC_MSG_NOTICE([Apache Portable Runtime Utility (APU) library configuration])
+
+  APR_FIND_APU("", "", 1, 1)
+
+  if test $apu_found = "no"; then
+    AC_MSG_WARN([APU not found])
+    UNIMRCP_DOWNLOAD_APU
+  fi
+
+  if test $apu_found = "reconfig"; then
+    AC_MSG_WARN([APU reconfig])
+  fi
+
+  dnl check APU version number
+
+  apu_version="`$apu_config --version`"
+  AC_MSG_RESULT([$apu_version])
+
+  dnl Get build information from APU
+
+  LDFLAGS="$LDFLAGS `$apu_config --ldflags`"
+
+  UNIMRCP_APU_INCLUDES="`$apu_config --includes`"
+  UNIMRCP_APU_LIBS="`$apu_config --link-libtool --libs`"
+
+  AC_SUBST(UNIMRCP_APU_INCLUDES)
+  AC_SUBST(UNIMRCP_APU_LIBS)
+])
+
+dnl UNIMRCP_DOWNLOAD_APU
+dnl no apr-util found, print out a message telling the user what to do
+AC_DEFUN([UNIMRCP_DOWNLOAD_APU],
+[
+  echo "The Apache Portable Runtime Utility (APU) library cannot be found."
+  echo "Please install APRUTIL on this system and supply the appropriate"
+  echo "--with-apr-util option to 'configure'"
+  AC_MSG_ERROR([no suitable APU found])
+])

Added: freeswitch/trunk/libs/unimrcp/build/acmacros/find_apr.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/acmacros/find_apr.m4	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,167 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements.  See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License.  You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl
+dnl find_apr.m4 : locate the APR include files and libraries
+dnl
+dnl This macro file can be used by applications to find and use the APR
+dnl library. It provides a standardized mechanism for using APR. It supports
+dnl embedding APR into the application source, or locating an installed
+dnl copy of APR.
+dnl
+dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl
+dnl   where srcdir is the location of the bundled APR source directory, or
+dnl   empty if source is not bundled.
+dnl
+dnl   where builddir is the location where the bundled APR will will be built,
+dnl   or empty if the build will occur in the srcdir.
+dnl
+dnl   where implicit-install-check set to 1 indicates if there is no
+dnl   --with-apr option specified, we will look for installed copies.
+dnl
+dnl   where acceptable-majors is a space separated list of acceptable major
+dnl   version numbers. Often only a single major version will be acceptable.
+dnl   If multiple versions are specified, and --with-apr=PREFIX or the
+dnl   implicit installed search are used, then the first (leftmost) version
+dnl   in the list that is found will be used.  Currently defaults to [0 1].
+dnl
+dnl Sets the following variables on exit:
+dnl
+dnl   apr_found : "yes", "no", "reconfig"
+dnl
+dnl   apr_config : If the apr-config tool exists, this refers to it. If
+dnl                apr_found is "reconfig", then the bundled directory
+dnl                should be reconfigured *before* using apr_config.
+dnl
+dnl Note: this macro file assumes that apr-config has been installed; it
+dnl       is normally considered a required part of an APR installation.
+dnl
+dnl If a bundled source directory is available and needs to be (re)configured,
+dnl then apr_found is set to "reconfig". The caller should reconfigure the
+dnl (passed-in) source directory, placing the result in the build directory,
+dnl as appropriate.
+dnl
+dnl If apr_found is "yes" or "reconfig", then the caller should use the
+dnl value of apr_config to fetch any necessary build/link information.
+dnl
+
+AC_DEFUN([APR_FIND_APR], [
+  apr_found="no"
+
+  if test "$target_os" = "os2-emx"; then
+    # Scripts don't pass test -x on OS/2
+    TEST_X="test -f"
+  else
+    TEST_X="test -x"
+  fi
+
+  ifelse([$4], [], [
+         ifdef(AC_WARNING,AC_WARNING([$0: missing argument 4 (acceptable-majors): Defaulting to APR 0.x then APR 1.x]))
+         acceptable_majors="0 1"],
+         [acceptable_majors="$4"])
+
+  apr_temp_acceptable_apr_config=""
+  for apr_temp_major in $acceptable_majors
+  do
+    case $apr_temp_major in
+      0)
+      apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config"
+      ;;
+      *)
+      apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config"
+      ;;
+    esac
+  done
+
+  AC_MSG_CHECKING(for APR)
+  AC_ARG_WITH(apr,
+  [  --with-apr=PATH         prefix for installed APR, path to APR build tree,
+                          or the full path to apr-config],
+  [
+    if test "$withval" = "no" || test "$withval" = "yes"; then
+      AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
+    fi
+
+    for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+    do
+      for lookdir in "$withval/bin" "$withval"
+      do
+        if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
+          apr_found="yes"
+          apr_config="$lookdir/$apr_temp_apr_config_file"
+          break 2
+        fi
+      done
+    done
+
+    if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
+      apr_found="yes"
+      apr_config="$withval"
+    fi
+
+    dnl if --with-apr is used, it is a fatal error for its argument
+    dnl to be invalid
+    if test "$apr_found" != "yes"; then
+      AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.])
+    fi
+  ],[
+    dnl If we allow installed copies, check those before using bundled copy.
+    if test -n "$3" && test "$3" = "1"; then
+      for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+      do
+        if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
+          apr_found="yes"
+          apr_config="$apr_temp_apr_config_file"
+          break
+        else
+          dnl look in some standard places
+          for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+            if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
+              apr_found="yes"
+              apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+              break 2
+            fi
+          done
+        fi
+      done
+    fi
+    dnl if we have not found anything yet and have bundled source, use that
+    if test "$apr_found" = "no" && test -d "$1"; then
+      apr_temp_abs_srcdir="`cd $1 && pwd`"
+      apr_found="reconfig"
+      apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`"
+      case $apr_bundled_major in
+        "")
+          AC_MSG_ERROR([failed to find major version of bundled APR])
+        ;;
+        0)
+          apr_temp_apr_config_file="apr-config"
+        ;;
+        *)
+          apr_temp_apr_config_file="apr-$apr_bundled_major-config"
+        ;;
+      esac
+      if test -n "$2"; then
+        apr_config="$2/$apr_temp_apr_config_file"
+      else
+        apr_config="$1/$apr_temp_apr_config_file"
+      fi
+    fi
+  ])
+
+  AC_MSG_RESULT($apr_found)
+])

Added: freeswitch/trunk/libs/unimrcp/build/acmacros/find_apu.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/acmacros/find_apu.m4	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,176 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+dnl applicable.
+dnl
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl
+dnl find_apu.m4 : locate the APR-util (APU) include files and libraries
+dnl
+dnl This macro file can be used by applications to find and use the APU
+dnl library. It provides a standardized mechanism for using APU. It supports
+dnl embedding APU into the application source, or locating an installed
+dnl copy of APU.
+dnl
+dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl
+dnl   where srcdir is the location of the bundled APU source directory, or
+dnl   empty if source is not bundled.
+dnl
+dnl   where builddir is the location where the bundled APU will be built,
+dnl   or empty if the build will occur in the srcdir.
+dnl
+dnl   where implicit-install-check set to 1 indicates if there is no
+dnl   --with-apr-util option specified, we will look for installed copies.
+dnl
+dnl   where acceptable-majors is a space separated list of acceptable major
+dnl   version numbers. Often only a single major version will be acceptable.
+dnl   If multiple versions are specified, and --with-apr-util=PREFIX or the
+dnl   implicit installed search are used, then the first (leftmost) version
+dnl   in the list that is found will be used.  Currently defaults to [0 1].
+dnl
+dnl Sets the following variables on exit:
+dnl
+dnl   apu_found : "yes", "no", "reconfig"
+dnl
+dnl   apu_config : If the apu-config tool exists, this refers to it.  If
+dnl                apu_found is "reconfig", then the bundled directory
+dnl                should be reconfigured *before* using apu_config.
+dnl
+dnl Note: this macro file assumes that apr-config has been installed; it
+dnl       is normally considered a required part of an APR installation.
+dnl
+dnl Note: At this time, we cannot find *both* a source dir and a build dir.
+dnl       If both are available, the build directory should be passed to
+dnl       the --with-apr-util switch.
+dnl
+dnl Note: the installation layout is presumed to follow the standard
+dnl       PREFIX/lib and PREFIX/include pattern. If the APU config file
+dnl       is available (and can be found), then non-standard layouts are
+dnl       possible, since it will be described in the config file.
+dnl
+dnl If a bundled source directory is available and needs to be (re)configured,
+dnl then apu_found is set to "reconfig". The caller should reconfigure the
+dnl (passed-in) source directory, placing the result in the build directory,
+dnl as appropriate.
+dnl
+dnl If apu_found is "yes" or "reconfig", then the caller should use the
+dnl value of apu_config to fetch any necessary build/link information.
+dnl
+
+AC_DEFUN([APR_FIND_APU], [
+  apu_found="no"
+
+  if test "$target_os" = "os2-emx"; then
+    # Scripts don't pass test -x on OS/2
+    TEST_X="test -f"
+  else
+    TEST_X="test -x"
+  fi
+
+  ifelse([$4], [],
+  [
+    ifdef(AC_WARNING,([$0: missing argument 4 (acceptable-majors): Defaulting to APU 0.x then APU 1.x]))
+    acceptable_majors="0 1"
+  ], [acceptable_majors="$4"])
+
+  apu_temp_acceptable_apu_config=""
+  for apu_temp_major in $acceptable_majors
+  do
+    case $apu_temp_major in
+      0)
+      apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-config"
+      ;;
+      *)
+      apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-$apu_temp_major-config"
+      ;;
+    esac
+  done
+
+  AC_MSG_CHECKING(for APR-util)
+  AC_ARG_WITH(apr-util,
+  [  --with-apr-util=PATH    prefix for installed APU, path to APU build tree,
+                          or the full path to apu-config],
+  [
+    if test "$withval" = "no" || test "$withval" = "yes"; then
+      AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])
+    fi
+
+    for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+    do
+      for lookdir in "$withval/bin" "$withval"
+      do
+        if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
+          apu_found="yes"
+          apu_config="$lookdir/$apu_temp_apu_config_file"
+          break 2
+        fi
+      done
+    done
+
+    if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
+      apu_found="yes"
+      apu_config="$withval"
+    fi
+
+    dnl if --with-apr-util is used, it is a fatal error for its argument
+    dnl to be invalid
+    if test "$apu_found" != "yes"; then
+      AC_MSG_ERROR([the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file.])
+    fi
+  ],[
+    if test -n "$3" && test "$3" = "1"; then
+      for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+      do
+        if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
+          apu_found="yes"
+          apu_config="$apu_temp_apu_config_file"
+          break
+        else
+          dnl look in some standard places (apparently not in builtin/default)
+          for lookdir in /usr /usr/local /usr/local/apr /opt/apr /usr/local/apache2 ; do
+            if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
+              apu_found="yes"
+              apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+              break 2
+            fi
+          done
+        fi
+      done
+    fi
+    dnl if we have not found anything yet and have bundled source, use that
+    if test "$apu_found" = "no" && test -d "$1"; then
+      apu_temp_abs_srcdir="`cd $1 && pwd`"
+      apu_found="reconfig"
+      apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apu_version.h\"`"
+      case $apu_bundled_major in
+        "")
+          AC_MSG_ERROR([failed to find major version of bundled APU])
+        ;;
+        0)
+          apu_temp_apu_config_file="apu-config"
+        ;;
+        *)
+          apu_temp_apu_config_file="apu-$apu_bundled_major-config"
+        ;;
+      esac
+      if test -n "$2"; then
+        apu_config="$2/$apu_temp_apu_config_file"
+      else
+        apu_config="$1/$apu_temp_apu_config_file"
+      fi
+    fi
+  ])
+
+  AC_MSG_RESULT($apu_found)
+])

Added: freeswitch/trunk/libs/unimrcp/build/acmacros/sofia-sip.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/acmacros/sofia-sip.m4	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,49 @@
+dnl UNIMRCP_CHECK_SOFIA
+
+AC_DEFUN([UNIMRCP_CHECK_SOFIA],
+[  
+    AC_MSG_NOTICE([Sofia SIP library configuration])
+
+    AC_MSG_CHECKING([for Sofia-SIP])
+    AC_ARG_WITH(sofia-sip,
+                [  --with-sofia-sip=PATH   prefix for installed Sofia-SIP or
+                          path to Sofia-SIP build tree],
+                [sofia_path=$withval],
+                [sofia_path="/usr/local"]
+                )
+    
+    sofiaconfig="lib/pkgconfig/sofia-sip-ua.pc"
+    sofiasrcdir="libsofia-sip-ua"
+    for dir in $sofia_path ; do
+        cd $dir && sofiadir=`pwd` && cd - > /dev/null
+        if test -f "$dir/$sofiaconfig"; then
+            found_sofia="yes"
+            UNIMRCP_SOFIA_INCLUDES="`pkg-config --cflags $dir/$sofiaconfig`"
+            UNIMRCP_SOFIA_LIBS="`pkg-config --libs $dir/$sofiaconfig`"
+	    sofia_version="`pkg-config --modversion $dir/$sofiaconfig`"
+            break
+        fi
+        if test -d "$dir/$sofiasrcdir"; then
+            found_sofia="yes"
+            UNIMRCP_SOFIA_INCLUDES="-I$sofiadir/$sofiasrcdir -I$sofiadir/$sofiasrcdir/bnf -I$sofiadir/$sofiasrcdir/features -I$sofiadir/$sofiasrcdir/http -I$sofiadir/$sofiasrcdir/ipt -I$sofiadir/$sofiasrcdir/iptsec -I$sofiadir/$sofiasrcdir/msg -I$sofiadir/$sofiasrcdir/nea -I$sofiadir/$sofiasrcdir/nta -I$sofiadir/$sofiasrcdir/nth -I$sofiadir/$sofiasrcdir/nua -I$sofiadir/$sofiasrcdir/sdp -I$sofiadir/$sofiasrcdir/sip -I$sofiadir/$sofiasrcdir/soa -I$sofiadir/$sofiasrcdir/sresolv -I$sofiadir/$sofiasrcdir/stun -I$sofiadir/$sofiasrcdir/su -I$sofiadir/$sofiasrcdir/tport -I$sofiadir/$sofiasrcdir/url"
+            UNIMRCP_SOFIA_LIBS="$sofiadir/$sofiasrcdir/libsofia-sip-ua.la"
+	    sofia_version="`pkg-config --modversion $sofiadir/packages/sofia-sip-ua.pc`"
+            break
+        fi
+    done
+
+    if test x_$found_sofia != x_yes; then
+        AC_MSG_ERROR(Cannot find Sofia-SIP - looked for sofia-config:$sofiaconfig and srcdir:$sofiasrcdir in $sofia_path)
+    else
+        AC_MSG_RESULT([$found_sofia])
+        AC_MSG_RESULT([$sofia_version])
+
+case "$host" in
+    *darwin*)
+	UNIMRCP_SOFIA_LIBS="$UNIMRCP_SOFIA_LIBS -framework CoreFoundation -framework SystemConfiguration"                                                                ;;
+esac
+
+        AC_SUBST(UNIMRCP_SOFIA_INCLUDES)
+        AC_SUBST(UNIMRCP_SOFIA_LIBS)
+    fi
+])

Added: freeswitch/trunk/libs/unimrcp/build/acmacros/swift.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/acmacros/swift.m4	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,30 @@
+dnl UNIMRCP_CHECK_SWIFT
+
+AC_DEFUN([UNIMRCP_CHECK_SWIFT],
+[  
+    AC_MSG_NOTICE([Cepstral Swift library configuration])
+
+    AC_MSG_CHECKING([for Swift])
+    AC_ARG_WITH(swift,
+                [  --with-swift=PATH       prefix for installed Swift],
+                [swift_path=$withval],
+                [swift_path="/opt/swift"]
+                )
+    
+    if test -d "$swift_path"; then
+        found_swift="yes"
+        UNIMRCP_SWIFT_INCLUDES="-I$swift_path/include"
+        UNIMRCP_SWIFT_LIBS="-lswift -lceplex_us -lceplang_en -lm"
+        UNIMRCP_SWIFT_LDFLAGS="-L$swift_path/lib/ -R$swift_path/lib/"
+
+        AC_SUBST(UNIMRCP_SWIFT_INCLUDES)
+        AC_SUBST(UNIMRCP_SWIFT_LIBS)
+        AC_SUBST(UNIMRCP_SWIFT_LDFLAGS)
+        
+	AC_MSG_RESULT($swift_path)
+    else
+	AC_MSG_WARN([not found - looked for $swift_path])
+    fi
+
+    AM_CONDITIONAL([CEPSTRAL_PLUGIN], [test x_$found_swift = x_yes])
+])

Added: freeswitch/trunk/libs/unimrcp/build/get-version.sh
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/get-version.sh	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# extract version numbers from a header file
+#
+# USAGE: get-version.sh CMD VERSION_HEADER PREFIX
+#   where CMD is one of: all, major, libtool
+#   where PREFIX is the prefix to {MAJOR|MINOR|PATCH}_VERSION defines
+#
+#   get-version.sh all returns a dotted version number
+#   get-version.sh major returns just the major version number
+#   get-version.sh libtool returns a version "libtool -version-info" format
+#
+
+if test $# != 3; then
+  echo "USAGE: $0 CMD VERSION_HEADER PREFIX"
+  echo "  where CMD is one of: all, major, libtool"
+  exit 1
+fi
+
+major_sed="/#define.*$3_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
+minor_sed="/#define.*$3_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
+patch_sed="/#define.*$3_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
+major="`sed -n $major_sed $2`"
+minor="`sed -n $minor_sed $2`"
+patch="`sed -n $patch_sed $2`"
+
+if test "$1" = "all"; then
+  echo ${major}.${minor}.${patch}
+elif test "$1" = "major"; then
+  echo ${major}
+elif test "$1" = "libtool"; then
+  # Yes, ${minor}:${patch}:${minor} is correct due to libtool idiocy.
+  echo ${minor}:${patch}:${minor}
+else
+  echo "ERROR: unknown version CMD ($1)"
+  exit 1
+fi

Added: freeswitch/trunk/libs/unimrcp/build/pkgconfig/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/pkgconfig/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,4 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+pkgconfigdir           = $(libdir)/pkgconfig
+pkgconfig_DATA         = unimrcpclient.pc unimrcpserver.pc unimrcpplugin.pc

Added: freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpclient.pc.in
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpclient.pc.in	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@ @UNIMRCP_APR_INCLUDES@
+
+Name: unimrcpclient
+Description: UniMRCP Client Stack
+Requires: 
+Version: @UNI_DOTTED_VERSION@
+Libs: -L${libdir} -lunimrcpclient
+Cflags: @CPPFLAGS@ @CFLAGS@ -I${includedir}

Added: freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpplugin.pc.in
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpplugin.pc.in	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@ @UNIMRCP_APR_INCLUDES@
+
+Name: unimrcpplugin
+Description: UniMRCP Server Plugin
+Requires: 
+Version: @UNI_DOTTED_VERSION@
+Libs: -L${libdir} -lunimrcpserver
+Cflags: @CPPFLAGS@ @CFLAGS@ -I${includedir}

Added: freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpserver.pc.in
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/pkgconfig/unimrcpserver.pc.in	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@ @UNIMRCP_APR_INCLUDES@
+
+Name: unimrcpserver
+Description: UniMRCP Server Stack
+Requires: 
+Version: @UNI_DOTTED_VERSION@
+Libs: -L${libdir} -lunimrcpserver
+Cflags: @CPPFLAGS@ @CFLAGS@ -I${includedir}

Added: freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,69 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+	
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/tools/unimrcp_service.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/tools/unimrcp_service.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "apt.h"
+#include "apt_pool.h"
+
+#define WIN_SERVICE_NAME "unimrcp"
+
+
+/** Register/install service in SCM */
+static apt_bool_t uni_service_register(const char *root_dir_path, apr_pool_t *pool)
+{
+	char *bin_path;
+	SERVICE_DESCRIPTION desc;
+	SC_HANDLE sch_service;
+	SC_HANDLE sch_manager = OpenSCManager(0,0,SC_MANAGER_ALL_ACCESS);
+	if(!sch_manager) {
+		printf("Failed to Open SCManager %d\n", GetLastError());
+		return FALSE;
+	}
+
+	bin_path = apr_psprintf(pool,"%s\\bin\\unimrcpserver.exe --service --root-dir \"%s\" -o 2",
+					root_dir_path,
+					root_dir_path);
+	sch_service = CreateService(
+					sch_manager,
+					WIN_SERVICE_NAME,
+					"UniMRCP Server",
+					GENERIC_EXECUTE | SERVICE_CHANGE_CONFIG,
+					SERVICE_WIN32_OWN_PROCESS,
+					SERVICE_DEMAND_START,
+					SERVICE_ERROR_NORMAL,
+					bin_path,0,0,0,0,0);
+	if(!sch_service) {
+		printf("Failed to Create Service %d\n", GetLastError());
+		CloseServiceHandle(sch_manager);
+		return FALSE;
+	}
+
+	desc.lpDescription = "Launches UniMRCP Server";
+	if(!ChangeServiceConfig2(sch_service,SERVICE_CONFIG_DESCRIPTION,&desc)) {
+		printf("Failed to Set Service Description %d\n", GetLastError());
+	}
+
+	CloseServiceHandle(sch_service);
+	CloseServiceHandle(sch_manager);
+	return TRUE;
+}
+
+/** Unregister/uninstall service from SCM */
+static apt_bool_t uni_service_unregister()
+{
+	apt_bool_t status = TRUE;
+	SERVICE_STATUS ss_status;
+	SC_HANDLE sch_service;
+	SC_HANDLE sch_manager = OpenSCManager(0,0,SC_MANAGER_ALL_ACCESS);
+	if(!sch_manager) {
+		printf("Failed to Open SCManager %d\n", GetLastError());
+		return FALSE;
+	}
+
+	sch_service = OpenService(sch_manager,WIN_SERVICE_NAME,DELETE|SERVICE_STOP);
+	if(!sch_service) {
+		printf("Failed to Open Service %d\n", GetLastError());
+		CloseServiceHandle(sch_manager);
+		return FALSE;
+	}
+
+	ControlService(sch_service,SERVICE_CONTROL_STOP,&ss_status);
+	if(!DeleteService(sch_service)) {
+		printf("Failed to Delete Service %d\n", GetLastError());
+		status = FALSE;
+	}
+	CloseServiceHandle(sch_service);
+	CloseServiceHandle(sch_manager);
+	return status;
+}
+
+/** Start service */
+static apt_bool_t uni_service_start()
+{
+	apt_bool_t status = TRUE;
+	SC_HANDLE sch_service;
+	SC_HANDLE sch_manager = OpenSCManager(0,0,SC_MANAGER_ALL_ACCESS);
+	if(!sch_manager) {
+		printf("Failed to Open SCManager %d\n", GetLastError());
+		return FALSE;
+	}
+
+	sch_service = OpenService(sch_manager,WIN_SERVICE_NAME,SERVICE_START);
+	if(!sch_service) {
+		printf("Failed to Open Service %d\n", GetLastError());
+		CloseServiceHandle(sch_manager);
+		return FALSE;
+	}
+
+	if(!StartService(sch_service,0,NULL)) {
+		printf("Failed to Start Service %d\n", GetLastError());
+		status = FALSE;
+	}
+	CloseServiceHandle(sch_service);
+	CloseServiceHandle(sch_manager);
+	return status;
+}
+
+/** Stop service */
+static apt_bool_t uni_service_stop()
+{
+	apt_bool_t status = TRUE;
+	SERVICE_STATUS ss_status;
+	SC_HANDLE sch_service;
+	SC_HANDLE sch_manager = OpenSCManager(0,0,SC_MANAGER_ALL_ACCESS);
+	if(!sch_manager) {
+		printf("Failed to Open SCManager %d\n", GetLastError());
+		return FALSE;
+	}
+
+	sch_service = OpenService(sch_manager,WIN_SERVICE_NAME,SERVICE_STOP);
+	if(!sch_service) {
+		printf("Failed to Open Service %d\n", GetLastError());
+		CloseServiceHandle(sch_manager);
+		return FALSE;
+	}
+
+	if(!ControlService(sch_service,SERVICE_CONTROL_STOP,&ss_status)) {
+		printf("Failed to Stop Service %d\n", GetLastError());
+		status = FALSE;
+	}
+
+	CloseServiceHandle(sch_service);
+	CloseServiceHandle(sch_manager);
+	return status;
+}
+
+
+static void usage()
+{
+	printf(
+		"\n"
+		"Usage:\n"
+		"\n"
+		"  unimrcpservice [options]\n"
+		"\n"
+		"  Available options:\n"
+		"\n"
+		"   -r [--register] rootdir : Register the Windows service.\n"
+		"\n"
+		"   -u [--unregister]       : Unregister the Windows service.\n"
+		"\n"
+		"   -s [--start]            : Start the Windows service.\n"
+		"\n"
+		"   -t [--stop]             : Stop the Windows service.\n"
+		"\n"
+		"   -h [--help]             : Show the help.\n"
+		"\n");
+}
+
+int main(int argc, const char * const *argv)
+{
+	apr_pool_t *pool;
+	apr_status_t rv;
+	apr_getopt_t *opt;
+
+	static const apr_getopt_option_t opt_option[] = {
+		/* long-option, short-option, has-arg flag, description */
+		{ "register",   'r', TRUE,  "register service" },  /* -r or --register arg */
+		{ "unregister", 'u', FALSE, "unregister service" },/* -u or --unregister */
+		{ "start",      's', FALSE, "start service" },     /* -s or --start */
+		{ "stop",       't', FALSE, "stop service" },      /* -t or --stop */
+		{ "help",       'h', FALSE, "show help" },         /* -h or --help */
+		{ NULL, 0, 0, NULL },                               /* end */
+	};
+
+	/* APR global initialization */
+	if(apr_initialize() != APR_SUCCESS) {
+		apr_terminate();
+		return 0;
+	}
+
+	/* create APR pool */
+	pool = apt_pool_create();
+	if(!pool) {
+		apr_terminate();
+		return 0;
+	}
+
+	rv = apr_getopt_init(&opt, pool , argc, argv);
+	if(rv == APR_SUCCESS) {
+		int optch;
+		const char *optarg;
+		while((rv = apr_getopt_long(opt, opt_option, &optch, &optarg)) == APR_SUCCESS) {
+			switch(optch) {
+				case 'r':
+					uni_service_register(optarg,pool);
+					break;
+				case 'u':
+					uni_service_unregister();
+					break;
+				case 's':
+					uni_service_start();
+					break;
+				case 't':
+					uni_service_stop();
+					break;
+				case 'h':
+					usage();
+					break;
+			}
+		}
+		if(rv != APR_EOF) {
+			usage();
+		}
+	}
+
+	/* destroy APR pool */
+	apr_pool_destroy(pool);
+	/* APR global termination */
+	apr_terminate();
+	return 0;
+}

Added: freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.exe.manifest
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.exe.manifest	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,11 @@
+
+
+  
+  
+    
+      
+        
+      
+    
+  
+

Added: freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,159 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/uni_version.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/uni_version.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __UNI_VERSION_H__
+#define __UNI_VERSION_H__
+
+/**
+ * @file uni_version.h
+ * @brief UniMRCP Version Numbering
+ * 
+ * UniMRCP version numbering is derived from APR project specified in:
+ *
+ *     http://apr.apache.org/versioning.html
+ */
+
+#include 
+
+/** major version 
+ * Major API changes that could cause compatibility problems for older
+ * programs such as structure size changes.  No binary compatibility is
+ * possible across a change in the major version.
+ */
+#define UNI_MAJOR_VERSION   0
+
+/** minor version
+ * Minor API changes that do not cause binary compatibility problems.
+ * Reset to 0 when upgrading UNI_MAJOR_VERSION
+ */
+#define UNI_MINOR_VERSION   6
+
+/** patch level 
+ * The Patch Level never includes API changes, simply bug fixes.
+ * Reset to 0 when upgrading UNI_MINOR_VERSION
+ */
+#define UNI_PATCH_VERSION   0
+
+
+/**
+ * Check at compile time if the UNI version is at least a certain
+ * level.
+ */
+#define UNI_VERSION_AT_LEAST(major,minor,patch)                    \
+(((major) < UNI_MAJOR_VERSION)                                     \
+ || ((major) == UNI_MAJOR_VERSION && (minor) < UNI_MINOR_VERSION) \
+ || ((major) == UNI_MAJOR_VERSION && (minor) == UNI_MINOR_VERSION && (patch) <= UNI_PATCH_VERSION))
+
+/** The formatted string of UniMRCP's version */
+#define UNI_VERSION_STRING \
+     APR_STRINGIFY(UNI_MAJOR_VERSION) "." \
+     APR_STRINGIFY(UNI_MINOR_VERSION) "." \
+     APR_STRINGIFY(UNI_PATCH_VERSION)
+
+#endif /* __UNI_VERSION_H__ */

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,28 @@
+
+
+	
+	
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/apt.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/apt.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,17 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/cepstral.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/cepstral.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/mpf.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/mpf.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,17 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/mrcp.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/mrcp.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,17 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpclient.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpclient.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpengine.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpengine.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpserver.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpserver.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpsignaling.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpsignaling.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpv2transport.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/mrcpv2transport.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpclient.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpclient.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,12 @@
+
+
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpplugin.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpplugin.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,12 @@
+
+
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpsdk.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpsdk.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,21 @@
+
+
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpserver.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/sdk/unimrcpserver.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,12 @@
+
+
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/unibase.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unibase.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,24 @@
+
+
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/unidebug.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unidebug.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,24 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpclient.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpclient.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpplugin.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpplugin.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,17 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpserver.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpserver.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,20 @@
+
+
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/unirelease.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unirelease.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,15 @@
+
+
+	
+

Added: freeswitch/trunk/libs/unimrcp/build/vsprops/unirtsp.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unirtsp.vsprops	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,17 @@
+
+
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/conf/unimrcpclient.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/conf/unimrcpclient.xml	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,76 @@
+
+
+  
+  
+    
+    
+      
+      
+        
+        
+        
+        
+        
+        
+        
+        
+ 
+        
+        
+      
+      
+      
+        
+        
+        
+        
+        
+          
+          
+        
+      
+    
+
+    
+    
+      
+        
+        
+      
+    
+
+    
+    
+      
+      
+        
+        
+        
+        
+        
+        
+        
+        
+      
+    
+  
+
+  
+  
+    
+    
+      
+      
+      
+      
+    
+    
+    
+      
+      
+      
+    
+
+    
+  
+

Added: freeswitch/trunk/libs/unimrcp/conf/unimrcpserver.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/conf/unimrcpserver.xml	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,80 @@
+
+
+  
+  
+    
+    
+      
+        
+        
+        
+        
+        
+ 
+        
+        
+      
+      
+        
+        
+        
+        
+          
+          
+        
+      
+    
+
+    
+    
+      
+        
+        
+        
+        
+      
+    
+
+    
+    
+      
+      
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      
+    
+
+    
+    
+      
+      
+      
+    
+  
+
+  
+  
+    
+    
+      
+      
+      
+      
+    
+    
+    
+      
+      
+      
+    
+
+    
+  
+

Added: freeswitch/trunk/libs/unimrcp/configure.ac
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/configure.ac	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,149 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.57)
+
+AC_INIT([unimrcp],[0.6.0])
+
+AC_CONFIG_AUX_DIR([build])
+AC_CONFIG_MACRO_DIR([build/acmacros])
+AC_PREFIX_DEFAULT(/usr/local/unimrcp)
+
+plugindir='${prefix}/plugin'
+confdir='${prefix}/conf'
+logdir='${prefix}/log'
+datadir='${prefix}/data'
+
+AM_INIT_AUTOMAKE(foreign)
+
+#Set default language
+AC_LANG_C
+
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_INSTALL
+
+#skip detection of Fortran
+m4_undefine([AC_PROG_F77])
+m4_defun([AC_PROG_F77],[])
+AC_PROG_LIBTOOL
+
+# get version information
+get_version="build/get-version.sh"
+version_hdr="build/uni_version.h"
+plugin_version_hdr="libs/mrcp-engine/include/mrcp_resource_plugin.h"
+UNI_DOTTED_VERSION="`$get_version all $version_hdr UNI`"
+UNI_LT_VERSION="-version-info `$get_version libtool $version_hdr UNI`"
+PLUGIN_LT_VERSION="-version-info `$get_version libtool $plugin_version_hdr PLUGIN`"
+
+AC_SUBST(UNI_DOTTED_VERSION)
+AC_SUBST(UNI_LT_VERSION)
+AC_SUBST(PLUGIN_LT_VERSION)
+
+echo "UniMRCP Version: ${UNI_DOTTED_VERSION}"
+
+UNIMRCP_CHECK_APR
+UNIMRCP_CHECK_APU
+
+UNIMRCP_CHECK_SOFIA
+
+UNIMRCP_CHECK_SWIFT
+
+
+AC_SUBST(ac_aux_dir)
+AC_SUBST(ac_macro_dir)
+AC_SUBST(plugindir)
+AC_SUBST(confdir)
+AC_SUBST(logdir)
+
+AC_DEFUN([AX_COMPILER_VENDOR],
+[
+AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
+ [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
+  # note: don't check for gcc first since some other compilers define __GNUC__
+  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
+    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+#if !($vencpp)
+      thisisanerror;
+#endif
+])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
+  done
+ ])
+])
+
+AX_COMPILER_VENDOR
+
+
+AC_ARG_ENABLE(maintainer-mode,
+    [AC_HELP_STRING([--enable-maintainer-mode  ],[turn on debugging and compile time warnings])],
+    [enable_maintainer_mode="$enableval"],
+    [enable_maintainer_mode="no"])
+
+if test "${enable_maintainer_mode}" != "no"; then
+    CFLAGS="$CFLAGS -g"
+    if test "x${ax_cv_c_compiler_vendor}"  =  "xgnu" ; then
+      CFLAGS="$CFLAGS -Wall -Werror"
+    fi
+fi
+
+AC_ARG_ENABLE(test-suites,
+    [AC_HELP_STRING([--enable-test-suites  ],[build test suites])],
+    [enable_test_suites="$enableval"],
+    [enable_test_suites="no"])
+
+AM_CONDITIONAL([TEST_SUITES],[test "${enable_test_suites}" != "no"])
+
+AC_ARG_ENABLE(demosynth-plugin,
+    [AC_HELP_STRING([--disable-demosynth-plugin  ],[exclude demo synthesizer plugin from build])],
+    [enable_demosynth_plugin="$enableval"],
+    [enable_demosynth_plugin="yes"])
+
+AM_CONDITIONAL([DEMOSYNTH_PLUGIN],[test "${enable_demosynth_plugin}" = "yes"])
+
+AC_ARG_ENABLE(demorecog-plugin,
+    [AC_HELP_STRING([--disable-demorecog-plugin  ],[exclude demo recognizer plugin from build])],
+    [enable_demorecog_plugin="$enableval"],
+    [enable_demorecog_plugin="yes"])
+
+AM_CONDITIONAL([DEMORECOG_PLUGIN],[test "${enable_demorecog_plugin}" = "yes"])
+
+
+AC_CONFIG_FILES([
+  Makefile
+  libs/Makefile
+  libs/apr-toolkit/Makefile
+  libs/mpf/Makefile
+  libs/mrcp/Makefile
+  libs/mrcp-signaling/Makefile
+  libs/mrcpv2-transport/Makefile
+  libs/mrcp-engine/Makefile
+  libs/mrcp-server/Makefile
+  libs/mrcp-client/Makefile
+  libs/uni-rtsp/Makefile
+  modules/Makefile
+  modules/mrcp-sofiasip/Makefile
+  modules/mrcp-unirtsp/Makefile
+  plugins/Makefile
+  plugins/mrcp-cepstral/Makefile
+  plugins/demo-synth/Makefile
+  plugins/demo-recog/Makefile
+  platforms/Makefile
+  platforms/libunimrcp-server/Makefile
+  platforms/libunimrcp-client/Makefile
+  platforms/unimrcp-server/Makefile
+  platforms/unimrcp-client/Makefile
+  tests/Makefile
+  tests/apttest/Makefile
+  tests/mpftest/Makefile
+  tests/mrcptest/Makefile
+  tests/rtsptest/Makefile
+  tests/strtablegen/Makefile
+  build/Makefile
+  build/pkgconfig/Makefile
+  build/pkgconfig/unimrcpclient.pc
+  build/pkgconfig/unimrcpserver.pc
+  build/pkgconfig/unimrcpplugin.pc
+])
+
+AC_OUTPUT

Added: freeswitch/trunk/libs/unimrcp/data/demo.pcm
==============================================================================
Binary file. No diff available.

Added: freeswitch/trunk/libs/unimrcp/data/grammar.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/data/grammar.xml	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,10 @@
+
+
+  
+    
+      one
+      two
+      three
+    
+  
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/data/one.pcm
==============================================================================
Binary file. No diff available.

Added: freeswitch/trunk/libs/unimrcp/data/result.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/data/result.xml	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,7 @@
+
+ 
+  
+    one
+    one
+  
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/data/speak.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/data/speak.xml	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,6 @@
+
+
+  
+    Hello World.
+  
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/docs/doxygen.conf
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/docs/doxygen.conf	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,32 @@
+PROJECT_NAME="UniMRCP"
+
+INPUT=.
+QUIET=YES
+RECURSIVE=YES
+FILE_PATTERNS=*.h
+
+OUTPUT_DIRECTORY=docs/dox
+
+MACRO_EXPANSION=YES
+EXPAND_ONLY_PREDEF=YES
+
+PREDEFINED="APT_DECLARE(x)=x" \
+           "MPF_DECLARE(x)=x" \
+           "MRCP_DECLARE(x)=x" \
+           "RTSP_DECLARE(x)=x"
+
+OPTIMIZE_OUTPUT_FOR_C=YES
+STRIP_CODE_COMMENTS=NO
+
+FULL_PATH_NAMES=NO
+CASE_SENSE_NAMES=NO
+
+EXCLUDE_PATTERNS="*/acconfig.h" \
+                 "*/test/*" \
+                 "*/arch/*"
+
+GENERATE_HTML=YES
+GENERATE_LATEX=NO
+GENERATE_RTF=NO
+GENERATE_MAN=NO
+GENERATE_XML=NO

Added: freeswitch/trunk/libs/unimrcp/libs/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+SUBDIRS                = apr-toolkit mpf mrcp mrcp-signaling mrcpv2-transport mrcp-engine mrcp-server mrcp-client uni-rtsp

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,43 @@
+MAINTAINERCLEANFILES 	 = Makefile.in
+
+INCLUDES                 = -I$(top_srcdir)/libs/apr-toolkit/include \
+                           $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES       = libaprtoolkit.la
+
+include_HEADERS          = include/apt.h \
+                           include/apt_obj_list.h \
+                           include/apt_cyclic_queue.h \
+                           include/apt_task.h \
+                           include/apt_task_msg.h \
+                           include/apt_consumer_task.h \
+                           include/apt_net_server_task.h \
+                           include/apt_net_client_task.h \
+                           include/apt_pollset.h \
+                           include/apt_pool.h \
+                           include/apt_log.h \
+                           include/apt_pair.h \
+                           include/apt_string.h \
+                           include/apt_string_table.h \
+                           include/apt_text_stream.h \
+                           include/apt_net.h \
+                           include/apt_dir_layout.h \
+                           include/apt_test_suite.h
+
+libaprtoolkit_la_SOURCES = src/apt_obj_list.c \
+                           src/apt_cyclic_queue.c \
+                           src/apt_task.c \
+                           src/apt_task_msg.c \
+                           src/apt_consumer_task.c \
+                           src/apt_net_server_task.c \
+                           src/apt_net_client_task.c \
+                           src/apt_pollset.c \
+                           src/apt_pool.c \
+                           src/apt_log.c \
+                           src/apt_pair.c \
+                           src/apt_string_table.c \
+                           src/apt_text_stream.c \
+                           src/apt_net.c \
+                           src/apt_dir_layout.c \
+                           src/apt_test_suite.c
+                           

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,277 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_H__
+#define __APT_H__
+
+/**
+ * @file apt.h
+ * @brief APR Toolkit Definitions
+ */ 
+
+#include 
+#include 
+#include 
+
+#ifdef __cplusplus
+/** Begin of extern "C" block */
+#define APT_BEGIN_EXTERN_C       extern "C" {
+/** End of extern "C" block */
+#define APT_END_EXTERN_C         }
+#else
+/** Begin of extern "C" block */
+#define APT_BEGIN_EXTERN_C
+/** End of extern "C" block */
+#define APT_END_EXTERN_C
+#endif 
+
+/** Lib export/import defines (win32) */
+#ifdef WIN32
+#ifdef APT_STATIC_LIB
+#define APT_DECLARE(type)   type __stdcall
+#else
+#ifdef APT_LIB_EXPORT
+#define APT_DECLARE(type)   __declspec(dllexport) type __stdcall
+#else
+#define APT_DECLARE(type)   __declspec(dllimport) type __stdcall
+#endif
+#endif
+#else
+#define APT_DECLARE(type) type
+#endif
+
+/** Boolean value */
+typedef int apt_bool_t;
+
+#endif /*__APT_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_consumer_task.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_consumer_task.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_CONSUMER_TASK_H__
+#define __APT_CONSUMER_TASK_H__
+
+/**
+ * @file apt_consumer_task.h
+ * @brief Consumer Task Definition
+ */ 
+
+#include "apt_task.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque consumer task declaration */
+typedef struct apt_consumer_task_t apt_consumer_task_t;
+
+/**
+ * Create consumer task.
+ * @param obj the external object to associate with the task
+ * @param msg_pool the pool of task messages
+ * @param pool the pool to allocate memory from
+ */
+APT_DECLARE(apt_consumer_task_t*) apt_consumer_task_create(
+									void *obj,
+									apt_task_msg_pool_t *msg_pool,
+									apr_pool_t *pool);
+
+/**
+ * Get task base.
+ * @param task the consumer task to get base for
+ */
+APT_DECLARE(apt_task_t*) apt_consumer_task_base_get(apt_consumer_task_t *task);
+
+/**
+ * Get task vtable.
+ * @param task the consumer task to get vtable for
+ */
+APT_DECLARE(apt_task_vtable_t*) apt_consumer_task_vtable_get(apt_consumer_task_t *task);
+
+/**
+ * Get consumer task object.
+ * @param task the consumer task to get object from
+ */
+APT_DECLARE(void*) apt_consumer_task_object_get(apt_consumer_task_t *task);
+
+APT_END_EXTERN_C
+
+#endif /*__APT_CONSUMER_TASK_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_cyclic_queue.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_cyclic_queue.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_CYCLIC_QUEUE_H__
+#define __APT_CYCLIC_QUEUE_H__
+
+/**
+ * @file apt_cyclic_queue.h
+ * @brief Cyclic FIFO Queue of Opaque void* Objects
+ */ 
+
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+#define CYCLIC_QUEUE_DEFAULT_SIZE	100
+
+/** Opaque cyclic queue declaration */
+typedef struct apt_cyclic_queue_t apt_cyclic_queue_t;
+
+/**
+ * Create cyclic queue.
+ * @param size the initial size of the queue
+ * @return the created queue
+ */
+APT_DECLARE(apt_cyclic_queue_t*) apt_cyclic_queue_create(apr_size_t size);
+
+/**
+ * Destroy cyclic queue.
+ * @param queue the queue to destroy
+ */
+APT_DECLARE(void) apt_cyclic_queue_destroy(apt_cyclic_queue_t *queue);
+
+/**
+ * Push object to the queue.
+ * @param queue the queue to push object to
+ * @param obj the object to push
+ */
+APT_DECLARE(apt_bool_t) apt_cyclic_queue_push(apt_cyclic_queue_t *queue, void *obj);
+
+/**
+ * Pop object from the queue.
+ * @param queue the queue to pop message from
+ */
+APT_DECLARE(void*) apt_cyclic_queue_pop(apt_cyclic_queue_t *queue);
+
+/**
+ * Clear the queue (remove all the elements from the queue).
+ * @param queue the queue to clear
+ */
+APT_DECLARE(void) apt_cyclic_queue_clear(apt_cyclic_queue_t *queue);
+
+/**
+ * Query whether the queue is empty.
+ * @param queue the queue to query
+ * @return TRUE if empty, otherwise FALSE
+ */
+APT_DECLARE(apt_bool_t) apt_cyclic_queue_is_empty(apt_cyclic_queue_t *queue);
+
+
+APT_END_EXTERN_C
+
+#endif /*__APT_CYCLIC_QUEUE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_dir_layout.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_dir_layout.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_DIR_LAYOUT_H__
+#define __APT_DIR_LAYOUT_H__
+
+/**
+ * @file apt_dir_layout.h
+ * @brief Directory Layout
+ */ 
+
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Directory layout declaration */
+typedef struct apt_dir_layout_t apt_dir_layout_t;
+
+/** Directory layout */
+struct apt_dir_layout_t {
+	/** Path to config dir */
+	char *conf_dir_path;
+	/** Path to plugin dir */
+	char *plugin_dir_path;
+	/** Path to log dir */
+	char *log_dir_path;
+	/** Path to data dir */
+	char *data_dir_path;
+};
+
+/**
+ * Create (allocate) the structure of default directories layout.
+ */
+APT_DECLARE(apt_dir_layout_t*) apt_default_dir_layout_create(const char *root_dir_path, apr_pool_t *pool);
+
+/**
+ * Create (allocate) the structure of custom directories layout.
+ */
+APT_DECLARE(apt_dir_layout_t*) apt_custom_dir_layout_create(
+									const char *conf_dir_path,
+									const char *plugin_dir_path,
+									const char *log_dir_path,
+									const char *data_dir_path,
+									apr_pool_t *pool);
+
+/**
+ * Construct file path with the given file name relative to data dir.
+ */
+APT_DECLARE(char*) apt_datadir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__APT_DIR_LAYOUT_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_log.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_log.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_LOG_H__
+#define __APT_LOG_H__
+
+/**
+ * @file apt_log.h
+ * @brief Basic Logger
+ */ 
+
+#include 
+#include 
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Default max size of the log file (8Mb) */
+#define MAX_LOG_FILE_SIZE (8 * 1024 * 1024)
+/** Default max number of rotated log files */
+#define MAX_LOG_FILE_COUNT 10
+
+/** File:line mark */
+#define APT_LOG_MARK	__FILE__,__LINE__
+
+/** Format to log pointer values */
+#define APT_PTR_FMT       "0x%x"
+/** Format to log string identifiers */
+#define APT_SID_FMT       "<%s>"
+/** Format to log string identifiers and resources */
+#define APT_SIDRES_FMT    "<%s@%s>"
+/** Format to log pointers and identifiers */
+#define APT_PTRSID_FMT    APT_PTR_FMT" "APT_SID_FMT
+/** Format to log pointers, identifiers and resources */
+#define APT_PTRSIDRES_FMT APT_PTR_FMT" "APT_SIDRES_FMT
+
+
+/** Priority of log messages ordered from highest priority to lowest (rfc3164) */
+typedef enum {
+	APT_PRIO_EMERGENCY, /**< system is unusable */
+	APT_PRIO_ALERT,     /**< action must be taken immediately */
+	APT_PRIO_CRITICAL,  /**< critical condition */
+	APT_PRIO_ERROR,     /**< error condition */
+	APT_PRIO_WARNING,   /**< warning condition */
+	APT_PRIO_NOTICE,    /**< normal, but significant condition */
+	APT_PRIO_INFO,      /**< informational message */
+	APT_PRIO_DEBUG,     /**< debug-level message */
+
+	APT_PRIO_COUNT     	/**< number of priorities */
+} apt_log_priority_e;
+
+/** Header (format) of log messages */
+typedef enum {
+	APT_LOG_HEADER_NONE     = 0x00, /**< disable optional headers output */
+	APT_LOG_HEADER_DATE     = 0x01, /**< enable date output */
+	APT_LOG_HEADER_TIME     = 0x02, /**< enable time output */
+	APT_LOG_HEADER_PRIORITY = 0x04, /**< enable priority name output */
+	APT_LOG_HEADER_MARK     = 0x08, /**< enable file:line mark output */
+
+	APT_LOG_HEADER_DEFAULT  = APT_LOG_HEADER_DATE | APT_LOG_HEADER_TIME | APT_LOG_HEADER_PRIORITY
+} apt_log_header_e;
+
+/** Log output modes */
+typedef enum {
+	APT_LOG_OUTPUT_NONE     = 0x00, /**< disable logging */
+	APT_LOG_OUTPUT_CONSOLE  = 0x01, /**< enable console output */
+	APT_LOG_OUTPUT_FILE     = 0x02, /**< enable log file output */
+} apt_log_output_e;
+
+/** Opaque logger declaration */
+typedef struct apt_logger_t apt_logger_t;
+
+/** Prototype of extended log handler function */
+typedef apt_bool_t (*apt_log_ext_handler_f)(const char *file, int line, const char *id, 
+											apt_log_priority_e priority, const char *format, va_list arg_ptr);
+
+/**
+ * Create the singleton instance of the logger.
+ * @param mode the log output mode
+ * @param priority the log priority level
+ * @param pool the memory pool to use
+ */
+APT_DECLARE(apt_bool_t) apt_log_instance_create(apt_log_output_e mode, apt_log_priority_e priority, apr_pool_t *pool);
+
+/**
+ * Destroy the singleton instance of the logger.
+ */
+APT_DECLARE(apt_bool_t) apt_log_instance_destroy();
+
+/**
+ * Get the singleton instance of the logger.
+ */
+APT_DECLARE(apt_logger_t*) apt_log_instance_get();
+
+/**
+ * Set the singleton instance of the logger.
+ */
+APT_DECLARE(apt_bool_t) apt_log_instance_set(apt_logger_t *logger);
+
+/**
+ * Open the log file.
+ * @param dir_path the path to the log directory
+ * @param file_name the name of the log file
+ * @param max_file_size the max size of the log file
+ * @param max_file_count the max number of files used in log rotation
+ * @param pool the memory pool to use
+ */
+APT_DECLARE(apt_bool_t) apt_log_file_open(
+							const char *dir_path, 
+							const char *file_name, 
+							apr_size_t max_file_size, 
+							apr_size_t max_file_count, 
+							apr_pool_t *pool);
+
+/**
+ * Close the log file.
+ */
+APT_DECLARE(apt_bool_t) apt_log_file_close();
+
+/**
+ * Set the logging output.
+ * @param mode the mode to set
+ */
+APT_DECLARE(apt_bool_t) apt_log_output_mode_set(apt_log_output_e mode);
+
+/**
+ * Set the logging priority (log level).
+ * @param priority the priority to set
+ */
+APT_DECLARE(apt_bool_t) apt_log_priority_set(apt_log_priority_e priority);
+
+/**
+ * Set the header (format) for log messages.
+ * @param header the header to set (used as bitmask)
+ */
+APT_DECLARE(apt_bool_t) apt_log_header_set(int header);
+
+/**
+ * Set the extended external log handler.
+ * @param handler the handler to pass log events to
+ * @remark default logger is used to output the logs to stdout and/or log file,
+ *         if external log handler isn't set
+ */
+APT_DECLARE(apt_bool_t) apt_log_ext_handler_set(apt_log_ext_handler_f handler);
+
+/**
+ * Do logging.
+ * @param file the file name log entry is generated from
+ * @param line the line number log entry is generated from
+ * @param priority the priority of the entire log entry
+ * @param format the format of the entire log entry
+ */
+APT_DECLARE(apt_bool_t) apt_log(const char *file, int line, apt_log_priority_e priority, const char *format, ...);
+
+APT_END_EXTERN_C
+
+#endif /*__APT_LOG_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_NET_H__
+#define __APT_NET_H__
+
+/**
+ * @file apt_net.h
+ * @brief Network Utilities
+ */ 
+
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Get the IP address (in numeric address string format) by hostname.
+ * @param addr the IP address
+ * @param pool the pool to allocate memory from
+ */
+apt_bool_t apt_ip_get(char **addr, apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__APT_NET_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net_client_task.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net_client_task.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_NET_CLIENT_TASK_H__
+#define __APT_NET_CLIENT_TASK_H__
+
+/**
+ * @file apt_net_client_task.h
+ * @brief Network Client Task Base
+ */ 
+
+#include 
+#include "apt_task.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque network client task declaration */
+typedef struct apt_net_client_task_t apt_net_client_task_t;
+/** Network client connection declaration */
+typedef struct apt_net_client_connection_t apt_net_client_connection_t;
+/** Virtual table of network client events */
+typedef struct apt_net_client_vtable_t apt_net_client_vtable_t;
+
+/** Network client connection */
+struct apt_net_client_connection_t {
+	/** Memory pool */
+	apr_pool_t   *pool;
+	/** External object */
+	void         *obj;
+	/** Connected socket */
+	apr_socket_t *sock;
+	/** Socket poll descriptor */
+	apr_pollfd_t  sock_pfd;
+	/** String identifier used for traces */
+	const char   *id;
+};
+
+/** Virtual table of network client events */
+struct apt_net_client_vtable_t {
+	/** Message receive handler */
+	apt_bool_t (*on_receive)(apt_net_client_task_t *task, apt_net_client_connection_t *connection);
+};
+
+
+/**
+ * Create network client task.
+ * @param max_connection_count the number of max connections
+ * @param obj the external object
+ * @param client_vtable the table of virtual methods of the net client task
+ * @param msg_pool the pool of task messages
+ * @param pool the pool to allocate memory from
+ */
+APT_DECLARE(apt_net_client_task_t*) apt_net_client_task_create(
+										apr_size_t max_connection_count,
+										void *obj,
+										const apt_net_client_vtable_t *client_vtable,
+										apt_task_msg_pool_t *msg_pool,
+										apr_pool_t *pool);
+
+/**
+ * Destroy network client task.
+ * @param task the task to destroy
+ */
+APT_DECLARE(apt_bool_t) apt_net_client_task_destroy(apt_net_client_task_t *task);
+
+/**
+ * Start network client task and wait for incoming requests.
+ * @param task the task to start
+ */
+APT_DECLARE(apt_bool_t) apt_net_client_task_start(apt_net_client_task_t *task);
+
+/**
+ * Terminate connection task.
+ * @param task the task to terminate
+ */
+APT_DECLARE(apt_bool_t) apt_net_client_task_terminate(apt_net_client_task_t *task);
+
+/**
+ * Get task base.
+ * @param task the network client task to get task base from
+ */
+APT_DECLARE(apt_task_t*) apt_net_client_task_base_get(apt_net_client_task_t *task);
+
+/**
+ * Get task vtable.
+ * @param task the network client task to get vtable from
+ */
+APT_DECLARE(apt_task_vtable_t*) apt_net_client_task_vtable_get(apt_net_client_task_t *task);
+
+/**
+ * Get external object.
+ * @param task the task to get object from
+ */
+APT_DECLARE(void*) apt_net_client_task_object_get(apt_net_client_task_t *task);
+
+/**
+ * Create connection.
+ */
+APT_DECLARE(apt_net_client_connection_t*) apt_net_client_connect(apt_net_client_task_t *task, const char *ip, apr_port_t port);
+
+/**
+ * Close connection.
+ */
+APT_DECLARE(apt_bool_t) apt_net_client_connection_close(apt_net_client_task_t *task, apt_net_client_connection_t *connection);
+
+/**
+ * Close and destroy connection.
+ */
+APT_DECLARE(apt_bool_t) apt_net_client_disconnect(apt_net_client_task_t *task, apt_net_client_connection_t *connection);
+
+
+APT_END_EXTERN_C
+
+#endif /*__APT_NET_CLIENT_TASK_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net_server_task.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_net_server_task.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_NET_SERVER_TASK_H__
+#define __APT_NET_SERVER_TASK_H__
+
+/**
+ * @file apt_net_server_task.h
+ * @brief Network Server Task Base
+ */ 
+
+#include 
+#include "apt_task.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque network server task declaration */
+typedef struct apt_net_server_task_t apt_net_server_task_t;
+/** Network server connection declaration */
+typedef struct apt_net_server_connection_t apt_net_server_connection_t;
+/** Virtual table of network server events */
+typedef struct apt_net_server_vtable_t apt_net_server_vtable_t;
+
+/** Network server connection */
+struct apt_net_server_connection_t {
+	/** Memory pool */
+	apr_pool_t   *pool;
+	/** External object */
+	void         *obj;
+	/** Client IP address */
+	char         *client_ip;
+	/** Accepted socket */
+	apr_socket_t *sock;
+	/** Socket poll descriptor */
+	apr_pollfd_t  sock_pfd;
+	/** String identifier used for traces */
+	const char   *id;
+};
+
+/** Virtual table of network server events */
+struct apt_net_server_vtable_t {
+	/** Connect event handler */
+	apt_bool_t (*on_connect)(apt_net_server_task_t *task, apt_net_server_connection_t *connection);
+	/** Disconnect event handler */
+	apt_bool_t (*on_disconnect)(apt_net_server_task_t *task, apt_net_server_connection_t *connection);
+	/** Message receive handler */
+	apt_bool_t (*on_receive)(apt_net_server_task_t *task, apt_net_server_connection_t *connection);
+};
+
+
+/**
+ * Create network server task.
+ * @param listen_ip the listen IP address
+ * @param listen_port the listen port
+ * @param max_connection_count the number of max connections to accept
+ * @param obj the external object
+ * @param server_vtable the table of virtual methods of the net server task
+ * @param msg_pool the pool of task messages
+ * @param pool the pool to allocate memory from
+ */
+APT_DECLARE(apt_net_server_task_t*) apt_net_server_task_create(
+										const char *listen_ip, 
+										apr_port_t listen_port, 
+										apr_size_t max_connection_count,
+										void *obj,
+										const apt_net_server_vtable_t *server_vtable,
+										apt_task_msg_pool_t *msg_pool,
+										apr_pool_t *pool);
+
+/**
+ * Destroy network server task.
+ * @param task the task to destroy
+ */
+APT_DECLARE(apt_bool_t) apt_net_server_task_destroy(apt_net_server_task_t *task);
+
+/**
+ * Start network server task and wait for incoming requests.
+ * @param task the task to start
+ */
+APT_DECLARE(apt_bool_t) apt_net_server_task_start(apt_net_server_task_t *task);
+
+/**
+ * Terminate connection task.
+ * @param task the task to terminate
+ */
+APT_DECLARE(apt_bool_t) apt_net_server_task_terminate(apt_net_server_task_t *task);
+
+/**
+ * Get task base.
+ * @param task the network server task to get task base from
+ */
+APT_DECLARE(apt_task_t*) apt_net_server_task_base_get(apt_net_server_task_t *task);
+
+/**
+ * Get task vtable.
+ * @param task the network server task to get vtable from
+ */
+APT_DECLARE(apt_task_vtable_t*) apt_net_server_task_vtable_get(apt_net_server_task_t *task);
+
+/**
+ * Get external object.
+ * @param task the task to get object from
+ */
+APT_DECLARE(void*) apt_net_server_task_object_get(apt_net_server_task_t *task);
+
+/**
+ * Close connection.
+ */
+APT_DECLARE(apt_bool_t) apt_net_server_connection_close(apt_net_server_task_t *task, apt_net_server_connection_t *connection);
+
+/**
+ * Destroy connection.
+ */
+APT_DECLARE(void) apt_net_server_connection_destroy(apt_net_server_connection_t *connection);
+
+
+APT_END_EXTERN_C
+
+#endif /*__APT_NET_SERVER_TASK_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_obj_list.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_obj_list.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_OBJ_LIST_H__
+#define __APT_OBJ_LIST_H__
+
+/**
+ * @file apt_obj_list.h
+ * @brief List of Opaque void* Objects
+ */ 
+
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+
+/** Opaque list declaration */
+typedef struct apt_obj_list_t apt_obj_list_t;
+/** Opaque list element declaration */
+typedef struct apt_list_elem_t apt_list_elem_t;
+
+/**
+ * Create list.
+ * @param pool the pool to allocate list from
+ * @return the created list
+ */
+APT_DECLARE(apt_obj_list_t*) apt_list_create(apr_pool_t *pool);
+
+/**
+ * Destroy list.
+ * @param list the list to destroy
+ */
+APT_DECLARE(void) apt_list_destroy(apt_obj_list_t *list);
+
+/**
+ * Push object to the list as first in, first out.
+ * @param list the list to push object to
+ * @param obj the object to push
+ * @param pool the pool to allocate list element from
+ * @return the inserted element
+ */
+APT_DECLARE(apt_list_elem_t*) apt_list_push_back(apt_obj_list_t *list, void *obj, apr_pool_t *pool);
+
+/**
+ * Pop object from the list as first in, first out.
+ * @param list the list to pop message from
+ * @return the popped object (if any)
+ */
+APT_DECLARE(void*) apt_list_pop_front(apt_obj_list_t *list);
+
+/**
+ * Retrieve object of the first element in the list.
+ * @param list the list to retrieve from
+ */
+APT_DECLARE(void*) apt_list_head(apt_obj_list_t *list);
+
+/**
+ * Retrieve object of the last element in the list.
+ * @param list the list to retrieve from
+ */
+APT_DECLARE(void*) apt_obj_list_tail(apt_obj_list_t *list);
+
+
+/**
+ * Retrieve the first element of the list.
+ * @param list the list to retrieve from
+ */
+APT_DECLARE(apt_list_elem_t*) apt_list_first_elem_get(apt_obj_list_t *list);
+
+/**
+ * Retrieve the last element of the list.
+ * @param list the list to retrieve from
+ */
+APT_DECLARE(apt_list_elem_t*) apt_list_last_elem_get(apt_obj_list_t *list);
+
+/**
+ * Retrieve the next element of the list.
+ * @param list the list to retrieve from
+ * @param elem the element to retrieve next element from
+ */
+APT_DECLARE(apt_list_elem_t*) apt_list_next_elem_get(apt_obj_list_t *list, apt_list_elem_t *elem);
+
+/**
+ * Retrieve the prev element of the list.
+ * @param list the list to retrieve from
+ * @param elem the element to retrieve prev element from
+ */
+APT_DECLARE(apt_list_elem_t*) apt_list_prev_elem_get(apt_obj_list_t *list, apt_list_elem_t *elem);
+
+/**
+ * Insert element to the list.
+ * @param list the list to insert element to
+ * @param elem the element to insert before
+ * @param obj the object to insert
+ * @param pool the pool to allocate list element from
+ * @return the inserted element
+ */
+APT_DECLARE(apt_list_elem_t*) apt_list_elem_insert(apt_obj_list_t *list, apt_list_elem_t *elem, void *obj, apr_pool_t *pool);
+
+/**
+ * Remove element from the list.
+ * @param list the list to remove element from
+ * @param elem the element to remove
+ * @return the next element (if any)
+ */
+APT_DECLARE(apt_list_elem_t*) apt_list_elem_remove(apt_obj_list_t *list, apt_list_elem_t *elem);
+
+/**
+ * Query whether the list is empty.
+ * @param list the list to query
+ * @return TRUE if empty, otherwise FALSE
+ */
+APT_DECLARE(apt_bool_t) apt_list_is_empty(apt_obj_list_t *list);
+
+/**
+ * Retrieve the object associated with element.
+ * @param elem the element to retrieve object from
+ */
+APT_DECLARE(void*) apt_list_elem_object_get(apt_list_elem_t *elem);
+
+
+APT_END_EXTERN_C
+
+#endif /*__APT_OBJ_LIST_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pair.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pair.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_PAIR_H__
+#define __APT_PAIR_H__
+
+/**
+ * @file apt_pair.h
+ * @brief Generic Name-Value Pair
+ */ 
+
+#include "apr_tables.h"
+#include "apt_string.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Name-value declaration */
+typedef struct apt_pair_t apt_pair_t;
+
+/** Generic name-value pair definition ("name:value") */
+struct apt_pair_t {
+	/** The name */
+	apt_str_t name;
+	/** The value */
+	apt_str_t value;
+};
+
+/** Dynamic array of name-value pairs */
+typedef apr_array_header_t apt_pair_arr_t;
+
+/** Initialize name-value pair */
+static APR_INLINE void apt_pair_init(apt_pair_t *pair)
+{
+	apt_string_reset(&pair->name);
+	apt_string_reset(&pair->value);
+}
+
+/** Copy name-value pair */
+static APR_INLINE void apt_pair_copy(apt_pair_t *pair, const apt_pair_t *src_pair, apr_pool_t *pool)
+{
+	apt_string_copy(&pair->name,&src_pair->name,pool);
+	apt_string_copy(&pair->value,&src_pair->value,pool);
+}
+
+/** Create array of name-value pairs */
+APT_DECLARE(apt_pair_arr_t*) apt_pair_array_create(apr_size_t initial_size, apr_pool_t *pool);
+/** Copy array of name-value pairs */
+APT_DECLARE(apt_pair_arr_t*) apt_pair_array_copy(const apt_pair_arr_t *src, apr_pool_t *pool);
+/** Append name-value pair */
+APT_DECLARE(apt_bool_t) apt_pair_array_append(apt_pair_arr_t *arr, const apt_str_t *name, const apt_str_t *value, apr_pool_t *pool);
+/** Find name-value pair by name */
+APT_DECLARE(const apt_pair_t*) apt_pair_array_find(const apt_pair_arr_t *arr, const apt_str_t *name);
+/** Get size of pair array */
+APT_DECLARE(int) apt_pair_array_size_get(const apt_pair_arr_t *arr);
+/** Get name-value pair by id */
+APT_DECLARE(const apt_pair_t*) apt_pair_array_get(const apt_pair_arr_t *arr, int id);
+
+APT_END_EXTERN_C
+
+#endif /*__APT_PAIR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pollset.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pollset.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_POLLSET_H__
+#define __APT_POLLSET_H__
+
+/**
+ * @file apt_pollset.h
+ * @brief Interruptable APR-Pollset
+ */ 
+
+/**
+ * Wakeup builtin API of the pollset is introduced only in APR-1.4
+ * and it is not available for APR-1.2 and APR-1.3 versions. Thus
+ * apt_pollset_t is an extension of apr_pollset_t and provides
+ * pollset wakeup capabilities the similar way as it's implemented
+ * in APR-1.4 trunk
+ */
+
+#include 
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque pollset declaration */
+typedef struct apt_pollset_t apt_pollset_t;
+
+/**
+ * Create interruptable pollset on top of APR pollset
+ * @param size the maximum number of descriptors pollset can hold
+ * @param pool the pool to allocate memory from
+ */
+APT_DECLARE(apt_pollset_t*) apt_pollset_create(apr_uint32_t size, apr_pool_t *pool);
+
+/**
+ * Destroy pollset.
+ * @param pollset the pollset to destroy
+ */
+APT_DECLARE(apt_bool_t) apt_pollset_destroy(apt_pollset_t *pollset);
+
+/**
+ * Add pollset descriptor to a pollset.
+ * @param pollset the pollset to add the descriptor to
+ * @param descriptor the descriptor to add
+ */
+APT_DECLARE(apt_bool_t) apt_pollset_add(apt_pollset_t *pollset, const apr_pollfd_t *descriptor);
+
+/**
+ * Remove pollset descriptor from a pollset.
+ * @param pollset the pollset to remove the descriptor from
+ * @param descriptor the descriptor to remove
+ */
+APT_DECLARE(apt_bool_t) apt_pollset_remove(apt_pollset_t *pollset, const apr_pollfd_t *descriptor);
+
+/**
+ * Block for activity on the descriptor(s) in a pollset.
+ * @param pollset the pollset to use
+ * @param timeout the timeout in microseconds
+ * @param num nthe umber of signalled descriptors (output parameter)
+ * @param descriptors the array of signalled descriptors (output parameter)
+ */
+APT_DECLARE(apr_status_t) apt_pollset_poll(
+								apt_pollset_t *pollset,
+								apr_interval_time_t timeout,
+								apr_int32_t *num,
+								const apr_pollfd_t **descriptors);
+
+/**
+ * Interrupt the blocked poll call.
+ * @param pollset the pollset to use
+ */
+APT_DECLARE(apt_bool_t) apt_pollset_wakeup(apt_pollset_t *pollset);
+
+/**
+ * Match against builtin wake up descriptor in a pollset.
+ * @param pollset the pollset to use
+ * @param descriptor the descriptor to match
+ */
+APT_DECLARE(apt_bool_t) apt_pollset_is_wakeup(apt_pollset_t *pollset, const apr_pollfd_t *descriptor);
+
+APT_END_EXTERN_C
+
+#endif /*__APT_POLLSET_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pool.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_pool.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_POOL_H__
+#define __APT_POOL_H__
+
+/**
+ * @file apt_pool.h
+ * @brief APR pool management
+ */ 
+
+/**
+ * Wrappers around APR pool creation 
+ * allow to control memory allocation policy project uses
+ */
+
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create APR pool
+ */
+APT_DECLARE(apr_pool_t*) apt_pool_create();
+
+/**
+ * Create APR subpool pool
+ * @param parent the parent pool
+ */
+APT_DECLARE(apr_pool_t*) apt_subpool_create(apr_pool_t *parent);
+
+APT_END_EXTERN_C
+
+#endif /*__APT_POOL_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_string.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_string.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_STRING_H__
+#define __APT_STRING_H__
+
+/**
+ * @file apt_string.h
+ * @brief String Representation
+ */ 
+
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+/** String declaration */
+typedef struct apt_str_t apt_str_t;
+
+/** String representation */
+struct apt_str_t {
+	/** String buffer (might be not NULL terminated) */
+	char *buf;
+	/** Length of the string (not counting terminating NULL character if exists) */
+	apr_size_t  length;
+}; 
+
+/** Reset string. */
+static APR_INLINE void apt_string_reset(apt_str_t *str)
+{
+	str->buf = NULL;
+	str->length = 0;
+}
+
+/**
+ * Set NULL terminated string. 
+ * @param str the destination string
+ * @param src the NULL terminated string to set
+ */
+static APR_INLINE void apt_string_set(apt_str_t *str, const char *src)
+{
+	str->buf = (char*)src;
+	str->length = src ? strlen(src) : 0;
+}
+
+/**
+ * Assign (copy) NULL terminated string. 
+ * @param str the destination string
+ * @param src the NULL terminated string to copy
+ * @param pool the pool to allocate memory from
+ */
+static APR_INLINE void apt_string_assign(apt_str_t *str, const char *src, apr_pool_t *pool)
+{
+	str->buf = NULL;
+	str->length = src ? strlen(src) : 0;
+	if(str->length) {
+		str->buf = apr_pstrmemdup(pool,src,str->length);
+	}
+}
+
+/**
+ * Assign (copy) n characters from the src string. 
+ * @param str the destination string
+ * @param src the NULL terminated string to copy
+ * @param pool the pool to allocate memory from
+ */
+static APR_INLINE void apt_string_assign_n(apt_str_t *str, const char *src, apr_size_t length, apr_pool_t *pool)
+{
+	str->buf = NULL;
+	str->length = length;
+	if(str->length) {
+		str->buf = apr_pstrmemdup(pool,src,str->length);
+	}
+}
+
+/**
+ * Copy string. 
+ * @param dest_str the destination string
+ * @param src_str the source string
+ * @param pool the pool to allocate memory from
+ */
+static APR_INLINE void apt_string_copy(apt_str_t *str, const apt_str_t *src_str, apr_pool_t *pool)
+{
+	str->buf = NULL;
+	str->length = src_str->length;
+	if(str->length) {
+		str->buf = apr_pstrmemdup(pool,src_str->buf,src_str->length);
+	}
+}
+
+/**
+ * Compare two strings (case insensitive). 
+ * @param str1 the string to compare
+ * @param str2 the string to compare
+ * @return TRUE if equal, FALSE otherwise
+ */
+static APR_INLINE apt_bool_t apt_string_compare(const apt_str_t *str1, const apt_str_t *str2)
+{
+	if(str1->length != str2->length || !str1->length) {
+		return FALSE;
+	}
+	return (strncasecmp(str1->buf,str2->buf,str1->length) == 0) ? TRUE : FALSE;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__APT_STRING_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_string_table.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_string_table.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_STRING_TABLE_H__
+#define __APT_STRING_TABLE_H__
+
+/**
+ * @file apt_string_table.h
+ * @brief Generic String Table
+ */ 
+
+#include "apt_string.h"
+
+APT_BEGIN_EXTERN_C
+
+
+/** String table item declaration */
+typedef struct apt_str_table_item_t apt_str_table_item_t;
+
+/** String table item definition */
+struct apt_str_table_item_t {
+	/** String value associated with id */
+	apt_str_t  value;
+	/** Index of the unique (key) character to compare */
+	apr_size_t key;
+};
+
+
+/**
+ * Get the string by a given id.
+ * @param table the table to get string from
+ * @param size the size of the table
+ * @param id the id to get string by
+ * @return the string associated with the id, or NULL if the id is invalid
+ */
+APT_DECLARE(const apt_str_t*) apt_string_table_str_get(const apt_str_table_item_t table[], apr_size_t size, apr_size_t id);
+
+/**
+ * Find the id associated with a given string.
+ * @param table the table to search for the id
+ * @param size the size of the table
+ * @param value the string to search for
+ * @return the id associated with the string, or invalid id if string cannot be matched
+ */
+APT_DECLARE(apr_size_t) apt_string_table_id_find(const apt_str_table_item_t table[], apr_size_t size, const apt_str_t *value);
+
+
+APT_END_EXTERN_C
+
+#endif /*__APT_STRING_TABLE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_task.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_task.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_TASK_H__
+#define __APT_TASK_H__
+
+/**
+ * @file apt_task.h
+ * @brief Thread Execution Abstraction
+ */ 
+
+#include "apt.h"
+#include "apt_task_msg.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque task declaration */
+typedef struct apt_task_t apt_task_t;
+/** Opaque task virtual table declaration */
+typedef struct apt_task_vtable_t apt_task_vtable_t;
+/** Opaque task method declaration */
+typedef apt_bool_t (*apt_task_method_f)(apt_task_t *task);
+/** Opaque task event declaration */
+typedef void (*apt_task_event_f)(apt_task_t *task);
+
+
+/**
+ * Create task.
+ * @param obj the external object to associate with the task
+ * @param msg_pool the pool of task messages
+ * @param pool the pool to allocate memory from
+ */
+APT_DECLARE(apt_task_t*) apt_task_create(
+								void *obj,
+								apt_task_msg_pool_t *msg_pool,
+								apr_pool_t *pool);
+
+/**
+ * Destroy task.
+ * @param task the task to destroy
+ */
+APT_DECLARE(apt_bool_t) apt_task_destroy(apt_task_t *task);
+
+/**
+ * Add slave task.
+ * @param task the task to add slave task to
+ * @param child_task the child task to add
+ */
+APT_DECLARE(apt_bool_t) apt_task_add(apt_task_t *task, apt_task_t *child_task);
+
+/**
+ * Start task.
+ * @param task the task to start
+ */
+APT_DECLARE(apt_bool_t) apt_task_start(apt_task_t *task);
+
+/**
+ * Terminate task.
+ * @param task the task to terminate
+ * @param wait_till_complete whether to wait for task to complete or
+ *                           process termination asynchronously
+ */
+APT_DECLARE(apt_bool_t) apt_task_terminate(apt_task_t *task, apt_bool_t wait_till_complete);
+
+/**
+ * Start child tasks.
+ * @param task the parent task
+ */
+APT_DECLARE(apt_bool_t) apt_task_child_start(apt_task_t *task);
+
+/**
+ * Terminate child tasks.
+ * @param task the parent task
+ */
+APT_DECLARE(apt_bool_t) apt_task_child_terminate(apt_task_t *task);
+
+/**
+ * Wait for task till complete.
+ * @param task the task to wait for
+ */
+APT_DECLARE(apt_bool_t) apt_task_wait_till_complete(apt_task_t *task);
+
+/**
+ * Get (acquire) task message.
+ * @param task the task to get task message from
+ */
+APT_DECLARE(apt_task_msg_t*) apt_task_msg_get(apt_task_t *task);
+
+/**
+ * Signal (post) message to the task.
+ * @param task the task to signal message to
+ * @param msg the message to signal
+ */
+APT_DECLARE(apt_bool_t) apt_task_msg_signal(apt_task_t *task, apt_task_msg_t *msg);
+
+/**
+ * Signal (post) message to the parent of the specified task.
+ * @param task the task to signal message to
+ * @param msg the message to signal
+ */
+APT_DECLARE(apt_bool_t) apt_task_msg_parent_signal(apt_task_t *task, apt_task_msg_t *msg);
+
+/**
+ * Process message signaled to the task.
+ * @param task the task to process message
+ * @param msg the message to process
+ */
+APT_DECLARE(apt_bool_t) apt_task_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+
+/**
+ * Get parent (master) task.
+ * @param task the task to get parent from
+ */
+APT_DECLARE(apt_task_t*) apt_task_parent_get(apt_task_t *task);
+
+/**
+ * Get memory pool associated with task.
+ * @param task the task to get pool from
+ */
+APT_DECLARE(apr_pool_t*) apt_task_pool_get(apt_task_t *task);
+
+/**
+ * Get external object associated with the task.
+ * @param task the task to get object from
+ */
+APT_DECLARE(void*) apt_task_object_get(apt_task_t *task);
+
+/**
+ * Get task vtable.
+ * @param task the task to get vtable from
+ */
+APT_DECLARE(apt_task_vtable_t*) apt_task_vtable_get(apt_task_t *task);
+
+/**
+ * Give a name to the task.
+ * @param task the task to give name for
+ * @param name the name to set
+ */
+APT_DECLARE(void) apt_task_name_set(apt_task_t *task, const char *name);
+
+/**
+ * Get task name.
+ * @param task the task to get name from
+ */
+APT_DECLARE(const char*) apt_task_name_get(apt_task_t *task);
+
+/**
+ * Hold task execution.
+ * @param msec the time to hold
+ */
+APT_DECLARE(void) apt_task_delay(apr_size_t msec);
+
+
+/** Table of task virtual methods */
+struct apt_task_vtable_t {
+	/** Virtual destroy method */
+	apt_task_method_f destroy;
+	/** Virtual start method*/
+	apt_task_method_f start;
+	/** Virtual terminate method */
+	apt_task_method_f terminate;
+	/** Virtual run method*/
+	apt_task_method_f run;
+
+	/** Virtual signal method  */
+	apt_bool_t (*signal_msg)(apt_task_t *task, apt_task_msg_t *msg);
+	/** Virtual process method */
+	apt_bool_t (*process_msg)(apt_task_t *task, apt_task_msg_t *msg);
+
+	/** Virtual pre-run event handler */
+	apt_task_event_f on_pre_run;
+	/** Virtual post-run event handler */
+	apt_task_event_f on_post_run;
+	/** Virtual start-complete event handler */
+	apt_task_event_f on_start_complete;
+	/** Virtual terminate-complete event handler */
+	apt_task_event_f on_terminate_complete;
+};
+
+static APR_INLINE void apt_task_vtable_reset(apt_task_vtable_t *vtable)
+{
+	vtable->destroy = NULL;
+	vtable->start = NULL;
+	vtable->terminate = NULL;
+	vtable->run = NULL;
+	vtable->signal_msg = NULL;
+	vtable->process_msg = NULL;
+	vtable->on_pre_run = NULL;
+	vtable->on_post_run = NULL;
+	vtable->on_start_complete = NULL;
+	vtable->on_terminate_complete = NULL;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__APT_TASK_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_task_msg.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_task_msg.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_TASK_MSG_H__
+#define __APT_TASK_MSG_H__
+
+/**
+ * @file apt_task_msg.h
+ * @brief Task Message Base Definition
+ */ 
+
+#include "apt.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Enumeration of task message types */
+typedef enum {
+	TASK_MSG_CORE,                   /**< core task message type */
+	TASK_MSG_USER                    /**< user defined task messages start from here */
+} apt_task_msg_type_e;
+
+/** Enumeration of core task messages */
+typedef enum {
+	CORE_TASK_MSG_NONE,              /**< indefinite message */
+	CORE_TASK_MSG_START_COMPLETE,    /**< start-complete message */
+	CORE_TASK_MSG_TERMINATE_REQUEST, /**< terminate-request message */
+	CORE_TASK_MSG_TERMINATE_COMPLETE /**< terminate-complete message */
+} apt_core_task_msg_type_e;
+
+/** Opaque task message declaration */
+typedef struct apt_task_msg_t apt_task_msg_t;
+/** Opaque task message pool declaration */
+typedef struct apt_task_msg_pool_t apt_task_msg_pool_t;
+
+/** Task message is used for inter task communication */
+struct apt_task_msg_t {
+	/** Message pool the task message is allocated from */
+	apt_task_msg_pool_t *msg_pool;
+	/** Task msg type */
+	apt_task_msg_type_e  type;
+	/** Task msg sub type */
+	int                  sub_type;
+	/** Context specific data */
+	char                 data[1];
+};
+
+
+/** Create pool of task messages with dynamic allocation of messages (no actual pool is created) */
+APT_DECLARE(apt_task_msg_pool_t*) apt_task_msg_pool_create_dynamic(apr_size_t msg_size, apr_pool_t *pool);
+
+/** Create pool of task messages with static allocation of messages */
+APT_DECLARE(apt_task_msg_pool_t*) apt_task_msg_pool_create_static(apr_size_t msg_size, apr_size_t msg_pool_size, apr_pool_t *pool);
+
+/** Destroy pool of task messages */
+APT_DECLARE(void) apt_task_msg_pool_destroy(apt_task_msg_pool_t *msg_pool);
+
+
+/** Acquire task message from task message pool */
+APT_DECLARE(apt_task_msg_t*) apt_task_msg_acquire(apt_task_msg_pool_t *task_msg_pool);
+
+/** Realese task message */
+APT_DECLARE(void) apt_task_msg_release(apt_task_msg_t *task_msg);
+
+
+APT_END_EXTERN_C
+
+#endif /*__APT_TASK_MSG_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_test_suite.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_test_suite.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_TEST_SUITE_H__
+#define __APT_TEST_SUITE_H__
+
+/**
+ * @file apt_test_suite.h
+ * @brief Test Suite and Framework Definitions
+ */ 
+
+#include "apt_string.h"
+
+APT_BEGIN_EXTERN_C
+
+
+/** Opaque test suite declaration */
+typedef struct apt_test_suite_t apt_test_suite_t;
+
+/** Prototype of test function */
+typedef apt_bool_t (*apt_test_f)(apt_test_suite_t *suite, int argc, const char * const *argv);
+
+/** Test suite as a base for all kind of tests */
+struct apt_test_suite_t {
+	/** Memory pool to allocate memory from */
+	apr_pool_t *pool;
+	/** Unique name of the test suite */
+	apt_str_t   name;
+	/** External object associated with the test suite */
+	void       *obj;
+	/** Test function to execute */
+	apt_test_f  tester;
+};
+
+/**
+ * Create test suite.
+ * @param pool the pool to allocate memory from
+ * @param name the unique name of the test suite
+ * @param obj the external object associated with the test suite
+ * @param tester the test function to execute
+ */
+APT_DECLARE(apt_test_suite_t*) apt_test_suite_create(apr_pool_t *pool, const char *name, 
+                                                     void *obj, apt_test_f tester);
+
+
+
+
+
+/** Opaque test framework declaration */
+typedef struct apt_test_framework_t apt_test_framework_t;
+
+/**
+ * Create test framework.
+ */
+APT_DECLARE(apt_test_framework_t*) apt_test_framework_create();
+
+/**
+ * Destroy test framework.
+ * @param framework the test framework to destroy
+ */
+APT_DECLARE(void) apt_test_framework_destroy(apt_test_framework_t *framework);
+
+/**
+ * Add test suite to framework.
+ * @param framework the test framework to add test suite to
+ * @param suite the test suite to add
+ */
+APT_DECLARE(apt_bool_t) apt_test_framework_suite_add(apt_test_framework_t *framework, apt_test_suite_t *suite);
+
+/**
+ * Run test suites.
+ * @param framework the test framework
+ * @param argc the number of arguments
+ * @param argv the array of arguments
+ */
+APT_DECLARE(apt_bool_t) apt_test_framework_run(apt_test_framework_t *framework, int argc, const char * const *argv);
+
+/**
+ * Retrieve the memory pool.
+ * @param framework the test framework to retrieve memory pool from
+ */
+APT_DECLARE(apr_pool_t*) apt_test_framework_pool_get(apt_test_framework_t *framework);
+
+APT_END_EXTERN_C
+
+#endif /*__APT_TEST_SUITE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_text_stream.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_text_stream.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __APT_TEXT_STREAM_H__
+#define __APT_TEXT_STREAM_H__
+
+/**
+ * @file apt_text_stream.h
+ * @brief Text Stream Parse/Generate Routine
+ */ 
+
+#include 
+#include 
+#include "apt_string.h"
+#include "apt_pair.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Named tokens */
+
+/** Space */
+#define APT_TOKEN_SP ' '
+/** Carrige return */
+#define APT_TOKEN_CR 0x0D
+/** Line feed */
+#define APT_TOKEN_LF 0x0A
+
+/** Text stream declaration */
+typedef struct apt_text_stream_t apt_text_stream_t;
+
+/** Text stream is used for message parsing and generation */
+struct apt_text_stream_t {
+	/** Text stream */
+	apt_str_t text;
+	/** Current position in the buffer */
+	char     *pos;
+};
+
+/**
+ * Navigate through the lines of the text stream (message).
+ * @param stream the text stream to navigate
+ * @param line the read line to return
+ * @return TRUE if the length of the line > 0, otherwise FALSE
+ */
+APT_DECLARE(apt_bool_t) apt_text_line_read(apt_text_stream_t *stream, apt_str_t *line);
+
+/**
+ * Navigate through the headers (name:value pairs) of the text stream (message).
+ * @param stream the text stream to navigate
+ * @param pair the read pair to return
+ * @return TRUE if the length of the read name > 0, otherwise FALSE
+ */
+APT_DECLARE(apt_bool_t) apt_text_header_read(apt_text_stream_t *stream, apt_pair_t *pair);
+
+/**
+ * Navigate through the fields of the line.
+ * @param stream the text stream to navigate
+ * @param separator the field separator
+ * @param skip_spaces whether to skip spaces or not
+ * @param field the read field to return
+ * @return TRUE if the length of the field > 0, otherwise FALSE
+ */
+APT_DECLARE(apt_bool_t) apt_text_field_read(apt_text_stream_t *stream, char separator, apt_bool_t skip_spaces, apt_str_t *field);
+
+
+
+/** Generate header */
+APT_DECLARE(apt_bool_t) apt_text_header_generate(const apt_pair_t *pair, apt_text_stream_t *text_stream);
+
+/** Generate only the name ("name:") of the header */
+APT_DECLARE(apt_bool_t) apt_text_header_name_generate(const apt_str_t *name, apt_text_stream_t *text_stream);
+
+/** Parse array of name-value pairs */
+APT_DECLARE(apt_bool_t) apt_pair_array_parse(apt_pair_arr_t *arr, const apt_str_t *value, apr_pool_t *pool);
+/** Generate array of name-value pairs */
+APT_DECLARE(apt_bool_t) apt_pair_array_generate(apt_pair_arr_t *arr, apt_text_stream_t *text_stream);
+
+
+/** Parse boolean-value */
+APT_DECLARE(apt_bool_t) apt_boolean_value_parse(const apt_str_t *str, apt_bool_t *value);
+
+/** Generate boolean-value */
+APT_DECLARE(apt_bool_t) apt_boolean_value_generate(apt_bool_t value, apt_text_stream_t *str);
+
+
+/** Parse size_t value */
+static APR_INLINE apr_size_t apt_size_value_parse(const apt_str_t *str)
+{
+	return str->buf ? atol(str->buf) : 0;
+}
+
+/** Generate apr_size_t value */
+static APR_INLINE apt_bool_t apt_size_value_generate(apr_size_t value, apt_text_stream_t *stream)
+{
+	int length = sprintf(stream->pos, "%"APR_SIZE_T_FMT, value);
+	if(length <= 0) {
+		return FALSE;
+	}
+	stream->pos += length;
+	return TRUE;
+}
+
+/** Parse float value */
+static APR_INLINE float apt_float_value_parse(const apt_str_t *str)
+{
+	return str->buf ? (float)atof(str->buf) : 0;
+}
+
+/** Generate float value */
+static APR_INLINE apt_bool_t apt_float_value_generate(float value, apt_text_stream_t *stream)
+{
+	int length = sprintf(stream->pos,"%.1f",value);
+	if(length <= 0) {
+		return FALSE;
+	}
+	stream->pos += length;
+	return TRUE;
+}
+
+/** Generate string value */
+static APR_INLINE apt_bool_t apt_string_value_generate(const apt_str_t *str, apt_text_stream_t *stream)
+{
+	if(str->length) {
+		memcpy(stream->pos,str->buf,str->length);
+		stream->pos += str->length;
+	}
+	return TRUE;
+}
+
+/** Initialize text stream */
+static APR_INLINE void apt_text_stream_init(apt_text_stream_t *stream, char *buffer, apr_size_t size)
+{
+	stream->text.buf = buffer;
+	stream->text.length = size;
+	stream->pos = stream->text.buf;
+}
+
+/** Insert end of the line symbol(s) */
+static APR_INLINE void apt_text_eol_insert(apt_text_stream_t *stream)
+{
+	*stream->pos++ = APT_TOKEN_CR;
+	*stream->pos++ = APT_TOKEN_LF;
+}
+
+/** Insert character */
+static APR_INLINE void apt_text_char_insert(apt_text_stream_t *stream, char ch)
+{
+	*stream->pos++ = ch;
+}
+
+/** Insert space */
+static APR_INLINE void apt_text_space_insert(apt_text_stream_t *stream)
+{
+	*stream->pos++ = APT_TOKEN_SP;
+}
+
+/** Skip spaces */
+static APR_INLINE void apt_text_spaces_skip(apt_text_stream_t *stream)
+{
+	const char *end = stream->text.buf + stream->text.length;
+	while(stream->pos < end && *stream->pos == APT_TOKEN_SP) stream->pos++;
+}
+
+/** Skip specified character */
+static APR_INLINE void apt_text_char_skip(apt_text_stream_t *stream, char ch)
+{
+	const char *end = stream->text.buf + stream->text.length;
+	if(stream->pos < end && *stream->pos == ch) stream->pos++;
+}
+
+/** Check whether end of stream is reached */
+static APR_INLINE apt_bool_t apt_text_is_eos(const apt_text_stream_t *stream)
+{
+	const char *end = stream->text.buf + stream->text.length;
+	return (stream->pos >= end) ? TRUE : FALSE;
+}
+
+/** Scroll text stream */
+APT_DECLARE(apt_bool_t) apt_text_stream_scroll(apt_text_stream_t *stream);
+
+/** Parse id at resource string */
+APT_DECLARE(apt_bool_t) apt_id_resource_parse(const apt_str_t *str, char separator, apt_str_t *id, apt_str_t *resource, apr_pool_t *pool);
+
+/** Generate id at resource string */
+APT_DECLARE(apt_bool_t) apt_id_resource_generate(const apt_str_t *id, const apt_str_t *resource, char separator, apt_str_t *str, apr_pool_t *pool);
+
+/** Generate value plus the length (number of digits) of the value itself */
+APT_DECLARE(apt_bool_t) apt_var_length_value_generate(apr_size_t *value, apr_size_t max_count, apt_str_t *str);
+
+
+/**
+ * Generate unique identifier (hex string)
+ * @param id the id to generate
+ * @param length the length of hex string to generate
+ * @param pool the pool to allocate memory from
+ */
+APT_DECLARE(apt_bool_t) apt_unique_id_generate(apt_str_t *id, apr_size_t length, apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__APT_TEXT_STREAM_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_consumer_task.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_consumer_task.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_consumer_task.h"
+
+struct apt_consumer_task_t {
+	void        *obj;
+	apt_task_t  *base;
+	apr_queue_t *msg_queue;
+};
+
+static apt_bool_t apt_consumer_task_msg_signal(apt_task_t *task, apt_task_msg_t *msg);
+static apt_bool_t apt_consumer_task_run(apt_task_t *task);
+
+APT_DECLARE(apt_consumer_task_t*) apt_consumer_task_create(
+									void *obj,
+									apt_task_msg_pool_t *msg_pool,
+									apr_pool_t *pool)
+{
+	apt_task_vtable_t *vtable;
+	apt_consumer_task_t *consumer_task = apr_palloc(pool,sizeof(apt_consumer_task_t));
+	consumer_task->obj = obj;
+	consumer_task->msg_queue = NULL;
+	if(apr_queue_create(&consumer_task->msg_queue,1024,pool) != APR_SUCCESS) {
+		return NULL;
+	}
+	
+	consumer_task->base = apt_task_create(consumer_task,msg_pool,pool);
+	if(!consumer_task->base) {
+		return NULL;
+	}
+
+	vtable = apt_task_vtable_get(consumer_task->base);
+	if(vtable) {
+		vtable->run = apt_consumer_task_run;
+		vtable->signal_msg = apt_consumer_task_msg_signal;
+	}
+	return consumer_task;
+}
+
+APT_DECLARE(apt_task_t*) apt_consumer_task_base_get(apt_consumer_task_t *task)
+{
+	return task->base;
+}
+
+APT_DECLARE(apt_task_vtable_t*) apt_consumer_task_vtable_get(apt_consumer_task_t *task)
+{
+	return apt_task_vtable_get(task->base);
+}
+
+APT_DECLARE(void*) apt_consumer_task_object_get(apt_consumer_task_t *task)
+{
+	return task->obj;
+}
+
+static apt_bool_t apt_consumer_task_msg_signal(apt_task_t *task, apt_task_msg_t *msg)
+{
+	apt_consumer_task_t *consumer_task = apt_task_object_get(task);
+	return (apr_queue_push(consumer_task->msg_queue,msg) == APR_SUCCESS) ? TRUE : FALSE;
+}
+
+static apt_bool_t apt_consumer_task_run(apt_task_t *task)
+{
+	apr_status_t rv;
+	void *msg;
+	apt_bool_t running = TRUE;
+	apt_consumer_task_t *consumer_task;
+	consumer_task = apt_task_object_get(task);
+	if(!consumer_task) {
+		return FALSE;
+	}
+
+	while(running) {
+		rv = apr_queue_pop(consumer_task->msg_queue,&msg);
+		if(rv == APR_SUCCESS) {
+			if(msg) {
+				apt_task_msg_t *task_msg = msg;
+				if(apt_task_msg_process(consumer_task->base,task_msg) == FALSE) {
+					running = FALSE;
+				}
+			}
+		}
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_cyclic_queue.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_cyclic_queue.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_cyclic_queue.h"
+
+struct apt_cyclic_queue_t {
+	void       **data;
+	apr_size_t   max_size;
+	apr_size_t   actual_size;
+	apr_size_t   head;
+	apr_size_t   tail;
+};
+
+static apt_bool_t apt_cyclic_queue_resize(apt_cyclic_queue_t *queue);
+
+
+APT_DECLARE(apt_cyclic_queue_t*) apt_cyclic_queue_create(apr_size_t size)
+{
+	apt_cyclic_queue_t *queue = malloc(sizeof(apt_cyclic_queue_t));
+	queue->max_size = size;
+	queue->actual_size = 0;
+	queue->data = malloc(sizeof(void*) * queue->max_size);
+	queue->head = queue->tail = 0;
+	return queue;
+}
+
+APT_DECLARE(void) apt_cyclic_queue_destroy(apt_cyclic_queue_t *queue)
+{
+	if(queue->data) {
+		free(queue->data);
+		queue->data = NULL;
+	}
+	free(queue);
+}
+
+APT_DECLARE(apt_bool_t) apt_cyclic_queue_push(apt_cyclic_queue_t *queue, void *obj)
+{
+	if(queue->actual_size >= queue->max_size) {
+		if(apt_cyclic_queue_resize(queue) != TRUE) {
+			return FALSE;
+		}
+	}
+	
+	queue->data[queue->head] = obj;
+	queue->head = (queue->head + 1) % queue->max_size;
+	queue->actual_size++;
+	return TRUE;
+}
+
+APT_DECLARE(void*) apt_cyclic_queue_pop(apt_cyclic_queue_t *queue)
+{
+	void *obj = NULL;
+	if(queue->actual_size) {
+		obj = queue->data[queue->tail];
+		queue->tail = (queue->tail + 1) % queue->max_size;
+		queue->actual_size--;
+	}
+	return obj;
+}
+
+APT_DECLARE(void) apt_cyclic_queue_clear(apt_cyclic_queue_t *queue)
+{
+	queue->actual_size = 0;
+	queue->head = queue->tail = 0;
+}
+
+APT_DECLARE(apt_bool_t) apt_cyclic_queue_is_empty(apt_cyclic_queue_t *queue)
+{
+	return queue->actual_size ? TRUE : FALSE;
+}
+
+static apt_bool_t apt_cyclic_queue_resize(apt_cyclic_queue_t *queue)
+{
+	apr_size_t new_size = queue->max_size + queue->max_size/2;
+	void **new_data = malloc(sizeof(void*) * new_size);
+	apr_size_t offset;
+
+	offset = queue->max_size - queue->head;
+	memcpy(new_data, queue->data + queue->head, sizeof(void*) * offset);
+	if(queue->head) {
+		memcpy(new_data + offset, queue->data, sizeof(void*) * queue->head);
+	}
+
+	queue->tail = 0;
+	queue->head = queue->max_size;
+	queue->max_size = new_size;
+	free(queue->data);
+	queue->data = new_data;
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_dir_layout.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_dir_layout.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_dir_layout.h"
+
+static apt_dir_layout_t* apt_dir_layout_alloc(apr_pool_t *pool)
+{
+	apt_dir_layout_t *dir_layout = (apt_dir_layout_t*) apr_palloc(pool,sizeof(apt_dir_layout_t));
+	dir_layout->conf_dir_path = NULL;
+	dir_layout->plugin_dir_path = NULL;
+	dir_layout->log_dir_path = NULL;
+	dir_layout->data_dir_path = NULL;
+	return dir_layout;
+}
+
+APT_DECLARE(apt_dir_layout_t*) apt_default_dir_layout_create(const char *root_dir_path, apr_pool_t *pool)
+{
+	apt_dir_layout_t *dir_layout = apt_dir_layout_alloc(pool);
+	if(root_dir_path) {
+		apr_filepath_merge(&dir_layout->conf_dir_path,root_dir_path,"conf",0,pool);
+		apr_filepath_merge(&dir_layout->plugin_dir_path,root_dir_path,"plugin",0,pool);
+		apr_filepath_merge(&dir_layout->log_dir_path,root_dir_path,"log",0,pool);
+		apr_filepath_merge(&dir_layout->data_dir_path,root_dir_path,"data",0,pool);
+	}
+	return dir_layout;
+}
+
+APT_DECLARE(apt_dir_layout_t*) apt_custom_dir_layout_create(
+									const char *conf_dir_path,
+									const char *plugin_dir_path,
+									const char *log_dir_path,
+									const char *data_dir_path,
+									apr_pool_t *pool)
+{
+	apt_dir_layout_t *dir_layout = apt_dir_layout_alloc(pool);
+	if(conf_dir_path) {
+		dir_layout->conf_dir_path = apr_pstrdup(pool,conf_dir_path);
+	}
+	if(plugin_dir_path) {
+		dir_layout->plugin_dir_path = apr_pstrdup(pool,plugin_dir_path);
+	}
+	if(log_dir_path) {
+		dir_layout->log_dir_path = apr_pstrdup(pool,log_dir_path);
+	}
+	if(data_dir_path) {
+		dir_layout->data_dir_path = apr_pstrdup(pool,data_dir_path);
+	}
+	return dir_layout;
+}
+
+APT_DECLARE(char*) apt_datadir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool)
+{
+	if(dir_layout && dir_layout->data_dir_path && file_name) {
+		char *file_path = NULL;
+		if(apr_filepath_merge(&file_path,dir_layout->data_dir_path,file_name,0,pool) == APR_SUCCESS) {
+			return file_path;
+		}
+	}
+	return NULL;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_log.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_log.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,304 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "apt_log.h"
+
+#define MAX_LOG_ENTRY_SIZE 4096
+#define MAX_PRIORITY_NAME_LENGTH 9
+
+static const char priority_snames[APT_PRIO_COUNT][MAX_PRIORITY_NAME_LENGTH+1] =
+{
+	"[EMERG]  ",
+	"[ALERT]  ",
+	"[CRITIC] ",
+	"[ERROR]  ",
+	"[WARN]   ",
+	"[NOTICE] ",
+	"[INFO]   ",
+	"[DEBUG]  "
+};
+
+typedef struct apt_log_file_data_t apt_log_file_data_t;
+
+struct apt_log_file_data_t {
+	const char           *log_dir_path;
+	const char           *log_file_name;
+	FILE                 *file;
+	apr_size_t            cur_size;
+	apr_size_t            max_size;
+	apr_size_t            cur_file_index;
+	apr_size_t            max_file_count;
+	apr_thread_mutex_t   *mutex;
+	apr_pool_t           *pool;
+};
+
+struct apt_logger_t {
+	apt_log_output_e      mode;
+	apt_log_priority_e    priority;
+	int                   header;
+	apt_log_ext_handler_f ext_handler;
+	apt_log_file_data_t  *file_data;
+};
+
+static apt_logger_t *apt_logger = NULL;
+
+static apt_bool_t apt_do_log(const char *file, int line, apt_log_priority_e priority, const char *format, va_list arg_ptr);
+
+static const char* apt_log_file_path_make(apt_log_file_data_t *file_data);
+static apt_bool_t apt_log_file_dump(apt_log_file_data_t *file_data, const char *log_entry, apr_size_t size);
+
+
+APT_DECLARE(apt_bool_t) apt_log_instance_create(apt_log_output_e mode, apt_log_priority_e priority, apr_pool_t *pool)
+{
+	if(apt_logger) {
+		return FALSE;
+	}
+	apt_logger = apr_palloc(pool,sizeof(apt_logger_t));
+	apt_logger->mode = mode;
+	apt_logger->priority = priority;
+	apt_logger->header = APT_LOG_HEADER_DEFAULT;
+	apt_logger->ext_handler = NULL;
+	apt_logger->file_data = NULL;
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_log_instance_destroy()
+{
+	if(!apt_logger) {
+		return FALSE;
+	}
+
+	if(apt_logger->file_data) {
+		apt_log_file_close();
+	}
+	apt_logger = NULL;
+	return TRUE;
+}
+
+APT_DECLARE(apt_logger_t*) apt_log_instance_get()
+{
+	return apt_logger;
+}
+
+APT_DECLARE(apt_bool_t) apt_log_instance_set(apt_logger_t *logger)
+{
+	if(apt_logger){
+		return FALSE;
+	}
+	apt_logger = logger;
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_log_file_open(const char *dir_path, const char *file_name, apr_size_t max_file_size, apr_size_t max_file_count, apr_pool_t *pool)
+{
+	const char *log_file_path;
+	apt_log_file_data_t *file_data;
+	if(!apt_logger || !dir_path || !file_name) {
+		return FALSE;
+	}
+
+	if(apt_logger->file_data) {
+		return FALSE;
+	}
+
+	file_data = apr_palloc(pool,sizeof(apt_log_file_data_t));
+	file_data->log_dir_path = dir_path;
+	file_data->log_file_name = file_name;
+	file_data->cur_file_index = 0;
+	file_data->cur_size = 0;
+	file_data->max_file_count = max_file_count;
+	file_data->max_size = max_file_size;
+	file_data->mutex = NULL;
+	file_data->pool = pool;
+
+	if(!file_data->max_size) {
+		file_data->max_file_count = MAX_LOG_FILE_SIZE;
+	}
+	if(!file_data->max_file_count) {
+		file_data->max_file_count = MAX_LOG_FILE_COUNT;
+	}
+
+	/* create mutex */
+	if(apr_thread_mutex_create(&file_data->mutex,APR_THREAD_MUTEX_DEFAULT,pool) != APR_SUCCESS) {
+		return FALSE;
+	}
+	/* open log file */
+	log_file_path = apt_log_file_path_make(file_data);
+	file_data->file = fopen(log_file_path,"wb");
+	if(!file_data->file) {
+		apr_thread_mutex_destroy(file_data->mutex);
+		return FALSE;
+	}
+
+	apt_logger->file_data = file_data;
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_log_file_close()
+{
+	apt_log_file_data_t *file_data;
+	if(!apt_logger || !apt_logger->file_data) {
+		return FALSE;
+	}
+	file_data = apt_logger->file_data;
+	if(file_data->file) {
+		/* close log file */
+		fclose(file_data->file);
+		file_data->file = NULL;
+		/* destroy mutex */
+		apr_thread_mutex_destroy(file_data->mutex);
+		file_data->mutex = NULL;
+	}
+	apt_logger->file_data = NULL;
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_log_output_mode_set(apt_log_output_e mode)
+{
+	if(!apt_logger) {
+		return FALSE;
+	}
+	apt_logger->mode = mode;
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_log_priority_set(apt_log_priority_e priority)
+{
+	if(!apt_logger || priority >= APT_PRIO_COUNT) {
+		return FALSE;
+	}
+	apt_logger->priority = priority;
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_log_header_set(int header)
+{
+	if(!apt_logger) {
+		return FALSE;
+	}
+	apt_logger->header = header;
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_log_ext_handler_set(apt_log_ext_handler_f handler)
+{
+	if(!apt_logger) {
+		return FALSE;
+	}
+	apt_logger->ext_handler = handler;
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_log(const char *file, int line, apt_log_priority_e priority, const char *format, ...)
+{
+	apt_bool_t status = TRUE;
+	if(!apt_logger) {
+		return FALSE;
+	}
+	if(priority <= apt_logger->priority) {
+		va_list arg_ptr;
+		va_start(arg_ptr, format);
+		if(apt_logger->ext_handler) {
+			status = apt_logger->ext_handler(file,line,NULL,priority,format,arg_ptr);
+		}
+		else {
+			status = apt_do_log(file,line,priority,format,arg_ptr);
+		}
+		va_end(arg_ptr); 
+	}
+	return status;
+}
+
+static apt_bool_t apt_do_log(const char *file, int line, apt_log_priority_e priority, const char *format, va_list arg_ptr)
+{
+	char log_entry[MAX_LOG_ENTRY_SIZE];
+	apr_size_t offset = 0;
+	apr_time_exp_t result;
+	apr_time_t now = apr_time_now();
+	apr_time_exp_lt(&result,now);
+
+	if(apt_logger->header & APT_LOG_HEADER_DATE) {
+		offset += apr_snprintf(log_entry+offset,MAX_LOG_ENTRY_SIZE-offset,"%4d-%02d-%02d ",
+							result.tm_year+1900,
+							result.tm_mon+1,
+							result.tm_mday);
+	}
+	if(apt_logger->header & APT_LOG_HEADER_TIME) {
+		offset += apr_snprintf(log_entry+offset,MAX_LOG_ENTRY_SIZE-offset,"%02d:%02d:%02d:%06d ",
+							result.tm_hour,
+							result.tm_min,
+							result.tm_sec,
+							result.tm_usec);
+	}
+	if(apt_logger->header & APT_LOG_HEADER_MARK) {
+		offset += apr_snprintf(log_entry+offset,MAX_LOG_ENTRY_SIZE-offset,"%s:%03d ",file,line);
+	}
+	if(apt_logger->header & APT_LOG_HEADER_PRIORITY) {
+		memcpy(log_entry+offset,priority_snames[priority],MAX_PRIORITY_NAME_LENGTH);
+		offset += MAX_PRIORITY_NAME_LENGTH;
+	}
+
+	offset += apr_vsnprintf(log_entry+offset,MAX_LOG_ENTRY_SIZE-offset,format,arg_ptr);
+	log_entry[offset++] = '\n';
+	log_entry[offset] = '\0';
+	if((apt_logger->mode & APT_LOG_OUTPUT_CONSOLE) == APT_LOG_OUTPUT_CONSOLE) {
+		printf(log_entry);
+	}
+	
+	if((apt_logger->mode & APT_LOG_OUTPUT_FILE) == APT_LOG_OUTPUT_FILE && apt_logger->file_data) {
+		apt_log_file_dump(apt_logger->file_data,log_entry,offset);
+	}
+	return TRUE;
+}
+
+static const char* apt_log_file_path_make(apt_log_file_data_t *file_data)
+{
+	char *log_file_path = NULL;
+	const char *log_file_name = apr_psprintf(file_data->pool,"%s-%d.log",file_data->log_file_name,file_data->cur_file_index);
+	apr_filepath_merge(&log_file_path,file_data->log_dir_path,log_file_name,0,file_data->pool);
+	return log_file_path;
+}
+
+static apt_bool_t apt_log_file_dump(apt_log_file_data_t *file_data, const char *log_entry, apr_size_t size)
+{
+	apr_thread_mutex_lock(file_data->mutex);
+
+	file_data->cur_size += size;
+	if(file_data->cur_size > file_data->max_size) {
+		const char *log_file_path;
+		/* close current log file */
+		fclose(file_data->file);
+		/* roll over the next log file */
+		file_data->cur_file_index++;
+		file_data->cur_file_index %= file_data->max_file_count;
+		/* open log file */
+		log_file_path = apt_log_file_path_make(file_data);
+		file_data->file = fopen(log_file_path,"wb");
+		if(!file_data->file) {
+			return FALSE;
+		}
+
+		file_data->cur_size = size;
+	}
+	/* write to log file */
+	fwrite(log_entry,1,size,file_data->file);
+	fflush(file_data->file);
+
+	apr_thread_mutex_unlock(file_data->mutex);
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_net.h"
+
+/** Get the IP address (in numeric address string format) by hostname */
+apt_bool_t apt_ip_get(char **addr, apr_pool_t *pool)
+{
+	apr_sockaddr_t *sockaddr = NULL;
+	char *hostname = apr_palloc(pool,APRMAXHOSTLEN+1);
+	if(apr_gethostname(hostname,APRMAXHOSTLEN,pool) != APR_SUCCESS) {
+		return FALSE;
+	}
+	if(apr_sockaddr_info_get(&sockaddr,hostname,APR_INET,0,0,pool) != APR_SUCCESS) {
+		return FALSE;
+	}
+	if(apr_sockaddr_ip_get(addr,sockaddr) != APR_SUCCESS) {
+		return FALSE;
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net_client_task.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net_client_task.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,320 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_net_client_task.h"
+#include "apt_task.h"
+#include "apt_pool.h"
+#include "apt_pollset.h"
+#include "apt_cyclic_queue.h"
+#include "apt_log.h"
+
+
+/** Network client task */
+struct apt_net_client_task_t {
+	apr_pool_t                    *pool;
+	apt_task_t                    *base;
+	void                          *obj;
+
+	apr_size_t                     max_connection_count;
+
+	apr_thread_mutex_t            *guard;
+	apt_cyclic_queue_t            *msg_queue;
+	apt_pollset_t                 *pollset;
+
+	const apt_net_client_vtable_t *client_vtable;
+};
+
+static apt_bool_t apt_net_client_task_msg_signal(apt_task_t *task, apt_task_msg_t *msg);
+static apt_bool_t apt_net_client_task_run(apt_task_t *task);
+static apt_bool_t apt_net_client_task_on_destroy(apt_task_t *task);
+
+/** Create connection task */
+APT_DECLARE(apt_net_client_task_t*) apt_net_client_task_create(
+										apr_size_t max_connection_count,
+										void *obj,
+										const apt_net_client_vtable_t *client_vtable,
+										apt_task_msg_pool_t *msg_pool,
+										apr_pool_t *pool)
+{
+	apt_task_vtable_t *vtable;
+	apt_net_client_task_t *task;
+	
+	task = apr_palloc(pool,sizeof(apt_net_client_task_t));
+	task->pool = pool;
+	task->obj = obj;
+	task->pollset = NULL;
+	task->max_connection_count = max_connection_count;
+
+	if(!client_vtable || !client_vtable->on_receive) {
+		return NULL;
+	}
+	task->client_vtable = client_vtable;
+
+	task->base = apt_task_create(task,msg_pool,pool);
+	if(!task->base) {
+		return NULL;
+	}
+
+	vtable = apt_task_vtable_get(task->base);
+	if(vtable) {
+		vtable->run = apt_net_client_task_run;
+		vtable->destroy = apt_net_client_task_on_destroy;
+		vtable->signal_msg = apt_net_client_task_msg_signal;
+	}
+
+	task->msg_queue = apt_cyclic_queue_create(CYCLIC_QUEUE_DEFAULT_SIZE);
+	apr_thread_mutex_create(&task->guard,APR_THREAD_MUTEX_UNNESTED,pool);
+	return task;
+}
+
+/** Virtual destroy handler */
+static apt_bool_t apt_net_client_task_on_destroy(apt_task_t *base)
+{
+	apt_net_client_task_t *task = apt_task_object_get(base);
+	if(task->guard) {
+		apr_thread_mutex_destroy(task->guard);
+		task->guard = NULL;
+	}
+	if(task->msg_queue) {
+		apt_cyclic_queue_destroy(task->msg_queue);
+		task->msg_queue = NULL;
+	}
+	return TRUE;
+}
+
+/** Destroy connection task. */
+APT_DECLARE(apt_bool_t) apt_net_client_task_destroy(apt_net_client_task_t *task)
+{
+	return apt_task_destroy(task->base);
+}
+
+/** Start connection task. */
+APT_DECLARE(apt_bool_t) apt_net_client_task_start(apt_net_client_task_t *task)
+{
+	return apt_task_start(task->base);
+}
+
+/** Terminate connection task. */
+APT_DECLARE(apt_bool_t) apt_net_client_task_terminate(apt_net_client_task_t *task)
+{
+	return apt_task_terminate(task->base,TRUE);
+}
+
+/** Get task */
+APT_DECLARE(apt_task_t*) apt_net_client_task_base_get(apt_net_client_task_t *task)
+{
+	return task->base;
+}
+
+/** Get task vtable */
+APT_DECLARE(apt_task_vtable_t*) apt_net_client_task_vtable_get(apt_net_client_task_t *task)
+{
+	return apt_task_vtable_get(task->base);
+}
+
+/** Get external object */
+APT_DECLARE(void*) apt_net_client_task_object_get(apt_net_client_task_t *task)
+{
+	return task->obj;
+}
+
+/** Create connection */
+APT_DECLARE(apt_net_client_connection_t*) apt_net_client_connect(apt_net_client_task_t *task, const char *ip, apr_port_t port)
+{
+	char *local_ip = NULL;
+	char *remote_ip = NULL;
+	apr_sockaddr_t *l_sockaddr = NULL;
+	apr_sockaddr_t *r_sockaddr = NULL;
+	apt_net_client_connection_t *connection;
+	apr_pool_t *pool = apt_pool_create();
+	if(!pool) {
+		return NULL;
+	}
+	
+	connection = apr_palloc(pool,sizeof(apt_net_client_connection_t));
+	connection->pool = pool;
+	connection->obj = NULL;
+	connection->sock = NULL;
+
+	if(apr_sockaddr_info_get(&r_sockaddr,ip,APR_INET,port,0,connection->pool) != APR_SUCCESS) {
+		apr_pool_destroy(pool);
+		return NULL;
+	}
+
+	if(apr_socket_create(&connection->sock,r_sockaddr->family,SOCK_STREAM,APR_PROTO_TCP,connection->pool) != APR_SUCCESS) {
+		apr_pool_destroy(pool);
+		return NULL;
+	}
+
+	apr_socket_opt_set(connection->sock, APR_SO_NONBLOCK, 0);
+	apr_socket_timeout_set(connection->sock, -1);
+	apr_socket_opt_set(connection->sock, APR_SO_REUSEADDR, 1);
+
+	if(apr_socket_connect(connection->sock,r_sockaddr) != APR_SUCCESS) {
+		apr_socket_close(connection->sock);
+		apr_pool_destroy(pool);
+		return NULL;
+	}
+
+	if(apr_socket_addr_get(&l_sockaddr,APR_LOCAL,connection->sock) != APR_SUCCESS) {
+		apr_socket_close(connection->sock);
+		apr_pool_destroy(pool);
+		return NULL;
+	}
+
+	apr_sockaddr_ip_get(&local_ip,l_sockaddr);
+	apr_sockaddr_ip_get(&remote_ip,r_sockaddr);
+	connection->id = apr_psprintf(pool,"%s:%hu <-> %s:%hu",
+		local_ip,l_sockaddr->port,
+		remote_ip,r_sockaddr->port);
+
+	memset(&connection->sock_pfd,0,sizeof(apr_pollfd_t));
+	connection->sock_pfd.desc_type = APR_POLL_SOCKET;
+	connection->sock_pfd.reqevents = APR_POLLIN;
+	connection->sock_pfd.desc.s = connection->sock;
+	connection->sock_pfd.client_data = connection;
+	if(apt_pollset_add(task->pollset,&connection->sock_pfd) != TRUE) {
+		apr_socket_close(connection->sock);
+		apr_pool_destroy(pool);
+		return NULL;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Established TCP Connection %s",connection->id);
+	return connection;
+}
+
+/** Close connection */
+APT_DECLARE(apt_bool_t) apt_net_client_connection_close(apt_net_client_task_t *task, apt_net_client_connection_t *connection)
+{
+	if(connection->sock) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Close TCP Connection %s",connection->id);
+		apt_pollset_remove(task->pollset,&connection->sock_pfd);
+		apr_socket_close(connection->sock);
+		connection->sock = NULL;
+	}
+	return TRUE;
+}
+
+/** Close and destroy connection */
+APT_DECLARE(apt_bool_t) apt_net_client_disconnect(apt_net_client_task_t *task, apt_net_client_connection_t *connection)
+{
+	apt_net_client_connection_close(task,connection);
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy TCP Connection %s",connection->id);
+	apr_pool_destroy(connection->pool);
+	return TRUE;
+}
+
+/** Create the pollset */
+static apt_bool_t apt_net_client_task_pollset_create(apt_net_client_task_t *task)
+{
+	/* create pollset */
+	task->pollset = apt_pollset_create((apr_uint32_t)task->max_connection_count, task->pool);
+	if(!task->pollset) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Pollset");
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/** Destroy the pollset */
+static void apt_net_client_task_pollset_destroy(apt_net_client_task_t *task)
+{
+	if(task->pollset) {
+		apt_pollset_destroy(task->pollset);
+		task->pollset = NULL;
+	}
+}
+
+static apt_bool_t apt_net_client_task_process(apt_net_client_task_t *task)
+{
+	apt_bool_t status = TRUE;
+	apt_bool_t running = TRUE;
+	apt_task_msg_t *msg;
+
+	do {
+		apr_thread_mutex_lock(task->guard);
+		msg = apt_cyclic_queue_pop(task->msg_queue);
+		apr_thread_mutex_unlock(task->guard);
+		if(msg) {
+			status = apt_task_msg_process(task->base,msg);
+		}
+		else {
+			running = FALSE;
+		}
+	}
+	while(running == TRUE);
+	return status;
+}
+
+static apt_bool_t apt_net_client_task_run(apt_task_t *base)
+{
+	apt_net_client_task_t *task = apt_task_object_get(base);
+	apt_bool_t running = TRUE;
+	apr_status_t status;
+	apr_int32_t num;
+	const apr_pollfd_t *ret_pfd;
+	int i;
+
+	if(!task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start Network Client Task");
+		return FALSE;
+	}
+
+	if(apt_net_client_task_pollset_create(task) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Pollset");
+		return FALSE;
+	}
+
+	while(running) {
+		status = apt_pollset_poll(task->pollset, -1, &num, &ret_pfd);
+		if(status != APR_SUCCESS) {
+			continue;
+		}
+		for(i = 0; i < num; i++) {
+			if(apt_pollset_is_wakeup(task->pollset,&ret_pfd[i])) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process Control Message");
+				if(apt_net_client_task_process(task) == FALSE) {
+					running = FALSE;
+					break;
+				}
+				continue;
+			}
+	
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process Message");
+			task->client_vtable->on_receive(task,ret_pfd[i].client_data);
+		}
+	}
+
+	apt_net_client_task_pollset_destroy(task);
+
+	apt_task_child_terminate(task->base);
+	return TRUE;
+}
+
+static apt_bool_t apt_net_client_task_msg_signal(apt_task_t *base, apt_task_msg_t *msg)
+{
+	apt_bool_t status;
+	apt_net_client_task_t *task = apt_task_object_get(base);
+	apr_thread_mutex_lock(task->guard);
+	status = apt_cyclic_queue_push(task->msg_queue,msg);
+	apr_thread_mutex_unlock(task->guard);
+	if(apt_pollset_wakeup(task->pollset) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Signal Control Message");
+		status = FALSE;
+	}
+	return status;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net_server_task.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_net_server_task.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,391 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_net_server_task.h"
+#include "apt_task.h"
+#include "apt_pool.h"
+#include "apt_pollset.h"
+#include "apt_cyclic_queue.h"
+#include "apt_log.h"
+
+
+/** Network server task */
+struct apt_net_server_task_t {
+	apr_pool_t                    *pool;
+	apt_task_t                    *base;
+	void                          *obj;
+
+	apr_size_t                     max_connection_count;
+
+	apr_thread_mutex_t            *guard;
+	apt_cyclic_queue_t            *msg_queue;
+	apt_pollset_t                 *pollset;
+
+	/* Listening socket descriptor */
+	apr_sockaddr_t                *sockaddr;
+	apr_socket_t                  *listen_sock;
+	apr_pollfd_t                   listen_sock_pfd;
+
+	const apt_net_server_vtable_t *server_vtable;
+};
+
+static apt_bool_t apt_net_server_task_msg_signal(apt_task_t *task, apt_task_msg_t *msg);
+static apt_bool_t apt_net_server_task_run(apt_task_t *task);
+static apt_bool_t apt_net_server_task_on_destroy(apt_task_t *task);
+
+/** Create connection task */
+APT_DECLARE(apt_net_server_task_t*) apt_net_server_task_create(
+										const char *listen_ip,
+										apr_port_t listen_port,
+										apr_size_t max_connection_count,
+										void *obj,
+										const apt_net_server_vtable_t *server_vtable,
+										apt_task_msg_pool_t *msg_pool,
+										apr_pool_t *pool)
+{
+	apt_task_vtable_t *vtable;
+	apt_net_server_task_t *task;
+	
+	task = apr_palloc(pool,sizeof(apt_net_server_task_t));
+	task->pool = pool;
+	task->obj = obj;
+	task->sockaddr = NULL;
+	task->listen_sock = NULL;
+	task->pollset = NULL;
+	task->max_connection_count = max_connection_count;
+
+	apr_sockaddr_info_get(&task->sockaddr,listen_ip,APR_INET,listen_port,0,task->pool);
+	if(!task->sockaddr) {
+		return NULL;
+	}
+
+	if(!server_vtable || !server_vtable->on_connect || 
+		!server_vtable->on_disconnect || !server_vtable->on_receive) {
+		return NULL;
+	}
+	task->server_vtable = server_vtable;
+
+	task->base = apt_task_create(task,msg_pool,pool);
+	if(!task->base) {
+		return NULL;
+	}
+
+	vtable = apt_task_vtable_get(task->base);
+	if(vtable) {
+		vtable->run = apt_net_server_task_run;
+		vtable->destroy = apt_net_server_task_on_destroy;
+		vtable->signal_msg = apt_net_server_task_msg_signal;
+	}
+
+	task->msg_queue = apt_cyclic_queue_create(CYCLIC_QUEUE_DEFAULT_SIZE);
+	apr_thread_mutex_create(&task->guard,APR_THREAD_MUTEX_UNNESTED,pool);
+	return task;
+}
+
+/** Virtual destroy handler */
+static apt_bool_t apt_net_server_task_on_destroy(apt_task_t *base)
+{
+	apt_net_server_task_t *task = apt_task_object_get(base);
+	if(task->guard) {
+		apr_thread_mutex_destroy(task->guard);
+		task->guard = NULL;
+	}
+	if(task->msg_queue) {
+		apt_cyclic_queue_destroy(task->msg_queue);
+		task->msg_queue = NULL;
+	}
+	return TRUE;
+}
+
+/** Destroy connection task. */
+APT_DECLARE(apt_bool_t) apt_net_server_task_destroy(apt_net_server_task_t *task)
+{
+	return apt_task_destroy(task->base);
+}
+
+/** Start connection task. */
+APT_DECLARE(apt_bool_t) apt_net_server_task_start(apt_net_server_task_t *task)
+{
+	return apt_task_start(task->base);
+}
+
+/** Terminate connection task. */
+APT_DECLARE(apt_bool_t) apt_net_server_task_terminate(apt_net_server_task_t *task)
+{
+	return apt_task_terminate(task->base,TRUE);
+}
+
+/** Get task */
+APT_DECLARE(apt_task_t*) apt_net_server_task_base_get(apt_net_server_task_t *task)
+{
+	return task->base;
+}
+
+/** Get task vtable */
+APT_DECLARE(apt_task_vtable_t*) apt_net_server_task_vtable_get(apt_net_server_task_t *task)
+{
+	return apt_task_vtable_get(task->base);
+}
+
+/** Get external object */
+APT_DECLARE(void*) apt_net_server_task_object_get(apt_net_server_task_t *task)
+{
+	return task->obj;
+}
+
+
+/** Create listening socket and add to pollset */
+static apt_bool_t apt_net_server_task_listen_socket_create(apt_net_server_task_t *task)
+{
+	apr_status_t status;
+	if(!task->sockaddr) {
+		return FALSE;
+	}
+
+	/* create listening socket */
+	status = apr_socket_create(&task->listen_sock, task->sockaddr->family, SOCK_STREAM, APR_PROTO_TCP, task->pool);
+	if(status != APR_SUCCESS) {
+		return FALSE;
+	}
+
+	apr_socket_opt_set(task->listen_sock, APR_SO_NONBLOCK, 0);
+	apr_socket_timeout_set(task->listen_sock, -1);
+	apr_socket_opt_set(task->listen_sock, APR_SO_REUSEADDR, 1);
+
+	status = apr_socket_bind(task->listen_sock, task->sockaddr);
+	if(status != APR_SUCCESS) {
+		apr_socket_close(task->listen_sock);
+		task->listen_sock = NULL;
+		return FALSE;
+	}
+	status = apr_socket_listen(task->listen_sock, SOMAXCONN);
+	if(status != APR_SUCCESS) {
+		apr_socket_close(task->listen_sock);
+		task->listen_sock = NULL;
+		return FALSE;
+	}
+
+	memset(&task->listen_sock_pfd,0,sizeof(apr_pollfd_t));
+	task->listen_sock_pfd.desc_type = APR_POLL_SOCKET;
+	task->listen_sock_pfd.reqevents = APR_POLLIN;
+	task->listen_sock_pfd.desc.s = task->listen_sock;
+	task->listen_sock_pfd.client_data = task->listen_sock;
+	if(apt_pollset_add(task->pollset, &task->listen_sock_pfd) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Add Listen Socket to Pollset");
+		apr_socket_close(task->listen_sock);
+		task->listen_sock = NULL;
+	}
+
+	return TRUE;
+}
+
+/** Remove from pollset and destroy listening socket */
+static void apt_net_server_task_listen_socket_destroy(apt_net_server_task_t *task)
+{
+	apt_pollset_remove(task->pollset,&task->listen_sock_pfd);
+
+	if(task->listen_sock) {
+		apr_socket_close(task->listen_sock);
+		task->listen_sock = NULL;
+	}
+}
+
+/** Create the pollset */
+static apt_bool_t apt_net_server_task_pollset_create(apt_net_server_task_t *task)
+{
+	/* create pollset */
+	task->pollset = apt_pollset_create((apr_uint32_t)task->max_connection_count + 1, task->pool);
+	if(!task->pollset) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Pollset");
+		return FALSE;
+	}
+
+	/* create listening socket */
+	if(apt_net_server_task_listen_socket_create(task) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Listen Socket");
+	}
+
+	return TRUE;
+}
+
+/** Destroy the pollset */
+static void apt_net_server_task_pollset_destroy(apt_net_server_task_t *task)
+{
+	apt_net_server_task_listen_socket_destroy(task);
+	if(task->pollset) {
+		apt_pollset_destroy(task->pollset);
+		task->pollset = NULL;
+	}
+}
+
+static apt_bool_t apt_net_server_task_process(apt_net_server_task_t *task)
+{
+	apt_bool_t status = TRUE;
+	apt_bool_t running = TRUE;
+	apt_task_msg_t *msg;
+
+	do {
+		apr_thread_mutex_lock(task->guard);
+		msg = apt_cyclic_queue_pop(task->msg_queue);
+		apr_thread_mutex_unlock(task->guard);
+		if(msg) {
+			status = apt_task_msg_process(task->base,msg);
+		}
+		else {
+			running = FALSE;
+		}
+	}
+	while(running == TRUE);
+	return status;
+}
+
+static apt_bool_t apt_net_server_task_accept(apt_net_server_task_t *task)
+{
+	char *local_ip = NULL;
+	char *remote_ip = NULL;
+	apr_sockaddr_t *l_sockaddr = NULL;
+	apr_sockaddr_t *r_sockaddr = NULL;
+	apt_net_server_connection_t *connection;
+	apr_pool_t *pool = apt_pool_create();
+	if(!pool) {
+		return FALSE;
+	}
+	
+	connection = apr_palloc(pool,sizeof(apt_net_server_connection_t));
+	connection->pool = pool;
+	connection->obj = NULL;
+	connection->sock = NULL;
+	connection->client_ip = NULL;
+
+	if(apr_socket_accept(&connection->sock,task->listen_sock,connection->pool) != APR_SUCCESS) {
+		apr_pool_destroy(pool);
+		return FALSE;
+	}
+
+	if(apr_socket_addr_get(&l_sockaddr,APR_LOCAL,connection->sock) != APR_SUCCESS ||
+		apr_socket_addr_get(&r_sockaddr,APR_REMOTE,connection->sock) != APR_SUCCESS) {
+		apr_pool_destroy(pool);
+		return FALSE;
+	}
+
+	apr_sockaddr_ip_get(&local_ip,l_sockaddr);
+	apr_sockaddr_ip_get(&remote_ip,r_sockaddr);
+	connection->client_ip = remote_ip;
+	connection->id = apr_psprintf(pool,"%s:%hu <-> %s:%hu",
+		local_ip,l_sockaddr->port,
+		remote_ip,r_sockaddr->port);
+
+	memset(&connection->sock_pfd,0,sizeof(apr_pollfd_t));
+	connection->sock_pfd.desc_type = APR_POLL_SOCKET;
+	connection->sock_pfd.reqevents = APR_POLLIN;
+	connection->sock_pfd.desc.s = connection->sock;
+	connection->sock_pfd.client_data = connection;
+	if(apt_pollset_add(task->pollset,&connection->sock_pfd) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Add to Pollset");
+		apr_socket_close(connection->sock);
+		apr_pool_destroy(pool);
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Accepted TCP Connection %s",connection->id);
+	task->server_vtable->on_connect(task,connection);
+	return TRUE;
+}
+
+static apt_bool_t apt_net_server_task_run(apt_task_t *base)
+{
+	apt_net_server_task_t *task = apt_task_object_get(base);
+	apt_bool_t running = TRUE;
+	apr_status_t status;
+	apr_int32_t num;
+	const apr_pollfd_t *ret_pfd;
+	int i;
+
+	if(!task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start Network Server Task");
+		return FALSE;
+	}
+
+	if(apt_net_server_task_pollset_create(task) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Pollset");
+		return FALSE;
+	}
+
+	while(running) {
+		status = apt_pollset_poll(task->pollset, -1, &num, &ret_pfd);
+		if(status != APR_SUCCESS) {
+			continue;
+		}
+		for(i = 0; i < num; i++) {
+			if(ret_pfd[i].desc.s == task->listen_sock) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Accept Connection");
+				apt_net_server_task_accept(task);
+				continue;
+			}
+			if(apt_pollset_is_wakeup(task->pollset,&ret_pfd[i])) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process Control Message");
+				if(apt_net_server_task_process(task) == FALSE) {
+					running = FALSE;
+					break;
+				}
+				continue;
+			}
+	
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process Message");
+			task->server_vtable->on_receive(task,ret_pfd[i].client_data);
+		}
+	}
+
+	apt_net_server_task_pollset_destroy(task);
+
+	apt_task_child_terminate(task->base);
+	return TRUE;
+}
+
+static apt_bool_t apt_net_server_task_msg_signal(apt_task_t *base, apt_task_msg_t *msg)
+{
+	apt_bool_t status;
+	apt_net_server_task_t *task = apt_task_object_get(base);
+	apr_thread_mutex_lock(task->guard);
+	status = apt_cyclic_queue_push(task->msg_queue,msg);
+	apr_thread_mutex_unlock(task->guard);
+	if(apt_pollset_wakeup(task->pollset) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Signal Control Message");
+		status = FALSE;
+	}
+	return status;
+}
+
+
+/** Close connection */
+APT_DECLARE(apt_bool_t) apt_net_server_connection_close(apt_net_server_task_t *task, apt_net_server_connection_t *connection)
+{
+	if(connection->sock) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Close TCP Connection %s",connection->id);
+		apt_pollset_remove(task->pollset,&connection->sock_pfd);
+		apr_socket_close(connection->sock);
+		connection->sock = NULL;
+		task->server_vtable->on_disconnect(task,connection);
+	}
+	return TRUE;
+}
+
+/** Destroy connection */
+APT_DECLARE(void) apt_net_server_connection_destroy(apt_net_server_connection_t *connection)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy TCP Connection %s",connection->id);
+	apr_pool_destroy(connection->pool);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_obj_list.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_obj_list.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef WIN32
+#pragma warning(disable: 4127)
+#endif
+#include 
+#include "apt_obj_list.h"
+
+struct apt_list_elem_t {
+	APR_RING_ENTRY(apt_list_elem_t) link;
+	void                           *obj;
+};
+
+struct apt_obj_list_t {
+	APR_RING_HEAD(apt_list_head_t, apt_list_elem_t) head;
+	apr_pool_t                                     *pool;
+};
+
+
+
+APT_DECLARE(apt_obj_list_t*) apt_list_create(apr_pool_t *pool)
+{
+	apt_obj_list_t *list = apr_palloc(pool, sizeof(apt_obj_list_t));
+	list->pool = pool;
+	APR_RING_INIT(&list->head, apt_list_elem_t, link);
+	return list;
+}
+
+APT_DECLARE(void) apt_list_destroy(apt_obj_list_t *list)
+{
+	/* nothing to do, the list is allocated from the pool */
+}
+
+APT_DECLARE(apt_list_elem_t*) apt_list_push_back(apt_obj_list_t *list, void *obj, apr_pool_t *pool)
+{
+	apt_list_elem_t *elem = apr_palloc(pool,sizeof(apt_list_elem_t));
+	elem->obj = obj;
+
+	APR_RING_INSERT_TAIL(&list->head,elem,apt_list_elem_t,link);
+	return elem;
+}
+
+APT_DECLARE(void*) apt_list_pop_front(apt_obj_list_t *list)
+{
+	apt_list_elem_t *elem;
+	if(APR_RING_EMPTY(&list->head,apt_list_elem_t,link)) {
+		return NULL;
+	}
+	elem = APR_RING_FIRST(&list->head);
+	APR_RING_REMOVE(elem,link);
+	return elem->obj;
+}
+
+APT_DECLARE(void*) apt_list_head(apt_obj_list_t *list)
+{
+	apt_list_elem_t *elem;
+	if(APR_RING_EMPTY(&list->head,apt_list_elem_t,link)) {
+		return NULL;
+	}
+	elem = APR_RING_FIRST(&list->head);
+	return elem->obj;
+}
+
+APT_DECLARE(void*) apt_obj_list_tail(apt_obj_list_t *list)
+{
+	apt_list_elem_t *elem;
+	if(APR_RING_EMPTY(&list->head,apt_list_elem_t,link)) {
+		return NULL;
+	}
+	elem = APR_RING_LAST(&list->head);
+	return elem->obj;
+}
+
+APT_DECLARE(apt_list_elem_t*) apt_list_first_elem_get(apt_obj_list_t *list)
+{
+	if(APR_RING_EMPTY(&list->head,apt_list_elem_t,link)) {
+		return NULL;
+	}
+	return APR_RING_FIRST(&list->head);
+}
+
+APT_DECLARE(apt_list_elem_t*) apt_list_last_elem_get(apt_obj_list_t *list)
+{
+	if(APR_RING_EMPTY(&list->head,apt_list_elem_t,link)) {
+		return NULL;
+	}
+	return APR_RING_LAST(&list->head);
+}
+
+APT_DECLARE(apt_list_elem_t*) apt_list_next_elem_get(apt_obj_list_t *list, apt_list_elem_t *elem)
+{
+	apt_list_elem_t *next_elem = APR_RING_NEXT(elem,link);
+	if(next_elem == APR_RING_SENTINEL(&list->head,apt_list_elem_t,link)) {
+		next_elem = NULL;
+	}
+	return next_elem;
+}
+
+APT_DECLARE(apt_list_elem_t*) apt_list_prev_elem_get(apt_obj_list_t *list, apt_list_elem_t *elem)
+{
+	apt_list_elem_t *prev_elem = APR_RING_PREV(elem,link);
+	if(prev_elem == APR_RING_SENTINEL(&list->head,apt_list_elem_t,link)) {
+		prev_elem = NULL;
+	}
+	return prev_elem;
+}
+
+APT_DECLARE(apt_list_elem_t*) apt_list_elem_insert(apt_obj_list_t *list, apt_list_elem_t *elem, void *obj, apr_pool_t *pool)
+{
+	apt_list_elem_t *new_elem = apr_palloc(pool,sizeof(apt_list_elem_t));
+	new_elem->obj = obj;
+	APR_RING_INSERT_BEFORE(elem,new_elem,link);
+	return new_elem;
+}
+
+APT_DECLARE(apt_list_elem_t*) apt_list_elem_remove(apt_obj_list_t *list, apt_list_elem_t *elem)
+{
+	apt_list_elem_t *next_elem = APR_RING_NEXT(elem,link);
+	APR_RING_REMOVE(elem,link);
+	if(next_elem == APR_RING_SENTINEL(&list->head,apt_list_elem_t,link)) {
+		next_elem = NULL;
+	}
+	return next_elem;
+}
+
+APT_DECLARE(apt_bool_t) apt_list_is_empty(apt_obj_list_t *list)
+{
+	if(APR_RING_EMPTY(&list->head,apt_list_elem_t,link)) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+APT_DECLARE(void*) apt_list_elem_object_get(apt_list_elem_t *elem)
+{
+	return elem->obj;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pair.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pair.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_pair.h"
+
+/** Create array of name-value pairs */
+APT_DECLARE(apt_pair_arr_t*) apt_pair_array_create(apr_size_t initial_size, apr_pool_t *pool)
+{
+	return apr_array_make(pool,(int)initial_size,sizeof(apt_pair_t));
+}
+
+/** Copy array of name-value pairs */
+APT_DECLARE(apt_pair_arr_t*) apt_pair_array_copy(const apt_pair_arr_t *src_arr, apr_pool_t *pool)
+{
+	int i;
+	const apt_pair_t *src_pair;
+	apt_pair_t *pair;
+	apt_pair_arr_t *arr;
+	if(!src_arr) {
+		return NULL;
+	}
+	arr = apr_array_copy(pool,src_arr);
+	for(i=0; inelts; i++) {
+		pair = (apt_pair_t*)arr->elts + i;
+		src_pair = (const apt_pair_t*)src_arr->elts + i;
+		apt_pair_copy(pair,src_pair,pool);
+	}
+	return arr;
+}
+
+
+/** Append name-value pair */
+APT_DECLARE(apt_bool_t) apt_pair_array_append(apt_pair_arr_t *arr, const apt_str_t *name, const apt_str_t *value, apr_pool_t *pool)
+{
+	apt_pair_t *pair = apr_array_push(arr);
+	apt_pair_init(pair);
+	if(name) {
+		apt_string_copy(&pair->name,name,pool);
+	}
+	if(value) {
+		apt_string_copy(&pair->value,value,pool);
+	}
+	return TRUE;
+}
+
+/** Find name-value pair by name */
+APT_DECLARE(const apt_pair_t*) apt_pair_array_find(const apt_pair_arr_t *arr, const apt_str_t *name)
+{
+	int i;
+	apt_pair_t *pair;
+	for(i=0; inelts; i++) {
+		pair = (apt_pair_t*)arr->elts + i;
+		if(apt_string_compare(&pair->name,name) == TRUE) {
+			return pair;
+		}
+	}
+	return NULL;
+}
+
+/** Get size of pair array */
+APT_DECLARE(int) apt_pair_array_size_get(const apt_pair_arr_t *arr)
+{
+	return arr->nelts;
+}
+
+/** Get name-value pair by id */
+APT_DECLARE(const apt_pair_t*) apt_pair_array_get(const apt_pair_arr_t *arr, int id)
+{
+	if(id < arr->nelts) {
+		return (apt_pair_t*)arr->elts + id;
+	}
+	return NULL;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pollset.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pollset.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,323 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_pollset.h"
+#include "apt_log.h"
+
+struct apt_pollset_t {
+	/** APR pollset */
+	apr_pollset_t *base;
+#ifdef WIN32
+	/** Socket descriptors used for wakeup */
+	apr_socket_t  *wakeup_pipe[2];
+#else
+	/** Pipe descriptors used for wakeup */
+	apr_file_t    *wakeup_pipe[2];
+#endif
+	/** Builtin wakeup poll descriptor */
+	apr_pollfd_t   wakeup_pfd;
+
+	/** Pool to allocate memory from */
+	apr_pool_t    *pool;
+};
+
+static apt_bool_t apt_wakeup_pipe_create(apt_pollset_t *pollset);
+static apt_bool_t apt_wakeup_pipe_destroy(apt_pollset_t *pollset);
+
+/** Create interruptable pollset on top of APR pollset */
+APT_DECLARE(apt_pollset_t*) apt_pollset_create(apr_uint32_t size, apr_pool_t *pool)
+{
+	apt_pollset_t *pollset = apr_palloc(pool,sizeof(apt_pollset_t));
+	pollset->pool = pool;
+	memset(&pollset->wakeup_pfd,0,sizeof(pollset->wakeup_pfd));
+	
+	/* create pollset with max number of descriptors size+1, 
+	where +1 is builtin wakeup descriptor */
+	if(apr_pollset_create(&pollset->base,size+1,pool,0) != APR_SUCCESS) {
+		return NULL;
+	}
+
+	/* create wakeup pipe */
+	if(apt_wakeup_pipe_create(pollset) != TRUE) {
+		apr_pollset_destroy(pollset->base);
+		return NULL;
+	}
+
+	/* add wakeup pipe to pollset */
+	if(apr_pollset_add(pollset->base,&pollset->wakeup_pfd) != APR_SUCCESS) {
+		apt_wakeup_pipe_destroy(pollset);
+		apr_pollset_destroy(pollset->base);
+		return NULL;
+	}
+	return pollset;
+}
+
+/** Destroy pollset */
+APT_DECLARE(apt_bool_t) apt_pollset_destroy(apt_pollset_t *pollset)
+{
+	/* remove wakeup pipe from pollset */
+	apr_pollset_remove(pollset->base,&pollset->wakeup_pfd);
+	/* destroy wakeup pipe */
+	apt_wakeup_pipe_destroy(pollset);
+	/* destroy pollset */
+	apr_pollset_destroy(pollset->base);
+	return TRUE;
+}
+
+/** Add pollset descriptor to a pollset */
+APT_DECLARE(apt_bool_t) apt_pollset_add(apt_pollset_t *pollset, const apr_pollfd_t *descriptor)
+{
+	return (apr_pollset_add(pollset->base,descriptor) == APR_SUCCESS) ? TRUE : FALSE;
+}
+
+/** Remove pollset descriptor from a pollset */
+APT_DECLARE(apt_bool_t) apt_pollset_remove(apt_pollset_t *pollset, const apr_pollfd_t *descriptor)
+{
+	return (apr_pollset_remove(pollset->base,descriptor) == APR_SUCCESS) ? TRUE : FALSE;
+}
+
+/** Block for activity on the descriptor(s) in a pollset */
+APT_DECLARE(apr_status_t) apt_pollset_poll(
+								apt_pollset_t *pollset,
+								apr_interval_time_t timeout,
+								apr_int32_t *num,
+								const apr_pollfd_t **descriptors)
+{
+	return apr_pollset_poll(pollset->base,timeout,num,descriptors);
+}
+
+/** Interrupt the blocked poll call */
+APT_DECLARE(apt_bool_t) apt_pollset_wakeup(apt_pollset_t *pollset)
+{
+	apt_bool_t status = TRUE;
+#ifdef WIN32
+	char tmp = 0;
+	apr_size_t len = sizeof(tmp);
+	if(apr_socket_send(pollset->wakeup_pipe[1],&tmp,&len) != APR_SUCCESS) {
+		status = FALSE;
+	}
+#else
+	if(apr_file_putc(1, pollset->wakeup_pipe[1]) != APR_SUCCESS) {
+		status = FALSE;
+	}
+#endif
+	return status;
+}
+
+/** Match against builtin wake up descriptor in a pollset */
+APT_DECLARE(apt_bool_t) apt_pollset_is_wakeup(apt_pollset_t *pollset, const apr_pollfd_t *descriptor)
+{
+	apt_bool_t status = FALSE;
+#ifdef WIN32
+	if(descriptor->desc.s == pollset->wakeup_pipe[0]) {
+		char rb[512];
+		apr_size_t nr = sizeof(rb);
+
+		/* simply read out from the input side of the pipe all the data. */
+		while(apr_socket_recv(pollset->wakeup_pipe[0], rb, &nr) == APR_SUCCESS) {
+			if(nr != sizeof(rb)) {
+				break;
+			}
+		}
+		status = TRUE;
+	}
+#else
+	if(descriptor->desc.f == pollset->wakeup_pipe[0]) {
+		char rb[512];
+		apr_size_t nr = sizeof(rb);
+
+		/* simply read out from the input side of the pipe all the data. */
+		while(apr_file_read(pollset->wakeup_pipe[0], rb, &nr) == APR_SUCCESS) {
+			if(nr != sizeof(rb)) {
+				break;
+			}
+		}
+		status = TRUE;
+	}
+#endif
+	return status;
+}
+
+#ifdef WIN32
+static apr_status_t socket_pipe_create(apr_socket_t **rd, apr_socket_t **wr, apr_pool_t *pool)
+{
+	static int id = 0;
+
+	apr_socket_t *ls = NULL;
+	apr_sockaddr_t *pa = NULL;
+	apr_sockaddr_t *ca = NULL;
+	apr_size_t nrd;
+	int uid[2];
+	int iid[2];
+
+	/* Create the unique socket identifier
+	 * so that we know the connection originated
+	 * from us.
+	 */
+	uid[0] = getpid();
+	uid[1] = id++;
+	if(apr_socket_create(&ls, AF_INET, SOCK_STREAM, APR_PROTO_TCP, pool) != APR_SUCCESS) {
+		return apr_get_netos_error();
+	}
+	apr_socket_opt_set(ls, APR_SO_REUSEADDR, 1);
+
+	if(apr_sockaddr_info_get(&pa,"127.0.0.1",APR_INET,0,0,pool) != APR_SUCCESS) {
+		apr_socket_close(ls);
+		return apr_get_netos_error();
+	}
+
+	if(apr_socket_bind(ls, pa) != APR_SUCCESS) {
+		apr_socket_close(ls);
+		return apr_get_netos_error();
+	}
+	
+	if(apr_socket_addr_get(&ca,APR_LOCAL,ls) != APR_SUCCESS) {
+		apr_socket_close(ls);
+		return apr_get_netos_error();
+	}
+
+	if(apr_socket_listen(ls,1) != APR_SUCCESS) {
+		apr_socket_close(ls);
+		return apr_get_netos_error();
+	}
+
+	if(apr_socket_create(wr, AF_INET, SOCK_STREAM, APR_PROTO_TCP, pool) != APR_SUCCESS) {
+		apr_socket_close(ls);
+		return apr_get_netos_error();
+	}
+	apr_socket_opt_set(*wr, APR_SO_REUSEADDR, 1);
+
+	if(apr_socket_connect(*wr, ca) != APR_SUCCESS) {
+		apr_socket_close(ls);
+		apr_socket_close(*wr);
+		return apr_get_netos_error();
+	}
+	nrd = sizeof(uid);
+	if(apr_socket_send(*wr, (char *)uid, &nrd) != APR_SUCCESS) {
+		apr_socket_close(ls);
+		apr_socket_close(*wr);
+		return apr_get_netos_error();
+	}
+	
+	apr_socket_opt_set(ls, APR_SO_NONBLOCK, 0);
+	/* Listening socket is blocking by now. The accept should 
+	 * return immediatelly because we connected already.
+	 */
+	if(apr_socket_accept(rd, ls, pool) != APR_SUCCESS) {
+		apr_socket_close(ls);
+		apr_socket_close(*wr);
+		return apr_get_netos_error();
+	}
+
+	/* Put read side of the pipe to the blocking mode */
+	apr_socket_opt_set(*rd, APR_SO_NONBLOCK, 0);
+
+	for (;;) {
+		/* Verify the connection by reading the sent identification */
+		nrd = sizeof(iid);
+		if(apr_socket_recv(*rd, (char *)iid, &nrd) != APR_SUCCESS) {
+			apr_socket_close(ls);
+			apr_socket_close(*wr);
+			apr_socket_close(*rd);
+			return apr_get_netos_error();
+		}
+		if(nrd == sizeof(iid)) {
+			if(memcmp(uid, iid, sizeof(uid)) == 0) {
+				/* Wow, we recived what we sent */
+				break;
+			}
+		}
+	}
+
+	/* We don't need the listening socket any more */
+	apr_socket_close(ls);
+	return APR_SUCCESS;
+}
+
+/** Create a dummy wakeup pipe for interrupting the poller */
+static apt_bool_t apt_wakeup_pipe_create(apt_pollset_t *pollset)
+{
+	apr_socket_t *rd = NULL;
+	apr_socket_t *wr = NULL;
+	apr_status_t rv;
+	rv = socket_pipe_create(&rd,&wr,pollset->pool);
+	if(rv != APR_SUCCESS) {
+		char err_str[256];
+		apr_strerror(rv,err_str,sizeof(err_str));
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Wakeup Pipe: %s",err_str);
+		return FALSE;
+	}
+	pollset->wakeup_pfd.reqevents = APR_POLLIN;
+	pollset->wakeup_pfd.desc_type = APR_POLL_SOCKET;
+	pollset->wakeup_pfd.desc.s = rd;
+	
+	pollset->wakeup_pipe[0] = rd;
+	pollset->wakeup_pipe[1] = wr;
+	return TRUE;
+}
+
+/** Destroy wakeup pipe */
+static apt_bool_t apt_wakeup_pipe_destroy(apt_pollset_t *pollset)
+{
+	/* Close both sides of the wakeup pipe */
+	if(pollset->wakeup_pipe[0]) {
+		apr_socket_close(pollset->wakeup_pipe[0]);
+		pollset->wakeup_pipe[0] = NULL;
+	}
+	if(pollset->wakeup_pipe[1]) {
+		apr_socket_close(pollset->wakeup_pipe[1]);
+		pollset->wakeup_pipe[1] = NULL;
+	}
+	return TRUE;
+}
+
+#else 
+
+/** Create a dummy wakeup pipe for interrupting the poller */
+static apt_bool_t apt_wakeup_pipe_create(apt_pollset_t *pollset)
+{
+	apr_file_t *file_in = NULL;
+	apr_file_t *file_out = NULL;
+
+	if(apr_file_pipe_create(&file_in,&file_out,pollset->pool) != APR_SUCCESS) {
+		return FALSE;
+	}
+	pollset->wakeup_pfd.reqevents = APR_POLLIN;
+	pollset->wakeup_pfd.desc_type = APR_POLL_FILE;
+	pollset->wakeup_pfd.desc.f = file_in;
+	
+	pollset->wakeup_pipe[0] = file_in;
+	pollset->wakeup_pipe[1] = file_out;
+	return TRUE;
+}
+
+/** Destroy wakeup pipe */
+static apt_bool_t apt_wakeup_pipe_destroy(apt_pollset_t *pollset)
+{
+	/* Close both sides of the wakeup pipe */
+	if(pollset->wakeup_pipe[0]) {
+		apr_file_close(pollset->wakeup_pipe[0]);
+		pollset->wakeup_pipe[0] = NULL;
+	}
+	if(pollset->wakeup_pipe[1]) {
+		apr_file_close(pollset->wakeup_pipe[1]);
+		pollset->wakeup_pipe[1] = NULL;
+	}
+	return TRUE;
+}
+
+#endif

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pool.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_pool.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_pool.h"
+
+//#define OWN_ALLOCATOR_PER_POOL
+
+APT_DECLARE(apr_pool_t*) apt_pool_create()
+{
+	apr_pool_t *pool = NULL;
+
+#ifdef OWN_ALLOCATOR_PER_POOL
+	apr_allocator_t *allocator = NULL;
+	apr_thread_mutex_t *mutex = NULL;
+
+	if(apr_allocator_create(&allocator) == APR_SUCCESS) {
+		if(apr_pool_create_ex(&pool,NULL,NULL,allocator) == APR_SUCCESS) {
+			apr_allocator_owner_set(allocator,pool);
+			apr_thread_mutex_create(&mutex,APR_THREAD_MUTEX_NESTED,pool);
+			apr_allocator_mutex_set(allocator,mutex);
+		}
+	}
+#else
+	apr_pool_create(&pool,NULL);
+#endif
+	return pool;
+}
+
+APT_DECLARE(apr_pool_t*) apt_subpool_create(apr_pool_t *parent)
+{
+	apr_pool_t *pool = NULL;
+	apr_pool_create(&pool,parent);
+	return pool;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_string_table.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_string_table.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_string_table.h"
+
+/* Get the string by a given id. */
+APT_DECLARE(const apt_str_t*) apt_string_table_str_get(const apt_str_table_item_t table[], apr_size_t size, apr_size_t id)
+{
+	if(id < size) {
+		return &table[id].value;
+	}
+	return NULL;
+}
+
+/* Find the id associated with a given string from the table */
+APT_DECLARE(apr_size_t) apt_string_table_id_find(const apt_str_table_item_t table[], apr_size_t size, const apt_str_t *value)
+{
+	/* Key character is stored within each apt_string_table_item.
+	At first, key characters must be matched in a loop crossing the items.
+	Then whole strings should be compared only for the matched item.
+	Key characters should be automatically generated once for a given string table. */
+
+	apr_size_t i;
+	const apt_str_table_item_t *item;
+	for(i=0; ivalue.length != value->length) {
+			/* lengths of th strings differ, just contninue */
+			continue;
+		}
+		/* check whether key is available */
+		if(item->key < value->length) {
+			/* check whether values are matched by key (using no case compare) */
+			if(value->length == item->value.length && 
+				tolower(item->value.buf[item->key]) == tolower(value->buf[item->key])) {
+				/* whole strings must be compared to ensure, should be done only once for each lookup */
+				if(apt_string_compare(&item->value,value) == TRUE) {
+					return i;
+				}
+			}
+		}
+		else {
+			/* no key available, just compare whole strings */
+			if(apt_string_compare(&item->value,value) == TRUE) {
+				return i;
+			}
+		}
+	}
+
+	/* no match found, return invalid id */
+	return size;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_task.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_task.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,417 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "apt_task.h"
+#include "apt_obj_list.h"
+#include "apt_log.h"
+
+/** Internal states of the task */
+typedef enum {
+	TASK_STATE_IDLE,               /**< no task activity */
+	TASK_STATE_START_REQUESTED,    /**< task start is requested and is in progress */
+	TASK_STATE_RUNNING,            /**< task is running */
+	TASK_STATE_TERMINATE_REQUESTED /**< task termination is requested and is in progress */
+} apt_task_state_t;
+
+struct apt_task_t {
+	void                *obj;           /* external object associated with the task */
+	apr_pool_t          *pool;          /* memory pool to allocate task data from */
+	apt_task_msg_pool_t *msg_pool;      /* message pool to allocate task messages from */
+	apr_thread_mutex_t  *data_guard;    /* mutex to protect task data */
+	apr_thread_t        *thread_handle; /* thread handle */
+	apt_task_state_t     state;         /* current task state */
+	apt_task_vtable_t    vtable;        /* table of virtual methods */
+	apt_task_t          *parent_task;   /* parent (master) task */
+	apt_obj_list_t      *child_tasks;   /* list of the child (slave) tasks */
+	apr_size_t           pending_start; /* number of pending start requests */
+	apr_size_t           pending_term;  /* number of pending terminate requests */
+	const char          *name;          /* name of the task */
+};
+
+static void* APR_THREAD_FUNC apt_task_run(apr_thread_t *thread_handle, void *data);
+static apt_bool_t apt_task_terminate_request(apt_task_t *task);
+
+
+APT_DECLARE(apt_task_t*) apt_task_create(
+								void *obj,
+								apt_task_msg_pool_t *msg_pool,
+								apr_pool_t *pool)
+{
+	apt_task_t *task = apr_palloc(pool,sizeof(apt_task_t));
+	task->obj = obj;
+	task->pool = pool;
+	task->msg_pool = msg_pool;
+
+	if(!task->msg_pool) {
+		task->msg_pool = apt_task_msg_pool_create_dynamic(0,pool);
+	}
+
+	task->state = TASK_STATE_IDLE;
+	task->thread_handle = NULL;
+	if(apr_thread_mutex_create(&task->data_guard, APR_THREAD_MUTEX_DEFAULT, task->pool) != APR_SUCCESS) {
+		return NULL;
+	}
+
+	/* reset and copy vtable */
+	apt_task_vtable_reset(&task->vtable);
+	task->vtable.terminate = apt_task_terminate_request;
+	
+	task->parent_task = NULL;
+	task->child_tasks = apt_list_create(pool);
+	task->pending_start = 0;
+	task->pending_term = 0;
+	task->name = "Task";
+	return task;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_destroy(apt_task_t *task)
+{
+	apt_task_t *child_task = NULL;
+	apt_list_elem_t *elem = apt_list_first_elem_get(task->child_tasks);
+	/* walk through the list of the child tasks and destroy them */
+	while(elem) {
+		child_task = apt_list_elem_object_get(elem);
+		if(child_task) {
+			apt_task_destroy(child_task);
+		}
+		elem = apt_list_next_elem_get(task->child_tasks,elem);
+	}
+
+	if(task->state != TASK_STATE_IDLE) {
+		apt_task_wait_till_complete(task);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Destroy %s",task->name);
+	if(task->vtable.destroy) {
+		task->vtable.destroy(task);
+	}
+	
+	apr_thread_mutex_destroy(task->data_guard);
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_add(apt_task_t *task, apt_task_t *child_task)
+{
+	child_task->parent_task = task;
+	return (apt_list_push_back(task->child_tasks,child_task, child_task->pool) ? TRUE : FALSE);
+}
+
+APT_DECLARE(apt_bool_t) apt_task_start(apt_task_t *task)
+{
+	apt_bool_t status = TRUE;
+	apr_thread_mutex_lock(task->data_guard);
+	if(task->state == TASK_STATE_IDLE) {
+		apr_status_t rv;
+		task->state = TASK_STATE_START_REQUESTED;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Start %s",task->name);
+		if(task->vtable.start) {
+			/* raise virtual start method */
+			task->vtable.start(task);
+		}
+		else {
+			/* start new thread by default */
+			rv = apr_thread_create(&task->thread_handle,NULL,apt_task_run,task,task->pool);
+			if(rv != APR_SUCCESS) {
+				task->state = TASK_STATE_IDLE;
+				status = FALSE;
+			}
+		}
+	}
+	else {
+		status = FALSE;
+	}
+	apr_thread_mutex_unlock(task->data_guard);
+	return status;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_terminate(apt_task_t *task, apt_bool_t wait_till_complete)
+{
+	apt_bool_t status = FALSE;
+	apr_thread_mutex_lock(task->data_guard);
+	if(task->state == TASK_STATE_START_REQUESTED || task->state == TASK_STATE_RUNNING) {
+		task->state = TASK_STATE_TERMINATE_REQUESTED;
+	}
+	apr_thread_mutex_unlock(task->data_guard);
+
+	if(task->state == TASK_STATE_TERMINATE_REQUESTED) {
+		/* raise virtual terminate method */
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Terminate %s",task->name);
+		if(task->vtable.terminate) {
+			status = task->vtable.terminate(task);
+		}
+
+		if(wait_till_complete == TRUE && status == TRUE) {
+			apt_task_wait_till_complete(task);
+		}
+	}
+
+	return status;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_wait_till_complete(apt_task_t *task)
+{
+	if(task->thread_handle) {
+		apr_status_t s;
+		apr_thread_join(&s,task->thread_handle);
+		task->thread_handle = NULL;
+	}
+	return TRUE;
+}
+
+APT_DECLARE(void) apt_task_delay(apr_size_t msec)
+{
+	apr_sleep(1000*msec);
+}
+
+APT_DECLARE(apt_task_t*) apt_task_parent_get(apt_task_t *task)
+{
+	return task->parent_task;
+}
+
+APT_DECLARE(apr_pool_t*) apt_task_pool_get(apt_task_t *task)
+{
+	return task->pool;
+}
+
+APT_DECLARE(void*) apt_task_object_get(apt_task_t *task)
+{
+	return task->obj;
+}
+
+APT_DECLARE(apt_task_vtable_t*) apt_task_vtable_get(apt_task_t *task)
+{
+	return &task->vtable;
+}
+
+APT_DECLARE(void) apt_task_name_set(apt_task_t *task, const char *name)
+{
+	task->name = name;
+}
+
+APT_DECLARE(const char*) apt_task_name_get(apt_task_t *task)
+{
+	return task->name;
+}
+
+APT_DECLARE(apt_task_msg_t*) apt_task_msg_get(apt_task_t *task)
+{
+	if(task->msg_pool) {
+		return apt_task_msg_acquire(task->msg_pool);
+	}
+	return NULL;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_msg_signal(apt_task_t *task, apt_task_msg_t *msg)
+{
+	if(task->vtable.signal_msg) {
+		return task->vtable.signal_msg(task,msg);
+	}
+	return FALSE;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_msg_parent_signal(apt_task_t *task, apt_task_msg_t *msg)
+{
+	apt_task_t *parent_task = task->parent_task;
+	if(parent_task) {
+		if(parent_task->vtable.signal_msg) {
+			return parent_task->vtable.signal_msg(parent_task,msg);
+		}
+	}
+	return FALSE;
+}
+
+
+APT_DECLARE(apt_bool_t) apt_core_task_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	apt_bool_t running = TRUE;
+	switch(msg->sub_type) {
+		case CORE_TASK_MSG_START_COMPLETE: 
+		{
+			if(!task->pending_start) {
+				/* error case, no pending start */
+				break;
+			}
+			task->pending_start--;
+			if(!task->pending_start) {
+				if(task->vtable.on_start_complete) {
+					task->vtable.on_start_complete(task);
+				}
+				if(task->parent_task) {
+					/* signal start-complete message */
+					apt_task_msg_signal(task->parent_task,msg);
+				}
+			}
+			break;
+		}
+		case CORE_TASK_MSG_TERMINATE_REQUEST:
+		{
+			apt_task_child_terminate(task);
+			if(!task->pending_term) {
+				running = FALSE;
+			}
+			break;
+		}
+		case CORE_TASK_MSG_TERMINATE_COMPLETE:
+		{
+			if(!task->pending_term) {
+				/* error case, no pending terminate */
+				break;
+			}
+			task->pending_term--;
+			if(!task->pending_term) {
+				if(task->vtable.on_terminate_complete) {
+					task->vtable.on_terminate_complete(task);
+				}
+				if(task->parent_task) {
+					/* signal terminate-complete message */
+					apt_task_msg_signal(task->parent_task,msg);
+				}
+				running = FALSE;
+			}
+			break;
+		}
+		default: break;
+	}
+	return running;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	apt_bool_t running = TRUE;
+	if(msg->type == TASK_MSG_CORE) {
+		running = apt_core_task_msg_process(task,msg);
+	}
+	else {
+		if(task->vtable.process_msg) {
+			task->vtable.process_msg(task,msg);
+		}
+	}
+	
+	apt_task_msg_release(msg);
+	return running;
+}
+
+static apt_bool_t apt_task_terminate_request(apt_task_t *task)
+{
+	if(task->msg_pool) {
+		apt_task_msg_t *msg = apt_task_msg_acquire(task->msg_pool);
+		/* signal terminate-request message */
+		msg->type = TASK_MSG_CORE;
+		msg->sub_type = CORE_TASK_MSG_TERMINATE_REQUEST;
+		return apt_task_msg_signal(task,msg);
+	}
+	return FALSE;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_child_start(apt_task_t *task)
+{
+	apt_task_t *child_task = NULL;
+	apt_list_elem_t *elem = apt_list_first_elem_get(task->child_tasks);
+	task->pending_start = 0;
+	/* walk through the list of the child tasks and start them */
+	while(elem) {
+		child_task = apt_list_elem_object_get(elem);
+		if(child_task) {
+			if(apt_task_start(child_task) == TRUE) {
+				task->pending_start++;
+			}
+		}
+		elem = apt_list_next_elem_get(task->child_tasks,elem);
+	}
+
+	if(!task->pending_start) {
+		/* no child task to start, just raise start-complete event */
+		if(task->vtable.on_start_complete) {
+			task->vtable.on_start_complete(task);
+		}
+		if(task->parent_task) {
+			if(task->msg_pool) {
+				apt_task_msg_t *msg = apt_task_msg_acquire(task->msg_pool);
+				/* signal start-complete message */
+				msg->type = TASK_MSG_CORE;
+				msg->sub_type = CORE_TASK_MSG_START_COMPLETE;
+				apt_task_msg_signal(task->parent_task,msg);
+			}
+		}
+	}
+	return TRUE;
+}
+
+APT_DECLARE(apt_bool_t) apt_task_child_terminate(apt_task_t *task)
+{
+	apt_task_t *child_task = NULL;
+	apt_list_elem_t *elem = apt_list_first_elem_get(task->child_tasks);
+	task->pending_term = 0;
+	/* walk through the list of the child tasks and terminate them */
+	while(elem) {
+		child_task = apt_list_elem_object_get(elem);
+		if(child_task) {
+			if(apt_task_terminate(child_task,FALSE) == TRUE) {
+				task->pending_term++;
+			}
+		}
+		elem = apt_list_next_elem_get(task->child_tasks,elem);
+	}
+
+	if(!task->pending_term) {
+		/* no child task to terminate, just raise terminate-complete event */
+		if(task->vtable.on_terminate_complete) {
+			task->vtable.on_terminate_complete(task);
+		}
+		if(task->parent_task) {
+			if(task->msg_pool) {
+				apt_task_msg_t *msg = apt_task_msg_acquire(task->msg_pool);
+				/* signal terminate-complete message */
+				msg->type = TASK_MSG_CORE;
+				msg->sub_type = CORE_TASK_MSG_TERMINATE_COMPLETE;
+				apt_task_msg_signal(task->parent_task,msg);
+			}
+		}
+	}
+	return TRUE;
+}
+
+static void* APR_THREAD_FUNC apt_task_run(apr_thread_t *thread_handle, void *data)
+{
+	apt_task_t *task = data;
+	
+	/* raise pre-run event */
+	if(task->vtable.on_pre_run) {
+		task->vtable.on_pre_run(task);
+	}
+	apr_thread_mutex_lock(task->data_guard);
+	task->state = TASK_STATE_RUNNING;
+	apr_thread_mutex_unlock(task->data_guard);
+
+	/* start child tasks (if any) */
+	apt_task_child_start(task);
+
+	/* run task */
+	if(task->vtable.run) {
+		task->vtable.run(task);
+	}
+
+	apr_thread_mutex_lock(task->data_guard);
+	task->state = TASK_STATE_IDLE;
+	apr_thread_mutex_unlock(task->data_guard);
+	/* raise post-run event */
+	if(task->vtable.on_post_run) {
+		task->vtable.on_post_run(task);
+	}
+	return NULL;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_task_msg.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_task_msg.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_task_msg.h"
+
+/** Abstract pool of task messages to allocate task messages from */
+struct apt_task_msg_pool_t {
+	void (*destroy)(apt_task_msg_pool_t *pool);
+
+	apt_task_msg_t* (*acquire_msg)(apt_task_msg_pool_t *pool);
+	void (*release_msg)(apt_task_msg_t *task_msg);
+
+	void       *obj;
+	apr_pool_t *pool;
+};
+
+
+/** Dynamic allocation of messages (no actual pool exist)*/
+typedef struct apt_msg_pool_dynamic_t apt_msg_pool_dynamic_t;
+
+struct apt_msg_pool_dynamic_t {
+	apr_size_t size;
+};
+
+static apt_task_msg_t* dynamic_pool_acquire_msg(apt_task_msg_pool_t *task_msg_pool)
+{
+	apt_msg_pool_dynamic_t *dynamic_pool = task_msg_pool->obj;
+	apt_task_msg_t *task_msg = malloc(dynamic_pool->size);
+	task_msg->msg_pool = task_msg_pool;
+	task_msg->type = TASK_MSG_USER;
+	task_msg->sub_type = 0;
+	return task_msg;
+}
+
+static void dynamic_pool_release_msg(apt_task_msg_t *task_msg)
+{
+	if(task_msg) {
+		free(task_msg);
+	}
+}
+
+static void dynamic_pool_destroy(apt_task_msg_pool_t *task_msg_pool)
+{
+	/* nothing to do */
+}
+
+APT_DECLARE(apt_task_msg_pool_t*) apt_task_msg_pool_create_dynamic(apr_size_t msg_size, apr_pool_t *pool)
+{
+	apt_task_msg_pool_t *task_msg_pool = apr_palloc(pool,sizeof(apt_task_msg_pool_t));
+	apt_msg_pool_dynamic_t *dynamic_pool = apr_palloc(pool,sizeof(apt_msg_pool_dynamic_t));
+	dynamic_pool->size = msg_size + sizeof(apt_task_msg_t) - 1;
+
+	task_msg_pool->pool = pool;
+	task_msg_pool->obj = dynamic_pool;
+	task_msg_pool->acquire_msg = dynamic_pool_acquire_msg;
+	task_msg_pool->release_msg = dynamic_pool_release_msg;
+	task_msg_pool->destroy = dynamic_pool_destroy;
+	return task_msg_pool;
+}
+
+
+/** Static allocation of messages from message pool (not implemented yet) */
+APT_DECLARE(apt_task_msg_pool_t*) apt_task_msg_pool_create_static(apr_size_t msg_size, apr_size_t pool_size, apr_pool_t *pool)
+{
+	return NULL;
+}
+
+
+
+APT_DECLARE(void) apt_task_msg_pool_destroy(apt_task_msg_pool_t *msg_pool)
+{
+	if(msg_pool->destroy) {
+		msg_pool->destroy(msg_pool);
+	}
+}
+
+APT_DECLARE(apt_task_msg_t*) apt_task_msg_acquire(apt_task_msg_pool_t *task_msg_pool)
+{
+	if(!task_msg_pool->acquire_msg)
+		return NULL;
+	return task_msg_pool->acquire_msg(task_msg_pool);
+}
+
+APT_DECLARE(void) apt_task_msg_release(apt_task_msg_t *task_msg)
+{
+	apt_task_msg_pool_t *task_msg_pool = task_msg->msg_pool;
+	if(task_msg_pool->release_msg)
+		task_msg_pool->release_msg(task_msg);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_test_suite.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_test_suite.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_pool.h"
+#include "apt_obj_list.h"
+#include "apt_test_suite.h"
+#include "apt_log.h"
+
+struct apt_test_framework_t{
+	apr_pool_t     *pool;
+	apt_obj_list_t *suites;
+};
+
+APT_DECLARE(apt_test_suite_t*) apt_test_suite_create(apr_pool_t *pool, const char *name, 
+													 void *obj, apt_test_f tester)
+{
+	apt_test_suite_t *suite = apr_palloc(pool,sizeof(apt_test_suite_t));
+	suite->pool = pool;
+	apt_string_assign(&suite->name,name,pool);
+	suite->obj = obj;
+	suite->tester = tester;
+	return suite;
+}
+
+APT_DECLARE(apt_test_framework_t*) apt_test_framework_create()
+{
+	apt_test_framework_t *framework;
+	apr_pool_t* pool = apt_pool_create();
+	framework = apr_palloc(pool,sizeof(apt_test_framework_t));
+	framework->pool = pool;
+	framework->suites = apt_list_create(pool);
+
+	apt_log_instance_create(APT_LOG_OUTPUT_CONSOLE,APT_PRIO_INFO,pool);
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create Test Framework");
+	return framework;
+}
+
+APT_DECLARE(void) apt_test_framework_destroy(apt_test_framework_t *framework)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy Test Framework");
+	apt_log_instance_destroy();
+	apr_pool_destroy(framework->pool);
+}
+
+APT_DECLARE(apt_bool_t) apt_test_framework_suite_add(apt_test_framework_t *framework, apt_test_suite_t *suite)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add Test Suite [%s]",suite->name);
+	return (apt_list_push_back(framework->suites,suite,suite->pool) ? TRUE : FALSE);
+}
+
+APT_DECLARE(apr_pool_t*) apt_test_framework_pool_get(apt_test_framework_t *framework)
+{
+	return framework->pool;
+}
+
+static apt_bool_t apt_test_framework_suite_run(apt_test_framework_t *framework, apt_test_suite_t *suite,
+											   int argc, const char * const *argv)
+{
+	apt_bool_t status = FALSE;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"----- Run Test Suite [%s] -----",suite->name);
+	if(suite->tester) {
+		status = suite->tester(suite,argc,argv);
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"---- Status [%s] ----\n",(status == TRUE) ? "OK" : "Failure");
+	return status;
+}
+
+APT_DECLARE(apt_bool_t) apt_test_framework_run(apt_test_framework_t *framework, int argc, const char * const *argv)
+{
+	apt_test_suite_t *suite = NULL;
+	apt_list_elem_t *elem = apt_list_first_elem_get(framework->suites);
+	if(argc == 1) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Run All Test Suites");
+		/* walk through the list of test suites and run all of them */
+		while(elem) {
+			suite = apt_list_elem_object_get(elem);
+			if(suite) {
+				/* run test suite with the default arguments */
+				apt_test_framework_suite_run(framework,suite,0,NULL);
+			}
+			elem = apt_list_next_elem_get(framework->suites,elem);
+		}
+	}
+	else {
+		/* walk through the list of test suites find appropriate one and run it */
+		apt_bool_t found = FALSE;
+		apt_str_t name;
+		apt_string_set(&name,argv[1]);
+		while(elem) {
+			suite = apt_list_elem_object_get(elem);
+			if(suite && apt_string_compare(&suite->name,&name) == TRUE) {
+				found = TRUE;
+				break;
+			}
+			elem = apt_list_next_elem_get(framework->suites,elem);
+		}
+		if(found == TRUE) {
+			/* run test suite with remaining arguments */
+			apt_test_framework_suite_run(framework,suite,argc-2,&argv[2]);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Such Test Suite [%s] to Run", argv[1]);
+		}
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_text_stream.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/src/apt_text_stream.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,372 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_text_stream.h"
+
+#define TOKEN_TRUE  "true"
+#define TOKEN_FALSE "false"
+#define TOKEN_TRUE_LENGTH  (sizeof(TOKEN_TRUE)-1)
+#define TOKEN_FALSE_LENGTH (sizeof(TOKEN_FALSE)-1)
+
+
+/** Navigate through the lines of the text stream (message) */
+APT_DECLARE(apt_bool_t) apt_text_line_read(apt_text_stream_t *stream, apt_str_t *line)
+{
+	char *pos = stream->pos;
+	const char *end = stream->text.buf + stream->text.length;
+	apt_bool_t eol = FALSE;
+	line->length = 0;
+	line->buf = pos;
+	/* while not end of stream */
+	while(pos < end) {
+		if(*pos == APT_TOKEN_CR) {
+			/* end of line detected */
+			line->length = pos - line->buf;
+			pos++;
+			if(pos < end && *pos == APT_TOKEN_LF) {
+				pos++;
+			}
+			eol = TRUE;
+			break;
+		}
+		else if(*pos == APT_TOKEN_LF) {
+			/* end of line detected */
+			line->length = pos - line->buf;
+			pos++;
+			eol = TRUE;
+			break;
+		}
+		pos++;
+	}
+
+	stream->pos = pos;
+	return eol;
+}
+
+/** Navigate through the headers (name:value pairs) of the text stream (message) 
+	Valid headers are:
+		name:value
+		name: value
+		name:    value
+		name: value
+		name:              (only name, no value)
+		                   (empty header)
+	Malformed headers are:
+		name:value               (missing end of line )
+		name               (missing separator ':')
+*/
+APT_DECLARE(apt_bool_t) apt_text_header_read(apt_text_stream_t *stream, apt_pair_t *pair)
+{
+	char *pos = stream->pos;
+	const char *end = stream->text.buf + stream->text.length;
+	apt_bool_t eol = FALSE;
+	apt_string_reset(&pair->name);
+	apt_string_reset(&pair->value);
+	/* while not end of stream */
+	while(pos < end) {
+		if(*pos == APT_TOKEN_CR) {
+			/* end of line detected */
+			if(pair->value.buf) {
+				/* set length of the value */
+				pair->value.length = pos - pair->value.buf;
+			}
+			pos++;
+			if(pos < end && *pos == APT_TOKEN_LF) {
+				pos++;
+			}
+			eol = TRUE;
+			break;
+		}
+		else if(*pos == APT_TOKEN_LF) {
+			/* end of line detected */
+			if(pair->value.buf) {
+				/* set length of the value */
+				pair->value.length = pos - pair->value.buf;
+			}
+			pos++;
+			eol = TRUE;
+			break;
+		}
+		else if(!pair->name.length) {
+			/* skip initial spaces and read name */
+			if(!pair->name.buf && *pos != APT_TOKEN_SP) {
+				pair->name.buf = pos;
+			}
+			if(*pos == ':') {
+				/* set length of the name */
+				pair->name.length = pos - pair->name.buf;
+			}
+		}
+		else if(!pair->value.length) {
+			/* skip initial spaces and read value */
+			if(!pair->value.buf && *pos != APT_TOKEN_SP) {
+				pair->value.buf = pos;
+			}
+		}
+		pos++;
+	}
+
+	stream->pos = pos;
+	/* if length == 0 && buf -> header is malformed */
+	return (eol && (pair->name.length || !pair->name.buf));
+}
+
+
+/** Navigate through the fields of the line */
+APT_DECLARE(apt_bool_t) apt_text_field_read(apt_text_stream_t *stream, char separator, apt_bool_t skip_spaces, apt_str_t *field)
+{
+	char *pos = stream->pos;
+	const char *end = stream->text.buf + stream->text.length;
+	if(skip_spaces == TRUE) {
+		while(pos < end && *pos == APT_TOKEN_SP) pos++;
+	}
+
+	field->buf = pos;
+	field->length = 0;
+	while(pos < end && *pos != separator) pos++;
+
+	field->length = pos - field->buf;
+	if(pos < end) {
+		/* skip the separator */
+		pos++;
+	}
+
+	stream->pos = pos;
+	return field->length ? TRUE : FALSE;
+}
+
+/** Scroll text stream */
+APT_DECLARE(apt_bool_t) apt_text_stream_scroll(apt_text_stream_t *stream)
+{
+	apr_size_t remaining_length = stream->text.buf + stream->text.length - stream->pos;
+	if(!remaining_length || remaining_length == stream->text.length) {
+		stream->pos = stream->text.buf + remaining_length;
+		return FALSE;
+	}
+	memmove(stream->text.buf,stream->pos,remaining_length);
+	stream->pos = stream->text.buf + remaining_length;
+	stream->text.length = remaining_length;
+	*stream->pos = '\0';
+	return TRUE;
+}
+
+/** Parse id at resource string */
+APT_DECLARE(apt_bool_t) apt_id_resource_parse(const apt_str_t *str, char separator, apt_str_t *id, apt_str_t *resource, apr_pool_t *pool)
+{
+	apt_str_t field = *str;
+	const char *pos = strchr(str->buf,separator);
+	if(!pos) {
+		return FALSE;
+	}
+
+	field.length = pos - field.buf;
+	if(field.length >= str->length) {
+		return FALSE;
+	}
+	apt_string_copy(id,&field,pool);
+	field.buf += field.length + 1;
+	field.length = str->length - (field.length + 1);
+	apt_string_copy(resource,&field,pool);
+	return TRUE;
+}
+
+/** Generate id at resource string */
+APT_DECLARE(apt_bool_t) apt_id_resource_generate(const apt_str_t *id, const apt_str_t *resource, char separator, apt_str_t *str, apr_pool_t *pool)
+{
+	apr_size_t length = id->length+resource->length+1;
+	char *buf = apr_palloc(pool,length+1);
+	memcpy(buf,id->buf,id->length);
+	buf[id->length] = separator;
+	memcpy(buf+id->length+1,resource->buf,resource->length);
+	buf[length] = '\0';
+	str->buf = buf;
+	str->length = length;
+	return TRUE;
+}
+
+/** Generate only the name ("name":) of the header */
+APT_DECLARE(apt_bool_t) apt_text_header_name_generate(const apt_str_t *name, apt_text_stream_t *stream)
+{
+	char *pos = stream->pos;
+	memcpy(pos,name->buf,name->length);
+	pos += name->length;
+	*pos++ = ':';
+	*pos++ = ' ';
+	stream->pos = pos;
+	return TRUE;
+}
+
+/** Parse name=value pair */
+static apt_bool_t apt_pair_parse(apt_pair_t *pair, const apt_str_t *field, apr_pool_t *pool)
+{
+	apt_text_stream_t stream;
+	stream.text = *field;
+	stream.pos = stream.text.buf;
+
+	/* read name */
+	if(apt_text_field_read(&stream,'=',TRUE,&pair->name) == FALSE) {
+		return FALSE;
+	}
+
+	/* read value */
+	apt_text_field_read(&stream,';',TRUE,&pair->value);
+	return TRUE;
+}
+
+/** Parse array of name-value pairs */
+APT_DECLARE(apt_bool_t) apt_pair_array_parse(apt_pair_arr_t *arr, const apt_str_t *value, apr_pool_t *pool)
+{
+	apt_str_t field;
+	apt_pair_t *pair;
+	apt_text_stream_t stream;
+	if(!arr || !value) {
+		return FALSE;
+	}
+
+	stream.text = *value;
+	stream.pos = stream.text.buf;
+	/* read name-value pairs */
+	while(apt_text_field_read(&stream,';',TRUE,&field) == TRUE) {
+		pair = apr_array_push(arr);
+		apt_pair_parse(pair,&field,pool);
+	}
+	return TRUE;
+}
+
+/** Generate array of name-value pairs */
+APT_DECLARE(apt_bool_t) apt_pair_array_generate(apt_pair_arr_t *arr, apt_text_stream_t *stream)
+{
+	int i;
+	apt_pair_t *pair;
+	char *pos = stream->pos;
+	if(!arr) {
+		return FALSE;
+	}
+
+	for(i=0; inelts; i++) {
+		pair = (apt_pair_t*)arr->elts + i;
+		if(i != 0) {
+			*pos++ = ';';
+		}
+		if(pair->name.length) {
+			memcpy(pos,pair->name.buf,pair->name.length);
+			pos += pair->name.length;
+			if(pair->value.length) {
+				*pos++ = '=';
+				memcpy(pos,pair->value.buf,pair->value.length);
+				pos += pair->value.length;
+			}
+		}
+	}
+	stream->pos = pos;
+	return TRUE;
+}
+
+/** Parse boolean-value */
+APT_DECLARE(apt_bool_t) apt_boolean_value_parse(const apt_str_t *str, apt_bool_t *value)
+{
+	if(!str->buf) {
+		return FALSE;
+	}
+	if(strncasecmp(str->buf,TOKEN_TRUE,TOKEN_TRUE_LENGTH) == 0) {
+		*value = TRUE;
+		return TRUE;
+	}
+	if(strncasecmp(str->buf,TOKEN_FALSE,TOKEN_FALSE_LENGTH) == 0) {
+		*value = FALSE;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/** Generate boolean-value */
+APT_DECLARE(apt_bool_t) apt_boolean_value_generate(apt_bool_t value, apt_text_stream_t *stream)
+{
+	if(value == TRUE) {
+		memcpy(stream->pos,TOKEN_TRUE,TOKEN_TRUE_LENGTH);
+		stream->pos += TOKEN_TRUE_LENGTH;
+	}
+	else {
+		memcpy(stream->pos,TOKEN_FALSE,TOKEN_FALSE_LENGTH);
+		stream->pos += TOKEN_FALSE_LENGTH;
+	}
+	return TRUE;
+}
+
+
+/** Generate value plus the length (number of digits) of the value itself. */
+APT_DECLARE(apt_bool_t) apt_var_length_value_generate(apr_size_t *value, apr_size_t max_count, apt_str_t *str)
+{
+	/* (N >= (10^M-M)) ? N+M+1 : N+M */
+	apr_size_t temp;
+	apr_size_t count; /* M */
+	apr_size_t bounds; /* 10^M */
+	int length;
+
+	/* calculate count */
+	temp = *value;
+	count = 0;
+	do{count++; temp /= 10;} while(temp);
+
+	/* calculate bounds */
+	temp = count;
+	bounds = 1;
+	do{bounds *= 10; temp--;} while(temp);
+
+	if(*value >= bounds - count) {
+		count++;
+	}
+
+	*value += count;
+	if(count > max_count) {
+		return FALSE;
+	}
+
+	str->length = 0;
+	length = sprintf(str->buf, "%"APR_SIZE_T_FMT, *value);
+	if(length <= 0) {
+		return FALSE;
+	}
+	str->length = length;
+	return TRUE;
+}
+
+
+/** Generate unique identifier (hex string) */
+APT_DECLARE(apt_bool_t) apt_unique_id_generate(apt_str_t *id, apr_size_t length, apr_pool_t *pool)
+{
+	char *hex_str;
+	apr_size_t i;
+	apr_size_t count;
+	apr_uuid_t uuid;
+	apr_uuid_get(&uuid);
+	
+	hex_str = apr_palloc(pool,length+1);
+	
+	count = length / 2;
+	if(count > sizeof(uuid)) {
+		count = sizeof(uuid);
+	}
+	for(i=0; ibuf = hex_str;
+	id->length = length;
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,63 @@
+MAINTAINERCLEANFILES 	 = Makefile.in
+
+INCLUDES                 = -I$(top_srcdir)/libs/mpf/codecs \
+                           -I$(top_srcdir)/libs/mpf/include \
+                           -I$(top_srcdir)/libs/apr-toolkit/include \
+                           $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES       = libmpf.la
+
+include_HEADERS          = codecs/g711/g711.h \
+                           include/mpf.h \
+                           include/mpf_activity_detector.h \
+                           include/mpf_audio_file_descriptor.h \
+                           include/mpf_audio_file_stream.h \
+                           include/mpf_bridge.h \
+                           include/mpf_buffer.h \
+                           include/mpf_codec.h \
+                           include/mpf_codec_descriptor.h \
+                           include/mpf_codec_manager.h \
+                           include/mpf_context.h \
+                           include/mpf_engine.h \
+                           include/mpf_frame.h \
+                           include/mpf_message.h \
+                           include/mpf_object.h \
+                           include/mpf_stream.h \
+                           include/mpf_stream_mode.h \
+                           include/mpf_termination.h \
+                           include/mpf_rtp_termination_factory.h \
+                           include/mpf_file_termination_factory.h \
+                           include/mpf_timer.h \
+                           include/mpf_types.h \
+                           include/mpf_encoder.h \
+                           include/mpf_decoder.h \
+                           include/mpf_jitter_buffer.h \
+                           include/mpf_rtp_header.h \
+                           include/mpf_rtp_descriptor.h \
+                           include/mpf_rtp_stream.h \
+                           include/mpf_rtp_stat.h \
+                           include/mpf_rtp_defs.h \
+                           include/mpf_rtp_attribs.h \
+                           include/mpf_media_descriptor.h \
+                           include/mpf_user.h
+
+libmpf_la_SOURCES        = codecs/g711/g711.c \
+                           src/mpf_activity_detector.c \
+                           src/mpf_audio_file_stream.c \
+                           src/mpf_bridge.c \
+                           src/mpf_buffer.c \
+                           src/mpf_codec_descriptor.c \
+                           src/mpf_codec_g711.c \
+                           src/mpf_codec_linear.c \
+                           src/mpf_codec_manager.c \
+                           src/mpf_context.c \
+                           src/mpf_engine.c \
+                           src/mpf_termination.c \
+                           src/mpf_rtp_termination_factory.c \
+                           src/mpf_file_termination_factory.c \
+                           src/mpf_timer.c \
+                           src/mpf_encoder.c \
+                           src/mpf_decoder.c \
+                           src/mpf_jitter_buffer.c \
+                           src/mpf_rtp_stream.c \
+                           src/mpf_rtp_attribs.c

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/codecs/g711/g711.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/codecs/g711/g711.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,91 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
+ *
+ * g711.c - A-law and u-law transcoding routines
+ *
+ * Written by Steve Underwood 
+ *
+ * Copyright (C) 2006 Steve Underwood
+ *
+ *  Despite my general liking of the GPL, I place this code in the
+ *  public domain for the benefit of all mankind - even the slimy
+ *  ones who might try to proprietize my work and use it to my
+ *  detriment.
+ *
+ */
+
+/*! \file */
+
+#ifdef HAVE_CONFIG_H
+#include 
+#endif
+
+#include 
+#include 
+#include 
+#include 
+#ifndef _MSC_VER
+#include 
+#ifdef HAVE_TGMATH_H
+#include 
+#endif
+#endif
+
+#include "g711.h"
+
+/* Copied from the CCITT G.711 specification */
+static const uint8_t ulaw_to_alaw_table[256] =
+{
+     42,  43,  40,  41,  46,  47,  44,  45,  34,  35,  32,  33,  38,  39,  36,  37,
+     58,  59,  56,  57,  62,  63,  60,  61,  50,  51,  48,  49,  54,  55,  52,  53,
+     10,  11,   8,   9,  14,  15,  12,  13,   2,   3,   0,   1,   6,   7,   4,  26,
+     27,  24,  25,  30,  31,  28,  29,  18,  19,  16,  17,  22,  23,  20,  21, 106,
+    104, 105, 110, 111, 108, 109,  98,  99,  96,  97, 102, 103, 100, 101, 122, 120,
+    126, 127, 124, 125, 114, 115, 112, 113, 118, 119, 116, 117,  75,  73,  79,  77,
+     66,  67,  64,  65,  70,  71,  68,  69,  90,  91,  88,  89,  94,  95,  92,  93,
+     82,  82,  83,  83,  80,  80,  81,  81,  86,  86,  87,  87,  84,  84,  85,  85,
+    170, 171, 168, 169, 174, 175, 172, 173, 162, 163, 160, 161, 166, 167, 164, 165,
+    186, 187, 184, 185, 190, 191, 188, 189, 178, 179, 176, 177, 182, 183, 180, 181,
+    138, 139, 136, 137, 142, 143, 140, 141, 130, 131, 128, 129, 134, 135, 132, 154,
+    155, 152, 153, 158, 159, 156, 157, 146, 147, 144, 145, 150, 151, 148, 149, 234,
+    232, 233, 238, 239, 236, 237, 226, 227, 224, 225, 230, 231, 228, 229, 250, 248,
+    254, 255, 252, 253, 242, 243, 240, 241, 246, 247, 244, 245, 203, 201, 207, 205,
+    194, 195, 192, 193, 198, 199, 196, 197, 218, 219, 216, 217, 222, 223, 220, 221,
+    210, 210, 211, 211, 208, 208, 209, 209, 214, 214, 215, 215, 212, 212, 213, 213
+};
+
+/* These transcoding tables are copied from the CCITT G.711 specification. To achieve
+   optimal results, do not change them. */
+
+static const uint8_t alaw_to_ulaw_table[256] =
+{
+     42,  43,  40,  41,  46,  47,  44,  45,  34,  35,  32,  33,  38,  39,  36,  37,
+     57,  58,  55,  56,  61,  62,  59,  60,  49,  50,  47,  48,  53,  54,  51,  52,
+     10,  11,   8,   9,  14,  15,  12,  13,   2,   3,   0,   1,   6,   7,   4,   5,
+     26,  27,  24,  25,  30,  31,  28,  29,  18,  19,  16,  17,  22,  23,  20,  21,
+     98,  99,  96,  97, 102, 103, 100, 101,  93,  93,  92,  92,  95,  95,  94,  94,
+    116, 118, 112, 114, 124, 126, 120, 122, 106, 107, 104, 105, 110, 111, 108, 109,
+     72,  73,  70,  71,  76,  77,  74,  75,  64,  65,  63,  63,  68,  69,  66,  67,
+     86,  87,  84,  85,  90,  91,  88,  89,  79,  79,  78,  78,  82,  83,  80,  81,
+    170, 171, 168, 169, 174, 175, 172, 173, 162, 163, 160, 161, 166, 167, 164, 165,
+    185, 186, 183, 184, 189, 190, 187, 188, 177, 178, 175, 176, 181, 182, 179, 180,
+    138, 139, 136, 137, 142, 143, 140, 141, 130, 131, 128, 129, 134, 135, 132, 133,
+    154, 155, 152, 153, 158, 159, 156, 157, 146, 147, 144, 145, 150, 151, 148, 149,
+    226, 227, 224, 225, 230, 231, 228, 229, 221, 221, 220, 220, 223, 223, 222, 222,
+    244, 246, 240, 242, 252, 254, 248, 250, 234, 235, 232, 233, 238, 239, 236, 237,
+    200, 201, 198, 199, 204, 205, 202, 203, 192, 193, 191, 191, 196, 197, 194, 195,
+    214, 215, 212, 213, 218, 219, 216, 217, 207, 207, 206, 206, 210, 211, 208, 209
+};
+
+uint8_t alaw_to_ulaw(uint8_t alaw)
+{
+    return alaw_to_ulaw_table[alaw];
+}
+/*- End of function --------------------------------------------------------*/
+
+uint8_t ulaw_to_alaw(uint8_t ulaw)
+{
+    return ulaw_to_alaw_table[ulaw];
+}
+/*- End of function --------------------------------------------------------*/
+/*- End of file ------------------------------------------------------------*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/codecs/g711/g711.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/codecs/g711/g711.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,381 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
+ *
+ * g711.h - In line A-law and u-law conversion routines
+ *
+ * Written by Steve Underwood 
+ *
+ * Copyright (C) 2001 Steve Underwood
+ *
+ *  Despite my general liking of the GPL, I place this code in the
+ *  public domain for the benefit of all mankind - even the slimy
+ *  ones who might try to proprietize my work and use it to my
+ *  detriment.
+ *
+ */
+
+/*! \file */
+
+/*! \page g711_page A-law and mu-law handling
+Lookup tables for A-law and u-law look attractive, until you consider the impact
+on the CPU cache. If it causes a substantial area of your processor cache to get
+hit too often, cache sloshing will severely slow things down. The main reason
+these routines are slow in C, is the lack of direct access to the CPU's "find
+the first 1" instruction. A little in-line assembler fixes that, and the
+conversion routines can be faster than lookup tables, in most real world usage.
+A "find the first 1" instruction is available on most modern CPUs, and is a
+much underused feature. 
+
+If an assembly language method of bit searching is not available, these routines
+revert to a method that can be a little slow, so the cache thrashing might not
+seem so bad :(
+
+Feel free to submit patches to add fast "find the first 1" support for your own
+favourite processor.
+
+Look up tables are used for transcoding between A-law and u-law, since it is
+difficult to achieve the precise transcoding procedure laid down in the G.711
+specification by other means.
+*/
+
+#if !defined(_G711_H_)
+#define _G711_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _MSC_VER
+#ifndef __inline__
+#define __inline__ __inline
+#endif
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef __int32 int32_t;
+typedef unsigned __int16 uint16_t;
+#endif
+
+#if defined(__i386__)
+/*! \brief Find the bit position of the highest set bit in a word
+    \param bits The word to be searched
+    \return The bit number of the highest set bit, or -1 if the word is zero. */
+static __inline__ int top_bit(unsigned int bits)
+{
+    int res;
+
+    __asm__ __volatile__(" movl $-1,%%edx;\n"
+                         " bsrl %%eax,%%edx;\n"
+                         : "=d" (res)
+                         : "a" (bits));
+    return res;
+}
+/*- End of function --------------------------------------------------------*/
+
+/*! \brief Find the bit position of the lowest set bit in a word
+    \param bits The word to be searched
+    \return The bit number of the lowest set bit, or -1 if the word is zero. */
+static __inline__ int bottom_bit(unsigned int bits)
+{
+    int res;
+
+    __asm__ __volatile__(" movl $-1,%%edx;\n"
+                         " bsfl %%eax,%%edx;\n"
+                         : "=d" (res)
+                         : "a" (bits));
+    return res;
+}
+/*- End of function --------------------------------------------------------*/
+#elif defined(__x86_64__)
+static __inline__ int top_bit(unsigned int bits)
+{
+    int res;
+
+    __asm__ __volatile__(" movq $-1,%%rdx;\n"
+                         " bsrq %%rax,%%rdx;\n"
+                         : "=d" (res)
+                         : "a" (bits));
+    return res;
+}
+/*- End of function --------------------------------------------------------*/
+
+static __inline__ int bottom_bit(unsigned int bits)
+{
+    int res;
+
+    __asm__ __volatile__(" movq $-1,%%rdx;\n"
+                         " bsfq %%rax,%%rdx;\n"
+                         : "=d" (res)
+                         : "a" (bits));
+    return res;
+}
+/*- End of function --------------------------------------------------------*/
+#else
+static __inline__ int top_bit(unsigned int bits)
+{
+    int i;
+    
+    if (bits == 0)
+        return -1;
+    i = 0;
+    if (bits & 0xFFFF0000)
+    {
+        bits &= 0xFFFF0000;
+        i += 16;
+    }
+    if (bits & 0xFF00FF00)
+    {
+        bits &= 0xFF00FF00;
+        i += 8;
+    }
+    if (bits & 0xF0F0F0F0)
+    {
+        bits &= 0xF0F0F0F0;
+        i += 4;
+    }
+    if (bits & 0xCCCCCCCC)
+    {
+        bits &= 0xCCCCCCCC;
+        i += 2;
+    }
+    if (bits & 0xAAAAAAAA)
+    {
+        bits &= 0xAAAAAAAA;
+        i += 1;
+    }
+    return i;
+}
+/*- End of function --------------------------------------------------------*/
+
+static __inline__ int bottom_bit(unsigned int bits)
+{
+    int i;
+    
+    if (bits == 0)
+        return -1;
+    i = 32;
+    if (bits & 0x0000FFFF)
+    {
+        bits &= 0x0000FFFF;
+        i -= 16;
+    }
+    if (bits & 0x00FF00FF)
+    {
+        bits &= 0x00FF00FF;
+        i -= 8;
+    }
+    if (bits & 0x0F0F0F0F)
+    {
+        bits &= 0x0F0F0F0F;
+        i -= 4;
+    }
+    if (bits & 0x33333333)
+    {
+        bits &= 0x33333333;
+        i -= 2;
+    }
+    if (bits & 0x55555555)
+    {
+        bits &= 0x55555555;
+        i -= 1;
+    }
+    return i;
+}
+/*- End of function --------------------------------------------------------*/
+#endif
+
+/* N.B. It is tempting to use look-up tables for A-law and u-law conversion.
+ *      However, you should consider the cache footprint.
+ *
+ *      A 64K byte table for linear to x-law and a 512 byte table for x-law to
+ *      linear sound like peanuts these days, and shouldn't an array lookup be
+ *      real fast? No! When the cache sloshes as badly as this one will, a tight
+ *      calculation may be better. The messiest part is normally finding the
+ *      segment, but a little inline assembly can fix that on an i386, x86_64 and
+ *      many other modern processors.
+ */
+ 
+/*
+ * Mu-law is basically as follows:
+ *
+ *      Biased Linear Input Code        Compressed Code
+ *      ------------------------        ---------------
+ *      00000001wxyza                   000wxyz
+ *      0000001wxyzab                   001wxyz
+ *      000001wxyzabc                   010wxyz
+ *      00001wxyzabcd                   011wxyz
+ *      0001wxyzabcde                   100wxyz
+ *      001wxyzabcdef                   101wxyz
+ *      01wxyzabcdefg                   110wxyz
+ *      1wxyzabcdefgh                   111wxyz
+ *
+ * Each biased linear code has a leading 1 which identifies the segment
+ * number. The value of the segment number is equal to 7 minus the number
+ * of leading 0's. The quantization interval is directly available as the
+ * four bits wxyz.  * The trailing bits (a - h) are ignored.
+ *
+ * Ordinarily the complement of the resulting code word is used for
+ * transmission, and so the code word is complemented before it is returned.
+ *
+ * For further information see John C. Bellamy's Digital Telephony, 1982,
+ * John Wiley & Sons, pps 98-111 and 472-476.
+ */
+
+//#define ULAW_ZEROTRAP                 /* turn on the trap as per the MIL-STD */
+#define ULAW_BIAS        0x84           /* Bias for linear code. */
+
+/*! \brief Encode a linear sample to u-law
+    \param linear The sample to encode.
+    \return The u-law value.
+*/
+static __inline__ uint8_t linear_to_ulaw(int linear)
+{
+    uint8_t u_val;
+    int mask;
+    int seg;
+
+    /* Get the sign and the magnitude of the value. */
+    if (linear < 0)
+    {
+        linear = ULAW_BIAS - linear;
+        mask = 0x7F;
+    }
+    else
+    {
+        linear = ULAW_BIAS + linear;
+        mask = 0xFF;
+    }
+
+    seg = top_bit(linear | 0xFF) - 7;
+
+    /*
+     * Combine the sign, segment, quantization bits,
+     * and complement the code word.
+     */
+    if (seg >= 8)
+        u_val = (uint8_t) (0x7F ^ mask);
+    else
+        u_val = (uint8_t) (((seg << 4) | ((linear >> (seg + 3)) & 0xF)) ^ mask);
+#ifdef ULAW_ZEROTRAP
+    /* Optional ITU trap */
+    if (u_val == 0)
+        u_val = 0x02;
+#endif
+    return  u_val;
+}
+/*- End of function --------------------------------------------------------*/
+
+/*! \brief Decode an u-law sample to a linear value.
+    \param ulaw The u-law sample to decode.
+    \return The linear value.
+*/
+static __inline__ int16_t ulaw_to_linear(uint8_t ulaw)
+{
+    int t;
+    
+    /* Complement to obtain normal u-law value. */
+    ulaw = ~ulaw;
+    /*
+     * Extract and bias the quantization bits. Then
+     * shift up by the segment number and subtract out the bias.
+     */
+    t = (((ulaw & 0x0F) << 3) + ULAW_BIAS) << (((int) ulaw & 0x70) >> 4);
+    return  (int16_t) ((ulaw & 0x80)  ?  (ULAW_BIAS - t)  :  (t - ULAW_BIAS));
+}
+/*- End of function --------------------------------------------------------*/
+
+/*
+ * A-law is basically as follows:
+ *
+ *      Linear Input Code        Compressed Code
+ *      -----------------        ---------------
+ *      0000000wxyza             000wxyz
+ *      0000001wxyza             001wxyz
+ *      000001wxyzab             010wxyz
+ *      00001wxyzabc             011wxyz
+ *      0001wxyzabcd             100wxyz
+ *      001wxyzabcde             101wxyz
+ *      01wxyzabcdef             110wxyz
+ *      1wxyzabcdefg             111wxyz
+ *
+ * For further information see John C. Bellamy's Digital Telephony, 1982,
+ * John Wiley & Sons, pps 98-111 and 472-476.
+ */
+
+#define ALAW_AMI_MASK       0x55
+
+/*! \brief Encode a linear sample to A-law
+    \param linear The sample to encode.
+    \return The A-law value.
+*/
+static __inline__ uint8_t linear_to_alaw(int linear)
+{
+    int mask;
+    int seg;
+    
+    if (linear >= 0)
+    {
+        /* Sign (bit 7) bit = 1 */
+        mask = ALAW_AMI_MASK | 0x80;
+    }
+    else
+    {
+        /* Sign (bit 7) bit = 0 */
+        mask = ALAW_AMI_MASK;
+        linear = -linear - 8;
+    }
+
+    /* Convert the scaled magnitude to segment number. */
+    seg = top_bit(linear | 0xFF) - 7;
+    if (seg >= 8)
+    {
+        if (linear >= 0)
+        {
+            /* Out of range. Return maximum value. */
+            return (uint8_t) (0x7F ^ mask);
+        }
+        /* We must be just a tiny step below zero */
+        return (uint8_t) (0x00 ^ mask);
+    }
+    /* Combine the sign, segment, and quantization bits. */
+    return (uint8_t) (((seg << 4) | ((linear >> ((seg)  ?  (seg + 3)  :  4)) & 0x0F)) ^ mask);
+}
+/*- End of function --------------------------------------------------------*/
+
+/*! \brief Decode an A-law sample to a linear value.
+    \param alaw The A-law sample to decode.
+    \return The linear value.
+*/
+static __inline__ int16_t alaw_to_linear(uint8_t alaw)
+{
+    int i;
+    int seg;
+
+    alaw ^= ALAW_AMI_MASK;
+    i = ((alaw & 0x0F) << 4);
+    seg = (((int) alaw & 0x70) >> 4);
+    if (seg)
+        i = (i + 0x108) << (seg - 1);
+    else
+        i += 8;
+    return (int16_t) ((alaw & 0x80)  ?  i  :  -i);
+}
+/*- End of function --------------------------------------------------------*/
+
+/*! \brief Transcode from A-law to u-law, using the procedure defined in G.711.
+    \param alaw The A-law sample to transcode.
+    \return The best matching u-law value.
+*/
+uint8_t alaw_to_ulaw(uint8_t alaw);
+
+/*! \brief Transcode from u-law to A-law, using the procedure defined in G.711.
+    \param alaw The u-law sample to transcode.
+    \return The best matching A-law value.
+*/
+uint8_t ulaw_to_alaw(uint8_t ulaw);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/*- End of file ------------------------------------------------------------*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_H__
+#define __MPF_H__
+
+/**
+ * @file mpf.h
+ * @brief Media Processing Framework Definitions
+ */ 
+
+#include 
+
+/** lib export/import defines (win32) */
+#ifdef WIN32
+#ifdef MPF_STATIC_LIB
+#define MPF_DECLARE(type)   type __stdcall
+#else
+#ifdef MPF_LIB_EXPORT
+#define MPF_DECLARE(type)   __declspec(dllexport) type __stdcall
+#else
+#define MPF_DECLARE(type)   __declspec(dllimport) type __stdcall
+#endif
+#endif
+#else
+#define MPF_DECLARE(type) type
+#endif
+
+#endif /*__MPF_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_activity_detector.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_activity_detector.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_ACTIVITY_DETECTOR_H__
+#define __MPF_ACTIVITY_DETECTOR_H__
+
+/**
+ * @file mpf_activity_detector.h
+ * @brief MPF Voice Activity Detector
+ */ 
+
+#include "mpf_frame.h"
+#include "mpf_codec.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque (voice) activity detector */
+typedef struct mpf_activity_detector_t mpf_activity_detector_t;
+
+/** Events of activity detector */
+typedef enum {
+	MPF_DETECTOR_EVENT_NONE,       /**< no event occurred */
+	MPF_DETECTOR_EVENT_ACTIVITY,   /**< voice activity (transition to activity from inactivity state) */
+	MPF_DETECTOR_EVENT_INACTIVITY, /**< voice inactivity (transition to inactivity from activity state) */
+	MPF_DETECTOR_EVENT_NOINPUT     /**< noinput event occurred */
+} mpf_detector_event_e;
+
+
+/** Create activity detector */
+MPF_DECLARE(mpf_activity_detector_t*) mpf_activity_detector_create(apr_pool_t *pool);
+
+/** Set threshold of voice activity (silence) level */
+MPF_DECLARE(void) mpf_activity_detector_level_set(mpf_activity_detector_t *detector, apr_size_t level_threshold);
+
+/** Set noinput timeout */
+MPF_DECLARE(void) mpf_activity_detector_noinput_timeout_set(mpf_activity_detector_t *detector, apr_size_t noinput_timeout);
+
+/** Set transition complete timeout */
+MPF_DECLARE(void) mpf_activity_detector_complete_timeout_set(mpf_activity_detector_t *detector, apr_size_t complete_timeout);
+
+/** Process current frame, return detected event if any */
+MPF_DECLARE(mpf_detector_event_e) mpf_activity_detector_process(mpf_activity_detector_t *detector, const mpf_frame_t *frame);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_ACTIVITY_DETECTOR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_audio_file_descriptor.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_audio_file_descriptor.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_AUDIO_FILE_DESCRIPTOR_H__
+#define __MPF_AUDIO_FILE_DESCRIPTOR_H__
+
+/**
+ * @file mpf_audio_file_descriptor.h
+ * @brief MPF Audio File Descriptor
+ */ 
+
+#include 
+#include "mpf_stream_mode.h"
+#include "mpf_codec_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** FILE_READER is defined as STREAM_MODE_RECEIVE */
+#define FILE_READER STREAM_MODE_RECEIVE
+/** FILE_WRITER is defined as STREAM_MODE_SEND */
+#define FILE_WRITER STREAM_MODE_SEND
+
+/** Audio file descriptor declaration */
+typedef struct mpf_audio_file_descriptor_t mpf_audio_file_descriptor_t;
+
+/** Audio file descriptor */
+struct mpf_audio_file_descriptor_t {
+	/** Indicate what descriptor for (reader and/or write) */
+	mpf_stream_mode_e      mask;
+	/** Codec descriptor to use for audio file read/write */
+	mpf_codec_descriptor_t codec_descriptor;
+	/** File handle to read audio stream */
+	FILE                  *read_handle;
+	/** File handle to write audio stream */
+	FILE                  *write_handle;
+	/** Max size of file  */
+	apr_size_t             max_write_size;
+};
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_AUDIO_FILE_DESCRIPTOR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_audio_file_stream.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_audio_file_stream.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_AUDIO_FILE_STREAM_H__
+#define __MPF_AUDIO_FILE_STREAM_H__
+
+/**
+ * @file mpf_audio_file_stream.h
+ * @brief MPF Audio FIle Stream
+ */ 
+
+#include "mpf_stream.h"
+#include "mpf_audio_file_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create file stream.
+ * @param termination the back pointer to hold
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_audio_stream_t*) mpf_file_stream_create(mpf_termination_t *termination, apr_pool_t *pool);
+
+/**
+ * Modify file stream.
+ * @param stream file stream to modify
+ * @param descriptor the descriptor to modify stream according
+ */
+MPF_DECLARE(apt_bool_t) mpf_file_stream_modify(mpf_audio_stream_t *stream, mpf_audio_file_descriptor_t *descriptor);
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_AUDIO_FILE_STREAM_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_bridge.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_bridge.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_BRIDGE_H__
+#define __MPF_BRIDGE_H__
+
+/**
+ * @file mpf_bridge.h
+ * @brief MPF Stream Bridge
+ */ 
+
+#include "mpf_object.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create bridge of audio streams.
+ * @param source the source audio stream
+ * @param sink the sink audio stream
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_object_t*) mpf_bridge_create(mpf_audio_stream_t *source, mpf_audio_stream_t *sink, apr_pool_t *pool);
+
+/**
+ * Create bridge of audio streams with the same codec descriptor.
+ * @param source the source audio stream
+ * @param sink the sink audio stream
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_object_t*) mpf_null_bridge_create(mpf_audio_stream_t *source, mpf_audio_stream_t *sink, apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_BRIDGE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_buffer.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_buffer.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_BUFFER_H__
+#define __MPF_BUFFER_H__
+
+/**
+ * @file mpf_buffer.h
+ * @brief Buffer of Media Chunks
+ */ 
+
+#include "mpf_frame.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque media buffer declaration */
+typedef struct mpf_buffer_t mpf_buffer_t;
+
+
+/** Create buffer */
+mpf_buffer_t* mpf_buffer_create(apr_pool_t *pool);
+
+/** Destroy buffer */
+void mpf_buffer_destroy(mpf_buffer_t *buffer);
+
+/** Restart buffer */
+apt_bool_t mpf_buffer_restart(mpf_buffer_t *buffer);
+
+/** Write audio chunk to buffer */
+apt_bool_t mpf_buffer_audio_write(mpf_buffer_t *buffer, void *data, apr_size_t size);
+
+/** Write event to buffer */
+apt_bool_t mpf_buffer_event_write(mpf_buffer_t *buffer, mpf_frame_type_e event_type);
+
+/** Read media frame from buffer */
+apt_bool_t mpf_buffer_frame_read(mpf_buffer_t *buffer, mpf_frame_t *media_frame);
+
+/** Get size of buffer **/
+apr_size_t mpf_buffer_get_size(mpf_buffer_t *buffer);
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_BUFFER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_CODEC_H__
+#define __MPF_CODEC_H__
+
+/**
+ * @file mpf_codec.h
+ * @brief MPF Codec
+ */ 
+
+#include "mpf_codec_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Codec virtual table declaration */
+typedef struct mpf_codec_vtable_t mpf_codec_vtable_t;
+/** Codec declaration*/
+typedef struct mpf_codec_t mpf_codec_t;
+
+/** Codec */
+struct mpf_codec_t {
+	/** Codec manipulators (encode, decode, dissect) */
+	const mpf_codec_vtable_t     *vtable;
+	/** Codec attributes (capabilities) */
+	const mpf_codec_attribs_t    *attribs;
+	/** Optional static codec descriptor (pt < 96) */
+	const mpf_codec_descriptor_t *static_descriptor;
+	
+	/** Negotiated codec descriptor */
+	mpf_codec_descriptor_t       *descriptor;
+};
+
+/** Table of codec virtual methods */
+struct mpf_codec_vtable_t {
+	/** Virtual open method */
+	apt_bool_t (*open)(mpf_codec_t *codec);
+	/** Virtual close method */
+	apt_bool_t (*close)(mpf_codec_t *codec);
+
+	/** Virtual encode method */
+	apt_bool_t (*encode)(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out);
+	/** Virtual decode method */
+	apt_bool_t (*decode)(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out);
+
+	/** Virtual dissect method */
+	apt_bool_t (*dissect)(mpf_codec_t *codec, void **buffer, apr_size_t *size, mpf_codec_frame_t *frame);
+};
+
+/**
+ * Create codec.
+ * @param vtable the table of virtual mthods
+ * @param attribs the codec attributes
+ * @param descriptor the codec descriptor
+ * @param pool the pool to allocate memory from
+ */
+static APR_INLINE mpf_codec_t* mpf_codec_create(
+									const mpf_codec_vtable_t *vtable, 
+									const mpf_codec_attribs_t *attribs, 
+									const mpf_codec_descriptor_t *descriptor, 
+									apr_pool_t *pool)
+{
+	mpf_codec_t *codec = (mpf_codec_t*)apr_palloc(pool,sizeof(mpf_codec_t));
+	codec->vtable = vtable;
+	codec->attribs = attribs;
+	codec->static_descriptor = descriptor;
+	codec->descriptor = NULL;
+	return codec;
+}
+
+/**
+ * Close codec.
+ * @param src_codec the source (original) codec to clone
+ * @param pool the pool to allocate memory from
+ */
+static APR_INLINE mpf_codec_t* mpf_codec_clone(mpf_codec_t *src_codec, apr_pool_t *pool)
+{
+	mpf_codec_t *codec = (mpf_codec_t*)apr_palloc(pool,sizeof(mpf_codec_t));
+	codec->vtable = src_codec->vtable;
+	codec->attribs = src_codec->attribs;
+	codec->static_descriptor = src_codec->static_descriptor;
+	codec->descriptor = src_codec->descriptor;
+	return codec;
+}
+
+/** Open codec */
+static APR_INLINE apt_bool_t mpf_codec_open(mpf_codec_t *codec)
+{
+	apt_bool_t rv = TRUE;
+	if(codec->descriptor) {
+		if(codec->vtable->open) {
+			rv = codec->vtable->open(codec);
+		}
+	}
+	else {
+		rv = FALSE;
+	}
+	return rv;
+}
+
+/** Close codec */
+static APR_INLINE apt_bool_t mpf_codec_close(mpf_codec_t *codec)
+{
+	apt_bool_t rv = TRUE;
+	if(codec->vtable->close) {
+		rv = codec->vtable->close(codec);
+	}
+	return rv;
+}
+
+/** Encode codec frame */
+static APR_INLINE apt_bool_t mpf_codec_encode(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out)
+{
+	apt_bool_t rv = TRUE;
+	if(codec->vtable->encode) {
+		rv = codec->vtable->encode(codec,frame_in,frame_out);
+	}
+	return rv;
+}
+
+/** Decode codec frame */
+static APR_INLINE apt_bool_t mpf_codec_decode(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out)
+{
+	apt_bool_t rv = TRUE;
+	if(codec->vtable->decode) {
+		rv = codec->vtable->decode(codec,frame_in,frame_out);
+	}
+	return rv;
+}
+
+/** Dissect codec frame (navigate through codec frames in a buffer, which may contain multiple frames) */
+static APR_INLINE apt_bool_t mpf_codec_dissect(mpf_codec_t *codec, void **buffer, apr_size_t *size, mpf_codec_frame_t *frame)
+{
+	apt_bool_t rv = TRUE;
+	if(codec->vtable->dissect) {
+		/* custom dissector for codecs like G.729, G.723 */
+		rv = codec->vtable->dissect(codec,buffer,size,frame);
+	}
+	else {
+		/* default dissector */
+		if(*size >= frame->size && frame->size) {
+			memcpy(frame->buffer,*buffer,frame->size);
+			
+			*buffer = (apr_byte_t*)*buffer + frame->size;
+			*size = *size - frame->size;
+		}
+		else {
+			rv = FALSE;
+		}
+	}
+	return rv;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_CODEC_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_descriptor.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_descriptor.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_CODEC_DESCRIPTOR_H__
+#define __MPF_CODEC_DESCRIPTOR_H__
+
+/**
+ * @file mpf_codec_descriptor.h
+ * @brief MPF Codec Descriptor
+ */ 
+
+#include 
+#include "apt_string.h"
+#include "mpf.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Codec frame time base in msec */
+#define CODEC_FRAME_TIME_BASE 10
+/** Bytes per sample for linear pcm */
+#define BYTES_PER_SAMPLE 2
+/** Bits per sample for linear pcm */
+#define BITS_PER_SAMPLE 16
+
+/** Supported sampling rates */
+typedef enum {
+	MPF_SAMPLE_RATE_NONE  = 0x00,
+	MPF_SAMPLE_RATE_8000  = 0x01,
+	MPF_SAMPLE_RATE_16000 = 0x02
+} mpf_sample_rates_e;
+
+/** Codec descriptor declaration */
+typedef struct mpf_codec_descriptor_t mpf_codec_descriptor_t;
+/** Codec list declaration */
+typedef struct mpf_codec_list_t mpf_codec_list_t;
+/** Codec frame declaration */
+typedef struct mpf_codec_frame_t mpf_codec_frame_t;
+/** Codec attributes declaration */
+typedef struct mpf_codec_attribs_t mpf_codec_attribs_t;
+
+
+/** Codec descriptor */
+struct mpf_codec_descriptor_t {
+	/** Payload type used in RTP packet */
+	apr_byte_t   payload_type;
+	/** Codec name */
+	apt_str_t    name;
+	/** Sampling rate */
+	apr_uint16_t sampling_rate;
+	/** Channel count */
+	apr_byte_t   channel_count;
+	/** Codec dependent additional format */
+	const char  *format;
+	/**  Enabled/disabled state */
+	apt_bool_t   enabled;
+};
+
+/** List of codec descriptors */
+struct mpf_codec_list_t {
+	/** Dynamic array of mpf_codec_descriptor_t */
+	apr_array_header_t     *descriptor_arr;
+	/** Preffered codec descriptor */
+	mpf_codec_descriptor_t *preffered;
+};
+
+/** Codec frame */
+struct mpf_codec_frame_t {
+	/** Raw buffer, which may contain encoded or decoded data */
+	void      *buffer;
+	/** Buffer size */
+	apr_size_t size;
+};
+
+/** Codec attributes */
+struct mpf_codec_attribs_t {
+	/** Codec name */
+	apt_str_t  name;
+	/** Bits per sample */
+	apr_byte_t bits_per_samples;
+	/** Supported sampling rates (mpf_sample_rates_e) */
+	int        sample_rates;
+};
+
+
+/** Initialize codec descriptor */
+static APR_INLINE void mpf_codec_descriptor_init(mpf_codec_descriptor_t *descriptor)
+{
+	descriptor->payload_type = 0;
+	apt_string_reset(&descriptor->name);
+	descriptor->sampling_rate = 0;
+	descriptor->channel_count = 0;
+	descriptor->format = NULL;
+	descriptor->enabled = TRUE;
+}
+
+/** Calculate encoded frame size in bytes */
+static APR_INLINE apr_size_t mpf_codec_frame_size_calculate(const mpf_codec_descriptor_t *descriptor, const mpf_codec_attribs_t *attribs)
+{
+	return descriptor->channel_count * attribs->bits_per_samples * CODEC_FRAME_TIME_BASE * 
+			descriptor->sampling_rate / 1000 / 8; /* 1000 - msec per sec, 8 - bits per byte */
+}
+
+/** Calculate samples of the frame (ts) */
+static APR_INLINE apr_size_t mpf_codec_frame_samples_calculate(const mpf_codec_descriptor_t *descriptor)
+{
+	return descriptor->channel_count * CODEC_FRAME_TIME_BASE * descriptor->sampling_rate / 1000;
+}
+
+/** Calculate linear frame size in bytes */
+static APR_INLINE apr_size_t mpf_codec_linear_frame_size_calculate(apr_uint16_t sampling_rate, apr_byte_t channel_count)
+{
+	return channel_count * BYTES_PER_SAMPLE * CODEC_FRAME_TIME_BASE * sampling_rate / 1000;
+}
+
+/** Reset list of codec descriptors */
+static APR_INLINE void mpf_codec_list_reset(mpf_codec_list_t *codec_list)
+{
+	codec_list->descriptor_arr = NULL;
+	codec_list->preffered = NULL;
+}
+
+/** Initialize list of codec descriptors */
+static APR_INLINE void mpf_codec_list_init(mpf_codec_list_t *codec_list, apr_size_t initial_count, apr_pool_t *pool)
+{
+	codec_list->descriptor_arr = apr_array_make(pool,(int)initial_count, sizeof(mpf_codec_descriptor_t));
+}
+
+/** Copy list of codec descriptors */
+static APR_INLINE void mpf_codec_list_copy(mpf_codec_list_t *codec_list, const mpf_codec_list_t *src_codec_list, apr_pool_t *pool)
+{
+	codec_list->descriptor_arr = apr_array_copy(pool,src_codec_list->descriptor_arr);
+}
+
+/** Increment number of codec descriptors in the list and return the descriptor to fill */
+static APR_INLINE mpf_codec_descriptor_t* mpf_codec_list_add(mpf_codec_list_t *codec_list)
+{
+	mpf_codec_descriptor_t* descriptor = (mpf_codec_descriptor_t*)apr_array_push(codec_list->descriptor_arr);
+	mpf_codec_descriptor_init(descriptor);
+	return descriptor;
+}
+
+/** Determine if codec list is empty */
+static APR_INLINE apt_bool_t mpf_codec_list_is_empty(const mpf_codec_list_t *codec_list)
+{
+	return apr_is_empty_array(codec_list->descriptor_arr);
+}
+
+/** Get codec descriptor by index */
+static APR_INLINE mpf_codec_descriptor_t* mpf_codec_get(const mpf_codec_list_t *codec_list, apr_size_t id)
+{
+	mpf_codec_descriptor_t *descriptor;
+	if(id >= (apr_size_t)codec_list->descriptor_arr->nelts) {
+		return NULL;
+	}
+	descriptor = (mpf_codec_descriptor_t*)codec_list->descriptor_arr->elts;
+	return descriptor + id;
+}
+
+/** Match two codec descriptors */
+MPF_DECLARE(apt_bool_t) mpf_codec_descriptor_match(const mpf_codec_descriptor_t *descriptor1, const mpf_codec_descriptor_t *descriptor2);
+/** Intersect two codec lists */
+MPF_DECLARE(apt_bool_t) mpf_codec_list_intersect(mpf_codec_list_t *codec_list1, mpf_codec_list_t *codec_list2);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_CODEC_DESCRIPTOR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_manager.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_manager.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_CODEC_MANAGER_H__
+#define __MPF_CODEC_MANAGER_H__
+
+/**
+ * @file mpf_codec_manager.h
+ * @brief MPF Codec Manager
+ */ 
+
+#include "mpf_types.h"
+#include "mpf_codec.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Create codec manager */
+MPF_DECLARE(mpf_codec_manager_t*) mpf_codec_manager_create(apr_size_t codec_count, apr_pool_t *pool);
+
+/** Destroy codec manager */
+MPF_DECLARE(void) mpf_codec_manager_destroy(mpf_codec_manager_t *codec_manager);
+
+/** Register codec in codec manager */
+MPF_DECLARE(apt_bool_t) mpf_codec_manager_codec_register(mpf_codec_manager_t *codec_manager, mpf_codec_t *codec);
+
+/** Get (allocate) codec by codec descriptor */
+MPF_DECLARE(mpf_codec_t*) mpf_codec_manager_codec_get(const mpf_codec_manager_t *codec_manager, mpf_codec_descriptor_t *descriptor, apr_pool_t *pool);
+
+/** Get (allocate) list of available codecs */
+MPF_DECLARE(apt_bool_t) mpf_codec_manager_codec_list_get(const mpf_codec_manager_t *codec_manager, mpf_codec_list_t *codec_list, apr_pool_t *pool);
+
+/** Load (allocate) list of codecs  */
+MPF_DECLARE(apt_bool_t) mpf_codec_manager_codec_list_load(const mpf_codec_manager_t *codec_manager, mpf_codec_list_t *codec_list, const char *str, apr_pool_t *pool);
+
+/** Find codec by name  */
+MPF_DECLARE(const mpf_codec_t*) mpf_codec_manager_codec_find(const mpf_codec_manager_t *codec_manager, const apt_str_t *codec_name);
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_CODEC_MANAGER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_context.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_context.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_CONTEXT_H__
+#define __MPF_CONTEXT_H__
+
+/**
+ * @file mpf_context.h
+ * @brief MPF Context
+ */ 
+
+#include "mpf_object.h"
+#include "apt_obj_list.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Definition of table item used in context */
+typedef void* table_item_t;
+
+/** Media processing context */
+struct mpf_context_t {
+    /** Pool to allocate memory from */
+	apr_pool_t        *pool;
+    /** External object */
+	void              *obj;
+    /** Set when context is addded to the list to ensure quick find on delete */
+	apt_list_elem_t   *elem;
+
+	/** Max number of terminations */
+	apr_size_t          max_termination_count;
+	/** Current number of terminations */
+	apr_size_t          termination_count;
+	/** Table, which holds terminations and topology */
+	table_item_t      **table;
+};
+
+
+/**
+ * Add termination to context.
+ * @param context the context to add termination to
+ * @param termination the termination to add
+ */
+MPF_DECLARE(apt_bool_t) mpf_context_termination_add(mpf_context_t *context, mpf_termination_t *termination);
+
+/**
+ * Subtract termination from context.
+ * @param context the context to subtract termination from
+ * @param termination the termination to subtract
+ */
+MPF_DECLARE(apt_bool_t) mpf_context_termination_subtract(mpf_context_t *context, mpf_termination_t *termination);
+
+/**
+ * Apply topology.
+ * @param context the context which holds the termination
+ * @param termination the termination to apply toplogy for
+ */
+MPF_DECLARE(apt_bool_t) mpf_context_topology_apply(mpf_context_t *context, mpf_termination_t *termination);
+
+/**
+ * Destroy topology.
+ * @param context the context which holds the termination
+ * @param termination the termination to destroy toplogy for
+ */
+MPF_DECLARE(apt_bool_t) mpf_context_topology_destroy(mpf_context_t *context, mpf_termination_t *termination);
+
+/**
+ * Process context.
+ * @param context the context
+ */
+MPF_DECLARE(apt_bool_t) mpf_context_process(mpf_context_t *context);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_CONTEXT_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_decoder.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_decoder.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_DECODER_H__
+#define __MPF_DECODER_H__
+
+/**
+ * @file mpf_decoder.h
+ * @brief MPF Stream Decoder
+ */ 
+
+#include "mpf_stream.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create audio stream decoder.
+ * @param source the source to get encoded stream from
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_audio_stream_t*) mpf_decoder_create(mpf_audio_stream_t *source, apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_ENCODER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_encoder.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_encoder.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_ENCODER_H__
+#define __MPF_ENCODER_H__
+
+/**
+ * @file mpf_encoder.h
+ * @brief MPF Stream Encoder
+ */ 
+
+#include "mpf_stream.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create audio stream encoder.
+ * @param sink the sink to write encoded stream to
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_audio_stream_t*) mpf_encoder_create(mpf_audio_stream_t *sink, apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_ENCODER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_engine.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_engine.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_ENGINE_H__
+#define __MPF_ENGINE_H__
+
+/**
+ * @file mpf_engine.h
+ * @brief Media Processing Framework Engine
+ */ 
+
+#include "apt_task.h"
+#include "mpf_message.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create MPF engine.
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_engine_t*) mpf_engine_create(apr_pool_t *pool);
+
+/**
+ * Create MPF codec manager.
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_codec_manager_t*) mpf_engine_codec_manager_create(apr_pool_t *pool);
+
+/**
+ * Register MPF codec manager.
+ * @param engine the engine to register codec manager for
+ * @param codec_manager the codec manager to register
+ */
+MPF_DECLARE(apt_bool_t) mpf_engine_codec_manager_register(mpf_engine_t *engine, const mpf_codec_manager_t *codec_manager);
+
+/**
+ * Get task.
+ * @param engine the engine to get task from
+ */
+MPF_DECLARE(apt_task_t*) mpf_task_get(mpf_engine_t *engine);
+
+/**
+ * Set task msg type to send responses and events with.
+ * @param engine the engine to set task msg type for
+ * @param type the type to set
+ */
+MPF_DECLARE(void) mpf_engine_task_msg_type_set(mpf_engine_t *engine, apt_task_msg_type_e type);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_ENGINE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_file_termination_factory.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_file_termination_factory.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_FILE_TERMINATION_FACTORY_H__
+#define __MPF_FILE_TERMINATION_FACTORY_H__
+
+/**
+ * @file mpf_file_termination_factory.h
+ * @brief MPF File Termination Factory
+ */ 
+
+#include "mpf_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create file termination factory.
+ */
+MPF_DECLARE(mpf_termination_factory_t*) mpf_file_termination_factory_create(apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_RTP_TERMINATION_FACTORY_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_frame.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_frame.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_FRAME_H__
+#define __MPF_FRAME_H__
+
+/**
+ * @file mpf_frame.h
+ * @brief MPF Audio/Video/Named-event Frame
+ */ 
+
+#include "mpf_codec_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Media frame types */
+typedef enum {
+	MEDIA_FRAME_TYPE_NONE  = 0x0, /**< none */
+	MEDIA_FRAME_TYPE_AUDIO = 0x1, /**< audio frame */
+	MEDIA_FRAME_TYPE_VIDEO = 0x2, /**< video frame */
+	MEDIA_FRAME_TYPE_EVENT = 0x4  /**< named event frame (RFC2833) */
+} mpf_frame_type_e;
+
+/** Named event declaration */
+typedef struct mpf_named_event_frame_t mpf_named_event_frame_t;
+/** Media frame declaration */
+typedef struct mpf_frame_t mpf_frame_t;
+
+
+/** Named event (RFC2833, out-of-band DTMF) */
+struct mpf_named_event_frame_t {
+	/** event (DTMF, tone) identifier */
+	apr_uint32_t event_id: 8;
+#if (APR_IS_BIGENDIAN == 1)
+	/** end of event */
+	apr_uint32_t edge:     1;
+	/** reserved */
+	apr_uint32_t reserved: 1;
+	/** tone volume */
+	apr_uint32_t volume:   6;
+#else
+	/** tone volume */
+	apr_uint32_t volume:   6;
+	/** reserved */
+	apr_uint32_t reserved: 1;
+	/** end of event */
+	apr_uint32_t edge:     1;
+#endif
+	/** event duration */
+	apr_uint32_t duration: 16;
+};
+
+/** Media frame */
+struct mpf_frame_t {
+	/** frame type (audio/video/named-event) mpf_frame_type_e */
+	int                     type;
+	/** codec frame */
+	mpf_codec_frame_t       codec_frame;
+	/** named-event frame */
+	mpf_named_event_frame_t event_frame;
+};
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_FRAME_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_jitter_buffer.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_jitter_buffer.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_JITTER_BUFFER_H__
+#define __MPF_JITTER_BUFFER_H__
+
+/**
+ * @file mpf_jitter_buffer.h
+ * @brief Jitter Buffer
+ */ 
+
+#include "mpf_frame.h"
+#include "mpf_codec.h"
+#include "mpf_rtp_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Jitter buffer write result */
+typedef enum {
+	JB_OK,                   /**< successful write */
+	JB_DISCARD_NOT_ALLIGNED, /**< discarded write (frame isn't alligned to CODEC_FRAME_TIME_BASE) */
+	JB_DISCARD_TOO_LATE,     /**< discarded write (frame is arrived too late) */
+	JB_DISCARD_TOO_EARLY,    /**< discarded write (frame is arrived too early, buffer is full) */
+} jb_result_t;
+
+/** Opaque jitter buffer declaration */
+typedef struct mpf_jitter_buffer_t mpf_jitter_buffer_t;
+
+
+/** Create jitter buffer */
+mpf_jitter_buffer_t* mpf_jitter_buffer_create(mpf_jb_config_t *jb_config, mpf_codec_t *codec, apr_pool_t *pool);
+
+/** Destroy jitter buffer */
+void mpf_jitter_buffer_destroy(mpf_jitter_buffer_t *jb);
+
+/** Restart jitter buffer */
+apt_bool_t mpf_jitter_buffer_restart(mpf_jitter_buffer_t *jb);
+
+/** Write audio data to jitter buffer */
+jb_result_t mpf_jitter_buffer_write(mpf_jitter_buffer_t *jb, mpf_codec_t *codec, void *buffer, apr_size_t size, apr_uint32_t ts);
+
+/** Write named event to jitter buffer */
+jb_result_t mpf_jitter_buffer_write_named_event(mpf_jitter_buffer_t *jb, mpf_named_event_frame_t *named_event, apr_uint32_t ts);
+
+/** Read media frame from jitter buffer */
+apt_bool_t mpf_jitter_buffer_read(mpf_jitter_buffer_t *jb, mpf_frame_t *media_frame);
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_JITTER_BUFFER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_media_descriptor.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_media_descriptor.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_MEDIA_DESCRIPTOR_H__
+#define __MPF_MEDIA_DESCRIPTOR_H__
+
+/**
+ * @file mpf_media_descriptor.h
+ * @brief Media Descriptor Base
+ */ 
+
+#include 
+#include "apt_string.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MPF media state */
+typedef enum {
+	MPF_MEDIA_DISABLED, /**< disabled media */
+	MPF_MEDIA_ENABLED   /**< enabled media */
+} mpf_media_state_e;
+
+/** MPF media descriptor declaration */
+typedef struct mpf_media_descriptor_t mpf_media_descriptor_t;
+
+/** MPF media descriptor */
+struct mpf_media_descriptor_t {
+	/** Media state (disabled/enabled)*/
+	mpf_media_state_e state;
+
+	/** Ip address */
+	apt_str_t          ip;
+	/** External (NAT) Ip address */
+	apt_str_t          ext_ip;
+	/** Port */
+	apr_port_t         port;
+	/** Identifier (0,1,...) */
+	apr_size_t         id;
+};
+
+/** Initialize MPF media descriptor */
+static APR_INLINE void mpf_media_descriptor_init(mpf_media_descriptor_t *descriptor)
+{
+	descriptor->state = MPF_MEDIA_DISABLED;
+	apt_string_reset(&descriptor->ip);
+	apt_string_reset(&descriptor->ext_ip);
+	descriptor->port = 0;
+	descriptor->id = 0;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_MEDIA_DESCRIPTOR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_message.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_message.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_MESSAGE_H__
+#define __MPF_MESSAGE_H__
+
+/**
+ * @file mpf_message.h
+ * @brief Media Processing Framework Message Definitions
+ */ 
+
+#include "mpf_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Enumeration of MPF message types */
+typedef enum {
+	MPF_MESSAGE_TYPE_REQUEST,  /**< request message */
+	MPF_MESSAGE_TYPE_RESPONSE, /**< response message */
+	MPF_MESSAGE_TYPE_EVENT     /**< event message */
+} mpf_message_type_e;
+
+/** Enumeration of MPF status codes */
+typedef enum {
+	MPF_STATUS_CODE_SUCCESS,  /**< indicates success */
+	MPF_STATUS_CODE_FAILURE   /**< indicates failure */
+} mpf_status_code_e;
+
+
+/** Enumeration of commands */
+typedef enum {
+	MPF_COMMAND_ADD,     /**< add termination to context */
+	MPF_COMMAND_MODIFY,  /**< modify termination properties */
+	MPF_COMMAND_SUBTRACT,/**< subtract termination from context */ 
+	MPF_COMMAND_MOVE     /**< move termination to another context */
+} mpf_command_type_e;
+
+/** MPF message declaration */
+typedef struct mpf_message_t mpf_message_t;
+
+/** MPF message definition */
+struct mpf_message_t {
+	/** Message type (request/response/event) */
+	mpf_message_type_e message_type;
+	/** Command identifier (add, modify, subtract, ...) */
+	mpf_command_type_e command_id;
+	/** Status code used in responses */
+	mpf_status_code_e  status_code;
+
+	/** Context */
+	mpf_context_t     *context;
+	/** Termination */
+	mpf_termination_t *termination;
+	/** Termination type dependent descriptor */
+	void              *descriptor;
+};
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_MESSAGE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_object.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_object.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_OBJECT_H__
+#define __MPF_OBJECT_H__
+
+/**
+ * @file mpf_object.h
+ * @brief Media Processing Object Base (bridge, multiplexor, mixer, ...)
+ */ 
+
+#include "mpf_types.h"
+#include "mpf_frame.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MPF object declaration */
+typedef struct mpf_object_t mpf_object_t;
+
+/** Base for media processing objects */
+struct mpf_object_t {
+	/** Audio stream source */
+	mpf_audio_stream_t *source;
+	/** Audio stream sink */
+	mpf_audio_stream_t *sink;
+
+	/** Media frame used to read data from source and write it to sink */
+	mpf_frame_t         frame;
+
+	/** Virtual process */
+	apt_bool_t (*process)(mpf_object_t *object);
+	/** Virtual destroy */
+	apt_bool_t (*destroy)(mpf_object_t *object);
+};
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_OBJECT_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_attribs.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_attribs.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_RTP_ATTRIBS_H__
+#define __MPF_RTP_ATTRIBS_H__
+
+/**
+ * @file mpf_rtp_attribs.h
+ * @brief RTP Attributes (SDP)
+ */ 
+
+#include "mpf_media_descriptor.h"
+#include "mpf_stream_mode.h"
+
+APT_BEGIN_EXTERN_C
+
+/** RTP attributes */
+typedef enum {
+	RTP_ATTRIB_RTPMAP,
+	RTP_ATTRIB_SENDONLY,
+	RTP_ATTRIB_RECVONLY,
+	RTP_ATTRIB_SENDRECV,
+	RTP_ATTRIB_MID,
+	RTP_ATTRIB_PTIME,
+
+	RTP_ATTRIB_COUNT,
+	RTP_ATTRIB_UNKNOWN = RTP_ATTRIB_COUNT
+} mpf_rtp_attrib_e;
+
+
+/** Get audio media attribute name by attribute identifier */
+MPF_DECLARE(const apt_str_t*) mpf_rtp_attrib_str_get(mpf_rtp_attrib_e attrib_id);
+
+/** Find audio media attribute identifier by attribute name */
+MPF_DECLARE(mpf_rtp_attrib_e) mpf_rtp_attrib_id_find(const apt_str_t *attrib);
+
+/** Get string by stream mode (send/receive) */
+MPF_DECLARE(const apt_str_t*) mpf_stream_mode_str_get(mpf_stream_mode_e direction);
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_RTP_ATTRIBS_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_defs.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_defs.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_RTP_DEFS_H__
+#define __MPF_RTP_DEFS_H__
+
+/**
+ * @file mpf_rtp_defs.h
+ * @brief Internal RTP Definitions
+ */ 
+
+#include "mpf_rtp_stat.h"
+#include "mpf_jitter_buffer.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Used to calculate actual number of received packets (32bit) in
+ * case seq number (16bit) wrapped around */
+#define RTP_SEQ_MOD (1 << 16)
+/** Number of max dropout packets (seq numbers) is used to trigger drift 
+ * in seq number or misorder packets */
+#define MAX_DROPOUT 3000
+/** Number of max misorder packets (seq numbers) to differentiate 
+ * seq drift from misorder packets */
+#define MAX_MISORDER 100
+/** Restart receiver if threshold is fired */
+#define DISCARDED_TO_RECEIVED_RATIO_THRESHOLD 30 /* 30% */
+/** Deviation threshold is used to trigger drift in timestamps */
+#define DEVIATION_THRESHOLD 4000
+
+/** RTP receive history declaration */
+typedef struct rtp_rx_history_t rtp_rx_history_t;
+/** RTP receive periodic history declaration */
+typedef struct rtp_rx_periodic_history_t rtp_rx_periodic_history_t;
+/** RTP receiver declaration */
+typedef struct rtp_receiver_t rtp_receiver_t;
+/** RTP transmitter declaration */
+typedef struct rtp_transmitter_t rtp_transmitter_t;
+
+/** History of RTP receive */
+struct rtp_rx_history_t {
+	/** Updated on every seq num wrap around*/
+	apr_uint32_t           seq_cycles;
+
+	/** First seq num received */
+	apr_uint16_t           seq_num_base;
+	/** Max seq num received */
+	apr_uint16_t           seq_num_max;
+
+	/** Last timestamp received */
+	apr_uint32_t           ts_last;
+	/** Local time measured on last packet received */
+	apr_time_t             time_last;
+
+	/** New ssrc, which is in probation */
+	apr_uint32_t           ssrc_new;
+	/** Period of ssrc probation */
+	apr_byte_t             ssrc_probation;
+};
+
+/** Periodic history of RTP receive (initialized after every N packets) */
+struct rtp_rx_periodic_history_t {
+	/** Number of packets received */
+	apr_uint32_t           received_prior;
+	/** Number of packets discarded */
+	apr_uint32_t           discarded_prior;
+
+	/** Min jitter */
+	apr_uint32_t           jitter_min;
+	/** Max jitter */
+	apr_uint32_t           jitter_max;
+};
+
+/** Reset RTP receive history */
+static APR_INLINE void mpf_rtp_rx_history_reset(rtp_rx_history_t *rx_history)
+{
+	memset(rx_history,0,sizeof(rtp_rx_history_t));
+}
+
+/** Reset RTP receive periodic history */
+static APR_INLINE void mpf_rtp_rx_periodic_history_reset(rtp_rx_periodic_history_t *rx_periodic_history)
+{
+	memset(rx_periodic_history,0,sizeof(rtp_rx_periodic_history_t));
+}
+
+/** RTP receiver */
+struct rtp_receiver_t {
+	/** Payload type of named-event packets (RFC2833) */
+	apr_byte_t                event_pt;
+
+	/** Jitter buffer */
+	mpf_jitter_buffer_t      *jb;
+
+	/** RTP receive statistics to report */
+	rtp_rx_stat_t             stat;
+	/** RTP history */
+	rtp_rx_history_t          history;
+	/** RTP periodic history */
+	rtp_rx_periodic_history_t periodic_history;
+};
+
+
+/** RTP transmitter */
+struct rtp_transmitter_t {
+	/** RTP stream ssrc */
+	apr_uint32_t    ssrc;
+	/** Payload type of named-event packets (RFC2833) */
+	apr_byte_t      event_pt;
+	/** Packetization time in msec */
+	apr_uint16_t    ptime;
+
+	/** Number of frames in a packet */
+	apr_uint16_t    packet_frames;
+	/** Current number of frames */
+	apr_uint16_t    current_frames;
+	/** Samples in frames in timestamp units */
+	apr_uint32_t    samples_per_frame;
+
+	/** Indicate silence period among the talkspurts */
+	apr_byte_t      inactivity;
+	/** Last seq number sent */
+	apr_uint16_t    last_seq_num;
+	/** Current timestamp (samples processed) */
+	apr_uint32_t    timestamp;
+
+	/** RTP packet payload */
+	char           *packet_data;
+	/** RTP packet payload size */
+	apr_size_t      packet_size;
+
+	/** RTP transmit statistics to report */
+	rtp_tx_stat_t   stat;
+};
+
+
+/** Initialize RTP receiver */
+static APR_INLINE void rtp_receiver_init(rtp_receiver_t *receiver)
+{
+	receiver->event_pt = 0;
+
+	receiver->jb = NULL;
+
+	mpf_rtp_rx_stat_reset(&receiver->stat);
+	mpf_rtp_rx_history_reset(&receiver->history);
+	mpf_rtp_rx_periodic_history_reset(&receiver->periodic_history);
+}
+
+/** Initialize RTP transmitter */
+static APR_INLINE void rtp_transmitter_init(rtp_transmitter_t *transmitter)
+{
+	transmitter->ssrc = 0;
+	transmitter->event_pt = 0;
+	transmitter->ptime = 0;
+
+	transmitter->packet_frames = 0;
+	transmitter->current_frames = 0;
+	transmitter->samples_per_frame = 0;
+
+	transmitter->inactivity = 0;
+	transmitter->last_seq_num = 0;
+	transmitter->timestamp = 0;
+
+	transmitter->packet_data = NULL;
+	transmitter->packet_size = 0;
+
+	mpf_rtp_tx_stat_reset(&transmitter->stat);
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_RTP_DEFS_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_descriptor.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_descriptor.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_RTP_DESCRIPTOR_H__
+#define __MPF_RTP_DESCRIPTOR_H__
+
+/**
+ * @file mpf_rtp_descriptor.h
+ * @brief MPF RTP Stream Descriptor
+ */ 
+
+#include "mpf_stream_mode.h"
+#include "mpf_media_descriptor.h"
+#include "mpf_codec_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** RTP media descriptor declaration */
+typedef struct mpf_rtp_media_descriptor_t mpf_rtp_media_descriptor_t;
+/** RTP stream descriptor declaration */
+typedef struct mpf_rtp_stream_descriptor_t mpf_rtp_stream_descriptor_t;
+/** RTP termination descriptor declaration */
+typedef struct mpf_rtp_termination_descriptor_t mpf_rtp_termination_descriptor_t;
+/** RTP configuration declaration */
+typedef struct mpf_rtp_config_t mpf_rtp_config_t;
+/** Jitter buffer configuration declaration */
+typedef struct mpf_jb_config_t mpf_jb_config_t;
+
+
+/** RTP media (local/remote) descriptor */
+struct mpf_rtp_media_descriptor_t {
+	/** Media descriptor base */
+	mpf_media_descriptor_t base;
+	/** Stream mode (send/receive) */
+	mpf_stream_mode_e      mode;
+	/** Packetization time */
+	apr_uint16_t           ptime;
+	/** Codec list */
+	mpf_codec_list_t       codec_list;
+	/** Media identifier */
+	apr_size_t             mid;
+};
+
+/** RTP stream descriptor */
+struct mpf_rtp_stream_descriptor_t {
+	/** Local media descriptor */
+	mpf_rtp_media_descriptor_t *local;
+	/** Remote media descriptor */
+	mpf_rtp_media_descriptor_t *remote;
+};
+
+/** RTP termination descriptor */
+struct mpf_rtp_termination_descriptor_t {
+	/** Audio stream descriptor */
+	mpf_rtp_stream_descriptor_t audio;
+	/** Video stream descriptor */
+	mpf_rtp_stream_descriptor_t video;
+};
+
+/** Jitter buffer configuration */
+struct mpf_jb_config_t {
+	/** Min playout delay in msec (used in case of adaptive jitter buffer) */
+	apr_size_t min_playout_delay;
+	/** Initial playout delay in msec */
+	apr_size_t initial_playout_delay;
+	/** Max playout delay in msec (used in case of adaptive jitter buffer) */
+	apr_size_t max_playout_delay;
+	/** Static - 0, adaptive - 1 jitter buffer */
+	apr_byte_t adaptive;
+};
+
+/** RTP config */
+struct mpf_rtp_config_t {
+	/** Local IP address to bind to */
+	apt_str_t ip;
+	/** External (NAT) IP address */
+	apt_str_t ext_ip;
+	/** Min RTP port */
+	apr_port_t rtp_port_min;
+	/** Max RTP port */
+	apr_port_t rtp_port_max;
+	/** Current RTP port */
+	apr_port_t rtp_port_cur;
+	/** Packetization time */
+	apr_uint16_t ptime;
+	/** Codec list */
+	mpf_codec_list_t codec_list;
+	/** Preference in offer/anser: 1 - own(local) preference, 0 - remote preference */
+	apt_bool_t own_preferrence;
+	/** Jitter buffer config */
+	mpf_jb_config_t jb_config;
+};
+
+/** Initialize media descriptor */
+static APR_INLINE void mpf_rtp_media_descriptor_init(mpf_rtp_media_descriptor_t *media)
+{
+	mpf_media_descriptor_init(&media->base);
+	media->mode = STREAM_MODE_NONE;
+	media->ptime = 0;
+	mpf_codec_list_reset(&media->codec_list);
+	media->mid = 0;
+}
+
+/** Initialize stream descriptor */
+static APR_INLINE void mpf_rtp_stream_descriptor_init(mpf_rtp_stream_descriptor_t *stream)
+{
+	stream->local = NULL;
+	stream->remote = NULL;
+}
+
+/** Initialize RTP termination descriptor */
+static APR_INLINE void mpf_rtp_termination_descriptor_init(mpf_rtp_termination_descriptor_t *rtp_descriptor)
+{
+	mpf_rtp_stream_descriptor_init(&rtp_descriptor->audio);
+	mpf_rtp_stream_descriptor_init(&rtp_descriptor->video);
+}
+
+/** Initialize JB config */
+static APR_INLINE void mpf_jb_config_init(mpf_jb_config_t *jb_config)
+{
+	jb_config->adaptive = 0;
+	jb_config->initial_playout_delay = 0;
+	jb_config->min_playout_delay = 0;
+	jb_config->max_playout_delay = 0;
+}
+
+/** Create/allocate RTP config */
+static APR_INLINE mpf_rtp_config_t* mpf_rtp_config_create(apr_pool_t *pool)
+{
+	mpf_rtp_config_t *rtp_config = (mpf_rtp_config_t*)apr_palloc(pool,sizeof(mpf_rtp_config_t));
+	apt_string_reset(&rtp_config->ip);
+	apt_string_reset(&rtp_config->ext_ip);
+	rtp_config->rtp_port_cur = 0;
+	rtp_config->rtp_port_min = 0;
+	rtp_config->rtp_port_max = 0;
+	rtp_config->ptime = 0;
+	mpf_codec_list_init(&rtp_config->codec_list,0,pool);
+	rtp_config->own_preferrence = FALSE;
+	mpf_jb_config_init(&rtp_config->jb_config);
+	return rtp_config;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_RTP_DESCRIPTOR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_header.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_header.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_RTP_HEADER_H__
+#define __MPF_RTP_HEADER_H__
+
+/**
+ * @file mpf_rtp_header.h
+ * @brief RTP Header Definition
+ */ 
+
+#include "mpf.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Protocol version. */
+#define RTP_VERSION 2
+
+/** RTP header declaration */
+typedef struct rtp_header_t rtp_header_t;
+/** RTP extension header declaration */
+typedef struct rtp_extension_header_t rtp_extension_header_t;
+
+
+/** RTP header */
+struct rtp_header_t {
+#if (APR_IS_BIGENDIAN == 1)
+	/** protocol version */
+	apr_uint32_t version:   2;
+	/** padding flag */
+	apr_uint32_t padding:   1;
+	/** header extension flag */
+	apr_uint32_t extension: 1;
+	/** CSRC count */
+	apr_uint32_t count:     4;
+	/** marker bit */
+	apr_uint32_t marker:    1;
+	/** payload type */
+	apr_uint32_t type:      7;
+#else
+	/** CSRC count */
+	apr_uint32_t count:     4;
+	/** header extension flag */
+	apr_uint32_t extension: 1;
+	/** padding flag */
+	apr_uint32_t padding:   1;
+	/** protocol version */
+	apr_uint32_t version:   2;
+	/** payload type */
+	apr_uint32_t type:      7;
+	/** marker bit */
+	apr_uint32_t marker:    1;
+#endif	
+	
+	/** sequence number */
+	apr_uint32_t sequence:  16;
+	/** timestamp */
+	apr_uint32_t timestamp;
+	/** synchronization source */
+	apr_uint32_t ssrc;
+};
+
+/** RTP extension header */
+struct rtp_extension_header_t
+{
+	/** profile */
+	apr_uint16_t profile;
+	/** length */
+	apr_uint16_t length;
+};
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_RTP_HEADER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_stat.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_stat.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_RTP_STAT_H__
+#define __MPF_RTP_STAT_H__
+
+/**
+ * @file mpf_rtp_stat.h
+ * @brief RTP Statistics
+ */ 
+
+#include "mpf.h"
+
+APT_BEGIN_EXTERN_C
+
+/** RTP transmit statistics declaration */
+typedef struct rtp_tx_stat_t rtp_tx_stat_t;
+/** RTP receive statistics declaration */
+typedef struct rtp_rx_stat_t rtp_rx_stat_t;
+
+
+/** RTP transmit statistics */
+struct rtp_tx_stat_t {
+	/** number of RTP packets received */
+	apr_uint32_t    sent_packets;
+
+	/* more to come */
+};
+
+/** RTP receive statistics */
+struct rtp_rx_stat_t {
+	/** number of valid RTP packets received */
+	apr_uint32_t           received_packets;
+	/** number of invalid RTP packets received */
+	apr_uint32_t           invalid_packets;
+
+	/** number of discarded in jitter buffer packets */
+	apr_uint32_t           discarded_packets;
+	/** number of ignored packets */
+	apr_uint32_t           ignored_packets;
+
+	/** number of lost in network packets */
+	apr_uint32_t           lost_packets;
+
+	/** number of restarts */
+	apr_byte_t             restarts;
+
+	/** network jitter (rfc3550) */
+	apr_uint32_t           jitter;
+
+	/** source id of received RTP stream */
+	apr_uint32_t           ssrc;
+};
+
+
+/** Reset RTP transmit statistics */
+static APR_INLINE void mpf_rtp_tx_stat_reset(rtp_tx_stat_t *tx_stat)
+{
+	memset(tx_stat,0,sizeof(rtp_tx_stat_t));
+}
+
+/** Reset RTP receive statistics */
+static APR_INLINE void mpf_rtp_rx_stat_reset(rtp_rx_stat_t *rx_stat)
+{
+	memset(rx_stat,0,sizeof(rtp_rx_stat_t));
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_RTP_STAT_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_stream.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_stream.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_RTP_STREAM_H__
+#define __MPF_RTP_STREAM_H__
+
+/**
+ * @file mpf_rtp_stream.h
+ * @brief MPF RTP Stream
+ */ 
+
+#include "mpf_stream.h"
+#include "mpf_rtp_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create RTP stream.
+ * @param termination the back pointer to hold
+ * @param config the configuration to use
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_audio_stream_t*) mpf_rtp_stream_create(mpf_termination_t *termination, mpf_rtp_config_t *config, apr_pool_t *pool);
+
+/**
+ * Modify RTP stream.
+ * @param stream RTP stream to modify
+ * @param descriptor the descriptor to modify stream according
+ */
+MPF_DECLARE(apt_bool_t) mpf_rtp_stream_modify(mpf_audio_stream_t *stream, mpf_rtp_stream_descriptor_t *descriptor);
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_RTP_STREAM_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_termination_factory.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_rtp_termination_factory.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_RTP_TERMINATION_FACTORY_H__
+#define __MPF_RTP_TERMINATION_FACTORY_H__
+
+/**
+ * @file mpf_rtp_termination_factory.h
+ * @brief MPF RTP Termination Factory
+ */ 
+
+#include 
+#include "mpf_types.h"
+#include "mpf_rtp_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create RTP termination factory.
+ */
+MPF_DECLARE(mpf_termination_factory_t*) mpf_rtp_termination_factory_create(
+										mpf_rtp_config_t *rtp_config,
+										apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_RTP_TERMINATION_FACTORY_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_stream.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_stream.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_STREAM_H__
+#define __MPF_STREAM_H__
+
+/**
+ * @file mpf_stream.h
+ * @brief MPF Bidirectional Stream
+ */ 
+
+#include "mpf_types.h"
+#include "mpf_stream_mode.h"
+#include "mpf_frame.h"
+#include "mpf_codec.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque audio stream virtual table declaration */
+typedef struct mpf_audio_stream_vtable_t mpf_audio_stream_vtable_t;
+
+/** Audio stream */
+struct mpf_audio_stream_t {
+	/** External object */
+	void                            *obj;
+	/** Table of virtual methods */
+	const mpf_audio_stream_vtable_t *vtable;
+	/** Back pointer */
+	mpf_termination_t               *termination;
+	/** Stream mode (send/receive) */
+	mpf_stream_mode_e                mode;
+	/** Receive codec */
+	mpf_codec_t                     *rx_codec;
+	/** Transmit codec */
+	mpf_codec_t                     *tx_codec;
+};
+
+/** Video stream */
+struct mpf_video_stream_t {
+	/** Back pointer */
+	mpf_termination_t               *termination;
+	/** Stream mode (send/receive) */
+	mpf_stream_mode_e                mode;
+};
+
+/** Table of audio stream virtual methods */
+struct mpf_audio_stream_vtable_t {
+	/** Virtual destroy method */
+	apt_bool_t (*destroy)(mpf_audio_stream_t *stream);
+
+	/** Virtual open receiver method */
+	apt_bool_t (*open_rx)(mpf_audio_stream_t *stream);
+	/** Virtual close receiver method */
+	apt_bool_t (*close_rx)(mpf_audio_stream_t *stream);
+	/** Virtual read frame method */
+	apt_bool_t (*read_frame)(mpf_audio_stream_t *stream, mpf_frame_t *frame);
+
+	/** Virtual open transmitter method */
+	apt_bool_t (*open_tx)(mpf_audio_stream_t *stream);
+	/** Virtual close transmitter method */
+	apt_bool_t (*close_tx)(mpf_audio_stream_t *stream);
+	/** Virtual write frame method */
+	apt_bool_t (*write_frame)(mpf_audio_stream_t *stream, const mpf_frame_t *frame);
+};
+
+
+/** Create audio stream */
+static APR_INLINE mpf_audio_stream_t* mpf_audio_stream_create(void *obj, const mpf_audio_stream_vtable_t *vtable, mpf_stream_mode_e mode, apr_pool_t *pool)
+{
+	mpf_audio_stream_t *stream = (mpf_audio_stream_t*)apr_palloc(pool,sizeof(mpf_audio_stream_t));
+	stream->obj = obj;
+	stream->vtable = vtable;
+	stream->termination = NULL;
+	stream->mode = mode;
+	stream->rx_codec = NULL;
+	stream->tx_codec = NULL;
+	return stream;
+}
+
+/** Destroy audio stream */
+static APR_INLINE apt_bool_t mpf_audio_stream_destroy(mpf_audio_stream_t *stream)
+{
+	if(stream->vtable->destroy)
+		return stream->vtable->destroy(stream);
+	return TRUE;
+}
+
+/** Open audio stream receive */
+static APR_INLINE apt_bool_t mpf_audio_stream_rx_open(mpf_audio_stream_t *stream)
+{
+	if(stream->vtable->open_rx)
+		return stream->vtable->open_rx(stream);
+	return TRUE;
+}
+
+/** Close audio stream receive */
+static APR_INLINE apt_bool_t mpf_audio_stream_rx_close(mpf_audio_stream_t *stream)
+{
+	if(stream->vtable->close_rx)
+		return stream->vtable->close_rx(stream);
+	return TRUE;
+}
+
+/** Read frame */
+static APR_INLINE apt_bool_t mpf_audio_stream_frame_read(mpf_audio_stream_t *stream, mpf_frame_t *frame)
+{
+	if(stream->vtable->read_frame)
+		return stream->vtable->read_frame(stream,frame);
+	return TRUE;
+}
+
+/** Open audio stream transmit */
+static APR_INLINE apt_bool_t mpf_audio_stream_tx_open(mpf_audio_stream_t *stream)
+{
+	if(stream->vtable->open_tx)
+		return stream->vtable->open_tx(stream);
+	return TRUE;
+}
+
+/** Close audio stream transmit */
+static APR_INLINE apt_bool_t mpf_audio_stream_tx_close(mpf_audio_stream_t *stream)
+{
+	if(stream->vtable->close_tx)
+		return stream->vtable->close_tx(stream);
+	return TRUE;
+}
+
+/** Write frame */
+static APR_INLINE apt_bool_t mpf_audio_stream_frame_write(mpf_audio_stream_t *stream, const mpf_frame_t *frame)
+{
+	if(stream->vtable->write_frame)
+		return stream->vtable->write_frame(stream,frame);
+	return TRUE;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_STREAM_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_stream_mode.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_stream_mode.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_STREAM_MODE_H__
+#define __MPF_STREAM_MODE_H__
+
+/**
+ * @file mpf_stream_mode.h
+ * @brief MPF Stream Mode (Send/Receive)
+ */ 
+
+#include "mpf.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Enumeration of stream modes */
+typedef enum {
+	STREAM_MODE_NONE    = 0x0, /**< none */
+	STREAM_MODE_SEND    = 0x1, /**< send */
+	STREAM_MODE_RECEIVE = 0x2, /**< receive */
+
+	STREAM_MODE_SEND_RECEIVE = STREAM_MODE_SEND | STREAM_MODE_RECEIVE /**< send and receive */
+} mpf_stream_mode_e; 
+
+static APR_INLINE mpf_stream_mode_e mpf_stream_mode_negotiate(mpf_stream_mode_e remote_mode)
+{
+	mpf_stream_mode_e local_mode = remote_mode;
+	if(local_mode == STREAM_MODE_SEND) {
+		local_mode = STREAM_MODE_RECEIVE;
+	}
+	else if(local_mode == STREAM_MODE_RECEIVE) {
+		local_mode = STREAM_MODE_SEND;
+	}
+	return local_mode;
+}
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_STREAM_MODE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_termination.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_termination.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_TERMINATION_H__
+#define __MPF_TERMINATION_H__
+
+/**
+ * @file mpf_termination.h
+ * @brief MPF Termination
+ */ 
+
+#include "mpf_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Prototype of termination event handler */
+typedef apt_bool_t (*mpf_termination_event_handler_f)(mpf_termination_t *termination, int event_id, void *descriptor);
+
+/** MPF Termination */
+struct mpf_termination_t {
+	/** Pool to allocate memory from */
+	apr_pool_t                     *pool;
+	/** External object */
+	void                           *obj;
+	/** Object to send events to */
+	void                           *event_handler_obj;
+	/** Event handler */
+	mpf_termination_event_handler_f event_handler;
+	/** Codec manager */
+	const mpf_codec_manager_t      *codec_manager;
+	/** Termination factory entire termination created by */
+	mpf_termination_factory_t      *termination_factory;
+	/** Table of virtual methods */
+	const mpf_termination_vtable_t *vtable;
+	/** Slot in context */
+	apr_size_t                      slot;
+
+	/** Audio stream */
+	mpf_audio_stream_t             *audio_stream;
+	/** Video stream */
+	mpf_video_stream_t             *video_stream;
+};
+
+/** MPF termination factory */
+struct mpf_termination_factory_t {
+	/** Virtual create */
+	mpf_termination_t* (*create_termination)(mpf_termination_factory_t *factory, void *obj, apr_pool_t *pool);
+
+	/* more to add */
+};
+
+
+/**
+ * Create MPF termination base.
+ * @param termination_factory the termination factory
+ * @param obj the external object associated with termination
+ * @param vtable the table of virtual functions of termination
+ * @param audio_stream the audio stream
+ * @param video_stream the video stream
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_termination_t*) mpf_termination_base_create(
+										mpf_termination_factory_t *termination_factory,
+										void *obj,
+										const mpf_termination_vtable_t *vtable,
+										mpf_audio_stream_t *audio_stream, 
+										mpf_video_stream_t *video_stream, 
+										apr_pool_t *pool);
+
+/**
+ * Modify MPF termination.
+ * @param termination the termination to modify
+ * @param descriptor the termination specific descriptor
+ */
+MPF_DECLARE(apt_bool_t) mpf_termination_modify(mpf_termination_t *termination, void *descriptor);
+
+/**
+ * Validate MPF termination.
+ * @param termination the termination to validate
+ */
+MPF_DECLARE(apt_bool_t) mpf_termination_validate(mpf_termination_t *termination);
+
+/**
+ * Destroy MPF termination.
+ * @param termination the termination to destroy
+ */
+MPF_DECLARE(apt_bool_t) mpf_termination_destroy(mpf_termination_t *termination);
+
+/**
+ * Get associated object.
+ * @param termination the termination to get object from
+ */
+MPF_DECLARE(void*) mpf_termination_object_get(mpf_termination_t *termination);
+
+
+/**
+ * Create MPF termination by termination factory.
+ * @param termination_factory the termination factory to create termination from
+ * @param obj the external object associated with termination
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_termination_t*) mpf_termination_create(
+										mpf_termination_factory_t *termination_factory,
+										void *obj,
+										apr_pool_t *pool);
+
+/**
+ * Create raw MPF termination.
+ * @param obj the external object associated with termination
+ * @param audio_stream the audio stream of the termination
+ * @param video_stream the video stream of the termination
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_termination_t*) mpf_raw_termination_create(
+										void *obj,
+										mpf_audio_stream_t *audio_stream, 
+										mpf_video_stream_t *video_stream, 
+										apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_TERMINATION_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_timer.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_timer.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_TIMER_H__
+#define __MPF_TIMER_H__
+
+/**
+ * @file mpf_timer.h
+ * @brief MPF High Resolution Timer
+ */ 
+
+#include "mpf.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque MPF timer declaration */
+typedef struct mpf_timer_t mpf_timer_t;
+
+/** Prototype of timer callback */
+typedef void (*mpf_timer_proc_f)(mpf_timer_t *timer, void *obj);
+
+/** Start periodic timer */
+MPF_DECLARE(mpf_timer_t*) mpf_timer_start(unsigned long timeout, mpf_timer_proc_f timer_proc, void *obj, apr_pool_t *pool);
+
+/** Stop timer */
+MPF_DECLARE(void) mpf_timer_stop(mpf_timer_t *timer);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_TIMER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_types.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_types.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_TYPES_H__
+#define __MPF_TYPES_H__
+
+/**
+ * @file mpf_types.h
+ * @brief MPF Types Declarations
+ */ 
+
+#include "mpf.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque MPF engine declaration */
+typedef struct mpf_engine_t mpf_engine_t;
+
+/** Opaque codec manager declaration */
+typedef struct mpf_codec_manager_t mpf_codec_manager_t;
+
+/** Opaque MPF context declaration */
+typedef struct mpf_context_t mpf_context_t;
+
+/** Opaque MPF termination declaration */
+typedef struct mpf_termination_t mpf_termination_t;
+
+/** Opaque MPF termination factory declaration */
+typedef struct mpf_termination_factory_t mpf_termination_factory_t;
+
+/** Opaque MPF audio stream declaration */
+typedef struct mpf_audio_stream_t mpf_audio_stream_t;
+
+/** Opaque MPF video stream declaration */
+typedef struct mpf_video_stream_t mpf_video_stream_t;
+
+/** Termination vtable declaration */
+typedef struct mpf_termination_vtable_t mpf_termination_vtable_t;
+
+/** Table of termination virtual methods */
+struct mpf_termination_vtable_t {
+	/** Virtual termination destroy method */
+	apt_bool_t (*destroy)(mpf_termination_t *termination);
+	/** Virtual termination modify method */
+	apt_bool_t (*modify)(mpf_termination_t *termination, void *descriptor);
+};
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_TYPES_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_user.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_user.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPF_USER_H__
+#define __MPF_USER_H__
+
+/**
+ * @file mpf_user.h
+ * @brief MPF User Interface
+ */ 
+
+#include "mpf_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create MPF context.
+ * @param obj the external object associated with context
+ * @param max_termination_count the max number of terminations in context
+ * @param pool the pool to allocate memory from
+ */
+MPF_DECLARE(mpf_context_t*) mpf_context_create(void *obj, apr_size_t max_termination_count, apr_pool_t *pool);
+
+/**
+ * Destroy MPF context.
+ * @param context the context to destroy
+ */
+MPF_DECLARE(apt_bool_t) mpf_context_destroy(mpf_context_t *context);
+
+/**
+ * Get external object associated with MPF context.
+ * @param context the context to get object from
+ */
+MPF_DECLARE(void*) mpf_context_object_get(mpf_context_t *context);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MPF_USER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,363 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+				
+				
+				
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_activity_detector.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_activity_detector.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_activity_detector.h"
+#include "apt_log.h"
+
+/** Detector states */
+typedef enum {
+	DETECTOR_STATE_INACTIVITY,           /**< inactivity detected */
+	DETECTOR_STATE_ACTIVITY_TRANSITION,  /**< activity detection is in-progress */
+	DETECTOR_STATE_ACTIVITY,             /**< activity detected */
+	DETECTOR_STATE_INACTIVITY_TRANSITION /**< inactivity detection is in-progress */
+} mpf_detector_state_e;
+
+/** Activity detector */
+struct mpf_activity_detector_t {
+	/* voice activity (silence) level threshold */
+	apr_size_t level_threshold;
+
+	/* period of activity/inactivity required to complete/raise an event */
+	apr_size_t complete_timeout;
+	/* noinput timeout */
+	apr_size_t noinput_timeout;
+
+	/* current state */
+	apt_bool_t state;
+	/* duration spent in current state  */
+	apr_size_t duration;
+};
+
+/** Create activity detector */
+MPF_DECLARE(mpf_activity_detector_t*) mpf_activity_detector_create(apr_pool_t *pool)
+{
+	mpf_activity_detector_t *detector = apr_palloc(pool,sizeof(mpf_activity_detector_t));
+	detector->level_threshold = 2; /* 0 .. 255 */
+	detector->complete_timeout = 300; /* 0.3 s */
+	detector->noinput_timeout = 5000; /* 5 s */
+	detector->duration = 0;
+	detector->state = DETECTOR_STATE_INACTIVITY;
+	return detector;
+}
+
+/** Set threshold of voice activity (silence) level */
+MPF_DECLARE(void) mpf_activity_detector_level_set(mpf_activity_detector_t *detector, apr_size_t level_threshold)
+{
+	detector->level_threshold = level_threshold;
+}
+
+/** Set noinput timeout */
+MPF_DECLARE(void) mpf_activity_detector_noinput_timeout_set(mpf_activity_detector_t *detector, apr_size_t noinput_timeout)
+{
+	detector->noinput_timeout = noinput_timeout;
+}
+
+/** Set transition complete timeout */
+MPF_DECLARE(void) mpf_activity_detector_complete_timeout_set(mpf_activity_detector_t *detector, apr_size_t complete_timeout)
+{
+	detector->complete_timeout = complete_timeout;
+}
+
+
+static APR_INLINE void mpf_activity_detector_state_change(mpf_activity_detector_t *detector, mpf_detector_state_e state)
+{
+	detector->duration = 0;
+	detector->state = state;
+}
+
+static apr_size_t mpf_activity_detector_level_calculate(const mpf_frame_t *frame)
+{
+	apr_size_t sum = 0;
+	apr_size_t count = frame->codec_frame.size/2;
+	const apr_int16_t *cur = frame->codec_frame.buffer;
+	const apr_int16_t *end = cur + count;
+
+	for(; cur < end; cur++) {
+		if(*cur < 0) {
+			sum -= *cur;
+		}
+		else {
+			sum += *cur;
+		}
+	}
+
+	return sum / count;
+}
+
+/** Process current frame */
+MPF_DECLARE(mpf_detector_event_e) mpf_activity_detector_process(mpf_activity_detector_t *detector, const mpf_frame_t *frame)
+{
+	mpf_detector_event_e det_event = MPF_DETECTOR_EVENT_NONE;
+	apr_size_t level = 0;
+	if((frame->type & MEDIA_FRAME_TYPE_AUDIO) == MEDIA_FRAME_TYPE_AUDIO) {
+		/* first, calculate current activity level of processed frame */
+		level = mpf_activity_detector_level_calculate(frame);
+#if 0
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Activity Detector [%d]",level);
+#endif
+	}
+
+	if(detector->state == DETECTOR_STATE_INACTIVITY) {
+		if(level >= detector->level_threshold) {
+			/* start to detect activity */
+			mpf_activity_detector_state_change(detector,DETECTOR_STATE_ACTIVITY_TRANSITION);
+		}
+		else {
+			detector->duration += CODEC_FRAME_TIME_BASE;
+			if(detector->duration >= detector->noinput_timeout) {
+				/* detected noinput */
+				det_event = MPF_DETECTOR_EVENT_NOINPUT;
+			}
+		}
+	}
+	else if(detector->state == DETECTOR_STATE_ACTIVITY_TRANSITION) {
+		if(level >= detector->level_threshold) {
+			detector->duration += CODEC_FRAME_TIME_BASE;
+			if(detector->duration >= detector->complete_timeout) {
+				/* finally detected activity */
+				det_event = MPF_DETECTOR_EVENT_ACTIVITY;
+				mpf_activity_detector_state_change(detector,DETECTOR_STATE_ACTIVITY);
+			}
+		}
+		else {
+			/* fallback to inactivity */
+			mpf_activity_detector_state_change(detector,DETECTOR_STATE_INACTIVITY);
+		}
+	}
+	else if(detector->state == DETECTOR_STATE_ACTIVITY) {
+		if(level >= detector->level_threshold) {
+			detector->duration += CODEC_FRAME_TIME_BASE;
+		}
+		else {
+			/* start to detect inactivity */
+			mpf_activity_detector_state_change(detector,DETECTOR_STATE_INACTIVITY_TRANSITION);
+		}
+	}
+	else if(detector->state == DETECTOR_STATE_INACTIVITY_TRANSITION) {
+		if(level >= detector->level_threshold) {
+			/* fallback to activity */
+			mpf_activity_detector_state_change(detector,DETECTOR_STATE_ACTIVITY);
+		}
+		else {
+			detector->duration += CODEC_FRAME_TIME_BASE;
+			if(detector->duration >= detector->complete_timeout) {
+				/* detected inactivity */
+				det_event = MPF_DETECTOR_EVENT_INACTIVITY;
+				mpf_activity_detector_state_change(detector,DETECTOR_STATE_INACTIVITY);
+			}
+		}
+	}
+
+	return det_event;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_audio_file_stream.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_audio_file_stream.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_audio_file_stream.h"
+#include "mpf_termination.h"
+#include "mpf_frame.h"
+#include "mpf_codec_manager.h"
+#include "apt_log.h"
+
+/** Audio file stream */
+typedef struct mpf_audio_file_stream_t mpf_audio_file_stream_t;
+struct mpf_audio_file_stream_t {
+	mpf_audio_stream_t *audio_stream;
+
+	FILE               *read_handle;
+	FILE               *write_handle;
+
+	apt_bool_t          eof;
+	apr_size_t          max_write_size;
+	apr_size_t          cur_write_size;
+};
+
+static APR_INLINE void mpf_audio_file_event_raise(mpf_audio_stream_t *stream, int event_id, void *descriptor);
+
+
+static apt_bool_t mpf_audio_file_destroy(mpf_audio_stream_t *stream)
+{
+	mpf_audio_file_stream_t *file_stream = stream->obj;
+	if(file_stream->read_handle) {
+		fclose(file_stream->read_handle);
+		file_stream->read_handle = NULL;
+	}
+	if(file_stream->write_handle) {
+		fclose(file_stream->write_handle);
+		file_stream->write_handle = NULL;
+	}
+	return TRUE;
+}
+
+static apt_bool_t mpf_audio_file_reader_open(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+static apt_bool_t mpf_audio_file_reader_close(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+static apt_bool_t mpf_audio_file_frame_read(mpf_audio_stream_t *stream, mpf_frame_t *frame)
+{
+	mpf_audio_file_stream_t *file_stream = stream->obj;
+	if(file_stream->read_handle && file_stream->eof == FALSE) {
+		if(fread(frame->codec_frame.buffer,1,frame->codec_frame.size,file_stream->read_handle) == frame->codec_frame.size) {
+			frame->type = MEDIA_FRAME_TYPE_AUDIO;
+		}
+		else {
+			file_stream->eof = TRUE;
+			mpf_audio_file_event_raise(stream,0,NULL);
+		}
+	}
+	return TRUE;
+}
+
+
+static apt_bool_t mpf_audio_file_writer_open(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+static apt_bool_t mpf_audio_file_writer_close(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+static apt_bool_t mpf_audio_file_frame_write(mpf_audio_stream_t *stream, const mpf_frame_t *frame)
+{
+	mpf_audio_file_stream_t *file_stream = stream->obj;
+	if(file_stream->write_handle && 
+		(!file_stream->max_write_size || file_stream->cur_write_size < file_stream->max_write_size)) {
+		file_stream->cur_write_size += fwrite(
+										frame->codec_frame.buffer,
+										1,
+										frame->codec_frame.size,
+										file_stream->write_handle);
+		if(file_stream->cur_write_size >= file_stream->max_write_size) {
+			mpf_audio_file_event_raise(stream,0,NULL);
+		}
+	}
+	return TRUE;
+}
+
+static const mpf_audio_stream_vtable_t vtable = {
+	mpf_audio_file_destroy,
+	mpf_audio_file_reader_open,
+	mpf_audio_file_reader_close,
+	mpf_audio_file_frame_read,
+	mpf_audio_file_writer_open,
+	mpf_audio_file_writer_close,
+	mpf_audio_file_frame_write
+};
+
+MPF_DECLARE(mpf_audio_stream_t*) mpf_file_stream_create(mpf_termination_t *termination, apr_pool_t *pool)
+{
+	mpf_audio_file_stream_t *file_stream = apr_palloc(pool,sizeof(mpf_audio_file_stream_t));
+	file_stream->audio_stream = mpf_audio_stream_create(file_stream,&vtable,STREAM_MODE_NONE,pool);
+	file_stream->audio_stream->termination = termination;
+
+	file_stream->write_handle = NULL;
+	file_stream->read_handle = NULL;
+	file_stream->eof = FALSE;
+	file_stream->max_write_size = 0;
+	file_stream->cur_write_size = 0;
+	return file_stream->audio_stream;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_file_stream_modify(mpf_audio_stream_t *stream, mpf_audio_file_descriptor_t *descriptor)
+{
+	mpf_audio_file_stream_t *file_stream = stream->obj;
+	if(descriptor->mask & FILE_READER) {
+		if(file_stream->read_handle) {
+			fclose(file_stream->read_handle);
+		}
+		file_stream->read_handle = descriptor->read_handle;
+		file_stream->eof = FALSE;
+		stream->mode |= FILE_READER;
+
+		stream->rx_codec = mpf_codec_manager_codec_get(
+								stream->termination->codec_manager,
+								&descriptor->codec_descriptor,
+								stream->termination->pool);
+	}
+	if(descriptor->mask & FILE_WRITER) {
+		if(file_stream->write_handle) {
+			fclose(file_stream->write_handle);
+		}
+		file_stream->write_handle = descriptor->write_handle;
+		file_stream->max_write_size = descriptor->max_write_size;
+		file_stream->cur_write_size = 0;
+		stream->mode |= FILE_WRITER;
+
+		stream->tx_codec = mpf_codec_manager_codec_get(
+								stream->termination->codec_manager,
+								&descriptor->codec_descriptor,
+								stream->termination->pool);
+	}
+	return TRUE;
+}
+
+static APR_INLINE void mpf_audio_file_event_raise(mpf_audio_stream_t *stream, int event_id, void *descriptor)
+{
+	if(stream->termination->event_handler) {
+		stream->termination->event_handler(stream->termination,event_id,descriptor);
+	}
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_bridge.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_bridge.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_bridge.h"
+#include "mpf_stream.h"
+#include "apt_log.h"
+
+static apt_bool_t mpf_bridge_process(mpf_object_t *object)
+{
+	object->frame.type = MEDIA_FRAME_TYPE_NONE;
+	object->source->vtable->read_frame(object->source,&object->frame);
+	
+	if((object->frame.type & MEDIA_FRAME_TYPE_AUDIO) == 0) {
+		memset(	object->frame.codec_frame.buffer,
+				0,
+				object->frame.codec_frame.size);
+	}
+
+	object->sink->vtable->write_frame(object->sink,&object->frame);
+	return TRUE;
+}
+
+static apt_bool_t mpf_null_bridge_process(mpf_object_t *object)
+{
+	object->frame.type = MEDIA_FRAME_TYPE_NONE;
+	object->source->vtable->read_frame(object->source,&object->frame);
+	object->sink->vtable->write_frame(object->sink,&object->frame);
+	return TRUE;
+}
+
+
+static apt_bool_t mpf_bridge_destroy(mpf_object_t *object)
+{
+	mpf_object_t *bridge = object;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Destroy Audio Bridge");
+	mpf_audio_stream_rx_close(bridge->source);
+	mpf_audio_stream_tx_close(bridge->sink);
+	return TRUE;
+}
+
+static mpf_object_t* mpf_bridge_base_create(mpf_audio_stream_t *source, mpf_audio_stream_t *sink, apr_pool_t *pool)
+{
+	mpf_object_t *bridge;
+	if(!source || !sink) {
+		return NULL;
+	}
+
+	bridge = apr_palloc(pool,sizeof(mpf_object_t));
+	bridge->source = source;
+	bridge->sink = sink;
+	bridge->process = mpf_bridge_process;
+	bridge->destroy = mpf_bridge_destroy;
+
+	if(mpf_audio_stream_rx_open(source) == FALSE) {
+		return NULL;
+	}
+	if(mpf_audio_stream_tx_open(sink) == FALSE) {
+		mpf_audio_stream_rx_close(source);
+		return NULL;
+	}
+	return bridge;
+}
+
+MPF_DECLARE(mpf_object_t*) mpf_bridge_create(mpf_audio_stream_t *source, mpf_audio_stream_t *sink, apr_pool_t *pool)
+{
+	mpf_codec_descriptor_t *descriptor;
+	apr_size_t frame_size;
+	mpf_object_t *bridge;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Create Audio Bridge");
+	bridge = mpf_bridge_base_create(source,sink,pool);
+	if(!bridge) {
+		return NULL;
+	}
+
+	descriptor = source->rx_codec->descriptor;
+	frame_size = mpf_codec_linear_frame_size_calculate(descriptor->sampling_rate,descriptor->channel_count);
+	bridge->frame.codec_frame.size = frame_size;
+	bridge->frame.codec_frame.buffer = apr_palloc(pool,frame_size);
+	return bridge;
+}
+
+MPF_DECLARE(mpf_object_t*) mpf_null_bridge_create(mpf_audio_stream_t *source, mpf_audio_stream_t *sink, apr_pool_t *pool)
+{
+	mpf_codec_t *codec;
+	apr_size_t frame_size;
+	mpf_object_t *bridge;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Create Audio Null Bridge");
+	bridge = mpf_bridge_base_create(source,sink,pool);
+	if(!bridge) {
+		return NULL;
+	}
+	bridge->process = mpf_null_bridge_process;
+
+	codec = source->rx_codec;
+	frame_size = mpf_codec_frame_size_calculate(codec->descriptor,codec->attribs);
+	bridge->frame.codec_frame.size = frame_size;
+	bridge->frame.codec_frame.buffer = apr_palloc(pool,frame_size);
+	return bridge;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_buffer.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_buffer.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef WIN32
+#pragma warning(disable: 4127)
+#endif
+#include 
+#include "mpf_buffer.h"
+
+typedef struct mpf_chunk_t mpf_chunk_t;
+
+struct mpf_chunk_t {
+	APR_RING_ENTRY(mpf_chunk_t) link;
+	mpf_frame_t                 frame;
+};
+
+struct mpf_buffer_t {
+	APR_RING_HEAD(mpf_chunk_head_t, mpf_chunk_t) head;
+	mpf_chunk_t                                 *cur_chunk;
+	apr_size_t                                   remaining_chunk_size;
+	apr_thread_mutex_t                          *guard;
+	apr_pool_t                                  *pool;
+	apr_size_t                                   size; /* total size */
+};
+
+mpf_buffer_t* mpf_buffer_create(apr_pool_t *pool)
+{
+	mpf_buffer_t *buffer = apr_palloc(pool,sizeof(mpf_buffer_t));
+	buffer->pool = pool;
+	buffer->cur_chunk = NULL;
+	buffer->remaining_chunk_size = 0;
+	buffer->size = 0;
+	APR_RING_INIT(&buffer->head, mpf_chunk_t, link);
+	apr_thread_mutex_create(&buffer->guard,APR_THREAD_MUTEX_UNNESTED,pool);
+	return buffer;
+}
+
+void mpf_buffer_destroy(mpf_buffer_t *buffer)
+{
+	if(buffer->guard) {
+		apr_thread_mutex_destroy(buffer->guard);
+		buffer->guard = NULL;
+	}
+}
+
+apt_bool_t mpf_buffer_restart(mpf_buffer_t *buffer)
+{
+	apr_thread_mutex_lock(buffer->guard);
+	APR_RING_INIT(&buffer->head, mpf_chunk_t, link);
+	apr_thread_mutex_unlock(buffer->guard);
+	return TRUE;
+}
+
+static APR_INLINE apt_bool_t mpf_buffer_chunk_write(mpf_buffer_t *buffer, mpf_chunk_t *chunk)
+{
+	APR_RING_INSERT_TAIL(&buffer->head,chunk,mpf_chunk_t,link);
+	return TRUE;
+}
+
+static APR_INLINE mpf_chunk_t* mpf_buffer_chunk_read(mpf_buffer_t *buffer)
+{
+	mpf_chunk_t *chunk = NULL;
+	if(!APR_RING_EMPTY(&buffer->head,mpf_chunk_t,link)) {
+		chunk = APR_RING_FIRST(&buffer->head);
+		APR_RING_REMOVE(chunk,link);
+	}
+	return chunk;
+}
+
+apt_bool_t mpf_buffer_audio_write(mpf_buffer_t *buffer, void *data, apr_size_t size)
+{
+	mpf_chunk_t *chunk;
+	apt_bool_t status = TRUE;
+	apr_thread_mutex_lock(buffer->guard);
+
+	chunk = apr_palloc(buffer->pool,sizeof(mpf_chunk_t));
+	chunk->frame.codec_frame.buffer = apr_palloc(buffer->pool,size);
+	memcpy(chunk->frame.codec_frame.buffer,data,size);
+	chunk->frame.codec_frame.size = size;
+	chunk->frame.type = MEDIA_FRAME_TYPE_AUDIO;
+	status = mpf_buffer_chunk_write(buffer,chunk);
+	
+	buffer->size += size;
+	apr_thread_mutex_unlock(buffer->guard);
+	return status;
+}
+
+apt_bool_t mpf_buffer_event_write(mpf_buffer_t *buffer, mpf_frame_type_e event_type)
+{
+	mpf_chunk_t *chunk;
+	apt_bool_t status = TRUE;
+	apr_thread_mutex_lock(buffer->guard);
+
+	chunk = apr_palloc(buffer->pool,sizeof(mpf_chunk_t));
+	chunk->frame.codec_frame.buffer = NULL;
+	chunk->frame.codec_frame.size = 0;
+	chunk->frame.type = event_type;
+	status = mpf_buffer_chunk_write(buffer,chunk);
+	
+	apr_thread_mutex_unlock(buffer->guard);
+	return status;
+}
+
+apt_bool_t mpf_buffer_frame_read(mpf_buffer_t *buffer, mpf_frame_t *media_frame)
+{
+	mpf_codec_frame_t *dest;
+	mpf_codec_frame_t *src;
+	apr_size_t remaining_frame_size = media_frame->codec_frame.size;
+	apr_thread_mutex_lock(buffer->guard);
+	do {
+		if(!buffer->cur_chunk) {
+			buffer->cur_chunk = mpf_buffer_chunk_read(buffer);
+			if(!buffer->cur_chunk) {
+				/* buffer is empty */
+				break;
+			}
+			buffer->remaining_chunk_size = buffer->cur_chunk->frame.codec_frame.size;
+		}
+
+		dest = &media_frame->codec_frame;
+		src = &buffer->cur_chunk->frame.codec_frame;
+		media_frame->type |= buffer->cur_chunk->frame.type;
+		if(remaining_frame_size < buffer->remaining_chunk_size) {
+			/* copy remaining_frame_size */
+			memcpy(
+				(char*)dest->buffer + dest->size - remaining_frame_size,
+				(char*)src->buffer + src->size - buffer->remaining_chunk_size,
+				remaining_frame_size);
+			buffer->remaining_chunk_size -= remaining_frame_size;
+			buffer->size -= remaining_frame_size;
+			remaining_frame_size = 0;
+		}
+		else {
+			/* copy remaining_chunk_size and proceed to the next chunk */
+			memcpy(
+				(char*)dest->buffer + dest->size - remaining_frame_size,
+				(char*)src->buffer + src->size - buffer->remaining_chunk_size,
+				buffer->remaining_chunk_size);
+			remaining_frame_size -= buffer->remaining_chunk_size;
+			buffer->size -= buffer->remaining_chunk_size;
+			buffer->remaining_chunk_size = 0;
+			buffer->cur_chunk = NULL;
+		}
+	}
+	while(remaining_frame_size);
+
+	if(remaining_frame_size) {
+		apr_size_t offset = media_frame->codec_frame.size - remaining_frame_size;
+		memset((char*)media_frame->codec_frame.buffer + offset, 0, remaining_frame_size);
+	}
+	apr_thread_mutex_unlock(buffer->guard);
+	return TRUE;
+}
+
+apr_size_t mpf_buffer_get_size(mpf_buffer_t *buffer)
+{
+	return buffer->size;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_descriptor.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_descriptor.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_codec_descriptor.h"
+
+/** Match two codec descriptors */
+MPF_DECLARE(apt_bool_t) mpf_codec_descriptor_match(const mpf_codec_descriptor_t *descriptor1, const mpf_codec_descriptor_t *descriptor2)
+{
+	apt_bool_t match = FALSE;
+	if(descriptor1->payload_type < 96 && descriptor2->payload_type < 96) {
+		if(descriptor1->payload_type == descriptor2->payload_type) {
+			match = TRUE;
+		}
+	}
+	else {
+		if(apt_string_compare(&descriptor1->name,&descriptor2->name) == TRUE) {
+			if(descriptor1->sampling_rate == descriptor2->sampling_rate && 
+				descriptor1->channel_count == descriptor2->channel_count) {
+				match = TRUE;
+			}
+		}
+	}
+	return match;
+}
+
+/** Intersect two codec lists */
+MPF_DECLARE(apt_bool_t) mpf_codec_list_intersect(mpf_codec_list_t *codec_list1, mpf_codec_list_t *codec_list2)
+{
+	int i;
+	int j;
+	mpf_codec_descriptor_t *descriptor1;
+	mpf_codec_descriptor_t *descriptor2;
+	codec_list1->preffered = NULL;
+	codec_list2->preffered = NULL;
+	/* find only one match, set the matched codec as preffered, disable the others */
+	for(i=0; idescriptor_arr->nelts; i++) {
+		descriptor1 = (mpf_codec_descriptor_t*)codec_list1->descriptor_arr->elts + i;
+		if(codec_list1->preffered) {
+			descriptor1->enabled = FALSE;
+			continue;
+		}
+
+		for(j=0; jdescriptor_arr->nelts; j++) {
+			descriptor2 = (mpf_codec_descriptor_t*)codec_list2->descriptor_arr->elts + j;
+
+			descriptor1->enabled = mpf_codec_descriptor_match(descriptor1,descriptor2);
+			if(descriptor1->enabled == TRUE) {
+				codec_list1->preffered = descriptor1;
+				codec_list2->preffered = descriptor2;
+				break;
+			}
+		}
+	}
+	for(j=0; jdescriptor_arr->nelts; j++) {
+		descriptor2 = (mpf_codec_descriptor_t*)codec_list2->descriptor_arr->elts + j;
+		descriptor2->enabled = (codec_list2->preffered == descriptor2) ? TRUE : FALSE;
+	}
+
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_g711.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_g711.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_codec.h"
+#include "g711/g711.h"
+
+#define G711u_CODEC_NAME        "PCMU"
+#define G711u_CODEC_NAME_LENGTH (sizeof(G711u_CODEC_NAME)-1)
+
+#define G711a_CODEC_NAME        "PCMA"
+#define G711a_CODEC_NAME_LENGTH (sizeof(G711a_CODEC_NAME)-1)
+
+static apt_bool_t g711_open(mpf_codec_t *codec)
+{
+	return TRUE;
+}
+
+static apt_bool_t g711_close(mpf_codec_t *codec)
+{
+	return TRUE;
+}
+
+static apt_bool_t g711u_encode(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out)
+{
+	const short *decode_buf;
+	unsigned char *encode_buf;
+	apr_uint32_t i;
+
+	decode_buf = frame_in->buffer;
+	encode_buf = frame_out->buffer;
+
+	frame_out->size = frame_in->size / sizeof(short);
+
+	for(i=0; isize; i++) {
+		encode_buf[i] = linear_to_ulaw(decode_buf[i]);
+	}
+
+	return TRUE;
+}
+
+static apt_bool_t g711u_decode(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out)
+{
+	short *decode_buf;
+	const unsigned char *encode_buf;
+	apr_uint32_t i;
+
+	decode_buf = frame_out->buffer;
+	encode_buf = frame_in->buffer;
+
+	frame_out->size = frame_in->size * sizeof(short);
+
+	for(i=0; isize; i++) {
+		decode_buf[i] = ulaw_to_linear(encode_buf[i]);
+	}
+
+	return TRUE;
+}
+
+static apt_bool_t g711a_encode(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out)
+{
+	const short *decode_buf;
+	unsigned char *encode_buf;
+	apr_uint32_t i;
+
+	decode_buf = frame_in->buffer;
+	encode_buf = frame_out->buffer;
+
+	frame_out->size = frame_in->size / sizeof(short);
+
+	for(i=0; isize; i++) {
+		encode_buf[i] = linear_to_alaw(decode_buf[i]);
+	}
+
+	return TRUE;
+}
+
+static apt_bool_t g711a_decode(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out)
+{
+	short *decode_buf;
+	const unsigned char *encode_buf;
+	apr_uint32_t i;
+
+	decode_buf = frame_out->buffer;
+	encode_buf = frame_in->buffer;
+
+	frame_out->size = frame_in->size * sizeof(short);
+
+	for(i=0; isize; i++) {
+		decode_buf[i] = alaw_to_linear(encode_buf[i]);
+	}
+
+	return TRUE;
+}
+
+static const mpf_codec_vtable_t g711u_vtable = {
+	g711_open,
+	g711_close,
+	g711u_encode,
+	g711u_decode,
+	NULL
+};
+
+static const mpf_codec_vtable_t g711a_vtable = {
+	g711_open,
+	g711_close,
+	g711a_encode,
+	g711a_decode,
+	NULL
+};
+
+static const mpf_codec_descriptor_t g711u_descriptor = {
+	0,
+	{G711u_CODEC_NAME, G711u_CODEC_NAME_LENGTH},
+	8000,
+	1,
+	NULL,
+	TRUE
+};
+
+static const mpf_codec_descriptor_t g711a_descriptor = {
+	8,
+	{G711a_CODEC_NAME, G711a_CODEC_NAME_LENGTH},
+	8000,
+	1,
+	NULL,
+	TRUE
+};
+
+static const mpf_codec_attribs_t g711u_attribs = {
+	{G711u_CODEC_NAME, G711u_CODEC_NAME_LENGTH}, /* codec name */
+	8,                                           /* bits per sample */
+	MPF_SAMPLE_RATE_8000 | MPF_SAMPLE_RATE_16000 /* sampling rates */
+};
+
+static const mpf_codec_attribs_t g711a_attribs = {
+	{G711a_CODEC_NAME, G711a_CODEC_NAME_LENGTH}, /* codec name */
+	8,                                           /* bits per sample */
+	MPF_SAMPLE_RATE_8000 | MPF_SAMPLE_RATE_16000 /* sampling rates */
+};
+
+mpf_codec_t* mpf_codec_g711u_create(apr_pool_t *pool)
+{
+	return mpf_codec_create(&g711u_vtable,&g711u_attribs,&g711u_descriptor,pool);
+}
+
+mpf_codec_t* mpf_codec_g711a_create(apr_pool_t *pool)
+{
+	return mpf_codec_create(&g711a_vtable,&g711a_attribs,&g711a_descriptor,pool);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_linear.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_linear.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_codec.h"
+
+#define L16_CODEC_NAME        "L16"
+#define L16_CODEC_NAME_LENGTH (sizeof(L16_CODEC_NAME)-1)
+
+static const mpf_codec_vtable_t l16_vtable = {
+	NULL
+};
+
+static const mpf_codec_descriptor_t l16_descriptor = {
+	96, /* not specified */
+	{L16_CODEC_NAME, L16_CODEC_NAME_LENGTH},
+	8000,
+	1,
+	NULL,
+	TRUE
+};
+
+static const mpf_codec_attribs_t l16_attribs = {
+	{L16_CODEC_NAME, L16_CODEC_NAME_LENGTH},     /* codec name */
+	16,                                          /* bits per sample */
+	MPF_SAMPLE_RATE_8000 | MPF_SAMPLE_RATE_16000 /* sampling rates */
+};
+
+mpf_codec_t* mpf_codec_l16_create(apr_pool_t *pool)
+{
+	return mpf_codec_create(&l16_vtable,&l16_attribs,NULL,pool);
+}
+
+const mpf_codec_descriptor_t* l16_descriptor_get()
+{
+	return &l16_descriptor;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_manager.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_manager.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "mpf_codec_manager.h"
+#include "apt_log.h"
+
+
+struct mpf_codec_manager_t {
+	/** Memory pool */
+	apr_pool_t   *pool;
+
+	/** Dynamic array of codecs (mpf_codec_t*) */
+	apr_array_header_t *codec_arr;
+};
+
+
+MPF_DECLARE(mpf_codec_manager_t*) mpf_codec_manager_create(apr_size_t codec_count, apr_pool_t *pool)
+{
+	mpf_codec_manager_t *codec_manager = apr_palloc(pool,sizeof(mpf_codec_manager_t));
+	codec_manager->pool = pool;
+	codec_manager->codec_arr = apr_array_make(pool,(int)codec_count,sizeof(mpf_codec_t*));
+	return codec_manager;
+}
+
+MPF_DECLARE(void) mpf_codec_manager_destroy(mpf_codec_manager_t *codec_manager)
+{
+	/* nothing to do */
+}
+
+MPF_DECLARE(apt_bool_t) mpf_codec_manager_codec_register(mpf_codec_manager_t *codec_manager, mpf_codec_t *codec)
+{
+	mpf_codec_t **slot;
+	if(!codec || !codec->attribs || !codec->attribs->name.buf) {
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Codec [%s]",codec->attribs->name.buf);
+
+	slot = apr_array_push(codec_manager->codec_arr);
+	*slot = codec;
+	return TRUE;
+}
+
+MPF_DECLARE(mpf_codec_t*) mpf_codec_manager_codec_get(const mpf_codec_manager_t *codec_manager, mpf_codec_descriptor_t *descriptor, apr_pool_t *pool)
+{
+	int i;
+	mpf_codec_t *codec = NULL;
+	mpf_codec_t *ret_codec = NULL;
+	if(!descriptor) {
+		return NULL;
+	}
+
+	for(i=0; icodec_arr->nelts; i++) {
+		codec = ((mpf_codec_t**)codec_manager->codec_arr->elts)[i];
+		if(descriptor->payload_type < 96) {
+			if(codec->static_descriptor && codec->static_descriptor->payload_type == descriptor->payload_type) {
+				descriptor->name = codec->static_descriptor->name;
+				descriptor->sampling_rate = codec->static_descriptor->sampling_rate;
+				descriptor->channel_count = codec->static_descriptor->channel_count;
+				break;
+			}
+		}
+		else {
+			if(apt_string_compare(&codec->attribs->name,&descriptor->name) == TRUE) {
+				/* sampling rate must be checked as well */
+				break;
+			}
+		}
+	}
+
+	if(i == codec_manager->codec_arr->nelts) {
+		/* no match found */
+		return NULL;
+	}
+	if(codec) {
+		ret_codec = mpf_codec_clone(codec,pool);
+		ret_codec->descriptor = descriptor;
+	}
+	return ret_codec;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_codec_manager_codec_list_get(const mpf_codec_manager_t *codec_manager, mpf_codec_list_t *codec_list, apr_pool_t *pool)
+{
+	const mpf_codec_descriptor_t *static_descriptor;
+	mpf_codec_descriptor_t *descriptor;
+	int i;
+	mpf_codec_t *codec;
+
+	mpf_codec_list_init(codec_list,codec_manager->codec_arr->nelts,pool);
+	for(i=0; icodec_arr->nelts; i++) {
+		codec = ((mpf_codec_t**)codec_manager->codec_arr->elts)[i];
+		static_descriptor = codec->static_descriptor;
+		if(static_descriptor) {
+			descriptor = mpf_codec_list_add(codec_list);
+			if(descriptor) {
+				*descriptor = *static_descriptor;
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mpf_codec_manager_codec_parse(const mpf_codec_manager_t *codec_manager, mpf_codec_list_t *codec_list, char *codec_desc_str, apr_pool_t *pool)
+{
+	const mpf_codec_t *codec;
+	mpf_codec_descriptor_t *descriptor;
+	const char *separator = "/";
+	char *state;
+	/* parse codec name */
+	char *str = apr_strtok(codec_desc_str, separator, &state);
+	codec_desc_str = NULL; /* make sure we pass NULL on subsequent calls of apr_strtok() */
+	if(str) {
+		apt_str_t name;
+		apt_string_assign(&name,str,pool);
+		/* find codec by name */
+		codec = mpf_codec_manager_codec_find(codec_manager,&name);
+		if(!codec) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Such Codec [%s]",str);
+			return FALSE;
+		}
+
+		descriptor = mpf_codec_list_add(codec_list);
+		descriptor->name = name;
+
+		/* set defualt attributes */
+		if(codec->static_descriptor) {
+			descriptor->payload_type = codec->static_descriptor->payload_type;
+			descriptor->sampling_rate = codec->static_descriptor->sampling_rate;
+			descriptor->channel_count = codec->static_descriptor->channel_count;
+		}
+		else {
+			descriptor->payload_type = 96;
+			descriptor->sampling_rate = 8000;
+			descriptor->channel_count = 1;
+		}
+
+		/* parse optional payload type */
+		str = apr_strtok(codec_desc_str, separator, &state);
+		if(str) {
+			descriptor->payload_type = (apr_byte_t)atol(str);
+
+			/* parse optional sampling rate */
+			str = apr_strtok(codec_desc_str, separator, &state);
+			if(str) {
+				descriptor->sampling_rate = (apr_uint16_t)atol(str);
+
+				/* parse optional channel count */
+				str = apr_strtok(codec_desc_str, separator, &state);
+				if(str) {
+					descriptor->channel_count = (apr_byte_t)atol(str);
+				}
+			}
+		}
+	}
+	return TRUE;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_codec_manager_codec_list_load(const mpf_codec_manager_t *codec_manager, mpf_codec_list_t *codec_list, const char *str, apr_pool_t *pool)
+{
+	char *codec_desc_str;
+	char *state;
+	char *codec_list_str = apr_pstrdup(pool,str);
+	do {
+		codec_desc_str = apr_strtok(codec_list_str, " ", &state);
+		if(codec_desc_str) {
+			mpf_codec_manager_codec_parse(codec_manager,codec_list,codec_desc_str,pool);
+		}
+		codec_list_str = NULL; /* make sure we pass NULL on subsequent calls of apr_strtok() */
+	} 
+	while(codec_desc_str);
+	return TRUE;
+}
+
+MPF_DECLARE(const mpf_codec_t*) mpf_codec_manager_codec_find(const mpf_codec_manager_t *codec_manager, const apt_str_t *codec_name)
+{
+	int i;
+	mpf_codec_t *codec;
+	for(i=0; icodec_arr->nelts; i++) {
+		codec = ((mpf_codec_t**)codec_manager->codec_arr->elts)[i];
+		if(apt_string_compare(&codec->attribs->name,codec_name) == TRUE) {
+			return codec;
+		}
+	}
+	return NULL;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_context.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_context.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_context.h"
+#include "mpf_termination.h"
+#include "mpf_stream.h"
+#include "mpf_encoder.h"
+#include "mpf_decoder.h"
+#include "mpf_bridge.h"
+#include "apt_log.h"
+
+static mpf_object_t* mpf_context_connection_create(mpf_context_t *context, mpf_termination_t *src_termination, mpf_termination_t *sink_termination);
+
+MPF_DECLARE(mpf_context_t*) mpf_context_create(void *obj, apr_size_t max_termination_count, apr_pool_t *pool)
+{
+	apr_size_t i,j;
+	mpf_context_t *context = apr_palloc(pool,sizeof(mpf_context_t));
+	context->obj = obj;
+	context->pool = pool;
+	context->elem = NULL;
+	context->max_termination_count = max_termination_count;
+	context->termination_count = 0;
+	context->table = apr_palloc(pool,sizeof(table_item_t)*max_termination_count);
+	for(i=0; itable[i] = apr_palloc(pool,sizeof(table_item_t)*max_termination_count);
+		for(j=0; jtable[i][j] = NULL;
+		}
+	}
+
+	return context;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_context_destroy(mpf_context_t *context)
+{
+	apr_size_t i;
+	apr_size_t count = context->max_termination_count;
+	mpf_termination_t *termination;
+	for(i=0; itable[i][i];
+		if(termination) {
+			mpf_context_termination_subtract(context,termination);
+			if(termination->audio_stream) {
+				mpf_audio_stream_destroy(termination->audio_stream);
+			}
+		}
+	}
+	return TRUE;
+}
+
+MPF_DECLARE(void*) mpf_context_object_get(mpf_context_t *context)
+{
+	return context->obj;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_context_termination_add(mpf_context_t *context, mpf_termination_t *termination)
+{
+	apr_size_t i;
+	apr_size_t count = context->max_termination_count;
+	for(i=0; itable[i][i]) {
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Add Termination");
+			context->table[i][i] = termination;
+			termination->slot = i;
+			context->termination_count++;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_context_termination_subtract(mpf_context_t *context, mpf_termination_t *termination)
+{
+	apr_size_t i = termination->slot;
+	if(i >= context->max_termination_count) {
+		return FALSE;
+	}
+	if(context->table[i][i] != termination) {
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Subtract Termination");
+	context->table[i][i] = NULL;
+	termination->slot = (apr_size_t)-1;
+	context->termination_count--;
+	return TRUE;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_context_process(mpf_context_t *context)
+{
+	mpf_object_t *object;
+	apr_size_t i,j;
+	for(i=0; imax_termination_count; i++) {
+		for(j=0; jmax_termination_count; j++) {
+			if(i==j) continue;
+
+			object = context->table[i][j];
+			if(object && object->process) {
+				object->process(object);
+			}
+		}
+	}
+	return TRUE;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_context_topology_apply(mpf_context_t *context, mpf_termination_t *termination)
+{
+	apr_size_t i,j;
+	mpf_object_t *object;
+	mpf_termination_t *sink_termination;
+	mpf_termination_t *source_termination;
+	if(context->termination_count <= 1) {
+		/* at least 2 terminations are required to apply topology on them */
+		return TRUE;
+	}
+
+	i = termination->slot;
+	for(j=0; jmax_termination_count; j++) {
+		if(i == j) continue;
+
+		sink_termination = context->table[j][j];
+		object = mpf_context_connection_create(context,termination,sink_termination);
+		if(object) {
+			context->table[i][j] = object;
+		}
+	}
+
+	j = termination->slot;
+	for(i=0; imax_termination_count; i++) {
+		if(i == j) continue;
+
+		source_termination = context->table[i][i];
+		object = mpf_context_connection_create(context,source_termination,termination);
+		if(object) {
+			context->table[i][j] = object;
+		}
+	}
+
+	return TRUE;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_context_topology_destroy(mpf_context_t *context, mpf_termination_t *termination)
+{
+	apr_size_t i,j;
+	mpf_object_t *object;
+	if(context->termination_count <= 1) {
+		/* at least 2 terminations are required to destroy topology */
+		return TRUE;
+	}
+
+	i = termination->slot;
+	for(j=0; jmax_termination_count; j++) {
+		if(i == j) continue;
+
+		object = context->table[i][j];
+		if(object) {
+			if(object->destroy) {
+				object->destroy(object);
+			}
+			context->table[i][j] = NULL;
+		}
+	}
+
+	j = termination->slot;
+	for(i=0; imax_termination_count; i++) {
+		if(i == j) continue;
+
+		object = context->table[i][j];
+		if(object) {
+			if(object->destroy) {
+				object->destroy(object);
+			}
+			context->table[i][j] = NULL;
+		}
+	}
+	return TRUE;
+}
+
+static mpf_object_t* mpf_context_connection_create(mpf_context_t *context, mpf_termination_t *src_termination, mpf_termination_t *sink_termination)
+{
+	mpf_object_t *object = NULL;
+	mpf_audio_stream_t *source;
+	mpf_audio_stream_t *sink;
+	if(!src_termination || !sink_termination) {
+		return NULL;
+	}
+	source = src_termination->audio_stream;
+	sink = sink_termination->audio_stream;
+	if(source && (source->mode & STREAM_MODE_RECEIVE) == STREAM_MODE_RECEIVE &&
+		sink && (sink->mode & STREAM_MODE_SEND) == STREAM_MODE_SEND) {
+		mpf_codec_t *rx_codec = source->rx_codec;
+		mpf_codec_t *tx_codec = sink->tx_codec;
+		if(rx_codec && tx_codec) {
+			if(mpf_codec_descriptor_match(rx_codec->descriptor,tx_codec->descriptor) == TRUE) {
+				object = mpf_null_bridge_create(source,sink,context->pool);
+			}
+			else {
+				if(rx_codec->attribs->bits_per_samples != BITS_PER_SAMPLE) {
+					/* set decoder before bridge */
+					mpf_audio_stream_t *decoder = mpf_decoder_create(source,context->pool);
+					source = decoder;
+				}
+				if(tx_codec->attribs->bits_per_samples != BITS_PER_SAMPLE) {
+					/* set encoder after bridge */
+					mpf_audio_stream_t *encoder = mpf_encoder_create(sink,context->pool);
+					sink = encoder;
+				}
+				object = mpf_bridge_create(source,sink,context->pool);
+			}
+		}
+	}
+	return object;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_decoder.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_decoder.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_decoder.h"
+#include "apt_log.h"
+
+typedef struct mpf_decoder_t mpf_decoder_t;
+
+struct mpf_decoder_t {
+	mpf_audio_stream_t *base;
+	mpf_audio_stream_t *source;
+	mpf_frame_t         frame_in;
+};
+
+
+static apt_bool_t mpf_decoder_destroy(mpf_audio_stream_t *stream)
+{
+	mpf_decoder_t *decoder = stream->obj;
+	return mpf_audio_stream_destroy(decoder->source);
+}
+
+static apt_bool_t mpf_decoder_open(mpf_audio_stream_t *stream)
+{
+	mpf_decoder_t *decoder = stream->obj;
+	return mpf_audio_stream_rx_open(decoder->source);
+}
+
+static apt_bool_t mpf_decoder_close(mpf_audio_stream_t *stream)
+{
+	mpf_decoder_t *decoder = stream->obj;
+	return mpf_audio_stream_rx_close(decoder->source);
+}
+
+static apt_bool_t mpf_decoder_process(mpf_audio_stream_t *stream, mpf_frame_t *frame)
+{
+	mpf_decoder_t *decoder = stream->obj;
+	if(mpf_audio_stream_frame_read(decoder->source,&decoder->frame_in) != TRUE) {
+		return FALSE;
+	}
+
+	frame->type = decoder->frame_in.type;
+	if((frame->type & MEDIA_FRAME_TYPE_EVENT) == MEDIA_FRAME_TYPE_EVENT) {
+		frame->event_frame = decoder->frame_in.event_frame;
+	}
+	if((frame->type & MEDIA_FRAME_TYPE_AUDIO) == MEDIA_FRAME_TYPE_AUDIO) {
+		mpf_codec_decode(decoder->source->rx_codec,&decoder->frame_in.codec_frame,&frame->codec_frame);
+	}
+	return TRUE;
+}
+
+
+static const mpf_audio_stream_vtable_t vtable = {
+	mpf_decoder_destroy,
+	mpf_decoder_open,
+	mpf_decoder_close,
+	mpf_decoder_process,
+	NULL,
+	NULL,
+	NULL
+};
+
+MPF_DECLARE(mpf_audio_stream_t*) mpf_decoder_create(mpf_audio_stream_t *source, apr_pool_t *pool)
+{
+	apr_size_t frame_size;
+	mpf_codec_t *codec;
+	mpf_decoder_t *decoder;
+	if(!source || !source->rx_codec) {
+		return NULL;
+	}
+	decoder = apr_palloc(pool,sizeof(mpf_decoder_t));
+	decoder->base = mpf_audio_stream_create(decoder,&vtable,STREAM_MODE_RECEIVE,pool);
+	decoder->source = source;
+
+	codec = source->rx_codec;
+	frame_size = mpf_codec_frame_size_calculate(codec->descriptor,codec->attribs);
+	decoder->base->rx_codec = codec;
+	decoder->frame_in.codec_frame.size = frame_size;
+	decoder->frame_in.codec_frame.buffer = apr_palloc(pool,frame_size);
+	return decoder->base;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_encoder.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_encoder.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_encoder.h"
+#include "apt_log.h"
+
+typedef struct mpf_encoder_t mpf_encoder_t;
+
+struct mpf_encoder_t {
+	mpf_audio_stream_t *base;
+	mpf_audio_stream_t *sink;
+	mpf_frame_t         frame_out;
+};
+
+
+static apt_bool_t mpf_encoder_destroy(mpf_audio_stream_t *stream)
+{
+	mpf_encoder_t *encoder = stream->obj;
+	return mpf_audio_stream_destroy(encoder->sink);
+}
+
+static apt_bool_t mpf_encoder_open(mpf_audio_stream_t *stream)
+{
+	mpf_encoder_t *encoder = stream->obj;
+	return mpf_audio_stream_tx_open(encoder->sink);
+}
+
+static apt_bool_t mpf_encoder_close(mpf_audio_stream_t *stream)
+{
+	mpf_encoder_t *encoder = stream->obj;
+	return mpf_audio_stream_tx_close(encoder->sink);
+}
+
+static apt_bool_t mpf_encoder_process(mpf_audio_stream_t *stream, const mpf_frame_t *frame)
+{
+	mpf_encoder_t *encoder = stream->obj;
+
+	encoder->frame_out.type = frame->type;
+	if((frame->type & MEDIA_FRAME_TYPE_EVENT) == MEDIA_FRAME_TYPE_EVENT) {
+		encoder->frame_out.event_frame = frame->event_frame;
+	}
+	if((frame->type & MEDIA_FRAME_TYPE_AUDIO) == MEDIA_FRAME_TYPE_AUDIO) {
+		mpf_codec_encode(encoder->sink->tx_codec,&frame->codec_frame,&encoder->frame_out.codec_frame);
+	}
+	return mpf_audio_stream_frame_write(encoder->sink,&encoder->frame_out);
+}
+
+
+static const mpf_audio_stream_vtable_t vtable = {
+	mpf_encoder_destroy,
+	NULL,
+	NULL,
+	NULL,
+	mpf_encoder_open,
+	mpf_encoder_close,
+	mpf_encoder_process
+};
+
+MPF_DECLARE(mpf_audio_stream_t*) mpf_encoder_create(mpf_audio_stream_t *sink, apr_pool_t *pool)
+{
+	apr_size_t frame_size;
+	mpf_codec_t *codec;
+	mpf_encoder_t *encoder;
+	if(!sink || !sink->tx_codec) {
+		return NULL;
+	}
+	encoder = apr_palloc(pool,sizeof(mpf_encoder_t));
+	encoder->base = mpf_audio_stream_create(encoder,&vtable,STREAM_MODE_SEND,pool);
+	encoder->sink = sink;
+
+	codec = sink->tx_codec;
+	frame_size = mpf_codec_frame_size_calculate(codec->descriptor,codec->attribs);
+	encoder->base->tx_codec = codec;
+	encoder->frame_out.codec_frame.size = frame_size;
+	encoder->frame_out.codec_frame.buffer = apr_palloc(pool,frame_size);
+	return encoder->base;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_engine.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_engine.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_engine.h"
+#include "mpf_user.h"
+#include "mpf_context.h"
+#include "mpf_termination.h"
+#include "mpf_stream.h"
+#include "mpf_timer.h"
+#include "mpf_codec_descriptor.h"
+#include "mpf_codec_manager.h"
+#include "apt_obj_list.h"
+#include "apt_cyclic_queue.h"
+#include "apt_log.h"
+
+#define MPF_TASK_NAME "Media Processing Engine"
+
+struct mpf_engine_t {
+	apr_pool_t                *pool;
+	apt_task_t                *task;
+	apt_task_msg_type_e        task_msg_type;
+	apr_thread_mutex_t        *request_queue_guard;
+	apt_cyclic_queue_t        *request_queue;
+	apt_obj_list_t            *contexts;
+	mpf_timer_t               *timer;
+	const mpf_codec_manager_t *codec_manager;
+};
+
+static void mpf_engine_main(mpf_timer_t *timer, void *data);
+static apt_bool_t mpf_engine_destroy(apt_task_t *task);
+static apt_bool_t mpf_engine_start(apt_task_t *task);
+static apt_bool_t mpf_engine_terminate(apt_task_t *task);
+static apt_bool_t mpf_engine_msg_signal(apt_task_t *task, apt_task_msg_t *msg);
+static apt_bool_t mpf_engine_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+
+static apt_bool_t mpf_engine_contexts_destroy(mpf_engine_t *engine);
+
+mpf_codec_t* mpf_codec_l16_create(apr_pool_t *pool);
+mpf_codec_t* mpf_codec_g711u_create(apr_pool_t *pool);
+mpf_codec_t* mpf_codec_g711a_create(apr_pool_t *pool);
+
+MPF_DECLARE(mpf_engine_t*) mpf_engine_create(apr_pool_t *pool)
+{
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+	mpf_engine_t *engine = apr_palloc(pool,sizeof(mpf_engine_t));
+	engine->pool = pool;
+	engine->request_queue = NULL;
+	engine->contexts = NULL;
+	engine->codec_manager = NULL;
+
+	msg_pool = apt_task_msg_pool_create_dynamic(sizeof(mpf_message_t),pool);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "MPF_TASK_NAME);
+	engine->task = apt_task_create(engine,msg_pool,pool);
+	if(!engine->task) {
+		return NULL;
+	}
+
+	apt_task_name_set(engine->task,MPF_TASK_NAME);
+
+	vtable = apt_task_vtable_get(engine->task);
+	if(vtable) {
+		vtable->destroy = mpf_engine_destroy;
+		vtable->start = mpf_engine_start;
+		vtable->terminate = mpf_engine_terminate;
+		vtable->signal_msg = mpf_engine_msg_signal;
+		vtable->process_msg = mpf_engine_msg_process;
+	}
+
+	engine->task_msg_type = TASK_MSG_USER;
+
+	engine->request_queue = apt_cyclic_queue_create(CYCLIC_QUEUE_DEFAULT_SIZE);
+	apr_thread_mutex_create(&engine->request_queue_guard,APR_THREAD_MUTEX_UNNESTED,engine->pool);
+
+	engine->contexts = apt_list_create(engine->pool);
+
+	return engine;
+}
+
+MPF_DECLARE(apt_task_t*) mpf_task_get(mpf_engine_t *engine)
+{
+	return engine->task;
+}
+
+MPF_DECLARE(void) mpf_engine_task_msg_type_set(mpf_engine_t *engine, apt_task_msg_type_e type)
+{
+	engine->task_msg_type = type;
+}
+
+static apt_bool_t mpf_engine_destroy(apt_task_t *task)
+{
+	mpf_engine_t *engine = apt_task_object_get(task);
+
+	apt_list_destroy(engine->contexts);
+
+	apt_cyclic_queue_destroy(engine->request_queue);
+	apr_thread_mutex_destroy(engine->request_queue_guard);
+	return TRUE;
+}
+
+static apt_bool_t mpf_engine_start(apt_task_t *task)
+{
+	mpf_engine_t *engine = apt_task_object_get(task);
+
+	engine->timer = mpf_timer_start(CODEC_FRAME_TIME_BASE,mpf_engine_main,engine,engine->pool);
+	apt_task_child_start(task);
+	return TRUE;
+}
+
+static apt_bool_t mpf_engine_terminate(apt_task_t *task)
+{
+	mpf_engine_t *engine = apt_task_object_get(task);
+
+	mpf_timer_stop(engine->timer);
+	mpf_engine_contexts_destroy(engine);
+	return TRUE;
+}
+
+static apt_bool_t mpf_engine_contexts_destroy(mpf_engine_t *engine)
+{
+	mpf_context_t *context;
+	context = apt_list_pop_front(engine->contexts);
+	while(context) {
+		mpf_context_destroy(context);
+		
+		context = apt_list_pop_front(engine->contexts);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mpf_engine_event_raise(mpf_termination_t *termination, int event_id, void *descriptor)
+{
+	apt_task_msg_t *task_msg;
+	mpf_message_t *event_msg;
+	mpf_engine_t *engine;
+	engine = termination->event_handler_obj;
+	if(!engine) {
+		return FALSE;
+	}
+
+	task_msg = apt_task_msg_get(engine->task);
+	task_msg->type = engine->task_msg_type;
+	event_msg = (mpf_message_t*) task_msg->data;
+	event_msg->command_id = event_id;
+	event_msg->message_type = MPF_MESSAGE_TYPE_EVENT;
+	event_msg->status_code = MPF_STATUS_CODE_SUCCESS;
+	event_msg->context = NULL;
+	event_msg->termination = termination;
+	event_msg->descriptor = descriptor;
+	
+	return apt_task_msg_parent_signal(engine->task,task_msg);
+}
+
+static apt_bool_t mpf_engine_msg_signal(apt_task_t *task, apt_task_msg_t *msg)
+{
+	mpf_engine_t *engine = apt_task_object_get(task);
+	
+	apr_thread_mutex_lock(engine->request_queue_guard);
+	if(apt_cyclic_queue_push(engine->request_queue,msg) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_ERROR,"MPF Request Queue is Full");
+	}
+	apr_thread_mutex_unlock(engine->request_queue_guard);
+	return TRUE;
+}
+
+static apt_bool_t mpf_engine_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	mpf_engine_t *engine = apt_task_object_get(task);
+	apt_task_msg_t *response_msg;
+	mpf_message_t *response;
+	mpf_context_t *context;
+	mpf_termination_t *termination;
+	const mpf_message_t *request = (const mpf_message_t*) msg->data;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process MPF Message");
+	if(request->message_type != MPF_MESSAGE_TYPE_REQUEST) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid MPF Message Type [%d]",request->message_type);
+		return FALSE;
+	}
+
+	response_msg = apt_task_msg_get(engine->task);
+	response_msg->type = engine->task_msg_type;
+	response = (mpf_message_t*) response_msg->data;
+	*response = *request;
+	response->message_type = MPF_MESSAGE_TYPE_RESPONSE;
+	response->status_code = MPF_STATUS_CODE_SUCCESS;
+	context = request->context;
+	termination = request->termination;
+	switch(request->command_id) {
+		case MPF_COMMAND_ADD:
+		{
+			termination->event_handler_obj = engine;
+			termination->event_handler = mpf_engine_event_raise;
+			termination->codec_manager = engine->codec_manager;
+			if(request->descriptor) {
+				mpf_termination_modify(termination,request->descriptor);
+			}
+			mpf_termination_validate(termination);
+			if(mpf_context_termination_add(context,termination) == FALSE) {
+				response->status_code = MPF_STATUS_CODE_FAILURE;
+				break;
+			}
+			mpf_context_topology_apply(context,termination);
+			if(context->termination_count == 1) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Add Context");
+				context->elem = apt_list_push_back(engine->contexts,context,context->pool);
+			}
+			break;
+		}
+		case MPF_COMMAND_SUBTRACT:
+		{
+			mpf_context_topology_destroy(context,termination);
+			if(mpf_context_termination_subtract(context,termination) == FALSE) {
+				response->status_code = MPF_STATUS_CODE_FAILURE;
+				break;
+			}
+			if(context->termination_count == 0) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Remove Context");
+				apt_list_elem_remove(engine->contexts,context->elem);
+				context->elem = NULL;
+			}
+			break;
+		}
+		case MPF_COMMAND_MODIFY:
+		{
+			if(request->descriptor) {
+				mpf_context_topology_destroy(context,termination);
+				mpf_termination_modify(termination,request->descriptor);
+				mpf_termination_validate(termination);
+				mpf_context_topology_apply(context,termination);
+			}
+			break;
+		}
+		default:
+		{
+			response->status_code = MPF_STATUS_CODE_FAILURE;
+		}
+	}
+
+	return apt_task_msg_parent_signal(engine->task,response_msg);
+}
+
+static void mpf_engine_main(mpf_timer_t *timer, void *data)
+{
+	mpf_engine_t *engine = data;
+	apt_task_msg_t *msg;
+	apt_list_elem_t *elem;
+	mpf_context_t *context;
+
+	/* process request queue */
+	apr_thread_mutex_lock(engine->request_queue_guard);
+	msg = apt_cyclic_queue_pop(engine->request_queue);
+	while(msg) {
+		apr_thread_mutex_unlock(engine->request_queue_guard);
+		apt_task_msg_process(engine->task,msg);
+		apr_thread_mutex_lock(engine->request_queue_guard);
+		msg = apt_cyclic_queue_pop(engine->request_queue);
+	}
+	apr_thread_mutex_unlock(engine->request_queue_guard);
+
+	/* process contexts */
+	elem = apt_list_first_elem_get(engine->contexts);
+	while(elem) {
+		context = apt_list_elem_object_get(elem);
+		if(context) {
+			mpf_context_process(context);
+		}
+		elem = apt_list_next_elem_get(engine->contexts,elem);
+	}
+}
+
+MPF_DECLARE(mpf_codec_manager_t*) mpf_engine_codec_manager_create(apr_pool_t *pool)
+{
+	mpf_codec_manager_t *codec_manager = mpf_codec_manager_create(3,pool);
+	if(codec_manager) {
+		mpf_codec_t *codec;
+		codec = mpf_codec_g711u_create(pool);
+		mpf_codec_manager_codec_register(codec_manager,codec);
+
+		codec = mpf_codec_g711a_create(pool);
+		mpf_codec_manager_codec_register(codec_manager,codec);
+
+		codec = mpf_codec_l16_create(pool);
+		mpf_codec_manager_codec_register(codec_manager,codec);
+	}
+	return codec_manager;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_engine_codec_manager_register(mpf_engine_t *engine, const mpf_codec_manager_t *codec_manager)
+{
+	engine->codec_manager = codec_manager;
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_file_termination_factory.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_file_termination_factory.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_termination.h"
+#include "mpf_file_termination_factory.h"
+#include "mpf_audio_file_stream.h"
+
+static apt_bool_t mpf_file_termination_destroy(mpf_termination_t *termination)
+{
+	return TRUE;
+}
+
+static apt_bool_t mpf_file_termination_modify(mpf_termination_t *termination, void *descriptor)
+{
+	mpf_audio_stream_t *audio_stream = termination->audio_stream;
+	if(!audio_stream) {
+		audio_stream = mpf_file_stream_create(termination,termination->pool);
+		if(!audio_stream) {
+			return FALSE;
+		}
+		termination->audio_stream = audio_stream;
+	}
+
+	return mpf_file_stream_modify(audio_stream,descriptor);
+}
+
+static const mpf_termination_vtable_t file_vtable = {
+	mpf_file_termination_destroy,
+	mpf_file_termination_modify,
+};
+
+static mpf_termination_t* mpf_file_termination_create(
+									mpf_termination_factory_t *termination_factory,
+									void *obj, 
+									apr_pool_t *pool)
+{
+	return mpf_termination_base_create(termination_factory,obj,&file_vtable,NULL,NULL,pool);
+}
+
+MPF_DECLARE(mpf_termination_factory_t*) mpf_file_termination_factory_create(apr_pool_t *pool)
+{
+	mpf_termination_factory_t *file_termination_factory = apr_palloc(pool,sizeof(mpf_termination_factory_t));
+	file_termination_factory->create_termination = mpf_file_termination_create;
+	return file_termination_factory;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_jitter_buffer.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_jitter_buffer.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_jitter_buffer.h"
+
+struct mpf_jitter_buffer_t {
+	mpf_jb_config_t *config;
+
+	apr_byte_t      *raw_data;
+	mpf_frame_t     *frames;
+	apr_size_t       frame_count;
+	apr_size_t       frame_ts;
+	apr_size_t       frame_size;
+
+	apr_size_t       playout_delay_ts;
+
+	apr_byte_t       write_sync;
+	int              write_ts_offset;
+	
+	apr_size_t       write_ts;
+	apr_size_t       read_ts;
+
+	apr_pool_t      *pool;
+};
+
+
+mpf_jitter_buffer_t* mpf_jitter_buffer_create(mpf_jb_config_t *jb_config, mpf_codec_t *codec, apr_pool_t *pool)
+{
+	size_t i;
+	mpf_jitter_buffer_t *jb = apr_palloc(pool,sizeof(mpf_jitter_buffer_t));
+	if(!jb_config) {
+		/* create default jb config */
+		jb_config = apr_palloc(pool,sizeof(mpf_jb_config_t));
+		mpf_jb_config_init(jb_config);
+	}
+	/* validate jb config */
+	if(jb_config->initial_playout_delay == 0) {
+		/* default configuration */
+		jb_config->min_playout_delay = 10; /* ms */
+		jb_config->initial_playout_delay = 50; /* ms */
+		jb_config->max_playout_delay = 200; /* ms */
+	}
+	else {
+		if(jb_config->min_playout_delay > jb_config->initial_playout_delay) {
+			jb_config->min_playout_delay = jb_config->initial_playout_delay;
+		}
+		if(jb_config->max_playout_delay < jb_config->initial_playout_delay) {
+			jb_config->max_playout_delay = 2 * jb_config->initial_playout_delay;
+		}
+	}
+	jb->config = jb_config;
+
+	jb->frame_ts = mpf_codec_frame_samples_calculate(codec->descriptor);
+	jb->frame_size = mpf_codec_frame_size_calculate(codec->descriptor,codec->attribs);
+	jb->frame_count = jb->config->max_playout_delay / CODEC_FRAME_TIME_BASE;
+	jb->raw_data = apr_palloc(pool,jb->frame_size*jb->frame_count);
+	jb->frames = apr_palloc(pool,sizeof(mpf_frame_t)*jb->frame_count);
+	for(i=0; iframe_count; i++) {
+		jb->frames[i].type = MEDIA_FRAME_TYPE_NONE;
+		jb->frames[i].codec_frame.buffer = jb->raw_data + i*jb->frame_size;
+	}
+
+	jb->playout_delay_ts = jb->config->initial_playout_delay *
+		codec->descriptor->channel_count * codec->descriptor->sampling_rate / 1000;
+
+	jb->write_sync = 1;
+	jb->write_ts_offset = 0;
+	jb->write_ts = jb->read_ts = 0;
+
+	return jb;
+}
+
+void mpf_jitter_buffer_destroy(mpf_jitter_buffer_t *jb)
+{
+}
+
+apt_bool_t mpf_jitter_buffer_restart(mpf_jitter_buffer_t *jb)
+{
+	jb->write_sync = 1;
+	jb->write_ts_offset = 0;
+	jb->write_ts = jb->read_ts;
+	return TRUE;
+}
+
+static APR_INLINE mpf_frame_t* mpf_jitter_buffer_frame_get(mpf_jitter_buffer_t *jb, apr_size_t ts)
+{
+	apr_size_t index = (ts / jb->frame_ts) % jb->frame_count;
+	return &jb->frames[index];
+}
+
+static APR_INLINE jb_result_t mpf_jitter_buffer_write_prepare(mpf_jitter_buffer_t *jb, apr_uint32_t ts, 
+												apr_size_t *write_ts, apr_size_t *available_frame_count)
+{
+	jb_result_t result = JB_OK;
+	if(jb->write_sync) {
+		jb->write_ts_offset = ts - jb->write_ts;
+		jb->write_sync = 0;
+	}
+
+	*write_ts = ts - jb->write_ts_offset + jb->playout_delay_ts;
+	if(*write_ts % jb->frame_ts != 0) {
+		/* not frame alligned */
+		return JB_DISCARD_NOT_ALLIGNED;
+	}
+
+	if(*write_ts >= jb->write_ts) {
+		if(*write_ts - jb->write_ts > jb->frame_ts) {
+			/* gap */
+		}
+		/* normal write */
+	}
+	else {
+		if(*write_ts >= jb->read_ts) {
+			/* backward write */
+		}
+		else {
+			/* too late */
+			result = JB_DISCARD_TOO_LATE;
+		}
+	}
+	*available_frame_count = jb->frame_count - (*write_ts - jb->read_ts)/jb->frame_ts;
+	return result;
+}
+
+jb_result_t mpf_jitter_buffer_write(mpf_jitter_buffer_t *jb, mpf_codec_t *codec, void *buffer, apr_size_t size, apr_uint32_t ts)
+{
+	mpf_frame_t *media_frame;
+	apr_size_t write_ts;
+	apr_size_t available_frame_count = 0;
+	jb_result_t result = mpf_jitter_buffer_write_prepare(jb,ts,&write_ts,&available_frame_count);
+	if(result != JB_OK) {
+		return result;
+	}
+
+	while(available_frame_count && size) {
+		media_frame = mpf_jitter_buffer_frame_get(jb,write_ts);
+		media_frame->codec_frame.size = jb->frame_size;
+		if(mpf_codec_dissect(codec,&buffer,&size,&media_frame->codec_frame) == FALSE) {
+			break;
+		}
+
+		media_frame->type |= MEDIA_FRAME_TYPE_AUDIO;
+		write_ts += jb->frame_ts;
+		available_frame_count--;
+	}
+
+	if(size) {
+		/* no frame available to write, but some data remains in buffer (partialy too early) */
+	}
+
+	if(write_ts > jb->write_ts) {
+		jb->write_ts = write_ts;
+	}
+	return result;
+}
+
+jb_result_t mpf_jitter_buffer_write_named_event(mpf_jitter_buffer_t *jb, mpf_named_event_frame_t *named_event, apr_uint32_t ts)
+{
+	return JB_OK;
+}
+
+apt_bool_t mpf_jitter_buffer_read(mpf_jitter_buffer_t *jb, mpf_frame_t *media_frame)
+{
+	mpf_frame_t *src_media_frame = mpf_jitter_buffer_frame_get(jb,jb->read_ts);
+	if(jb->write_ts > jb->read_ts) {
+		/* normal read */
+		media_frame->type = src_media_frame->type;
+		if(media_frame->type & MEDIA_FRAME_TYPE_AUDIO) {
+			media_frame->codec_frame.size = src_media_frame->codec_frame.size;
+			memcpy(media_frame->codec_frame.buffer,src_media_frame->codec_frame.buffer,media_frame->codec_frame.size);
+		}
+		if(media_frame->type & MEDIA_FRAME_TYPE_EVENT) {
+			media_frame->event_frame = src_media_frame->event_frame;
+		}
+	}
+	else {
+		/* underflow */
+		media_frame->type = MEDIA_FRAME_TYPE_NONE;
+		jb->write_ts += jb->frame_ts;
+	}
+	src_media_frame->type = MEDIA_FRAME_TYPE_NONE;
+	jb->read_ts += jb->frame_ts;
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_attribs.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_attribs.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_string_table.h"
+#include "mpf_rtp_attribs.h"
+
+/** String table of RTP attributes (mpf_rtp_attrib_e) */
+static const apt_str_table_item_t mpf_rtp_attrib_table[] = {
+	{{"rtpmap",   6},1},
+	{{"sendonly", 8},8},
+	{{"recvonly", 8},2},
+	{{"sendrecv", 8},4},
+	{{"mid",      3},0},
+	{{"ptime",    5},0}
+};
+
+
+MPF_DECLARE(const apt_str_t*) mpf_rtp_attrib_str_get(mpf_rtp_attrib_e attrib_id)
+{
+	return apt_string_table_str_get(mpf_rtp_attrib_table,RTP_ATTRIB_COUNT,attrib_id);
+}
+
+MPF_DECLARE(mpf_rtp_attrib_e) mpf_rtp_attrib_id_find(const apt_str_t *attrib)
+{
+	return apt_string_table_id_find(mpf_rtp_attrib_table,RTP_ATTRIB_COUNT,attrib);
+}
+
+MPF_DECLARE(const apt_str_t*) mpf_stream_mode_str_get(mpf_stream_mode_e direction)
+{
+	mpf_rtp_attrib_e attrib_id = RTP_ATTRIB_UNKNOWN;
+	switch(direction) {
+		case STREAM_MODE_SEND:
+			attrib_id = RTP_ATTRIB_SENDONLY;
+			break;
+		case STREAM_MODE_RECEIVE:
+			attrib_id = RTP_ATTRIB_RECVONLY;
+			break;
+		case STREAM_MODE_SEND_RECEIVE:
+			attrib_id = RTP_ATTRIB_SENDRECV;
+			break;
+		default:
+			break;
+	}
+	return apt_string_table_str_get(mpf_rtp_attrib_table,RTP_ATTRIB_COUNT,attrib_id);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_stream.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_stream.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,764 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "mpf_rtp_stream.h"
+#include "mpf_termination.h"
+#include "mpf_codec_manager.h"
+#include "mpf_rtp_header.h"
+#include "mpf_rtp_defs.h"
+#include "apt_log.h"
+
+
+/** RTP stream */
+typedef struct mpf_rtp_stream_t mpf_rtp_stream_t;
+struct mpf_rtp_stream_t {
+	mpf_audio_stream_t         *base;
+
+	mpf_rtp_media_descriptor_t *local_media;
+	mpf_rtp_media_descriptor_t *remote_media;
+
+	rtp_transmitter_t           transmitter;
+	rtp_receiver_t              receiver;
+
+	mpf_rtp_config_t           *config;
+
+	apr_socket_t               *socket;
+	apr_sockaddr_t             *local_sockaddr;
+	apr_sockaddr_t             *remote_sockaddr;
+	
+	apr_pool_t                 *pool;
+};
+
+static apt_bool_t mpf_rtp_stream_destroy(mpf_audio_stream_t *stream);
+static apt_bool_t mpf_rtp_rx_stream_open(mpf_audio_stream_t *stream);
+static apt_bool_t mpf_rtp_rx_stream_close(mpf_audio_stream_t *stream);
+static apt_bool_t mpf_rtp_stream_receive(mpf_audio_stream_t *stream, mpf_frame_t *frame);
+static apt_bool_t mpf_rtp_tx_stream_open(mpf_audio_stream_t *stream);
+static apt_bool_t mpf_rtp_tx_stream_close(mpf_audio_stream_t *stream);
+static apt_bool_t mpf_rtp_stream_transmit(mpf_audio_stream_t *stream, const mpf_frame_t *frame);
+
+static const mpf_audio_stream_vtable_t vtable = {
+	mpf_rtp_stream_destroy,
+	mpf_rtp_rx_stream_open,
+	mpf_rtp_rx_stream_close,
+	mpf_rtp_stream_receive,
+	mpf_rtp_tx_stream_open,
+	mpf_rtp_tx_stream_close,
+	mpf_rtp_stream_transmit
+};
+
+static apt_bool_t mpf_rtp_socket_create(mpf_rtp_stream_t *stream, mpf_rtp_media_descriptor_t *local_media);
+
+
+MPF_DECLARE(mpf_audio_stream_t*) mpf_rtp_stream_create(mpf_termination_t *termination, mpf_rtp_config_t *config, apr_pool_t *pool)
+{
+	mpf_rtp_stream_t *rtp_stream = apr_palloc(pool,sizeof(mpf_rtp_stream_t));
+	rtp_stream->pool = pool;
+	rtp_stream->config = config;
+	rtp_stream->local_media = NULL;
+	rtp_stream->remote_media = NULL;
+	rtp_stream->socket = NULL;
+	rtp_stream->local_sockaddr = NULL;
+	rtp_stream->remote_sockaddr = NULL;
+	rtp_stream->base = mpf_audio_stream_create(rtp_stream,&vtable,STREAM_MODE_NONE,pool);
+	rtp_stream->base->termination = termination;
+	rtp_receiver_init(&rtp_stream->receiver);
+	rtp_transmitter_init(&rtp_stream->transmitter);
+	rtp_stream->transmitter.ssrc = (apr_uint32_t)apr_time_now();
+
+	return rtp_stream->base;
+}
+
+static void mpf_rtp_stream_ip_port_set(mpf_rtp_media_descriptor_t *media, mpf_rtp_config_t *config)
+{
+	if(media->base.ip.length == 0) {
+		media->base.ip = config->ip;
+		media->base.ext_ip = config->ext_ip;
+	}
+	if(media->base.port == 0) {
+		media->base.port = config->rtp_port_cur;
+		config->rtp_port_cur += 2;
+		if(config->rtp_port_cur == config->rtp_port_max) {
+			config->rtp_port_cur = config->rtp_port_min;
+		}
+	}
+}
+
+static apt_bool_t mpf_rtp_stream_local_media_create(mpf_rtp_stream_t *rtp_stream, mpf_rtp_media_descriptor_t *local_media, mpf_rtp_media_descriptor_t *remote_media)
+{
+	apt_bool_t status = TRUE;
+	if(!local_media) {
+		/* local media is not specified, create the default one */
+		local_media = apr_palloc(rtp_stream->pool,sizeof(mpf_rtp_media_descriptor_t));
+		mpf_rtp_media_descriptor_init(local_media);
+		local_media->base.state = MPF_MEDIA_ENABLED;
+		local_media->mode = STREAM_MODE_SEND_RECEIVE;
+	}
+	if(remote_media) {
+		local_media->base.id = remote_media->base.id;
+	}
+
+	mpf_rtp_stream_ip_port_set(local_media,rtp_stream->config);
+	if(mpf_rtp_socket_create(rtp_stream,local_media) == FALSE) {
+		local_media->base.state = MPF_MEDIA_DISABLED;
+		status = FALSE;
+	}
+
+	if(rtp_stream->config->ptime) {
+		local_media->ptime = rtp_stream->config->ptime;
+	}
+
+	if(mpf_codec_list_is_empty(&local_media->codec_list) == TRUE) {
+		if(mpf_codec_list_is_empty(&rtp_stream->config->codec_list) == TRUE) {
+			mpf_codec_manager_codec_list_get(
+								rtp_stream->base->termination->codec_manager,
+								&local_media->codec_list,
+								rtp_stream->pool);
+		}
+		else {
+			mpf_codec_list_copy(&local_media->codec_list,
+								&rtp_stream->config->codec_list,
+								rtp_stream->pool);
+		}
+	}
+
+	rtp_stream->local_media = local_media;
+	return status;
+}
+
+static apt_bool_t mpf_rtp_stream_local_media_update(mpf_rtp_stream_t *rtp_stream, mpf_rtp_media_descriptor_t *media)
+{
+	apt_bool_t status = TRUE;
+	if(apt_string_compare(&rtp_stream->local_media->base.ip,&media->base.ip) == FALSE ||
+		rtp_stream->local_media->base.port != media->base.port) {
+
+		if(mpf_rtp_socket_create(rtp_stream,media) == FALSE) {
+			media->base.state = MPF_MEDIA_DISABLED;
+			status = FALSE;
+		}
+	}
+	if(mpf_codec_list_is_empty(&media->codec_list) == TRUE) {
+		mpf_codec_manager_codec_list_get(
+							rtp_stream->base->termination->codec_manager,
+							&media->codec_list,
+							rtp_stream->pool);
+	}
+
+	rtp_stream->local_media = media;
+	return status;
+}
+
+static apt_bool_t mpf_rtp_stream_remote_media_update(mpf_rtp_stream_t *rtp_stream, mpf_rtp_media_descriptor_t *media)
+{
+	apt_bool_t status = TRUE;
+	if(!rtp_stream->remote_media || 
+		apt_string_compare(&rtp_stream->remote_media->base.ip,&media->base.ip) == FALSE ||
+		rtp_stream->remote_media->base.port != media->base.port) {
+
+		rtp_stream->remote_sockaddr = NULL;
+		apr_sockaddr_info_get(
+			&rtp_stream->remote_sockaddr,
+			media->base.ip.buf,
+			APR_INET,
+			media->base.port,
+			0,
+			rtp_stream->pool);
+		if(!rtp_stream->remote_sockaddr) {
+			status = FALSE;
+		}
+	}
+
+	rtp_stream->remote_media = media;
+	return status;
+}
+
+static apt_bool_t mpf_rtp_stream_media_negotiate(mpf_rtp_stream_t *rtp_stream)
+{
+	if(!rtp_stream->local_media || !rtp_stream->remote_media) {
+		return FALSE;
+	}
+
+	rtp_stream->local_media->base.id = rtp_stream->remote_media->base.id;
+	rtp_stream->local_media->base.state = rtp_stream->remote_media->base.state;
+
+	rtp_stream->local_media->mid = rtp_stream->remote_media->mid;
+	rtp_stream->local_media->ptime = rtp_stream->remote_media->ptime;
+	rtp_stream->local_media->mode = mpf_stream_mode_negotiate(rtp_stream->remote_media->mode);
+
+	if(mpf_codec_list_is_empty(&rtp_stream->remote_media->codec_list) == TRUE) {
+		/* no remote codecs available, initialize them according to the local codecs  */
+		mpf_codec_list_copy(&rtp_stream->remote_media->codec_list,
+							&rtp_stream->local_media->codec_list,
+							rtp_stream->pool);
+	}
+
+	/* intersect local and remote codecs */
+	if(rtp_stream->config->own_preferrence == TRUE) {
+		mpf_codec_list_intersect(&rtp_stream->local_media->codec_list,&rtp_stream->remote_media->codec_list);
+	}
+	else {
+		mpf_codec_list_intersect(&rtp_stream->remote_media->codec_list,&rtp_stream->local_media->codec_list);
+	}
+
+	rtp_stream->base->mode = rtp_stream->local_media->mode;
+	return TRUE;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_rtp_stream_modify(mpf_audio_stream_t *stream, mpf_rtp_stream_descriptor_t *descriptor)
+{
+	apt_bool_t status = TRUE;
+	mpf_rtp_stream_t *rtp_stream = stream->obj;
+	if(!rtp_stream) {
+		return FALSE;
+	}
+
+	if(!rtp_stream->local_media) {
+		/* create local media */
+		status = mpf_rtp_stream_local_media_create(rtp_stream,descriptor->local,descriptor->remote);
+	}
+	else if(descriptor->local) {
+		/* update local media */
+		status = mpf_rtp_stream_local_media_update(rtp_stream,descriptor->local);
+	}
+	
+	if(descriptor->remote && status == TRUE) {
+		/* update remote media */
+		mpf_rtp_stream_remote_media_update(rtp_stream,descriptor->remote);
+
+		/* negotiate local and remote media */
+		mpf_rtp_stream_media_negotiate(rtp_stream);
+	}
+
+	if((rtp_stream->base->mode & STREAM_MODE_SEND) == STREAM_MODE_SEND) {
+		rtp_stream->base->tx_codec = mpf_codec_manager_codec_get(
+								rtp_stream->base->termination->codec_manager,
+								rtp_stream->remote_media->codec_list.preffered,
+								rtp_stream->pool);
+		if(rtp_stream->base->tx_codec) {
+			rtp_stream->transmitter.samples_per_frame = 
+				(apr_uint32_t)mpf_codec_frame_samples_calculate(rtp_stream->base->tx_codec->descriptor);
+		}
+	}
+	if((rtp_stream->base->mode & STREAM_MODE_RECEIVE) == STREAM_MODE_RECEIVE) {
+		rtp_stream->base->rx_codec = mpf_codec_manager_codec_get(
+								rtp_stream->base->termination->codec_manager,
+								rtp_stream->local_media->codec_list.preffered,
+								rtp_stream->pool);
+	}
+
+	if(!descriptor->local) {
+		descriptor->local = rtp_stream->local_media;
+	}
+	return status;
+}
+
+static apt_bool_t mpf_rtp_stream_destroy(mpf_audio_stream_t *stream)
+{
+	mpf_rtp_stream_t *rtp_stream = stream->obj;
+	if(rtp_stream->socket) {
+		apr_socket_close(rtp_stream->socket);
+		rtp_stream->socket = NULL;
+	}
+	
+	return TRUE;
+}
+
+static apt_bool_t mpf_rtp_rx_stream_open(mpf_audio_stream_t *stream)
+{
+	mpf_rtp_stream_t *rtp_stream = stream->obj;
+	rtp_receiver_t *receiver = &rtp_stream->receiver;
+	if(!rtp_stream->socket || !rtp_stream->local_media) {
+		return FALSE;
+	}
+
+	receiver->jb = mpf_jitter_buffer_create(
+						&rtp_stream->config->jb_config,
+						stream->rx_codec,
+						rtp_stream->pool);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open RTP Receive %s:%hu <- %s:%hu playout [%d ms]",
+			rtp_stream->local_media->base.ip.buf,
+			rtp_stream->local_media->base.port,
+			rtp_stream->remote_media->base.ip.buf,
+			rtp_stream->remote_media->base.port,
+			rtp_stream->config->jb_config.initial_playout_delay);
+	return TRUE;
+}
+
+static apt_bool_t mpf_rtp_rx_stream_close(mpf_audio_stream_t *stream)
+{
+	mpf_rtp_stream_t *rtp_stream = stream->obj;
+	rtp_receiver_t *receiver = &rtp_stream->receiver;
+	receiver->stat.lost_packets = 0;
+	if(receiver->stat.received_packets) {
+		apr_uint32_t expected_packets = receiver->history.seq_cycles + 
+			receiver->history.seq_num_max - receiver->history.seq_num_base + 1;
+		if(expected_packets > receiver->stat.received_packets) {
+			receiver->stat.lost_packets = expected_packets - receiver->stat.received_packets;
+		}
+	}
+
+	mpf_jitter_buffer_destroy(receiver->jb);
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Close RTP Receive %s:%hu <- %s:%hu [r:%lu l:%lu j:%lu]",
+			rtp_stream->local_media->base.ip.buf,
+			rtp_stream->local_media->base.port,
+			rtp_stream->remote_media->base.ip.buf,
+			rtp_stream->remote_media->base.port,
+			receiver->stat.received_packets,
+			receiver->stat.lost_packets,
+			receiver->stat.jitter);
+	return TRUE;
+}
+
+
+static APR_INLINE void rtp_rx_overall_stat_reset(rtp_receiver_t *receiver)
+{
+	memset(&receiver->stat,0,sizeof(receiver->stat));
+	memset(&receiver->history,0,sizeof(receiver->history));
+	memset(&receiver->periodic_history,0,sizeof(receiver->periodic_history));
+}
+
+static APR_INLINE void rtp_rx_stat_init(rtp_receiver_t *receiver, rtp_header_t *header, apr_time_t *time)
+{
+	receiver->stat.ssrc = header->ssrc;
+	receiver->history.seq_num_base = receiver->history.seq_num_max = (apr_uint16_t)header->sequence;
+	receiver->history.ts_last = header->timestamp;
+	receiver->history.time_last = *time;
+}
+
+static APR_INLINE void rtp_rx_restart(rtp_receiver_t *receiver)
+{
+	apr_byte_t restarts = ++receiver->stat.restarts;
+	rtp_rx_overall_stat_reset(receiver);
+	mpf_jitter_buffer_restart(receiver->jb);
+	receiver->stat.restarts = restarts;
+}
+
+static rtp_header_t* rtp_rx_header_skip(void **buffer, apr_size_t *size)
+{
+	apr_size_t offset = 0;
+	rtp_header_t *header = (rtp_header_t*)*buffer;
+
+    /* RTP header validity check */
+	if(header->version != RTP_VERSION) {
+		return NULL;
+	}
+
+    /* calculate payload offset */
+	offset = sizeof(rtp_header_t) + (header->count * sizeof(apr_uint32_t));
+
+	/* additional offset in case of RTP extension */
+	if(header->extension) {
+		rtp_extension_header_t *ext_header = (rtp_extension_header_t*)(((apr_byte_t*)*buffer)+offset);
+		offset += (ntohs(ext_header->length) * sizeof(apr_uint32_t));
+	}
+
+	if (offset >= *size) {
+		return NULL;
+	}
+
+	/* skip to payload */
+	*buffer = (apr_byte_t*)*buffer + offset;
+	*size = *size - offset;
+
+	return header;
+}
+
+typedef enum {
+	RTP_SSRC_UPDATE,
+	RTP_SSRC_PROBATION,
+	RTP_SSRC_RESTART
+} rtp_ssrc_result_e;
+
+static APR_INLINE rtp_ssrc_result_e rtp_rx_ssrc_update(rtp_receiver_t *receiver, apr_uint32_t ssrc)
+{
+	if(receiver->stat.ssrc == ssrc) {
+		/* known ssrc */
+		if(receiver->history.ssrc_probation) {
+			/* reset the probation for new ssrc */
+			receiver->history.ssrc_probation = 0;
+			receiver->history.ssrc_new = 0;
+		}
+	}
+	else {
+		if(receiver->history.ssrc_new == ssrc) {
+			if(--receiver->history.ssrc_probation == 0) {
+				/* restart with new ssrc */
+				receiver->stat.ssrc = ssrc;
+				return RTP_SSRC_RESTART;
+			}
+			else {
+				return RTP_SSRC_PROBATION;
+			}
+		}
+		else {
+			/* start probation for new ssrc */
+			receiver->history.ssrc_new = ssrc;
+			receiver->history.ssrc_probation = 5;
+			return RTP_SSRC_PROBATION;
+		}
+	}
+	return RTP_SSRC_UPDATE;
+}
+
+typedef enum {
+	RTP_SEQ_UPDATE,
+	RTP_SEQ_MISORDER,
+	RTP_SEQ_DRIFT
+} rtp_seq_result_e;
+
+static APR_INLINE rtp_seq_result_e rtp_rx_seq_update(rtp_receiver_t *receiver, apr_uint16_t seq_num)
+{
+	rtp_seq_result_e result = RTP_SEQ_UPDATE;
+	apr_uint16_t seq_delta = seq_num - receiver->history.seq_num_max;
+	if(seq_delta < MAX_DROPOUT) {
+		if(seq_num < receiver->history.seq_num_max) {
+			/* sequence number wrapped */
+			receiver->history.seq_cycles += RTP_SEQ_MOD;
+		}
+		receiver->history.seq_num_max = seq_num;
+	}
+	else if(seq_delta <= RTP_SEQ_MOD - MAX_MISORDER) {
+		/* sequence number made a very large jump */
+		result = RTP_SEQ_DRIFT;
+	}
+	else {
+		/* duplicate or misordered packet */
+		result = RTP_SEQ_MISORDER;
+	}
+	receiver->stat.received_packets++;
+
+	if(receiver->stat.received_packets - receiver->periodic_history.received_prior >= 50) {
+		receiver->periodic_history.received_prior = receiver->stat.received_packets;
+		receiver->periodic_history.discarded_prior = receiver->stat.discarded_packets;
+		receiver->periodic_history.jitter_min = receiver->stat.jitter;
+		receiver->periodic_history.jitter_max = receiver->stat.jitter;
+	}
+	return result;
+}
+
+typedef enum {
+	RTP_TS_UPDATE,
+	RTP_TS_DRIFT
+} rtp_ts_result_e;
+
+static APR_INLINE rtp_ts_result_e rtp_rx_ts_update(rtp_receiver_t *receiver, mpf_codec_descriptor_t *descriptor, apr_time_t *time, apr_uint32_t ts)
+{
+	apr_int32_t deviation;
+
+	/* arrival time diff in samples */
+	deviation = (apr_int32_t)apr_time_as_msec(*time - receiver->history.time_last) * 
+		descriptor->channel_count * descriptor->sampling_rate / 1000;
+	/* arrival timestamp diff */
+	deviation -= ts - receiver->history.ts_last;
+
+	if(deviation < 0) {
+		deviation = -deviation;
+	}
+
+	if(deviation > DEVIATION_THRESHOLD) {
+		return RTP_TS_DRIFT;
+	}
+
+	receiver->stat.jitter += deviation - ((receiver->stat.jitter + 8) >> 4);
+#if PRINT_RTP_PACKET_STAT
+	printf("jitter=%d deviation=%d\n",receiver->stat.jitter,deviation);
+#endif
+	receiver->history.time_last = *time;
+	receiver->history.ts_last = ts;
+
+	if(receiver->stat.jitter < receiver->periodic_history.jitter_min) {
+		receiver->periodic_history.jitter_min = receiver->stat.jitter;
+	}
+	if(receiver->stat.jitter > receiver->periodic_history.jitter_max) {
+		receiver->periodic_history.jitter_max = receiver->stat.jitter;
+	}
+	return RTP_TS_UPDATE;
+}
+
+static APR_INLINE void rtp_rx_failure_threshold_check(rtp_receiver_t *receiver)
+{
+	apr_uint32_t received;
+	apr_uint32_t discarded;
+	received = receiver->stat.received_packets - receiver->periodic_history.received_prior;
+	discarded = receiver->stat.discarded_packets - receiver->periodic_history.discarded_prior;
+
+	if(discarded * 100 > received * DISCARDED_TO_RECEIVED_RATIO_THRESHOLD) {
+		/* failure threshold hired, restart */
+		rtp_rx_restart(receiver);
+	}
+}
+
+static apt_bool_t rtp_rx_packet_receive(rtp_receiver_t *receiver, mpf_codec_t *codec, void *buffer, apr_size_t size)
+{
+	apr_time_t time;
+	rtp_ssrc_result_e ssrc_result;
+	rtp_header_t *header = rtp_rx_header_skip(&buffer,&size);
+	if(!header) {
+		/* invalid RTP packet */
+		receiver->stat.invalid_packets++;
+		return FALSE;
+	}
+
+	header->sequence = ntohs((apr_uint16_t)header->sequence);
+	header->timestamp = ntohl(header->timestamp);
+	header->ssrc = ntohl(header->ssrc);
+
+	time = apr_time_now();
+
+#if PRINT_RTP_PACKET_STAT
+	printf("RTP time=%6lu ssrc=%8lx pt=%3u %cts=%9lu seq=%5u size=%lu\n",
+					(apr_uint32_t)apr_time_usec(time),
+					header->ssrc, header->type, header->marker ? '*' : ' ',
+					header->timestamp, header->sequence, size);
+#endif
+	if(!receiver->stat.received_packets) {
+		/* initialization */
+		rtp_rx_stat_init(receiver,header,&time);
+	}
+
+	ssrc_result = rtp_rx_ssrc_update(receiver,header->ssrc);
+	if(ssrc_result == RTP_SSRC_PROBATION) {
+		receiver->stat.invalid_packets++;
+		return FALSE;
+	}
+	else if(ssrc_result == RTP_SSRC_RESTART) {
+		rtp_rx_restart(receiver);
+		rtp_rx_stat_init(receiver,header,&time);
+	}
+
+	rtp_rx_seq_update(receiver,(apr_uint16_t)header->sequence);
+	
+	if(rtp_rx_ts_update(receiver,codec->descriptor,&time,header->timestamp) == RTP_TS_DRIFT) {
+		rtp_rx_restart(receiver);
+		return FALSE;
+	}
+	
+	if(header->type == codec->descriptor->payload_type) {
+		/* codec */
+		if(mpf_jitter_buffer_write(receiver->jb,codec,buffer,size,header->timestamp) != JB_OK) {
+			receiver->stat.discarded_packets++;
+			rtp_rx_failure_threshold_check(receiver);
+		}
+	}
+	else if(header->type == receiver->event_pt && receiver->event_pt != 0) {
+		/* named event */
+		mpf_named_event_frame_t *named_event = (mpf_named_event_frame_t *)buffer;
+		if(mpf_jitter_buffer_write_named_event(receiver->jb,named_event,header->timestamp) != JB_OK) {
+			receiver->stat.discarded_packets++;
+			rtp_rx_failure_threshold_check(receiver);
+		}
+	}
+	else if(header->type == 13 || header->type == 19) {
+		/* CN packet*/
+		receiver->stat.ignored_packets++;
+	}
+	else {
+		/* invalid payload type */
+		receiver->stat.ignored_packets++;
+	}
+	
+	return TRUE;
+}
+
+static apt_bool_t rtp_rx_process(mpf_rtp_stream_t *rtp_stream)
+{
+	char buffer[1500];
+	apr_size_t size = sizeof(buffer);
+	apr_size_t max_count = 5;
+	while(max_count && apr_socket_recvfrom(rtp_stream->remote_sockaddr,rtp_stream->socket,0,buffer,&size) == APR_SUCCESS) {
+		rtp_rx_packet_receive(&rtp_stream->receiver,rtp_stream->base->rx_codec,buffer,size);
+
+		size = sizeof(buffer);
+		max_count--;
+	}
+	return TRUE;
+}
+
+static apt_bool_t mpf_rtp_stream_receive(mpf_audio_stream_t *stream, mpf_frame_t *frame)
+{
+	mpf_rtp_stream_t *rtp_stream = stream->obj;
+	rtp_rx_process(rtp_stream);
+
+	return mpf_jitter_buffer_read(rtp_stream->receiver.jb,frame);
+}
+
+
+
+
+
+static apt_bool_t mpf_rtp_tx_stream_open(mpf_audio_stream_t *stream)
+{
+	apr_size_t frame_size;
+	mpf_rtp_stream_t *rtp_stream = stream->obj;
+	rtp_transmitter_t *transmitter = &rtp_stream->transmitter;
+	if(!rtp_stream->socket || !rtp_stream->remote_media) {
+		return FALSE;
+	}
+
+	if(!transmitter->ptime) {
+		if(rtp_stream->config && rtp_stream->config->ptime) {
+			transmitter->ptime = rtp_stream->config->ptime;
+		}
+		else {
+			transmitter->ptime = 20;
+		}
+	}
+	transmitter->packet_frames = transmitter->ptime / CODEC_FRAME_TIME_BASE;
+	transmitter->current_frames = 0;
+
+	frame_size = mpf_codec_frame_size_calculate(
+							stream->tx_codec->descriptor,
+							stream->tx_codec->attribs);
+	transmitter->packet_data = apr_palloc(
+							rtp_stream->pool,
+							sizeof(rtp_header_t) + transmitter->packet_frames * frame_size);
+	
+	transmitter->inactivity = 1;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open RTP Transmit %s:%hu -> %s:%hu",
+			rtp_stream->local_media->base.ip.buf,
+			rtp_stream->local_media->base.port,
+			rtp_stream->remote_media->base.ip.buf,
+			rtp_stream->remote_media->base.port);
+	return TRUE;
+}
+
+static apt_bool_t mpf_rtp_tx_stream_close(mpf_audio_stream_t *stream)
+{
+	mpf_rtp_stream_t *rtp_stream = stream->obj;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Close RTP Transmit %s:%hu -> %s:%hu [s:%lu]",
+			rtp_stream->local_media->base.ip.buf,
+			rtp_stream->local_media->base.port,
+			rtp_stream->remote_media->base.ip.buf,
+			rtp_stream->remote_media->base.port,
+			rtp_stream->transmitter.stat.sent_packets);
+	return TRUE;
+}
+
+
+static APR_INLINE void rtp_header_prepare(rtp_transmitter_t *transmitter, apr_byte_t payload_type)
+{
+	rtp_header_t *header = (rtp_header_t*)transmitter->packet_data;
+
+#if PRINT_RTP_PACKET_STAT
+	printf("> RTP time=%6lu ssrc=%8lx pt=%3u %cts=%9lu seq=%5u\n",
+		(apr_uint32_t)apr_time_usec(apr_time_now()),
+		transmitter->ssrc, payload_type, transmitter->inactivity ? '*' : ' ',
+		transmitter->timestamp, transmitter->last_seq_num);
+#endif	
+	header->version = RTP_VERSION;
+	header->padding = 0;
+	header->extension = 0;
+	header->count = 0;
+	header->marker = transmitter->inactivity;
+	header->type = payload_type;
+	header->sequence = htons(++transmitter->last_seq_num);
+	header->timestamp = htonl(transmitter->timestamp);
+	header->ssrc = htonl(transmitter->ssrc);
+
+	if(transmitter->inactivity) {
+		transmitter->inactivity = 0;
+	}
+
+	transmitter->packet_size = sizeof(rtp_header_t);
+}
+
+static apt_bool_t mpf_rtp_stream_transmit(mpf_audio_stream_t *stream, const mpf_frame_t *frame)
+{
+	apt_bool_t status = TRUE;
+	mpf_rtp_stream_t *rtp_stream = stream->obj;
+	rtp_transmitter_t *transmitter = &rtp_stream->transmitter;
+
+	transmitter->timestamp += transmitter->samples_per_frame;
+
+	if(transmitter->current_frames == 0) {
+		if(frame->type == MEDIA_FRAME_TYPE_NONE) {
+			transmitter->inactivity = 1;
+		}
+		else {
+			rtp_header_prepare(transmitter,stream->tx_codec->descriptor->payload_type);
+		}
+	}
+	
+	if(!transmitter->inactivity) {
+		memcpy(
+			transmitter->packet_data + transmitter->packet_size,
+			frame->codec_frame.buffer,
+			frame->codec_frame.size);
+		transmitter->packet_size += frame->codec_frame.size;
+
+		if(++transmitter->current_frames == transmitter->packet_frames) {
+			if(apr_socket_sendto(
+								rtp_stream->socket,
+								rtp_stream->remote_sockaddr,
+								0,
+								transmitter->packet_data,
+								&transmitter->packet_size) == APR_SUCCESS) {
+				transmitter->stat.sent_packets++;
+			}
+			else {
+				status = FALSE;
+			}
+			transmitter->current_frames = 0;
+		}
+	}
+
+	return status;
+}
+
+static apt_bool_t mpf_rtp_socket_create(mpf_rtp_stream_t *stream, mpf_rtp_media_descriptor_t *local_media)
+{
+	if(stream->socket) {
+		apr_socket_close(stream->socket);
+		stream->socket = NULL;
+	}
+	
+	stream->local_sockaddr = NULL;
+	apr_sockaddr_info_get(
+		&stream->local_sockaddr,
+		local_media->base.ip.buf,
+		APR_INET,
+		local_media->base.port,
+		0,
+		stream->pool);
+	if(!stream->local_sockaddr) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Failed to Get Sockaddr %s:%hu",
+				local_media->base.ip.buf,
+				local_media->base.port);
+		return FALSE;
+	}
+	if(apr_socket_create(&stream->socket,stream->local_sockaddr->family,SOCK_DGRAM,0,stream->pool) != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Failed to Create Socket %s:%hu",
+				local_media->base.ip.buf,
+				local_media->base.port);
+		return FALSE;
+	}
+	
+	apr_socket_opt_set(stream->socket,APR_SO_NONBLOCK,1);
+	apr_socket_timeout_set(stream->socket,0);
+	apr_socket_opt_set(stream->socket,APR_SO_REUSEADDR,1);
+
+	if(apr_socket_bind(stream->socket,stream->local_sockaddr) != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Failed to Bind Socket to %s:%hu",
+				local_media->base.ip.buf,
+				local_media->base.port);
+		apr_socket_close(stream->socket);
+		stream->socket = NULL;
+		return FALSE;
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_termination_factory.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_rtp_termination_factory.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_termination.h"
+#include "mpf_rtp_termination_factory.h"
+#include "mpf_rtp_stream.h"
+#include "apt_log.h"
+
+typedef struct rtp_termination_factory_t rtp_termination_factory_t;
+struct rtp_termination_factory_t {
+	mpf_termination_factory_t base;
+	mpf_rtp_config_t         *config;
+};
+
+static apt_bool_t mpf_rtp_termination_destroy(mpf_termination_t *termination)
+{
+	return TRUE;
+}
+
+static apt_bool_t mpf_rtp_termination_modify(mpf_termination_t *termination, void *descriptor)
+{
+	mpf_rtp_termination_descriptor_t *rtp_descriptor = descriptor;
+	mpf_audio_stream_t *audio_stream = termination->audio_stream;
+	if(!audio_stream) {
+		rtp_termination_factory_t *termination_factory = (rtp_termination_factory_t*)termination->termination_factory;
+		audio_stream = mpf_rtp_stream_create(termination,termination_factory->config,termination->pool);
+		if(!audio_stream) {
+			return FALSE;
+		}
+		termination->audio_stream = audio_stream;
+	}
+
+	return mpf_rtp_stream_modify(audio_stream,&rtp_descriptor->audio);
+}
+
+static const mpf_termination_vtable_t rtp_vtable = {
+	mpf_rtp_termination_destroy,
+	mpf_rtp_termination_modify,
+};
+
+static mpf_termination_t* mpf_rtp_termination_create(mpf_termination_factory_t *termination_factory, void *obj, apr_pool_t *pool)
+{
+	return mpf_termination_base_create(termination_factory,obj,&rtp_vtable,NULL,NULL,pool);
+}
+
+MPF_DECLARE(mpf_termination_factory_t*) mpf_rtp_termination_factory_create(
+											mpf_rtp_config_t *rtp_config,
+											apr_pool_t *pool)
+{
+	rtp_termination_factory_t *rtp_termination_factory;
+	if(!rtp_config) {
+		return NULL;
+	}
+	rtp_config->rtp_port_cur = rtp_config->rtp_port_min;
+	rtp_termination_factory = apr_palloc(pool,sizeof(rtp_termination_factory_t));
+	rtp_termination_factory->base.create_termination = mpf_rtp_termination_create;
+	rtp_termination_factory->config = rtp_config;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create RTP Termination Factory %s:[%hu,%hu]",
+									rtp_config->ip.buf,
+									rtp_config->rtp_port_min,
+									rtp_config->rtp_port_max);
+	return &rtp_termination_factory->base;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_termination.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_termination.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_termination.h"
+#include "mpf_stream.h"
+#include "mpf_codec_manager.h"
+
+const mpf_codec_descriptor_t* l16_descriptor_get();
+
+MPF_DECLARE(mpf_termination_t*) mpf_termination_base_create(
+										mpf_termination_factory_t *termination_factory,
+										void *obj,
+										const mpf_termination_vtable_t *vtable,
+										mpf_audio_stream_t *audio_stream,
+										mpf_video_stream_t *video_stream,
+										apr_pool_t *pool)
+{
+	mpf_termination_t *termination = apr_palloc(pool,sizeof(mpf_termination_t));
+	termination->pool = pool;
+	termination->obj = obj;
+	termination->event_handler_obj = NULL;
+	termination->event_handler = NULL;
+	termination->codec_manager = NULL;
+	termination->termination_factory = termination_factory;
+	termination->vtable = vtable;
+	termination->slot = 0;
+	if(audio_stream) {
+		audio_stream->termination = termination;
+	}
+	if(video_stream) {
+		video_stream->termination = termination;
+	}
+	termination->audio_stream = audio_stream;
+	termination->video_stream = video_stream;
+	return termination;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_termination_destroy(mpf_termination_t *termination)
+{
+	if(termination->vtable && termination->vtable->destroy) {
+		termination->vtable->destroy(termination);
+	}
+	return TRUE;
+}
+
+MPF_DECLARE(void*) mpf_termination_object_get(mpf_termination_t *termination)
+{
+	return termination->obj;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_termination_modify(mpf_termination_t *termination, void *descriptor)
+{
+	if(termination->vtable && termination->vtable->modify) {
+		termination->vtable->modify(termination,descriptor);
+	}
+	return TRUE;
+}
+
+static mpf_codec_t* mpf_termination_default_codec_create(mpf_termination_t *termination)
+{
+	mpf_codec_t *codec;
+	const mpf_codec_descriptor_t *default_descriptor = l16_descriptor_get();
+	mpf_codec_descriptor_t *descriptor = apr_palloc(termination->pool,sizeof(mpf_codec_descriptor_t));
+	mpf_codec_descriptor_init(descriptor);
+	*descriptor = *default_descriptor;
+	codec = mpf_codec_manager_codec_get(
+		termination->codec_manager,
+		descriptor,
+		termination->pool);
+	return codec;
+}
+
+MPF_DECLARE(apt_bool_t) mpf_termination_validate(mpf_termination_t *termination)
+{
+	mpf_audio_stream_t *audio_stream;
+	if(!termination) {
+		return FALSE;
+	}
+	audio_stream = termination->audio_stream;
+	if(audio_stream) {
+		if(!audio_stream->vtable) {
+			return FALSE;
+		}
+		if((audio_stream->mode & STREAM_MODE_RECEIVE) == STREAM_MODE_RECEIVE) {
+			if(!audio_stream->rx_codec) {
+				audio_stream->rx_codec = mpf_termination_default_codec_create(termination);
+			}
+		}
+		if((audio_stream->mode & STREAM_MODE_SEND) == STREAM_MODE_SEND) {
+			if(!audio_stream->tx_codec) {
+				audio_stream->tx_codec = mpf_termination_default_codec_create(termination);
+			}
+		}
+	}
+	return TRUE;
+}
+
+
+/** Create MPF termination by termination factory */
+MPF_DECLARE(mpf_termination_t*) mpf_termination_create(
+										mpf_termination_factory_t *termination_factory,
+										void *obj,
+										apr_pool_t *pool)
+{
+	if(termination_factory && termination_factory->create_termination) {
+		return termination_factory->create_termination(termination_factory,obj,pool);
+	}
+	return NULL;
+}
+
+/** Create raw MPF termination. */
+MPF_DECLARE(mpf_termination_t*) mpf_raw_termination_create(
+										void *obj,
+										mpf_audio_stream_t *audio_stream,
+										mpf_video_stream_t *video_stream,
+										apr_pool_t *pool)
+{
+	return mpf_termination_base_create(NULL,obj,NULL,audio_stream,video_stream,pool);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_timer.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_timer.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mpf_timer.h"
+
+#ifdef WIN32
+#define ENABLE_MULTIMEDIA_TIMERS
+#endif
+
+#ifdef ENABLE_MULTIMEDIA_TIMERS
+
+#pragma warning(disable:4201)
+#include 
+#include 
+
+#ifndef TIME_KILL_SYNCHRONOUS
+#define TIME_KILL_SYNCHRONOUS   0x0100
+#endif
+
+struct mpf_timer_t {
+	unsigned int     timer_id;
+	mpf_timer_proc_f timer_proc;
+	void            *obj;
+};
+
+#define MAX_MEDIA_TIMERS 10
+
+static mpf_timer_t media_timer_set[MAX_MEDIA_TIMERS];
+
+static void CALLBACK mm_timer_proc(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2);
+
+MPF_DECLARE(mpf_timer_t*) mpf_timer_start(unsigned long timeout, mpf_timer_proc_f timer_proc, void *obj, apr_pool_t *pool)
+{
+	mpf_timer_t *timer = NULL;
+	size_t i;
+	for(i = 0; itimer_proc = timer_proc;
+		timer->obj = obj;
+		timer->timer_id = timeSetEvent(timeout, 0, mm_timer_proc, i, 
+			TIME_PERIODIC | TIME_CALLBACK_FUNCTION | TIME_KILL_SYNCHRONOUS);
+		if(!timer->timer_id) {
+			timer = NULL;
+		}
+	}
+	return timer;
+}
+
+MPF_DECLARE(void) mpf_timer_stop(mpf_timer_t *timer)
+{
+	if(timer) {
+		timeKillEvent(timer->timer_id);
+		timer->timer_id = 0;
+		timer->timer_proc = NULL;
+		timer->obj = NULL;
+	}
+}
+
+static void CALLBACK mm_timer_proc(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
+{
+	mpf_timer_t *timer;
+	if(dwUser >= MAX_MEDIA_TIMERS) {
+		return;
+	}
+	timer = &media_timer_set[dwUser];
+	timer->timer_proc(timer,timer->obj);
+}
+
+#else
+
+#include 
+
+struct mpf_timer_t {
+	apr_thread_t    *thread;
+	apr_byte_t       running;
+
+	unsigned long    timeout;
+	mpf_timer_proc_f timer_proc;
+	void            *obj;
+};
+
+static void* APR_THREAD_FUNC timer_thread_proc(apr_thread_t *thread, void *data);
+
+MPF_DECLARE(mpf_timer_t*) mpf_timer_start(unsigned long timeout, mpf_timer_proc_f timer_proc, void *obj, apr_pool_t *pool)
+{
+	mpf_timer_t *timer = apr_palloc(pool,sizeof(mpf_timer_t));
+	timer->timeout = timeout;
+	timer->timer_proc = timer_proc;
+	timer->obj = obj;
+	timer->running = 1;
+	if(apr_thread_create(&timer->thread,NULL,timer_thread_proc,timer,pool) != APR_SUCCESS) {
+		return NULL;
+	}
+	return timer;
+}
+
+MPF_DECLARE(void) mpf_timer_stop(mpf_timer_t *timer)
+{
+	if(timer) {
+		timer->running = 0;
+		if(timer->thread) {
+			apr_status_t s;
+			apr_thread_join(&s,timer->thread);
+			timer->thread = NULL;
+		}
+	}
+}
+
+static void* APR_THREAD_FUNC timer_thread_proc(apr_thread_t *thread, void *data)
+{
+	mpf_timer_t *timer = data;
+	apr_interval_time_t timeout = timer->timeout * 1000;
+	apr_interval_time_t time_drift = 0;
+	apr_time_t time_now, time_last;
+	
+	time_now = apr_time_now();
+	while(timer->running) {
+		time_last = time_now;
+		timer->timer_proc(timer,timer->obj);
+
+		if(timeout > time_drift) {
+			apr_sleep(timeout - time_drift);
+		}
+
+		time_now = apr_time_now();
+		time_drift += time_now - time_last - timeout;
+#if 0
+		printf("time_drift=%d\n",time_drift);
+#endif
+	}
+	
+	return NULL;
+}
+
+#endif

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES 	    = Makefile.in
+
+INCLUDES                    = -I$(top_srcdir)/libs/mrcp-client/include \
+                              -I$(top_srcdir)/libs/mrcp-signaling/include \
+                              -I$(top_srcdir)/libs/mrcpv2-transport/include \
+                              -I$(top_srcdir)/libs/mrcp/include \
+                              -I$(top_srcdir)/libs/mrcp/message/include \
+                              -I$(top_srcdir)/libs/mrcp/control/include \
+                              -I$(top_srcdir)/libs/mrcp/resources/include \
+                              -I$(top_srcdir)/libs/mpf/include \
+                              -I$(top_srcdir)/libs/apr-toolkit/include \
+                              $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES          = libmrcpclient.la
+
+include_HEADERS             = include/mrcp_client_types.h \
+                              include/mrcp_client.h \
+                              include/mrcp_client_session.h \
+                              include/mrcp_application.h
+
+libmrcpclient_la_SOURCES    = src/mrcp_client.c \
+                              src/mrcp_client_session.c

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_application.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_application.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,297 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_APPLICATION_H__
+#define __MRCP_APPLICATION_H__
+
+/**
+ * @file mrcp_application.h
+ * @brief MRCP User Level Application Interface
+ */ 
+
+#include "mrcp_client_types.h"
+#include "mpf_rtp_descriptor.h"
+#include "mpf_stream.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP application message declaration */
+typedef struct mrcp_app_message_t mrcp_app_message_t;
+
+/** MRCP signaling message declaration */
+typedef struct mrcp_sig_message_t mrcp_sig_message_t;
+
+/** MRCP application message dispatcher declaration */
+typedef struct mrcp_app_message_dispatcher_t mrcp_app_message_dispatcher_t;
+
+/** MRCP application message handler */
+typedef apt_bool_t (*mrcp_app_message_handler_f)(const mrcp_app_message_t *app_message);
+
+/** Enumeration of MRCP signaling message types */
+typedef enum {
+	MRCP_SIG_MESSAGE_TYPE_REQUEST,  /**< request message */
+	MRCP_SIG_MESSAGE_TYPE_RESPONSE, /**< response message */
+	MRCP_SIG_MESSAGE_TYPE_EVENT     /**< event message */
+} mrcp_sig_message_type_e;
+
+/** Enumeration of MRCP signaling status codes */
+typedef enum {
+	MRCP_SIG_STATUS_CODE_SUCCESS,   /**< indicates success */
+	MRCP_SIG_STATUS_CODE_FAILURE,   /**< request failed */
+	MRCP_SIG_STATUS_CODE_TERMINATE, /**< request failed, session/channel/connection unexpectedly terminated */
+	MRCP_SIG_STATUS_CODE_CANCEL     /**< request cancelled */
+} mrcp_sig_status_code_e;
+
+
+/** Enumeration of MRCP signaling commands (requests/responses) */
+typedef enum {
+	MRCP_SIG_COMMAND_SESSION_UPDATE,
+	MRCP_SIG_COMMAND_SESSION_TERMINATE,
+	MRCP_SIG_COMMAND_CHANNEL_ADD,
+	MRCP_SIG_COMMAND_CHANNEL_REMOVE,
+	MRCP_SIG_COMMAND_RESOURCE_DISCOVER
+} mrcp_sig_command_e;
+
+/** Enumeration of MRCP signaling events */
+typedef enum {
+	MRCP_SIG_EVENT_READY,
+	MRCP_SIG_EVENT_TERMINATE
+} mrcp_sig_event_e;
+
+
+/** Enumeration of MRCP application message types */
+typedef enum {
+	MRCP_APP_MESSAGE_TYPE_SIGNALING, /**< signaling message type */
+	MRCP_APP_MESSAGE_TYPE_CONTROL    /**< control message type */
+} mrcp_app_message_type_e;
+
+/** MRCP signaling message definition */
+struct mrcp_sig_message_t {
+	/** Message type (request/response/event) */
+	mrcp_sig_message_type_e message_type;
+	/** Command (request/response) identifier */
+	mrcp_sig_command_e      command_id;
+	/** Event identifier */
+	mrcp_sig_event_e        event_id;
+	/** Status code used in response */
+	mrcp_sig_status_code_e  status;
+};
+
+
+/** MRCP application message definition */
+struct mrcp_app_message_t {
+	/** Message type (signaling/control) */
+	mrcp_app_message_type_e message_type;
+
+	/** Application */
+	mrcp_application_t        *application;
+	/** Session */
+	mrcp_session_t            *session;
+	/** Channel */
+	mrcp_channel_t            *channel;
+	/** Session/resource descriptor */
+	mrcp_session_descriptor_t *descriptor;
+
+	/** MRCP signaling message (used if message_type == MRCP_APP_MESSAGE_SIGNALING) */
+	mrcp_sig_message_t         sig_message;
+	/** MRCP control message (used if message_type == MRCP_APP_MESSAGE_CONTROL) */
+	mrcp_message_t            *control_message;
+};
+
+/** MRCP application message dispatcher interface */
+struct mrcp_app_message_dispatcher_t {
+	/** Response to mrcp_application_session_update()request */
+	apt_bool_t (*on_session_update)(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+	/** Response to mrcp_application_session_terminate()request */
+	apt_bool_t (*on_session_terminate)(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+	
+	/** Response to mrcp_application_channel_add() request */
+	apt_bool_t (*on_channel_add)(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+	/** Response to mrcp_application_channel_remove() request */
+	apt_bool_t (*on_channel_remove)(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+
+	/** Response (event) to mrcp_application_message_send() request */
+	apt_bool_t (*on_message_receive)(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message);
+
+	/** Event indicating client stack is started and ready to process requests from the application */
+	apt_bool_t (*on_ready)(mrcp_application_t *application, mrcp_sig_status_code_e status);
+
+	/** Event indicating unexpected session/channel termination */
+	apt_bool_t (*on_terminate_event)(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel);
+
+	/** Response to mrcp_application_resource_discover() request */
+	apt_bool_t (*on_resource_discover)(mrcp_application_t *application, mrcp_session_t *session, mrcp_session_descriptor_t *descriptor, mrcp_sig_status_code_e status);
+};
+
+
+
+/**
+ * Create application instance.
+ * @param handler the event handler
+ * @param obj the external object
+ * @param pool the pool to allocate memory from
+ */
+MRCP_DECLARE(mrcp_application_t*) mrcp_application_create(const mrcp_app_message_handler_f handler, void *obj, apr_pool_t *pool);
+
+/**
+ * Destroy application instance.
+ * @param application the application to destroy
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_destroy(mrcp_application_t *application);
+
+/**
+ * Get external object associated with the application.
+ * @param application the application to get object from
+ */
+MRCP_DECLARE(void*) mrcp_application_object_get(mrcp_application_t *application);
+
+/**
+ * Get dir layout structure.
+ * @param application the application to get dir layout from
+ */
+MRCP_DECLARE(const apt_dir_layout_t*) mrcp_application_dir_layout_get(mrcp_application_t *application);
+
+/**
+ * Create session.
+ * @param application the entire application
+ * @param profile the name of the profile to use
+ * @param obj the external object
+ * @return the created session instance
+ */
+MRCP_DECLARE(mrcp_session_t*) mrcp_application_session_create(mrcp_application_t *application, const char *profile, void *obj);
+
+/**
+ * Get external object associated with the session.
+ * @param session the session to get object from
+ */
+MRCP_DECLARE(void*) mrcp_application_session_object_get(mrcp_session_t *session);
+
+/** 
+ * Send session update request.
+ * @param session the session to update
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_session_update(mrcp_session_t *session);
+
+/** 
+ * Send session termination request.
+ * @param session the session to terminate
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_session_terminate(mrcp_session_t *session);
+
+/** 
+ * Destroy client session (session must be terminated prior to destroy).
+ * @param session the session to destroy
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_session_destroy(mrcp_session_t *session);
+
+
+/** 
+ * Create control channel.
+ * @param session the session to create channel for
+ * @param resource_id the resource identifier of the channel
+ * @param termination the media termination
+ * @param rtp_descriptor the RTP termination descriptor (NULL by default)
+ * @param obj the external object
+ */
+MRCP_DECLARE(mrcp_channel_t*) mrcp_application_channel_create(
+									mrcp_session_t *session, 
+									mrcp_resource_id resource_id, 
+									mpf_termination_t *termination, 
+									mpf_rtp_termination_descriptor_t *rtp_descriptor, 
+									void *obj);
+
+/**
+ * Get external object associated with the channel.
+ * @param channel the channel to get object from
+ */
+MRCP_DECLARE(void*) mrcp_application_channel_object_get(mrcp_channel_t *channel);
+
+/**
+ * Get RTP termination descriptor.
+ * @param channel the channel to get descriptor from
+ */
+MRCP_DECLARE(mpf_rtp_termination_descriptor_t*) mrcp_application_rtp_descriptor_get(mrcp_channel_t *channel);
+
+/** 
+ * Send channel add request.
+ * @param session the session to create channel for
+ * @param channel the control channel
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_channel_add(mrcp_session_t *session, mrcp_channel_t *channel);
+
+/** 
+ * Create MRCP message.
+ * @param session the session
+ * @param channel the control channel
+ * @param method_id the method identifier of MRCP message
+ */
+MRCP_DECLARE(mrcp_message_t*) mrcp_application_message_create(mrcp_session_t *session, mrcp_channel_t *channel, mrcp_method_id method_id);
+
+/** 
+ * Send MRCP message.
+ * @param session the session
+ * @param channel the control channel
+ * @param message the MRCP message to send
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_message_send(mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message);
+
+/** 
+ * Remove channel.
+ * @param session the session to remove channel from
+ * @param channel the control channel to remove
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_channel_remove(mrcp_session_t *session, mrcp_channel_t *channel);
+
+/** 
+ * Discover resources.
+ * @param session the session to use as communication object
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_resource_discover(mrcp_session_t *session);
+
+/**
+ * Dispatch application message.
+ * @param dispatcher the dispatcher inteface
+ * @param app_message the message to dispatch
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_application_message_dispatch(const mrcp_app_message_dispatcher_t *dispatcher, const mrcp_app_message_t *app_message);
+
+
+/** Create source media termination
+ * @param session the session to create channel for
+ * @param stream_vtable the virtual table of audio stream
+ * @param codec_descriptor the descriptor of audio stream (NULL by default)
+ * @param obj the external object
+ */
+MRCP_DECLARE(mpf_termination_t*) mrcp_application_source_termination_create(
+										mrcp_session_t *session,
+										const mpf_audio_stream_vtable_t *stream_vtable,
+										mpf_codec_descriptor_t *codec_descriptor,
+										void *obj);
+/** Create sink media termination
+ * @param session the session to create channel for
+ * @param stream_vtable the virtual table of audio stream
+ * @param codec_descriptor the descriptor of audio stream (NULL by default)
+ * @param obj the external object
+ */
+MRCP_DECLARE(mpf_termination_t*) mrcp_application_sink_termination_create(
+										mrcp_session_t *session,
+										const mpf_audio_stream_vtable_t *stream_vtable,
+										mpf_codec_descriptor_t *codec_descriptor,
+										void *obj);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_APPLICATION_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_CLIENT_H__
+#define __MRCP_CLIENT_H__
+
+/**
+ * @file mrcp_client.h
+ * @brief MRCP Client
+ */ 
+
+#include "mrcp_client_types.h"
+#include "apt_task.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create MRCP client instance.
+ * @return the created client instance
+ */
+MRCP_DECLARE(mrcp_client_t*) mrcp_client_create(apt_dir_layout_t *dir_layout);
+
+/**
+ * Start message processing loop.
+ * @param client the MRCP client to start
+ * @return the created client instance
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_start(mrcp_client_t *client);
+
+/**
+ * Shutdown message processing loop.
+ * @param client the MRCP client to shutdown
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_shutdown(mrcp_client_t *client);
+
+/**
+ * Destroy MRCP client.
+ * @param client the MRCP client to destroy
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_destroy(mrcp_client_t *client);
+
+
+/**
+ * Register MRCP resource factory.
+ * @param client the MRCP client to set resource factory for
+ * @param resource_factory the resource factory to set
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_resource_factory_register(mrcp_client_t *client, mrcp_resource_factory_t *resource_factory);
+
+/**
+ * Register codec manager.
+ * @param client the MRCP client to set codec manager for
+ * @param codec_manager the codec manager to set
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_codec_manager_register(mrcp_client_t *client, mpf_codec_manager_t *codec_manager);
+
+/**
+ * Get registered codec manager.
+ * @param client the MRCP client to get codec manager from
+ */
+MRCP_DECLARE(const mpf_codec_manager_t*) mrcp_client_codec_manager_get(mrcp_client_t *client);
+
+/**
+ * Register media engine.
+ * @param client the MRCP client to set media engine for
+ * @param media_engine the media engine to set
+ * @param name the name of the media engine
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_media_engine_register(mrcp_client_t *client, mpf_engine_t *media_engine, const char *name);
+
+/**
+ * Register RTP termination factory.
+ * @param client the MRCP client to set termination factory for
+ * @param rtp_termination_factory the termination factory
+ * @param name the name of the factory
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_rtp_factory_register(mrcp_client_t *client, mpf_termination_factory_t *rtp_termination_factory, const char *name);
+
+/**
+ * Register MRCP signaling agent.
+ * @param client the MRCP client to set signaling agent for
+ * @param signaling_agent the signaling agent to set
+ * @param name the name of the agent
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_signaling_agent_register(mrcp_client_t *client, mrcp_sig_agent_t *signaling_agent, const char *name);
+
+/**
+ * Register MRCP connection agent (MRCPv2 only).
+ * @param client the MRCP client to set connection agent for
+ * @param connection_agent the connection agent to set
+ * @param name the name of the agent
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_connection_agent_register(mrcp_client_t *client, mrcp_connection_agent_t *connection_agent, const char *name);
+
+/** Create MRCP profile */
+MRCP_DECLARE(mrcp_profile_t*) mrcp_client_profile_create(
+									mrcp_resource_factory_t *resource_factory,
+									mrcp_sig_agent_t *signaling_agent,
+									mrcp_connection_agent_t *connection_agent,
+									mpf_engine_t *media_engine,
+									mpf_termination_factory_t *rtp_factory,
+									apr_pool_t *pool);
+
+/**
+ * Register MRCP profile.
+ * @param client the MRCP client to set profile for
+ * @param profile the profile to set
+ * @param name the name of the profile
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_profile_register(mrcp_client_t *client, mrcp_profile_t *profile, const char *name);
+
+/**
+ * Register MRCP application.
+ * @param client the MRCP client to set application for
+ * @param application the application to set
+ * @param name the name of the application
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_application_register(mrcp_client_t *client, mrcp_application_t *application, const char *name);
+
+/**
+ * Get memory pool.
+ * @param client the MRCP client to get memory pool from
+ */
+MRCP_DECLARE(apr_pool_t*) mrcp_client_memory_pool_get(mrcp_client_t *client);
+
+/**
+ * Get media engine by name.
+ * @param client the MRCP client to get media engine from
+ * @param name the name of the media engine to lookup
+ */
+MRCP_DECLARE(mpf_engine_t*) mrcp_client_media_engine_get(mrcp_client_t *client, const char *name);
+
+/**
+ * Get RTP termination factory by name.
+ * @param client the MRCP client to get from
+ * @param name the name to lookup
+ */
+MRCP_DECLARE(mpf_termination_factory_t*) mrcp_client_rtp_factory_get(mrcp_client_t *client, const char *name);
+
+/**
+ * Get signaling agent by name.
+ * @param client the MRCP client to get from
+ * @param name the name to lookup
+ */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_client_signaling_agent_get(mrcp_client_t *client, const char *name);
+
+/**
+ * Get connection agent by name.
+ * @param client the MRCP client to get from
+ * @param name the name to lookup
+ */
+MRCP_DECLARE(mrcp_connection_agent_t*) mrcp_client_connection_agent_get(mrcp_client_t *client, const char *name);
+
+/**
+ * Get profile by name.
+ * @param client the MRCP client to get from
+ * @param name the name to lookup
+ */
+MRCP_DECLARE(mrcp_profile_t*) mrcp_client_profile_get(mrcp_client_t *client, const char *name);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_CLIENT_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client_session.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client_session.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_CLIENT_SESSION_H__
+#define __MRCP_CLIENT_SESSION_H__
+
+/**
+ * @file mrcp_client_session.h
+ * @brief MRCP Client Session
+ */ 
+
+#include "mrcp_client_types.h"
+#include "mrcp_application.h"
+#include "mrcp_session.h"
+#include "mpf_message.h"
+#include "apt_task_msg.h"
+#include "apt_obj_list.h"
+
+APT_BEGIN_EXTERN_C
+
+/** RTP termination slot declaration */
+typedef struct rtp_termination_slot_t rtp_termination_slot_t;
+
+/** MRCP client session declaration */
+typedef struct mrcp_client_session_t mrcp_client_session_t;
+
+/** MRCP client session */
+struct mrcp_client_session_t {
+	/** Session base */
+	mrcp_session_t             base;
+	/** Application session belongs to */
+	mrcp_application_t        *application;
+	/** External object associated with session */
+	void                      *app_obj;
+	/** Profile to use */
+	mrcp_profile_t            *profile;
+
+	/** Media context */
+	mpf_context_t             *context;
+	/** Codec manager */
+	const mpf_codec_manager_t *codec_manager;
+
+
+	/** RTP termination array (mrcp_termination_slot_t) */
+	apr_array_header_t        *terminations;
+	/** MRCP control channel array (mrcp_channel_t*) */
+	apr_array_header_t        *channels;
+
+	/** Indicates whether session is already added to session table */
+	apt_bool_t                 registered;
+
+	/** In-progress offer */
+	mrcp_session_descriptor_t *offer;
+	/** In-progress answer */
+	mrcp_session_descriptor_t *answer;
+
+	/** MRCP application active request */
+	const mrcp_app_message_t  *active_request;
+	/** MRCP application request queue */
+	apt_obj_list_t            *request_queue;
+
+	/** Number of in-progress offer requests (flags) */
+	apr_size_t                 offer_flag_count;
+	/** Number of in-progress answer requests (flags) */
+	apr_size_t                 answer_flag_count;
+	/** Number of in-progress terminate requests (flags) */
+	apr_size_t                 terminate_flag_count;
+};
+
+/** MRCP channel */
+struct mrcp_channel_t {
+	/** Memory pool */
+	apr_pool_t             *pool;
+	/** External object associated with channel */
+	void                   *obj;
+	/** MRCP resource identifier */
+	mrcp_resource_id        resource_id;
+	/** MRCP resource name */
+	const apt_str_t        *resource_name;
+	/** MRCP resource */
+	mrcp_resource_t        *resource;
+	/** MRCP session entire channel belongs to */
+	mrcp_session_t         *session;
+	/** MRCP control channel */
+	mrcp_control_channel_t *control_channel;
+	/** Media termination */
+	mpf_termination_t      *termination;
+	/** Associated RTP termination slot */
+	rtp_termination_slot_t *rtp_termination_slot;
+
+	/** waiting state of control channel */
+	apt_bool_t              waiting_for_channel;         
+	/** waiting state of media termination */
+	apt_bool_t              waiting_for_termination;
+};
+
+/** RTP termination slot */
+struct rtp_termination_slot_t {
+	/** waiting state */
+	apt_bool_t                        waiting;
+	/** RTP termination */
+	mpf_termination_t                *termination;
+	/** RTP termination descriptor */
+	mpf_rtp_termination_descriptor_t *descriptor;
+};
+
+
+/** MRCP profile */
+struct mrcp_profile_t {
+	/** MRCP resource factory */
+	mrcp_resource_factory_t   *resource_factory;
+	/** Media processing engine */
+	mpf_engine_t              *media_engine;
+	/** RTP termination factory */
+	mpf_termination_factory_t *rtp_termination_factory;
+	/** Signaling agent */
+	mrcp_sig_agent_t          *signaling_agent;
+	/** Connection agent */
+	mrcp_connection_agent_t   *connection_agent;
+};
+
+/** MRCP application */
+struct mrcp_application_t {
+	/** External object associated with the application */
+	void                      *obj;
+	/** Application message handler */
+	mrcp_app_message_handler_f handler;
+	/** MRCP client */
+	mrcp_client_t             *client;
+	/** Application task message pool */
+	apt_task_msg_pool_t       *msg_pool;
+};
+
+/** Create client session */
+mrcp_client_session_t* mrcp_client_session_create(mrcp_application_t *application, void *obj);
+/** Create channel */
+mrcp_channel_t* mrcp_client_channel_create(
+					mrcp_session_t *session, 
+					mrcp_resource_id resource_id, 
+					mpf_termination_t *termination, 
+					mpf_rtp_termination_descriptor_t *rtp_descriptor, 
+					void *obj);
+
+/** Create signaling app_message_t request */
+mrcp_app_message_t* mrcp_client_app_signaling_request_create(mrcp_sig_command_e command_id, apr_pool_t *pool);
+/** Create signaling app_message_t event */
+mrcp_app_message_t* mrcp_client_app_signaling_event_create(mrcp_sig_event_e event_id, apr_pool_t *pool);
+/** Create control app_message_t */
+mrcp_app_message_t* mrcp_client_app_control_message_create(apr_pool_t *pool);
+/** Create response to app_message_t request */
+mrcp_app_message_t* mrcp_client_app_response_create(const mrcp_app_message_t *app_request, mrcp_sig_status_code_e status, apr_pool_t *pool);
+
+/** Process application message */
+apt_bool_t mrcp_client_app_message_process(mrcp_app_message_t *app_message);
+/** Process MPF message */
+apt_bool_t mrcp_client_mpf_message_process(mpf_message_t *mpf_message);
+
+/** Process session answer */
+apt_bool_t mrcp_client_session_answer_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor);
+/** Process session termination response */
+apt_bool_t mrcp_client_session_terminate_response_process(mrcp_client_session_t *session);
+/** Process session control response */
+apt_bool_t mrcp_client_session_control_response_process(mrcp_client_session_t *session, mrcp_message_t *message);
+/** Process resource discovery response */
+apt_bool_t mrcp_client_session_discover_response_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor);
+/** Process session termination event */
+apt_bool_t mrcp_client_session_terminate_event_process(mrcp_client_session_t *session);
+
+/** Process channel add event */
+apt_bool_t mrcp_client_on_channel_add(mrcp_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status);
+/** Process channel modify event */
+apt_bool_t mrcp_client_on_channel_modify(mrcp_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status);
+/** Process channel remove event */
+apt_bool_t mrcp_client_on_channel_remove(mrcp_channel_t *channel, apt_bool_t status);
+/** Process message receive event */
+apt_bool_t mrcp_client_on_message_receive(mrcp_channel_t *channel, mrcp_message_t *message);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_CLIENT_SESSION_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client_types.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/include/mrcp_client_types.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_CLIENT_TYPES_H__
+#define __MRCP_CLIENT_TYPES_H__
+
+/**
+ * @file mrcp_client_types.h
+ * @brief MRCP Client Types
+ */ 
+
+#include "mrcp_sig_types.h"
+#include "mrcp_connection_types.h"
+#include "mpf_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque MRCP client declaration */
+typedef struct mrcp_client_t mrcp_client_t;
+
+/** Opaque MRCP profile declaration */
+typedef struct mrcp_profile_t mrcp_profile_t;
+
+/** Opaque MRCP application declaration */
+typedef struct mrcp_application_t mrcp_application_t;
+
+/** Opaque MRCP channel declaration */
+typedef struct mrcp_channel_t mrcp_channel_t;
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_CLIENT_TYPES_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,165 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/src/mrcp_client.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/src/mrcp_client.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,983 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "mrcp_client.h"
+#include "mrcp_resource_factory.h"
+#include "mrcp_sig_agent.h"
+#include "mrcp_client_session.h"
+#include "mrcp_client_connection.h"
+#include "mrcp_message.h"
+#include "mpf_engine.h"
+#include "mpf_termination.h"
+#include "mpf_codec_manager.h"
+#include "apt_pool.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+#define CLIENT_TASK_NAME "MRCP Client"
+
+/** MRCP client */
+struct mrcp_client_t {
+	/** Main message processing task */
+	apt_consumer_task_t     *task;
+
+	/** MRCP resource factory */
+	mrcp_resource_factory_t *resource_factory;
+	/** Codec manager */
+	mpf_codec_manager_t     *codec_manager;
+	/** Table of media processing engines (mpf_engine_t*) */
+	apr_hash_t              *media_engine_table;
+	/** Table of RTP termination factories (mpf_termination_factory_t*) */
+	apr_hash_t              *rtp_factory_table;
+	/** Table of signaling agents (mrcp_sig_agent_t*) */
+	apr_hash_t              *sig_agent_table;
+	/** Table of connection agents (mrcp_connection_agent_t*) */
+	apr_hash_t              *cnt_agent_table;
+	/** Table of profiles (mrcp_profile_t*) */
+	apr_hash_t              *profile_table;
+
+	/** Table of applications (mrcp_application_t*) */
+	apr_hash_t              *app_table;
+
+	/** Table of sessions/handles */
+	apr_hash_t              *session_table;
+
+	/** Connection task message pool */
+	apt_task_msg_pool_t     *cnt_msg_pool;
+	/** Dir layout structure */
+	apt_dir_layout_t        *dir_layout;
+	/** Memory pool */
+	apr_pool_t              *pool;
+};
+
+
+typedef enum {
+	MRCP_CLIENT_SIGNALING_TASK_MSG = TASK_MSG_USER,
+	MRCP_CLIENT_CONNECTION_TASK_MSG,
+	MRCP_CLIENT_MEDIA_TASK_MSG,
+	MRCP_CLIENT_APPLICATION_TASK_MSG
+} mrcp_client_task_msg_type_e;
+
+/* Signaling agent interface */
+typedef enum {
+	SIG_AGENT_TASK_MSG_ANSWER,
+	SIG_AGENT_TASK_MSG_TERMINATE_RESPONSE,
+	SIG_AGENT_TASK_MSG_CONTROL_RESPONSE,
+	SIG_AGENT_TASK_MSG_DISCOVER_RESPONSE,
+	SIG_AGENT_TASK_MSG_TERMINATE_EVENT
+} sig_agent_task_msg_type_e;
+
+typedef struct sig_agent_task_msg_data_t sig_agent_task_msg_data_t;
+struct sig_agent_task_msg_data_t {
+	mrcp_client_session_t     *session;
+	mrcp_session_descriptor_t *descriptor;
+	mrcp_message_t            *message;
+};
+
+static apt_bool_t mrcp_client_answer_signal(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_client_terminate_response_signal(mrcp_session_t *session);
+static apt_bool_t mrcp_client_control_response_signal(mrcp_session_t *session, mrcp_message_t *message);
+static apt_bool_t mrcp_client_discover_response_signal(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+
+static apt_bool_t mrcp_client_terminate_event_signal(mrcp_session_t *session);
+
+static const mrcp_session_response_vtable_t session_response_vtable = {
+	mrcp_client_answer_signal,
+	mrcp_client_terminate_response_signal,
+	mrcp_client_control_response_signal,
+	mrcp_client_discover_response_signal
+};
+
+static const mrcp_session_event_vtable_t session_event_vtable = {
+	mrcp_client_terminate_event_signal
+};
+
+/* Connection agent interface */
+typedef enum {
+	CONNECTION_AGENT_TASK_MSG_ADD_CHANNEL,
+	CONNECTION_AGENT_TASK_MSG_MODIFY_CHANNEL,
+	CONNECTION_AGENT_TASK_MSG_REMOVE_CHANNEL,
+	CONNECTION_AGENT_TASK_MSG_RECEIVE_MESSAGE,
+} connection_agent_task_msg_type_e ;
+
+typedef struct connection_agent_task_msg_data_t connection_agent_task_msg_data_t;
+struct connection_agent_task_msg_data_t {
+	mrcp_channel_t            *channel;
+	mrcp_control_descriptor_t *descriptor;
+	mrcp_message_t            *message;
+	apt_bool_t                 status;
+};
+
+static apt_bool_t mrcp_client_channel_add_signal(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status);
+static apt_bool_t mrcp_client_channel_modify_signal(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status);
+static apt_bool_t mrcp_client_channel_remove_signal(mrcp_control_channel_t *channel, apt_bool_t status);
+static apt_bool_t mrcp_client_message_signal(mrcp_control_channel_t *channel, mrcp_message_t *message);
+
+static const mrcp_connection_event_vtable_t connection_method_vtable = {
+	mrcp_client_channel_add_signal,
+	mrcp_client_channel_modify_signal,
+	mrcp_client_channel_remove_signal,
+	mrcp_client_message_signal
+};
+
+/* Task interface */
+static void mrcp_client_on_start_complete(apt_task_t *task);
+static void mrcp_client_on_terminate_complete(apt_task_t *task);
+static apt_bool_t mrcp_client_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+static apt_bool_t mrcp_app_signaling_task_msg_signal(mrcp_sig_command_e command_id, mrcp_session_t *session, mrcp_channel_t *channel);
+static apt_bool_t mrcp_app_control_task_msg_signal(mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message);
+
+
+/** Create MRCP client instance */
+MRCP_DECLARE(mrcp_client_t*) mrcp_client_create(apt_dir_layout_t *dir_layout)
+{
+	mrcp_client_t *client;
+	apr_pool_t *pool;
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+	
+	pool = apt_pool_create();
+	if(!pool) {
+		return NULL;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "CLIENT_TASK_NAME);
+	client = apr_palloc(pool,sizeof(mrcp_client_t));
+	client->pool = pool;
+	client->dir_layout = dir_layout;
+	client->resource_factory = NULL;
+	client->media_engine_table = NULL;
+	client->rtp_factory_table = NULL;
+	client->sig_agent_table = NULL;
+	client->cnt_agent_table = NULL;
+	client->profile_table = NULL;
+	client->app_table = NULL;
+	client->session_table = NULL;
+	client->cnt_msg_pool = NULL;
+
+	msg_pool = apt_task_msg_pool_create_dynamic(0,pool);
+	client->task = apt_consumer_task_create(client,msg_pool,pool);
+	if(!client->task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Client Task");
+		return NULL;
+	}
+	task = apt_consumer_task_base_get(client->task);
+	apt_task_name_set(task,CLIENT_TASK_NAME);
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->process_msg = mrcp_client_msg_process;
+		vtable->on_start_complete = mrcp_client_on_start_complete;
+		vtable->on_terminate_complete = mrcp_client_on_terminate_complete;
+	}
+
+	client->media_engine_table = apr_hash_make(client->pool);
+	client->rtp_factory_table = apr_hash_make(client->pool);
+	client->sig_agent_table = apr_hash_make(client->pool);
+	client->cnt_agent_table = apr_hash_make(client->pool);
+	client->profile_table = apr_hash_make(client->pool);
+	client->app_table = apr_hash_make(client->pool);
+	
+	client->session_table = apr_hash_make(client->pool);
+	return client;
+}
+
+/** Start message processing loop */
+MRCP_DECLARE(apt_bool_t) mrcp_client_start(mrcp_client_t *client)
+{
+	apt_task_t *task;
+	if(!client || !client->task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid Client");
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(client->task);
+	if(apt_task_start(task) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start Client Task");
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/** Shutdown message processing loop */
+MRCP_DECLARE(apt_bool_t) mrcp_client_shutdown(mrcp_client_t *client)
+{
+	apt_task_t *task;
+	if(!client || !client->task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid Client");
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(client->task);
+	if(apt_task_terminate(task,TRUE) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Shutdown Client Task");
+		return FALSE;
+	}
+	client->session_table = NULL;
+	return TRUE;
+}
+
+/** Destroy MRCP client */
+MRCP_DECLARE(apt_bool_t) mrcp_client_destroy(mrcp_client_t *client)
+{
+	apt_task_t *task;
+	if(!client || !client->task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid Client");
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(client->task);
+	apt_task_destroy(task);
+
+	apr_pool_destroy(client->pool);
+	return TRUE;
+}
+
+
+/** Register MRCP resource factory */
+MRCP_DECLARE(apt_bool_t) mrcp_client_resource_factory_register(mrcp_client_t *client, mrcp_resource_factory_t *resource_factory)
+{
+	if(!resource_factory) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Resource Factory");
+	client->resource_factory = resource_factory;
+	return TRUE;
+}
+
+/** Register codec manager */
+MRCP_DECLARE(apt_bool_t) mrcp_client_codec_manager_register(mrcp_client_t *client, mpf_codec_manager_t *codec_manager)
+{
+	if(!codec_manager) {
+		return FALSE;
+	}
+	client->codec_manager = codec_manager;
+	return TRUE;
+}
+
+/** Get registered codec manager */
+MRCP_DECLARE(const mpf_codec_manager_t*) mrcp_client_codec_manager_get(mrcp_client_t *client)
+{
+	return client->codec_manager;
+}
+
+/** Register media engine */
+MRCP_DECLARE(apt_bool_t) mrcp_client_media_engine_register(mrcp_client_t *client, mpf_engine_t *media_engine, const char *name)
+{
+	if(!media_engine || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Media Engine [%s]",name);
+	mpf_engine_codec_manager_register(media_engine,client->codec_manager);
+	apr_hash_set(client->media_engine_table,name,APR_HASH_KEY_STRING,media_engine);
+	mpf_engine_task_msg_type_set(media_engine,MRCP_CLIENT_MEDIA_TASK_MSG);
+	if(client->task) {
+		apt_task_t *media_task = mpf_task_get(media_engine);
+		apt_task_t *task = apt_consumer_task_base_get(client->task);
+		apt_task_add(task,media_task);
+	}
+	return TRUE;
+}
+
+/** Get media engine by name */
+MRCP_DECLARE(mpf_engine_t*) mrcp_client_media_engine_get(mrcp_client_t *client, const char *name)
+{
+	return apr_hash_get(client->media_engine_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register RTP termination factory */
+MRCP_DECLARE(apt_bool_t) mrcp_client_rtp_factory_register(mrcp_client_t *client, mpf_termination_factory_t *rtp_termination_factory, const char *name)
+{
+	if(!rtp_termination_factory || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register RTP Termination Factory [%s]",name);
+	apr_hash_set(client->rtp_factory_table,name,APR_HASH_KEY_STRING,rtp_termination_factory);
+	return TRUE;
+}
+
+/** Get RTP termination factory by name */
+MRCP_DECLARE(mpf_termination_factory_t*) mrcp_client_rtp_factory_get(mrcp_client_t *client, const char *name)
+{
+	return apr_hash_get(client->rtp_factory_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register MRCP signaling agent */
+MRCP_DECLARE(apt_bool_t) mrcp_client_signaling_agent_register(mrcp_client_t *client, mrcp_sig_agent_t *signaling_agent, const char *name)
+{
+	if(!signaling_agent || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Signaling Agent [%s]",name);
+	signaling_agent->msg_pool = apt_task_msg_pool_create_dynamic(sizeof(sig_agent_task_msg_data_t),client->pool);
+	signaling_agent->parent = client;
+	signaling_agent->resource_factory = client->resource_factory;
+	apr_hash_set(client->sig_agent_table,name,APR_HASH_KEY_STRING,signaling_agent);
+	if(client->task) {
+		apt_task_t *task = apt_consumer_task_base_get(client->task);
+		apt_task_add(task,signaling_agent->task);
+	}
+	return TRUE;
+}
+
+/** Get signaling agent by name */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_client_signaling_agent_get(mrcp_client_t *client, const char *name)
+{
+	return apr_hash_get(client->sig_agent_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register MRCP connection agent (MRCPv2 only) */
+MRCP_DECLARE(apt_bool_t) mrcp_client_connection_agent_register(mrcp_client_t *client, mrcp_connection_agent_t *connection_agent, const char *name)
+{
+	if(!connection_agent || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Connection Agent [%s]",name);
+	mrcp_client_connection_resource_factory_set(connection_agent,client->resource_factory);
+	mrcp_client_connection_agent_handler_set(connection_agent,client,&connection_method_vtable);
+	client->cnt_msg_pool = apt_task_msg_pool_create_dynamic(sizeof(connection_agent_task_msg_data_t),client->pool);
+	apr_hash_set(client->cnt_agent_table,name,APR_HASH_KEY_STRING,connection_agent);
+	if(client->task) {
+		apt_task_t *task = apt_consumer_task_base_get(client->task);
+		apt_task_t *connection_task = mrcp_client_connection_agent_task_get(connection_agent);
+		apt_task_add(task,connection_task);
+	}
+	return TRUE;
+}
+
+/** Get connection agent by name */
+MRCP_DECLARE(mrcp_connection_agent_t*) mrcp_client_connection_agent_get(mrcp_client_t *client, const char *name)
+{
+	return apr_hash_get(client->cnt_agent_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Create MRCP profile */
+MRCP_DECLARE(mrcp_profile_t*) mrcp_client_profile_create(
+									mrcp_resource_factory_t *resource_factory,
+									mrcp_sig_agent_t *signaling_agent,
+									mrcp_connection_agent_t *connection_agent,
+									mpf_engine_t *media_engine,
+									mpf_termination_factory_t *rtp_factory,
+									apr_pool_t *pool)
+{
+	mrcp_profile_t *profile = apr_palloc(pool,sizeof(mrcp_profile_t));
+	profile->resource_factory = resource_factory;
+	profile->media_engine = media_engine;
+	profile->rtp_termination_factory = rtp_factory;
+	profile->signaling_agent = signaling_agent;
+	profile->connection_agent = connection_agent;
+	return profile;
+}
+
+/** Register MRCP profile */
+MRCP_DECLARE(apt_bool_t) mrcp_client_profile_register(mrcp_client_t *client, mrcp_profile_t *profile, const char *name)
+{
+	if(!profile || !name) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Profile: no name",name);
+		return FALSE;
+	}
+	if(!profile->resource_factory) {
+		profile->resource_factory = client->resource_factory;
+	}
+	if(!profile->signaling_agent) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Profile [%s]: missing signaling agent",name);
+		return FALSE;
+	}
+	if(profile->signaling_agent->mrcp_version == MRCP_VERSION_2 &&
+		!profile->connection_agent) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Profile [%s]: missing connection agent",name);
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Profile [%s]",name);
+	apr_hash_set(client->profile_table,name,APR_HASH_KEY_STRING,profile);
+	return TRUE;
+}
+
+/** Get profile by name */
+MRCP_DECLARE(mrcp_profile_t*) mrcp_client_profile_get(mrcp_client_t *client, const char *name)
+{
+	return apr_hash_get(client->profile_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register MRCP application */
+MRCP_DECLARE(apt_bool_t) mrcp_client_application_register(mrcp_client_t *client, mrcp_application_t *application, const char *name)
+{
+	if(!application || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Application [%s]",name);
+	application->client = client;
+	application->msg_pool = apt_task_msg_pool_create_dynamic(sizeof(mrcp_app_message_t*),client->pool);
+	apr_hash_set(client->app_table,name,APR_HASH_KEY_STRING,application);
+	return TRUE;
+}
+
+/** Get memory pool */
+MRCP_DECLARE(apr_pool_t*) mrcp_client_memory_pool_get(mrcp_client_t *client)
+{
+	return client->pool;
+}
+
+
+/** Create application instance */
+MRCP_DECLARE(mrcp_application_t*) mrcp_application_create(const mrcp_app_message_handler_f handler, void *obj, apr_pool_t *pool)
+{
+	mrcp_application_t *application;
+	if(!handler) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create Application");
+	application = apr_palloc(pool,sizeof(mrcp_application_t));
+	application->obj = obj;
+	application->handler = handler;
+	application->client = NULL;
+	return application;
+}
+
+/** Destroy application instance */
+MRCP_DECLARE(apt_bool_t) mrcp_application_destroy(mrcp_application_t *application)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy Application");
+	return TRUE;
+}
+
+/** Get external object associated with the application */
+MRCP_DECLARE(void*) mrcp_application_object_get(mrcp_application_t *application)
+{
+	return application->obj;
+}
+
+/** Get dir layout structure */
+MRCP_DECLARE(const apt_dir_layout_t*) mrcp_application_dir_layout_get(mrcp_application_t *application)
+{
+	return application->client->dir_layout;
+}
+
+
+
+/** Create client session */
+MRCP_DECLARE(mrcp_session_t*) mrcp_application_session_create(mrcp_application_t *application, const char *profile_name, void *obj)
+{
+	mrcp_profile_t *profile;
+	mrcp_client_session_t *session;
+	if(!application || !application->client) {
+		return NULL;
+	}
+
+	profile = mrcp_client_profile_get(application->client,profile_name);
+	if(!profile) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Such Profile [%s]",profile_name);
+		return NULL;
+	}
+
+	session = mrcp_client_session_create(application,obj);
+	if(!session) {
+		return NULL;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create MRCP Handle "APT_PTR_FMT" [%s]",
+		MRCP_SESSION_PTR(session),
+		profile_name);
+	session->profile = profile;
+	session->codec_manager = application->client->codec_manager;
+	session->base.response_vtable = &session_response_vtable;
+	session->base.event_vtable = &session_event_vtable;
+	return &session->base;
+}
+
+/** Get external object associated with the session */
+MRCP_DECLARE(void*) mrcp_application_session_object_get(mrcp_session_t *session)
+{
+	mrcp_client_session_t *client_session = (mrcp_client_session_t*)session;
+	if(!client_session) {
+		return NULL;
+	}
+	return client_session->app_obj;
+}
+
+
+/** Send session update request */
+MRCP_DECLARE(apt_bool_t) mrcp_application_session_update(mrcp_session_t *session)
+{
+	if(!session) {
+		return FALSE;
+	}
+	return mrcp_app_signaling_task_msg_signal(MRCP_SIG_COMMAND_SESSION_UPDATE,session,NULL);
+}
+
+/** Send session termination request */
+MRCP_DECLARE(apt_bool_t) mrcp_application_session_terminate(mrcp_session_t *session)
+{
+	if(!session) {
+		return FALSE;
+	}
+	return mrcp_app_signaling_task_msg_signal(MRCP_SIG_COMMAND_SESSION_TERMINATE,session,NULL);
+}
+
+/** Destroy client session (session must be terminated prior to destroy) */
+MRCP_DECLARE(apt_bool_t) mrcp_application_session_destroy(mrcp_session_t *session)
+{
+	if(!session) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy MRCP Handle "APT_PTR_FMT,MRCP_SESSION_PTR(session));
+	mrcp_session_destroy(session);
+	return TRUE;
+}
+
+
+/** Create control channel */
+MRCP_DECLARE(mrcp_channel_t*) mrcp_application_channel_create(
+									mrcp_session_t *session, 
+									mrcp_resource_id resource_id, 
+									mpf_termination_t *termination, 
+									mpf_rtp_termination_descriptor_t *rtp_descriptor, 
+									void *obj)
+{
+	mrcp_client_session_t *client_session = (mrcp_client_session_t*)session;
+	if(!client_session || !client_session->profile) {
+		/* Invalid params */
+		return FALSE;
+	}
+	if(termination) {
+		/* Media engine and RTP factory must be specified in this case */
+		if(!client_session->profile->media_engine || !client_session->profile->rtp_termination_factory) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Channel: invalid profile");
+			return FALSE;
+		}
+	}
+	else {
+		/* Either termination or rtp_descriptor must be specified */
+		if(!rtp_descriptor) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Channel: missing both termination and RTP descriptor");
+			return FALSE;
+		}
+	}
+	return mrcp_client_channel_create(session,resource_id,termination,rtp_descriptor,obj);
+}
+
+/** Get external object associated with the channel */
+MRCP_DECLARE(void*) mrcp_application_channel_object_get(mrcp_channel_t *channel)
+{
+	if(!channel) {
+		return FALSE;
+	}
+	return channel->obj;
+}
+
+/** Get RTP termination descriptor */
+MRCP_DECLARE(mpf_rtp_termination_descriptor_t*) mrcp_application_rtp_descriptor_get(mrcp_channel_t *channel)
+{
+	if(!channel || !channel->rtp_termination_slot) {
+		return FALSE;
+	}
+	return channel->rtp_termination_slot->descriptor;
+}
+
+/** Send channel add request */
+MRCP_DECLARE(apt_bool_t) mrcp_application_channel_add(mrcp_session_t *session, mrcp_channel_t *channel)
+{
+	if(!session || !channel) {
+		return FALSE;
+	}
+	return mrcp_app_signaling_task_msg_signal(MRCP_SIG_COMMAND_CHANNEL_ADD,session,channel);
+}
+
+/** Send channel removal request */
+MRCP_DECLARE(apt_bool_t) mrcp_application_channel_remove(mrcp_session_t *session, mrcp_channel_t *channel)
+{
+	if(!session || !channel) {
+		return FALSE;
+	}
+	return mrcp_app_signaling_task_msg_signal(MRCP_SIG_COMMAND_CHANNEL_REMOVE,session,channel);
+}
+
+/** Send resource discovery request */
+MRCP_DECLARE(apt_bool_t) mrcp_application_resource_discover(mrcp_session_t *session)
+{
+	if(!session) {
+		return FALSE;
+	}
+	return mrcp_app_signaling_task_msg_signal(MRCP_SIG_COMMAND_RESOURCE_DISCOVER,session,NULL);
+}
+
+/** Create MRCP message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_application_message_create(mrcp_session_t *session, mrcp_channel_t *channel, mrcp_method_id method_id)
+{
+	mrcp_message_t *mrcp_message;
+	mrcp_profile_t *profile;
+	mrcp_client_session_t *client_session = (mrcp_client_session_t*)session;
+	if(!client_session || !channel) {
+		return NULL;
+	}
+	profile = client_session->profile;
+	if(!profile || !profile->resource_factory) {
+		return NULL;
+	}
+	mrcp_message = mrcp_request_create(channel->resource_id,method_id,session->pool);
+	if(mrcp_message) {
+		mrcp_message->start_line.version = profile->signaling_agent->mrcp_version;
+		mrcp_message_resourcify_by_id(profile->resource_factory,mrcp_message);
+	}
+	return mrcp_message;
+}
+
+/** Send MRCP message */
+MRCP_DECLARE(apt_bool_t) mrcp_application_message_send(mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	if(!session || !channel || !message) {
+		return FALSE;
+	}
+	return mrcp_app_control_task_msg_signal(session,channel,message);
+}
+
+/** Create source media termination */
+MRCP_DECLARE(mpf_termination_t*) mrcp_application_source_termination_create(
+										mrcp_session_t *session,
+										const mpf_audio_stream_vtable_t *stream_vtable,
+										mpf_codec_descriptor_t *codec_descriptor,
+										void *obj)
+{
+	mpf_audio_stream_t *audio_stream;
+	/* create audio stream */
+	audio_stream = mpf_audio_stream_create(
+			obj,                  /* object to associate */
+			stream_vtable,        /* virtual methods table of audio stream */
+			STREAM_MODE_RECEIVE,  /* stream mode/direction */
+			session->pool);       /* memory pool to allocate memory from */
+
+	if(codec_descriptor) {
+		mrcp_client_session_t *client_session = (mrcp_client_session_t*)session;
+		audio_stream->rx_codec = mpf_codec_manager_codec_get(client_session->codec_manager,codec_descriptor,session->pool);
+	}
+
+	/* create raw termination */
+	return mpf_raw_termination_create(
+			NULL,                 /* no object to associate */
+			audio_stream,         /* audio stream */
+			NULL,                 /* no video stream */
+			session->pool);       /* memory pool to allocate memory from */
+}
+
+MRCP_DECLARE(mpf_termination_t*) mrcp_application_sink_termination_create(
+										mrcp_session_t *session,
+										const mpf_audio_stream_vtable_t *stream_vtable,
+										mpf_codec_descriptor_t *codec_descriptor,
+										void *obj)
+{
+	mpf_audio_stream_t *audio_stream;
+	/* create audio stream */
+	audio_stream = mpf_audio_stream_create(
+			obj,                  /* object to associate */
+			stream_vtable,        /* virtual methods table of audio stream */
+			STREAM_MODE_SEND,     /* stream mode/direction */
+			session->pool);       /* memory pool to allocate memory from */
+
+	if(codec_descriptor) {
+		mrcp_client_session_t *client_session = (mrcp_client_session_t*)session;
+		audio_stream->tx_codec = mpf_codec_manager_codec_get(client_session->codec_manager,codec_descriptor,session->pool);
+	}
+
+	/* create raw termination */
+	return mpf_raw_termination_create(
+			NULL,                 /* no object to associate */
+			audio_stream,         /* audio stream */
+			NULL,                 /* no video stream */
+			session->pool);       /* memory pool to allocate memory from */
+}
+
+void mrcp_client_session_add(mrcp_client_t *client, mrcp_client_session_t *session)
+{
+	if(session) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add MRCP Handle "APT_PTR_FMT,MRCP_SESSION_PTR(session));
+		apr_hash_set(client->session_table,session,sizeof(session),session);
+	}
+}
+
+void mrcp_client_session_remove(mrcp_client_t *client, mrcp_client_session_t *session)
+{
+	if(session) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remove MRCP Handle "APT_PTR_FMT,MRCP_SESSION_PTR(session));
+		apr_hash_set(client->session_table,session,sizeof(session),NULL);
+	}
+}
+
+static void mrcp_client_on_start_complete(apt_task_t *task)
+{
+	apt_consumer_task_t *consumer_task = apt_task_object_get(task);
+	mrcp_client_t *client = apt_consumer_task_object_get(consumer_task);
+	void *val;
+	mrcp_application_t *application;
+	mrcp_app_message_t *app_message;
+	apr_hash_index_t *it;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,CLIENT_TASK_NAME" Started");
+	it = apr_hash_first(client->pool,client->app_table);
+	for(; it; it = apr_hash_next(it)) {
+		apr_hash_this(it,NULL,NULL,&val);
+		application = val;
+		if(!application) continue;
+
+		/* raise one-time application-ready event */
+		app_message = mrcp_client_app_signaling_event_create(MRCP_SIG_EVENT_READY,client->pool);
+		app_message->sig_message.status = MRCP_SIG_STATUS_CODE_SUCCESS;
+		app_message->application = application;
+		application->handler(app_message);
+	}
+}
+
+static void mrcp_client_on_terminate_complete(apt_task_t *task)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,CLIENT_TASK_NAME" Terminated");
+}
+
+
+static apt_bool_t mrcp_client_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	apt_consumer_task_t *consumer_task = apt_task_object_get(task);
+	mrcp_client_t *client = apt_consumer_task_object_get(consumer_task);
+	if(!client) {
+		return FALSE;
+	}
+	switch(msg->type) {
+		case MRCP_CLIENT_SIGNALING_TASK_MSG:
+		{
+			const sig_agent_task_msg_data_t *sig_message = (const sig_agent_task_msg_data_t*)msg->data;
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Receive Signaling Task Message [%d]", msg->sub_type);
+			switch(msg->sub_type) {
+				case SIG_AGENT_TASK_MSG_ANSWER:
+					mrcp_client_session_answer_process(sig_message->session,sig_message->descriptor);
+					break;
+				case SIG_AGENT_TASK_MSG_TERMINATE_RESPONSE:
+					mrcp_client_session_terminate_response_process(sig_message->session);
+					break;
+				case SIG_AGENT_TASK_MSG_CONTROL_RESPONSE:
+					mrcp_client_session_control_response_process(sig_message->session,sig_message->message);
+					break;
+				case SIG_AGENT_TASK_MSG_DISCOVER_RESPONSE:
+					mrcp_client_session_discover_response_process(sig_message->session,sig_message->descriptor);
+					break;
+				case SIG_AGENT_TASK_MSG_TERMINATE_EVENT:
+					mrcp_client_session_terminate_event_process(sig_message->session);
+					break;
+				default:
+					break;
+			}
+			break;
+		}
+		case MRCP_CLIENT_CONNECTION_TASK_MSG:
+		{
+			const connection_agent_task_msg_data_t *data = (const connection_agent_task_msg_data_t*)msg->data;
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Receive Connection Task Message [%d]", msg->sub_type);
+			switch(msg->sub_type) {
+				case CONNECTION_AGENT_TASK_MSG_ADD_CHANNEL:
+					mrcp_client_on_channel_add(data->channel,data->descriptor,data->status);
+					break;
+				case CONNECTION_AGENT_TASK_MSG_MODIFY_CHANNEL:
+					mrcp_client_on_channel_modify(data->channel,data->descriptor,data->status);
+					break;
+				case CONNECTION_AGENT_TASK_MSG_REMOVE_CHANNEL:
+					mrcp_client_on_channel_remove(data->channel,data->status);
+					break;
+				case CONNECTION_AGENT_TASK_MSG_RECEIVE_MESSAGE:
+					mrcp_client_on_message_receive(data->channel,data->message);
+					break;
+				default:
+					break;
+			}
+			break;
+		}
+		case MRCP_CLIENT_MEDIA_TASK_MSG:
+		{
+			mpf_message_t *mpf_message = (mpf_message_t*) msg->data;
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Receive Media Task Message [%d]", mpf_message->command_id);
+			mrcp_client_mpf_message_process(mpf_message);
+			break;
+		}
+		case MRCP_CLIENT_APPLICATION_TASK_MSG:
+		{
+			mrcp_app_message_t **app_message = (mrcp_app_message_t**) msg->data;
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Receive Application Task Message [%d]", (*app_message)->message_type);
+			mrcp_client_app_message_process(*app_message);
+			break;
+		}
+		default:
+		{
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Receive Unknown Task Message [%d]", msg->type);
+			break;
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_app_signaling_task_msg_signal(mrcp_sig_command_e command_id, mrcp_session_t *session, mrcp_channel_t *channel)
+{
+	mrcp_client_session_t *client_session = (mrcp_client_session_t*)session;
+	mrcp_application_t *application = client_session->application;
+	apt_task_t *task = apt_consumer_task_base_get(application->client->task);
+	apt_task_msg_t *task_msg = apt_task_msg_acquire(application->msg_pool);
+	if(task_msg) {
+		mrcp_app_message_t **slot = ((mrcp_app_message_t**)task_msg->data);
+		mrcp_app_message_t *app_message;
+		task_msg->type = MRCP_CLIENT_APPLICATION_TASK_MSG;
+
+		app_message = mrcp_client_app_signaling_request_create(command_id,session->pool);
+		app_message->application = client_session->application;
+		app_message->session = session;
+		app_message->channel = channel;
+		app_message->control_message = NULL;
+		app_message->descriptor = NULL;
+		*slot = app_message;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Signal Application Task Message");
+	return apt_task_msg_signal(task,task_msg);
+}
+
+static apt_bool_t mrcp_app_control_task_msg_signal(mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	mrcp_client_session_t *client_session = (mrcp_client_session_t*)session;
+	mrcp_application_t *application = client_session->application;
+	apt_task_t *task = apt_consumer_task_base_get(application->client->task);
+	apt_task_msg_t *task_msg = apt_task_msg_acquire(application->msg_pool);
+	if(task_msg) {
+		mrcp_app_message_t **slot = ((mrcp_app_message_t**)task_msg->data);
+		mrcp_app_message_t *app_message;
+		task_msg->type = MRCP_CLIENT_APPLICATION_TASK_MSG;
+
+		app_message = mrcp_client_app_control_message_create(session->pool);
+		app_message->application = client_session->application;
+		app_message->session = session;
+		app_message->channel = channel;
+		app_message->control_message = message;
+		*slot = app_message;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Signal Application Task Message");
+	return apt_task_msg_signal(task,task_msg);
+}
+
+static apt_bool_t mrcp_client_signaling_task_msg_signal(sig_agent_task_msg_type_e type, mrcp_session_t *session, mrcp_session_descriptor_t *descriptor, mrcp_message_t *message)
+{
+	sig_agent_task_msg_data_t *data;
+	apt_task_msg_t *task_msg = apt_task_msg_acquire(session->signaling_agent->msg_pool);
+	task_msg->type = MRCP_CLIENT_SIGNALING_TASK_MSG;
+	task_msg->sub_type = type;
+	data = (sig_agent_task_msg_data_t*) task_msg->data;
+	data->session = (mrcp_client_session_t*)session;
+	data->descriptor = descriptor;
+	data->message = message;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Signal Signaling Task Message");
+	return apt_task_msg_parent_signal(session->signaling_agent->task,task_msg);
+}
+
+static apt_bool_t mrcp_client_connection_task_msg_signal(
+							connection_agent_task_msg_type_e type,
+							mrcp_connection_agent_t         *agent, 
+							mrcp_control_channel_t          *channel,
+							mrcp_control_descriptor_t       *descriptor,
+							mrcp_message_t                  *message,
+							apt_bool_t                       status)
+{
+	apt_task_t *task;
+	apt_task_msg_t *task_msg;
+	connection_agent_task_msg_data_t *data;
+	mrcp_client_t *client = mrcp_client_connection_agent_object_get(agent);
+	if(!client || !client->cnt_msg_pool) {
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(client->task);
+	task_msg = apt_task_msg_acquire(client->cnt_msg_pool);
+	task_msg->type = MRCP_CLIENT_CONNECTION_TASK_MSG;
+	task_msg->sub_type = type;
+	data = (connection_agent_task_msg_data_t*) task_msg->data;
+	data->channel = channel ? channel->obj : NULL;
+	data->descriptor = descriptor;
+	data->message = message;
+	data->status = status;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Signal Connection Task Message");
+	return apt_task_msg_signal(task,task_msg);
+}
+
+
+
+static apt_bool_t mrcp_client_answer_signal(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	return mrcp_client_signaling_task_msg_signal(SIG_AGENT_TASK_MSG_ANSWER,session,descriptor,NULL);
+}
+
+static apt_bool_t mrcp_client_terminate_response_signal(mrcp_session_t *session)
+{
+	return mrcp_client_signaling_task_msg_signal(SIG_AGENT_TASK_MSG_TERMINATE_RESPONSE,session,NULL,NULL);
+}
+
+static apt_bool_t mrcp_client_control_response_signal(mrcp_session_t *session, mrcp_message_t *message)
+{
+	return mrcp_client_signaling_task_msg_signal(SIG_AGENT_TASK_MSG_CONTROL_RESPONSE,session,NULL,message);
+}
+
+static apt_bool_t mrcp_client_discover_response_signal(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	return mrcp_client_signaling_task_msg_signal(SIG_AGENT_TASK_MSG_DISCOVER_RESPONSE,session,descriptor,NULL);
+}
+
+static apt_bool_t mrcp_client_terminate_event_signal(mrcp_session_t *session)
+{
+	return mrcp_client_signaling_task_msg_signal(SIG_AGENT_TASK_MSG_TERMINATE_EVENT,session,NULL,NULL);
+}
+
+
+static apt_bool_t mrcp_client_channel_add_signal(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status)
+{
+	return mrcp_client_connection_task_msg_signal(
+								CONNECTION_AGENT_TASK_MSG_ADD_CHANNEL,
+								channel->agent,
+								channel,
+								descriptor,
+								NULL,
+								status);
+}
+
+static apt_bool_t mrcp_client_channel_modify_signal(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status)
+{
+	return mrcp_client_connection_task_msg_signal(
+								CONNECTION_AGENT_TASK_MSG_MODIFY_CHANNEL,
+								channel->agent,
+								channel,
+								descriptor,
+								NULL,
+								status);
+}
+
+static apt_bool_t mrcp_client_channel_remove_signal(mrcp_control_channel_t *channel, apt_bool_t status)
+{
+	return mrcp_client_connection_task_msg_signal(
+								CONNECTION_AGENT_TASK_MSG_REMOVE_CHANNEL,
+								channel->agent,
+								channel,
+								NULL,
+								NULL,
+								status);
+}
+
+static apt_bool_t mrcp_client_message_signal(mrcp_control_channel_t *channel, mrcp_message_t *mrcp_message)
+{
+	return mrcp_client_connection_task_msg_signal(
+								CONNECTION_AGENT_TASK_MSG_RECEIVE_MESSAGE,
+								channel->agent,
+								channel,
+								NULL,
+								mrcp_message,
+								TRUE);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/src/mrcp_client_session.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/src/mrcp_client_session.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,1220 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_client_session.h"
+#include "mrcp_resource.h"
+#include "mrcp_resource_factory.h"
+#include "mrcp_sig_agent.h"
+#include "mrcp_client_connection.h"
+#include "mrcp_session.h"
+#include "mrcp_session_descriptor.h"
+#include "mrcp_control_descriptor.h"
+#include "mrcp_message.h"
+#include "mpf_termination.h"
+#include "mpf_stream.h"
+#include "mpf_engine.h"
+#include "mpf_user.h"
+#include "apt_consumer_task.h"
+#include "apt_obj_list.h"
+#include "apt_log.h"
+
+
+void mrcp_client_session_add(mrcp_client_t *client, mrcp_client_session_t *session);
+void mrcp_client_session_remove(mrcp_client_t *client, mrcp_client_session_t *session);
+
+static apt_bool_t mrcp_client_session_offer_send(mrcp_client_session_t *session);
+
+static apt_bool_t mrcp_app_session_terminate_raise(mrcp_client_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t mrcp_app_sig_response_raise(mrcp_client_session_t *session, mrcp_sig_status_code_e status, apt_bool_t process_pending_requests);
+static apt_bool_t mrcp_app_sig_event_raise(mrcp_client_session_t *session, mrcp_channel_t *channel);
+static apt_bool_t mrcp_app_control_message_raise(mrcp_client_session_t *session, mrcp_channel_t *channel, mrcp_message_t *mrcp_message);
+static apt_bool_t mrcp_app_request_dispatch(mrcp_client_session_t *session, const mrcp_app_message_t *app_message);
+
+static apt_bool_t mrcp_client_resource_answer_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_client_control_media_answer_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_client_av_media_answer_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor);
+
+static mrcp_channel_t* mrcp_client_channel_find_by_name(mrcp_client_session_t *session, const apt_str_t *resource_name);
+
+static apt_bool_t mrcp_client_mpf_request_send(
+						mpf_engine_t *engine, 
+						mpf_command_type_e command_id, 
+						mpf_context_t *context, 
+						mpf_termination_t *termination, 
+						void *descriptor);
+
+mrcp_client_session_t* mrcp_client_session_create(mrcp_application_t *application, void *obj)
+{
+	apr_pool_t *pool;
+	mrcp_client_session_t *session = (mrcp_client_session_t*) mrcp_session_create(sizeof(mrcp_client_session_t)-sizeof(mrcp_session_t));
+	pool = session->base.pool;
+	session->application = application;
+	session->codec_manager = NULL;
+	session->app_obj = obj;
+	session->profile = NULL;
+	session->context = NULL;
+	session->terminations = apr_array_make(pool,2,sizeof(rtp_termination_slot_t));
+	session->channels = apr_array_make(pool,2,sizeof(mrcp_channel_t*));
+	session->registered = FALSE;
+	session->offer = NULL;
+	session->answer = NULL;
+	session->active_request = NULL;
+	session->request_queue = apt_list_create(pool);
+	session->offer_flag_count = 0;
+	session->answer_flag_count = 0;
+	session->terminate_flag_count = 0;
+	return session;
+}
+
+mrcp_channel_t* mrcp_client_channel_create(
+					mrcp_session_t *session, 
+					mrcp_resource_id resource_id, 
+					mpf_termination_t *termination, 
+					mpf_rtp_termination_descriptor_t *rtp_descriptor, 
+					void *obj)
+{
+	mrcp_channel_t *channel = apr_palloc(session->pool,sizeof(mrcp_channel_t));
+	channel->pool = session->pool;
+	channel->obj = obj;
+	channel->session = session;
+	channel->resource_id = resource_id;
+	channel->resource_name = NULL;
+	channel->control_channel = NULL;
+	channel->termination = termination;
+	channel->rtp_termination_slot = NULL;
+	channel->resource = NULL;
+	channel->waiting_for_channel = FALSE;
+	channel->waiting_for_termination = FALSE;
+
+	if(rtp_descriptor) {
+		channel->rtp_termination_slot = apr_palloc(session->pool,sizeof(rtp_termination_slot_t));
+		channel->rtp_termination_slot->descriptor = rtp_descriptor;
+		channel->rtp_termination_slot->termination = NULL;
+		channel->rtp_termination_slot->waiting = FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Create Channel "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(session));
+	return channel;
+}
+
+apt_bool_t mrcp_client_session_answer_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	mrcp_sig_status_code_e status_code = MRCP_SIG_STATUS_CODE_SUCCESS;
+	if(!session->offer) {
+		return FALSE;
+	}
+	if(!descriptor) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive Answer "APT_PTRSID_FMT" [null descriptor]",	MRCP_SESSION_PTRSID(&session->base));
+		status_code = MRCP_SIG_STATUS_CODE_FAILURE;
+		/* raise app response */
+		return mrcp_app_sig_response_raise(session,status_code,TRUE);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive Answer "APT_PTRSID_FMT" [c:%d a:%d v:%d]",
+		MRCP_SESSION_PTRSID(&session->base),
+		descriptor->control_media_arr->nelts,
+		descriptor->audio_media_arr->nelts,
+		descriptor->video_media_arr->nelts);
+
+	if(session->base.signaling_agent->mrcp_version == MRCP_VERSION_1) {
+		if(mrcp_client_resource_answer_process(session,descriptor) != TRUE) {
+			status_code = MRCP_SIG_STATUS_CODE_FAILURE;
+		}
+	}
+	else {
+		mrcp_client_control_media_answer_process(session,descriptor);
+		mrcp_client_av_media_answer_process(session,descriptor);
+	}
+
+	/* store received answer */
+	session->answer = descriptor;
+
+	if(!session->answer_flag_count) {
+		/* raise app response */
+		mrcp_app_sig_response_raise(session,status_code,TRUE);
+	}
+
+	return TRUE;
+}
+
+apt_bool_t mrcp_client_session_terminate_response_process(mrcp_client_session_t *session)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive Terminate Response "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+
+	if(session->terminate_flag_count) {
+		session->terminate_flag_count--;
+	}
+
+	if(!session->terminate_flag_count) {
+		mrcp_app_session_terminate_raise(session,MRCP_SIG_STATUS_CODE_SUCCESS);
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_client_session_terminate_event_process(mrcp_client_session_t *session)
+{
+	if(session->active_request) {
+		/* raise app response */
+		mrcp_app_sig_response_raise(session,MRCP_SIG_STATUS_CODE_TERMINATE,FALSE);
+
+		/* cancel remaing requests (if any) */
+		do {
+			session->active_request = apt_list_pop_front(session->request_queue);
+			if(session->active_request) {
+				mrcp_app_sig_response_raise(session,MRCP_SIG_STATUS_CODE_CANCEL,FALSE);
+			}
+		}
+		while(session->active_request);
+	}
+	else {
+		/* raise app event */
+		mrcp_app_sig_event_raise(session,NULL);
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_client_session_control_response_process(mrcp_client_session_t *session, mrcp_message_t *message)
+{
+	mrcp_channel_t *channel = mrcp_client_channel_find_by_name(session,&message->channel_id.resource_name);
+	if(!channel) {
+		return FALSE;
+	}
+	return mrcp_app_control_message_raise(session,channel,message);
+}
+
+apt_bool_t mrcp_client_session_discover_response_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive Resource Discovery Response "APT_PTR_FMT, MRCP_SESSION_PTR(&session->base));
+	if(!session->active_request) {
+		return FALSE;
+	}
+
+	if(!descriptor) {
+		/* raise app response */
+		return mrcp_app_sig_response_raise(session,MRCP_SIG_STATUS_CODE_FAILURE,TRUE);
+	}
+
+	if(session->base.signaling_agent->mrcp_version == MRCP_VERSION_1) {
+		if(descriptor->resource_state == TRUE) {
+			mrcp_control_descriptor_t *control_media;
+			if(!session->answer) {
+				session->answer = descriptor;
+			}
+			control_media = apr_palloc(session->base.pool,sizeof(mrcp_control_descriptor_t));
+			mrcp_control_descriptor_init(control_media);
+			control_media->id = mrcp_session_control_media_add(session->answer,control_media);
+			control_media->resource_name = descriptor->resource_name;
+		}
+	}
+
+	if(session->answer_flag_count) {
+		session->answer_flag_count--;
+	}
+
+	if(!session->answer_flag_count) {
+		mrcp_app_message_t *response;
+		response = mrcp_client_app_response_create(session->active_request,MRCP_SIG_STATUS_CODE_SUCCESS,session->base.pool);
+		response->descriptor = session->answer;
+		session->answer = NULL;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Raise App Resource Discovery Response "APT_PTR_FMT, MRCP_SESSION_PTR(&session->base));
+		session->application->handler(response);
+
+		session->active_request = apt_list_pop_front(session->request_queue);
+		if(session->active_request) {
+			mrcp_app_request_dispatch(session,session->active_request);
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_client_on_channel_add(mrcp_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status)
+{
+	mrcp_client_session_t *session = (mrcp_client_session_t*)channel->session;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Control Channel Add "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+	if(!channel->waiting_for_channel) {
+		return FALSE;
+	}
+	channel->waiting_for_channel = FALSE;
+	if(session->offer_flag_count) {
+		session->offer_flag_count--;
+		if(!session->offer_flag_count) {
+			/* send offer to server */
+			mrcp_client_session_offer_send(session);
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_client_on_channel_modify(mrcp_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status)
+{
+	mrcp_client_session_t *session = (mrcp_client_session_t*)channel->session;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Control Channel Modify "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+	if(!channel->waiting_for_channel) {
+		return FALSE;
+	}
+	channel->waiting_for_channel = FALSE;
+	if(session->answer_flag_count) {
+		session->answer_flag_count--;
+		if(!session->answer_flag_count) {
+			/* raise app response */
+			mrcp_app_sig_response_raise(
+				session,
+				status == TRUE ? MRCP_SIG_STATUS_CODE_SUCCESS : MRCP_SIG_STATUS_CODE_FAILURE,
+				TRUE);
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_client_on_channel_remove(mrcp_channel_t *channel, apt_bool_t status)
+{
+	mrcp_client_session_t *session = (mrcp_client_session_t*)channel->session;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Control Channel Remove "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+	if(!channel->waiting_for_channel) {
+		return FALSE;
+	}
+	channel->waiting_for_channel = FALSE;
+	if(session->terminate_flag_count) {
+		session->terminate_flag_count--;
+		if(!session->terminate_flag_count) {
+			mrcp_app_session_terminate_raise(
+				session,
+				status == TRUE ? MRCP_SIG_STATUS_CODE_SUCCESS : MRCP_SIG_STATUS_CODE_FAILURE);
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_client_on_message_receive(mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	mrcp_client_session_t *session = (mrcp_client_session_t*)channel->session;
+	return mrcp_app_control_message_raise(session,channel,message);
+}
+
+mrcp_app_message_t* mrcp_client_app_signaling_request_create(mrcp_sig_command_e command_id, apr_pool_t *pool)
+{
+	mrcp_app_message_t *app_message = apr_palloc(pool,sizeof(mrcp_app_message_t));
+	app_message->message_type = MRCP_APP_MESSAGE_TYPE_SIGNALING;
+	app_message->sig_message.message_type = MRCP_SIG_MESSAGE_TYPE_REQUEST;
+	app_message->sig_message.command_id = command_id;
+	return app_message;
+}
+
+mrcp_app_message_t* mrcp_client_app_signaling_event_create(mrcp_sig_event_e event_id, apr_pool_t *pool)
+{
+	mrcp_app_message_t *app_message = apr_palloc(pool,sizeof(mrcp_app_message_t));
+	app_message->message_type = MRCP_APP_MESSAGE_TYPE_SIGNALING;
+	app_message->sig_message.message_type = MRCP_SIG_MESSAGE_TYPE_EVENT;
+	app_message->sig_message.event_id = event_id;
+	return app_message;
+}
+
+mrcp_app_message_t* mrcp_client_app_control_message_create(apr_pool_t *pool)
+{
+	mrcp_app_message_t *app_message = apr_palloc(pool,sizeof(mrcp_app_message_t));
+	app_message->message_type = MRCP_APP_MESSAGE_TYPE_CONTROL;
+	return app_message;
+}
+
+mrcp_app_message_t* mrcp_client_app_response_create(const mrcp_app_message_t *app_request, mrcp_sig_status_code_e status, apr_pool_t *pool)
+{
+	mrcp_app_message_t *app_response = apr_palloc(pool,sizeof(mrcp_app_message_t));
+	*app_response = *app_request;
+	app_response->sig_message.message_type = MRCP_SIG_MESSAGE_TYPE_RESPONSE;
+	app_response->sig_message.status = status;
+	return app_response;
+}
+
+apt_bool_t mrcp_client_app_message_process(mrcp_app_message_t *app_message)
+{
+	mrcp_client_session_t *session = (mrcp_client_session_t*)app_message->session;
+	if(app_message->message_type == MRCP_APP_MESSAGE_TYPE_SIGNALING) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive App Request "APT_PTRSID_FMT" [%d]",
+			MRCP_SESSION_PTRSID(&session->base),
+			app_message->sig_message.command_id);
+	}
+	else {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive App MRCP Request "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+	}
+
+	if(session->active_request) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Push Request to Queue "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+		apt_list_push_back(session->request_queue,app_message,session->base.pool);
+		return TRUE;
+	}
+
+	session->active_request = app_message;
+	mrcp_app_request_dispatch(session,app_message);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_session_offer_send(mrcp_client_session_t *session)
+{
+	mrcp_session_descriptor_t *descriptor = session->offer;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send Offer "APT_PTRSID_FMT" [c:%d a:%d v:%d]",
+		MRCP_SESSION_PTRSID(&session->base),
+		descriptor->control_media_arr->nelts,
+		descriptor->audio_media_arr->nelts,
+		descriptor->video_media_arr->nelts);
+	return mrcp_session_offer(&session->base,descriptor);
+}
+
+static apt_bool_t mrcp_app_session_terminate_raise(mrcp_client_session_t *session, mrcp_sig_status_code_e status)
+{
+	int i;
+	mrcp_channel_t *channel;
+	for(i=0; ichannels->nelts; i++) {
+		channel = ((mrcp_channel_t**)session->channels->elts)[i];
+		if(!channel) continue;
+
+		if(channel->control_channel) {
+			mrcp_client_control_channel_destroy(channel->control_channel);
+			channel->control_channel = NULL;
+		}
+	}
+
+	mrcp_client_session_remove(session->application->client,session);
+	/* raise app response */
+	return mrcp_app_sig_response_raise(session,status,FALSE);
+}
+
+static apt_bool_t mrcp_app_sig_response_raise(mrcp_client_session_t *session, mrcp_sig_status_code_e status, apt_bool_t process_pending_requests)
+{
+	mrcp_app_message_t *response;
+	const mrcp_app_message_t *request = session->active_request;
+	if(!request) {
+		return FALSE;
+	}
+	session->active_request = NULL;
+	response = mrcp_client_app_response_create(request,status,session->base.pool);
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Raise App Response "APT_PTRSID_FMT" [%d] %s [%d]", 
+		MRCP_SESSION_PTRSID(&session->base),
+		response->sig_message.command_id,
+		status == MRCP_SIG_STATUS_CODE_SUCCESS ? "SUCCESS" : "FAILURE",
+		status);
+	session->application->handler(response);
+
+	if(process_pending_requests) {
+		session->active_request = apt_list_pop_front(session->request_queue);
+		if(session->active_request) {
+			mrcp_app_request_dispatch(session,session->active_request);
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_app_sig_event_raise(mrcp_client_session_t *session, mrcp_channel_t *channel)
+{
+	mrcp_app_message_t *app_event;
+	if(!session) {
+		return FALSE;
+	}
+	app_event = mrcp_client_app_signaling_event_create(MRCP_SIG_EVENT_TERMINATE,session->base.pool);
+	app_event->application = session->application;
+	app_event->session = &session->base;
+	app_event->channel = channel;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Raise App Event "APT_PTRSID_FMT" [%d]", 
+		MRCP_SESSION_PTRSID(&session->base),
+		app_event->sig_message.event_id);
+	return session->application->handler(app_event);
+}
+
+static apt_bool_t mrcp_app_control_message_raise(mrcp_client_session_t *session, mrcp_channel_t *channel, mrcp_message_t *mrcp_message)
+{
+	if(mrcp_message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		mrcp_app_message_t *response;
+		mrcp_message_t *mrcp_request;
+		if(!session->active_request || !session->active_request->control_message) {
+			return FALSE;
+		}
+		response = mrcp_client_app_response_create(session->active_request,0,session->base.pool);
+		mrcp_request = session->active_request->control_message;
+		mrcp_message->start_line.method_id = mrcp_request->start_line.method_id;
+		mrcp_message->start_line.method_name = mrcp_request->start_line.method_name;
+		response->control_message = mrcp_message;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Raise App MRCP Response "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+		session->application->handler(response);
+
+		session->active_request = apt_list_pop_front(session->request_queue);
+		if(session->active_request) {
+			mrcp_app_request_dispatch(session,session->active_request);
+		}
+	}
+	else if(mrcp_message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		mrcp_app_message_t *app_message;
+		app_message = mrcp_client_app_control_message_create(session->base.pool);
+		app_message->control_message = mrcp_message;
+		app_message->application = session->application;
+		app_message->session = &session->base;
+		app_message->channel = channel;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Raise App MRCP Event "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+		session->application->handler(app_message);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_channel_find(mrcp_client_session_t *session, mrcp_channel_t *channel, int *index)
+{
+	int i;
+	for(i=0; ichannels->nelts; i++) {
+		mrcp_channel_t *existing_channel = ((mrcp_channel_t**)session->channels->elts)[i];
+		if(existing_channel == channel) {
+			if(index) {
+				*index = i;
+			}
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+static rtp_termination_slot_t* mrcp_client_rtp_termination_find(mrcp_client_session_t *session, mpf_termination_t *termination)
+{
+	int i;
+	rtp_termination_slot_t *slot;
+	for(i=0; iterminations->nelts; i++) {
+		slot = &((rtp_termination_slot_t*)session->terminations->elts)[i];
+		if(slot && slot->termination == termination) {
+			return slot;
+		}
+	}
+	return NULL;
+}
+
+static int mrcp_client_audio_media_find_by_mid(const mrcp_session_descriptor_t *descriptor, apr_size_t mid)
+{
+	int i;
+	mpf_rtp_media_descriptor_t *media;
+	for(i=0; iaudio_media_arr->nelts; i++) {
+		media = ((mpf_rtp_media_descriptor_t**)descriptor->audio_media_arr->elts)[i];
+		if(media->mid == mid) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+static mrcp_channel_t* mrcp_client_channel_termination_find(mrcp_client_session_t *session, mpf_termination_t *termination)
+{
+	int i;
+	mrcp_channel_t *channel;
+	for(i=0; ichannels->nelts; i++) {
+		channel = ((mrcp_channel_t**)session->channels->elts)[i];
+		if(!channel) continue;
+
+		if(channel->termination == termination) {
+			return channel;
+		}
+	}
+	return NULL;
+}
+
+static mrcp_channel_t* mrcp_client_channel_find_by_name(mrcp_client_session_t *session, const apt_str_t *resource_name)
+{
+	int i;
+	mrcp_channel_t *channel;
+	for(i=0; ichannels->nelts; i++) {
+		channel = ((mrcp_channel_t**)session->channels->elts)[i];
+		if(!channel) continue;
+
+		if(apt_string_compare(channel->resource_name,resource_name) == TRUE) {
+			return channel;
+		}
+	}
+	return NULL;
+}
+
+static apt_bool_t mrcp_client_message_send(mrcp_client_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	if(!session->base.id.length) {
+		mrcp_message_t *response = mrcp_response_create(message,message->pool);
+		response->start_line.status_code = MRCP_STATUS_CODE_METHOD_FAILED;
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Raise App Failure MRCP Response "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+		mrcp_app_control_message_raise(session,channel,response);
+		return TRUE;
+	}
+
+	message->channel_id.session_id = session->base.id;
+	message->start_line.request_id = ++session->base.last_request_id;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send MRCP Request "APT_PTRSIDRES_FMT" [%d]",
+					MRCP_SESSION_PTRSID(&session->base),
+					channel->resource_name->buf,
+					message->start_line.request_id);
+
+	if(channel->control_channel) {
+		/* MRCPv2 */
+		mrcp_client_control_message_send(channel->control_channel,message);
+	}
+	else {
+		/* MRCPv1 */
+		mrcp_session_control_request(channel->session,message);
+	}
+
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_channel_modify(mrcp_client_session_t *session, mrcp_channel_t *channel, apt_bool_t enable)
+{
+	int index;
+	if(!session->offer) {
+		return FALSE;
+	}
+	if(!channel->resource_name) {
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Modify Control Channel "APT_PTRSIDRES_FMT" [%d]",
+					MRCP_SESSION_PTRSID(&session->base),
+					channel->resource_name->buf,
+					enable);
+	if(mrcp_client_channel_find(session,channel,&index) == TRUE) {
+		mrcp_control_descriptor_t *control_media = mrcp_session_control_media_get(session->offer,(apr_size_t)index);
+		if(control_media) {
+			control_media->port = (enable == TRUE) ? 9 : 0;
+			if(channel->termination && channel->termination->audio_stream) {
+				int i = mrcp_client_audio_media_find_by_mid(session->offer,control_media->cmid);
+				if(i >= 0) {
+					mpf_stream_mode_e mode = mpf_stream_mode_negotiate(channel->termination->audio_stream->mode);
+					mpf_rtp_media_descriptor_t *audio_media = mrcp_session_audio_media_get(session->offer,(apr_size_t)i);
+					if(audio_media) {
+						if(enable == TRUE) {
+							audio_media->mode |= mode;
+						}
+						else {
+							audio_media->mode &= ~mode;
+						}
+						audio_media->base.state = (audio_media->mode != STREAM_MODE_NONE) ? MPF_MEDIA_ENABLED : MPF_MEDIA_DISABLED;
+					}
+				}
+			}
+		}
+	}
+
+	session->offer->resource_name = *channel->resource_name;
+	session->offer->resource_state = enable;
+	return mrcp_client_session_offer_send(session);
+}
+
+static apt_bool_t mrcp_client_channel_add(mrcp_client_session_t *session, mrcp_channel_t *channel)
+{
+	mrcp_channel_t **channel_slot;
+	mrcp_control_descriptor_t *control_media;
+	mpf_rtp_termination_descriptor_t *rtp_descriptor = NULL;
+	rtp_termination_slot_t *termination_slot;
+	apr_pool_t *pool = session->base.pool;
+	mrcp_profile_t *profile = session->profile;
+	if(mrcp_client_channel_find(session,channel,NULL) == TRUE) {
+		/* update */
+		return mrcp_client_channel_modify(session,channel,TRUE);
+	}
+
+	if(!session->offer) {
+		session->offer = mrcp_session_descriptor_create(pool);
+		session->context = mpf_context_create(session,5,pool);
+	}
+	if(!channel->resource) {
+		channel->resource = mrcp_resource_get(profile->resource_factory,channel->resource_id);
+		if(!channel->resource) {
+			return FALSE;
+		}
+		channel->resource_name = mrcp_resource_name_get(profile->resource_factory,channel->resource_id);
+		if(!channel->resource_name) {
+			return FALSE;
+		}
+	}
+	if(session->base.signaling_agent->mrcp_version == MRCP_VERSION_1) {
+		session->offer->resource_name = *channel->resource_name;
+		session->offer->resource_state = TRUE;
+	}
+	else {
+		if(!channel->control_channel) {
+			channel->control_channel = mrcp_client_control_channel_create(profile->connection_agent,channel,pool);
+		}
+		control_media = mrcp_control_offer_create(pool);
+		control_media->id = mrcp_session_control_media_add(session->offer,control_media);
+		control_media->cmid = session->offer->control_media_arr->nelts;
+		control_media->resource_name = *channel->resource_name;
+		if(mrcp_client_control_channel_add(channel->control_channel,control_media) == TRUE) {
+			channel->waiting_for_channel = TRUE;
+			session->offer_flag_count++;
+		}
+	}
+
+	/* add to channel array */
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Add Control Channel "APT_PTRSIDRES_FMT,
+					MRCP_SESSION_PTRSID(&session->base),
+					channel->resource_name->buf);
+	channel_slot = apr_array_push(session->channels);
+	*channel_slot = channel;
+
+	if(channel->termination) {
+		if(mrcp_client_mpf_request_send(profile->media_engine,MPF_COMMAND_ADD,session->context,channel->termination,NULL) == TRUE) {
+			channel->waiting_for_termination = TRUE;
+			session->offer_flag_count++;
+		}
+	}
+
+	if(channel->rtp_termination_slot) {
+		rtp_descriptor = channel->rtp_termination_slot->descriptor;
+	}	
+	/* add to rtp termination array */
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Add RTP Termination "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+	termination_slot = apr_array_push(session->terminations);
+	termination_slot->waiting = FALSE;
+	termination_slot->termination = NULL;
+	termination_slot->descriptor = NULL;
+	if(rtp_descriptor) {
+		if(rtp_descriptor->audio.local) {
+			session->offer->ip = rtp_descriptor->audio.local->base.ip;
+			session->offer->ext_ip = rtp_descriptor->audio.local->base.ext_ip;
+			rtp_descriptor->audio.local->base.id = mrcp_session_audio_media_add(session->offer,rtp_descriptor->audio.local);
+			rtp_descriptor->audio.local->mid = session->offer->audio_media_arr->nelts;
+		}
+	}
+	else {
+		/* create rtp termination */
+		mpf_termination_t *termination = mpf_termination_create(profile->rtp_termination_factory,session,session->base.pool);
+		termination_slot->termination = termination;
+
+		/* initialize rtp descriptor */
+		rtp_descriptor = apr_palloc(pool,sizeof(mpf_rtp_termination_descriptor_t));
+		mpf_rtp_termination_descriptor_init(rtp_descriptor);
+		if(channel->termination && channel->termination->audio_stream) {
+			mpf_rtp_media_descriptor_t *media;
+			media = apr_palloc(pool,sizeof(mpf_rtp_media_descriptor_t));
+			mpf_rtp_media_descriptor_init(media);
+			media->base.state = MPF_MEDIA_ENABLED;
+			media->mode = mpf_stream_mode_negotiate(channel->termination->audio_stream->mode);
+			rtp_descriptor->audio.local = media;
+		}
+		/* send add termination request (add to media context) */
+		if(mrcp_client_mpf_request_send(profile->media_engine,MPF_COMMAND_ADD,session->context,termination,rtp_descriptor) == TRUE) {
+			termination_slot->waiting = TRUE;
+			session->offer_flag_count++;
+		}
+	}
+	termination_slot->descriptor = rtp_descriptor;
+	channel->rtp_termination_slot = termination_slot;
+
+	if(!session->offer_flag_count) {
+		/* send offer to server */
+		mrcp_client_session_offer_send(session);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_session_update(mrcp_client_session_t *session)
+{
+	if(!session->offer) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Update Session "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+	return mrcp_client_session_offer_send(session);
+}
+
+static apt_bool_t mrcp_client_session_terminate(mrcp_client_session_t *session)
+{
+	mrcp_profile_t *profile;
+	mrcp_channel_t *channel;
+	rtp_termination_slot_t *slot;
+	int i;
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Terminate Session "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+	profile = session->profile;
+	/* remove existing control channels */
+	for(i=0; ichannels->nelts; i++) {
+		/* get existing channel */
+		channel = *((mrcp_channel_t**)session->channels->elts + i);
+		if(!channel) continue;
+
+		if(channel->control_channel) {
+			/* remove channel */
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Remove Control Channel "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+			if(mrcp_client_control_channel_remove(channel->control_channel) == TRUE) {
+				channel->waiting_for_channel = TRUE;
+				session->terminate_flag_count++;
+			}
+		}
+
+		if(channel->termination) {		
+			/* send subtract termination request */
+			if(channel->termination) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Subtract Channel Termination "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+				if(mrcp_client_mpf_request_send(profile->media_engine,MPF_COMMAND_SUBTRACT,session->context,channel->termination,NULL) == TRUE) {
+					channel->waiting_for_termination = TRUE;
+					session->terminate_flag_count++;
+				}
+			}
+		}
+	}
+
+	/* subtract existing terminations */
+	for(i=0; iterminations->nelts; i++) {
+		/* get existing termination */
+		slot = &((rtp_termination_slot_t*)session->terminations->elts)[i];
+		if(!slot || !slot->termination) continue;
+
+		/* send subtract termination request */
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Subtract Termination "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+		if(mrcp_client_mpf_request_send(profile->media_engine,MPF_COMMAND_SUBTRACT,session->context,slot->termination,NULL) == TRUE) {
+			slot->waiting = TRUE;
+			session->terminate_flag_count++;
+		}
+	}
+
+	session->terminate_flag_count++;
+	mrcp_session_terminate_request(&session->base);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_resource_discover(mrcp_client_session_t *session)
+{
+	mrcp_session_descriptor_t *descriptor = NULL;
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send Resource Discovery Request "APT_PTR_FMT, MRCP_SESSION_PTR(&session->base));
+	session->answer = NULL;
+	if(session->base.signaling_agent->mrcp_version == MRCP_VERSION_1) {
+		const apt_str_t *resource_name;
+		mrcp_resource_id i;
+
+		for(i=0; iprofile->resource_factory,i);
+			if(!resource_name) continue;
+		
+			descriptor = mrcp_session_descriptor_create(session->base.pool);
+			apt_string_copy(&descriptor->resource_name,resource_name,session->base.pool);
+			if(mrcp_session_discover_request(&session->base,descriptor) == TRUE) {
+				session->answer_flag_count++;
+			}
+		}
+	}
+	else {
+		if(mrcp_session_discover_request(&session->base,descriptor) == TRUE) {
+			session->answer_flag_count++;
+		}
+	}
+
+	if(session->answer_flag_count == 0) {
+		mrcp_app_sig_response_raise(session,MRCP_SIG_STATUS_CODE_FAILURE,TRUE);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_on_termination_add(mrcp_client_session_t *session, mpf_message_t *mpf_message)
+{
+	rtp_termination_slot_t *termination_slot;
+	if(!session) {
+		return FALSE;
+	}
+	termination_slot = mrcp_client_rtp_termination_find(session,mpf_message->termination);
+	if(termination_slot) {
+		/* rtp termination */
+		mpf_rtp_termination_descriptor_t *rtp_descriptor;
+		if(termination_slot->waiting == FALSE) {
+			return FALSE;
+		}
+		termination_slot->waiting = FALSE;
+		rtp_descriptor = mpf_message->descriptor;
+		if(rtp_descriptor->audio.local) {
+			session->offer->ip = rtp_descriptor->audio.local->base.ip;
+			session->offer->ext_ip = rtp_descriptor->audio.local->base.ext_ip;
+			rtp_descriptor->audio.local->base.id = mrcp_session_audio_media_add(session->offer,rtp_descriptor->audio.local);
+			rtp_descriptor->audio.local->mid = session->offer->audio_media_arr->nelts;
+		}
+		if(session->offer_flag_count) {
+			session->offer_flag_count--;
+			if(!session->offer_flag_count) {
+				/* send offer to server */
+				mrcp_client_session_offer_send(session);
+			}
+		}
+	}
+	else {
+		/* channel termination */
+		mrcp_channel_t *channel = mrcp_client_channel_termination_find(session,mpf_message->termination);
+		if(channel && channel->waiting_for_termination == TRUE) {
+			channel->waiting_for_termination = FALSE;
+			if(session->offer_flag_count) {
+				session->offer_flag_count--;
+				if(!session->offer_flag_count) {
+					/* send offer to server */
+					mrcp_client_session_offer_send(session);
+				}
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_on_termination_modify(mrcp_client_session_t *session, mpf_message_t *mpf_message)
+{
+	rtp_termination_slot_t *termination_slot;
+	if(!session) {
+		return FALSE;
+	}
+	termination_slot = mrcp_client_rtp_termination_find(session,mpf_message->termination);
+	if(termination_slot) {
+		/* rtp termination */
+		if(termination_slot->waiting == FALSE) {
+			return FALSE;
+		}
+		termination_slot->waiting = FALSE;
+		termination_slot->descriptor = mpf_message->descriptor;;
+
+		if(session->offer_flag_count) {
+			session->offer_flag_count--;
+			if(!session->offer_flag_count) {
+				/* send offer to server */
+				mrcp_client_session_offer_send(session);
+			}
+		}
+		if(session->answer_flag_count) {
+			session->answer_flag_count--;
+			if(!session->answer_flag_count) {
+				/* raise app response */
+				mrcp_app_sig_response_raise(session,MRCP_SIG_STATUS_CODE_SUCCESS,TRUE);
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_on_termination_subtract(mrcp_client_session_t *session, mpf_message_t *mpf_message)
+{
+	rtp_termination_slot_t *termination_slot;
+	if(!session) {
+		return FALSE;
+	}
+	termination_slot = mrcp_client_rtp_termination_find(session,mpf_message->termination);
+	if(termination_slot) {
+		/* rtp termination */
+		if(termination_slot->waiting == FALSE) {
+			return FALSE;
+		}
+		termination_slot->waiting = FALSE;
+		if(session->terminate_flag_count) {
+			session->terminate_flag_count--;
+			if(!session->terminate_flag_count) {
+				mrcp_app_session_terminate_raise(session,MRCP_SIG_STATUS_CODE_SUCCESS);
+			}
+		}
+	}
+	else {
+		/* channel termination */
+		mrcp_channel_t *channel = mrcp_client_channel_termination_find(session,mpf_message->termination);
+		if(channel && channel->waiting_for_termination == TRUE) {
+			channel->waiting_for_termination = FALSE;
+			if(session->terminate_flag_count) {
+				session->terminate_flag_count--;
+				if(!session->terminate_flag_count) {
+					/* raise app response */
+					mrcp_app_sig_response_raise(session,MRCP_SIG_STATUS_CODE_SUCCESS,TRUE);
+				}
+			}
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_client_mpf_message_process(mpf_message_t *mpf_message)
+{
+	mrcp_client_session_t *session = NULL;
+	if(mpf_message->context) {
+		session = mpf_context_object_get(mpf_message->context);
+	}
+	if(!session) {
+		return FALSE;
+	}
+	if(mpf_message->message_type == MPF_MESSAGE_TYPE_RESPONSE) {
+		switch(mpf_message->command_id) {
+			case MPF_COMMAND_ADD:
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Termination Add "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+				mrcp_client_on_termination_add(session,mpf_message);
+				break;
+			case MPF_COMMAND_MODIFY:
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Termination Modify "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+				mrcp_client_on_termination_modify(session,mpf_message);
+				break;
+			case MPF_COMMAND_SUBTRACT:
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Termination Subtract "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+				mrcp_client_on_termination_subtract(session,mpf_message);
+				break;
+			default:
+				break;
+		}
+	}
+	else if(mpf_message->message_type == MPF_MESSAGE_TYPE_EVENT) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process MPF Event "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_resource_answer_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	apt_bool_t status = TRUE;
+	if(session->offer->resource_state == TRUE) {
+		if(descriptor->resource_state == TRUE) {
+			mrcp_client_av_media_answer_process(session,descriptor);
+		}
+		else {
+			status = FALSE;
+		}
+	}
+	return status;
+}
+
+static apt_bool_t mrcp_client_control_media_answer_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	mrcp_channel_t *channel;
+	mrcp_control_descriptor_t *control_descriptor;
+	int i;
+	int count = session->channels->nelts;
+	if(count != descriptor->control_media_arr->nelts) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Number of control channels [%d] != Number of control media in answer [%d]",
+			count,descriptor->control_media_arr->nelts);
+		count = descriptor->control_media_arr->nelts;
+	}
+
+	if(!session->base.id.length) {
+		/* initial answer received, store session id and add to session's table */
+		control_descriptor = mrcp_session_control_media_get(descriptor,0);
+		if(control_descriptor) {
+			session->base.id = control_descriptor->session_id;
+		}
+	}
+
+	/* update existing control channels */
+	for(i=0; ichannels->elts + i);
+		if(!channel) continue;
+
+		/* get control descriptor */
+		control_descriptor = mrcp_session_control_media_get(descriptor,i);
+		/* modify channel */
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Modify Control Channel "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+		if(mrcp_client_control_channel_modify(channel->control_channel,control_descriptor) == TRUE) {
+			channel->waiting_for_channel = TRUE;
+			session->answer_flag_count++;
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_av_media_answer_process(mrcp_client_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	rtp_termination_slot_t *slot;
+	int i;
+	int count = session->terminations->nelts;
+	if(count != descriptor->audio_media_arr->nelts) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Number of terminations [%d] != Number of audio media in answer [%d]",
+			count,descriptor->audio_media_arr->nelts);
+		count = descriptor->audio_media_arr->nelts;
+	}
+	
+	/* update existing terminations */
+	for(i=0; iterminations->elts)[i];
+		if(!slot) continue;
+
+		remote_media = mrcp_session_audio_media_get(descriptor,i);
+		if(slot->descriptor) {
+			slot->descriptor->audio.remote = remote_media;
+		}
+		if(slot->termination) {
+			/* construct termination descriptor */
+			rtp_descriptor = apr_palloc(session->base.pool,sizeof(mpf_rtp_termination_descriptor_t));
+			mpf_rtp_termination_descriptor_init(rtp_descriptor);
+			rtp_descriptor->audio.local = NULL;
+			rtp_descriptor->audio.remote = remote_media;
+
+			/* send modify termination request */
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Modify Termination "APT_PTRSID_FMT, MRCP_SESSION_PTRSID(&session->base));
+			if(mrcp_client_mpf_request_send(session->profile->media_engine,MPF_COMMAND_MODIFY,session->context,slot->termination,rtp_descriptor) == TRUE) {
+				slot->waiting = TRUE;
+				session->answer_flag_count++;
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_app_request_dispatch(mrcp_client_session_t *session, const mrcp_app_message_t *app_message)
+{
+	if(session->registered == FALSE) {
+		session->base.signaling_agent = session->profile->signaling_agent;
+		session->base.signaling_agent->create_client_session(&session->base);
+
+		mrcp_client_session_add(session->application->client,session);
+		session->registered = TRUE;
+	}
+	switch(app_message->message_type) {
+		case MRCP_APP_MESSAGE_TYPE_SIGNALING:
+		{
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Dispatch Application Request "APT_PTRSID_FMT" [%d]",
+				MRCP_SESSION_PTRSID(&session->base),
+				app_message->sig_message.command_id);
+			switch(app_message->sig_message.command_id) {
+				case MRCP_SIG_COMMAND_SESSION_UPDATE:
+					mrcp_client_session_update(session);
+					break;
+				case MRCP_SIG_COMMAND_SESSION_TERMINATE:
+					mrcp_client_session_terminate(session);
+					break;
+				case MRCP_SIG_COMMAND_CHANNEL_ADD:
+					mrcp_client_channel_add(session,app_message->channel);
+					break;
+				case MRCP_SIG_COMMAND_CHANNEL_REMOVE:
+					mrcp_client_channel_modify(session,app_message->channel,FALSE);
+					break;
+				case MRCP_SIG_COMMAND_RESOURCE_DISCOVER:
+					mrcp_client_resource_discover(session);
+					break;
+				default:
+					break;
+			}
+			break;
+		}
+		case MRCP_APP_MESSAGE_TYPE_CONTROL:
+		{
+			mrcp_client_message_send(session,app_message->channel,app_message->control_message);
+			break;
+		}
+	}
+	return TRUE;
+}
+
+/** Dispatch application message */
+MRCP_DECLARE(apt_bool_t) mrcp_application_message_dispatch(const mrcp_app_message_dispatcher_t *dispatcher, const mrcp_app_message_t *app_message)
+{
+	apt_bool_t status = FALSE;
+	switch(app_message->message_type) {
+		case MRCP_APP_MESSAGE_TYPE_SIGNALING:
+		{
+			if(app_message->sig_message.message_type == MRCP_SIG_MESSAGE_TYPE_RESPONSE) {
+				switch(app_message->sig_message.command_id) {
+					case MRCP_SIG_COMMAND_SESSION_UPDATE:
+						if(dispatcher->on_session_update) {
+							status = dispatcher->on_session_update(
+										app_message->application,
+										app_message->session,
+										app_message->sig_message.status);
+						}
+						break;
+					case MRCP_SIG_COMMAND_SESSION_TERMINATE:
+						if(dispatcher->on_session_terminate) {
+							status = dispatcher->on_session_terminate(
+										app_message->application,
+										app_message->session,
+										app_message->sig_message.status);
+						}
+						break;
+					case MRCP_SIG_COMMAND_CHANNEL_ADD:
+						if(dispatcher->on_channel_add) {
+							status = dispatcher->on_channel_add(
+										app_message->application,
+										app_message->session,
+										app_message->channel,
+										app_message->sig_message.status);
+						}
+						break;
+					case MRCP_SIG_COMMAND_CHANNEL_REMOVE:
+						if(dispatcher->on_channel_remove) {
+							status = dispatcher->on_channel_remove(
+										app_message->application,
+										app_message->session,
+										app_message->channel,
+										app_message->sig_message.status);
+						}
+						break;
+					case MRCP_SIG_COMMAND_RESOURCE_DISCOVER:
+						if(dispatcher->on_resource_discover) {
+							status = dispatcher->on_resource_discover(
+										app_message->application,
+										app_message->session,
+										app_message->descriptor,
+										app_message->sig_message.status);
+						}
+						break;
+					default:
+						break;
+				}
+			}
+			else if(app_message->sig_message.message_type == MRCP_SIG_MESSAGE_TYPE_EVENT) {
+				switch(app_message->sig_message.event_id) {
+					case MRCP_SIG_EVENT_READY:
+						if(dispatcher->on_ready) {
+							status = dispatcher->on_ready(
+										app_message->application,
+										app_message->sig_message.status);
+						}
+						break;
+					case MRCP_SIG_EVENT_TERMINATE:
+						if(dispatcher->on_terminate_event) {
+							status = dispatcher->on_terminate_event(
+										app_message->application,
+										app_message->session,
+										app_message->channel);
+						}
+						break;
+					default:
+						break;
+				}
+			}
+			break;
+		}
+		case MRCP_APP_MESSAGE_TYPE_CONTROL:
+		{
+			if(dispatcher->on_message_receive) {
+				status = dispatcher->on_message_receive(
+										app_message->application,
+										app_message->session,
+										app_message->channel,
+										app_message->control_message);
+			}
+			break;
+		}
+	}
+	return status;
+}
+
+static apt_bool_t mrcp_client_mpf_request_send(
+						mpf_engine_t *engine, 
+						mpf_command_type_e command_id,
+						mpf_context_t *context, 
+						mpf_termination_t *termination, 
+						void *descriptor)
+{
+	apt_task_t *media_task;
+	apt_task_msg_t *msg;
+	mpf_message_t *mpf_message;
+	if(!engine) {
+		return FALSE;
+	}
+	media_task = mpf_task_get(engine);
+	msg = apt_task_msg_get(media_task);
+	msg->type = TASK_MSG_USER;
+	mpf_message = (mpf_message_t*) msg->data;
+
+	mpf_message->message_type = MPF_MESSAGE_TYPE_REQUEST;
+	mpf_message->command_id = command_id;
+	mpf_message->context = context;
+	mpf_message->termination = termination;
+	mpf_message->descriptor = descriptor;
+	return apt_task_msg_signal(media_task,msg);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,17 @@
+MAINTAINERCLEANFILES 	    = Makefile.in
+
+INCLUDES                    = -I$(top_srcdir)/libs/mrcp-engine/include \
+                              -I$(top_srcdir)/libs/mrcp/include \
+                              -I$(top_srcdir)/libs/mrcp/message/include \
+                              -I$(top_srcdir)/libs/mrcp/control/include \
+                              -I$(top_srcdir)/libs/mrcp/resources/include \
+                              -I$(top_srcdir)/libs/mpf/include \
+                              -I$(top_srcdir)/libs/apr-toolkit/include \
+                              $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES          = libmrcpengine.la
+
+include_HEADERS             = include/mrcp_resource_plugin.h \
+                              include/mrcp_resource_engine.h
+
+libmrcpengine_la_SOURCES    = src/mrcp_resource_engine.c

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/include/mrcp_resource_engine.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/include/mrcp_resource_engine.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_RESOURCE_ENGINE_H__
+#define __MRCP_RESOURCE_ENGINE_H__
+
+/**
+ * @file mrcp_resource_engine.h
+ * @brief MRCP Resource Engine Interface
+ */ 
+
+#include "mrcp_types.h"
+#include "mpf_termination.h"
+#include "mpf_stream.h"
+#include "mrcp_resource_plugin.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP resource engine vtable declaration */
+typedef struct mrcp_engine_method_vtable_t mrcp_engine_method_vtable_t;
+/** MRCP engine channel declaration */
+typedef struct mrcp_engine_channel_t mrcp_engine_channel_t;
+/** MRCP engine channel virtual method table declaration */
+typedef struct mrcp_engine_channel_method_vtable_t mrcp_engine_channel_method_vtable_t;
+/** MRCP engine channel virtual event table declaration */
+typedef struct mrcp_engine_channel_event_vtable_t mrcp_engine_channel_event_vtable_t;
+
+/** Table of channel virtual methods */
+struct mrcp_engine_channel_method_vtable_t {
+	/** Virtual destroy */
+	apt_bool_t (*destroy)(mrcp_engine_channel_t *channel);
+	/** Virtual open */
+	apt_bool_t (*open)(mrcp_engine_channel_t *channel);
+	/** Virtual close */
+	apt_bool_t (*close)(mrcp_engine_channel_t *channel);
+	/** Virtual process_request */
+	apt_bool_t (*process_request)(mrcp_engine_channel_t *channel, mrcp_message_t *request);
+};
+
+/** Table of channel virtual event handlers */
+struct mrcp_engine_channel_event_vtable_t {
+	/** Open event handler */
+	apt_bool_t (*on_open)(mrcp_engine_channel_t *channel, apt_bool_t status);
+	/** Close event handler */
+	apt_bool_t (*on_close)(mrcp_engine_channel_t *channel);
+	/** Message event handler */
+	apt_bool_t (*on_message)(mrcp_engine_channel_t *channel, mrcp_message_t *message);
+};
+
+/** MRCP engine channel declaration */
+struct mrcp_engine_channel_t {
+	/** Table of virtual methods */
+	const mrcp_engine_channel_method_vtable_t *method_vtable;
+	/** External object used with virtual methods */
+	void                                      *method_obj;
+	/** Table of virtual event handlers */
+	const mrcp_engine_channel_event_vtable_t  *event_vtable;
+	/** External object used with event handlers */
+	void                                      *event_obj;
+	/** Media termination */
+	mpf_termination_t                         *termination;
+	/** Back pointer to resource engine */
+	mrcp_resource_engine_t                    *engine;
+	/** Pool to allocate memory from */
+	apr_pool_t                                *pool;
+};
+
+/** Table of MRCP engine virtual methods */
+struct mrcp_engine_method_vtable_t {
+	/** Virtual destroy */
+	apt_bool_t (*destroy)(mrcp_resource_engine_t *engine);
+	/** Virtual open */
+	apt_bool_t (*open)(mrcp_resource_engine_t *engine);
+	/** Virtual close */
+	apt_bool_t (*close)(mrcp_resource_engine_t *engine);
+	/** Virtual channel create */
+	mrcp_engine_channel_t* (*create_channel)(mrcp_resource_engine_t *engine, apr_pool_t *pool);
+};
+
+/** MRCP resource engine */
+struct mrcp_resource_engine_t {
+	/** Plugin version */
+	mrcp_plugin_version_t              plugin_version;
+	/** Resource identifier */
+	mrcp_resource_id                   resource_id;
+	/** External object associated with engine */
+	void                              *obj;
+	/** Table of virtual methods */
+	const mrcp_engine_method_vtable_t *method_vtable;
+	/** Codec manager */
+	const mpf_codec_manager_t         *codec_manager;
+	/** Dir layout structure */
+	const apt_dir_layout_t            *dir_layout;
+	/** Pool to allocate memory from */
+	apr_pool_t                        *pool;
+};
+
+/** Create resource engine */
+mrcp_resource_engine_t* mrcp_resource_engine_create(
+								mrcp_resource_id resource_id,
+								void *obj, 
+								const mrcp_engine_method_vtable_t *vtable,
+								apr_pool_t *pool);
+
+/** Destroy resource engine */
+static APR_INLINE apt_bool_t mrcp_resource_engine_destroy(mrcp_resource_engine_t *engine)
+{
+	return engine->method_vtable->destroy(engine);
+}
+
+/** Open resource engine */
+static APR_INLINE apt_bool_t mrcp_resource_engine_open(mrcp_resource_engine_t *engine)
+{
+	return engine->method_vtable->open(engine);
+}
+
+/** Close resource engine */
+static APR_INLINE apt_bool_t mrcp_resource_engine_close(mrcp_resource_engine_t *engine)
+{
+	return engine->method_vtable->close(engine);
+}
+
+/** Create engine channel */
+mrcp_engine_channel_t* mrcp_engine_channel_create(
+								mrcp_resource_engine_t *engine,
+								const mrcp_engine_channel_method_vtable_t *method_vtable,
+								void *method_obj,
+								mpf_termination_t *termination,
+								apr_pool_t *pool);
+
+/** Create engine channel and source media termination */
+mrcp_engine_channel_t* mrcp_engine_source_channel_create(
+								mrcp_resource_engine_t *engine,
+								const mrcp_engine_channel_method_vtable_t *channel_vtable,
+								const mpf_audio_stream_vtable_t *stream_vtable,
+								void *method_obj,
+								mpf_codec_descriptor_t *codec_descriptor,
+								apr_pool_t *pool);
+
+/** Create engine channel and sink media termination */
+mrcp_engine_channel_t* mrcp_engine_sink_channel_create(
+								mrcp_resource_engine_t *engine,
+								const mrcp_engine_channel_method_vtable_t *channel_vtable,
+								const mpf_audio_stream_vtable_t *stream_vtable,
+								void *method_obj,
+								mpf_codec_descriptor_t *codec_descriptor,
+								apr_pool_t *pool);
+
+/** Destroy engine channel */
+static APR_INLINE apt_bool_t mrcp_engine_channel_destroy(mrcp_engine_channel_t *channel)
+{
+	return channel->method_vtable->destroy(channel);
+}
+
+/** Open engine channel */
+static APR_INLINE apt_bool_t mrcp_engine_channel_open(mrcp_engine_channel_t *channel)
+{
+	return channel->method_vtable->open(channel);
+}
+
+/** Close engine channel */
+static APR_INLINE apt_bool_t mrcp_engine_channel_close(mrcp_engine_channel_t *channel)
+{
+	return channel->method_vtable->close(channel);
+}
+
+/** Process request */
+static APR_INLINE apt_bool_t mrcp_engine_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *message)
+{
+	return channel->method_vtable->process_request(channel,message);
+}
+
+/** Send channel open response */
+static APR_INLINE apt_bool_t mrcp_engine_channel_open_respond(mrcp_engine_channel_t *channel, apt_bool_t status)
+{
+	return channel->event_vtable->on_open(channel,status);
+}
+
+/** Send channel close response */
+static APR_INLINE apt_bool_t mrcp_engine_channel_close_respond(mrcp_engine_channel_t *channel)
+{
+	return channel->event_vtable->on_close(channel);
+}
+
+/** Send response/event message */
+static APR_INLINE apt_bool_t mrcp_engine_channel_message_send(mrcp_engine_channel_t *channel, mrcp_message_t *message)
+{
+	return channel->event_vtable->on_message(channel,message);
+}
+
+/** Get codec of the audio source stream */
+mpf_codec_t* mrcp_engine_source_stream_codec_get(mrcp_engine_channel_t *channel);
+
+/** Get codec of the audio sink stream */
+mpf_codec_t* mrcp_engine_sink_stream_codec_get(mrcp_engine_channel_t *channel);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_RESOURCE_ENGINE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/include/mrcp_resource_plugin.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/include/mrcp_resource_plugin.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_RESOURCE_PLUGIN_H__
+#define __MRCP_RESOURCE_PLUGIN_H__
+
+/**
+ * @file mrcp_resource_plugin.h
+ * @brief MRCP Resource Engine Plugin
+ */ 
+
+#include "apr_version.h"
+#include "apt_log.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Plugin export defines */
+#ifdef WIN32
+#define MRCP_PLUGIN_DECLARE(type) EXTERN_C __declspec(dllexport) type
+#else
+#define MRCP_PLUGIN_DECLARE(type) type
+#endif
+
+/** Symbol name of the main entry point in plugin DSO */
+#define MRCP_PLUGIN_ENGINE_SYM_NAME "mrcp_plugin_create"
+/** Symbol name of the log accessor entry point in plugin DSO */
+#define MRCP_PLUGIN_LOGGER_SYM_NAME "mrcp_plugin_logger_set"
+
+/** MRCP resource engine declaration */
+typedef struct mrcp_resource_engine_t mrcp_resource_engine_t;
+/** Prototype of resource engine creator (entry point of plugin DSO) */
+typedef mrcp_resource_engine_t* (*mrcp_plugin_creator_f)(apr_pool_t *pool);
+
+/** Prototype of resource engine creator (entry point of plugin DSO) */
+typedef apt_bool_t (*mrcp_plugin_log_accessor_f)(apt_logger_t *logger);
+
+/** Declare this macro in plugins to use log routine of the server */
+#define MRCP_PLUGIN_LOGGER_IMPLEMENT \
+	MRCP_PLUGIN_DECLARE(apt_bool_t) mrcp_plugin_logger_set(apt_logger_t *logger) \
+		{ return apt_log_instance_set(logger); }
+
+
+/** major version 
+ * Major API changes that could cause compatibility problems for older
+ * plugins such as structure size changes.  No binary compatibility is
+ * possible across a change in the major version.
+ */
+#define PLUGIN_MAJOR_VERSION   0
+
+/** minor version
+ * Minor API changes that do not cause binary compatibility problems.
+ * Reset to 0 when upgrading PLUGIN_MAJOR_VERSION
+ */
+#define PLUGIN_MINOR_VERSION   4
+
+/** patch level 
+ * The Patch Level never includes API changes, simply bug fixes.
+ * Reset to 0 when upgrading PLUGIN_MINOR_VERSION
+ */
+#define PLUGIN_PATCH_VERSION   0
+
+
+/**
+ * Check at compile time if the plugin version is at least a certain
+ * level.
+ */
+#define PLUGIN_VERSION_AT_LEAST(major,minor,patch)                    \
+(((major) < PLUGIN_MAJOR_VERSION)                                     \
+ || ((major) == PLUGIN_MAJOR_VERSION && (minor) < PLUGIN_MINOR_VERSION) \
+ || ((major) == PLUGIN_MAJOR_VERSION && (minor) == PLUGIN_MINOR_VERSION && (patch) <= PLUGIN_PATCH_VERSION))
+
+/** The formatted string of plugin's version */
+#define PLUGIN_VERSION_STRING \
+     APR_STRINGIFY(PLUGIN_MAJOR_VERSION) "." \
+     APR_STRINGIFY(PLUGIN_MINOR_VERSION) "." \
+     APR_STRINGIFY(PLUGIN_PATCH_VERSION)
+
+/** Plugin version */
+typedef apr_version_t mrcp_plugin_version_t;
+
+/** Get plugin version */
+static APR_INLINE void mrcp_plugin_version_get(mrcp_plugin_version_t *version)
+{
+	version->major = PLUGIN_MAJOR_VERSION;
+	version->minor = PLUGIN_MINOR_VERSION;
+	version->patch = PLUGIN_PATCH_VERSION;
+}
+
+/** Check plugin version */
+static APR_INLINE int mrcp_plugin_version_check(mrcp_plugin_version_t *version)
+{
+	return PLUGIN_VERSION_AT_LEAST(version->major,version->minor,version->patch);
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_RESOURCE_PLUGIN_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,153 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/src/mrcp_resource_engine.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/src/mrcp_resource_engine.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_resource_engine.h"
+#include "mpf_codec_manager.h"
+
+/** Create resource engine */
+mrcp_resource_engine_t* mrcp_resource_engine_create(
+								mrcp_resource_id resource_id,
+								void *obj, 
+								const mrcp_engine_method_vtable_t *vtable,
+								apr_pool_t *pool)
+{
+	mrcp_resource_engine_t *engine = apr_palloc(pool,sizeof(mrcp_resource_engine_t));
+	mrcp_plugin_version_get(&engine->plugin_version);
+	engine->resource_id = resource_id;
+	engine->obj = obj;
+	engine->method_vtable =vtable;
+	engine->codec_manager = NULL;
+	engine->dir_layout = NULL;
+	engine->pool = pool;
+	return engine;
+}
+
+/** Create engine channel */
+mrcp_engine_channel_t* mrcp_engine_channel_create(
+								mrcp_resource_engine_t *engine, 
+								const mrcp_engine_channel_method_vtable_t *method_vtable,
+								void *method_obj,
+								mpf_termination_t *termination,
+								apr_pool_t *pool)
+{
+	mrcp_engine_channel_t *channel = apr_palloc(pool,sizeof(mrcp_engine_channel_t));
+	channel->method_vtable = method_vtable;
+	channel->method_obj = method_obj;
+	channel->event_vtable = NULL;
+	channel->event_obj = NULL;
+	channel->termination = termination;
+	channel->engine = engine;
+	channel->pool = pool;
+	return channel;
+}
+
+/** Create engine channel and source media termination */
+mrcp_engine_channel_t* mrcp_engine_source_channel_create(
+								mrcp_resource_engine_t *engine,
+								const mrcp_engine_channel_method_vtable_t *channel_vtable,
+								const mpf_audio_stream_vtable_t *stream_vtable,
+								void *method_obj,
+								mpf_codec_descriptor_t *codec_descriptor,
+								apr_pool_t *pool)
+{
+	mpf_audio_stream_t *audio_stream;
+	mpf_termination_t *termination;
+	/* create audio stream */
+	audio_stream = mpf_audio_stream_create(
+			method_obj,           /* object to associate */
+			stream_vtable,        /* virtual methods table of audio stream */
+			STREAM_MODE_RECEIVE,  /* stream mode/direction */
+			pool);                /* pool to allocate memory from */
+
+	if(engine->codec_manager) {
+		audio_stream->rx_codec = mpf_codec_manager_codec_get(engine->codec_manager,codec_descriptor,pool);
+	}
+	
+	/* create media termination */
+	termination = mpf_raw_termination_create(
+			NULL,                 /* no object to associate */
+			audio_stream,         /* audio stream */
+			NULL,                 /* no video stream */
+			pool);                /* pool to allocate memory from */
+
+	/* create engine channel base */
+	return mrcp_engine_channel_create(
+			engine,          /* resource engine */
+			channel_vtable,  /* virtual methods table of engine channel */
+			method_obj,      /* object to associate */
+			termination,     /* media termination, used to terminate audio stream */
+			pool);           /* pool to allocate memory from */
+}
+
+/** Create engine channel and sink media termination */
+mrcp_engine_channel_t* mrcp_engine_sink_channel_create(
+								mrcp_resource_engine_t *engine,
+								const mrcp_engine_channel_method_vtable_t *channel_vtable,
+								const mpf_audio_stream_vtable_t *stream_vtable,
+								void *method_obj,
+								mpf_codec_descriptor_t *codec_descriptor,
+								apr_pool_t *pool)
+{
+	mpf_audio_stream_t *audio_stream;
+	mpf_termination_t *termination;
+
+	/* create audio stream */
+	audio_stream = mpf_audio_stream_create(
+			method_obj,             /* object to associate */
+			stream_vtable,          /* virtual methods table of audio stream */
+			STREAM_MODE_SEND,       /* stream mode/direction */
+			pool);                  /* pool to allocate memory from */
+	
+	if(engine->codec_manager) {
+		audio_stream->tx_codec = mpf_codec_manager_codec_get(engine->codec_manager,codec_descriptor,pool);
+	}
+	
+	/* create media termination */
+	termination = mpf_raw_termination_create(
+			NULL,            /* no object to associate */
+			audio_stream,    /* audio stream */
+			NULL,            /* no video stream */
+			pool);           /* pool to allocate memory from */
+
+	/* create engine channel base */
+	return mrcp_engine_channel_create(
+			engine,          /* resource engine */
+			channel_vtable,  /* virtual methods table of engine channel */
+			method_obj,      /* object to associate */
+			termination,     /* media termination, used to terminate audio stream */
+			pool);           /* pool to allocate memory from */
+}
+
+/** Get codec of the audio source stream */
+mpf_codec_t* mrcp_engine_source_stream_codec_get(mrcp_engine_channel_t *channel)
+{
+	if(channel && channel->termination && channel->termination->audio_stream) {
+		return channel->termination->audio_stream->rx_codec;
+	}
+	return NULL;
+}
+
+/** Get codec of the audio sink stream */
+mpf_codec_t* mrcp_engine_sink_stream_codec_get(mrcp_engine_channel_t *channel)
+{
+	if(channel && channel->termination && channel->termination->audio_stream) {
+		return channel->termination->audio_stream->tx_codec;
+	}
+	return NULL;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES 	    = Makefile.in
+
+INCLUDES                    = -I$(top_srcdir)/libs/mrcp-server/include \
+                              -I$(top_srcdir)/libs/mrcp-engine/include \
+                              -I$(top_srcdir)/libs/mrcp-signaling/include \
+                              -I$(top_srcdir)/libs/mrcpv2-transport/include \
+                              -I$(top_srcdir)/libs/mrcp/include \
+                              -I$(top_srcdir)/libs/mrcp/message/include \
+                              -I$(top_srcdir)/libs/mrcp/control/include \
+                              -I$(top_srcdir)/libs/mrcp/resources/include \
+                              -I$(top_srcdir)/libs/mpf/include \
+                              -I$(top_srcdir)/libs/apr-toolkit/include \
+                              $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES          = libmrcpserver.la
+
+include_HEADERS             = include/mrcp_server_types.h \
+                              include/mrcp_server.h \
+                              include/mrcp_server_session.h
+
+libmrcpserver_la_SOURCES    = src/mrcp_server.c \
+                              src/mrcp_server_session.c

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SERVER_H__
+#define __MRCP_SERVER_H__
+
+/**
+ * @file mrcp_server.h
+ * @brief MRCP Server
+ */ 
+
+#include "mrcp_server_types.h"
+#include "mrcp_resource_engine.h"
+#include "apt_task.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create MRCP server instance.
+ * @return the created server instance
+ */
+MRCP_DECLARE(mrcp_server_t*) mrcp_server_create(apt_dir_layout_t *dir_layout);
+
+/**
+ * Start message processing loop.
+ * @param server the MRCP server to start
+ * @return the created server instance
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_start(mrcp_server_t *server);
+
+/**
+ * Shutdown message processing loop.
+ * @param server the MRCP server to shutdown
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_shutdown(mrcp_server_t *server);
+
+/**
+ * Destroy MRCP server.
+ * @param server the MRCP server to destroy
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_destroy(mrcp_server_t *server);
+
+
+/**
+ * Register MRCP resource factory.
+ * @param server the MRCP server to set resource factory for
+ * @param resource_factory the resource factory to set
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_resource_factory_register(mrcp_server_t *server, mrcp_resource_factory_t *resource_factory);
+
+/**
+ * Register MRCP resource engine.
+ * @param server the MRCP server to set engine for
+ * @param engine the resource engine to set
+ * @param name the name of the resource engine
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_resource_engine_register(mrcp_server_t *server, mrcp_resource_engine_t *engine, const char *name);
+
+/**
+ * Register codec manager.
+ * @param server the MRCP server to set codec manager for
+ * @param codec_manager the codec manager to set
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_codec_manager_register(mrcp_server_t *server, mpf_codec_manager_t *codec_manager);
+
+/**
+ * Get registered codec manager.
+ * @param server the MRCP server to get codec manager from
+ */
+MRCP_DECLARE(const mpf_codec_manager_t*) mrcp_server_codec_manager_get(mrcp_server_t *server);
+
+/**
+ * Register media engine.
+ * @param server the MRCP server to set media engine for
+ * @param media_engine the media engine to set
+ * @param name the name of the media engine
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_media_engine_register(mrcp_server_t *server, mpf_engine_t *media_engine, const char *name);
+
+/**
+ * Register RTP termination factory.
+ * @param server the MRCP server to set termination factory for
+ * @param rtp_termination_factory the termination factory
+ * @param name the name of the factory
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_rtp_factory_register(mrcp_server_t *server, mpf_termination_factory_t *rtp_termination_factory, const char *name);
+
+/**
+ * Register MRCP signaling agent.
+ * @param server the MRCP server to set signaling agent for
+ * @param signaling_agent the signaling agent to set
+ * @param name the name of the agent
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_signaling_agent_register(mrcp_server_t *server, mrcp_sig_agent_t *signaling_agent, const char *name);
+
+/**
+ * Register MRCP connection agent (MRCPv2 only).
+ * @param server the MRCP server to set connection agent for
+ * @param connection_agent the connection agent to set
+ * @param name the name of the agent
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_connection_agent_register(mrcp_server_t *server, mrcp_connection_agent_t *connection_agent, const char *name);
+
+/** Create MRCP profile */
+MRCP_DECLARE(mrcp_profile_t*) mrcp_server_profile_create(
+									mrcp_resource_factory_t *resource_factory,
+									mrcp_sig_agent_t *signaling_agent,
+									mrcp_connection_agent_t *connection_agent,
+									mpf_engine_t *media_engine,
+									mpf_termination_factory_t *rtp_factory,
+									apr_pool_t *pool);
+
+/**
+ * Register MRCP profile.
+ * @param server the MRCP server to set profile for
+ * @param profile the profile to set
+ * @param plugin_map the map of resource engines (plugins)
+ * @param name the name of the profile
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_profile_register(
+									mrcp_server_t *server, 
+									mrcp_profile_t *profile,
+									apr_table_t *plugin_map,
+									const char *name);
+
+/**
+ * Register resource engine plugin.
+ * @param server the MRCP server to set engine for
+ * @param path the path to plugin
+ * @param name the name of the plugin
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_plugin_register(mrcp_server_t *server, const char *path, const char *name);
+
+/**
+ * Get memory pool.
+ * @param server the MRCP server to get memory pool from
+ */
+MRCP_DECLARE(apr_pool_t*) mrcp_server_memory_pool_get(mrcp_server_t *server);
+
+/**
+ * Get resource engine by name.
+ * @param server the MRCP server to get resource engine from
+ * @param name the name of the resource engine to lookup
+ */
+MRCP_DECLARE(mrcp_resource_engine_t*) mrcp_server_resource_engine_get(mrcp_server_t *server, const char *name);
+
+/**
+ * Get media engine by name.
+ * @param server the MRCP server to get media engine from
+ * @param name the name of the media engine to lookup
+ */
+MRCP_DECLARE(mpf_engine_t*) mrcp_server_media_engine_get(mrcp_server_t *server, const char *name);
+
+/**
+ * Get RTP termination factory by name.
+ * @param server the MRCP server to get from
+ * @param name the name to lookup
+ */
+MRCP_DECLARE(mpf_termination_factory_t*) mrcp_server_rtp_factory_get(mrcp_server_t *server, const char *name);
+
+/**
+ * Get signaling agent by name.
+ * @param server the MRCP server to get from
+ * @param name the name to lookup
+ */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_server_signaling_agent_get(mrcp_server_t *server, const char *name);
+
+/**
+ * Get connection agent by name.
+ * @param server the MRCP server to get from
+ * @param name the name to lookup
+ */
+MRCP_DECLARE(mrcp_connection_agent_t*) mrcp_server_connection_agent_get(mrcp_server_t *server, const char *name);
+
+/**
+ * Get profile by name.
+ * @param server the MRCP client to get from
+ * @param name the name to lookup
+ */
+MRCP_DECLARE(mrcp_profile_t*) mrcp_server_profile_get(mrcp_server_t *server, const char *name);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SERVER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server_session.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server_session.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SERVER_SESSION_H__
+#define __MRCP_SERVER_SESSION_H__
+
+/**
+ * @file mrcp_server_session.h
+ * @brief MRCP Server Session
+ */ 
+
+#include 
+#include "mrcp_session.h"
+#include "mpf_message.h"
+#include "apt_task.h"
+#include "apt_obj_list.h"
+
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque MRCP channel declaration */
+typedef struct mrcp_channel_t mrcp_channel_t;
+/** MRCP server session declaration */
+typedef struct mrcp_server_session_t mrcp_server_session_t;
+/** MRCP signaling message declaration */
+typedef struct mrcp_signaling_message_t mrcp_signaling_message_t;
+
+/** Enumeration of signaling task messages */
+typedef enum {
+	SIGNALING_MESSAGE_OFFER,
+	SIGNALING_MESSAGE_CONTROL,
+	SIGNALING_MESSAGE_TERMINATE,
+} mrcp_signaling_message_type_e;
+
+/** MRCP signaling message */
+struct mrcp_signaling_message_t {
+	/** Signaling message type */
+	mrcp_signaling_message_type_e type;
+
+	/** Session */
+	mrcp_server_session_t        *session;
+	/** Descriptor */
+	mrcp_session_descriptor_t    *descriptor;
+
+	/** Channel */
+	mrcp_channel_t               *channel;
+	/** MRCP message */
+	mrcp_message_t               *message;
+};
+
+
+/** MRCP server session */
+struct mrcp_server_session_t {
+	/** Session base */
+	mrcp_session_t             base;
+	/** MRCP server */
+	mrcp_server_t             *server;
+	/** MRCP profile */
+	mrcp_profile_t            *profile;
+
+	/** Media context */
+	mpf_context_t             *context;
+
+	/** Media termination array */
+	apr_array_header_t        *terminations;
+	/** MRCP control channel array */
+	apr_array_header_t        *channels;
+
+	/** In-progress signaling request */
+	mrcp_signaling_message_t  *active_request;
+	/** Signaling request queue */
+	apt_obj_list_t            *request_queue;
+
+	/** In-progress offer */
+	mrcp_session_descriptor_t *offer;
+	/** In-progres answer */
+	mrcp_session_descriptor_t *answer;
+
+	/** Number of in-progress answer requests (flags) */
+	apr_size_t                 answer_flag_count;
+	/** Number of in-progress terminate requests (flags) */
+	apr_size_t                 terminate_flag_count;
+};
+
+/** MRCP profile */
+struct mrcp_profile_t {
+	/** Table of resource engines (mrcp_resource_engine_t*) */
+	apr_hash_t                *engine_table;
+	/** MRCP resource factory */
+	mrcp_resource_factory_t   *resource_factory;
+	/** Media processing engine */
+	mpf_engine_t              *media_engine;
+	/** RTP termination factory */
+	mpf_termination_factory_t *rtp_termination_factory;
+	/** Signaling agent */
+	mrcp_sig_agent_t          *signaling_agent;
+	/** Connection agent */
+	mrcp_connection_agent_t   *connection_agent;
+};
+
+/** Create server session */
+mrcp_server_session_t* mrcp_server_session_create();
+
+/** Process signaling message */
+apt_bool_t mrcp_server_signaling_message_process(mrcp_signaling_message_t *signaling_message);
+/** Process MPF message */
+apt_bool_t mrcp_server_mpf_message_process(mpf_message_t *mpf_message);
+
+/** Process channel modify event */
+apt_bool_t mrcp_server_on_channel_modify(mrcp_channel_t *channel, mrcp_control_descriptor_t *answer, apt_bool_t status);
+/** Process channel remove event */
+apt_bool_t mrcp_server_on_channel_remove(mrcp_channel_t *channel, apt_bool_t status);
+/** Process channel message receive */
+apt_bool_t mrcp_server_on_channel_message(mrcp_channel_t *channel, mrcp_message_t *message);
+
+/** Process channel open event */
+apt_bool_t mrcp_server_on_engine_channel_open(mrcp_channel_t *channel, apt_bool_t status);
+/** Process channel close event */
+apt_bool_t mrcp_server_on_engine_channel_close(mrcp_channel_t *channel);
+/** Process message receive event */
+apt_bool_t mrcp_server_on_engine_channel_message(mrcp_channel_t *channel, mrcp_message_t *message);
+
+/** Get session by channel */
+mrcp_session_t* mrcp_server_channel_session_get(mrcp_channel_t *channel);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SERVER_SESSION_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server_types.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/include/mrcp_server_types.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SERVER_TYPES_H__
+#define __MRCP_SERVER_TYPES_H__
+
+/**
+ * @file mrcp_server_types.h
+ * @brief MRCP Server Types
+ */ 
+
+#include "mrcp_sig_types.h"
+#include "mrcp_connection_types.h"
+#include "mpf_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque MRCP server declaration */
+typedef struct mrcp_server_t mrcp_server_t;
+
+/** Opaque MRCP profile declaration */
+typedef struct mrcp_profile_t mrcp_profile_t;
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SERVER_TYPES_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,161 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/src/mrcp_server.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/src/mrcp_server.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,930 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "mrcp_server.h"
+#include "mrcp_server_session.h"
+#include "mrcp_message.h"
+#include "mrcp_resource_factory.h"
+#include "mrcp_sig_agent.h"
+#include "mrcp_server_connection.h"
+#include "mpf_engine.h"
+#include "apt_pool.h"
+#include "apt_consumer_task.h"
+#include "apt_obj_list.h"
+#include "apt_log.h"
+
+#define SERVER_TASK_NAME "MRCP Server"
+
+/** MRCP server */
+struct mrcp_server_t {
+	/** Main message processing task */
+	apt_consumer_task_t     *task;
+
+	/** MRCP resource factory */
+	mrcp_resource_factory_t *resource_factory;
+	/** Codec manager */
+	mpf_codec_manager_t     *codec_manager;
+	/** Table of resource engines (mrcp_resource_engine_t*) */
+	apr_hash_t              *resource_engine_table;
+	/** Table of media processing engines (mpf_engine_t*) */
+	apr_hash_t              *media_engine_table;
+	/** Table of RTP termination factories (mpf_termination_factory_t*) */
+	apr_hash_t              *rtp_factory_table;
+	/** Table of signaling agents (mrcp_sig_agent_t*) */
+	apr_hash_t              *sig_agent_table;
+	/** Table of connection agents (mrcp_connection_agent_t*) */
+	apr_hash_t              *cnt_agent_table;
+	/** Table of profiles (mrcp_profile_t*) */
+	apr_hash_t              *profile_table;
+	/** Table of plugins (apr_dso_handle_t*) */
+	apr_hash_t              *plugin_table;
+
+	/** Table of sessions */
+	apr_hash_t              *session_table;
+
+	/** Connection task message pool */
+	apt_task_msg_pool_t     *connection_msg_pool;
+	/** Resource engine task message pool */
+	apt_task_msg_pool_t     *resource_engine_msg_pool;
+
+	/** Dir layout structure */
+	apt_dir_layout_t        *dir_layout;
+	/** Time server started at */
+	apr_time_t               start_time;
+	/** Memory pool */
+	apr_pool_t              *pool;
+};
+
+
+typedef enum {
+	MRCP_SERVER_SIGNALING_TASK_MSG = TASK_MSG_USER,
+	MRCP_SERVER_CONNECTION_TASK_MSG,
+	MRCP_SERVER_RESOURCE_ENGINE_TASK_MSG,
+	MRCP_SERVER_MEDIA_TASK_MSG
+} mrcp_server_task_msg_type_e;
+
+
+static apt_bool_t mrcp_server_offer_signal(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_server_terminate_signal(mrcp_session_t *session);
+static apt_bool_t mrcp_server_control_signal(mrcp_session_t *session, mrcp_message_t *message);
+
+static const mrcp_session_request_vtable_t session_request_vtable = {
+	mrcp_server_offer_signal,
+	mrcp_server_terminate_signal,
+	mrcp_server_control_signal
+};
+
+
+/* Connection agent interface */
+typedef enum {
+	CONNECTION_AGENT_TASK_MSG_ADD_CHANNEL,
+	CONNECTION_AGENT_TASK_MSG_MODIFY_CHANNEL,
+	CONNECTION_AGENT_TASK_MSG_REMOVE_CHANNEL,
+	CONNECTION_AGENT_TASK_MSG_RECEIVE_MESSAGE,
+	CONNECTION_AGENT_TASK_MSG_TERMINATE
+} connection_agent_task_msg_type_e;
+
+typedef struct connection_agent_task_msg_data_t connection_agent_task_msg_data_t;
+struct connection_agent_task_msg_data_t {
+	mrcp_channel_t            *channel;
+	mrcp_control_descriptor_t *descriptor;
+	mrcp_message_t            *message;
+	apt_bool_t                 status;
+};
+
+static apt_bool_t mrcp_server_channel_add_signal(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status);
+static apt_bool_t mrcp_server_channel_modify_signal(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status);
+static apt_bool_t mrcp_server_channel_remove_signal(mrcp_control_channel_t *channel, apt_bool_t status);
+static apt_bool_t mrcp_server_message_signal(mrcp_control_channel_t *channel, mrcp_message_t *message);
+
+static const mrcp_connection_event_vtable_t connection_method_vtable = {
+	mrcp_server_channel_add_signal,
+	mrcp_server_channel_modify_signal,
+	mrcp_server_channel_remove_signal,
+	mrcp_server_message_signal
+};
+
+
+/* Resource engine interface */
+typedef enum {
+	RESOURCE_ENGINE_TASK_MSG_OPEN_CHANNEL,
+	RESOURCE_ENGINE_TASK_MSG_CLOSE_CHANNEL,
+	RESOURCE_ENGINE_TASK_MSG_MESSAGE
+} resource_engine_task_msg_type_e;
+
+typedef struct resource_engine_task_msg_data_t resource_engine_task_msg_data_t;
+struct resource_engine_task_msg_data_t {
+	mrcp_channel_t *channel;
+	apt_bool_t      status;
+	mrcp_message_t *mrcp_message;
+};
+
+static apt_bool_t mrcp_server_channel_open_signal(mrcp_engine_channel_t *channel, apt_bool_t status);
+static apt_bool_t mrcp_server_channel_close_signal(mrcp_engine_channel_t *channel);
+static apt_bool_t mrcp_server_channel_message_signal(mrcp_engine_channel_t *channel, mrcp_message_t *message);
+
+const mrcp_engine_channel_event_vtable_t engine_channel_vtable = {
+	mrcp_server_channel_open_signal,
+	mrcp_server_channel_close_signal,
+	mrcp_server_channel_message_signal
+};
+
+/* Task interface */
+static void mrcp_server_on_start_complete(apt_task_t *task);
+static void mrcp_server_on_terminate_complete(apt_task_t *task);
+static apt_bool_t mrcp_server_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+
+static mrcp_session_t* mrcp_server_sig_agent_session_create(mrcp_sig_agent_t *signaling_agent);
+
+
+/** Create MRCP server instance */
+MRCP_DECLARE(mrcp_server_t*) mrcp_server_create(apt_dir_layout_t *dir_layout)
+{
+	mrcp_server_t *server;
+	apr_pool_t *pool;
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+	
+	pool = apt_pool_create();
+	if(!pool) {
+		return NULL;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "SERVER_TASK_NAME);
+	server = apr_palloc(pool,sizeof(mrcp_server_t));
+	server->pool = pool;
+	server->dir_layout = dir_layout;
+	server->resource_factory = NULL;
+	server->resource_engine_table = NULL;
+	server->media_engine_table = NULL;
+	server->rtp_factory_table = NULL;
+	server->sig_agent_table = NULL;
+	server->cnt_agent_table = NULL;
+	server->profile_table = NULL;
+	server->plugin_table = NULL;
+	server->session_table = NULL;
+	server->connection_msg_pool = NULL;
+	server->resource_engine_msg_pool = NULL;
+
+	msg_pool = apt_task_msg_pool_create_dynamic(0,pool);
+
+	server->task = apt_consumer_task_create(server,msg_pool,pool);
+	if(!server->task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Server Task");
+		return NULL;
+	}
+	task = apt_consumer_task_base_get(server->task);
+	apt_task_name_set(task,SERVER_TASK_NAME);
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->process_msg = mrcp_server_msg_process;
+		vtable->on_start_complete = mrcp_server_on_start_complete;
+		vtable->on_terminate_complete = mrcp_server_on_terminate_complete;
+	}
+
+	server->resource_engine_table = apr_hash_make(server->pool);
+	server->media_engine_table = apr_hash_make(server->pool);
+	server->rtp_factory_table = apr_hash_make(server->pool);
+	server->sig_agent_table = apr_hash_make(server->pool);
+	server->cnt_agent_table = apr_hash_make(server->pool);
+
+	server->profile_table = apr_hash_make(server->pool);
+	server->plugin_table = apr_hash_make(server->pool);
+	
+	server->session_table = apr_hash_make(server->pool);
+	return server;
+}
+
+/** Start message processing loop */
+MRCP_DECLARE(apt_bool_t) mrcp_server_start(mrcp_server_t *server)
+{
+	apt_task_t *task;
+	if(!server || !server->task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid Server");
+		return FALSE;
+	}
+	server->start_time = apr_time_now();
+	task = apt_consumer_task_base_get(server->task);
+	if(apt_task_start(task) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start Server Task");
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/** Shutdown message processing loop */
+MRCP_DECLARE(apt_bool_t) mrcp_server_shutdown(mrcp_server_t *server)
+{
+	apt_task_t *task;
+	apr_time_t uptime;
+	if(!server || !server->task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid Server");
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(server->task);
+	if(apt_task_terminate(task,TRUE) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Shutdown Server Task");
+		return FALSE;
+	}
+	server->session_table = NULL;
+	uptime = apr_time_now() - server->start_time;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Server Uptime [%d sec]", apr_time_sec(uptime));
+	return TRUE;
+}
+
+/** Destroy MRCP server */
+MRCP_DECLARE(apt_bool_t) mrcp_server_destroy(mrcp_server_t *server)
+{
+	apt_task_t *task;
+	if(!server || !server->task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid Server");
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(server->task);
+	apt_task_destroy(task);
+
+	apr_pool_destroy(server->pool);
+	return TRUE;
+}
+
+/** Register MRCP resource factory */
+MRCP_DECLARE(apt_bool_t) mrcp_server_resource_factory_register(mrcp_server_t *server, mrcp_resource_factory_t *resource_factory)
+{
+	if(!resource_factory) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Resource Factory");
+	server->resource_factory = resource_factory;
+	return TRUE;
+}
+
+/** Register MRCP resource engine */
+MRCP_DECLARE(apt_bool_t) mrcp_server_resource_engine_register(mrcp_server_t *server, mrcp_resource_engine_t *engine, const char *name)
+{
+	if(!engine || !name) {
+		return FALSE;
+	}
+	if(!server->resource_engine_msg_pool) {
+		server->resource_engine_msg_pool = apt_task_msg_pool_create_dynamic(sizeof(resource_engine_task_msg_data_t),server->pool);
+	}
+	engine->codec_manager = server->codec_manager;
+	engine->dir_layout = server->dir_layout;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Resource Engine [%s]",name);
+	apr_hash_set(server->resource_engine_table,name,APR_HASH_KEY_STRING,engine);
+	return TRUE;
+}
+
+/** Get resource engine by name */
+MRCP_DECLARE(mrcp_resource_engine_t*) mrcp_server_resource_engine_get(mrcp_server_t *server, const char *name)
+{
+	return apr_hash_get(server->resource_engine_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register codec manager */
+MRCP_DECLARE(apt_bool_t) mrcp_server_codec_manager_register(mrcp_server_t *server, mpf_codec_manager_t *codec_manager)
+{
+	if(!codec_manager) {
+		return FALSE;
+	}
+	server->codec_manager = codec_manager;
+	return TRUE;
+}
+
+/** Get registered codec manager */
+MRCP_DECLARE(const mpf_codec_manager_t*) mrcp_server_codec_manager_get(mrcp_server_t *server)
+{
+	return server->codec_manager;
+}
+
+/** Register media engine */
+MRCP_DECLARE(apt_bool_t) mrcp_server_media_engine_register(mrcp_server_t *server, mpf_engine_t *media_engine, const char *name)
+{
+	if(!media_engine || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Media Engine [%s]",name);
+	mpf_engine_codec_manager_register(media_engine,server->codec_manager);
+	apr_hash_set(server->media_engine_table,name,APR_HASH_KEY_STRING,media_engine);
+	mpf_engine_task_msg_type_set(media_engine,MRCP_SERVER_MEDIA_TASK_MSG);
+	if(server->task) {
+		apt_task_t *media_task = mpf_task_get(media_engine);
+		apt_task_t *task = apt_consumer_task_base_get(server->task);
+		apt_task_add(task,media_task);
+	}
+	return TRUE;
+}
+
+/** Get media engine by name */
+MRCP_DECLARE(mpf_engine_t*) mrcp_server_media_engine_get(mrcp_server_t *server, const char *name)
+{
+	return apr_hash_get(server->media_engine_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register RTP termination factory */
+MRCP_DECLARE(apt_bool_t) mrcp_server_rtp_factory_register(mrcp_server_t *server, mpf_termination_factory_t *rtp_termination_factory, const char *name)
+{
+	if(!rtp_termination_factory || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register RTP Termination Factory [%s]",name);
+	apr_hash_set(server->rtp_factory_table,name,APR_HASH_KEY_STRING,rtp_termination_factory);
+	return TRUE;
+}
+
+/** Get RTP termination factory by name */
+MRCP_DECLARE(mpf_termination_factory_t*) mrcp_server_rtp_factory_get(mrcp_server_t *server, const char *name)
+{
+	return apr_hash_get(server->rtp_factory_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register MRCP signaling agent */
+MRCP_DECLARE(apt_bool_t) mrcp_server_signaling_agent_register(mrcp_server_t *server, mrcp_sig_agent_t *signaling_agent, const char *name)
+{
+	if(!signaling_agent || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Signaling Agent [%s]",name);
+	signaling_agent->parent = server;
+	signaling_agent->resource_factory = server->resource_factory;
+	signaling_agent->create_server_session = mrcp_server_sig_agent_session_create;
+	signaling_agent->msg_pool = apt_task_msg_pool_create_dynamic(sizeof(mrcp_signaling_message_t*),server->pool);
+	apr_hash_set(server->sig_agent_table,name,APR_HASH_KEY_STRING,signaling_agent);
+	if(server->task) {
+		apt_task_t *task = apt_consumer_task_base_get(server->task);
+		apt_task_add(task,signaling_agent->task);
+	}
+	return TRUE;
+}
+
+/** Get signaling agent by name */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_server_signaling_agent_get(mrcp_server_t *server, const char *name)
+{
+	return apr_hash_get(server->sig_agent_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register MRCP connection agent (MRCPv2 only) */
+MRCP_DECLARE(apt_bool_t) mrcp_server_connection_agent_register(mrcp_server_t *server, mrcp_connection_agent_t *connection_agent, const char *name)
+{
+	if(!connection_agent || !name) {
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Connection Agent [%s]",name);
+	mrcp_server_connection_resource_factory_set(connection_agent,server->resource_factory);
+	mrcp_server_connection_agent_handler_set(connection_agent,server,&connection_method_vtable);
+	server->connection_msg_pool = apt_task_msg_pool_create_dynamic(sizeof(connection_agent_task_msg_data_t),server->pool);
+	apr_hash_set(server->cnt_agent_table,name,APR_HASH_KEY_STRING,connection_agent);
+	if(server->task) {
+		apt_task_t *task = apt_consumer_task_base_get(server->task);
+		apt_task_t *connection_task = mrcp_server_connection_agent_task_get(connection_agent);
+		apt_task_add(task,connection_task);
+	}
+	return TRUE;
+}
+
+/** Get connection agent by name */
+MRCP_DECLARE(mrcp_connection_agent_t*) mrcp_server_connection_agent_get(mrcp_server_t *server, const char *name)
+{
+	return apr_hash_get(server->cnt_agent_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Create MRCP profile */
+MRCP_DECLARE(mrcp_profile_t*) mrcp_server_profile_create(
+									mrcp_resource_factory_t *resource_factory,
+									mrcp_sig_agent_t *signaling_agent,
+									mrcp_connection_agent_t *connection_agent,
+									mpf_engine_t *media_engine,
+									mpf_termination_factory_t *rtp_factory,
+									apr_pool_t *pool)
+{
+	mrcp_profile_t *profile = apr_palloc(pool,sizeof(mrcp_profile_t));
+	profile->resource_factory = resource_factory;
+	profile->engine_table = NULL;
+	profile->media_engine = media_engine;
+	profile->rtp_termination_factory = rtp_factory;
+	profile->signaling_agent = signaling_agent;
+	profile->connection_agent = connection_agent;
+	return profile;
+}
+
+static apt_bool_t mrcp_server_engine_table_make(mrcp_server_t *server, mrcp_profile_t *profile, apr_table_t *plugin_map)
+{
+	int i;
+	const apt_str_t *resource_name;
+	const char *plugin_name = NULL;
+	mrcp_resource_engine_t *resource_engine;
+
+	profile->engine_table = apr_hash_make(server->pool);
+	for(i=0; iresource_factory,i);
+		if(!resource_name) continue;
+		
+		resource_engine = NULL;
+		/* first, try to find engine by name specified in plugin map (if available) */
+		if(plugin_map) {
+			plugin_name = apr_table_get(plugin_map,resource_name->buf);
+			if(plugin_name) {
+				resource_engine = mrcp_server_resource_engine_get(server,plugin_name);
+			}
+		}
+
+		/* next, if no engine found, try to find the first available engine */
+		if(!resource_engine) {
+			mrcp_resource_engine_t *cur_engine;
+			void *val;
+			apr_hash_index_t *it = apr_hash_first(server->pool,server->resource_engine_table);
+			/* walk through the list of engines */
+			for(; it; it = apr_hash_next(it)) {
+				apr_hash_this(it,(void*)&plugin_name,NULL,&val);
+				cur_engine = val;
+				if(cur_engine && cur_engine->resource_id == (mrcp_resource_id)i) {
+					resource_engine = cur_engine;
+					break;
+				}
+			}
+		}
+		
+		if(resource_engine) {
+			if(plugin_name) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Assign Resource Engine [%s] [%s]",resource_name->buf,plugin_name);
+			}
+			apr_hash_set(profile->engine_table,resource_name->buf,resource_name->length,resource_engine);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Resource Engine Available [%s]",resource_name->buf);
+		}
+	}
+
+	return TRUE;
+}
+
+/** Register MRCP profile */
+MRCP_DECLARE(apt_bool_t) mrcp_server_profile_register(
+									mrcp_server_t *server,
+									mrcp_profile_t *profile,
+									apr_table_t *plugin_map,
+									const char *name)
+{
+	if(!profile || !name) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Profile: no name");
+		return FALSE;
+	}
+	if(!profile->resource_factory) {
+		profile->resource_factory = server->resource_factory;
+	}
+	mrcp_server_engine_table_make(server,profile,plugin_map);
+	
+	if(!profile->signaling_agent) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Profile [%s]: missing signaling agent",name);
+		return FALSE;
+	}
+	if(profile->signaling_agent->mrcp_version == MRCP_VERSION_2 &&
+		!profile->connection_agent) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Profile [%s]: missing connection agent",name);
+		return FALSE;
+	}
+	if(!profile->media_engine) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Profile [%s]: missing media engine",name);
+		return FALSE;
+	}
+	if(!profile->rtp_termination_factory) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Profile [%s]: missing RTP factory",name);
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Profile [%s]",name);
+	apr_hash_set(server->profile_table,name,APR_HASH_KEY_STRING,profile);
+	return TRUE;
+}
+
+/** Get profile by name */
+MRCP_DECLARE(mrcp_profile_t*) mrcp_server_profile_get(mrcp_server_t *server, const char *name)
+{
+	return apr_hash_get(server->profile_table,name,APR_HASH_KEY_STRING);
+}
+
+/** Register resource engine plugin */
+MRCP_DECLARE(apt_bool_t) mrcp_server_plugin_register(mrcp_server_t *server, const char *path, const char *name)
+{
+	apt_bool_t status = FALSE;
+	apr_dso_handle_t *plugin = NULL;
+	apr_dso_handle_sym_t func_handle = NULL;
+	mrcp_plugin_creator_f plugin_creator = NULL;
+	if(!path || !name) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Plugin: no name");
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Register Plugin [%s] [%s]",path,name);
+	if(apr_dso_load(&plugin,path,server->pool) == APR_SUCCESS) {
+		if(apr_dso_sym(&func_handle,plugin,MRCP_PLUGIN_ENGINE_SYM_NAME) == APR_SUCCESS) {
+			if(func_handle) {
+				plugin_creator = (mrcp_plugin_creator_f)(intptr_t)func_handle;
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Load DSO Symbol: "MRCP_PLUGIN_ENGINE_SYM_NAME);
+			apr_dso_unload(plugin);
+			return FALSE;
+		}
+		
+		if(apr_dso_sym(&func_handle,plugin,MRCP_PLUGIN_LOGGER_SYM_NAME) == APR_SUCCESS) {
+			if(func_handle) {
+				apt_logger_t *logger = apt_log_instance_get();
+				mrcp_plugin_log_accessor_f log_accessor;
+				log_accessor = (mrcp_plugin_log_accessor_f)(intptr_t)func_handle;
+				log_accessor(logger);
+			}
+		}
+	}
+	else {
+		char derr[512] = "";
+		apr_dso_error(plugin,derr,sizeof(derr));
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Load DSO: %s", derr);
+		return FALSE;
+	}
+
+	if(plugin_creator) {
+		mrcp_resource_engine_t *engine = plugin_creator(server->pool);
+		if(engine) {
+			if(mrcp_plugin_version_check(&engine->plugin_version)) {
+				status = TRUE;
+				mrcp_server_resource_engine_register(server,engine,name);
+				apr_hash_set(server->plugin_table,name,APR_HASH_KEY_STRING,plugin);
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Incompatible Plugin Version [%d.%d.%d] < ["PLUGIN_VERSION_STRING"]",
+					engine->plugin_version.major,
+					engine->plugin_version.minor,
+					engine->plugin_version.patch);
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Resource Engine");
+		}
+	}
+	else {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Entry Point Found for Plugin");
+	}
+
+	if(status == FALSE) {
+		apr_dso_unload(plugin);
+	}
+	return status;
+}
+
+MRCP_DECLARE(apr_pool_t*) mrcp_server_memory_pool_get(mrcp_server_t *server)
+{
+	return server->pool;
+}
+
+void mrcp_server_session_add(mrcp_server_session_t *session)
+{
+	if(session->base.id.buf) {
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Add Session "APT_SID_FMT,session->base.id.buf);
+		apr_hash_set(session->server->session_table,session->base.id.buf,session->base.id.length,session);
+	}
+}
+
+void mrcp_server_session_remove(mrcp_server_session_t *session)
+{
+	if(session->base.id.buf) {
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Remove Session "APT_SID_FMT,session->base.id.buf);
+		apr_hash_set(session->server->session_table,session->base.id.buf,session->base.id.length,NULL);
+	}
+}
+
+static APR_INLINE mrcp_server_session_t* mrcp_server_session_find(mrcp_server_t *server, const apt_str_t *session_id)
+{
+	return apr_hash_get(server->session_table,session_id->buf,session_id->length);
+}
+
+static void mrcp_server_on_start_complete(apt_task_t *task)
+{
+	apt_consumer_task_t *consumer_task = apt_task_object_get(task);
+	mrcp_server_t *server = apt_consumer_task_object_get(consumer_task);
+	mrcp_resource_engine_t *resource_engine;
+	apr_hash_index_t *it;
+	void *val;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Resource Engines");
+	it = apr_hash_first(server->pool,server->resource_engine_table);
+	for(; it; it = apr_hash_next(it)) {
+		apr_hash_this(it,NULL,NULL,&val);
+		resource_engine = val;
+		if(resource_engine) {
+			mrcp_resource_engine_open(resource_engine);
+		}
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,SERVER_TASK_NAME" Started");
+}
+
+static void mrcp_server_on_terminate_complete(apt_task_t *task)
+{
+	apt_consumer_task_t *consumer_task = apt_task_object_get(task);
+	mrcp_server_t *server = apt_consumer_task_object_get(consumer_task);
+	mrcp_resource_engine_t *resource_engine;
+	apr_dso_handle_t *plugin;
+	apr_hash_index_t *it;
+	void *val;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Close Resource Engines");
+	it=apr_hash_first(server->pool,server->resource_engine_table);
+	for(; it; it = apr_hash_next(it)) {
+		apr_hash_this(it,NULL,NULL,&val);
+		resource_engine = val;
+		if(resource_engine) {
+			mrcp_resource_engine_close(resource_engine);
+		}
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Unload Plugins");
+	it=apr_hash_first(server->pool,server->plugin_table);
+	for(; it; it = apr_hash_next(it)) {
+		apr_hash_this(it,NULL,NULL,&val);
+		plugin = val;
+		if(plugin) {
+			apr_dso_unload(plugin);
+		}
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,SERVER_TASK_NAME" Terminated");
+}
+
+static apt_bool_t mrcp_server_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	switch(msg->type) {
+		case MRCP_SERVER_SIGNALING_TASK_MSG:
+		{
+			mrcp_signaling_message_t **signaling_message = (mrcp_signaling_message_t**) msg->data;
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Receive Signaling Task Message [%d]", (*signaling_message)->type);
+			mrcp_server_signaling_message_process(*signaling_message);
+			break;
+		}
+		case MRCP_SERVER_CONNECTION_TASK_MSG:
+		{
+			const connection_agent_task_msg_data_t *connection_message = (const connection_agent_task_msg_data_t*)msg->data;
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Receive Connection Task Message [%d]", msg->sub_type);
+			switch(msg->sub_type) {
+				case CONNECTION_AGENT_TASK_MSG_ADD_CHANNEL:
+				{
+					mrcp_server_on_channel_modify(connection_message->channel,connection_message->descriptor,connection_message->status);
+					break;
+				}
+				case CONNECTION_AGENT_TASK_MSG_MODIFY_CHANNEL:
+				{
+					mrcp_server_on_channel_modify(connection_message->channel,connection_message->descriptor,connection_message->status);
+					break;
+				}
+				case CONNECTION_AGENT_TASK_MSG_REMOVE_CHANNEL:
+				{
+					mrcp_server_on_channel_remove(connection_message->channel,connection_message->status);
+					break;
+				}
+				case CONNECTION_AGENT_TASK_MSG_RECEIVE_MESSAGE:
+				{
+					mrcp_server_on_channel_message(connection_message->channel, connection_message->message);
+					break;
+				}
+				default:
+					break;
+			}
+			break;
+		}
+		case MRCP_SERVER_RESOURCE_ENGINE_TASK_MSG:
+		{
+			resource_engine_task_msg_data_t *data = (resource_engine_task_msg_data_t*)msg->data;
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Receive Resource Engine Task Message [%d]", msg->sub_type);
+			switch(msg->sub_type) {
+				case RESOURCE_ENGINE_TASK_MSG_OPEN_CHANNEL:
+					mrcp_server_on_engine_channel_open(data->channel,data->status);
+					break;
+				case RESOURCE_ENGINE_TASK_MSG_CLOSE_CHANNEL:
+					mrcp_server_on_engine_channel_close(data->channel);
+					break;
+				case RESOURCE_ENGINE_TASK_MSG_MESSAGE:
+					mrcp_server_on_engine_channel_message(data->channel,data->mrcp_message);
+					break;
+				default:
+					break;
+			}
+			break;
+		}
+		case MRCP_SERVER_MEDIA_TASK_MSG:
+		{
+			mpf_message_t *mpf_message = (mpf_message_t*) msg->data;
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Receive Media Task Message [%d]", mpf_message->command_id);
+			mrcp_server_mpf_message_process(mpf_message);
+			break;
+		}
+		default:
+		{
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Receive Unknown Task Message [%d]", msg->type);
+			break;
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_signaling_task_msg_signal(mrcp_signaling_message_type_e type, mrcp_session_t *session, mrcp_session_descriptor_t *descriptor, mrcp_message_t *message)
+{
+	mrcp_signaling_message_t *signaling_message;
+	apt_task_msg_t *task_msg = apt_task_msg_acquire(session->signaling_agent->msg_pool);
+	mrcp_signaling_message_t **slot = ((mrcp_signaling_message_t**)task_msg->data);
+	task_msg->type = MRCP_SERVER_SIGNALING_TASK_MSG;
+	task_msg->sub_type = type;
+	
+	signaling_message = apr_palloc(session->pool,sizeof(mrcp_signaling_message_t));
+	signaling_message->type = type;
+	signaling_message->session = (mrcp_server_session_t*)session;
+	signaling_message->descriptor = descriptor;
+	signaling_message->channel = NULL;
+	signaling_message->message = message;
+	*slot = signaling_message;
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Signal Signaling Task Message");
+	return apt_task_msg_parent_signal(session->signaling_agent->task,task_msg);
+}
+
+static apt_bool_t mrcp_server_connection_task_msg_signal(
+							connection_agent_task_msg_type_e type,
+							mrcp_connection_agent_t         *agent,
+							mrcp_control_channel_t          *channel,
+							mrcp_control_descriptor_t       *descriptor,
+							mrcp_message_t                  *message,
+							apt_bool_t                       status)
+{
+	mrcp_server_t *server = mrcp_server_connection_agent_object_get(agent);
+	apt_task_t *task = apt_consumer_task_base_get(server->task);
+	connection_agent_task_msg_data_t *data;
+	apt_task_msg_t *task_msg = apt_task_msg_acquire(server->connection_msg_pool);
+	task_msg->type = MRCP_SERVER_CONNECTION_TASK_MSG;
+	task_msg->sub_type = type;
+	data = (connection_agent_task_msg_data_t*) task_msg->data;
+	data->channel = channel ? channel->obj : NULL;
+	data->descriptor = descriptor;
+	data->message = message;
+	data->status = status;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Signal Connection Task Message");
+	return apt_task_msg_signal(task,task_msg);
+}
+
+static apt_bool_t mrcp_server_engine_task_msg_signal(
+							resource_engine_task_msg_type_e  type,
+							mrcp_engine_channel_t           *engine_channel,
+							apt_bool_t                       status,
+							mrcp_message_t                  *message)
+{
+	mrcp_channel_t *channel = engine_channel->event_obj;
+	mrcp_session_t *session = mrcp_server_channel_session_get(channel);
+	mrcp_server_t *server = session->signaling_agent->parent;
+	apt_task_t *task = apt_consumer_task_base_get(server->task);
+	resource_engine_task_msg_data_t *data;
+	apt_task_msg_t *task_msg = apt_task_msg_acquire(server->resource_engine_msg_pool);
+	task_msg->type = MRCP_SERVER_RESOURCE_ENGINE_TASK_MSG;
+	task_msg->sub_type = type;
+	data = (resource_engine_task_msg_data_t*) task_msg->data;
+	data->channel = channel;
+	data->status = status;
+	data->mrcp_message = message;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Signal Resource Engine Task Message");
+	return apt_task_msg_signal(task,task_msg);
+}
+
+static mrcp_profile_t* mrcp_server_profile_get_by_agent(mrcp_server_t *server, mrcp_server_session_t *session, mrcp_sig_agent_t *signaling_agent)
+{
+	mrcp_profile_t *profile;
+	apr_hash_index_t *it;
+	void *val;
+	const void *key;
+	const char *name;
+	it = apr_hash_first(session->base.pool,server->profile_table);
+	for(; it; it = apr_hash_next(it)) {
+		apr_hash_this(it,&key,NULL,&val);
+		profile = val;
+		name = key;
+		if(profile && name && profile->signaling_agent == signaling_agent) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Found Profile [%s]",name);
+			return profile;
+		}
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot Find Profile by Agent "APT_SID_FMT,session->base.id.buf);
+	return NULL;
+}
+
+static mrcp_session_t* mrcp_server_sig_agent_session_create(mrcp_sig_agent_t *signaling_agent)
+{
+	mrcp_server_t *server = signaling_agent->parent;
+	mrcp_server_session_t *session = mrcp_server_session_create();
+	session->server = server;
+	session->profile = mrcp_server_profile_get_by_agent(server,session,signaling_agent);
+	if(!session->profile) {
+		mrcp_session_destroy(&session->base);
+		return NULL;
+	}
+	session->base.signaling_agent = signaling_agent;
+	session->base.request_vtable = &session_request_vtable;
+	return &session->base;
+}
+
+static apt_bool_t mrcp_server_offer_signal(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	return mrcp_server_signaling_task_msg_signal(SIGNALING_MESSAGE_OFFER,session,descriptor,NULL);
+}
+
+static apt_bool_t mrcp_server_terminate_signal(mrcp_session_t *session)
+{
+	return mrcp_server_signaling_task_msg_signal(SIGNALING_MESSAGE_TERMINATE,session,NULL,NULL);
+}
+
+static apt_bool_t mrcp_server_control_signal(mrcp_session_t *session, mrcp_message_t *message)
+{
+	return mrcp_server_signaling_task_msg_signal(SIGNALING_MESSAGE_CONTROL,session,NULL,message);
+}
+
+static apt_bool_t mrcp_server_channel_add_signal(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status)
+{
+	mrcp_connection_agent_t *agent = channel->agent;
+	return mrcp_server_connection_task_msg_signal(
+								CONNECTION_AGENT_TASK_MSG_ADD_CHANNEL,
+								agent,
+								channel,
+								descriptor,
+								NULL,
+								status);
+}
+
+static apt_bool_t mrcp_server_channel_modify_signal(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status)
+{
+	mrcp_connection_agent_t *agent = channel->agent;
+	return mrcp_server_connection_task_msg_signal(
+								CONNECTION_AGENT_TASK_MSG_MODIFY_CHANNEL,
+								agent,
+								channel,
+								descriptor,
+								NULL,
+								status);
+}
+
+static apt_bool_t mrcp_server_channel_remove_signal(mrcp_control_channel_t *channel, apt_bool_t status)
+{
+	mrcp_connection_agent_t *agent = channel->agent;
+	return mrcp_server_connection_task_msg_signal(
+								CONNECTION_AGENT_TASK_MSG_REMOVE_CHANNEL,
+								agent,
+								channel,
+								NULL,
+								NULL,
+								status);
+}
+
+static apt_bool_t mrcp_server_message_signal(mrcp_control_channel_t *channel, mrcp_message_t *message)
+{
+	mrcp_connection_agent_t *agent = channel->agent;
+	return mrcp_server_connection_task_msg_signal(
+								CONNECTION_AGENT_TASK_MSG_RECEIVE_MESSAGE,
+								agent,
+								channel,
+								NULL,
+								message,
+								TRUE);
+}
+
+static apt_bool_t mrcp_server_channel_open_signal(mrcp_engine_channel_t *channel, apt_bool_t status)
+{
+	return mrcp_server_engine_task_msg_signal(
+								RESOURCE_ENGINE_TASK_MSG_OPEN_CHANNEL,
+								channel,
+								status,
+								NULL);
+}
+
+static apt_bool_t mrcp_server_channel_close_signal(mrcp_engine_channel_t *channel)
+{
+	return mrcp_server_engine_task_msg_signal(
+								RESOURCE_ENGINE_TASK_MSG_CLOSE_CHANNEL,
+								channel,
+								TRUE,
+								NULL);
+}
+
+static apt_bool_t mrcp_server_channel_message_signal(mrcp_engine_channel_t *channel, mrcp_message_t *message)
+{
+	return mrcp_server_engine_task_msg_signal(
+								RESOURCE_ENGINE_TASK_MSG_MESSAGE,
+								channel,
+								TRUE,
+								message);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/src/mrcp_server_session.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/src/mrcp_server_session.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,934 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_server.h"
+#include "mrcp_server_session.h"
+#include "mrcp_resource.h"
+#include "mrcp_resource_factory.h"
+#include "mrcp_resource_engine.h"
+#include "mrcp_sig_agent.h"
+#include "mrcp_server_connection.h"
+#include "mrcp_session_descriptor.h"
+#include "mrcp_control_descriptor.h"
+#include "mrcp_state_machine.h"
+#include "mrcp_message.h"
+#include "mpf_user.h"
+#include "mpf_termination.h"
+#include "mpf_engine.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+#define MRCP_SESSION_ID_HEX_STRING_LENGTH 16
+
+struct mrcp_channel_t {
+	/** Memory pool */
+	apr_pool_t             *pool;
+	/** MRCP resource */
+	apt_str_t               resource_name;
+	/** MRCP resource */
+	mrcp_resource_t        *resource;
+	/** MRCP session entire channel belongs to */
+	mrcp_session_t         *session;
+	/** MRCP control channel */
+	mrcp_control_channel_t *control_channel;
+	/** MRCP resource engine channel */
+	mrcp_engine_channel_t  *engine_channel;
+	/** MRCP resource state machine  */
+	mrcp_state_machine_t   *state_machine;
+	/** media descriptor id */
+	apr_size_t              id;
+	/** waiting state of control media */
+	apt_bool_t              waiting_for_channel;
+	/** waiting state of media termination */
+	apt_bool_t              waiting_for_termination;
+};
+
+typedef struct mrcp_termination_slot_t mrcp_termination_slot_t;
+
+struct mrcp_termination_slot_t {
+	/** RTP termination */
+	mpf_termination_t *termination;
+	/** media descriptor id */
+	apr_size_t              id;
+	/** waiting state */
+	apt_bool_t         waiting;
+};
+
+extern const mrcp_engine_channel_event_vtable_t engine_channel_vtable;
+
+void mrcp_server_session_add(mrcp_server_session_t *session);
+void mrcp_server_session_remove(mrcp_server_session_t *session);
+
+static apt_bool_t mrcp_server_signaling_message_dispatch(mrcp_server_session_t *session, mrcp_signaling_message_t *signaling_message);
+
+static apt_bool_t mrcp_server_resource_offer_process(mrcp_server_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_server_control_media_offer_process(mrcp_server_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_server_av_media_offer_process(mrcp_server_session_t *session, mrcp_session_descriptor_t *descriptor);
+
+static apt_bool_t mrcp_server_on_termination_modify(mrcp_server_session_t *session, const mpf_message_t *mpf_message);
+static apt_bool_t mrcp_server_on_termination_subtract(mrcp_server_session_t *session, const mpf_message_t *mpf_message);
+
+static apt_bool_t mrcp_server_session_answer_send(mrcp_server_session_t *session);
+static apt_bool_t mrcp_server_session_terminate_send(mrcp_server_session_t *session);
+
+static mrcp_channel_t* mrcp_server_channel_find(mrcp_server_session_t *session, const apt_str_t *resource_name);
+
+static apt_bool_t mrcp_server_mpf_request_send(
+						mrcp_server_session_t *session, 
+						mpf_command_type_e command_id, 
+						mpf_context_t *context, 
+						mpf_termination_t *termination, 
+						void *descriptor);
+
+
+mrcp_server_session_t* mrcp_server_session_create()
+{
+	mrcp_server_session_t *session = (mrcp_server_session_t*) mrcp_session_create(sizeof(mrcp_server_session_t)-sizeof(mrcp_session_t));
+	session->context = NULL;
+	session->terminations = apr_array_make(session->base.pool,2,sizeof(mrcp_termination_slot_t));
+	session->channels = apr_array_make(session->base.pool,2,sizeof(mrcp_channel_t*));
+	session->active_request = NULL;
+	session->request_queue = apt_list_create(session->base.pool);
+	session->offer = NULL;
+	session->answer = NULL;
+	session->answer_flag_count = 0;
+	session->terminate_flag_count = 0;
+	return session;
+}
+
+static mrcp_engine_channel_t* mrcp_server_engine_channel_create(mrcp_server_session_t *session, const apt_str_t *resource_name)
+{
+	mrcp_resource_engine_t *resource_engine = apr_hash_get(
+												session->profile->engine_table,
+												resource_name->buf,
+												resource_name->length);
+	if(!resource_engine) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Find Resource Engine [%s]",resource_name->buf);
+		return NULL;
+	}
+
+	return resource_engine->method_vtable->create_channel(resource_engine,session->base.pool);
+}
+
+static apt_bool_t mrcp_server_message_dispatch(mrcp_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_channel_t *channel = state_machine->obj;
+
+	if(message->start_line.message_type == MRCP_MESSAGE_TYPE_REQUEST) {
+		/* send request message to resource engine for actual processing */
+		if(channel->engine_channel) {
+			mrcp_engine_channel_request_process(channel->engine_channel,message);
+		}
+	}
+	else if(message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		mrcp_server_session_t *session = (mrcp_server_session_t*)channel->session;
+		/* send response message to client */
+		if(channel->control_channel) {
+			/* MRCPv2 */
+			mrcp_server_control_message_send(channel->control_channel,message);
+		}
+		else {
+			/* MRCPv1 */
+			mrcp_session_control_response(channel->session,message);
+		}
+
+		session->active_request = apt_list_pop_front(session->request_queue);
+		if(session->active_request) {
+			mrcp_server_signaling_message_dispatch(session,session->active_request);
+		}
+	}
+	else { 
+		/* send event message to client */
+		if(channel->control_channel) {
+			/* MRCPv2 */
+			mrcp_server_control_message_send(channel->control_channel,message);
+		}
+		else {
+			/* MRCPv1 */
+			mrcp_session_control_response(channel->session,message);
+		}
+	}
+	return TRUE;
+}
+
+static mrcp_channel_t* mrcp_server_channel_create(mrcp_server_session_t *session, const apt_str_t *resource_name, apr_size_t id)
+{
+	mrcp_channel_t *channel;
+	apr_pool_t *pool = session->base.pool;
+
+	channel = apr_palloc(pool,sizeof(mrcp_channel_t));
+	channel->pool = pool;
+	channel->session = &session->base;
+	channel->resource = NULL;
+	channel->control_channel = NULL;
+	channel->state_machine = NULL;
+	channel->engine_channel = NULL;
+	channel->id = id;
+	channel->waiting_for_channel = FALSE;
+	channel->waiting_for_termination = FALSE;
+	apt_string_reset(&channel->resource_name);
+
+	if(resource_name && resource_name->buf) {
+		mrcp_resource_id resource_id;
+		mrcp_resource_t *resource;
+		mrcp_engine_channel_t *engine_channel;
+		channel->resource_name = *resource_name;
+		resource_id = mrcp_resource_id_find(
+								session->profile->resource_factory,
+								resource_name);
+		resource = mrcp_resource_get(session->profile->resource_factory,resource_id);
+		if(resource) {
+			channel->resource = resource;
+			if(session->base.signaling_agent->mrcp_version == MRCP_VERSION_2) {
+				channel->control_channel = mrcp_server_control_channel_create(
+									session->profile->connection_agent,
+									channel,
+									pool);
+			}
+			channel->state_machine = resource->create_server_state_machine(
+								channel,
+								mrcp_server_message_dispatch,
+								session->base.signaling_agent->mrcp_version,
+								pool);
+
+			engine_channel = mrcp_server_engine_channel_create(session,resource_name);
+			if(engine_channel) {
+				engine_channel->event_obj = channel;
+				engine_channel->event_vtable = &engine_channel_vtable;
+				channel->engine_channel = engine_channel;
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Resource Engine Channel [%s]",resource_name->buf);
+				session->answer->status = MRCP_SESSION_STATUS_UNACCEPTABLE_RESOURCE;
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Such Resource [%s]",resource_name->buf);
+			session->answer->status = MRCP_SESSION_STATUS_NO_SUCH_RESOURCE;
+		}
+	}
+	else {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid Resource Identifier");
+		session->answer->status = MRCP_SESSION_STATUS_NO_SUCH_RESOURCE;
+	}
+
+	return channel;
+}
+
+mrcp_session_t* mrcp_server_channel_session_get(mrcp_channel_t *channel)
+{
+	return channel->session;
+}
+
+apt_bool_t mrcp_server_signaling_message_process(mrcp_signaling_message_t *signaling_message)
+{
+	mrcp_server_session_t *session = signaling_message->session;
+	if(session->active_request) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Push Request to Queue");
+		apt_list_push_back(session->request_queue,signaling_message,session->base.pool);
+	}
+	else {
+		session->active_request = signaling_message;
+		mrcp_server_signaling_message_dispatch(session,signaling_message);
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_server_on_channel_modify(mrcp_channel_t *channel, mrcp_control_descriptor_t *answer, apt_bool_t status)
+{
+	mrcp_server_session_t *session = (mrcp_server_session_t*)channel->session;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Control Channel Modify");
+	if(!answer) {
+		return FALSE;
+	}
+	if(!channel->waiting_for_channel) {
+		return FALSE;
+	}
+	channel->waiting_for_channel = FALSE;
+	answer->session_id = session->base.id;
+	mrcp_session_control_media_set(session->answer,channel->id,answer);
+	if(session->answer_flag_count) {
+		session->answer_flag_count--;
+		if(!session->answer_flag_count) {
+			/* send answer to client */
+			mrcp_server_session_answer_send(session);
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_server_on_channel_remove(mrcp_channel_t *channel, apt_bool_t status)
+{
+	mrcp_server_session_t *session = (mrcp_server_session_t*)channel->session;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Control Channel Remove");
+	if(!channel->waiting_for_channel) {
+		return FALSE;
+	}
+	channel->waiting_for_channel = FALSE;
+	if(session->terminate_flag_count) {
+		session->terminate_flag_count--;
+		if(!session->terminate_flag_count) {
+			mrcp_server_session_terminate_send(session);
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_server_on_channel_message(mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	mrcp_server_session_t *session = (mrcp_server_session_t*)channel->session;
+	mrcp_signaling_message_t *signaling_message;
+	signaling_message = apr_palloc(session->base.pool,sizeof(mrcp_signaling_message_t));
+	signaling_message->type = SIGNALING_MESSAGE_CONTROL;
+	signaling_message->session = session;
+	signaling_message->descriptor = NULL;
+	signaling_message->channel = channel;
+	signaling_message->message = message;
+	return mrcp_server_signaling_message_process(signaling_message);
+}
+
+apt_bool_t mrcp_server_on_engine_channel_open(mrcp_channel_t *channel, apt_bool_t status)
+{
+	mrcp_server_session_t *session = (mrcp_server_session_t*)channel->session;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Engine Channel Open [%s]", status == TRUE ? "OK" : "Failed");
+	if(status == FALSE) {
+		session->answer->status = MRCP_SESSION_STATUS_UNAVAILABLE_RESOURCE;
+	}
+	if(session->answer_flag_count) {
+		session->answer_flag_count--;
+		if(!session->answer_flag_count) {
+			/* send answer to client */
+			mrcp_server_session_answer_send(session);
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_server_on_engine_channel_close(mrcp_channel_t *channel)
+{
+	mrcp_server_session_t *session = (mrcp_server_session_t*)channel->session;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Engine Channel Close");
+	if(session->terminate_flag_count) {
+		session->terminate_flag_count--;
+		if(!session->terminate_flag_count) {
+			mrcp_server_session_terminate_send(session);
+		}
+	}
+	return TRUE;
+}
+
+apt_bool_t mrcp_server_on_engine_channel_message(mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	if(!channel->state_machine) {
+		return FALSE;
+	}
+	/* update state machine */
+	return mrcp_state_machine_update(channel->state_machine,message);
+}
+
+
+apt_bool_t mrcp_server_mpf_message_process(mpf_message_t *mpf_message)
+{
+	mrcp_server_session_t *session = NULL;
+	if(mpf_message->context) {
+		session = mpf_context_object_get(mpf_message->context);
+	}
+	if(mpf_message->message_type == MPF_MESSAGE_TYPE_RESPONSE) {
+		switch(mpf_message->command_id) {
+			case MPF_COMMAND_ADD:
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Termination Add");
+				mrcp_server_on_termination_modify(session,mpf_message);
+				break;
+			case MPF_COMMAND_MODIFY:
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Termination Modify");
+				mrcp_server_on_termination_modify(session,mpf_message);
+				break;
+			case MPF_COMMAND_SUBTRACT:
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Termination Subtract");
+				mrcp_server_on_termination_subtract(session,mpf_message);
+				break;
+			default:
+				break;
+		}
+	}
+	else if(mpf_message->message_type == MPF_MESSAGE_TYPE_EVENT) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process MPF Event");
+	}
+	return TRUE;
+}
+
+static mrcp_session_descriptor_t* mrcp_session_answer_create(mrcp_session_descriptor_t *offer, apr_pool_t *pool)
+{
+	int i;
+	void **control_slot;
+	mpf_rtp_media_descriptor_t **av_slot;
+	mrcp_session_descriptor_t *answer = apr_palloc(pool,sizeof(mrcp_session_descriptor_t));
+	apt_string_reset(&answer->origin);
+	apt_string_reset(&answer->ip);
+	apt_string_reset(&answer->ext_ip);
+	answer->resource_name = offer->resource_name;
+	answer->resource_state = offer->resource_state;
+	answer->status = offer->status;
+	answer->control_media_arr = apr_array_make(pool,offer->control_media_arr->nelts,sizeof(void*));
+	for(i=0; icontrol_media_arr->nelts; i++) {
+		control_slot = apr_array_push(answer->control_media_arr);
+		*control_slot = NULL;
+	}
+	answer->audio_media_arr = apr_array_make(pool,offer->audio_media_arr->nelts,sizeof(mpf_rtp_media_descriptor_t*));
+	for(i=0; iaudio_media_arr->nelts; i++) {
+		av_slot = apr_array_push(answer->audio_media_arr);
+		*av_slot = NULL;
+	}
+	answer->video_media_arr = apr_array_make(pool,offer->video_media_arr->nelts,sizeof(mpf_rtp_media_descriptor_t*));
+	for(i=0; ivideo_media_arr->nelts; i++) {
+		av_slot = apr_array_push(answer->video_media_arr);
+		*av_slot = NULL;
+	}
+	return answer;
+}
+
+static apt_bool_t mrcp_server_session_offer_process(mrcp_server_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	if(!session->context) {
+		/* initial offer received, generate session id and add to session's table */
+		if(!session->base.id.length) {
+			apt_unique_id_generate(&session->base.id,MRCP_SESSION_ID_HEX_STRING_LENGTH,session->base.pool);
+		}
+		mrcp_server_session_add(session);
+
+		session->context = mpf_context_create(session,5,session->base.pool);
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive Offer "APT_SID_FMT" [c:%d a:%d v:%d]",
+		session->base.id.buf,
+		descriptor->control_media_arr->nelts,
+		descriptor->audio_media_arr->nelts,
+		descriptor->video_media_arr->nelts);
+
+	/* store received offer */
+	session->offer = descriptor;
+	session->answer = mrcp_session_answer_create(descriptor,session->base.pool);
+
+	if(session->base.signaling_agent->mrcp_version == MRCP_VERSION_1) {
+		if(mrcp_server_resource_offer_process(session,descriptor) == TRUE) {
+			mrcp_server_av_media_offer_process(session,descriptor);
+		}
+		else {
+			session->answer->resource_state = FALSE;
+		}
+	}
+	else {
+		mrcp_server_control_media_offer_process(session,descriptor);
+		mrcp_server_av_media_offer_process(session,descriptor);
+	}
+	
+	if(!session->answer_flag_count) {
+		/* send answer to client */
+		mrcp_server_session_answer_send(session);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_session_terminate_process(mrcp_server_session_t *session)
+{
+	mrcp_channel_t *channel;
+	mrcp_termination_slot_t *slot;
+	int i;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive Terminate Request "APT_SID_FMT,session->base.id.buf);
+	for(i=0; ichannels->nelts; i++) {
+		channel = ((mrcp_channel_t**)session->channels->elts)[i];
+		if(!channel) continue;
+
+		/* send remove channel request */
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Remove Control Channel [%d]",i);
+		if(channel->control_channel) {
+			if(mrcp_server_control_channel_remove(channel->control_channel) == TRUE) {
+				channel->waiting_for_channel = TRUE;
+				session->terminate_flag_count++;
+			}
+		}
+
+		if(channel->engine_channel) {
+			mpf_termination_t *termination = channel->engine_channel->termination;
+			/* send subtract termination request */
+			if(termination) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Subtract Channel Termination");
+				if(mrcp_server_mpf_request_send(session,MPF_COMMAND_SUBTRACT,session->context,termination,NULL) == TRUE) {
+					channel->waiting_for_termination = TRUE;
+					session->terminate_flag_count++;
+				}
+			}
+
+			/* close resource engine channel */
+			if(mrcp_engine_channel_close(channel->engine_channel) == TRUE) {
+				session->terminate_flag_count++;
+			}
+		}
+	}
+	for(i=0; iterminations->nelts; i++) {
+		/* get existing termination */
+		slot = &((mrcp_termination_slot_t*)session->terminations->elts)[i];
+		if(!slot || !slot->termination) continue;
+
+		/* send subtract termination request */
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Subtract RTP Termination [%d]",i);
+		if(mrcp_server_mpf_request_send(session,MPF_COMMAND_SUBTRACT,session->context,slot->termination,NULL) == TRUE) {
+			slot->waiting = TRUE;
+			session->terminate_flag_count++;
+		}
+	}
+	mrcp_server_session_remove(session);
+
+	if(!session->terminate_flag_count) {
+		mrcp_server_session_terminate_send(session);
+	}
+
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_on_message_receive(mrcp_server_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	if(!channel) {
+		channel = mrcp_server_channel_find(session,&message->channel_id.resource_name);
+		if(!channel) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Such Channel");
+			return FALSE;
+		}
+	}
+	if(!channel->resource || !channel->state_machine) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Resource");
+		return FALSE;
+	}
+
+	/* update state machine */
+	return mrcp_state_machine_update(channel->state_machine,message);
+}
+
+static apt_bool_t mrcp_server_signaling_message_dispatch(mrcp_server_session_t *session, mrcp_signaling_message_t *signaling_message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Dispatch Signaling Message [%d]",signaling_message->type);
+	switch(signaling_message->type) {
+		case SIGNALING_MESSAGE_OFFER:
+			mrcp_server_session_offer_process(signaling_message->session,signaling_message->descriptor);
+			break;
+		case SIGNALING_MESSAGE_CONTROL:
+			mrcp_server_on_message_receive(signaling_message->session,signaling_message->channel,signaling_message->message);
+			break;
+		case SIGNALING_MESSAGE_TERMINATE:
+			mrcp_server_session_terminate_process(signaling_message->session);
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_resource_offer_process(mrcp_server_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	if(descriptor->resource_state == TRUE) {
+		/* setup */
+		mrcp_channel_t *channel;
+		mrcp_channel_t **slot;
+		int count = session->channels->nelts;
+		channel = mrcp_server_channel_find(session,&descriptor->resource_name);
+		if(channel) {
+			/* channel already exists */
+			return TRUE;
+		}
+		/* create new MRCP channel instance */
+		channel = mrcp_server_channel_create(session,&descriptor->resource_name,count);
+		if(!channel || !channel->resource) {
+			return FALSE;
+		}
+		/* add to channel array */
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Add Control Channel [%d]",count);
+		slot = apr_array_push(session->channels);
+		*slot = channel;
+
+		if(channel->engine_channel) {
+			/* open resource engine channel */
+			if(mrcp_engine_channel_open(channel->engine_channel) == TRUE) {
+				mpf_termination_t *termination = channel->engine_channel->termination;
+				session->answer_flag_count++;
+
+				if(termination) {
+					/* send add termination request (add to media context) */
+					if(mrcp_server_mpf_request_send(session,MPF_COMMAND_ADD,session->context,termination,NULL) == TRUE) {
+						channel->waiting_for_termination = TRUE;
+						session->answer_flag_count++;
+					}
+
+					if(termination->audio_stream) {
+						mpf_rtp_media_descriptor_t *rtp_media_descriptor = mrcp_session_audio_media_get(descriptor,0);
+						if(rtp_media_descriptor) {
+							mpf_stream_mode_e mode = termination->audio_stream->mode;
+							rtp_media_descriptor->mode |= mode;
+						}
+					}
+				}
+			}
+		}
+	}
+	else {
+		/* teardown */
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_control_media_offer_process(mrcp_server_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	mrcp_channel_t *channel;
+	mrcp_control_descriptor_t *control_descriptor;
+	int i;
+	int count = session->channels->nelts;
+	if(count > descriptor->control_media_arr->nelts) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Number of Control Channels [%d] > Number of Control Media in Offer [%d]",
+			count,descriptor->control_media_arr->nelts);
+		count = descriptor->control_media_arr->nelts;
+	}
+	
+	/* update existing control channels */
+	for(i=0; ichannels->elts + i);
+		if(!channel) continue;
+
+		channel->waiting_for_channel = FALSE;
+		/* get control descriptor */
+		control_descriptor = mrcp_session_control_media_get(descriptor,i);
+		if(!control_descriptor) continue;
+
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Modify Control Channel [%d]",i);
+		if(channel->control_channel) {
+			/* send offer */
+			if(mrcp_server_control_channel_modify(channel->control_channel,control_descriptor) == TRUE) {
+				channel->waiting_for_channel = TRUE;
+				session->answer_flag_count++;
+			}
+		}
+
+		if(channel->waiting_for_channel == FALSE) {
+			mrcp_control_descriptor_t *answer = mrcp_control_answer_create(control_descriptor,channel->pool);
+			answer->port = 0;
+			answer->session_id = session->base.id;
+			mrcp_session_control_media_set(session->answer,channel->id,answer);
+		}
+	}
+	
+	/* add new control channels */
+	for(; icontrol_media_arr->nelts; i++) {
+		mrcp_channel_t **slot;
+		/* get control descriptor */
+		control_descriptor = mrcp_session_control_media_get(descriptor,i);
+		if(!control_descriptor) continue;
+
+		/* create new MRCP channel instance */
+		channel = mrcp_server_channel_create(session,&control_descriptor->resource_name,i);
+		if(!channel) continue;
+		/* add to channel array */
+
+		control_descriptor->session_id = session->base.id;
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Add Control Channel [%d]",i);
+		slot = apr_array_push(session->channels);
+		*slot = channel;
+
+		if(channel->control_channel) {
+			/* send modify connection request */
+			if(mrcp_server_control_channel_add(channel->control_channel,control_descriptor) == TRUE) {
+				channel->waiting_for_channel = TRUE;
+				session->answer_flag_count++;
+			}
+		}
+
+		if(channel->waiting_for_channel == FALSE) {
+			mrcp_control_descriptor_t *answer = mrcp_control_answer_create(control_descriptor,channel->pool);
+			answer->port = 0;
+			answer->session_id = session->base.id;
+			mrcp_session_control_media_set(session->answer,channel->id,answer);
+		}
+		
+		if(channel->engine_channel) {
+			/* open resource engine channel */
+			if(mrcp_engine_channel_open(channel->engine_channel) == TRUE) {
+				mpf_termination_t *termination = channel->engine_channel->termination;
+				session->answer_flag_count++;
+
+				if(termination) {
+					/* send add termination request (add to media context) */
+					if(mrcp_server_mpf_request_send(session,MPF_COMMAND_ADD,session->context,termination,NULL) == TRUE) {
+						channel->waiting_for_termination = TRUE;
+						session->answer_flag_count++;
+					}
+				}
+			}
+		}
+	}
+
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_av_media_offer_process(mrcp_server_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	mrcp_termination_slot_t *slot;
+	int i;
+	int count = session->terminations->nelts;
+	if(!descriptor->audio_media_arr->nelts) {
+		/* no media to process */
+		return TRUE;
+	}
+	if(count > descriptor->audio_media_arr->nelts) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Number of Terminations [%d] > Number of Audio Media in Offer [%d]",
+			count,descriptor->audio_media_arr->nelts);
+		count = descriptor->audio_media_arr->nelts;
+	}
+	
+	/* update existing terminations */
+	for(i=0; iterminations->elts)[i];
+		if(!slot || !slot->termination) continue;
+
+		/* construct termination descriptor */
+		rtp_descriptor = apr_palloc(session->base.pool,sizeof(mpf_rtp_termination_descriptor_t));
+		mpf_rtp_termination_descriptor_init(rtp_descriptor);
+		rtp_descriptor->audio.local = NULL;
+		rtp_descriptor->audio.remote = mrcp_session_audio_media_get(descriptor,i);
+
+		/* send modify termination request */
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Modify RTP Termination [%d]",i);
+		if(mrcp_server_mpf_request_send(session,MPF_COMMAND_MODIFY,session->context,slot->termination,rtp_descriptor) == TRUE) {
+			slot->waiting = TRUE;
+			session->answer_flag_count++;
+		}
+	}
+	
+	/* add new terminations */
+	for(; iaudio_media_arr->nelts; i++) {
+		mpf_rtp_termination_descriptor_t *rtp_descriptor;
+		mpf_termination_t *termination;
+		/* create new RTP termination instance */
+		termination = mpf_termination_create(session->profile->rtp_termination_factory,session,session->base.pool);
+		/* add to termination array */
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Add RTP Termination [%d]",i);
+		slot = apr_array_push(session->terminations);
+		slot->id = i;
+		slot->waiting = FALSE;
+		slot->termination = termination;
+
+		/* construct termination descriptor */
+		rtp_descriptor = apr_palloc(session->base.pool,sizeof(mpf_rtp_termination_descriptor_t));
+		mpf_rtp_termination_descriptor_init(rtp_descriptor);
+		rtp_descriptor->audio.local = NULL;
+		rtp_descriptor->audio.remote = mrcp_session_audio_media_get(descriptor,i);
+
+		/* send add termination request (add to media context) */
+		if(mrcp_server_mpf_request_send(session,MPF_COMMAND_ADD,session->context,termination,rtp_descriptor) == TRUE) {
+			slot->waiting = TRUE;
+			session->answer_flag_count++;
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_session_answer_send(mrcp_server_session_t *session)
+{
+	apt_bool_t status;
+	mrcp_session_descriptor_t *descriptor = session->answer;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send Answer "APT_SID_FMT" [c:%d a:%d v:%d] Status %s",
+		session->base.id.buf,
+		descriptor->control_media_arr->nelts,
+		descriptor->audio_media_arr->nelts,
+		descriptor->video_media_arr->nelts,
+		mrcp_session_status_phrase_get(descriptor->status));
+	status = mrcp_session_answer(&session->base,descriptor);
+	session->offer = NULL;
+	session->answer = NULL;
+
+	session->active_request = apt_list_pop_front(session->request_queue);
+	if(session->active_request) {
+		mrcp_server_signaling_message_dispatch(session,session->active_request);
+	}
+	return status;
+}
+
+static apt_bool_t mrcp_server_session_terminate_send(mrcp_server_session_t *session)
+{
+	int i;
+	mrcp_channel_t *channel;
+	for(i=0; ichannels->nelts; i++) {
+		channel = ((mrcp_channel_t**)session->channels->elts)[i];
+		if(!channel) continue;
+
+		if(channel->control_channel) {
+			mrcp_server_control_channel_destroy(channel->control_channel);
+			channel->control_channel = NULL;
+		}
+		if(channel->engine_channel) {
+			mrcp_engine_channel_destroy(channel->engine_channel);
+			channel->engine_channel = NULL;
+		}
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send Terminate Response "APT_SID_FMT,session->base.id.buf);
+	mrcp_session_terminate_response(&session->base);
+	return TRUE;
+}
+
+
+static mrcp_termination_slot_t* mrcp_server_rtp_termination_find(mrcp_server_session_t *session, mpf_termination_t *termination)
+{
+	int i;
+	mrcp_termination_slot_t *slot;
+	for(i=0; iterminations->nelts; i++) {
+		slot = &((mrcp_termination_slot_t*)session->terminations->elts)[i];
+		if(slot && slot->termination == termination) {
+			return slot;
+		}
+	}
+	return NULL;
+}
+
+static mrcp_channel_t* mrcp_server_channel_termination_find(mrcp_server_session_t *session, mpf_termination_t *termination)
+{
+	int i;
+	mrcp_channel_t *channel;
+	for(i=0; ichannels->nelts; i++) {
+		channel = ((mrcp_channel_t**)session->channels->elts)[i];
+		if(!channel) continue;
+
+		if(channel->engine_channel && channel->engine_channel->termination == termination) {
+			return channel;
+		}
+	}
+	return NULL;
+}
+
+static mrcp_channel_t* mrcp_server_channel_find(mrcp_server_session_t *session, const apt_str_t *resource_name)
+{
+	int i;
+	mrcp_channel_t *channel;
+	for(i=0; ichannels->nelts; i++) {
+		channel = ((mrcp_channel_t**)session->channels->elts)[i];
+		if(!channel) continue;
+
+		if(apt_string_compare(&channel->resource_name,resource_name) == TRUE) {
+			return channel;
+		}
+	}
+	return NULL;
+}
+
+static apt_bool_t mrcp_server_on_termination_modify(mrcp_server_session_t *session, const mpf_message_t *mpf_message)
+{
+	mrcp_termination_slot_t *termination_slot;
+	if(!session) {
+		return FALSE;
+	}
+	termination_slot = mrcp_server_rtp_termination_find(session,mpf_message->termination);
+	if(termination_slot) {
+		/* rtp termination */
+		mpf_rtp_termination_descriptor_t *rtp_descriptor;
+		if(termination_slot->waiting == FALSE) {
+			return FALSE;
+		}
+		termination_slot->waiting = FALSE;
+		rtp_descriptor = mpf_message->descriptor;
+		if(rtp_descriptor->audio.local) {
+			session->answer->ip = rtp_descriptor->audio.local->base.ip;
+			session->answer->ext_ip = rtp_descriptor->audio.local->base.ext_ip;
+			mrcp_session_audio_media_set(session->answer,termination_slot->id,rtp_descriptor->audio.local);
+		}
+		if(session->answer_flag_count) {
+			session->answer_flag_count--;
+			if(!session->answer_flag_count) {
+				/* send answer to client */
+				mrcp_server_session_answer_send(session);
+			}
+		}
+	}
+	else {
+		/* engine channel termination */
+		mrcp_channel_t *channel = mrcp_server_channel_termination_find(session,mpf_message->termination);
+		if(channel && channel->waiting_for_termination == TRUE) {
+			channel->waiting_for_termination = FALSE;
+			if(session->answer_flag_count) {
+				session->answer_flag_count--;
+				if(!session->answer_flag_count) {
+					/* send answer to client */
+					mrcp_server_session_answer_send(session);
+				}
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_on_termination_subtract(mrcp_server_session_t *session, const mpf_message_t *mpf_message)
+{
+	mrcp_termination_slot_t *termination_slot;
+	if(!session) {
+		return FALSE;
+	}
+	termination_slot = mrcp_server_rtp_termination_find(session,mpf_message->termination);
+	if(termination_slot) {
+		/* rtp termination */
+		if(termination_slot->waiting == FALSE) {
+			return FALSE;
+		}
+		termination_slot->waiting = FALSE;
+		if(session->terminate_flag_count) {
+			session->terminate_flag_count--;
+			if(!session->terminate_flag_count) {
+				mrcp_server_session_terminate_send(session);
+			}
+		}
+	}
+	else {
+		/* engine channel termination */
+		mrcp_channel_t *channel = mrcp_server_channel_termination_find(session,mpf_message->termination);
+		if(channel && channel->waiting_for_termination == TRUE) {
+			channel->waiting_for_termination = FALSE;
+			if(session->terminate_flag_count) {
+				session->terminate_flag_count--;
+				if(!session->terminate_flag_count) {
+					mrcp_server_session_terminate_send(session);
+				}
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_mpf_request_send(
+						mrcp_server_session_t *session, 
+						mpf_command_type_e command_id, 
+						mpf_context_t *context, 
+						mpf_termination_t *termination, 
+						void *descriptor)
+{
+	apt_task_t *media_task = mpf_task_get(session->profile->media_engine);
+	apt_task_msg_t *msg;
+	mpf_message_t *mpf_message;
+	msg = apt_task_msg_get(media_task);
+	msg->type = TASK_MSG_USER;
+	mpf_message = (mpf_message_t*) msg->data;
+
+	mpf_message->message_type = MPF_MESSAGE_TYPE_REQUEST;
+	mpf_message->command_id = command_id;
+	mpf_message->context = context;
+	mpf_message->termination = termination;
+	mpf_message->descriptor = descriptor;
+	return apt_task_msg_signal(media_task,msg);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,17 @@
+MAINTAINERCLEANFILES 	    = Makefile.in
+
+INCLUDES                    = -I$(top_srcdir)/libs/mrcp-signaling/include \
+                              -I$(top_srcdir)/libs/mrcp/include \
+                              -I$(top_srcdir)/libs/mpf/include \
+                              -I$(top_srcdir)/libs/apr-toolkit/include \
+                              $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES          = libmrcpsignaling.la
+
+include_HEADERS             = include/mrcp_sig_types.h \
+                              include/mrcp_sig_agent.h \
+                              include/mrcp_session.h \
+                              include/mrcp_session_descriptor.h
+
+libmrcpsignaling_la_SOURCES = src/mrcp_sig_agent.c \
+                              src/mrcp_session_descriptor.c
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_session.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_session.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SESSION_H__
+#define __MRCP_SESSION_H__
+
+/**
+ * @file mrcp_session.h
+ * @brief Abstract MRCP Session
+ */ 
+
+#include "mrcp_sig_types.h"
+#include "apt_string.h"
+
+APT_BEGIN_EXTERN_C
+
+#define MRCP_SESSION_PTR(session) (session)
+#define MRCP_SESSION_SID(session) \
+	(session)->id.buf ? (session)->id.buf : "new"
+
+#define MRCP_SESSION_PTRSID(session) \
+	MRCP_SESSION_PTR(session), MRCP_SESSION_SID(session)
+
+/** MRCP session request vtable declaration */
+typedef struct mrcp_session_request_vtable_t mrcp_session_request_vtable_t;
+/** MRCP session response vtable declaration */
+typedef struct mrcp_session_response_vtable_t mrcp_session_response_vtable_t;
+/** MRCP session event vtable declaration */
+typedef struct mrcp_session_event_vtable_t mrcp_session_event_vtable_t;
+
+
+/** MRCP session */
+struct mrcp_session_t {
+	/** Memory pool to allocate memory from */
+	apr_pool_t       *pool;
+	/** External object associated with session */
+	void             *obj;
+	/** Back pointer to signaling agent */
+	mrcp_sig_agent_t *signaling_agent;
+
+	/** Session identifier */
+	apt_str_t         id;
+	/** Last request identifier sent for client, received for server */
+	mrcp_request_id   last_request_id;
+
+	/** Virtual request methods */
+	const mrcp_session_request_vtable_t  *request_vtable;
+	/** Virtual response methods */
+	const mrcp_session_response_vtable_t *response_vtable;
+	/** Virtual event methods */
+	const mrcp_session_event_vtable_t    *event_vtable;
+};
+
+
+/** MRCP session request vtable */
+struct mrcp_session_request_vtable_t {
+	/** Offer session descriptor */
+	apt_bool_t (*offer)(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+	/** Terminate session */
+	apt_bool_t (*terminate)(mrcp_session_t *session);
+	/** Control session (MRCPv1 only) */
+	apt_bool_t (*control)(mrcp_session_t *session, mrcp_message_t *message);
+	/** Discover resources */
+	apt_bool_t (*discover)(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+};
+
+/** MRCP session response vtable */
+struct mrcp_session_response_vtable_t {
+	/** Answer with remote session descriptor */
+	apt_bool_t (*on_answer)(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+	/** Session terminated */
+	apt_bool_t (*on_terminate)(mrcp_session_t *session);
+	/** Control session (MRCPv1 only) */
+	apt_bool_t (*on_control)(mrcp_session_t *session, mrcp_message_t *message);
+	/** Response to resource discovery request */
+	apt_bool_t (*on_discover)(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+};
+
+/** MRCP session event vtable */
+struct mrcp_session_event_vtable_t {
+	/** Received session termination event without appropriate request */
+	apt_bool_t (*on_terminate)(mrcp_session_t *session);
+};
+
+
+/** Create new memory pool and allocate session object from the pool. */
+MRCP_DECLARE(mrcp_session_t*) mrcp_session_create(apr_size_t padding);
+
+/** Destroy session and assosiated memory pool. */
+MRCP_DECLARE(void) mrcp_session_destroy(mrcp_session_t *session);
+
+
+/** Offer */
+static APR_INLINE apt_bool_t mrcp_session_offer(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	if(session->request_vtable->offer) {
+		return session->request_vtable->offer(session,descriptor);
+	}
+	return FALSE;
+}
+
+/** Terminate */
+static APR_INLINE apt_bool_t mrcp_session_terminate_request(mrcp_session_t *session)
+{
+	if(session->request_vtable->terminate) {
+		return session->request_vtable->terminate(session);
+	}
+	return FALSE;
+}
+
+/** Answer */
+static APR_INLINE apt_bool_t mrcp_session_answer(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	if(session->response_vtable->on_answer) {
+		return session->response_vtable->on_answer(session,descriptor);
+	}
+	return FALSE;
+}
+
+/** On terminate response */
+static APR_INLINE apt_bool_t mrcp_session_terminate_response(mrcp_session_t *session)
+{
+	if(session->response_vtable->on_terminate) {
+		return session->response_vtable->on_terminate(session);
+	}
+	return FALSE;
+}
+
+/** On terminate event */
+static APR_INLINE apt_bool_t mrcp_session_terminate_event(mrcp_session_t *session)
+{
+	if(session->event_vtable->on_terminate) {
+		return session->event_vtable->on_terminate(session);
+	}
+	return FALSE;
+}
+
+/** Control request */
+static APR_INLINE apt_bool_t mrcp_session_control_request(mrcp_session_t *session, mrcp_message_t *message)
+{
+	if(session->request_vtable->control) {
+		return session->request_vtable->control(session,message);
+	}
+	return FALSE;
+}
+
+/** On control response/event */
+static APR_INLINE apt_bool_t mrcp_session_control_response(mrcp_session_t *session, mrcp_message_t *message)
+{
+	if(session->response_vtable->on_control) {
+		return session->response_vtable->on_control(session,message);
+	}
+	return FALSE;
+}
+
+/** Resource discovery request */
+static APR_INLINE apt_bool_t mrcp_session_discover_request(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	if(session->request_vtable->discover) {
+		return session->request_vtable->discover(session,descriptor);
+	}
+	return FALSE;
+}
+
+/** On resource discovery response */
+static APR_INLINE apt_bool_t mrcp_session_discover_response(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	if(session->response_vtable->on_discover) {
+		return session->response_vtable->on_discover(session,descriptor);
+	}
+	return FALSE;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SESSION_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_session_descriptor.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_session_descriptor.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SESSION_DESCRIPTOR_H__
+#define __MRCP_SESSION_DESCRIPTOR_H__
+
+/**
+ * @file mrcp_session_descriptor.h
+ * @brief MRCP Session Descriptor
+ */ 
+
+#include "mpf_rtp_descriptor.h"
+#include "mrcp_sig_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP session status */
+typedef enum {
+	MRCP_SESSION_STATUS_OK,			          /**< OK */
+	MRCP_SESSION_STATUS_NO_SUCH_RESOURCE,     /**< no such resource found */
+	MRCP_SESSION_STATUS_UNACCEPTABLE_RESOURCE,/**< resource exists, but no implementation (plugin) found */
+	MRCP_SESSION_STATUS_UNAVAILABLE_RESOURCE, /**< resource exists, but is temporary unavailable */
+	MRCP_SESSION_STATUS_ERROR                 /**< internal error occuried */
+} mrcp_session_status_e;
+
+/** MRCP session descriptor */
+struct mrcp_session_descriptor_t {
+	/** SDP origin */
+	apt_str_t             origin;
+	/** Session level IP address */
+	apt_str_t             ip;
+	/** Session level external (NAT) IP address */
+	apt_str_t             ext_ip;
+	/** Session level resource name (MRCPv1 only) */
+	apt_str_t             resource_name;
+	/** Resource state (MRCPv1 only) */
+	apt_bool_t            resource_state;
+	/** Session status */
+	mrcp_session_status_e status;
+
+	/** MRCP control media array (mrcp_control_descriptor_t) */
+	apr_array_header_t   *control_media_arr;
+	/** Audio media array (mpf_rtp_media_descriptor_t) */
+	apr_array_header_t   *audio_media_arr;
+	/** Video media array (mpf_rtp_media_descriptor_t) */
+	apr_array_header_t   *video_media_arr;
+};
+
+/** Create session descriptor  */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_session_descriptor_create(apr_pool_t *pool);
+
+static APR_INLINE apr_size_t mrcp_session_media_count_get(const mrcp_session_descriptor_t *descriptor)
+{
+	return descriptor->control_media_arr->nelts + descriptor->audio_media_arr->nelts + descriptor->video_media_arr->nelts;
+}
+
+static APR_INLINE apr_size_t mrcp_session_control_media_add(mrcp_session_descriptor_t *descriptor, void *media)
+{
+	void **slot = apr_array_push(descriptor->control_media_arr);
+	*slot = media;
+	return mrcp_session_media_count_get(descriptor) - 1;
+}
+
+static APR_INLINE void* mrcp_session_control_media_get(const mrcp_session_descriptor_t *descriptor, apr_size_t id)
+{
+	if((int)id >= descriptor->control_media_arr->nelts) {
+		return NULL;
+	}
+	return ((void**)descriptor->control_media_arr->elts)[id];
+}
+
+static APR_INLINE apt_bool_t mrcp_session_control_media_set(mrcp_session_descriptor_t *descriptor, apr_size_t id, void *media)
+{
+	if((int)id >= descriptor->control_media_arr->nelts) {
+		return FALSE;
+	}
+	((void**)descriptor->control_media_arr->elts)[id] = media;
+	return TRUE;
+}
+
+
+static APR_INLINE apr_size_t mrcp_session_audio_media_add(mrcp_session_descriptor_t *descriptor, mpf_rtp_media_descriptor_t *media)
+{
+	mpf_rtp_media_descriptor_t **slot = apr_array_push(descriptor->audio_media_arr);
+	*slot = media;
+	return mrcp_session_media_count_get(descriptor) - 1;
+}
+
+static APR_INLINE mpf_rtp_media_descriptor_t* mrcp_session_audio_media_get(const mrcp_session_descriptor_t *descriptor, apr_size_t id)
+{
+	if((int)id >= descriptor->audio_media_arr->nelts) {
+		return NULL;
+	}
+	return ((mpf_rtp_media_descriptor_t**)descriptor->audio_media_arr->elts)[id];
+}
+
+static APR_INLINE apt_bool_t mrcp_session_audio_media_set(const mrcp_session_descriptor_t *descriptor, apr_size_t id, mpf_rtp_media_descriptor_t* media)
+{
+	if((int)id >= descriptor->audio_media_arr->nelts) {
+		return FALSE;
+	}
+	((mpf_rtp_media_descriptor_t**)descriptor->audio_media_arr->elts)[id] = media;
+	return TRUE;
+}
+
+
+static APR_INLINE apr_size_t mrcp_session_video_media_add(mrcp_session_descriptor_t *descriptor, mpf_rtp_media_descriptor_t *media)
+{
+	mpf_rtp_media_descriptor_t **slot = apr_array_push(descriptor->video_media_arr);
+	*slot = media;
+	return mrcp_session_media_count_get(descriptor) - 1;
+}
+
+static APR_INLINE mpf_rtp_media_descriptor_t* mrcp_session_video_media_get(const mrcp_session_descriptor_t *descriptor, apr_size_t id)
+{
+	if((int)id >= descriptor->video_media_arr->nelts) {
+		return NULL;
+	}
+	return ((mpf_rtp_media_descriptor_t**)descriptor->video_media_arr->elts)[id];
+}
+
+static APR_INLINE apt_bool_t mrcp_session_video_media_set(mrcp_session_descriptor_t *descriptor, apr_size_t id, mpf_rtp_media_descriptor_t* media)
+{
+	if((int)id >= descriptor->video_media_arr->nelts) {
+		return FALSE;
+	}
+	((mpf_rtp_media_descriptor_t**)descriptor->video_media_arr->elts)[id] = media;
+	return TRUE;
+}
+
+/** Get session status phrase  */
+MRCP_DECLARE(const char*) mrcp_session_status_phrase_get(mrcp_session_status_e status);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SESSION_DESCRIPTOR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_sig_agent.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_sig_agent.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SIG_AGENT_H__
+#define __MRCP_SIG_AGENT_H__
+
+/**
+ * @file mrcp_sig_agent.h
+ * @brief Abstract MRCP Signaling Agent
+ */ 
+
+#include "mrcp_sig_types.h"
+#include "apt_task.h"
+
+APT_BEGIN_EXTERN_C
+
+
+/** MRCP signaling agent  */
+struct mrcp_sig_agent_t {
+	/** Memory pool to allocate memory from */
+	apr_pool_t          *pool;
+	/** External object associated with agent */
+	void                *obj;
+	/** Parent object (client/server) */
+	void                *parent;
+	/** MRCP version */
+	mrcp_version_e       mrcp_version;
+	/** MRCP resource factory */
+	mrcp_resource_factory_t *resource_factory;
+	/** Task interface */
+	apt_task_t          *task;
+	/** Task message pool used to allocate signaling agent messages */
+	apt_task_msg_pool_t *msg_pool;
+
+	/** Virtual create_server_session */
+	mrcp_session_t* (*create_server_session)(mrcp_sig_agent_t *signaling_agent);
+	/** Virtual create_client_session */
+	apt_bool_t (*create_client_session)(mrcp_session_t *session);
+};
+
+/** Create signaling agent. */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_signaling_agent_create(void *obj, mrcp_version_e mrcp_version, apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SIG_AGENT_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_sig_types.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/include/mrcp_sig_types.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SIG_TYPES_H__
+#define __MRCP_SIG_TYPES_H__
+
+/**
+ * @file mrcp_sig_types.h
+ * @brief MRCP Signaling Types Declaration
+ */ 
+
+#include "mrcp_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque MRCP signaling agent declaration */
+typedef struct mrcp_sig_agent_t mrcp_sig_agent_t;
+
+/** Opaque MRCP session declaration */
+typedef struct mrcp_session_t mrcp_session_t;
+
+/** Opaque MRCP session descriptor declaration */
+typedef struct mrcp_session_descriptor_t mrcp_session_descriptor_t;
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SIG_TYPES_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,165 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/src/mrcp_session_descriptor.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/src/mrcp_session_descriptor.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_session_descriptor.h"
+
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_session_descriptor_create(apr_pool_t *pool)
+{
+	mrcp_session_descriptor_t *descriptor = apr_palloc(pool,sizeof(mrcp_session_descriptor_t));
+	apt_string_reset(&descriptor->origin);
+	apt_string_reset(&descriptor->ip);
+	apt_string_reset(&descriptor->ext_ip);
+	apt_string_reset(&descriptor->resource_name);
+	descriptor->resource_state = FALSE;
+	descriptor->status = MRCP_SESSION_STATUS_OK;
+	descriptor->control_media_arr = apr_array_make(pool,1,sizeof(void*));
+	descriptor->audio_media_arr = apr_array_make(pool,1,sizeof(mpf_rtp_media_descriptor_t*));
+	descriptor->video_media_arr = apr_array_make(pool,0,sizeof(mpf_rtp_media_descriptor_t*));
+	return descriptor;
+}
+
+MRCP_DECLARE(const char*) mrcp_session_status_phrase_get(mrcp_session_status_e status)
+{
+	switch(status) {
+		case MRCP_SESSION_STATUS_OK:
+			return "OK";
+		case MRCP_SESSION_STATUS_NO_SUCH_RESOURCE:
+			return "Not Found";
+		case MRCP_SESSION_STATUS_UNACCEPTABLE_RESOURCE:
+			return "Not Acceptable";
+		case MRCP_SESSION_STATUS_UNAVAILABLE_RESOURCE:
+			return "Unavailable";
+		case MRCP_SESSION_STATUS_ERROR:
+			return "Error";
+	}
+	return "Unknown";
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/src/mrcp_sig_agent.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/src/mrcp_sig_agent.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_sig_agent.h"
+#include "mrcp_session.h"
+#include "apt_pool.h"
+
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_signaling_agent_create(void *obj, mrcp_version_e mrcp_version, apr_pool_t *pool)
+{
+	mrcp_sig_agent_t *sig_agent = apr_palloc(pool,sizeof(mrcp_sig_agent_t));
+	sig_agent->pool = pool;
+	sig_agent->obj = obj;
+	sig_agent->mrcp_version = mrcp_version;
+	sig_agent->resource_factory = NULL;
+	sig_agent->parent = NULL;
+	sig_agent->task = NULL;
+	sig_agent->msg_pool = NULL;
+	sig_agent->create_server_session = NULL;
+	sig_agent->create_client_session = NULL;
+	return sig_agent;
+}
+
+MRCP_DECLARE(mrcp_session_t*) mrcp_session_create(apr_size_t padding)
+{
+	mrcp_session_t *session;
+	apr_pool_t *pool = apt_pool_create();
+	if(!pool) {
+		return NULL;
+	}
+	session = apr_palloc(pool,sizeof(mrcp_session_t)+padding);
+	session->pool = pool;
+	session->obj = NULL;
+	session->signaling_agent = NULL;
+	session->request_vtable = NULL;
+	session->response_vtable = NULL;
+	session->event_vtable = NULL;
+	apt_string_reset(&session->id);
+	session->last_request_id = 0;
+	return session;
+}
+
+MRCP_DECLARE(void) mrcp_session_destroy(mrcp_session_t *session)
+{
+	if(session->pool) {
+		apr_pool_destroy(session->pool);
+	}
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,42 @@
+MAINTAINERCLEANFILES 	 = Makefile.in
+
+INCLUDES                 = -I$(top_srcdir)/libs/mrcp/include \
+                           -I$(top_srcdir)/libs/mrcp/message/include \
+                           -I$(top_srcdir)/libs/mrcp/control/include \
+                           -I$(top_srcdir)/libs/mrcp/resources/include \
+                           -I$(top_srcdir)/libs/apr-toolkit/include \
+                           $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES       = libmrcp.la
+
+include_HEADERS          = include/mrcp.h \
+                           include/mrcp_types.h \
+                           message/include/mrcp_header_accessor.h \
+                           message/include/mrcp_generic_header.h \
+                           message/include/mrcp_message.h \
+                           control/include/mrcp_state_machine.h \
+                           control/include/mrcp_resource.h \
+                           control/include/mrcp_resource_factory.h \
+                           control/include/mrcp_stream.h \
+                           resources/include/mrcp_synth_header.h \
+                           resources/include/mrcp_synth_resource.h \
+                           resources/include/mrcp_synth_state_machine.h \
+                           resources/include/mrcp_recog_header.h \
+                           resources/include/mrcp_recog_resource.h \
+                           resources/include/mrcp_recog_state_machine.h \
+                           resources/include/mrcp_default_factory.h
+
+libmrcp_la_SOURCES       = message/src/mrcp_header_accessor.c \
+                           message/src/mrcp_generic_header.c \
+                           message/src/mrcp_message.c \
+                           control/src/mrcp_resource_factory.c \
+                           control/src/mrcp_stream.c \
+                           resources/src/mrcp_synth_header.c \
+                           resources/src/mrcp_synth_resource.c \
+                           resources/src/mrcp_synth_server_state_machine.c \
+                           resources/src/mrcp_synth_client_state_machine.c \
+                           resources/src/mrcp_recog_header.c \
+                           resources/src/mrcp_recog_resource.c \
+                           resources/src/mrcp_recog_server_state_machine.c \
+                           resources/src/mrcp_recog_client_state_machine.c \
+                           resources/src/mrcp_default_factory.c

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_resource.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_resource.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_RESOURCE_H__
+#define __MRCP_RESOURCE_H__
+
+/**
+ * @file mrcp_resource.h
+ * @brief Abstract MRCP Resource
+ */ 
+
+#include "mrcp_types.h"
+#include "mrcp_header_accessor.h"
+#include "mrcp_state_machine.h"
+
+APT_BEGIN_EXTERN_C
+
+
+/** MRCP resource definition */
+struct mrcp_resource_t {
+	/** MRCP resource identifier */
+	mrcp_resource_id            id;
+
+	/** Set resource specific data in a message by resource id */
+	apt_bool_t (*resourcify_message_by_id)(mrcp_resource_t *resource, mrcp_message_t *message);
+	/** Set resource specific data in a message by resource name */
+	apt_bool_t (*resourcify_message_by_name)(mrcp_resource_t *resource, mrcp_message_t *message);
+
+	/** Create client side state machine */
+	mrcp_state_machine_t* (*create_client_state_machine)(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool);
+	/** Create server side state machine */
+	mrcp_state_machine_t* (*create_server_state_machine)(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool);
+};
+
+/** Initialize MRCP resource */
+static APR_INLINE void mrcp_resource_init(mrcp_resource_t *resource)
+{
+	resource->resourcify_message_by_id = NULL;
+	resource->resourcify_message_by_name = NULL;
+	resource->create_client_state_machine = NULL;
+	resource->create_server_state_machine = NULL;
+}
+
+/** Validate MRCP resource */
+static APR_INLINE apt_bool_t mrcp_resource_validate(mrcp_resource_t *resource)
+{
+	return (resource->resourcify_message_by_id && 
+		resource->resourcify_message_by_name) ? TRUE : FALSE;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_RESOURCE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_resource_factory.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_resource_factory.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_RESOURCE_FACTORY_H__
+#define __MRCP_RESOURCE_FACTORY_H__
+
+/**
+ * @file mrcp_resource_factory.h
+ * @brief Aggregation of MRCP Resources
+ */ 
+
+#include "apt_string_table.h"
+#include "apt_text_stream.h"
+#include "mrcp_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Create MRCP resource factory */
+MRCP_DECLARE(mrcp_resource_factory_t*) mrcp_resource_factory_create(apr_size_t resource_count, apr_pool_t *pool);
+
+/** Destroy MRCP resource factory */
+MRCP_DECLARE(apt_bool_t) mrcp_resource_factory_destroy(mrcp_resource_factory_t *resource_factory);
+
+/** Set MRCP resource string table */
+MRCP_DECLARE(apt_bool_t) mrcp_resource_string_table_set(mrcp_resource_factory_t *resource_factory, const apt_str_table_item_t *string_table);
+
+/** Register MRCP resource */
+MRCP_DECLARE(apt_bool_t) mrcp_resource_register(mrcp_resource_factory_t *resource_factory, mrcp_resource_t *resource, mrcp_resource_id resource_id);
+
+/** Get MRCP resource by resource id */
+MRCP_DECLARE(mrcp_resource_t*) mrcp_resource_get(mrcp_resource_factory_t *resource_factory, mrcp_resource_id resource_id);
+
+/** Get resource name associated with specified resource id */
+MRCP_DECLARE(const apt_str_t*) mrcp_resource_name_get(mrcp_resource_factory_t *resource_factory, mrcp_resource_id resource_id);
+
+/** Find resource id associated with specified resource name */
+MRCP_DECLARE(mrcp_resource_id) mrcp_resource_id_find(mrcp_resource_factory_t *resource_factory, const apt_str_t *resource_name);
+
+
+/** Associate MRCP resource specific data by resource identifier */
+MRCP_DECLARE(apt_bool_t) mrcp_message_resourcify_by_id(mrcp_resource_factory_t *resource_factory, mrcp_message_t *message);
+
+/** Associate MRCP resource specific data by resource name */
+MRCP_DECLARE(apt_bool_t) mrcp_message_resourcify_by_name(mrcp_resource_factory_t *resource_factory, mrcp_message_t *message);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_RESOURCE_FACTORY_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_state_machine.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_state_machine.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_STATE_MACHINE_H__
+#define __MRCP_STATE_MACHINE_H__
+
+/**
+ * @file mrcp_state_machine.h
+ * @brief MRCP State Machine
+ */ 
+
+#include "mrcp_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP state machine declaration */
+typedef struct mrcp_state_machine_t mrcp_state_machine_t;
+
+/** MRCP message dispatcher */
+typedef apt_bool_t (*mrcp_message_dispatcher_f)(mrcp_state_machine_t *state_machine, mrcp_message_t *message);
+
+
+/** MRCP state machine */
+struct mrcp_state_machine_t {
+	/** External object associated with state machine */
+	void *obj;
+	/** Message dispatcher */
+	mrcp_message_dispatcher_f dispatcher;
+
+	/** Virtual update */
+	apt_bool_t (*update)(mrcp_state_machine_t *state_machine, mrcp_message_t *message);
+};
+
+/** Initialize MRCP state machine */
+static APR_INLINE void mrcp_state_machine_init(mrcp_state_machine_t *state_machine, void *obj, mrcp_message_dispatcher_f dispatcher)
+{
+	state_machine->obj = obj;
+	state_machine->dispatcher = dispatcher;
+}
+
+/** Update MRCP state machine */
+static APR_INLINE apt_bool_t mrcp_state_machine_update(mrcp_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	return state_machine->update(state_machine,message);
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_STATE_MACHINE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_stream.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/control/include/mrcp_stream.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_STREAM_H__
+#define __MRCP_STREAM_H__
+
+/**
+ * @file mrcp_stream.h
+ * @brief MRCP Stream Parser and Generator
+ */ 
+
+#include "apt_text_stream.h"
+#include "mrcp_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Result of MRCP stream processing (parse/generate) */
+typedef enum {
+	MRCP_STREAM_MESSAGE_COMPLETE,
+	MRCP_STREAM_MESSAGE_TRUNCATED,
+	MRCP_STREAM_MESSAGE_INVALID
+} mrcp_stream_result_e;
+
+/** Opaque MRCP parser declaration */
+typedef struct mrcp_parser_t mrcp_parser_t;
+/** Opaque MRCP generator declaration */
+typedef struct mrcp_generator_t mrcp_generator_t;
+
+/** MRCP message handler */
+typedef apt_bool_t (*mrcp_message_handler_f)(void *obj, mrcp_message_t *message, mrcp_stream_result_e result);
+
+/** Parse MRCP message (excluding message body) */
+MRCP_DECLARE(apt_bool_t) mrcp_message_parse(mrcp_resource_factory_t *resource_factory, mrcp_message_t *message, apt_text_stream_t *stream);
+
+/** Generate MRCP message (excluding message body) */
+MRCP_DECLARE(apt_bool_t) mrcp_message_generate(mrcp_resource_factory_t *resource_factory, mrcp_message_t *message, apt_text_stream_t *stream);
+
+
+/** Create MRCP stream parser */
+MRCP_DECLARE(mrcp_parser_t*) mrcp_parser_create(mrcp_resource_factory_t *resource_factory, apr_pool_t *pool);
+
+/** Set resource name to be used while parsing (MRCPv1 only) */
+MRCP_DECLARE(void) mrcp_parser_resource_name_set(mrcp_parser_t *parser, const apt_str_t *resource_name);
+
+/** Parse MRCP stream */
+MRCP_DECLARE(mrcp_stream_result_e) mrcp_parser_run(mrcp_parser_t *parser, apt_text_stream_t *stream);
+
+/** Get parsed MRCP message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_parser_message_get(const mrcp_parser_t *parser);
+
+
+/** Create MRCP stream generator */
+MRCP_DECLARE(mrcp_generator_t*) mrcp_generator_create(mrcp_resource_factory_t *resource_factory, apr_pool_t *pool);
+
+/** Set MRCP message to generate */
+MRCP_DECLARE(apt_bool_t) mrcp_generator_message_set(mrcp_generator_t *generator, mrcp_message_t *message);
+
+/** Generate MRCP stream */
+MRCP_DECLARE(mrcp_stream_result_e) mrcp_generator_run(mrcp_generator_t *generator, apt_text_stream_t *stream);
+
+/** Walk through MRCP stream and call message handler for each parsed message */
+MRCP_DECLARE(apt_bool_t) mrcp_stream_walk(mrcp_parser_t *parser, apt_text_stream_t *stream, mrcp_message_handler_f handler, void *obj);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_STREAM_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/control/src/mrcp_resource_factory.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/control/src/mrcp_resource_factory.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_resource_factory.h"
+#include "mrcp_message.h"
+#include "mrcp_resource.h"
+#include "mrcp_generic_header.h"
+
+/** Resource factory definition (aggregation of resources) */
+struct mrcp_resource_factory_t {
+	/** Array of MRCP resources */
+	mrcp_resource_t           **resource_array;
+	/** Number of MRCP resources */
+	apr_size_t                  resource_count;
+	/** String table of MRCP resource names */
+	const apt_str_table_item_t *string_table;
+};
+
+/** Create MRCP resource factory */
+MRCP_DECLARE(mrcp_resource_factory_t*) mrcp_resource_factory_create(apr_size_t resource_count, apr_pool_t *pool)
+{
+	apr_size_t i;
+	mrcp_resource_factory_t *resource_factory;
+	if(resource_count == 0) {
+		return NULL;
+	}
+
+	resource_factory = apr_palloc(pool,sizeof(mrcp_resource_factory_t));
+	resource_factory->resource_count = resource_count;
+	resource_factory->resource_array = apr_palloc(pool,sizeof(mrcp_resource_t*)*resource_count);
+	for(i=0; iresource_array[i] = NULL;
+	}
+	resource_factory->string_table = NULL;
+	
+	return resource_factory;
+}
+
+/** Destroy MRCP resource container */
+MRCP_DECLARE(apt_bool_t) mrcp_resource_factory_destroy(mrcp_resource_factory_t *resource_factory)
+{
+	if(resource_factory->resource_array) {
+		resource_factory->resource_array = NULL;
+	}
+	resource_factory->resource_count = 0;
+	return TRUE;
+}
+
+/** Set MRCP resource string table */
+MRCP_DECLARE(apt_bool_t) mrcp_resource_string_table_set(mrcp_resource_factory_t *resource_factory, const apt_str_table_item_t *string_table)
+{
+	resource_factory->string_table = string_table;
+	return TRUE;
+}
+
+/** Register MRCP resource */
+MRCP_DECLARE(apt_bool_t) mrcp_resource_register(mrcp_resource_factory_t *resource_factory, mrcp_resource_t *resource, mrcp_resource_id resource_id)
+{	
+	if(!resource || resource_id >= resource_factory->resource_count) {
+		/* invalid params */
+		return FALSE;
+	}
+	if(resource_factory->resource_array[resource_id]) {
+		/* resource with specified id already exists */
+		return FALSE;
+	}
+	resource->id = resource_id;
+	if(mrcp_resource_validate(resource) != TRUE) {
+		/* invalid resource */
+		return FALSE;
+	}
+	resource_factory->resource_array[resource->id] = resource;
+	return TRUE;
+}
+
+/** Get MRCP resource by resource id */
+MRCP_DECLARE(mrcp_resource_t*) mrcp_resource_get(mrcp_resource_factory_t *resource_factory, mrcp_resource_id resource_id)
+{
+	if(resource_id >= resource_factory->resource_count) {
+		return NULL;
+	}
+	return resource_factory->resource_array[resource_id];
+}
+
+
+/** Set header accessor interface */
+static APR_INLINE void mrcp_generic_header_accessor_set(mrcp_message_t *message)
+{
+	message->header.generic_header_accessor.vtable = mrcp_generic_header_vtable_get(message->start_line.version);
+}
+
+/** Associate MRCP resource specific data by resource identifier */
+MRCP_DECLARE(apt_bool_t) mrcp_message_resourcify_by_id(mrcp_resource_factory_t *resource_factory, mrcp_message_t *message)
+{
+	mrcp_resource_t *resource;
+	const apt_str_t *name;
+	resource = mrcp_resource_get(resource_factory,message->channel_id.resource_id);
+	if(!resource) {
+		return FALSE;
+	}
+	name = mrcp_resource_name_get(resource_factory,resource->id);
+	if(!name) {
+		return FALSE;
+	}
+	/* associate resource_name and resource_id */
+	message->channel_id.resource_name = *name;
+
+	mrcp_generic_header_accessor_set(message);
+	return resource->resourcify_message_by_id(resource,message);
+}
+
+/** Associate MRCP resource specific data by resource name */
+MRCP_DECLARE(apt_bool_t) mrcp_message_resourcify_by_name(mrcp_resource_factory_t *resource_factory, mrcp_message_t *message)
+{
+	mrcp_resource_t *resource;
+	/* associate resource_name and resource_id */
+	const apt_str_t *name = &message->channel_id.resource_name;
+	message->channel_id.resource_id = mrcp_resource_id_find(resource_factory,name);
+	resource = mrcp_resource_get(resource_factory,message->channel_id.resource_id);
+	if(!resource) {
+		return FALSE;
+	}
+
+	mrcp_generic_header_accessor_set(message);
+	return resource->resourcify_message_by_name(resource,message);
+}
+
+/** Get resource name associated with specified resource id */
+MRCP_DECLARE(const apt_str_t*) mrcp_resource_name_get(mrcp_resource_factory_t *resource_factory, mrcp_resource_id resource_id)
+{
+	return apt_string_table_str_get(resource_factory->string_table,resource_factory->resource_count,resource_id);
+}
+
+/** Find resource id associated with specified resource name */
+MRCP_DECLARE(mrcp_resource_id) mrcp_resource_id_find(mrcp_resource_factory_t *resource_factory, const apt_str_t *resource_name)
+{
+	return apt_string_table_id_find(resource_factory->string_table,resource_factory->resource_count,resource_name);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/control/src/mrcp_stream.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/control/src/mrcp_stream.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,360 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_stream.h"
+#include "mrcp_message.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_resource_factory.h"
+#include "apt_log.h"
+
+/** MRCP parser */
+struct mrcp_parser_t {
+	mrcp_resource_factory_t *resource_factory;
+	apt_str_t                resource_name;
+	mrcp_stream_result_e     result;
+	char                    *pos;
+	apt_bool_t               skip_lf;
+	mrcp_message_t          *message;
+	apr_pool_t              *pool;
+};
+
+/** MRCP generator */
+struct mrcp_generator_t {
+	mrcp_resource_factory_t *resource_factory;
+	mrcp_stream_result_e     result;
+	char                    *pos;
+	mrcp_message_t          *message;
+	apr_pool_t              *pool;
+};
+
+
+/** Read MRCP message-body */
+static mrcp_stream_result_e mrcp_message_body_read(mrcp_message_t *message, apt_text_stream_t *stream)
+{
+	mrcp_stream_result_e result = MRCP_STREAM_MESSAGE_COMPLETE;
+	if(message->body.buf) {
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_get(message);
+		/* stream length available to read */
+		apr_size_t stream_length = stream->text.length - (stream->pos - stream->text.buf);
+		/* required/remaining length to read */
+		apr_size_t required_length = generic_header->content_length - message->body.length;
+		if(required_length > stream_length) {
+			required_length = stream_length;
+			/* not complete */
+			result = MRCP_STREAM_MESSAGE_TRUNCATED;
+		}
+		memcpy(message->body.buf+message->body.length,stream->pos,required_length);
+		message->body.length += required_length;
+		stream->pos += required_length;
+		message->body.buf[message->body.length] = '\0';
+	}
+
+	return result;
+}
+
+/** Parse MRCP message-body */
+static mrcp_stream_result_e mrcp_message_body_parse(mrcp_message_t *message, apt_text_stream_t *stream, apr_pool_t *pool)
+{
+	if(mrcp_generic_header_property_check(message,GENERIC_HEADER_CONTENT_LENGTH) == TRUE) {
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_get(message);
+		if(generic_header && generic_header->content_length) {
+			apt_str_t *body = &message->body;
+			body->buf = apr_palloc(pool,generic_header->content_length+1);
+			body->length = 0;
+			return mrcp_message_body_read(message,stream);
+		}
+	}
+	return MRCP_STREAM_MESSAGE_COMPLETE;
+}
+
+/** Write MRCP message-body */
+static mrcp_stream_result_e mrcp_message_body_write(mrcp_message_t *message, apt_text_stream_t *stream)
+{
+	mrcp_stream_result_e result = MRCP_STREAM_MESSAGE_COMPLETE;
+	mrcp_generic_header_t *generic_header = mrcp_generic_header_get(message);
+	if(generic_header && message->body.length < generic_header->content_length) {
+		/* stream length available to write */
+		apr_size_t stream_length = stream->text.length - (stream->pos - stream->text.buf);
+		/* required/remaining length to write */
+		apr_size_t required_length = generic_header->content_length - message->body.length;
+		if(required_length > stream_length) {
+			required_length = stream_length;
+			/* not complete */
+			result = MRCP_STREAM_MESSAGE_TRUNCATED;
+		}
+
+		memcpy(stream->pos,message->body.buf+message->body.length,required_length);
+		message->body.length += required_length;
+		stream->pos += required_length;
+	}
+
+	return result;
+}
+
+/** Generate MRCP message-body */
+static mrcp_stream_result_e mrcp_message_body_generate(mrcp_message_t *message, apt_text_stream_t *stream)
+{
+	if(mrcp_generic_header_property_check(message,GENERIC_HEADER_CONTENT_LENGTH) == TRUE) {
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_get(message);
+		if(generic_header && generic_header->content_length) {
+			apt_str_t *body = &message->body;
+			body->length = 0;
+			return mrcp_message_body_write(message,stream);
+		}
+	}
+	return MRCP_STREAM_MESSAGE_COMPLETE;
+}
+
+/** Parse MRCP message (excluding message body) */
+MRCP_DECLARE(apt_bool_t) mrcp_message_parse(mrcp_resource_factory_t *resource_factory, mrcp_message_t *message, apt_text_stream_t *stream)
+{
+	/* parse start-line */
+	if(mrcp_start_line_parse(&message->start_line,stream,message->pool) == FALSE) {
+		return FALSE;
+	}
+
+	if(message->start_line.version == MRCP_VERSION_2) {
+		mrcp_channel_id_parse(&message->channel_id,stream,message->pool);
+	}
+
+	if(mrcp_message_resourcify_by_name(resource_factory,message) == FALSE) {
+		return FALSE;
+	}
+
+	/* parse header */
+	if(mrcp_message_header_parse(&message->header,stream,message->pool) == FALSE) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/** Generate MRCP message (excluding message body) */
+MRCP_DECLARE(apt_bool_t) mrcp_message_generate(mrcp_resource_factory_t *resource_factory, mrcp_message_t *message, apt_text_stream_t *stream)
+{
+	/* initialize resource specific data */
+	if(mrcp_message_resourcify_by_id(resource_factory,message) == FALSE) {
+		return FALSE;
+	}
+
+	/* validate message */
+	if(mrcp_message_validate(message) == FALSE) {
+		return FALSE;
+	}
+	
+	/* generate start-line */
+	if(mrcp_start_line_generate(&message->start_line,stream) == FALSE) {
+		return FALSE;
+	}
+
+	if(message->start_line.version == MRCP_VERSION_2) {
+		mrcp_channel_id_generate(&message->channel_id,stream);
+	}
+
+	/* generate header */
+	if(mrcp_message_header_generate(&message->header,stream) == FALSE) {
+		return FALSE;
+	}
+
+	/* finalize start-line generation */
+	mrcp_start_line_finalize(&message->start_line,message->body.length,stream);
+	return TRUE;
+}
+
+
+/** Create MRCP stream parser */
+MRCP_DECLARE(mrcp_parser_t*) mrcp_parser_create(mrcp_resource_factory_t *resource_factory, apr_pool_t *pool)
+{
+	mrcp_parser_t *parser = apr_palloc(pool,sizeof(mrcp_parser_t));
+	parser->resource_factory = resource_factory;
+	apt_string_reset(&parser->resource_name);
+	parser->result = MRCP_STREAM_MESSAGE_INVALID;
+	parser->pos = NULL;
+	parser->skip_lf = FALSE;
+	parser->message = NULL;
+	parser->pool = pool;
+	return parser;
+}
+
+/** Set resource name to be used while parsing (MRCPv1 only) */
+MRCP_DECLARE(void) mrcp_parser_resource_name_set(mrcp_parser_t *parser, const apt_str_t *resource_name)
+{
+	if(resource_name) {
+		apt_string_copy(&parser->resource_name,resource_name,parser->pool);
+	}
+}
+
+static mrcp_stream_result_e mrcp_parser_break(mrcp_parser_t *parser, apt_text_stream_t *stream)
+{
+	/* failed to parse either start-line or header */
+	if(apt_text_is_eos(stream) == TRUE) {
+		/* end of stream reached, rewind/restore stream */
+		stream->pos = parser->pos;
+		parser->result = MRCP_STREAM_MESSAGE_TRUNCATED;
+		parser->message = NULL;
+	}
+	else {
+		/* error case */
+		parser->result = MRCP_STREAM_MESSAGE_INVALID;
+	}
+	return parser->result;
+}
+
+/** Parse MRCP stream */
+MRCP_DECLARE(mrcp_stream_result_e) mrcp_parser_run(mrcp_parser_t *parser, apt_text_stream_t *stream)
+{
+	mrcp_message_t *message = parser->message;
+	if(message && parser->result == MRCP_STREAM_MESSAGE_TRUNCATED) {
+		/* process continuation data */
+		parser->result = mrcp_message_body_read(message,stream);
+		return parser->result;
+	}
+	
+	/* create new MRCP message */
+	message = mrcp_message_create(parser->pool);
+	message->channel_id.resource_name = parser->resource_name;
+	parser->message = message;
+	/* store current position to be able to rewind/restore stream if needed */
+	parser->pos = stream->pos;
+
+	/* parse start-line and header */
+	if(mrcp_message_parse(parser->resource_factory,message,stream) == FALSE) {
+		return mrcp_parser_break(parser,stream);
+	}
+
+	/* parse body */
+	parser->result = mrcp_message_body_parse(message,stream,message->pool);
+
+	/* in the worst case message segmentation may occur between  and  
+	   of the final empty header */
+	if(!message->body.length && *(stream->pos-1)== APT_TOKEN_CR) {
+		/* if this is the case be prepared to skip  */
+		parser->skip_lf = TRUE;
+	}
+	return parser->result;
+}
+
+/** Get parsed MRCP message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_parser_message_get(const mrcp_parser_t *parser)
+{
+	return parser->message;
+}
+
+
+/** Create MRCP stream generator */
+MRCP_DECLARE(mrcp_generator_t*) mrcp_generator_create(mrcp_resource_factory_t *resource_factory, apr_pool_t *pool)
+{
+	mrcp_generator_t *generator = apr_palloc(pool,sizeof(mrcp_generator_t));
+	generator->resource_factory = resource_factory;
+	generator->result = MRCP_STREAM_MESSAGE_INVALID;
+	generator->pos = NULL;
+	generator->message = NULL;
+	generator->pool = pool;
+	return generator;
+}
+
+/** Set MRCP message to generate */
+MRCP_DECLARE(apt_bool_t) mrcp_generator_message_set(mrcp_generator_t *generator, mrcp_message_t *message)
+{
+	if(!message) {
+		return FALSE;
+	}
+	generator->message = message;
+	return TRUE;
+}
+
+static mrcp_stream_result_e mrcp_generator_break(mrcp_generator_t *generator, apt_text_stream_t *stream)
+{
+	/* failed to generate either start-line or header */
+	if(apt_text_is_eos(stream) == TRUE) {
+		/* end of stream reached, rewind/restore stream */
+		stream->pos = generator->pos;
+		generator->result = MRCP_STREAM_MESSAGE_TRUNCATED;
+	}
+	else {
+		/* error case */
+		generator->result = MRCP_STREAM_MESSAGE_INVALID;
+	}
+	return generator->result;
+}
+
+/** Generate MRCP stream */
+MRCP_DECLARE(mrcp_stream_result_e) mrcp_generator_run(mrcp_generator_t *generator, apt_text_stream_t *stream)
+{
+	mrcp_message_t *message = generator->message;
+	if(!message) {
+		return MRCP_STREAM_MESSAGE_INVALID;
+	}
+
+	if(message && generator->result == MRCP_STREAM_MESSAGE_TRUNCATED) {
+		/* process continuation data */
+		generator->result = mrcp_message_body_write(message,stream);
+		return generator->result;
+	}
+
+	/* generate start-line and header */
+	if(mrcp_message_generate(generator->resource_factory,message,stream) == FALSE) {
+		return mrcp_generator_break(generator,stream);
+	}
+
+	/* generate body */
+	generator->result = mrcp_message_body_generate(message,stream);
+	return generator->result;
+}
+
+
+/** Walk through MRCP stream and invoke message handler for each parsed message */
+MRCP_DECLARE(apt_bool_t) mrcp_stream_walk(mrcp_parser_t *parser, apt_text_stream_t *stream, mrcp_message_handler_f handler, void *obj)
+{
+	mrcp_stream_result_e result;
+	if(parser->skip_lf == TRUE) {
+		/* skip  occurred as a result of message segmentation between  and  */
+		apt_text_char_skip(stream,APT_TOKEN_LF);
+		parser->skip_lf = FALSE;
+	}
+	do {
+		result = mrcp_parser_run(parser,stream);
+		if(result == MRCP_STREAM_MESSAGE_COMPLETE) {
+			/* message is completely parsed */
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Parsed MRCP Message [%lu]", stream->pos - stream->text.buf);
+			/* invoke message handler */
+			handler(obj,parser->message,result);
+		}
+		else if(result == MRCP_STREAM_MESSAGE_TRUNCATED) {
+			/* message is partially parsed, to be continued */
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Truncated MRCP Message [%lu]", stream->pos - stream->text.buf);
+			/* prepare stream for further processing */
+			if(apt_text_stream_scroll(stream) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Scroll MRCP Stream", stream->text.buf);
+			}
+			return TRUE;
+		}
+		else if(result == MRCP_STREAM_MESSAGE_INVALID){
+			/* error case */
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse MRCP Message");
+			/* invoke message handler */
+			handler(obj,parser->message,result);
+			/* reset stream pos */
+			stream->pos = stream->text.buf;
+			return FALSE;
+		}
+	}
+	while(apt_text_is_eos(stream) == FALSE);
+
+	/* reset stream pos */
+	stream->pos = stream->text.buf;
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/include/mrcp.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/include/mrcp.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_H__
+#define __MRCP_H__
+
+/**
+ * @file mrcp.h
+ * @brief MRCP Core Definitions
+ */ 
+
+#include 
+#include 
+
+/** Library export/import defines */
+#ifdef WIN32
+#ifdef MRCP_STATIC_LIB
+#define MRCP_DECLARE(type)   type __stdcall
+#else
+#ifdef MRCP_LIB_EXPORT
+#define MRCP_DECLARE(type)   __declspec(dllexport) type __stdcall
+#else
+#define MRCP_DECLARE(type)   __declspec(dllimport) type __stdcall
+#endif
+#endif
+#else
+#define MRCP_DECLARE(type) type
+#endif
+
+#endif /*__MRCP_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/include/mrcp_types.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/include/mrcp_types.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_TYPES_H__
+#define __MRCP_TYPES_H__
+
+/**
+ * @file mrcp_types.h
+ * @brief Basic MRCP Types
+ */ 
+
+#include "mrcp.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Protocol version */
+typedef enum {
+	
+	MRCP_VERSION_UNKNOWN = 0,  /**< Unknown version */
+	MRCP_VERSION_1 = 1,        /**< MRCPv1 (RFC4463) */
+	MRCP_VERSION_2 = 2         /**< MRCPv2 (draft-ietf-speechsc-mrcpv2-15) */
+} mrcp_version_e;
+
+/** Enumeration of MRCP resource types */
+typedef enum {
+	MRCP_SYNTHESIZER_RESOURCE, /**< Synthesizer resource */
+	MRCP_RECOGNIZER_RESOURCE,  /**< Recognizer resource */
+
+	MRCP_RESOURCE_TYPE_COUNT   /**< Number of resources */
+} mrcp_resource_type_e;
+
+/** Message identifier used in request/response/event messages. */
+typedef apr_size_t  mrcp_request_id;
+/** Method identifier associated with method name. */
+typedef apr_size_t mrcp_method_id;
+/** Resource identifier associated with resource name. */
+typedef apr_size_t mrcp_resource_id;
+
+
+/** Opaque MRCP message declaration */
+typedef struct mrcp_message_t mrcp_message_t;
+/** Opaque MRCP resource declaration */
+typedef struct mrcp_resource_t mrcp_resource_t;
+/** Opaque MRCP resource factory declaration */
+typedef struct mrcp_resource_factory_t mrcp_resource_factory_t;
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_TYPES_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_generic_header.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_generic_header.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_GENERIC_HEADER_H__
+#define __MRCP_GENERIC_HEADER_H__
+
+/**
+ * @file mrcp_generic_header.h
+ * @brief MRCP Generic Header
+ */ 
+
+#include "mrcp_types.h"
+#include "mrcp_header_accessor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Enumeration of MRCP generic headers */
+typedef enum {
+	GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST,
+	GENERIC_HEADER_PROXY_SYNC_ID,
+	GENERIC_HEADER_ACCEPT_CHARSET,
+	GENERIC_HEADER_CONTENT_TYPE,
+	GENERIC_HEADER_CONTENT_ID,
+	GENERIC_HEADER_CONTENT_BASE,
+	GENERIC_HEADER_CONTENT_ENCODING,
+	GENERIC_HEADER_CONTENT_LOCATION,
+	GENERIC_HEADER_CONTENT_LENGTH,
+	GENERIC_HEADER_CACHE_CONTROL,
+	GENERIC_HEADER_LOGGING_TAG,
+	GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS,
+	
+	/** Additional headers for MRCP v2 */
+	GENERIC_HEADER_ACCEPT,
+	GENERIC_HEADER_FETCH_TIMEOUT,
+	GENERIC_HEADER_SET_COOKIE,
+	GENERIC_HEADER_SET_COOKIE2,
+
+	GENERIC_HEADER_COUNT
+} mrcp_generic_header_id;
+
+/** MRCP request identifiers list declaration */
+typedef struct mrcp_request_id_list_t mrcp_request_id_list_t;
+/** MRCP vendor specific parameter list of pairs */
+typedef struct mrcp_vendor_specific_params_list_t mrcp_vendor_specific_params_list_t;
+/** MRCP generic header declaration */
+typedef struct mrcp_generic_header_t mrcp_generic_header_t;
+
+/** Max number of request ids in active request id list */
+#define MAX_ACTIVE_REQUEST_ID_COUNT 5
+/** List (array) of MRCP request identifiers */
+struct mrcp_request_id_list_t {
+	/** Array of request identifiers */
+	mrcp_request_id ids[MAX_ACTIVE_REQUEST_ID_COUNT];
+	/** Number of request identifiers */
+	size_t          count;
+};
+
+
+/** MRCP generic header */
+struct mrcp_generic_header_t {
+	/** Indicates the list of request-ids to which it should apply */
+	mrcp_request_id_list_t active_request_id_list;
+	/** Helps the resource receiving the event, proxied by the client, 
+	to decide if this event has been processed through a direct interaction of the resources */
+	apt_str_t              proxy_sync_id;
+	/** Specifies the acceptable character set for entities returned in the response or events associated with this request */
+	apt_str_t              accept_charset;
+	/** Restricted to speech markup, grammar, recognition results, etc. */
+	apt_str_t              content_type;
+	/** Contains an ID or name for the content, by which it can be referred to */
+	apt_str_t              content_id;
+	/** May be used to specify the base URI for resolving relative URLs within the entity */
+	apt_str_t              content_base;
+	/** Indicates what additional content coding has been applied to the entity-body */
+	apt_str_t              content_encoding;
+	/** Statement of the location of the resource corresponding to this particular entity at the time of the request */
+	apt_str_t              content_location;
+	/** Contains the length of the content of the message body */
+	size_t                 content_length;
+	/** Defines the default caching algorithms on the media server for the session or request */
+	apt_str_t              cache_control;
+	/** Sets the logging tag for logs generated by the media server */
+	apt_str_t              logging_tag;
+	/** Specifies the vendor specific parameters used by the media server */
+	apt_pair_arr_t        *vendor_specific_params;
+
+	/** Additional headers for MRCP v2 */
+	/** Specifies the acceptable media types set for entities returned in the response or events associated with this request */
+	apt_str_t              accept;
+	/** Defines the timeout for content that the server may need to fetch over the network */
+	apr_size_t             fetch_timeout;
+	/** Enables to synchronize the cookie store of MRCP v2 client and server */
+	apt_str_t              set_cookie;
+	/** Enables to synchronize the cookie store of MRCP v2 client and server */
+	apt_str_t              set_cookie2;
+};
+
+/** Get generic header vtable */
+MRCP_DECLARE(const mrcp_header_vtable_t*) mrcp_generic_header_vtable_get(mrcp_version_e version);
+
+
+/** Append active request id list */
+MRCP_DECLARE(apt_bool_t) active_request_id_list_append(mrcp_generic_header_t *generic_header, mrcp_request_id request_id);
+/** Find request id in active request id list */
+MRCP_DECLARE(apt_bool_t) active_request_id_list_find(mrcp_generic_header_t *generic_header, mrcp_request_id request_id);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_GENERIC_HEADER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_header_accessor.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_header_accessor.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_HEADER_ACCESSOR_H__
+#define __MRCP_HEADER_ACCESSOR_H__
+
+/**
+ * @file mrcp_header_accessor.h
+ * @brief Abstract MRCP Header Accessor
+ */ 
+
+#include "apt_string_table.h"
+#include "apt_text_stream.h"
+#include "mrcp.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP header accessor declaration */
+typedef struct mrcp_header_accessor_t mrcp_header_accessor_t;
+/** MRCP header vtable declaration */
+typedef struct mrcp_header_vtable_t mrcp_header_vtable_t;
+
+/** MRCP header accessor interface */
+struct mrcp_header_vtable_t {
+	/** Allocate actual header data */
+	void* (*allocate)(mrcp_header_accessor_t *accessor, apr_pool_t *pool);
+	/** Destroy header data */
+	void (*destroy)(mrcp_header_accessor_t *accessor);
+
+	/** Parse header field */
+	apt_bool_t (*parse_field)(mrcp_header_accessor_t *accessor, apr_size_t id, const apt_str_t *value, apr_pool_t *pool);
+	/** Generate header field */
+	apt_bool_t (*generate_field)(mrcp_header_accessor_t *accessor, apr_size_t id, apt_text_stream_t *value);
+	/** Duplicate header field */
+	apt_bool_t (*duplicate_field)(mrcp_header_accessor_t *accessor, const mrcp_header_accessor_t *src, apr_size_t id, apr_pool_t *pool);
+
+	/** Table of fields  */
+	const apt_str_table_item_t *field_table;
+	/** Number of fields  */
+	apr_size_t                  field_count;
+};
+
+
+/** Initialize header vtable */
+static APR_INLINE void mrcp_header_vtable_init(mrcp_header_vtable_t *vtable)
+{
+	vtable->allocate = NULL;
+	vtable->destroy = NULL;
+	vtable->parse_field = NULL;
+	vtable->generate_field = NULL;
+	vtable->duplicate_field = NULL;
+	vtable->field_table = NULL;
+	vtable->field_count = 0;
+}
+
+/** Validate header vtable */
+static APR_INLINE apt_bool_t mrcp_header_vtable_validate(const mrcp_header_vtable_t *vtable)
+{
+	return (vtable->allocate && vtable->destroy && 
+		vtable->parse_field && vtable->generate_field &&
+		vtable->duplicate_field && vtable->field_table && 
+		vtable->field_count) ?	TRUE : FALSE;
+}
+
+
+/** MRCP header accessor */
+struct mrcp_header_accessor_t {
+	/** Actual header data allocated by accessor */
+	void                       *data;
+
+	/** Array properties (mrcp_header_property_e) */
+	char                       *properties;
+	/** Number of filled properties (header fields) */
+	apr_size_t                  counter;
+	
+	/** Header accessor interface */
+	const mrcp_header_vtable_t *vtable;
+};
+
+/** Initialize header accessor */
+static APR_INLINE void mrcp_header_accessor_init(mrcp_header_accessor_t *accessor)
+{
+	accessor->data = NULL;
+	accessor->properties = NULL;
+	accessor->counter = 0;
+	accessor->vtable = NULL;
+}
+
+
+/** Allocate header data */
+static APR_INLINE void* mrcp_header_allocate(mrcp_header_accessor_t *accessor, apr_pool_t *pool)
+{
+	if(accessor->data) {
+		return accessor->data;
+	}
+	if(!accessor->vtable || !accessor->vtable->allocate) {
+		return NULL;
+	}
+	accessor->properties = (char*)apr_pcalloc(pool,sizeof(char)*accessor->vtable->field_count);
+	accessor->counter = 0;
+	return accessor->vtable->allocate(accessor,pool);
+}
+
+/** Destroy header data */
+static APR_INLINE void mrcp_header_destroy(mrcp_header_accessor_t *accessor)
+{
+	if(!accessor->vtable || !accessor->vtable->destroy) {
+		return;
+	}
+	accessor->vtable->destroy(accessor);
+}
+
+
+/** Parse header */
+MRCP_DECLARE(apt_bool_t) mrcp_header_parse(mrcp_header_accessor_t *accessor, const apt_pair_t *pair, apr_pool_t *pool);
+
+/** Generate header */
+MRCP_DECLARE(apt_bool_t) mrcp_header_generate(mrcp_header_accessor_t *accessor, apt_text_stream_t *text_stream);
+
+/** Set header */
+MRCP_DECLARE(apt_bool_t) mrcp_header_set(mrcp_header_accessor_t *accessor, const mrcp_header_accessor_t *src, const mrcp_header_accessor_t *mask, apr_pool_t *pool);
+
+/** Inherit header */
+MRCP_DECLARE(apt_bool_t) mrcp_header_inherit(mrcp_header_accessor_t *accessor, const mrcp_header_accessor_t *parent, apr_pool_t *pool);
+
+
+/** Add name:value property */
+MRCP_DECLARE(void) mrcp_header_property_add(mrcp_header_accessor_t *accessor, apr_size_t id);
+
+/** Remove property */
+MRCP_DECLARE(void) mrcp_header_property_remove(mrcp_header_accessor_t *accessor, apr_size_t id);
+
+/** Check the property */
+MRCP_DECLARE(apt_bool_t) mrcp_header_property_check(mrcp_header_accessor_t *accessor, apr_size_t id);
+
+/** Add name only property */
+MRCP_DECLARE(void) mrcp_header_name_property_add(mrcp_header_accessor_t *accessor, apr_size_t id);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_HEADER_ACCESSOR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_message.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/message/include/mrcp_message.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,278 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_MESSAGE_H__
+#define __MRCP_MESSAGE_H__
+
+/**
+ * @file mrcp_message.h
+ * @brief MRCP Message Definition
+ */ 
+
+#include "mrcp_types.h"
+#include "mrcp_header_accessor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Request-states used in MRCP response message */
+typedef enum {
+	/** The request was processed to completion and there will be no	
+	    more events from that resource to the client with that request-id */
+	MRCP_REQUEST_STATE_COMPLETE,
+	/** The job has been placed on a queue and will be processed in first-in-first-out order */
+	MRCP_REQUEST_STATE_INPROGRESS,
+	/** Indicate that further event messages will be delivered with that request-id */
+	MRCP_REQUEST_STATE_PENDING,
+	
+	/** Number of request states */
+	MRCP_REQUEST_STATE_COUNT,
+	/** Unknown request state */
+	MRCP_REQUEST_STATE_UNKNOWN = MRCP_REQUEST_STATE_COUNT
+} mrcp_request_state_e;
+
+/** Status codes */
+typedef enum {
+	MRCP_STATUS_CODE_UNKNOWN                   = 0,
+	/* success codes (2xx) */
+	MRCP_STATUS_CODE_SUCCESS                   = 200,
+	MRCP_STATUS_CODE_SUCCESS_WITH_IGNORE       = 201,
+	/* failure codes (4xx) */
+	MRCP_STATUS_CODE_METHOD_NOT_ALLOWED        = 401,
+	MRCP_STATUS_CODE_METHOD_NOT_VALID          = 402,
+	MRCP_STATUS_CODE_UNSUPPORTED_PARAM         = 403,
+	MRCP_STATUS_CODE_ILLEGAL_PARAM_VALUE       = 404,
+	MRCP_STATUS_CODE_NOT_FOUND                 = 405,
+	MRCP_STATUS_CODE_MISSING_PARAM             = 406,
+	MRCP_STATUS_CODE_METHOD_FAILED             = 407,
+	MRCP_STATUS_CODE_UNRECOGNIZED_MESSAGE      = 408,
+	MRCP_STATUS_CODE_UNSUPPORTED_PARAM_VALUE   = 409,
+	MRCP_STATUS_CODE_RESOURCE_SPECIFIC_FAILURE = 421
+} mrcp_status_code_e;
+
+/** MRCP message types */
+typedef enum {
+	MRCP_MESSAGE_TYPE_UNKNOWN,
+	MRCP_MESSAGE_TYPE_REQUEST,
+	MRCP_MESSAGE_TYPE_RESPONSE,
+	MRCP_MESSAGE_TYPE_EVENT
+} mrcp_message_type_e;
+
+
+/** MRCP start-line declaration */
+typedef struct mrcp_start_line_t mrcp_start_line_t;
+/** MRCP channel-id declaration */
+typedef struct mrcp_channel_id mrcp_channel_id;
+/** MRCP message header declaration */
+typedef struct mrcp_message_header_t mrcp_message_header_t;
+
+
+/** Start-line of MRCP message */
+struct mrcp_start_line_t {
+	/** MRCP message type */
+	mrcp_message_type_e  message_type;
+	/** Version of protocol in use */
+	mrcp_version_e       version;
+	/** Specify the length of the message, including the start-line (v2) */
+	size_t               length;
+	/** Unique identifier among client and server */
+	mrcp_request_id      request_id;
+	/** MRCP method name */
+	apt_str_t            method_name;
+	/** MRCP method id (associated with method name) */
+	mrcp_method_id       method_id;
+	/** Success or failure or other status of the request */
+	mrcp_status_code_e   status_code;
+	/** The state of the job initiated by the request */
+	mrcp_request_state_e request_state;
+};
+
+/** Initialize MRCP start-line */
+MRCP_DECLARE(void) mrcp_start_line_init(mrcp_start_line_t *start_line);
+/** Parse MRCP start-line */
+MRCP_DECLARE(apt_bool_t) mrcp_start_line_parse(mrcp_start_line_t *start_line, apt_text_stream_t *text_stream, apr_pool_t *pool);
+/** Generate MRCP start-line */
+MRCP_DECLARE(apt_bool_t) mrcp_start_line_generate(mrcp_start_line_t *start_line, apt_text_stream_t *text_stream);
+/** Finalize MRCP start-line generation */
+MRCP_DECLARE(apt_bool_t) mrcp_start_line_finalize(mrcp_start_line_t *start_line, apr_size_t content_length, apt_text_stream_t *text_stream);
+
+
+/** MRCP channel-identifier */
+struct mrcp_channel_id {
+	/** Unambiguous string identifying the MRCP session */
+	apt_str_t        session_id;
+	/** MRCP resource name */
+	apt_str_t        resource_name;
+	/** MRCP resource id (associated with resource name) */
+	mrcp_resource_id resource_id;
+};
+
+/** Initialize MRCP channel-identifier */
+MRCP_DECLARE(void) mrcp_channel_id_init(mrcp_channel_id *channel_id);
+
+/** Parse MRCP channel-identifier */
+MRCP_DECLARE(apt_bool_t) mrcp_channel_id_parse(mrcp_channel_id *channel_id, apt_text_stream_t *text_stream, apr_pool_t *pool);
+
+/** Generate MRCP channel-identifier */
+MRCP_DECLARE(apt_bool_t) mrcp_channel_id_generate(mrcp_channel_id *channel_id, apt_text_stream_t *text_stream);
+
+
+/** MRCP message-header */
+struct mrcp_message_header_t {
+	/** MRCP generic-header */
+	mrcp_header_accessor_t generic_header_accessor;
+	/** MRCP resource specific header */
+	mrcp_header_accessor_t resource_header_accessor;
+};
+
+/** Initialize MRCP message-header */
+static APR_INLINE void mrcp_message_header_init(mrcp_message_header_t *message_header)
+{
+	mrcp_header_accessor_init(&message_header->generic_header_accessor);
+	mrcp_header_accessor_init(&message_header->resource_header_accessor);
+}
+
+/** Destroy MRCP message-header */
+static APR_INLINE void mrcp_message_header_destroy(mrcp_message_header_t *message_header)
+{
+	mrcp_header_destroy(&message_header->generic_header_accessor);
+	mrcp_header_destroy(&message_header->resource_header_accessor);
+}
+
+
+/** Parse MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_parse(mrcp_message_header_t *message_header, apt_text_stream_t *text_stream, apr_pool_t *pool);
+
+/** Generate MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_generate(mrcp_message_header_t *message_header, apt_text_stream_t *text_stream);
+
+/** Set MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_set(mrcp_message_header_t *message_header, const mrcp_message_header_t *src, apr_pool_t *pool);
+
+/** Get MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_get(mrcp_message_header_t *message_header, const mrcp_message_header_t *src, apr_pool_t *pool);
+
+/** Inherit MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_inherit(mrcp_message_header_t *message_header, const mrcp_message_header_t *parent, apr_pool_t *pool);
+
+
+
+/** MRCP message */
+struct mrcp_message_t {
+	/** Start-line of MRCP message */
+	mrcp_start_line_t      start_line;
+	/** Channel-identifier of MRCP message */
+	mrcp_channel_id        channel_id;
+	/** Header of MRCP message */
+	mrcp_message_header_t  header;
+	/** Body of MRCP message */
+	apt_str_t              body;
+
+	/** Memory pool MRCP message is allocated from */
+	apr_pool_t            *pool;
+};
+
+/** Create MRCP message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_message_create(apr_pool_t *pool);
+
+/** Initialize MRCP message */
+MRCP_DECLARE(void) mrcp_message_init(mrcp_message_t *message, apr_pool_t *pool);
+
+/** Initialize MRCP response/event message by request message */
+MRCP_DECLARE(void) mrcp_message_init_by_request(mrcp_message_t *message, const mrcp_message_t *request_message);
+
+/** Create MRCP request message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_request_create(mrcp_resource_id resource_id, mrcp_method_id method_id, apr_pool_t *pool);
+/** Create MRCP response message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_response_create(const mrcp_message_t *request_message, apr_pool_t *pool);
+/** Create MRCP event message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_event_create(const mrcp_message_t *request_message, mrcp_method_id event_id, apr_pool_t *pool);
+
+/** Validate MRCP message */
+MRCP_DECLARE(apt_bool_t) mrcp_message_validate(mrcp_message_t *message);
+
+/** Destroy MRCP message */
+MRCP_DECLARE(void) mrcp_message_destroy(mrcp_message_t *message);
+
+
+/** Parse MRCP message-body */
+MRCP_DECLARE(apt_bool_t) mrcp_body_parse(mrcp_message_t *message, apt_text_stream_t *text_stream, apr_pool_t *pool);
+/** Generate MRCP message-body */
+MRCP_DECLARE(apt_bool_t) mrcp_body_generate(mrcp_message_t *message, apt_text_stream_t *text_stream);
+
+/** Get MRCP generic-header */
+static APR_INLINE void* mrcp_generic_header_get(mrcp_message_t *mrcp_message)
+{
+	return mrcp_message->header.generic_header_accessor.data;
+}
+
+/** Prepare MRCP generic-header */
+static APR_INLINE void* mrcp_generic_header_prepare(mrcp_message_t *mrcp_message)
+{
+	return mrcp_header_allocate(&mrcp_message->header.generic_header_accessor,mrcp_message->pool);
+}
+
+/** Add MRCP generic-header proprerty */
+static APR_INLINE void mrcp_generic_header_property_add(mrcp_message_t *mrcp_message, size_t id)
+{
+	mrcp_header_property_add(&mrcp_message->header.generic_header_accessor,id);
+}
+
+/** Add MRCP generic-header name only proprerty (should be used to construct empty headers in case of GET-PARAMS request) */
+static APR_INLINE void mrcp_generic_header_name_property_add(mrcp_message_t *mrcp_message, size_t id)
+{
+	mrcp_header_name_property_add(&mrcp_message->header.generic_header_accessor,id);
+}
+
+/** Check MRCP generic-header proprerty */
+static APR_INLINE apt_bool_t mrcp_generic_header_property_check(mrcp_message_t *mrcp_message, size_t id)
+{
+	return mrcp_header_property_check(&mrcp_message->header.generic_header_accessor,id);
+}
+
+
+/** Get MRCP resource-header */
+static APR_INLINE void* mrcp_resource_header_get(const mrcp_message_t *mrcp_message)
+{
+	return mrcp_message->header.resource_header_accessor.data;
+}
+
+/** Prepare MRCP resource-header */
+static APR_INLINE void* mrcp_resource_header_prepare(mrcp_message_t *mrcp_message)
+{
+	return mrcp_header_allocate(&mrcp_message->header.resource_header_accessor,mrcp_message->pool);
+}
+
+/** Add MRCP resource-header proprerty */
+static APR_INLINE void mrcp_resource_header_property_add(mrcp_message_t *mrcp_message, size_t id)
+{
+	mrcp_header_property_add(&mrcp_message->header.resource_header_accessor,id);
+}
+
+/** Add MRCP resource-header name only proprerty (should be used to construct empty headers in case of GET-PARAMS request) */
+static APR_INLINE void mrcp_resource_header_name_property_add(mrcp_message_t *mrcp_message, size_t id)
+{
+	mrcp_header_name_property_add(&mrcp_message->header.resource_header_accessor,id);
+}
+
+/** Check MRCP resource-header proprerty */
+static APR_INLINE apt_bool_t mrcp_resource_header_property_check(mrcp_message_t *mrcp_message, size_t id)
+{
+	return mrcp_header_property_check(&mrcp_message->header.resource_header_accessor,id);
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_MESSAGE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_generic_header.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_generic_header.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,330 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_generic_header.h"
+
+/** String table of mrcp generic-header fields (mrcp_generic_header_id) */
+static const apt_str_table_item_t generic_header_string_table[] = {
+	{{"Active-Request-Id-List",    22},3},
+	{{"Proxy-Sync-Id",             13},0},
+	{{"Accept-Charset",            14},7},
+	{{"Content-Type",              12},9},
+	{{"Content-Id",                10},9},
+	{{"Content-Base",              12},8},
+	{{"Content-Encoding",          16},9},
+	{{"Content-Location",          16},9},
+	{{"Content-Length",            14},10},
+	{{"Cache-Control",             13},1},
+	{{"Logging-Tag",               11},0},
+	{{"Vendor-Specific-Parameters",26},0},
+	{{"Accept",                     6},6},
+	{{"Fetch-Timeout",             13},0},
+	{{"Set-Cookie",                10},10},
+	{{"Set-Cookie2",               11},10}
+};
+
+
+/** Parse mrcp request-id list */
+static apt_bool_t mrcp_request_id_list_parse(mrcp_request_id_list_t *request_id_list, const apt_str_t *value)
+{
+	apt_str_t field;
+	apt_text_stream_t stream;
+	stream.text = *value;
+	stream.pos = stream.text.buf;
+	request_id_list->count = 0;
+	while(request_id_list->count < MAX_ACTIVE_REQUEST_ID_COUNT) {
+		if(apt_text_field_read(&stream,',',TRUE,&field) == FALSE) {
+			break;
+		}
+		request_id_list->ids[request_id_list->count] = apt_size_value_parse(&field);
+		request_id_list->count++;
+	}
+	return TRUE;
+}
+
+/** Generate mrcp request-id list */
+static apt_bool_t mrcp_request_id_list_generate(mrcp_request_id_list_t *request_id_list, apt_text_stream_t *stream)
+{
+	size_t i;
+	for(i=0; icount; i++) {
+		apt_size_value_generate(request_id_list->ids[i],stream);
+		if(i < request_id_list->count-1) {
+			*stream->pos++ = ',';
+		}
+	}
+	return TRUE;
+}
+
+
+/** Initialize generic-header */
+static void mrcp_generic_header_init(mrcp_generic_header_t *generic_header)
+{
+	generic_header->active_request_id_list.count = 0;
+	apt_string_reset(&generic_header->proxy_sync_id);
+	apt_string_reset(&generic_header->accept_charset);
+	apt_string_reset(&generic_header->content_type);
+	apt_string_reset(&generic_header->content_id);
+	apt_string_reset(&generic_header->content_base);
+	apt_string_reset(&generic_header->content_encoding);
+	apt_string_reset(&generic_header->content_location);
+	generic_header->content_length = 0;
+	apt_string_reset(&generic_header->cache_control);
+	apt_string_reset(&generic_header->logging_tag);
+	generic_header->vendor_specific_params = NULL;
+	/* initializes additionnal MRCP V2 generic headers */
+	apt_string_reset(&generic_header->accept);
+	generic_header->fetch_timeout = 0;
+	apt_string_reset(&generic_header->set_cookie);
+	apt_string_reset(&generic_header->set_cookie2);
+}
+
+
+/** Allocate generic-header */
+static void* mrcp_generic_header_allocate(mrcp_header_accessor_t *accessor, apr_pool_t *pool)
+{
+	mrcp_generic_header_t *generic_header = apr_palloc(pool,sizeof(mrcp_generic_header_t));
+	mrcp_generic_header_init(generic_header);
+	accessor->data = generic_header;
+	return accessor->data;
+}
+
+/** Parse generic-header */
+static apt_bool_t mrcp_generic_header_parse(mrcp_header_accessor_t *accessor, size_t id, const apt_str_t *value, apr_pool_t *pool)
+{
+	apt_bool_t status = TRUE;
+	mrcp_generic_header_t *generic_header = accessor->data;
+	switch(id) {
+		case GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST:
+			mrcp_request_id_list_parse(&generic_header->active_request_id_list,value);
+			break;
+		case GENERIC_HEADER_PROXY_SYNC_ID:
+			apt_string_copy(&generic_header->proxy_sync_id,value,pool);
+			break;
+		case GENERIC_HEADER_ACCEPT_CHARSET:
+			apt_string_copy(&generic_header->accept_charset,value,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_TYPE:
+			apt_string_copy(&generic_header->content_type,value,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_ID:
+			apt_string_copy(&generic_header->content_id,value,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_BASE:
+			apt_string_copy(&generic_header->content_base,value,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_ENCODING:
+			apt_string_copy(&generic_header->content_encoding,value,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_LOCATION:
+			apt_string_copy(&generic_header->content_location,value,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_LENGTH:
+			generic_header->content_length = apt_size_value_parse(value);
+			break;
+		case GENERIC_HEADER_CACHE_CONTROL:
+			apt_string_copy(&generic_header->cache_control,value,pool);
+			break;
+		case GENERIC_HEADER_LOGGING_TAG:
+			apt_string_copy(&generic_header->logging_tag,value,pool);
+			break;
+		case GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS:
+			if(!generic_header->vendor_specific_params) {
+				generic_header->vendor_specific_params = apt_pair_array_create(1,pool);
+			}
+			apt_pair_array_parse(generic_header->vendor_specific_params,value,pool);
+			break;
+		case GENERIC_HEADER_ACCEPT:
+			apt_string_copy(&generic_header->accept,value,pool);
+			break;
+		case GENERIC_HEADER_FETCH_TIMEOUT:
+			generic_header->fetch_timeout = apt_size_value_parse(value);
+			break;
+		case GENERIC_HEADER_SET_COOKIE:
+			apt_string_copy(&generic_header->set_cookie,value,pool);
+			break;
+		case GENERIC_HEADER_SET_COOKIE2:
+			apt_string_copy(&generic_header->set_cookie2,value,pool);
+			break;
+		default:
+			status = FALSE;
+	}
+	return status;
+}
+
+/** Generate generic-header */
+static apt_bool_t mrcp_generic_header_generate(mrcp_header_accessor_t *accessor, size_t id, apt_text_stream_t *value)
+{
+	mrcp_generic_header_t *generic_header = accessor->data;
+	switch(id) {
+		case GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST:
+			mrcp_request_id_list_generate(&generic_header->active_request_id_list,value);
+			break;
+		case GENERIC_HEADER_PROXY_SYNC_ID:
+			apt_string_value_generate(&generic_header->proxy_sync_id,value);
+			break;
+		case GENERIC_HEADER_ACCEPT_CHARSET:
+			apt_string_value_generate(&generic_header->accept_charset,value);
+			break;
+		case GENERIC_HEADER_CONTENT_TYPE:
+			apt_string_value_generate(&generic_header->content_type,value);
+			break;
+		case GENERIC_HEADER_CONTENT_ID:
+			apt_string_value_generate(&generic_header->content_id,value);
+			break;
+		case GENERIC_HEADER_CONTENT_BASE:
+			apt_string_value_generate(&generic_header->content_base,value);
+			break;
+		case GENERIC_HEADER_CONTENT_ENCODING:
+			apt_string_value_generate(&generic_header->content_encoding,value);
+			break;
+		case GENERIC_HEADER_CONTENT_LOCATION:
+			apt_string_value_generate(&generic_header->content_location,value);
+			break;
+		case GENERIC_HEADER_CONTENT_LENGTH:
+			apt_size_value_generate(generic_header->content_length,value);
+			break;
+		case GENERIC_HEADER_CACHE_CONTROL:
+			apt_string_value_generate(&generic_header->cache_control,value);
+			break;
+		case GENERIC_HEADER_LOGGING_TAG:
+			apt_string_value_generate(&generic_header->logging_tag,value);
+			break;
+		case GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS:
+			apt_pair_array_generate(generic_header->vendor_specific_params,value);
+			break;
+		case GENERIC_HEADER_ACCEPT:
+			apt_string_value_generate(&generic_header->accept,value);
+			break;
+		case GENERIC_HEADER_FETCH_TIMEOUT:
+			apt_size_value_generate(generic_header->fetch_timeout,value);
+			break;
+		case GENERIC_HEADER_SET_COOKIE:
+			apt_string_value_generate(&generic_header->set_cookie,value);
+			break;
+		case GENERIC_HEADER_SET_COOKIE2:
+			apt_string_value_generate(&generic_header->set_cookie2,value);
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}
+
+/** Duplicate generic-header */
+static apt_bool_t mrcp_generic_header_duplicate(mrcp_header_accessor_t *accessor, const mrcp_header_accessor_t *src, size_t id, apr_pool_t *pool)
+{
+	mrcp_generic_header_t *generic_header = accessor->data;
+	const mrcp_generic_header_t *src_generic_header = src->data;
+	apt_bool_t status = TRUE;
+
+	if(!generic_header || !src_generic_header) {
+		return FALSE;
+	}
+
+	switch(id) {
+		case GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST:
+			break;
+		case GENERIC_HEADER_PROXY_SYNC_ID:
+			apt_string_copy(&generic_header->proxy_sync_id,&src_generic_header->proxy_sync_id,pool);
+			break;
+		case GENERIC_HEADER_ACCEPT_CHARSET:
+			apt_string_copy(&generic_header->accept_charset,&src_generic_header->accept_charset,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_TYPE:
+			apt_string_copy(&generic_header->content_type,&src_generic_header->content_type,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_ID:
+			apt_string_copy(&generic_header->content_id,&src_generic_header->content_id,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_BASE:
+			apt_string_copy(&generic_header->content_base,&src_generic_header->content_base,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_ENCODING:
+			apt_string_copy(&generic_header->content_encoding,&src_generic_header->content_encoding,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_LOCATION:
+			apt_string_copy(&generic_header->content_location,&src_generic_header->content_location,pool);
+			break;
+		case GENERIC_HEADER_CONTENT_LENGTH:
+			generic_header->content_length = src_generic_header->content_length;
+			break;
+		case GENERIC_HEADER_CACHE_CONTROL:
+			apt_string_copy(&generic_header->cache_control,&src_generic_header->cache_control,pool);
+			break;
+		case GENERIC_HEADER_LOGGING_TAG:
+			apt_string_copy(&generic_header->logging_tag,&src_generic_header->logging_tag,pool);
+			break;
+		case GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS:
+			generic_header->vendor_specific_params = apt_pair_array_copy(src_generic_header->vendor_specific_params,pool);
+			break;
+		case GENERIC_HEADER_ACCEPT:
+			apt_string_copy(&generic_header->accept,&src_generic_header->accept,pool);
+			break;
+		case GENERIC_HEADER_FETCH_TIMEOUT:
+			generic_header->fetch_timeout = src_generic_header->fetch_timeout;
+			break;
+		case GENERIC_HEADER_SET_COOKIE:
+			apt_string_copy(&generic_header->set_cookie,&src_generic_header->set_cookie,pool);
+			break;
+		case GENERIC_HEADER_SET_COOKIE2:
+			apt_string_copy(&generic_header->set_cookie2,&src_generic_header->set_cookie2,pool);
+			break;
+		default:
+			status = FALSE;
+	}
+	return status;
+}
+
+static const mrcp_header_vtable_t vtable = {
+	mrcp_generic_header_allocate,
+	NULL, /* nothing to destroy */
+	mrcp_generic_header_parse,
+	mrcp_generic_header_generate,
+	mrcp_generic_header_duplicate,
+	generic_header_string_table,
+	GENERIC_HEADER_COUNT
+};
+
+
+MRCP_DECLARE(const mrcp_header_vtable_t*) mrcp_generic_header_vtable_get(mrcp_version_e version)
+{
+	return &vtable;
+}
+
+
+/** Append active request id list */
+MRCP_DECLARE(apt_bool_t) active_request_id_list_append(mrcp_generic_header_t *generic_header, mrcp_request_id request_id)
+{
+	mrcp_request_id_list_t *request_id_list = &generic_header->active_request_id_list;
+	if(request_id_list->count >= MAX_ACTIVE_REQUEST_ID_COUNT) {
+		return FALSE;
+	}
+	request_id_list->ids[request_id_list->count++] = request_id;
+	return TRUE;
+}
+
+/** Find request id in active request id list */
+MRCP_DECLARE(apt_bool_t) active_request_id_list_find(mrcp_generic_header_t *generic_header, mrcp_request_id request_id)
+{
+	size_t i;
+	mrcp_request_id_list_t *request_id_list = &generic_header->active_request_id_list;
+	for(i=0; icount; i++) {
+		if(request_id_list->ids[i] == request_id) {
+			return TRUE;
+		}
+	}
+	return FALSE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_header_accessor.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_header_accessor.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_header_accessor.h"
+
+typedef enum {
+	MRCP_HEADER_FIELD_NONE       = 0x0,
+	MRCP_HEADER_FIELD_NAME       = 0x1,
+	MRCP_HEADER_FIELD_VALUE      = 0x2,
+	MRCP_HEADER_FIELD_NAME_VALUE = MRCP_HEADER_FIELD_NAME | MRCP_HEADER_FIELD_VALUE
+} mrcp_header_property_e;
+
+
+MRCP_DECLARE(apt_bool_t) mrcp_header_parse(mrcp_header_accessor_t *accessor, const apt_pair_t *pair, apr_pool_t *pool)
+{
+	size_t id;
+	if(!accessor->vtable) {
+		return FALSE;
+	}
+
+	id = apt_string_table_id_find(accessor->vtable->field_table,accessor->vtable->field_count,&pair->name);
+	if(id >= accessor->vtable->field_count) {
+		return FALSE;
+	}
+
+	if(!pair->value.length) {
+		mrcp_header_name_property_add(accessor,id);
+		return TRUE;
+	}
+
+	if(accessor->vtable->parse_field(accessor,id,&pair->value,pool) == FALSE) {
+		return FALSE;
+	}
+	
+	mrcp_header_property_add(accessor,id);
+	return TRUE;
+}
+
+MRCP_DECLARE(apt_bool_t) mrcp_header_generate(mrcp_header_accessor_t *accessor, apt_text_stream_t *text_stream)
+{
+	const apt_str_t *name;
+	apr_size_t i,j;
+	char prop;
+
+	if(!accessor->vtable) {
+		return FALSE;
+	}
+
+	for(i=0, j=0; ivtable->field_count && jcounter; i++) {
+		prop = accessor->properties[i];
+		if((prop & MRCP_HEADER_FIELD_NAME) == MRCP_HEADER_FIELD_NAME) {
+			j++;
+			name = apt_string_table_str_get(accessor->vtable->field_table,accessor->vtable->field_count,i);
+			if(!name) continue;
+			
+			apt_text_header_name_generate(name,text_stream);
+			if((prop & MRCP_HEADER_FIELD_VALUE) == MRCP_HEADER_FIELD_VALUE) {
+				accessor->vtable->generate_field(accessor,i,text_stream);
+			}
+			apt_text_eol_insert(text_stream);
+		}
+	}
+
+	return TRUE;
+}
+
+MRCP_DECLARE(void) mrcp_header_property_add(mrcp_header_accessor_t *accessor, apr_size_t id)
+{
+	if(id < accessor->vtable->field_count) {
+		char *prop = &accessor->properties[id];
+		if((*prop & MRCP_HEADER_FIELD_NAME) != MRCP_HEADER_FIELD_NAME) {
+			accessor->counter++;
+		}
+		*prop = MRCP_HEADER_FIELD_NAME_VALUE;
+	}
+}
+
+MRCP_DECLARE(void) mrcp_header_name_property_add(mrcp_header_accessor_t *accessor, apr_size_t id)
+{
+	if(id < accessor->vtable->field_count) {
+		char *prop = &accessor->properties[id];
+		if((*prop & MRCP_HEADER_FIELD_NAME) != MRCP_HEADER_FIELD_NAME) {
+			*prop = MRCP_HEADER_FIELD_NAME;
+			accessor->counter++;
+		}
+	}
+}
+
+
+MRCP_DECLARE(void) mrcp_header_property_remove(mrcp_header_accessor_t *accessor, apr_size_t id)
+{
+	if(id < accessor->vtable->field_count) {
+		char *prop = &accessor->properties[id];
+		if((*prop & MRCP_HEADER_FIELD_NAME) == MRCP_HEADER_FIELD_NAME) {
+			accessor->counter--;
+		}
+		*prop = MRCP_HEADER_FIELD_NONE;
+	}
+}
+
+MRCP_DECLARE(apt_bool_t) mrcp_header_property_check(mrcp_header_accessor_t *accessor, apr_size_t id)
+{
+	if((id < accessor->vtable->field_count) && accessor->properties) {
+		if((accessor->properties[id] & MRCP_HEADER_FIELD_NAME) == MRCP_HEADER_FIELD_NAME) {
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+
+MRCP_DECLARE(apt_bool_t) mrcp_header_set(mrcp_header_accessor_t *accessor, const mrcp_header_accessor_t *src, const mrcp_header_accessor_t *mask, apr_pool_t *pool)
+{
+	apr_size_t i,j;
+
+	if(!accessor->vtable || !src->vtable) {
+		return FALSE;
+	}
+
+	mrcp_header_allocate(accessor,pool);
+
+	for(i=0, j=0; i < src->vtable->field_count && j < src->counter; i++) {
+		if((mask->properties[i] & src->properties[i] & MRCP_HEADER_FIELD_NAME) == MRCP_HEADER_FIELD_NAME) {
+			j++;
+			if((src->properties[i] & MRCP_HEADER_FIELD_VALUE) == MRCP_HEADER_FIELD_VALUE) {
+				accessor->vtable->duplicate_field(accessor,src,i,pool);
+				mrcp_header_property_add(accessor,i);
+			}
+			else {
+				mrcp_header_name_property_add(accessor,i);
+			}
+		}
+	}
+
+	return TRUE;
+}
+
+MRCP_DECLARE(apt_bool_t) mrcp_header_inherit(mrcp_header_accessor_t *accessor, const mrcp_header_accessor_t *parent, apr_pool_t *pool)
+{
+	apr_size_t i,j;
+
+	if(!accessor->vtable || !parent->vtable) {
+		return FALSE;
+	}
+
+	mrcp_header_allocate(accessor,pool);
+
+	for(i=0, j=0; ivtable->field_count && j < parent->counter; i++) {
+		if((parent->properties[i] & MRCP_HEADER_FIELD_NAME) == MRCP_HEADER_FIELD_NAME) {
+			j++;
+			if((parent->properties[i] & MRCP_HEADER_FIELD_VALUE) == MRCP_HEADER_FIELD_VALUE) {
+				accessor->vtable->duplicate_field(accessor,parent,i,pool);
+				mrcp_header_property_add(accessor,i);
+			}
+			else {
+				mrcp_header_name_property_add(accessor,i);
+			}
+		}
+	}
+
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_message.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/message/src/mrcp_message.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,691 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_message.h"
+#include "mrcp_generic_header.h"
+#include "apt_log.h"
+
+/** Protocol name used in version string */
+#define MRCP_NAME               "MRCP"
+#define MRCP_NAME_LENGTH        (sizeof(MRCP_NAME)-1)
+
+#define MRCP_CHANNEL_ID         "Channel-Identifier"
+#define MRCP_CHANNEL_ID_LENGTH  (sizeof(MRCP_CHANNEL_ID)-1)
+
+/** Separators used in MRCP version string parse/generate */
+#define MRCP_NAME_VERSION_SEPARATOR        '/'
+#define MRCP_VERSION_MAJOR_MINOR_SEPARATOR '.'
+
+#define MRCP_MESSAGE_LENGTH_MAX_DIGITS_COUNT 4
+
+
+/** String table of MRCP request-states (mrcp_request_state_t) */
+static const apt_str_table_item_t mrcp_request_state_string_table[] = {
+	{{"COMPLETE",    8},0},
+	{{"IN-PROGRESS",11},0},
+	{{"PENDING",     7},0}
+};
+
+
+/** Parse MRCP version */
+static mrcp_version_e mrcp_version_parse(const apt_str_t *field)
+{
+	mrcp_version_e version = MRCP_VERSION_UNKNOWN;
+	const char *pos;
+	if(field->length <= MRCP_NAME_LENGTH || strncasecmp(field->buf,MRCP_NAME,MRCP_NAME_LENGTH) != 0) {
+		/* unexpected protocol name */
+		return version;
+	}
+
+	pos = field->buf + MRCP_NAME_LENGTH;
+	if(*pos == MRCP_NAME_VERSION_SEPARATOR) {
+		pos++;
+		switch(*pos) {
+			case '1': version = MRCP_VERSION_1; break;
+			case '2': version = MRCP_VERSION_2; break;
+			default: ;
+		}
+	}
+	return version;
+}
+
+/** Generate MRCP version */
+static apt_bool_t mrcp_version_generate(mrcp_version_e version, apt_text_stream_t *stream)
+{
+	memcpy(stream->pos,MRCP_NAME,MRCP_NAME_LENGTH);
+	stream->pos += MRCP_NAME_LENGTH;
+	*stream->pos++ = MRCP_NAME_VERSION_SEPARATOR;
+	apt_size_value_generate(version,stream);
+	*stream->pos++ = MRCP_VERSION_MAJOR_MINOR_SEPARATOR;
+	*stream->pos++ = '0';
+	return TRUE;
+}
+
+/** Parse MRCP request-state used in MRCP response and event */
+static APR_INLINE mrcp_request_state_e mrcp_request_state_parse(const apt_str_t *request_state_str)
+{
+	return apt_string_table_id_find(mrcp_request_state_string_table,MRCP_REQUEST_STATE_COUNT,request_state_str);
+}
+
+/** Generate MRCP request-state used in MRCP response and event */
+static apt_bool_t mrcp_request_state_generate(mrcp_request_state_e request_state, apt_text_stream_t *stream)
+{
+	const apt_str_t *name;
+	name = apt_string_table_str_get(mrcp_request_state_string_table,MRCP_REQUEST_STATE_COUNT,request_state);
+	if(request_state < MRCP_REQUEST_STATE_COUNT) {
+		memcpy(stream->pos,name->buf,name->length);
+		stream->pos += name->length;
+	}
+	return TRUE;
+}
+
+
+/** Parse MRCP request-id */
+static APR_INLINE mrcp_request_id mrcp_request_id_parse(const apt_str_t *field)
+{
+	return apt_size_value_parse(field);
+}
+
+/** Generate MRCP request-id */
+static APR_INLINE apt_bool_t mrcp_request_id_generate(mrcp_request_id request_id, apt_text_stream_t *stream)
+{
+	return apt_size_value_generate(request_id,stream);
+}
+
+/** Parse MRCP status-code */
+static APR_INLINE mrcp_status_code_e mrcp_status_code_parse(const apt_str_t *field)
+{
+	return apt_size_value_parse(field);
+}
+
+/** Generate MRCP status-code */
+static APR_INLINE size_t  mrcp_status_code_generate(mrcp_status_code_e status_code, apt_text_stream_t *stream)
+{
+	return apt_size_value_generate(status_code,stream);
+}
+
+
+/** Parse MRCP request-line */
+static apt_bool_t mrcp_request_line_parse(mrcp_start_line_t *start_line, apt_text_stream_t *stream)
+{
+	apt_str_t field;
+	if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse request-id in request-line");
+		return FALSE;
+	}
+	start_line->request_id = mrcp_request_id_parse(&field);
+
+	if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse mrcp-version in request-line");
+		return FALSE;
+	}
+
+	start_line->request_state = mrcp_request_state_parse(&field);
+	if(start_line->request_state == MRCP_REQUEST_STATE_UNKNOWN) {
+		/* request-line */
+		start_line->message_type = MRCP_MESSAGE_TYPE_REQUEST;
+	}
+	else {
+		/* event line */
+		start_line->message_type = MRCP_MESSAGE_TYPE_EVENT;
+
+		if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse mrcp-version in request-line");
+			return FALSE;
+		}
+	}
+
+	start_line->version = mrcp_version_parse(&field);
+	if(start_line->version == MRCP_VERSION_UNKNOWN) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown mrcp-version");
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/** Generate MRCP request-line */
+static apt_bool_t mrcp_request_line_generate(mrcp_start_line_t *start_line, apt_text_stream_t *stream)
+{
+	memcpy(stream->pos,start_line->method_name.buf,start_line->method_name.length);
+	stream->pos += start_line->method_name.length;
+	*stream->pos++ = APT_TOKEN_SP;
+
+	mrcp_request_id_generate(start_line->request_id,stream);
+	*stream->pos++ = APT_TOKEN_SP;
+
+	if(start_line->message_type == MRCP_MESSAGE_TYPE_REQUEST) {
+		if(start_line->status_code != MRCP_STATUS_CODE_UNKNOWN) {
+			mrcp_status_code_generate(start_line->status_code,stream);
+			*stream->pos++ = APT_TOKEN_SP;
+		}
+	}
+	else if(start_line->message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		mrcp_request_state_generate(start_line->request_state,stream);
+		*stream->pos++ = APT_TOKEN_SP;
+	}
+
+	mrcp_version_generate(start_line->version,stream);
+	return TRUE;
+}
+
+/** Parse MRCP response-line */
+static apt_bool_t mrcp_response_line_parse(mrcp_start_line_t *start_line, apt_text_stream_t *stream)
+{
+	apt_str_t field;
+	start_line->length = 0;
+	if(start_line->version == MRCP_VERSION_2) {
+		if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse message-length in response-line");
+			return FALSE;
+		}
+		start_line->length = apt_size_value_parse(&field);
+	}
+
+	if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse request-id in response-line");
+		return FALSE;
+	}
+	start_line->request_id = mrcp_request_id_parse(&field);
+
+	if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse status-code in response-line");
+		return FALSE;
+	}
+	start_line->status_code = mrcp_status_code_parse(&field);
+
+	if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse request-state in response-line");
+		return FALSE;
+	}
+	start_line->request_state = mrcp_request_state_parse(&field);
+	return TRUE;
+}
+
+/** Generate MRCP response-line */
+static apt_bool_t mrcp_response_line_generate(mrcp_start_line_t *start_line, apt_text_stream_t *stream)
+{
+	mrcp_version_generate(start_line->version,stream);
+	*stream->pos++ = APT_TOKEN_SP;
+
+	mrcp_request_id_generate(start_line->request_id,stream);
+	*stream->pos++ = APT_TOKEN_SP;
+
+	mrcp_status_code_generate(start_line->status_code,stream);
+	*stream->pos++ = APT_TOKEN_SP;
+
+	mrcp_request_state_generate(start_line->request_state,stream);
+	return TRUE;
+}
+
+/** Parse MRCP v2 start-line */
+static apt_bool_t mrcp_v2_start_line_parse(mrcp_start_line_t *start_line, apt_text_stream_t *stream, apr_pool_t *pool)
+{
+	apt_str_t field;
+	if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse message-length in v2 start-line");
+		return FALSE;
+	}
+	start_line->length = apt_size_value_parse(&field);
+
+	if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse request-id in v2 start-line");
+		return FALSE;
+	}
+	start_line->request_id = mrcp_request_id_parse(&field);
+	if(start_line->request_id == 0 && *field.buf != '0') {
+		/* parsing MRCP v2 request or event */
+		start_line->message_type = MRCP_MESSAGE_TYPE_REQUEST;
+		apt_string_copy(&start_line->method_name,&field,pool);
+
+		if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse request-id in v2 start-line");
+			return FALSE;
+		}
+		start_line->request_id = mrcp_request_id_parse(&field);
+
+		if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == TRUE) {
+			/* parsing MRCP v2 event */
+			start_line->request_state = mrcp_request_state_parse(&field);
+			start_line->message_type = MRCP_MESSAGE_TYPE_EVENT;
+		}
+	}
+	else {
+		/* parsing MRCP v2 response */
+		start_line->message_type = MRCP_MESSAGE_TYPE_RESPONSE;
+
+		if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse status-code in v2 start-line");
+			return FALSE;
+		}
+		start_line->status_code = mrcp_status_code_parse(&field);
+
+		if(apt_text_field_read(stream,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse request-state in v2 start-line");
+			return FALSE;
+		}
+		start_line->request_state = mrcp_request_state_parse(&field);
+	}
+
+	return TRUE;
+}
+
+/** Generate MRCP v2 start-line */
+static apt_bool_t mrcp_v2_start_line_generate(mrcp_start_line_t *start_line, apt_text_stream_t *stream)
+{
+	char *pos = stream->pos;
+	mrcp_version_generate(start_line->version,stream);
+	*stream->pos++ = APT_TOKEN_SP;
+
+	start_line->length = stream->pos - pos; /* length is temrorary used to store offset */
+	/* reserving MRCP_MESSAGE_LENGTH_MAX_DIGITS_COUNT space for start_line->length */
+	memset(stream->pos,APT_TOKEN_SP,MRCP_MESSAGE_LENGTH_MAX_DIGITS_COUNT+1);
+	stream->pos += MRCP_MESSAGE_LENGTH_MAX_DIGITS_COUNT+1;
+
+	if(start_line->message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		mrcp_request_id_generate(start_line->request_id,stream);
+		*stream->pos++ = APT_TOKEN_SP;
+
+		mrcp_status_code_generate(start_line->status_code,stream);
+		*stream->pos++ = APT_TOKEN_SP;
+
+		mrcp_request_state_generate(start_line->request_state,stream);
+		*stream->pos++ = APT_TOKEN_SP;
+	}
+	else {
+		memcpy(stream->pos,start_line->method_name.buf,start_line->method_name.length);
+		stream->pos += start_line->method_name.length;
+		*stream->pos++ = APT_TOKEN_SP;
+
+		mrcp_request_id_generate(start_line->request_id,stream);
+		if(start_line->message_type == MRCP_MESSAGE_TYPE_EVENT) {
+			*stream->pos++ = APT_TOKEN_SP;
+			mrcp_request_state_generate(start_line->request_state,stream);
+		}
+	}
+	return TRUE;
+}
+
+/** Initialize MRCP start-line */
+MRCP_DECLARE(void) mrcp_start_line_init(mrcp_start_line_t *start_line)
+{
+	start_line->message_type = MRCP_MESSAGE_TYPE_UNKNOWN;
+	start_line->version = MRCP_VERSION_UNKNOWN;
+	start_line->length = 0;
+	start_line->request_id = 0;
+	apt_string_reset(&start_line->method_name);
+	start_line->status_code = MRCP_STATUS_CODE_UNKNOWN;
+	start_line->request_state = MRCP_REQUEST_STATE_UNKNOWN;
+}
+
+/** Parse MRCP start-line */
+MRCP_DECLARE(apt_bool_t) mrcp_start_line_parse(mrcp_start_line_t *start_line, apt_text_stream_t *text_stream, apr_pool_t *pool)
+{
+	apt_text_stream_t line;
+	apt_str_t field;
+	apt_bool_t status = TRUE;
+	start_line->message_type = MRCP_MESSAGE_TYPE_UNKNOWN;
+	if(apt_text_line_read(text_stream,&line.text) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse MRCP start-line");
+		return FALSE;
+	}
+	line.pos = line.text.buf;
+
+	if(apt_text_field_read(&line,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot read the first field in start-line");
+		return FALSE;
+	}
+
+	if(field.buf == strstr(field.buf,MRCP_NAME)) {
+		start_line->version = mrcp_version_parse(&field);
+
+		if(start_line->version == MRCP_VERSION_1) {
+			/* parsing MRCP v1 response */
+			start_line->message_type = MRCP_MESSAGE_TYPE_RESPONSE;
+			status = mrcp_response_line_parse(start_line,&line);
+		}
+		else if(start_line->version == MRCP_VERSION_2) {
+			/* parsing MRCP v2 start-line (request/response/event) */
+			status = mrcp_v2_start_line_parse(start_line,&line,pool);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown MRCP version");
+			return FALSE;
+		}
+	}
+	else {
+		/* parsing MRCP v1 request or event */
+		apt_string_copy(&start_line->method_name,&field,pool);
+		status = mrcp_request_line_parse(start_line,&line);
+	}
+	return status;
+}
+
+/** Generate MRCP start-line */
+MRCP_DECLARE(apt_bool_t) mrcp_start_line_generate(mrcp_start_line_t *start_line, apt_text_stream_t *text_stream)
+{
+	apt_bool_t status = FALSE;
+	if(start_line->version == MRCP_VERSION_1) {
+		switch(start_line->message_type) {
+			case MRCP_MESSAGE_TYPE_REQUEST:
+				status = mrcp_request_line_generate(start_line,text_stream);
+				break;
+			case MRCP_MESSAGE_TYPE_RESPONSE:
+				status = mrcp_response_line_generate(start_line,text_stream);
+				break;
+			case MRCP_MESSAGE_TYPE_EVENT:
+				status = mrcp_request_line_generate(start_line,text_stream);
+				break;
+			default:
+				break;
+		}
+	}
+	else if(start_line->version == MRCP_VERSION_2) {
+		status = mrcp_v2_start_line_generate(start_line,text_stream);
+	}
+
+	if(status == TRUE) {
+		apt_text_eol_insert(text_stream);
+	}
+	
+	return status;
+}
+
+/** Finalize MRCP start-line generation */
+MRCP_DECLARE(apt_bool_t) mrcp_start_line_finalize(mrcp_start_line_t *start_line, apr_size_t content_length, apt_text_stream_t *text_stream)
+{
+	apr_size_t length = text_stream->pos - text_stream->text.buf + content_length;
+	if(start_line->version == MRCP_VERSION_2) {
+		/* message-length includes the number of bytes that specify the message-length in the header */
+		/* too comlex to generate!!! see the discussion */
+		/* http://www1.ietf.org/mail-archive/web/speechsc/current/msg01734.html */
+		apt_str_t field;
+		field.buf = text_stream->text.buf + start_line->length; /* length is temrorary used to store offset */
+		length -= MRCP_MESSAGE_LENGTH_MAX_DIGITS_COUNT;
+		apt_var_length_value_generate(&length,MRCP_MESSAGE_LENGTH_MAX_DIGITS_COUNT,&field);
+		field.buf[field.length] = APT_TOKEN_SP;
+		start_line->length += field.length;
+
+		field.length = MRCP_MESSAGE_LENGTH_MAX_DIGITS_COUNT - field.length;
+		if(field.length) {
+			memmove(text_stream->text.buf+field.length,text_stream->text.buf,start_line->length);
+			text_stream->text.buf += field.length;
+			text_stream->text.length -= field.length;
+		}
+	}
+
+	start_line->length = length;
+	return TRUE;
+}
+
+/** Initialize MRCP channel-identifier */
+MRCP_DECLARE(void) mrcp_channel_id_init(mrcp_channel_id *channel_id)
+{
+	apt_string_reset(&channel_id->session_id);
+	apt_string_reset(&channel_id->resource_name);
+	channel_id->resource_id = 0;
+}
+
+/** Parse MRCP channel-identifier */
+MRCP_DECLARE(apt_bool_t) mrcp_channel_id_parse(mrcp_channel_id *channel_id, apt_text_stream_t *text_stream, apr_pool_t *pool)
+{
+	apt_bool_t match = FALSE;
+	apt_pair_t pair;
+	do {
+		if(apt_text_header_read(text_stream,&pair) == TRUE) {
+			if(pair.name.length) {
+				if(pair.value.length && strncasecmp(pair.name.buf,MRCP_CHANNEL_ID,MRCP_CHANNEL_ID_LENGTH) == 0) {
+					match = TRUE;
+					apt_id_resource_parse(&pair.value,'@',&channel_id->session_id,&channel_id->resource_name,pool);
+					break;
+				}
+				/* skip this header, expecting channel identifier first */
+			}
+			else {
+				/* empty header */
+				break;
+			}
+		}
+	}
+	while(apt_text_is_eos(text_stream) == FALSE);
+	return match;
+}
+
+/** Generate MRCP channel-identifier */
+MRCP_DECLARE(apt_bool_t) mrcp_channel_id_generate(mrcp_channel_id *channel_id, apt_text_stream_t *text_stream)
+{
+	apt_str_t *str;
+	char *pos = text_stream->pos;
+
+	memcpy(pos,MRCP_CHANNEL_ID,MRCP_CHANNEL_ID_LENGTH);
+	pos += MRCP_CHANNEL_ID_LENGTH;
+	*pos++ = ':';
+	*pos++ = ' ';
+	
+	str = &channel_id->session_id;
+	memcpy(pos,str->buf,str->length);
+	pos += str->length;
+	*pos++ = '@';
+
+	str = &channel_id->resource_name;
+	memcpy(pos,str->buf,str->length);
+	pos += str->length;
+
+	text_stream->pos = pos;
+	apt_text_eol_insert(text_stream);
+	return TRUE;
+}
+
+/** Parse MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_parse(mrcp_message_header_t *message_header, apt_text_stream_t *text_stream, apr_pool_t *pool)
+{
+	apt_pair_t pair;
+	apt_bool_t result = FALSE;
+
+	mrcp_header_allocate(&message_header->generic_header_accessor,pool);
+	mrcp_header_allocate(&message_header->resource_header_accessor,pool);
+
+	do {
+		if(apt_text_header_read(text_stream,&pair) == TRUE) {
+			if(pair.name.length) {
+				/* normal header */
+				if(mrcp_header_parse(&message_header->resource_header_accessor,&pair,pool) != TRUE) {
+					if(mrcp_header_parse(&message_header->generic_header_accessor,&pair,pool) != TRUE) {
+						/* unknown MRCP header */
+					}
+				}
+			}
+			else {
+				/* empty header -> exit */
+				result = TRUE;
+				break;
+			}
+		}
+		else {
+			/* malformed header, skip to the next one */
+		}
+	}
+	while(apt_text_is_eos(text_stream) == FALSE);
+
+	return result;
+}
+
+/** Generate MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_generate(mrcp_message_header_t *message_header, apt_text_stream_t *text_stream)
+{
+	mrcp_header_generate(&message_header->resource_header_accessor,text_stream);
+	mrcp_header_generate(&message_header->generic_header_accessor,text_stream);
+	apt_text_eol_insert(text_stream);
+	return TRUE;
+}
+
+/** Set MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_set(mrcp_message_header_t *message_header, const mrcp_message_header_t *src, apr_pool_t *pool)
+{
+	mrcp_header_set(
+		&message_header->resource_header_accessor,
+		&src->resource_header_accessor,
+		&src->resource_header_accessor,pool);
+	mrcp_header_set(
+		&message_header->generic_header_accessor,
+		&src->generic_header_accessor,
+		&src->generic_header_accessor,pool);
+	return TRUE;
+}
+
+/** Get MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_get(mrcp_message_header_t *message_header, const mrcp_message_header_t *src, apr_pool_t *pool)
+{
+	mrcp_header_set(
+		&message_header->resource_header_accessor,
+		&src->resource_header_accessor,
+		&message_header->resource_header_accessor,
+		pool);
+	mrcp_header_set(
+		&message_header->generic_header_accessor,
+		&src->generic_header_accessor,
+		&message_header->generic_header_accessor,
+		pool);
+	return TRUE;
+}
+
+/** Inherit MRCP message-header */
+MRCP_DECLARE(apt_bool_t) mrcp_message_header_inherit(mrcp_message_header_t *message_header, const mrcp_message_header_t *parent, apr_pool_t *pool)
+{
+	mrcp_header_inherit(&message_header->resource_header_accessor,&parent->resource_header_accessor,pool);
+	mrcp_header_inherit(&message_header->generic_header_accessor,&parent->generic_header_accessor,pool);
+	return TRUE;
+}
+
+
+/** Parse MRCP message-body */
+MRCP_DECLARE(apt_bool_t) mrcp_body_parse(mrcp_message_t *message, apt_text_stream_t *text_stream, apr_pool_t *pool)
+{
+	if(mrcp_generic_header_property_check(message,GENERIC_HEADER_CONTENT_LENGTH) == TRUE) {
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_get(message);
+		if(generic_header && generic_header->content_length) {
+			apt_str_t *body = &message->body;
+			body->length = generic_header->content_length;
+			if(body->length > (text_stream->text.length - (text_stream->pos - text_stream->text.buf))) {
+				body->length = text_stream->text.length - (text_stream->pos - text_stream->text.buf);
+			}
+			body->buf = apr_pstrmemdup(pool,text_stream->pos,body->length);
+			text_stream->pos += body->length;
+		}
+	}
+	return TRUE;
+}
+
+/** Generate MRCP message-body */
+MRCP_DECLARE(apt_bool_t) mrcp_body_generate(mrcp_message_t *message, apt_text_stream_t *text_stream)
+{
+	apt_str_t *body = &message->body;
+	if(body->length) {
+		memcpy(text_stream->pos,body->buf,body->length);
+		text_stream->pos += body->length;
+	}
+	return TRUE;
+}
+
+
+/** Create MRCP message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_message_create(apr_pool_t *pool)
+{
+	mrcp_message_t *message = apr_palloc(pool,sizeof(mrcp_message_t));
+	mrcp_message_init(message,pool);
+	return message;
+}
+
+/** Initialize MRCP message */
+MRCP_DECLARE(void) mrcp_message_init(mrcp_message_t *message, apr_pool_t *pool)
+{
+	mrcp_start_line_init(&message->start_line);
+	mrcp_channel_id_init(&message->channel_id);
+	mrcp_message_header_init(&message->header);
+	apt_string_reset(&message->body);
+	message->pool = pool;
+}
+
+/** Initialize response/event message by request message */
+MRCP_DECLARE(void) mrcp_message_init_by_request(mrcp_message_t *message, const mrcp_message_t *request_message)
+{
+	message->channel_id = request_message->channel_id;
+	message->start_line.request_id = request_message->start_line.request_id;
+	message->start_line.version = request_message->start_line.version;
+	message->start_line.method_id = request_message->start_line.method_id;
+	message->header.generic_header_accessor.vtable = request_message->header.generic_header_accessor.vtable;
+	message->header.resource_header_accessor.vtable = request_message->header.resource_header_accessor.vtable;
+}
+
+/** Create MRCP request message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_request_create(mrcp_resource_id resource_id, mrcp_method_id method_id, apr_pool_t *pool)
+{
+	mrcp_message_t *request_message = mrcp_message_create(pool);
+	request_message->start_line.message_type = MRCP_MESSAGE_TYPE_REQUEST;
+	request_message->start_line.method_id = method_id;
+	request_message->channel_id.resource_id = resource_id;
+	return request_message;
+}
+
+/** Create MRCP response message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_response_create(const mrcp_message_t *request_message, apr_pool_t *pool)
+{
+	mrcp_message_t *response_message = mrcp_message_create(pool);
+	if(request_message) {
+		mrcp_message_init_by_request(response_message,request_message);
+	}
+	response_message->start_line.message_type = MRCP_MESSAGE_TYPE_RESPONSE;
+	response_message->start_line.request_state = MRCP_REQUEST_STATE_COMPLETE;
+	response_message->start_line.status_code = MRCP_STATUS_CODE_SUCCESS;
+	return response_message;
+}
+
+/** Create MRCP event message */
+MRCP_DECLARE(mrcp_message_t*) mrcp_event_create(const mrcp_message_t *request_message, mrcp_method_id event_id, apr_pool_t *pool)
+{
+	mrcp_message_t *event_message = mrcp_message_create(pool);
+	if(request_message) {
+		mrcp_message_init_by_request(event_message,request_message);
+	}
+	event_message->start_line.message_type = MRCP_MESSAGE_TYPE_EVENT;
+	event_message->start_line.method_id = event_id;
+	return event_message;
+}
+
+/** Destroy MRCP message */
+MRCP_DECLARE(void) mrcp_message_destroy(mrcp_message_t *message)
+{
+	apt_string_reset(&message->body);
+	mrcp_message_header_destroy(&message->header);
+}
+
+/** Validate MRCP message */
+MRCP_DECLARE(apt_bool_t) mrcp_message_validate(mrcp_message_t *message)
+{
+	if(message->body.length) {
+		/* content length must be specified */
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_prepare(message);
+		if(!generic_header) {
+			return FALSE;
+		}
+		if(mrcp_generic_header_property_check(message,GENERIC_HEADER_CONTENT_LENGTH) != TRUE ||
+		  !generic_header->content_length) {
+			generic_header->content_length = message->body.length;
+			mrcp_generic_header_property_add(message,GENERIC_HEADER_CONTENT_LENGTH);
+		}
+	}
+
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,300 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_default_factory.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_default_factory.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_DEFAULT_FACTORY_H__
+#define __MRCP_DEFAULT_FACTORY_H__
+
+/**
+ * @file mrcp_default_factory.h
+ * @brief Default MRCP Resource Factory
+ */ 
+
+#include "mrcp_resource_factory.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Create default MRCP resource factory */
+MRCP_DECLARE(mrcp_resource_factory_t*) mrcp_default_factory_create(apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_DEFAULT_FACTORY_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_header.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_header.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_RECOG_HEADER_H__
+#define __MRCP_RECOG_HEADER_H__
+
+/**
+ * @file mrcp_recog_header.h
+ * @brief MRCP Recognizer Header
+ */ 
+
+#include "mrcp_types.h"
+#include "mrcp_header_accessor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP recognizer headers */
+typedef enum {
+	RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD,
+	RECOGNIZER_HEADER_SENSITIVITY_LEVEL,
+	RECOGNIZER_HEADER_SPEED_VS_ACCURACY,
+	RECOGNIZER_HEADER_N_BEST_LIST_LENGTH,
+	RECOGNIZER_HEADER_NO_INPUT_TIMEOUT,
+	RECOGNIZER_HEADER_RECOGNITION_TIMEOUT,
+	RECOGNIZER_HEADER_WAVEFORM_URI,
+	RECOGNIZER_HEADER_COMPLETION_CAUSE,
+	RECOGNIZER_HEADER_RECOGNIZER_CONTEXT_BLOCK,
+	RECOGNIZER_HEADER_START_INPUT_TIMERS,
+	RECOGNIZER_HEADER_SPEECH_COMPLETE_TIMEOUT,
+	RECOGNIZER_HEADER_SPEECH_INCOMPLETE_TIMEOUT,
+	RECOGNIZER_HEADER_DTMF_INTERDIGIT_TIMEOUT,
+	RECOGNIZER_HEADER_DTMF_TERM_TIMEOUT,
+	RECOGNIZER_HEADER_DTMF_TERM_CHAR,
+	RECOGNIZER_HEADER_FAILED_URI,
+	RECOGNIZER_HEADER_FAILED_URI_CAUSE,
+	RECOGNIZER_HEADER_SAVE_WAVEFORM,
+	RECOGNIZER_HEADER_NEW_AUDIO_CHANNEL,
+	RECOGNIZER_HEADER_SPEECH_LANGUAGE,
+
+	/** Additional headers for MRCP v2 */
+	RECOGNIZER_HEADER_INPUT_TYPE,
+	RECOGNIZER_HEADER_INPUT_WAVEFORM_URI,
+	RECOGNIZER_HEADER_COMPLETION_REASON,
+	RECOGNIZER_HEADER_MEDIA_TYPE,
+	RECOGNIZER_HEADER_VER_BUFFER_UTTERANCE,
+	RECOGNIZER_HEADER_RECOGNITION_MODE,
+	RECOGNIZER_HEADER_CANCEL_IF_QUEUE,
+	RECOGNIZER_HEADER_HOTWORD_MAX_DURATION,
+	RECOGNIZER_HEADER_HOTWORD_MIN_DURATION,
+	RECOGNIZER_HEADER_INTERPRET_TEXT,
+	RECOGNIZER_HEADER_DTMF_BUFFER_TIME,
+	RECOGNIZER_HEADER_CLEAR_DTMF_BUFFER,
+	RECOGNIZER_HEADER_EARLY_NO_MATCH,
+
+	RECOGNIZER_HEADER_COUNT
+} mrcp_recognizer_header_id;
+
+
+/** MRCP recognizer completion-cause  */
+typedef enum {
+	RECOGNIZER_COMPLETION_CAUSE_SUCCESS                 = 0,
+	RECOGNIZER_COMPLETION_CAUSE_NO_MATCH                = 1,
+	RECOGNIZER_COMPLETION_CAUSE_NO_INPUT_TIMEOUT        = 2,
+	RECOGNIZER_COMPLETION_CAUSE_RECOGNITION_TIMEOUT     = 3,
+	RECOGNIZER_COMPLETION_CAUSE_GRAM_LOAD_FAILURE       = 4,
+	RECOGNIZER_COMPLETION_CAUSE_GRAM_COMP_FAILURE       = 5,
+	RECOGNIZER_COMPLETION_CAUSE_ERROR                   = 6,
+	RECOGNIZER_COMPLETION_CAUSE_SPEECH_TOO_EARLY        = 7,
+	RECOGNIZER_COMPLETION_CAUSE_TOO_MUCH_SPEECH_TIMEOUT = 8,
+	RECOGNIZER_COMPLETION_CAUSE_URI_FAILURE             = 9,
+	RECOGNIZER_COMPLETION_CAUSE_LANGUAGE_UNSUPPORTED    = 10,
+
+	/** Additional completion-cause for MRCP v2 */
+	RECOGNIZER_COMPLETION_CAUSE_CANCELLED               = 11,
+	RECOGNIZER_COMPLETION_CAUSE_SEMANTICS_FAILURE       = 12,
+	RECOGNIZER_COMPLETION_CAUSE_PARTIAL_MATCH           = 13,
+	RECOGNIZER_COMPLETION_CAUSE_PARTIAL_MATCH_MAXTIME   = 14,
+	RECOGNIZER_COMPLETION_CAUSE_NO_MATCH_MAXTIME        = 15,
+	RECOGNIZER_COMPLETION_CAUSE_GRAM_DEFINITION_FAILURE = 16,
+
+	RECOGNIZER_COMPLETION_CAUSE_COUNT                   = 17,
+	RECOGNIZER_COMPLETION_CAUSE_UNKNOWN                 = RECOGNIZER_COMPLETION_CAUSE_COUNT
+} mrcp_recog_completion_cause_e;
+
+
+
+/** MRCP recognizer-header declaration */
+typedef struct mrcp_recog_header_t mrcp_recog_header_t;
+
+/** MRCP recognizer-header */
+struct mrcp_recog_header_t {
+	/** Tells the recognizer resource what confidence level the client considers a
+    successful match */
+	float                         confidence_threshold;
+	/** To filter out background noise and not mistake it for speech */
+	float                         sensitivity_level;
+	/** Tunable towards Performance or Accuracy */
+	float                         speed_vs_accuracy;
+	/** The client, by setting this header, can ask the recognition resource 
+	to send it more  than 1 alternative */
+	apr_size_t                    n_best_list_length;
+	/** The client can use the no-input-timeout header to set this timeout */
+	apr_size_t                    no_input_timeout;
+	/** The client can use the recognition-timeout header to set this timeout */
+	apr_size_t                    recognition_timeout;
+	/** MUST be present in the RECOGNITION-COMPLETE event if the Save-Waveform
+	header was set to true */
+	apt_str_t                     waveform_uri;
+	/** MUST be part of a RECOGNITION-COMPLETE, event coming from
+    the recognizer resource to the client */
+	mrcp_recog_completion_cause_e completion_cause;
+	/** MAY be sent as part of the SET-PARAMS or GET-PARAMS request */
+	apt_str_t                     recognizer_context_block;
+	/** MAY be sent as part of the RECOGNIZE request. A value of false tells
+	the recognizer to start recognition, but not to start the no-input timer yet */
+	apt_bool_t                    start_input_timers;
+	/** Specifies the length of silence required following user
+    speech before the speech recognizer finalizes a result */
+	apr_size_t                    speech_complete_timeout;
+	/** Specifies the required length of silence following user
+    speech after which a recognizer finalizes a result */
+	apr_size_t                    speech_incomplete_timeout;
+	/** Specifies the inter-digit timeout value to use when
+    recognizing DTMF input */
+	apr_size_t                    dtmf_interdigit_timeout;
+	/** Specifies the terminating timeout to use when 
+	recognizing DTMF input*/
+	apr_size_t                    dtmf_term_timeout;
+	/** Specifies the terminating DTMF character for DTMF input
+    recognition */
+	char                          dtmf_term_char;
+	/** When a recognizer needs to fetch or access a URI and the access fails
+    the server SHOULD provide the failed URI in this header in the method response*/
+	apt_str_t                     failed_uri;
+	/** When a recognizer method needs a recognizer to fetch or access a URI
+    and the access fails the server MUST provide the URI specific or
+    protocol specific response code for the URI in the Failed-URI header */
+	apt_str_t                     failed_uri_cause;
+	/** Allows the client to request the recognizer resource to
+    save the audio input to the recognizer */
+	apt_bool_t                    save_waveform;
+	/** MAY be specified in a RECOGNIZE request and allows the
+    client to tell the server that, from this point on, further input
+    audio comes from a different audio source */
+	apt_bool_t                    new_audio_channel;
+	/** Specifies the language of recognition grammar data within
+    a session or request, if it is not specified within the data */
+	apt_str_t                     speech_language;
+
+	/** Additional headers for MRCP v2 */
+	/** Specifies if the input that caused a barge-in was DTMF or speech */
+	apt_str_t                     input_type;
+	/** Optional header specifies a URI pointing to audio content to be
+    processed by the RECOGNIZE operation */
+	apt_str_t                     input_waveform_uri;
+	/** MAY be specified in a RECOGNITION-COMPLETE event coming from
+    the recognizer resource to the client */
+	apt_str_t                     completion_reason;
+	/** tells the server resource the Media Type in which to store captured 
+	audio such as the one captured and returned by the Waveform-URI header */
+	apt_str_t                     media_type;
+	/** lets the client request the server to buffer the
+    utterance associated with this recognition request into a buffer
+    available to a co-resident verification resource */
+	apt_bool_t                    ver_buffer_utterance;
+	/** Specifies what mode the RECOGNIZE method will operate in */
+	apt_str_t                     recognition_mode;
+	/** Specifies what will happen if the client attempts to
+    invoke another RECOGNIZE method when this RECOGNIZE request is
+    already in progress for the resource*/
+	apt_bool_t                    cancel_if_queue;
+	/** Specifies the maximum length of an utterance (in seconds) that will
+    be considered for Hotword recognition */
+	apr_size_t                    hotword_max_duration;
+	/** Specifies the minimum length of an utterance (in seconds) that will
+    be considered for Hotword recognition */
+	apr_size_t                    hotword_min_duration;
+	/** Provides a pointer to the text for which a natural language interpretation is desired */
+	apt_str_t                     interpret_text;
+	/** MAY be specified in a GET-PARAMS or SET-PARAMS method and
+    is used to specify the size in time, in milliseconds, of the
+    typeahead buffer for the recognizer */
+	apr_size_t                    dtmf_buffer_time;
+	/** MAY be specified in a RECOGNIZE method and is used to
+    tell the recognizer to clear the DTMF type-ahead buffer before
+    starting the recognize */
+	apt_bool_t                    clear_dtmf_buffer;
+	/** MAY be specified in a RECOGNIZE method and is used to
+    tell the recognizer that it MUST not wait for the end of speech
+    before processing the collected speech to match active grammars */
+	apt_bool_t                    early_no_match;
+};
+
+
+/** Get recognizer header vtable */
+MRCP_DECLARE(const mrcp_header_vtable_t*) mrcp_recog_header_vtable_get(mrcp_version_e version);
+
+/** Get recognizer completion cause string */
+MRCP_DECLARE(const apt_str_t*) mrcp_recog_completion_cause_get(mrcp_recog_completion_cause_e completion_cause, mrcp_version_e version);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_RECOG_HEADER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_resource.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_resource.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_RECOG_RESOURCE_H__
+#define __MRCP_RECOG_RESOURCE_H__
+
+/**
+ * @file mrcp_recog_resource.h
+ * @brief MRCP Recognizer Resource
+ */ 
+
+#include "mrcp_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP recognizer methods */
+typedef enum {
+	RECOGNIZER_SET_PARAMS,
+	RECOGNIZER_GET_PARAMS,
+	RECOGNIZER_DEFINE_GRAMMAR,
+	RECOGNIZER_RECOGNIZE,
+	RECOGNIZER_GET_RESULT,
+	RECOGNIZER_START_INPUT_TIMERS,
+	RECOGNIZER_STOP,
+
+	RECOGNIZER_METHOD_COUNT
+} mrcp_recognizer_method_id;
+
+/** MRCP recognizer events */
+typedef enum {
+	RECOGNIZER_START_OF_INPUT,
+	RECOGNIZER_RECOGNITION_COMPLETE,
+
+	RECOGNIZER_EVENT_COUNT
+} mrcp_recognizer_event_id;
+
+/** Create MRCP recognizer resource */
+MRCP_DECLARE(mrcp_resource_t*) mrcp_recog_resource_create(apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_RECOG_RESOURCE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_state_machine.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_recog_state_machine.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_RECOG_STATE_MACHINE_H__
+#define __MRCP_RECOG_STATE_MACHINE_H__
+
+/**
+ * @file mrcp_recog_state_machine.h
+ * @brief MRCP Recognizer State Machine
+ */ 
+
+#include "mrcp_state_machine.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Create MRCP recognizer server state machine */
+mrcp_state_machine_t* mrcp_recog_server_state_machine_create(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool);
+
+/** Create MRCP recognizer client state machine */
+mrcp_state_machine_t* mrcp_recog_client_state_machine_create(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_RECOG_STATE_MACHINE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_header.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_header.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SYNTH_HEADER_H__
+#define __MRCP_SYNTH_HEADER_H__
+
+/**
+ * @file mrcp_synth_header.h
+ * @brief MRCP Synthesizer Header
+ */ 
+
+#include "mrcp_types.h"
+#include "mrcp_header_accessor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP synthesizer headers */
+typedef enum {
+	SYNTHESIZER_HEADER_JUMP_SIZE,
+	SYNTHESIZER_HEADER_KILL_ON_BARGE_IN,
+	SYNTHESIZER_HEADER_SPEAKER_PROFILE,
+	SYNTHESIZER_HEADER_COMPLETION_CAUSE,
+	SYNTHESIZER_HEADER_COMPLETION_REASON,
+	SYNTHESIZER_HEADER_VOICE_GENDER,
+	SYNTHESIZER_HEADER_VOICE_AGE,
+	SYNTHESIZER_HEADER_VOICE_VARIANT,
+	SYNTHESIZER_HEADER_VOICE_NAME,
+	SYNTHESIZER_HEADER_PROSODY_VOLUME,
+	SYNTHESIZER_HEADER_PROSODY_RATE,
+	SYNTHESIZER_HEADER_SPEECH_MARKER,
+	SYNTHESIZER_HEADER_SPEECH_LANGUAGE,
+	SYNTHESIZER_HEADER_FETCH_HINT,
+	SYNTHESIZER_HEADER_AUDIO_FETCH_HINT,
+	SYNTHESIZER_HEADER_FAILED_URI,
+	SYNTHESIZER_HEADER_FAILED_URI_CAUSE,
+	SYNTHESIZER_HEADER_SPEAK_RESTART,
+	SYNTHESIZER_HEADER_SPEAK_LENGTH,
+	SYNTHESIZER_HEADER_LOAD_LEXICON,
+	SYNTHESIZER_HEADER_LEXICON_SEARCH_ORDER,
+
+	SYNTHESIZER_HEADER_COUNT
+} mrcp_synthesizer_header_id;
+
+
+/** Speech-units */
+typedef enum {
+	SPEECH_UNIT_SECOND,
+	SPEECH_UNIT_WORD,
+	SPEECH_UNIT_SENTENCE,
+	SPEECH_UNIT_PARAGRAPH,
+
+	SPEECH_UNIT_COUNT
+} mrcp_speech_unit_e;
+
+/** Speech-length types */
+typedef enum {
+	SPEECH_LENGTH_TYPE_TEXT,
+	SPEECH_LENGTH_TYPE_NUMERIC_POSITIVE,
+	SPEECH_LENGTH_TYPE_NUMERIC_NEGATIVE,
+
+	SPEECH_LENGTH_TYPE_UNKNOWN
+} mrcp_speech_length_type_e;
+
+/** MRCP voice-gender */
+typedef enum {
+	VOICE_GENDER_MALE,
+	VOICE_GENDER_FEMALE,
+	VOICE_GENDER_NEUTRAL,
+	
+	VOICE_GENDER_COUNT,
+	VOICE_GENDER_UNKNOWN = VOICE_GENDER_COUNT
+} mrcp_voice_gender_e;
+
+/** Prosody-volume type */
+typedef enum {
+	PROSODY_VOLUME_TYPE_LABEL,
+	PROSODY_VOLUME_TYPE_NUMERIC,
+	PROSODY_VOLUME_TYPE_RELATIVE_CHANGE,
+	
+	PROSODY_VOLUME_TYPE_UNKNOWN
+} mrcp_prosody_volume_type_e;
+
+/** Prosody-rate type */
+typedef enum {
+	PROSODY_RATE_TYPE_LABEL,
+	PROSODY_RATE_TYPE_RELATIVE_CHANGE,
+
+	PROSODY_RATE_TYPE_UNKNOWN
+} mrcp_prosody_rate_type_e;
+
+/** Prosody-volume */
+typedef enum {
+	PROSODY_VOLUME_SILENT,
+	PROSODY_VOLUME_XSOFT,
+	PROSODY_VOLUME_SOFT,
+	PROSODY_VOLUME_MEDIUM,
+	PROSODY_VOLUME_LOUD,
+	PROSODY_VOLUME_XLOUD,
+	PROSODY_VOLUME_DEFAULT,
+
+	PROSODY_VOLUME_COUNT,
+	PROSODY_VOLUME_UNKNOWN = PROSODY_VOLUME_COUNT
+} mrcp_prosody_volume_label_e;
+
+/** Prosody-rate */
+typedef enum {
+	PROSODY_RATE_XSLOW,
+	PROSODY_RATE_SLOW,
+	PROSODY_RATE_MEDIUM,
+	PROSODY_RATE_FAST,
+	PROSODY_RATE_XFAST,
+	PROSODY_RATE_DEFAULT,
+
+	PROSODY_RATE_COUNT,
+	PROSODY_RATE_UNKNOWN = PROSODY_RATE_COUNT
+} mrcp_prosody_rate_label_e;
+
+/** Synthesizer completion-cause specified in SPEAK-COMPLETE event */
+typedef enum {
+	SYNTHESIZER_COMPLETION_CAUSE_NORMAL               = 0,
+	SYNTHESIZER_COMPLETION_CAUSE_BARGE_IN             = 1,
+	SYNTHESIZER_COMPLETION_CAUSE_PARSE_FAILURE        = 2,
+	SYNTHESIZER_COMPLETION_CAUSE_URI_FAILURE          = 3,
+	SYNTHESIZER_COMPLETION_CAUSE_ERROR                = 4,
+	SYNTHESIZER_COMPLETION_CAUSE_LANGUAGE_UNSUPPORTED = 5,
+	SYNTHESIZER_COMPLETION_CAUSE_LEXICON_LOAD_FAILURE = 6,
+	SYNTHESIZER_COMPLETION_CAUSE_CANCELLED            = 7,
+
+	SYNTHESIZER_COMPLETION_CAUSE_COUNT                = 8,
+	SYNTHESIZER_COMPLETION_CAUSE_UNKNOWN              = SYNTHESIZER_COMPLETION_CAUSE_COUNT
+} mrcp_synth_completion_cause_e;
+
+
+/** Speech-length value declaration */
+typedef struct mrcp_speech_length_value_t mrcp_speech_length_value_t;
+/** Numeric speech-length declaration */
+typedef struct mrcp_numeric_speech_length_t mrcp_numeric_speech_length_t;
+/** Prosody-param declaration */
+typedef struct mrcp_prosody_param_t mrcp_prosody_param_t;
+/** Voice-param declaration */
+typedef struct mrcp_voice_param_t mrcp_voice_param_t;
+/**Prosody-rate declaration*/
+typedef struct mrcp_prosody_rate_t mrcp_prosody_rate_t;
+/**Prosody-volume declaration*/
+typedef struct mrcp_prosody_volume_t mrcp_prosody_volume_t;
+/** MRCP synthesizer-header declaration */
+typedef struct mrcp_synth_header_t mrcp_synth_header_t;
+
+/** Numeric speech-length */
+struct mrcp_numeric_speech_length_t {
+	/** The length */
+	apr_size_t         length;
+	/** The unit (second/word/sentence/paragraph) */
+	mrcp_speech_unit_e unit;
+};
+
+/** Definition of speech-length value */
+struct mrcp_speech_length_value_t {
+	/** Speech-length type (numeric/text)*/
+	mrcp_speech_length_type_e type;
+	/** Speech-length value (either numeric or text) */
+	union {
+		/** Text speech-length */
+		apt_str_t                    tag;
+		/** Numeric speech-length */
+		mrcp_numeric_speech_length_t numeric;
+	} value;
+};
+
+/** MRCP voice-param */
+struct mrcp_voice_param_t {
+	/** Voice gender (male/femaile/neutral)*/
+	mrcp_voice_gender_e gender;
+	/** Voice age */
+	apr_size_t          age;
+	/** Voice variant */
+	apr_size_t          variant;
+	/** Voice name */
+	apt_str_t           name;
+};
+
+/** MRCP prosody-volume */
+struct mrcp_prosody_volume_t {
+	/** prosody-volume type (one of label,numeric,relative change) */
+	mrcp_prosody_volume_type_e type;
+
+	/** prosody-volume value */
+	union {
+		/** one of "silent", "x-soft,..." */ 
+		mrcp_prosody_volume_label_e label;
+		/** numeric value */
+		float                       numeric;
+		/** relative change */
+		float                       relative;
+	} value;
+};
+
+/** MRCP prosody-rate */
+struct mrcp_prosody_rate_t {
+	/** prosody-rate type (one of label, relative change) */
+	mrcp_prosody_rate_type_e type;
+
+	/** prosody-rate value */
+	union {
+		/** one of "x-slow", "slow,..." */ 
+		mrcp_prosody_rate_label_e label;
+		/** relative change */
+		float                     relative;
+	} value;
+};
+
+/** MRCP prosody-param */
+struct mrcp_prosody_param_t {
+	/** Prosofy volume */
+	mrcp_prosody_volume_t volume;
+	/** Prosofy rate */
+	mrcp_prosody_rate_t   rate;
+};
+
+/** MRCP synthesizer-header */
+struct mrcp_synth_header_t {
+	/** MAY be specified in a CONTROL method and controls the
+    amount to jump forward or backward in an active "SPEAK" request */
+	mrcp_speech_length_value_t    jump_size;
+	/** MAY be sent as part of the "SPEAK" method to enable kill-
+    on-barge-in support */
+	apt_bool_t                    kill_on_barge_in;
+	/** MAY be part of the "SET-PARAMS"/"GET-PARAMS" or "SPEAK"
+    request from the client to the server and specifies a URI which
+    references the profile of the speaker */
+	apt_str_t                     speaker_profile;
+	/** MUST be specified in a "SPEAK-COMPLETE" event coming from
+    the synthesizer resource to the client */
+	mrcp_synth_completion_cause_e completion_cause;
+	/** MAY be specified in a "SPEAK-COMPLETE" event coming from
+    the synthesizer resource to the client */
+	apt_str_t                     completion_reason;
+	/** This set of headers defines the voice of the speaker */
+	mrcp_voice_param_t            voice_param;
+	/** This set of headers defines the prosody of the speech */
+	mrcp_prosody_param_t          prosody_param;
+	/** Contains timestamp information in a "timestamp" field */
+	apt_str_t                     speech_marker;
+	/** specifies the default language of the speech data if the
+    language is not specified in the markup */
+	apt_str_t                     speech_language;
+	/** When the synthesizer needs to fetch documents or other resources like
+    speech markup or audio files, this header controls the corresponding
+    URI access properties */
+	apt_str_t                     fetch_hint;
+	/** When the synthesizer needs to fetch documents or other resources like
+    speech audio files, this header controls the corresponding URI access
+    properties */
+	apt_str_t                     audio_fetch_hint;
+	/** When a synthesizer method needs a synthesizer to fetch or access a
+    URI and the access fails, the server SHOULD provide the failed URI in
+    this header in the method response */
+	apt_str_t                     failed_uri;
+	/** When a synthesizer method needs a synthesizer to fetch or access a
+    URI and the access fails the server MUST provide the URI specific or
+    protocol specific response code for the URI in the Failed-URI header
+    in the method response through this header */
+	apt_str_t                     failed_uri_cause;
+	/** When a CONTROL request to jump backward is issued to a currently
+    speaking synthesizer resource, and the target jump point is before
+    the start of the current "SPEAK" request, the current "SPEAK" request
+    MUST restart */
+	apt_bool_t                    speak_restart;
+	/** MAY be specified in a CONTROL method to control the
+    length of speech to speak, relative to the current speaking point in
+    the currently active "SPEAK" request */
+	mrcp_speech_length_value_t    speak_length;
+	/** Used to indicate whether a lexicon has to be loaded or unloaded */
+	apt_bool_t                    load_lexicon;
+	/** used to specify a list of active Lexicon URIs and the
+    search order among the active lexicons */
+	apt_str_t                     lexicon_search_order;
+};
+
+/** Get synthesizer header vtable */
+MRCP_DECLARE(const mrcp_header_vtable_t*) mrcp_synth_header_vtable_get(mrcp_version_e version);
+
+/** Get synthesizer completion cause string */
+MRCP_DECLARE(const apt_str_t*) mrcp_synth_completion_cause_get(mrcp_synth_completion_cause_e completion_cause, mrcp_version_e version);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SYNTH_HEADER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_resource.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_resource.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SYNTH_RESOURCE_H__
+#define __MRCP_SYNTH_RESOURCE_H__
+
+/**
+ * @file mrcp_synth_resource.h
+ * @brief MRCP Synthesizer Resource
+ */ 
+
+#include "mrcp_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCP synthesizer methods */
+typedef enum {
+	SYNTHESIZER_SET_PARAMS,
+	SYNTHESIZER_GET_PARAMS,
+	SYNTHESIZER_SPEAK,
+	SYNTHESIZER_STOP,
+	SYNTHESIZER_PAUSE,
+	SYNTHESIZER_RESUME,
+	SYNTHESIZER_BARGE_IN_OCCURRED,
+	SYNTHESIZER_CONTROL,
+	SYNTHESIZER_DEFINE_LEXICON,
+
+	SYNTHESIZER_METHOD_COUNT
+} mrcp_synthesizer_method_id;
+
+/** MRCP synthesizer events */
+typedef enum {
+	SYNTHESIZER_SPEECH_MARKER,
+	SYNTHESIZER_SPEAK_COMPLETE,
+
+	SYNTHESIZER_EVENT_COUNT
+} mrcp_synthesizer_event_id;
+
+
+/** Create MRCP synthesizer resource */
+MRCP_DECLARE(mrcp_resource_t*) mrcp_synth_resource_create(apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SYNTH_RESOURCE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_state_machine.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/include/mrcp_synth_state_machine.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SYNTH_STATE_MACHINE_H__
+#define __MRCP_SYNTH_STATE_MACHINE_H__
+
+/**
+ * @file mrcp_synth_state_machine.h
+ * @brief MRCP Synthesizer State Machine
+ */ 
+
+#include "mrcp_state_machine.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Create MRCP synthesizer server state machine */
+mrcp_state_machine_t* mrcp_synth_server_state_machine_create(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool);
+
+/** Create MRCP synthesizer client state machine */
+mrcp_state_machine_t* mrcp_synth_client_state_machine_create(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SYNTH_STATE_MACHINE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_default_factory.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_default_factory.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_default_factory.h"
+#include "mrcp_synth_resource.h"
+#include "mrcp_recog_resource.h"
+#include "apt_log.h"
+
+/** String table of MRCPv2 resources (mrcp_resource_types_e) */
+static const apt_str_table_item_t mrcp_resource_string_table[] = {
+	{{"speechsynth",11},6},
+	{{"speechrecog",11},6}
+};
+
+/** Create default MRCP resource factory */
+MRCP_DECLARE(mrcp_resource_factory_t*) mrcp_default_factory_create(apr_pool_t *pool)
+{
+	mrcp_resource_t *resource;
+	mrcp_resource_factory_t *resource_factory;
+	/* create resource factory instance */
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create MRCP Resource Factory [%d]",MRCP_RESOURCE_TYPE_COUNT);
+	resource_factory = mrcp_resource_factory_create(MRCP_RESOURCE_TYPE_COUNT,pool);
+	if(!resource_factory) {
+		return NULL;
+	}
+	
+	/* set resource string table */
+	mrcp_resource_string_table_set(resource_factory,mrcp_resource_string_table);
+
+	/* create and register resources */
+	resource = mrcp_synth_resource_create(pool);
+	if(resource) {
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Register Synthesizer Resource");
+		mrcp_resource_register(resource_factory,resource,MRCP_SYNTHESIZER_RESOURCE);
+	}
+	
+	resource = mrcp_recog_resource_create(pool);
+	if(resource) {
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Register Recognizer Resource");
+		mrcp_resource_register(resource_factory,resource,MRCP_RECOGNIZER_RESOURCE);
+	}
+
+	return resource_factory;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_client_state_machine.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_client_state_machine.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_state_machine.h"
+#include "mrcp_recog_state_machine.h"
+#include "mrcp_message.h"
+
+
+/** Update state according to request received from user level or response/event received from MRCP server */
+static apt_bool_t recog_state_update(mrcp_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	/* no actual state machine processing yet, dispatch whatever received */
+	return state_machine->dispatcher(state_machine,message);
+}
+
+/** Create MRCP recognizer client state machine */
+mrcp_state_machine_t* mrcp_recog_client_state_machine_create(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool)
+{
+	mrcp_state_machine_t *state_machine = apr_palloc(pool,sizeof(mrcp_state_machine_t));
+	mrcp_state_machine_init(state_machine,obj,dispatcher);
+	state_machine->update = recog_state_update;
+	return state_machine;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_header.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_header.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,656 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_recog_header.h"
+
+/** String table of MRCPv1 recognizer headers (mrcp_recog_header_id) */
+static const apt_str_table_item_t v1_recog_header_string_table[] = {
+	{{"Confidence-Threshold",       20},7},
+	{{"Sensitivity-Level",          17},3},
+	{{"Speed-Vs-Accuracy",          17},4},
+	{{"N-Best-List-Length",         18},1},
+	{{"No-Input-Timeout",           16},2},
+	{{"Recognition-Timeout",        19},16},
+	{{"Waveform-Url",               12},0},
+	{{"Completion-Cause",           16},16},
+	{{"Recognizer-Context-Block",   24},12},
+	{{"Recognizer-Start-Timers",    23},11},
+	{{"Speech-Complete-Timeout",    23},7},
+	{{"Speech-Incomplete-Timeout",  25},8},
+	{{"DTMF-Interdigit-Timeout",    23},5},
+	{{"DTMF-Term-Timeout",          17},14},
+	{{"DTMF-Term-Char",             14},14},
+	{{"Failed-Uri",                 10},10},
+	{{"Failed-Uri-Cause",           16},16},
+	{{"Save-Waveform",              13},5},
+	{{"New-Audio-Channel",          17},2},
+	{{"Speech-Language",            15},8},
+	{{"Input-Type",                 10},10},
+	{{"Input-Waveform-Uri",         18},6},
+	{{"Completion-Reason",          17},15},
+	{{"Media-Type",                 10},0},
+	{{"Ver-Buffer-Utterance",       20},0},
+	{{"Recognition-Mode",           16},14},
+	{{"Cancel-If-Queue",            15},3},
+	{{"Hotword-Max-Duration",       20},10},
+	{{"Hotword-Min-Duration",       20},20},
+	{{"Interpret-Text",             14},7},
+	{{"DTMF-Buffer-Time",           16},5},
+	{{"Clear-DTMF-Buffer",          17},1},
+	{{"Early-No-Match",             14},0}
+};
+
+/** String table of MRCPv2 recognizer headers (mrcp_recog_header_id) */
+static const apt_str_table_item_t v2_recog_header_string_table[] = {
+	{{"Confidence-Threshold",       20},8},
+	{{"Sensitivity-Level",          17},3},
+	{{"Speed-Vs-Accuracy",          17},4},
+	{{"N-Best-List-Length",         18},1},
+	{{"No-Input-Timeout",           16},2},
+	{{"Recognition-Timeout",        19},16},
+	{{"Waveform-Uri",               12},0},
+	{{"Completion-Cause",           16},16},
+	{{"Recognizer-Context-Block",   24},7},
+	{{"Start-Input-Timers",         18},2},
+	{{"Speech-Complete-Timeout",    23},7},
+	{{"Speech-Incomplete-Timeout",  25},8},
+	{{"DTMF-Interdigit-Timeout",    23},5},
+	{{"DTMF-Term-Timeout",          17},14},
+	{{"DTMF-Term-Char",             14},14},
+	{{"Failed-Uri",                 10},10},
+	{{"Failed-Uri-Cause",           16},16},
+	{{"Save-Waveform",              13},5},
+	{{"New-Audio-Channel",          17},2},
+	{{"Speech-Language",            15},8},
+	{{"Input-Type",                 10},10},
+	{{"Input-Waveform-Uri",         18},6},
+	{{"Completion-Reason",          17},13},
+	{{"Media-Type",                 10},0},
+	{{"Ver-Buffer-Utterance",       20},0},
+	{{"Recognition-Mode",           16},14},
+	{{"Cancel-If-Queue",            15},3},
+	{{"Hotword-Max-Duration",       20},10},
+	{{"Hotword-Min-Duration",       20},20},
+	{{"Interpret-Text",             14},7},
+	{{"DTMF-Buffer-Time",           16},5},
+	{{"Clear-DTMF-Buffer",          17},1},
+	{{"Early-No-Match",             14},0}
+};
+
+/** String table of MRCPv1 recognizer completion-cause fields (mrcp_recog_completion_cause_e) */
+static const apt_str_table_item_t v1_completion_cause_string_table[] = {
+	{{"success",                     7},1},
+	{{"no-match",                    8},8},
+	{{"no-input-timeout",           16},3},
+	{{"recognition-timeout",        19},0},
+	{{"gram-load-failure",          17},7},
+	{{"gram-comp-failure",          17},5},
+	{{"error",                       5},0},
+	{{"speech-too-early",           16},1},
+	{{"too-much-speech-timeout",    23},0},
+	{{"uri-failure",                11},0},
+	{{"language-unsupported",       20},0},
+	{{"cancelled",                   9},0},
+	{{"semantics-failure",          17},2},
+	{{"partial-match",              13},13},
+	{{"partial-match-maxtime",      21},13},
+	{{"no-match-maxtime",           16},9},
+	{{"gram-definition-failure",    23},5}
+};
+
+
+/** String table of MRCPv2 recognizer completion-cause fields (mrcp_recog_completion_cause_e) */
+static const apt_str_table_item_t v2_completion_cause_string_table[] = {
+	{{"success",                     7},7},
+	{{"no-match",                    8},4},
+	{{"no-input-timeout",           16},3},
+	{{"hotword-maxtime",            15},0},
+	{{"grammar-load-failure",       20},8},
+	{{"grammar-compilation-failure",27},8},
+	{{"recognizer-error",           16},0},
+	{{"speech-too-early",           16},1},
+	{{"success-maxtime",            15},15},
+	{{"uri-failure",                11},0},
+	{{"language-unsupported",       20},0},
+	{{"cancelled",                   9},0},
+	{{"semantics-failure",          17},2},
+	{{"partial-match",              13},13},
+	{{"partial-match-maxtime",      21},13},
+	{{"no-match-maxtime",           16},9},
+	{{"grammar-definition-failure", 26},9}
+};
+
+/** Generate MRCP recognizer completion-cause */
+static apt_bool_t mrcp_completion_cause_generate(mrcp_recog_completion_cause_e completion_cause, const apt_str_t *name, apt_text_stream_t *stream)
+{
+	int length = sprintf(stream->pos,"%03"APR_SIZE_T_FMT" ",completion_cause);
+	if(length <= 0) {
+		return FALSE;
+	}
+	stream->pos += length;
+
+	if(name) {
+		memcpy(stream->pos,name->buf,name->length);
+		stream->pos += name->length;
+	}
+	return TRUE;
+}
+
+
+/** Initialize recognizer header */
+static void mrcp_recog_header_init(mrcp_recog_header_t *recog_header)
+{
+	recog_header->confidence_threshold = 0.0;
+	recog_header->sensitivity_level = 0.0;
+	recog_header->speed_vs_accuracy = 0.0;
+	recog_header->n_best_list_length = 0;
+	recog_header->no_input_timeout = 0;
+	recog_header->recognition_timeout = 0;
+	apt_string_reset(&recog_header->waveform_uri);
+	recog_header->completion_cause = RECOGNIZER_COMPLETION_CAUSE_COUNT;
+	apt_string_reset(&recog_header->recognizer_context_block);
+	recog_header->start_input_timers = FALSE;
+	recog_header->speech_complete_timeout = 0;
+	recog_header->speech_incomplete_timeout = 0;
+	recog_header->dtmf_interdigit_timeout = 0;
+	recog_header->dtmf_term_timeout = 0;
+	recog_header->dtmf_term_char = 0;
+	apt_string_reset(&recog_header->failed_uri);
+	apt_string_reset(&recog_header->failed_uri_cause);
+	recog_header->save_waveform = FALSE;
+	recog_header->new_audio_channel = FALSE;
+	apt_string_reset(&recog_header->speech_language);
+	/* initializes additionnal MRCPV2 recog headers */
+	apt_string_reset(&recog_header->input_type);
+	apt_string_reset(&recog_header->input_waveform_uri);
+	apt_string_reset(&recog_header->completion_reason);
+	apt_string_reset(&recog_header->media_type);
+	recog_header->ver_buffer_utterance = FALSE;
+	apt_string_reset(&recog_header->recognition_mode);
+	recog_header->cancel_if_queue = FALSE;
+	recog_header->hotword_max_duration = 0;
+	recog_header->hotword_min_duration = 0;
+	apt_string_reset(&recog_header->interpret_text);
+	recog_header->dtmf_buffer_time = 0;
+	recog_header->clear_dtmf_buffer = FALSE;
+	recog_header->early_no_match = FALSE;
+}
+
+/** Allocate MRCP recognizer header */
+static void* mrcp_recog_header_allocate(mrcp_header_accessor_t *accessor, apr_pool_t *pool)
+{
+	mrcp_recog_header_t *recog_header = apr_palloc(pool,sizeof(mrcp_recog_header_t));
+	mrcp_recog_header_init(recog_header);
+	accessor->data = recog_header;
+	return accessor->data;
+}
+
+/** Parse MRCP recognizer header */
+static apt_bool_t mrcp_recog_header_parse(mrcp_recog_header_t *recog_header, apr_size_t id, const apt_str_t *value, apr_pool_t *pool)
+{
+	apt_bool_t status = TRUE;
+	switch(id) {
+		case RECOGNIZER_HEADER_N_BEST_LIST_LENGTH:
+			recog_header->n_best_list_length = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_NO_INPUT_TIMEOUT:
+			recog_header->no_input_timeout = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_RECOGNITION_TIMEOUT:
+			recog_header->recognition_timeout = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_WAVEFORM_URI:
+			apt_string_copy(&recog_header->waveform_uri,value,pool);
+			break;
+		case RECOGNIZER_HEADER_COMPLETION_CAUSE:
+			recog_header->completion_cause = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_RECOGNIZER_CONTEXT_BLOCK:
+			apt_string_copy(&recog_header->recognizer_context_block,value,pool);
+			break;
+		case RECOGNIZER_HEADER_START_INPUT_TIMERS:
+			apt_boolean_value_parse(value,&recog_header->start_input_timers);
+			break;
+		case RECOGNIZER_HEADER_SPEECH_COMPLETE_TIMEOUT:
+			recog_header->speech_complete_timeout = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_SPEECH_INCOMPLETE_TIMEOUT:
+			recog_header->speech_incomplete_timeout = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_DTMF_INTERDIGIT_TIMEOUT:
+			recog_header->dtmf_interdigit_timeout = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_DTMF_TERM_TIMEOUT:
+			recog_header->dtmf_term_timeout = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_DTMF_TERM_CHAR:
+			recog_header->dtmf_term_char = *value->buf;
+			break;
+		case RECOGNIZER_HEADER_FAILED_URI:
+			apt_string_copy(&recog_header->failed_uri,value,pool);
+			break;
+		case RECOGNIZER_HEADER_FAILED_URI_CAUSE:
+			apt_string_copy(&recog_header->failed_uri_cause,value,pool);
+			break;
+		case RECOGNIZER_HEADER_SAVE_WAVEFORM:
+			apt_boolean_value_parse(value,&recog_header->save_waveform);
+			break;
+		case RECOGNIZER_HEADER_NEW_AUDIO_CHANNEL:
+			apt_boolean_value_parse(value,&recog_header->new_audio_channel);
+			break;
+		case RECOGNIZER_HEADER_SPEECH_LANGUAGE:
+			apt_string_copy(&recog_header->speech_language,value,pool);
+			break;
+		case RECOGNIZER_HEADER_INPUT_TYPE:
+			apt_string_copy(&recog_header->input_type,value,pool);
+			break;
+		case RECOGNIZER_HEADER_MEDIA_TYPE:
+			apt_string_copy(&recog_header->media_type,value,pool);
+			break;
+		case RECOGNIZER_HEADER_INPUT_WAVEFORM_URI:
+			apt_string_copy(&recog_header->input_waveform_uri,value,pool);
+			break;
+		case RECOGNIZER_HEADER_COMPLETION_REASON:
+			apt_string_copy(&recog_header->completion_reason,value,pool);
+			break;
+		case RECOGNIZER_HEADER_VER_BUFFER_UTTERANCE:
+			apt_boolean_value_parse(value,&recog_header->ver_buffer_utterance);
+			break;
+		case RECOGNIZER_HEADER_RECOGNITION_MODE:
+			apt_string_copy(&recog_header->recognition_mode,value,pool);
+			break;
+		case RECOGNIZER_HEADER_CANCEL_IF_QUEUE:
+			apt_boolean_value_parse(value,&recog_header->cancel_if_queue);
+			break;
+		case RECOGNIZER_HEADER_HOTWORD_MAX_DURATION:
+			recog_header->hotword_max_duration = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_HOTWORD_MIN_DURATION:
+			recog_header->hotword_min_duration = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_INTERPRET_TEXT:
+			apt_string_copy(&recog_header->interpret_text,value,pool);
+			break;
+		case RECOGNIZER_HEADER_DTMF_BUFFER_TIME:
+			recog_header->dtmf_buffer_time = apt_size_value_parse(value);
+			break;
+		case RECOGNIZER_HEADER_CLEAR_DTMF_BUFFER:
+			apt_boolean_value_parse(value,&recog_header->clear_dtmf_buffer);
+			break;
+		case RECOGNIZER_HEADER_EARLY_NO_MATCH:
+			apt_boolean_value_parse(value,&recog_header->early_no_match);
+			break;
+		default:
+			status = FALSE;
+	}
+	return status;
+}
+
+static APR_INLINE float apt_size_value_parse_as_float(const apt_str_t *value)
+{
+	float f = (float)apt_size_value_parse(value);
+	return f / 100;
+}
+
+static APR_INLINE apt_bool_t apt_size_value_generate_from_float(float value, apt_text_stream_t *stream)
+{
+	apr_size_t s = (apr_size_t)((value + 0.001f) * 100);
+	return apt_size_value_generate(s,stream);
+}
+
+/** Parse MRCPv1 recognizer header */
+static apt_bool_t mrcp_v1_recog_header_parse(mrcp_header_accessor_t *accessor, apr_size_t id, const apt_str_t *value, apr_pool_t *pool)
+{
+	mrcp_recog_header_t *recog_header = accessor->data;
+	if(id == RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD) {
+		recog_header->confidence_threshold = apt_size_value_parse_as_float(value);
+		return TRUE;
+	}
+	else if(id == RECOGNIZER_HEADER_SENSITIVITY_LEVEL) {
+		recog_header->sensitivity_level = apt_size_value_parse_as_float(value);
+		return TRUE;
+	}
+	else if(id == RECOGNIZER_HEADER_SPEED_VS_ACCURACY) {
+		recog_header->speed_vs_accuracy = apt_size_value_parse_as_float(value);
+		return TRUE;
+	}
+	return mrcp_recog_header_parse(recog_header,id,value,pool);
+}
+
+/** Parse MRCPv2 recognizer header */
+static apt_bool_t mrcp_v2_recog_header_parse(mrcp_header_accessor_t *accessor, apr_size_t id, const apt_str_t *value, apr_pool_t *pool)
+{
+	mrcp_recog_header_t *recog_header = accessor->data;
+	if(id == RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD) {
+		recog_header->confidence_threshold = apt_float_value_parse(value);
+		return TRUE;
+	}
+	else if(id == RECOGNIZER_HEADER_SENSITIVITY_LEVEL) {
+		recog_header->sensitivity_level = apt_float_value_parse(value);
+		return TRUE;
+	}
+	else if(id == RECOGNIZER_HEADER_SPEED_VS_ACCURACY) {
+		recog_header->speed_vs_accuracy = apt_float_value_parse(value);
+		return TRUE;
+	}
+	return mrcp_recog_header_parse(recog_header,id,value,pool);
+}
+
+/** Generate MRCP recognizer header */
+static apt_bool_t mrcp_recog_header_generate(mrcp_recog_header_t *recog_header, apr_size_t id, apt_text_stream_t *value)
+{
+	switch(id) {
+		case RECOGNIZER_HEADER_N_BEST_LIST_LENGTH:
+			apt_size_value_generate(recog_header->n_best_list_length,value);
+			break;
+		case RECOGNIZER_HEADER_NO_INPUT_TIMEOUT:
+			apt_size_value_generate(recog_header->no_input_timeout,value);
+			break;
+		case RECOGNIZER_HEADER_RECOGNITION_TIMEOUT:
+			apt_size_value_generate(recog_header->recognition_timeout,value);
+			break;
+		case RECOGNIZER_HEADER_WAVEFORM_URI:
+			apt_string_value_generate(&recog_header->waveform_uri,value);
+			break;
+		case RECOGNIZER_HEADER_RECOGNIZER_CONTEXT_BLOCK:
+			apt_string_value_generate(&recog_header->recognizer_context_block,value);
+			break;
+		case RECOGNIZER_HEADER_START_INPUT_TIMERS:
+			apt_boolean_value_generate(recog_header->start_input_timers,value);
+			break;
+		case RECOGNIZER_HEADER_SPEECH_COMPLETE_TIMEOUT:
+			apt_size_value_generate(recog_header->speech_complete_timeout,value);
+			break;
+		case RECOGNIZER_HEADER_SPEECH_INCOMPLETE_TIMEOUT:
+			apt_size_value_generate(recog_header->speech_incomplete_timeout,value);
+			break;
+		case RECOGNIZER_HEADER_DTMF_INTERDIGIT_TIMEOUT:
+			apt_size_value_generate(recog_header->dtmf_interdigit_timeout,value);
+			break;
+		case RECOGNIZER_HEADER_DTMF_TERM_TIMEOUT:
+			apt_size_value_generate(recog_header->dtmf_term_timeout,value);
+			break;
+		case RECOGNIZER_HEADER_DTMF_TERM_CHAR:
+			*value->pos++ = recog_header->dtmf_term_char;
+			break;
+		case RECOGNIZER_HEADER_FAILED_URI:
+			apt_string_value_generate(&recog_header->failed_uri,value);
+			break;
+		case RECOGNIZER_HEADER_FAILED_URI_CAUSE:
+			apt_string_value_generate(&recog_header->failed_uri_cause,value);
+			break;
+		case RECOGNIZER_HEADER_SAVE_WAVEFORM:
+			apt_boolean_value_generate(recog_header->save_waveform,value);
+			break;
+		case RECOGNIZER_HEADER_NEW_AUDIO_CHANNEL:
+			apt_boolean_value_generate(recog_header->new_audio_channel,value);
+			break;
+		case RECOGNIZER_HEADER_SPEECH_LANGUAGE:
+			apt_string_value_generate(&recog_header->speech_language,value);
+			break;
+		case RECOGNIZER_HEADER_INPUT_TYPE:
+			apt_string_value_generate(&recog_header->input_type,value);
+			break;
+		case RECOGNIZER_HEADER_INPUT_WAVEFORM_URI:
+			apt_string_value_generate(&recog_header->input_waveform_uri,value);
+			break;
+		case RECOGNIZER_HEADER_COMPLETION_REASON:
+			apt_string_value_generate(&recog_header->completion_reason,value);
+			break;
+		case RECOGNIZER_HEADER_MEDIA_TYPE:
+			apt_string_value_generate(&recog_header->media_type,value);
+			break;
+		case RECOGNIZER_HEADER_VER_BUFFER_UTTERANCE:
+			apt_boolean_value_generate(recog_header->ver_buffer_utterance,value);
+			break;
+		case RECOGNIZER_HEADER_RECOGNITION_MODE:
+			apt_string_value_generate(&recog_header->recognition_mode,value);
+			break;
+		case RECOGNIZER_HEADER_CANCEL_IF_QUEUE:
+			apt_boolean_value_generate(recog_header->cancel_if_queue,value);
+			break;
+		case RECOGNIZER_HEADER_HOTWORD_MAX_DURATION:
+			apt_size_value_generate(recog_header->hotword_max_duration,value);
+			break;
+		case RECOGNIZER_HEADER_HOTWORD_MIN_DURATION:
+			apt_size_value_generate(recog_header->hotword_min_duration,value);
+			break;
+		case RECOGNIZER_HEADER_INTERPRET_TEXT:
+			apt_string_value_generate(&recog_header->interpret_text,value);
+			break;
+		case RECOGNIZER_HEADER_DTMF_BUFFER_TIME:
+			apt_size_value_generate(recog_header->dtmf_buffer_time,value);
+			break;
+		case RECOGNIZER_HEADER_CLEAR_DTMF_BUFFER:
+			apt_boolean_value_generate(recog_header->clear_dtmf_buffer,value);
+			break;
+		case RECOGNIZER_HEADER_EARLY_NO_MATCH:
+			apt_boolean_value_generate(recog_header->early_no_match,value);
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}
+
+/** Generate MRCPv1 recognizer header */
+static apt_bool_t mrcp_v1_recog_header_generate(mrcp_header_accessor_t *accessor, apr_size_t id, apt_text_stream_t *value)
+{
+	mrcp_recog_header_t *recog_header = accessor->data;
+	if(id == RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD) {
+		return apt_size_value_generate_from_float(recog_header->confidence_threshold,value);
+	}
+	else if(id == RECOGNIZER_HEADER_SENSITIVITY_LEVEL) {
+		return apt_size_value_generate_from_float(recog_header->sensitivity_level,value);
+	}
+	else if(id == RECOGNIZER_HEADER_SPEED_VS_ACCURACY) {
+		return apt_size_value_generate_from_float(recog_header->speed_vs_accuracy,value);
+	}
+	else if(id == RECOGNIZER_HEADER_COMPLETION_CAUSE) {
+		const apt_str_t *name = apt_string_table_str_get(
+			v1_completion_cause_string_table,
+			RECOGNIZER_COMPLETION_CAUSE_COUNT,
+			recog_header->completion_cause);
+		return mrcp_completion_cause_generate(recog_header->completion_cause,name,value);
+	}
+	return mrcp_recog_header_generate(recog_header,id,value);
+}
+
+/** Generate MRCPv2 recognizer header */
+static apt_bool_t mrcp_v2_recog_header_generate(mrcp_header_accessor_t *accessor, apr_size_t id, apt_text_stream_t *value)
+{
+	mrcp_recog_header_t *recog_header = accessor->data;
+	if(id == RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD) {
+		return apt_float_value_generate(recog_header->confidence_threshold,value);
+	}
+	else if(id == RECOGNIZER_HEADER_SENSITIVITY_LEVEL) {
+		return apt_float_value_generate(recog_header->sensitivity_level,value);
+	}
+	else if(id == RECOGNIZER_HEADER_SPEED_VS_ACCURACY) {
+		return apt_float_value_generate(recog_header->speed_vs_accuracy,value);
+	}
+	else if(id == RECOGNIZER_HEADER_COMPLETION_CAUSE) {
+		const apt_str_t *name = apt_string_table_str_get(
+			v2_completion_cause_string_table,
+			RECOGNIZER_COMPLETION_CAUSE_COUNT,
+			recog_header->completion_cause);
+		return mrcp_completion_cause_generate(recog_header->completion_cause,name,value);
+	}
+	return mrcp_recog_header_generate(recog_header,id,value);
+}
+
+/** Duplicate MRCP recognizer header */
+static apt_bool_t mrcp_recog_header_duplicate(mrcp_header_accessor_t *accessor, const mrcp_header_accessor_t *src, apr_size_t id, apr_pool_t *pool)
+{
+	mrcp_recog_header_t *recog_header = accessor->data;
+	const mrcp_recog_header_t *src_recog_header = src->data;
+	apt_bool_t status = TRUE;
+
+	if(!recog_header || !src_recog_header) {
+		return FALSE;
+	}
+	
+	switch(id) {
+		case RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD:
+			recog_header->confidence_threshold = src_recog_header->confidence_threshold;
+			break;
+		case RECOGNIZER_HEADER_SENSITIVITY_LEVEL:
+			recog_header->sensitivity_level = src_recog_header->sensitivity_level;
+			break;
+		case RECOGNIZER_HEADER_SPEED_VS_ACCURACY:
+			recog_header->speed_vs_accuracy = src_recog_header->speed_vs_accuracy;
+			break;
+		case RECOGNIZER_HEADER_N_BEST_LIST_LENGTH:
+			recog_header->n_best_list_length = src_recog_header->n_best_list_length;
+			break;
+		case RECOGNIZER_HEADER_NO_INPUT_TIMEOUT:
+			recog_header->no_input_timeout = src_recog_header->no_input_timeout;
+			break;
+		case RECOGNIZER_HEADER_RECOGNITION_TIMEOUT:
+			recog_header->recognition_timeout = src_recog_header->recognition_timeout;
+			break;
+		case RECOGNIZER_HEADER_WAVEFORM_URI:
+			apt_string_copy(&recog_header->waveform_uri,&src_recog_header->waveform_uri,pool);
+			break;
+		case RECOGNIZER_HEADER_COMPLETION_CAUSE:
+			recog_header->completion_cause = src_recog_header->completion_cause;
+			break;
+		case RECOGNIZER_HEADER_RECOGNIZER_CONTEXT_BLOCK:
+			apt_string_copy(&recog_header->recognizer_context_block,&src_recog_header->recognizer_context_block,pool);
+			break;
+		case RECOGNIZER_HEADER_START_INPUT_TIMERS:
+			recog_header->start_input_timers = src_recog_header->start_input_timers;
+			break;
+		case RECOGNIZER_HEADER_SPEECH_COMPLETE_TIMEOUT:
+			recog_header->speech_complete_timeout = src_recog_header->speech_complete_timeout;
+			break;
+		case RECOGNIZER_HEADER_SPEECH_INCOMPLETE_TIMEOUT:
+			recog_header->speech_incomplete_timeout = src_recog_header->speech_incomplete_timeout;
+			break;
+		case RECOGNIZER_HEADER_DTMF_INTERDIGIT_TIMEOUT:
+			recog_header->dtmf_interdigit_timeout = src_recog_header->dtmf_interdigit_timeout;
+			break;
+		case RECOGNIZER_HEADER_DTMF_TERM_TIMEOUT:
+			recog_header->dtmf_term_timeout = src_recog_header->dtmf_term_timeout;
+			break;
+		case RECOGNIZER_HEADER_DTMF_TERM_CHAR:
+			recog_header->dtmf_term_char = src_recog_header->dtmf_term_char;
+			break;
+		case RECOGNIZER_HEADER_FAILED_URI:
+			apt_string_copy(&recog_header->failed_uri,&src_recog_header->failed_uri,pool);
+			break;
+		case RECOGNIZER_HEADER_FAILED_URI_CAUSE:
+			apt_string_copy(&recog_header->failed_uri_cause,&src_recog_header->failed_uri_cause,pool);
+			break;
+		case RECOGNIZER_HEADER_SAVE_WAVEFORM:
+			recog_header->save_waveform = src_recog_header->save_waveform;
+			break;
+		case RECOGNIZER_HEADER_NEW_AUDIO_CHANNEL:
+			recog_header->new_audio_channel = src_recog_header->new_audio_channel;
+			break;
+		case RECOGNIZER_HEADER_SPEECH_LANGUAGE:
+			apt_string_copy(&recog_header->speech_language,&src_recog_header->speech_language,pool);
+			break;
+		case RECOGNIZER_HEADER_INPUT_TYPE:
+			apt_string_copy(&recog_header->input_type,&src_recog_header->input_type,pool);
+			break;
+		case RECOGNIZER_HEADER_INPUT_WAVEFORM_URI:
+			apt_string_copy(&recog_header->input_waveform_uri,&src_recog_header->input_waveform_uri,pool);
+			break;
+		case RECOGNIZER_HEADER_COMPLETION_REASON:
+			apt_string_copy(&recog_header->completion_reason,&src_recog_header->completion_reason,pool);
+			break;
+		case RECOGNIZER_HEADER_MEDIA_TYPE:
+			apt_string_copy(&recog_header->media_type,&src_recog_header->media_type,pool);
+			break;
+		case RECOGNIZER_HEADER_VER_BUFFER_UTTERANCE:
+			recog_header->ver_buffer_utterance = src_recog_header->ver_buffer_utterance;
+			break;
+		case RECOGNIZER_HEADER_RECOGNITION_MODE:
+			apt_string_copy(&recog_header->recognition_mode,&src_recog_header->recognition_mode,pool);
+			break;
+		case RECOGNIZER_HEADER_CANCEL_IF_QUEUE:
+			recog_header->cancel_if_queue = src_recog_header->cancel_if_queue;
+			break;
+		case RECOGNIZER_HEADER_HOTWORD_MAX_DURATION:
+			recog_header->hotword_max_duration = src_recog_header->hotword_max_duration;
+			break;
+		case RECOGNIZER_HEADER_HOTWORD_MIN_DURATION:
+			recog_header->hotword_min_duration = src_recog_header->hotword_min_duration;
+			break;
+		case RECOGNIZER_HEADER_INTERPRET_TEXT:
+			apt_string_copy(&recog_header->interpret_text,&src_recog_header->interpret_text,pool);
+			break;
+		case RECOGNIZER_HEADER_DTMF_BUFFER_TIME:
+			recog_header->dtmf_buffer_time = src_recog_header->dtmf_buffer_time;
+			break;
+		case RECOGNIZER_HEADER_CLEAR_DTMF_BUFFER:
+			recog_header->clear_dtmf_buffer = src_recog_header->clear_dtmf_buffer;
+			break;
+		case RECOGNIZER_HEADER_EARLY_NO_MATCH:
+			recog_header->early_no_match = src_recog_header->early_no_match;
+			break;
+		default:
+			status = FALSE;
+	}
+	return status;
+}
+
+static APR_INLINE const apt_str_table_item_t* recog_header_string_table_get(mrcp_version_e version)
+{
+	if(version == MRCP_VERSION_1) {
+		return v1_recog_header_string_table;
+	}
+	return v2_recog_header_string_table;
+}
+
+static const mrcp_header_vtable_t v1_vtable = {
+	mrcp_recog_header_allocate,
+	NULL, /* nothing to destroy */
+	mrcp_v1_recog_header_parse,
+	mrcp_v1_recog_header_generate,
+	mrcp_recog_header_duplicate,
+	v1_recog_header_string_table,
+	RECOGNIZER_HEADER_COUNT
+};
+
+static const mrcp_header_vtable_t v2_vtable = {
+	mrcp_recog_header_allocate,
+	NULL, /* nothing to destroy */
+	mrcp_v2_recog_header_parse,
+	mrcp_v2_recog_header_generate,
+	mrcp_recog_header_duplicate,
+	v2_recog_header_string_table,
+	RECOGNIZER_HEADER_COUNT
+};
+
+MRCP_DECLARE(const mrcp_header_vtable_t*) mrcp_recog_header_vtable_get(mrcp_version_e version)
+{
+	if(version == MRCP_VERSION_1) {
+		return &v1_vtable;
+	}
+	return &v2_vtable;
+}
+
+MRCP_DECLARE(const apt_str_t*) mrcp_recog_completion_cause_get(mrcp_recog_completion_cause_e completion_cause, mrcp_version_e version)
+{
+	const apt_str_table_item_t *table = v2_completion_cause_string_table;
+	if(version == MRCP_VERSION_1) {
+		table = v1_completion_cause_string_table;
+	}
+
+	return apt_string_table_str_get(table,RECOGNIZER_COMPLETION_CAUSE_COUNT,completion_cause);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_resource.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_resource.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_recog_resource.h"
+#include "mrcp_recog_header.h"
+#include "mrcp_recog_state_machine.h"
+#include "mrcp_resource.h"
+#include "mrcp_message.h"
+
+/** String table of MRCP recognizer methods (mrcp_recognizer_method_id) */
+static const apt_str_table_item_t v1_recog_method_string_table[] = {
+	{{"SET-PARAMS",               10},10},
+	{{"GET-PARAMS",               10},10},
+	{{"DEFINE-GRAMMAR",           14},0},
+	{{"RECOGNIZE",                 9},7},
+	{{"GET-RESULT",               10},4},
+	{{"RECOGNITION-START-TIMERS", 24},7},
+	{{"STOP",                      4},1}
+};
+
+/** String table of mrcpv2 recognizer methods (mrcp_recognizer_method_id) */
+static const apt_str_table_item_t v2_recog_method_string_table[] = {
+	{{"SET-PARAMS",               10},10},
+	{{"GET-PARAMS",               10},10},
+	{{"DEFINE-GRAMMAR",           14},0},
+	{{"RECOGNIZE",                 9},7},
+	{{"GET-RESULT",               10},4},
+	{{"START-INPUT-TIMERS",       18},2},
+	{{"STOP",                      4},2}
+};
+
+/** String table of MRCP recognizer events (mrcp_recognizer_event_id) */
+static const apt_str_table_item_t v1_recog_event_string_table[] = {
+	{{"START-OF-SPEECH",          15},0},
+	{{"RECOGNITION-COMPLETE",     20},0}
+};
+
+/** String table of mrcpv2 recognizer events (mrcp_recognizer_event_id) */
+static const apt_str_table_item_t v2_recog_event_string_table[] = {
+	{{"START-OF-INPUT",           14},0},
+	{{"RECOGNITION-COMPLETE",     20},0}
+};
+
+
+static APR_INLINE const apt_str_table_item_t* recog_method_string_table_get(mrcp_version_e version)
+{
+	if(version == MRCP_VERSION_1) {
+		return v1_recog_method_string_table;
+	}
+	return v2_recog_method_string_table;
+}
+
+static APR_INLINE const apt_str_table_item_t* recog_event_string_table_get(mrcp_version_e version)
+{
+	if(version == MRCP_VERSION_1) {
+		return v1_recog_event_string_table;
+	}
+	return v2_recog_event_string_table;
+}
+
+/** Set resource specifica data */
+static apt_bool_t recog_message_resourcify_by_id(mrcp_resource_t *resource, mrcp_message_t *message)
+{
+	/* associate method_name and method_id */
+	if(message->start_line.message_type == MRCP_MESSAGE_TYPE_REQUEST) {
+		const apt_str_t *name = apt_string_table_str_get(
+			recog_method_string_table_get(message->start_line.version),
+			RECOGNIZER_METHOD_COUNT,
+			message->start_line.method_id);
+		if(!name) {
+			return FALSE;
+		}
+		message->start_line.method_name = *name;
+	}
+	else if(message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		const apt_str_t *name = apt_string_table_str_get(
+			recog_event_string_table_get(message->start_line.version),
+			RECOGNIZER_EVENT_COUNT,
+			message->start_line.method_id);
+		if(!name) {
+			return FALSE;
+		}
+		message->start_line.method_name = *name;
+	}
+
+	message->header.resource_header_accessor.vtable = mrcp_recog_header_vtable_get(message->start_line.version);
+	return TRUE;
+}
+
+/** Set resource specifica data */
+static apt_bool_t recog_message_resourcify_by_name(mrcp_resource_t *resource, mrcp_message_t *message)
+{
+	/* associate method_name and method_id */
+	if(message->start_line.message_type == MRCP_MESSAGE_TYPE_REQUEST) {
+		message->start_line.method_id = apt_string_table_id_find(
+			recog_method_string_table_get(message->start_line.version),
+			RECOGNIZER_METHOD_COUNT,
+			&message->start_line.method_name);
+		if(message->start_line.method_id >= RECOGNIZER_METHOD_COUNT) {
+			return FALSE;
+		}
+	}
+	else if(message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		message->start_line.method_id = apt_string_table_id_find(
+			recog_event_string_table_get(message->start_line.version),
+			RECOGNIZER_EVENT_COUNT,
+			&message->start_line.method_name);
+		if(message->start_line.method_id >= RECOGNIZER_EVENT_COUNT) {
+			return FALSE;
+		}
+	}
+
+	message->header.resource_header_accessor.vtable = mrcp_recog_header_vtable_get(message->start_line.version);
+	return TRUE;
+}
+
+
+/** Create MRCP recognizer resource */
+MRCP_DECLARE(mrcp_resource_t*) mrcp_recog_resource_create(apr_pool_t *pool)
+{
+	mrcp_resource_t *resource = apr_palloc(pool,sizeof(mrcp_resource_t));
+	mrcp_resource_init(resource);
+
+	resource->resourcify_message_by_id = recog_message_resourcify_by_id;
+	resource->resourcify_message_by_name = recog_message_resourcify_by_name;
+
+	resource->create_client_state_machine = mrcp_recog_client_state_machine_create;
+	resource->create_server_state_machine = mrcp_recog_server_state_machine_create;
+	return resource;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_server_state_machine.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_recog_server_state_machine.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,473 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_obj_list.h"
+#include "apt_log.h"
+#include "mrcp_state_machine.h"
+#include "mrcp_recog_state_machine.h"
+#include "mrcp_recog_header.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_recog_resource.h"
+#include "mrcp_message.h"
+
+/** MRCP recognizer states */
+typedef enum {
+	RECOGNIZER_STATE_IDLE,
+	RECOGNIZER_STATE_RECOGNIZING,
+	RECOGNIZER_STATE_RECOGNIZED,
+
+	RECOGNIZER_STATE_COUNT
+} mrcp_recog_state_e;
+
+static const char * state_names[RECOGNIZER_STATE_COUNT] = {
+	"IDLE",
+	"RECOGNIZING",
+	"RECOGNIZED"
+};
+
+typedef struct mrcp_recog_state_machine_t mrcp_recog_state_machine_t;
+struct mrcp_recog_state_machine_t {
+	/** state machine base */
+	mrcp_state_machine_t  base;
+	/** recognizer state */
+	mrcp_recog_state_e    state;
+	/** indicate whether active_request was processed from pending request queue */
+	apt_bool_t            is_pending;
+	/** request sent to recognition engine and waiting for the response to be received */
+	mrcp_message_t       *active_request;
+	/** in-progress recognize request */
+	mrcp_message_t       *recog;
+	/** queue of pending recognition requests */
+	apt_obj_list_t       *queue;
+	/** properties used in set/get params */
+	mrcp_message_header_t properties;
+};
+
+typedef apt_bool_t (*recog_method_f)(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message);
+
+static APR_INLINE apt_bool_t recog_request_dispatch(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	state_machine->active_request = message;
+	return state_machine->base.dispatcher(&state_machine->base,message);
+}
+
+static APR_INLINE apt_bool_t recog_response_dispatch(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	state_machine->active_request = NULL;
+	return state_machine->base.dispatcher(&state_machine->base,message);
+}
+
+static APR_INLINE apt_bool_t recog_event_dispatch(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	return state_machine->base.dispatcher(&state_machine->base,message);
+}
+
+static APR_INLINE void recog_state_change(mrcp_recog_state_machine_t *state_machine, mrcp_recog_state_e state)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"State Transition %s -> %s",state_names[state_machine->state],state_names[state]);
+	state_machine->state = state;
+	if(state == RECOGNIZER_STATE_IDLE) {
+		state_machine->recog = NULL;
+	}
+}
+
+
+static apt_bool_t recog_request_set_params(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process SET-PARAMS Request [%d]",message->start_line.request_id);
+	mrcp_message_header_set(&state_machine->properties,&message->header,message->pool);
+	return recog_request_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_response_set_params(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process SET-PARAMS Response [%d]",message->start_line.request_id);
+	return recog_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_request_get_params(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process GET-PARAMS Request [%d]",message->start_line.request_id);
+	return recog_request_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_response_get_params(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process GET-PARAMS Response [%d]",message->start_line.request_id);
+	mrcp_message_header_set(&message->header,&state_machine->active_request->header,message->pool);
+	mrcp_message_header_get(&message->header,&state_machine->properties,message->pool);
+	return recog_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_request_define_grammar(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	if(state_machine->state == RECOGNIZER_STATE_RECOGNIZING) {
+		mrcp_message_t *response_message = mrcp_response_create(message,message->pool);
+		response_message->start_line.status_code = MRCP_STATUS_CODE_METHOD_NOT_VALID;
+		return recog_response_dispatch(state_machine,response_message);
+	}
+	else if(state_machine->state == RECOGNIZER_STATE_RECOGNIZED) {
+		recog_state_change(state_machine,RECOGNIZER_STATE_IDLE);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process DEFINE-GRAMMAR Request [%d]",message->start_line.request_id);
+	return recog_request_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_response_define_grammar(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process DEFINE-GRAMMAR Response [%d]",message->start_line.request_id);
+	if(mrcp_resource_header_property_check(message,RECOGNIZER_HEADER_COMPLETION_CAUSE) != TRUE) {
+		mrcp_recog_header_t *recog_header = mrcp_resource_header_prepare(message);
+		recog_header->completion_cause = RECOGNIZER_COMPLETION_CAUSE_SUCCESS;
+		mrcp_resource_header_property_add(message,RECOGNIZER_HEADER_COMPLETION_CAUSE);
+	}
+	return recog_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_request_recognize(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_header_inherit(&message->header,&state_machine->properties,message->pool);
+	if(state_machine->state == RECOGNIZER_STATE_RECOGNIZING) {
+		mrcp_message_t *response;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Queue Up RECOGNIZE Request [%d]",message->start_line.request_id);
+		message->start_line.request_state = MRCP_REQUEST_STATE_PENDING;
+		apt_list_push_back(state_machine->queue,message,message->pool);
+		
+		response = mrcp_response_create(message,message->pool);
+		response->start_line.request_state = MRCP_REQUEST_STATE_PENDING;
+		return recog_response_dispatch(state_machine,response);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process RECOGNIZE Request [%d]",message->start_line.request_id);
+	return recog_request_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_response_recognize(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process RECOGNIZE Response [%d]",message->start_line.request_id);
+	if(message->start_line.request_state == MRCP_REQUEST_STATE_INPROGRESS) {
+		state_machine->recog = state_machine->active_request;
+		recog_state_change(state_machine,RECOGNIZER_STATE_RECOGNIZING);
+	}
+	if(state_machine->is_pending == TRUE) {
+		state_machine->is_pending = FALSE;
+		/* not to send the response for pending request */
+		return TRUE;
+	}
+	return recog_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_request_get_result(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *response_message;
+	if(state_machine->state == RECOGNIZER_STATE_RECOGNIZED) {
+		/* found recognized request */
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process GET-RESULT Request [%d]",message->start_line.request_id);
+		return recog_request_dispatch(state_machine,message);
+	}
+
+	/* found no recognized request */
+	response_message = mrcp_response_create(message,message->pool);
+	response_message->start_line.status_code = MRCP_STATUS_CODE_METHOD_NOT_VALID;
+	return recog_response_dispatch(state_machine,response_message);
+}
+
+static apt_bool_t recog_response_get_result(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process GET-RESULT Response [%d]",message->start_line.request_id);
+	return recog_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_request_recognition_start_timers(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *response_message;
+	if(state_machine->state == RECOGNIZER_STATE_RECOGNIZING) {
+		/* found in-progress request */
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process START-INPUT-TIMERS Request [%d]",message->start_line.request_id);
+		return recog_request_dispatch(state_machine,message);
+	}
+
+	/* found no in-progress request */
+	response_message = mrcp_response_create(message,message->pool);
+	response_message->start_line.status_code = MRCP_STATUS_CODE_METHOD_NOT_VALID;
+	return recog_response_dispatch(state_machine,response_message);
+}
+
+static apt_bool_t recog_response_recognition_start_timers(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process START-INPUT-TIMERS Response [%d]",message->start_line.request_id);
+	return recog_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_pending_requests_remove(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *request_message, mrcp_message_t *response_message)
+{
+	apt_list_elem_t *elem;
+	mrcp_message_t *pending_message;
+	mrcp_request_id_list_t *request_id_list = NULL;
+	mrcp_generic_header_t *generic_header = mrcp_generic_header_get(request_message);
+	mrcp_generic_header_t *response_generic_header = mrcp_generic_header_prepare(response_message);
+	if(generic_header && mrcp_generic_header_property_check(request_message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST) == TRUE) {
+		if(generic_header->active_request_id_list.ids && generic_header->active_request_id_list.count) {
+			/* selective STOP request */
+			request_id_list = &generic_header->active_request_id_list;
+		}
+	}
+
+	elem = apt_list_first_elem_get(state_machine->queue);
+	while(elem) {
+		pending_message = apt_list_elem_object_get(elem);
+		if(!request_id_list || active_request_id_list_find(generic_header,pending_message->start_line.request_id) == TRUE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remove Pending RECOGNIZE Request [%d]",pending_message->start_line.request_id);
+			elem = apt_list_elem_remove(state_machine->queue,elem);
+			/* append active id list */
+			active_request_id_list_append(response_generic_header,pending_message->start_line.request_id);
+		}
+		else {
+			/* speak request remains in the queue, just proceed to the next one */
+			elem = apt_list_next_elem_get(state_machine->queue,elem);
+		}
+	}
+	if(response_generic_header->active_request_id_list.count) {
+		mrcp_generic_header_property_add(response_message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST);
+	}
+	return TRUE;
+}
+
+static apt_bool_t recog_request_stop(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *response_message;
+	if(state_machine->state == RECOGNIZER_STATE_RECOGNIZING) {
+		mrcp_request_id_list_t *request_id_list = NULL;
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_get(message);
+		if(generic_header && mrcp_generic_header_property_check(message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST) == TRUE) {
+			if(generic_header->active_request_id_list.ids && generic_header->active_request_id_list.count) {
+				/* selective STOP request */
+				request_id_list = &generic_header->active_request_id_list;
+			}
+		}
+
+		if(!request_id_list || active_request_id_list_find(generic_header,state_machine->recog->start_line.request_id) == TRUE) {
+			/* found in-progress RECOGNIZE request, stop it */
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process STOP Request [%d]",message->start_line.request_id);
+			return recog_request_dispatch(state_machine,message);
+		}
+	}
+	else if(state_machine->state == RECOGNIZER_STATE_RECOGNIZED) {
+		recog_state_change(state_machine,RECOGNIZER_STATE_IDLE);
+	}
+
+	/* found no in-progress RECOGNIZE request, sending immediate response */
+	response_message = mrcp_response_create(message,message->pool);
+	recog_pending_requests_remove(state_machine,message,response_message);
+	return recog_response_dispatch(state_machine,response_message);
+}
+
+static apt_bool_t recog_response_stop(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *pending_request;
+	mrcp_generic_header_t *generic_header = mrcp_generic_header_prepare(message);
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process STOP Response [%d]",message->start_line.request_id);
+	/* append active id list */
+	active_request_id_list_append(generic_header,state_machine->recog->start_line.request_id);
+	mrcp_generic_header_property_add(message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST);
+	recog_pending_requests_remove(state_machine,state_machine->active_request,message);
+	recog_state_change(state_machine,RECOGNIZER_STATE_IDLE);
+	recog_response_dispatch(state_machine,message);
+
+	/* process pending RECOGNIZE requests / if any */
+	pending_request = apt_list_pop_front(state_machine->queue);
+	if(pending_request) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process Pending RECOGNIZE Request [%d]",pending_request->start_line.request_id);
+		state_machine->is_pending = TRUE;
+		recog_request_dispatch(state_machine,pending_request);
+	}
+	return TRUE;
+}
+
+static apt_bool_t recog_event_start_of_input(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	if(!state_machine->recog) {
+		/* unexpected event, no in-progress recognition request */
+		return FALSE;
+	}
+
+	if(state_machine->recog->start_line.request_id != message->start_line.request_id) {
+		/* unexpected event */
+		return FALSE;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process START-OF-INPUT Event [%d]",message->start_line.request_id);
+	message->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
+	return recog_event_dispatch(state_machine,message);
+}
+
+static apt_bool_t recog_event_recognition_complete(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *pending_request;
+	if(!state_machine->recog) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Unexpected RECOGNITION-COMPLETE Event [%d]",message->start_line.request_id);
+		return FALSE;
+	}
+
+	if(state_machine->recog->start_line.request_id != message->start_line.request_id) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Unexpected RECOGNITION-COMPLETE Event [%d]",message->start_line.request_id);
+		return FALSE;
+	}
+
+	if(state_machine->active_request && state_machine->active_request->start_line.method_id == RECOGNIZER_STOP) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Ignore RECOGNITION-COMPLETE Event [%d]: waiting for STOP response",message->start_line.request_id);
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process RECOGNITION-COMPLETE Event [%d]",message->start_line.request_id);
+	if(mrcp_resource_header_property_check(message,RECOGNIZER_HEADER_COMPLETION_CAUSE) != TRUE) {
+		mrcp_recog_header_t *recog_header = mrcp_resource_header_prepare(message);
+		recog_header->completion_cause = RECOGNIZER_COMPLETION_CAUSE_SUCCESS;
+		mrcp_resource_header_property_add(message,RECOGNIZER_HEADER_COMPLETION_CAUSE);
+	}
+	recog_state_change(state_machine,RECOGNIZER_STATE_RECOGNIZED);
+	recog_event_dispatch(state_machine,message);
+
+	/* process pending RECOGNIZE requests */
+	pending_request = apt_list_pop_front(state_machine->queue);
+	if(pending_request) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process Pending RECOGNIZE Request [%d]",pending_request->start_line.request_id);
+		state_machine->is_pending = TRUE;
+		recog_request_dispatch(state_machine,pending_request);
+	}
+	return TRUE;
+}
+
+static recog_method_f recog_request_method_array[RECOGNIZER_METHOD_COUNT] = {
+	recog_request_set_params,
+	recog_request_get_params,
+	recog_request_define_grammar,
+	recog_request_recognize,
+	recog_request_get_result,
+	recog_request_recognition_start_timers,
+	recog_request_stop
+};
+
+static recog_method_f recog_response_method_array[RECOGNIZER_METHOD_COUNT] = {
+	recog_response_set_params,
+	recog_response_get_params,
+	recog_response_define_grammar,
+	recog_response_recognize,
+	recog_response_get_result,
+	recog_response_recognition_start_timers,
+	recog_response_stop
+};
+
+static recog_method_f recog_event_method_array[RECOGNIZER_EVENT_COUNT] = {
+	recog_event_start_of_input,
+	recog_event_recognition_complete
+};
+
+/** Update state according to received incoming request from MRCP client */
+static apt_bool_t recog_request_state_update(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	recog_method_f method;
+	if(message->start_line.method_id >= RECOGNIZER_METHOD_COUNT) {
+		return FALSE;
+	}
+	
+	method = recog_request_method_array[message->start_line.method_id];
+	if(method) {
+		return method(state_machine,message);
+	}
+	return recog_request_dispatch(state_machine,message);
+}
+
+/** Update state according to received outgoing response from recognition engine */
+static apt_bool_t recog_response_state_update(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	recog_method_f method;
+	if(!state_machine->active_request) {
+		/* unexpected response, no active request waiting for response */
+		return FALSE;
+	}
+	if(state_machine->active_request->start_line.request_id != message->start_line.request_id) {
+		/* unexpected response, request id doesn't match */
+		return FALSE;
+	}
+
+	if(message->start_line.method_id >= RECOGNIZER_METHOD_COUNT) {
+		return FALSE;
+	}
+	
+	method = recog_response_method_array[message->start_line.method_id];
+	if(method) {
+		return method(state_machine,message);
+	}
+	return recog_response_dispatch(state_machine,message);
+}
+
+/** Update state according to received outgoing event from recognition engine */
+static apt_bool_t recog_event_state_update(mrcp_recog_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	recog_method_f method;
+	if(message->start_line.method_id >= RECOGNIZER_EVENT_COUNT) {
+		return FALSE;
+	}
+	
+	method = recog_event_method_array[message->start_line.method_id];
+	if(method) {
+		return method(state_machine,message);
+	}
+	return recog_event_dispatch(state_machine,message);
+}
+
+/** Update state according to request received from MRCP client or response/event received from recognition engine */
+static apt_bool_t recog_state_update(mrcp_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_recog_state_machine_t *recog_state_machine = (mrcp_recog_state_machine_t*)state_machine;
+	apt_bool_t status = TRUE;
+	switch(message->start_line.message_type) {
+		case MRCP_MESSAGE_TYPE_REQUEST:
+			status = recog_request_state_update(recog_state_machine,message);
+			break;
+		case MRCP_MESSAGE_TYPE_RESPONSE:
+			status = recog_response_state_update(recog_state_machine,message);
+			break;
+		case MRCP_MESSAGE_TYPE_EVENT:
+			status = recog_event_state_update(recog_state_machine,message);
+			break;
+		default:
+			status = FALSE;
+			break;
+	}
+	return status;
+}
+
+/** Create MRCP recognizer server state machine */
+mrcp_state_machine_t* mrcp_recog_server_state_machine_create(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool)
+{
+	mrcp_message_header_t *properties;
+	mrcp_recog_state_machine_t *state_machine = apr_palloc(pool,sizeof(mrcp_recog_state_machine_t));
+	mrcp_state_machine_init(&state_machine->base,obj,dispatcher);
+	state_machine->base.update = recog_state_update;
+	state_machine->state = RECOGNIZER_STATE_IDLE;
+	state_machine->is_pending = FALSE;
+	state_machine->active_request = NULL;
+	state_machine->recog = NULL;
+	state_machine->queue = apt_list_create(pool);
+	properties = &state_machine->properties;
+	mrcp_message_header_init(properties);
+	properties->generic_header_accessor.vtable = mrcp_generic_header_vtable_get(version);
+	properties->resource_header_accessor.vtable = mrcp_recog_header_vtable_get(version);
+	return &state_machine->base;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_client_state_machine.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_client_state_machine.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_state_machine.h"
+#include "mrcp_synth_state_machine.h"
+#include "mrcp_message.h"
+
+
+/** Update state according to request received from user level or response/event received from MRCP server */
+static apt_bool_t synth_state_update(mrcp_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	/* no actual state machine processing yet, dispatch whatever received */
+	return state_machine->dispatcher(state_machine,message);
+}
+
+/** Create MRCP synthesizer client state machine */
+mrcp_state_machine_t* mrcp_synth_client_state_machine_create(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool)
+{
+	mrcp_state_machine_t *state_machine = apr_palloc(pool,sizeof(mrcp_state_machine_t));
+	mrcp_state_machine_init(state_machine,obj,dispatcher);
+	state_machine->update = synth_state_update;
+	return state_machine;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_header.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_header.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,558 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_synth_header.h"
+
+/** String table of MRCP synthesizer headers (mrcp_synthesizer_header_id) */
+static const apt_str_table_item_t synth_header_string_table[] = {
+	{{"Jump-Size",            9},0},
+	{{"Kill-On-Barge-In",    16},0},
+	{{"Speaker-Profile",     15},8},
+	{{"Completion-Cause",    16},16},
+	{{"Completion-Reason",   17},13},
+	{{"Voice-Gender",        12},6},
+	{{"Voice-Age",            9},6},
+	{{"Voice-Variant",       13},6},
+	{{"Voice-Name",          10},8},
+	{{"Prosody-Volume",      14},8},
+	{{"Prosody-Rate",        12},12},
+	{{"Speech-Marker",       13},7},
+	{{"Speech-Language",     15},7},
+	{{"Fetch-Hint",          10},2},
+	{{"Audio-Fetch-Hint",    16},0},
+	{{"Failed-Uri",          10},10},
+	{{"Failed-Uri_Cause",    16},10},
+	{{"Speak-Restart",       13},13},
+	{{"Speak-Length",        12},6},
+	{{"Load-Lexicon",        12},2},
+	{{"Lexicon-Search-Order",20},2}
+};
+
+/** String table of MRCP speech-unit fields (mrcp_speech_unit_t) */
+static const apt_str_table_item_t speech_unit_string_table[] = {
+	{{"Second",   6},2},
+	{{"Word",     4},0},
+	{{"Sentence", 8},2},
+	{{"Paragraph",9},0}
+};
+
+/** String table of MRCP voice-gender fields (mrcp_voice_gender_t) */
+static const apt_str_table_item_t voice_gender_string_table[] = {
+	{{"male",   4},0},
+	{{"female", 6},0},
+	{{"neutral",7},0}
+};
+
+/** String table of MRCP prosody-volume fields (mrcp_prosody_volume_t) */
+static const apt_str_table_item_t prosody_volume_string_table[] = {
+	{{"silent", 6},1},
+	{{"x-soft", 6},2},
+	{{"soft",   4},3},
+	{{"medium", 6},0},
+	{{"loud",   4},0},
+	{{"x-loud", 6},5},
+	{{"default",7},0} 
+};
+
+/** String table of MRCP prosody-rate fields (mrcp_prosody_rate_t) */
+static const apt_str_table_item_t prosody_rate_string_table[] = {
+	{{"x-slow", 6},3},
+	{{"slow",   4},0},
+	{{"medium", 6},0},
+	{{"fast",   4},0},
+	{{"x-fast", 6},4},
+	{{"default",7},0}
+};
+
+/** String table of MRCP synthesizer completion-cause fields (mrcp_synthesizer_completion_cause_t) */
+static const apt_str_table_item_t completion_cause_string_table[] = {
+	{{"normal",               6},0},
+	{{"barge-in",             8},0},
+	{{"parse-failure",       13},0},
+	{{"uri-failure",         11},0},
+	{{"error",                5},0},
+	{{"language-unsupported",20},4},
+	{{"lexicon-load-failure",20},1},
+	{{"cancelled",            9},0}
+};
+
+
+static APR_INLINE apr_size_t apt_string_table_value_parse(const apt_str_table_item_t *string_table, size_t count, const apt_str_t *value)
+{
+	return apt_string_table_id_find(string_table,count,value);
+}
+
+static apt_bool_t apt_string_table_value_generate(const apt_str_table_item_t *string_table, size_t count, size_t id, apt_text_stream_t *stream)
+{
+	const apt_str_t *name = apt_string_table_str_get(string_table,count,id);
+	if(!name) {
+		return FALSE;
+	}
+
+	memcpy(stream->pos,name->buf,name->length);
+	stream->pos += name->length;
+	return TRUE;
+}
+
+/** Parse MRCP prosody-rate value */
+static apt_bool_t mrcp_prosody_param_rate_parse(mrcp_prosody_rate_t *prosody_rate, const apt_str_t *value, apr_pool_t *pool)
+{
+	if(!value->length) {
+		return FALSE;
+	}
+
+	/** For the rate attribute, relative changes are a number. (not preceded by a "+" or "-")(w3c ssml)*/
+	if('0'<=value->buf[0] && value->buf[0]<='9') {
+		prosody_rate->type = PROSODY_RATE_TYPE_RELATIVE_CHANGE;
+	}
+	else {
+		prosody_rate->type = PROSODY_RATE_TYPE_LABEL;
+	}
+
+	if(prosody_rate->type == PROSODY_RATE_TYPE_RELATIVE_CHANGE) {
+		prosody_rate->value.relative = apt_float_value_parse(value);
+	}
+	else {
+		prosody_rate->value.label = apt_string_table_value_parse(prosody_rate_string_table,PROSODY_RATE_COUNT,value);
+	}
+
+	return TRUE;
+}
+
+/** Generate MRCP prosody-rate value */
+static apt_bool_t mrcp_prosody_rate_generate(mrcp_prosody_rate_t *prosody_rate, apt_text_stream_t *stream)
+{
+	if(prosody_rate->type == PROSODY_RATE_TYPE_LABEL) {
+		apt_string_table_value_generate(prosody_rate_string_table,PROSODY_RATE_COUNT,prosody_rate->value.label,stream);
+	}
+	else {
+		apt_float_value_generate(prosody_rate->value.relative, stream);
+	}
+
+	return TRUE;
+}
+
+/** Parse MRCP prosody-volume value */
+static apt_bool_t mrcp_prosody_param_volume_parse(mrcp_prosody_volume_t *prosody_volume, const apt_str_t *value, apr_pool_t *pool)
+{
+	if(!value->length) {
+		return FALSE;
+	}
+
+	/** For the volume attribute, relative changes are a number preceded by "+" or "-" (w3c ssml)*/
+	if(value->buf[0]=='+' || value->buf[0]=='-') {
+		prosody_volume->type = PROSODY_VOLUME_TYPE_RELATIVE_CHANGE;
+	}
+	else if('0'<=value->buf[0] && value->buf[0]<='9') {
+		prosody_volume->type = PROSODY_VOLUME_TYPE_NUMERIC;
+	}
+	else {
+		prosody_volume->type = PROSODY_VOLUME_TYPE_LABEL;
+	}
+
+	if(prosody_volume->type == PROSODY_VOLUME_TYPE_RELATIVE_CHANGE) {
+		prosody_volume->value.relative = apt_float_value_parse(value);
+	}
+	else if(prosody_volume->type == PROSODY_VOLUME_TYPE_NUMERIC) {
+		prosody_volume->value.numeric = apt_float_value_parse(value);
+	}
+	else {
+		prosody_volume->value.label = apt_string_table_value_parse(prosody_volume_string_table,PROSODY_VOLUME_COUNT,value);
+	}
+
+	return TRUE;
+}
+
+/** Generate MRCP prosody-volume value */
+static apt_bool_t mrcp_prosody_volume_generate(mrcp_prosody_volume_t *prosody_volume, apt_text_stream_t *stream)
+{
+	if(prosody_volume->type == PROSODY_VOLUME_TYPE_LABEL) {
+		apt_string_table_value_generate(prosody_volume_string_table,PROSODY_VOLUME_COUNT,prosody_volume->value.label,stream);
+	}
+	else if (prosody_volume->type == PROSODY_VOLUME_TYPE_NUMERIC) {
+		apt_float_value_generate(prosody_volume->value.numeric, stream);
+	}
+	else {
+		apt_float_value_generate(prosody_volume->value.relative, stream);
+	}
+
+	return TRUE;
+}
+
+/** Parse MRCP speech-length value */
+static apt_bool_t mrcp_speech_length_value_parse(mrcp_speech_length_value_t *speech_length, const apt_str_t *value, apr_pool_t *pool)
+{
+	if(!value->length) {
+		return FALSE;
+	}
+
+	switch(*value->buf) {
+		case '+': speech_length->type = SPEECH_LENGTH_TYPE_NUMERIC_POSITIVE; break;
+		case '-': speech_length->type = SPEECH_LENGTH_TYPE_NUMERIC_NEGATIVE; break;
+		default : speech_length->type = SPEECH_LENGTH_TYPE_TEXT;
+	}
+
+	if(speech_length->type == SPEECH_LENGTH_TYPE_TEXT) {
+		apt_string_copy(&speech_length->value.tag,value,pool);
+	}
+	else {
+		mrcp_numeric_speech_length_t *numeric = &speech_length->value.numeric;
+		apt_str_t str;
+		apt_text_stream_t stream;
+		stream.text = *value;
+		stream.pos = stream.text.buf;
+		stream.pos++;
+		if(apt_text_field_read(&stream,APT_TOKEN_SP,TRUE,&str) == FALSE) {
+			return FALSE;
+		}
+		numeric->length = apt_size_value_parse(&str);
+
+		if(apt_text_field_read(&stream,APT_TOKEN_SP,TRUE,&str) == FALSE) {
+			return FALSE;
+		}
+		numeric->unit = apt_string_table_value_parse(speech_unit_string_table,SPEECH_UNIT_COUNT,&str);
+	}
+	return TRUE;
+}
+
+/** Generate MRCP speech-length value */
+static apt_bool_t mrcp_speech_length_generate(mrcp_speech_length_value_t *speech_length, apt_text_stream_t *stream)
+{
+	if(speech_length->type == SPEECH_LENGTH_TYPE_TEXT) {
+		apt_str_t *tag = &speech_length->value.tag;
+		if(tag->length) {
+			memcpy(stream->pos,tag->buf,tag->length);
+			stream->pos += tag->length;
+		}
+	}
+	else {
+		if(speech_length->type == SPEECH_LENGTH_TYPE_NUMERIC_POSITIVE) {
+			*stream->pos++ = '+';
+		}
+		else {
+			*stream->pos++ = '-';
+		}
+		apt_size_value_generate(speech_length->value.numeric.length,stream);
+		*stream->pos++ = ' ';
+		apt_string_table_value_generate(speech_unit_string_table,SPEECH_UNIT_COUNT,speech_length->value.numeric.unit,stream);
+	}
+	return TRUE;
+}
+
+/** Generate MRCP synthesizer completion-cause */
+static apt_bool_t mrcp_completion_cause_generate(mrcp_synth_completion_cause_e completion_cause, apt_text_stream_t *stream)
+{
+	int length;
+	const apt_str_t *name = apt_string_table_str_get(completion_cause_string_table,SYNTHESIZER_COMPLETION_CAUSE_COUNT,completion_cause);
+	if(!name) {
+		return FALSE;
+	}
+	length = sprintf(stream->pos,"%03"APR_SIZE_T_FMT" ",completion_cause);
+	if(length <= 0) {
+		return FALSE;
+	}
+	stream->pos += length;
+
+	memcpy(stream->pos,name->buf,name->length);
+	stream->pos += name->length;
+	return TRUE;
+}
+
+/** Initialize synthesizer header */
+static void mrcp_synth_header_init(mrcp_synth_header_t *synth_header)
+{
+	synth_header->jump_size.type = SPEECH_LENGTH_TYPE_UNKNOWN;
+	synth_header->kill_on_barge_in = FALSE;
+	apt_string_reset(&synth_header->speaker_profile);
+	synth_header->completion_cause = SYNTHESIZER_COMPLETION_CAUSE_UNKNOWN;
+	apt_string_reset(&synth_header->completion_reason);
+	synth_header->voice_param.gender = VOICE_GENDER_UNKNOWN;
+	synth_header->voice_param.age = 0;
+	synth_header->voice_param.variant = 0;
+	apt_string_reset(&synth_header->voice_param.name);
+	synth_header->prosody_param.volume.type = PROSODY_VOLUME_TYPE_UNKNOWN;
+	synth_header->prosody_param.rate.type = PROSODY_RATE_TYPE_UNKNOWN;
+	apt_string_reset(&synth_header->speech_marker);
+	apt_string_reset(&synth_header->speech_language);
+	apt_string_reset(&synth_header->fetch_hint);
+	apt_string_reset(&synth_header->audio_fetch_hint);
+	apt_string_reset(&synth_header->failed_uri);
+	apt_string_reset(&synth_header->failed_uri_cause);
+	synth_header->speak_restart = FALSE;
+	synth_header->speak_length.type = SPEECH_LENGTH_TYPE_UNKNOWN;
+	synth_header->load_lexicon = FALSE;
+	apt_string_reset(&synth_header->lexicon_search_order);
+}
+
+
+/** Allocate MRCP synthesizer header */
+static void* mrcp_synth_header_allocate(mrcp_header_accessor_t *accessor, apr_pool_t *pool)
+{
+	mrcp_synth_header_t *synth_header = apr_palloc(pool,sizeof(mrcp_synth_header_t));
+	mrcp_synth_header_init(synth_header);
+	accessor->data = synth_header;
+	return accessor->data;
+}
+
+/** Parse MRCP synthesizer header */
+static apt_bool_t mrcp_synth_header_parse(mrcp_header_accessor_t *accessor, size_t id, const apt_str_t *value, apr_pool_t *pool)
+{
+	apt_bool_t status = TRUE;
+	mrcp_synth_header_t *synth_header = accessor->data;
+	switch(id) {
+		case SYNTHESIZER_HEADER_JUMP_SIZE:
+			mrcp_speech_length_value_parse(&synth_header->jump_size,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_KILL_ON_BARGE_IN:
+			apt_boolean_value_parse(value,&synth_header->kill_on_barge_in);
+			break;
+		case SYNTHESIZER_HEADER_SPEAKER_PROFILE:
+			apt_string_copy(&synth_header->speaker_profile,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_COMPLETION_CAUSE:
+			synth_header->completion_cause = apt_size_value_parse(value);
+			break;
+		case SYNTHESIZER_HEADER_COMPLETION_REASON:
+			apt_string_copy(&synth_header->completion_reason,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_GENDER:
+			synth_header->voice_param.gender = apt_string_table_value_parse(voice_gender_string_table,VOICE_GENDER_COUNT,value);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_AGE:
+			synth_header->voice_param.age = apt_size_value_parse(value);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_VARIANT:
+			synth_header->voice_param.variant = apt_size_value_parse(value);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_NAME:
+			apt_string_copy(&synth_header->voice_param.name,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_PROSODY_VOLUME:
+			mrcp_prosody_param_volume_parse(&synth_header->prosody_param.volume,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_PROSODY_RATE:
+			mrcp_prosody_param_rate_parse(&synth_header->prosody_param.rate,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_SPEECH_MARKER:
+			apt_string_copy(&synth_header->speech_marker,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_SPEECH_LANGUAGE:
+			apt_string_copy(&synth_header->speech_language,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_FETCH_HINT:
+			apt_string_copy(&synth_header->fetch_hint,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_AUDIO_FETCH_HINT:
+			apt_string_copy(&synth_header->audio_fetch_hint,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_FAILED_URI:
+			apt_string_copy(&synth_header->failed_uri,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_FAILED_URI_CAUSE:
+			apt_string_copy(&synth_header->failed_uri_cause,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_SPEAK_RESTART:
+			apt_boolean_value_parse(value,&synth_header->speak_restart);
+			break;
+		case SYNTHESIZER_HEADER_SPEAK_LENGTH:
+			mrcp_speech_length_value_parse(&synth_header->speak_length,value,pool);
+			break;
+		case SYNTHESIZER_HEADER_LOAD_LEXICON:
+			apt_boolean_value_parse(value,&synth_header->load_lexicon);
+			break;
+		case SYNTHESIZER_HEADER_LEXICON_SEARCH_ORDER:
+			apt_string_copy(&synth_header->lexicon_search_order,value,pool);
+			break;
+		default:
+			status = FALSE;
+	}
+	return status;
+}
+
+/** Generate MRCP synthesizer header */
+static apt_bool_t mrcp_synth_header_generate(mrcp_header_accessor_t *accessor, size_t id, apt_text_stream_t *value)
+{
+	mrcp_synth_header_t *synth_header = accessor->data;
+	switch(id) {
+		case SYNTHESIZER_HEADER_JUMP_SIZE:
+			mrcp_speech_length_generate(&synth_header->jump_size,value);
+			break;
+		case SYNTHESIZER_HEADER_KILL_ON_BARGE_IN:
+			apt_boolean_value_generate(synth_header->kill_on_barge_in,value);
+			break;
+		case SYNTHESIZER_HEADER_SPEAKER_PROFILE:
+			apt_string_value_generate(&synth_header->speaker_profile,value);
+			break;
+		case SYNTHESIZER_HEADER_COMPLETION_CAUSE:
+			mrcp_completion_cause_generate(synth_header->completion_cause,value);
+			break;
+		case SYNTHESIZER_HEADER_COMPLETION_REASON:
+			apt_string_value_generate(&synth_header->completion_reason,value);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_GENDER:
+			apt_string_table_value_generate(voice_gender_string_table,VOICE_GENDER_COUNT,synth_header->voice_param.gender,value);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_AGE:
+			apt_size_value_generate(synth_header->voice_param.age,value);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_VARIANT:
+			apt_size_value_generate(synth_header->voice_param.variant,value);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_NAME:
+			apt_string_value_generate(&synth_header->voice_param.name,value);
+			break;
+		case SYNTHESIZER_HEADER_PROSODY_VOLUME:
+			mrcp_prosody_volume_generate(&synth_header->prosody_param.volume,value);
+			break;
+		case SYNTHESIZER_HEADER_PROSODY_RATE:
+			mrcp_prosody_rate_generate(&synth_header->prosody_param.rate,value);
+			break;
+		case SYNTHESIZER_HEADER_SPEECH_MARKER:
+			apt_string_value_generate(&synth_header->speech_marker,value);
+			break;
+		case SYNTHESIZER_HEADER_SPEECH_LANGUAGE:
+			apt_string_value_generate(&synth_header->speech_language,value);
+			break;
+		case SYNTHESIZER_HEADER_FETCH_HINT:
+			apt_string_value_generate(&synth_header->fetch_hint,value);
+			break;
+		case SYNTHESIZER_HEADER_AUDIO_FETCH_HINT:
+			apt_string_value_generate(&synth_header->audio_fetch_hint,value);
+			break;
+		case SYNTHESIZER_HEADER_FAILED_URI:
+			apt_string_value_generate(&synth_header->failed_uri,value);
+			break;
+		case SYNTHESIZER_HEADER_FAILED_URI_CAUSE:
+			apt_string_value_generate(&synth_header->failed_uri_cause,value);
+			break;
+		case SYNTHESIZER_HEADER_SPEAK_RESTART:
+			apt_boolean_value_generate(synth_header->speak_restart,value);
+			break;
+		case SYNTHESIZER_HEADER_SPEAK_LENGTH:
+			mrcp_speech_length_generate(&synth_header->speak_length,value);
+			break;
+		case SYNTHESIZER_HEADER_LOAD_LEXICON:
+			apt_boolean_value_generate(synth_header->load_lexicon,value);
+			break;
+		case SYNTHESIZER_HEADER_LEXICON_SEARCH_ORDER:
+			apt_string_value_generate(&synth_header->lexicon_search_order,value);
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}
+
+/** Duplicate MRCP synthesizer header */
+static apt_bool_t mrcp_synth_header_duplicate(mrcp_header_accessor_t *accessor, const mrcp_header_accessor_t *src, size_t id, apr_pool_t *pool)
+{
+	mrcp_synth_header_t *synth_header = accessor->data;
+	const mrcp_synth_header_t *src_synth_header = src->data;
+	apt_bool_t status = TRUE;
+
+	if(!synth_header || !src_synth_header) {
+		return FALSE;
+	}
+
+	switch(id) {
+		case SYNTHESIZER_HEADER_JUMP_SIZE:
+			synth_header->jump_size = src_synth_header->jump_size;
+			break;
+		case SYNTHESIZER_HEADER_KILL_ON_BARGE_IN:
+			synth_header->kill_on_barge_in = src_synth_header->kill_on_barge_in;
+			break;
+		case SYNTHESIZER_HEADER_SPEAKER_PROFILE:
+			apt_string_copy(&synth_header->speaker_profile,&src_synth_header->speaker_profile,pool);
+			break;
+		case SYNTHESIZER_HEADER_COMPLETION_CAUSE:
+			synth_header->completion_cause = src_synth_header->completion_cause;
+			break;
+		case SYNTHESIZER_HEADER_COMPLETION_REASON:
+			apt_string_copy(&synth_header->completion_reason,&src_synth_header->completion_reason,pool);
+			break;
+		case SYNTHESIZER_HEADER_VOICE_GENDER:
+			synth_header->voice_param.gender = src_synth_header->voice_param.gender;
+			break;
+		case SYNTHESIZER_HEADER_VOICE_AGE:
+			synth_header->voice_param.age = src_synth_header->voice_param.age;
+			break;
+		case SYNTHESIZER_HEADER_VOICE_VARIANT:
+			synth_header->voice_param.variant = src_synth_header->voice_param.variant;
+			break;
+		case SYNTHESIZER_HEADER_VOICE_NAME:
+			apt_string_copy(&synth_header->voice_param.name,&src_synth_header->voice_param.name,pool);
+			break;
+		case SYNTHESIZER_HEADER_PROSODY_VOLUME:
+			synth_header->prosody_param.volume = src_synth_header->prosody_param.volume;
+			break;
+		case SYNTHESIZER_HEADER_PROSODY_RATE:
+			synth_header->prosody_param.rate = src_synth_header->prosody_param.rate;
+			break;
+		case SYNTHESIZER_HEADER_SPEECH_MARKER:
+			apt_string_copy(&synth_header->speech_marker,&src_synth_header->speech_marker,pool);
+			break;
+		case SYNTHESIZER_HEADER_SPEECH_LANGUAGE:
+			apt_string_copy(&synth_header->speech_language,&src_synth_header->speech_language,pool);
+			break;
+		case SYNTHESIZER_HEADER_FETCH_HINT:
+			apt_string_copy(&synth_header->fetch_hint,&src_synth_header->fetch_hint,pool);
+			break;
+		case SYNTHESIZER_HEADER_AUDIO_FETCH_HINT:
+			apt_string_copy(&synth_header->audio_fetch_hint,&src_synth_header->audio_fetch_hint,pool);
+			break;
+		case SYNTHESIZER_HEADER_FAILED_URI:
+			apt_string_copy(&synth_header->failed_uri,&src_synth_header->failed_uri,pool);
+			break;
+		case SYNTHESIZER_HEADER_FAILED_URI_CAUSE:
+			apt_string_copy(&synth_header->failed_uri_cause,&src_synth_header->failed_uri_cause,pool);
+			break;
+		case SYNTHESIZER_HEADER_SPEAK_RESTART:
+			synth_header->speak_restart = src_synth_header->speak_restart;
+			break;
+		case SYNTHESIZER_HEADER_SPEAK_LENGTH:
+			synth_header->speak_length = src_synth_header->speak_length;
+			break;
+		case SYNTHESIZER_HEADER_LOAD_LEXICON:
+			synth_header->load_lexicon = src_synth_header->load_lexicon;
+			break;
+		case SYNTHESIZER_HEADER_LEXICON_SEARCH_ORDER:
+			apt_string_copy(&synth_header->lexicon_search_order,&src_synth_header->lexicon_search_order,pool);
+			break;
+		default:
+			status = FALSE;
+	}
+	return status;
+}
+
+static const mrcp_header_vtable_t vtable = {
+	mrcp_synth_header_allocate,
+	NULL, /* nothing to destroy */
+	mrcp_synth_header_parse,
+	mrcp_synth_header_generate,
+	mrcp_synth_header_duplicate,
+	synth_header_string_table,
+	SYNTHESIZER_HEADER_COUNT
+};
+
+MRCP_DECLARE(const mrcp_header_vtable_t*) mrcp_synth_header_vtable_get(mrcp_version_e version)
+{
+	return &vtable;
+}
+
+MRCP_DECLARE(const apt_str_t*) mrcp_synth_completion_cause_get(mrcp_synth_completion_cause_e completion_cause, mrcp_version_e version)
+{
+	return apt_string_table_str_get(completion_cause_string_table,SYNTHESIZER_COMPLETION_CAUSE_COUNT,completion_cause);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_resource.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_resource.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_synth_resource.h"
+#include "mrcp_synth_header.h"
+#include "mrcp_synth_state_machine.h"
+#include "mrcp_resource.h"
+#include "mrcp_message.h"
+
+/** String table of MRCP synthesizer methods (mrcp_synthesizer_method_id) */
+static const apt_str_table_item_t synth_method_string_table[] = {
+	{{"SET-PARAMS",       10},10},
+	{{"GET-PARAMS",       10},0},
+	{{"SPEAK",             5},1},
+	{{"STOP",              4},1},
+	{{"PAUSE",             5},0},
+	{{"RESUME",            6},0},
+	{{"BARGE-IN-OCCURRED",17},0},
+	{{"CONTROL",           7},0},
+	{{"DEFINE-LEXICON",   14},0}
+};
+
+/** String table of MRCP synthesizer events (mrcp_synthesizer_event_id) */
+static const apt_str_table_item_t synth_event_string_table[] = {
+	{{"SPEECH-MARKER", 13},3},
+	{{"SPEAK-COMPLETE",14},3}
+};
+
+/** Set resource specifica data */
+static apt_bool_t synth_message_resourcify_by_id(mrcp_resource_t *resource, mrcp_message_t *message)
+{
+	/* associate method_name and method_id */
+	if(message->start_line.message_type == MRCP_MESSAGE_TYPE_REQUEST) {
+		const apt_str_t *name = apt_string_table_str_get(
+			synth_method_string_table,
+			SYNTHESIZER_METHOD_COUNT,
+			message->start_line.method_id);
+		if(!name) {
+			return FALSE;
+		}
+		message->start_line.method_name = *name;
+	}
+	else if(message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		const apt_str_t *name = apt_string_table_str_get(
+			synth_event_string_table,
+			SYNTHESIZER_EVENT_COUNT,
+			message->start_line.method_id);
+		if(!name) {
+			return FALSE;
+		}
+		message->start_line.method_name = *name;
+	}
+
+	message->header.resource_header_accessor.vtable = 
+		mrcp_synth_header_vtable_get(message->start_line.version);
+	return TRUE;
+}
+
+/** Set resource specifica data */
+static apt_bool_t synth_message_resourcify_by_name(mrcp_resource_t *resource, mrcp_message_t *message)
+{
+	/* associate method_name and method_id */
+	if(message->start_line.message_type == MRCP_MESSAGE_TYPE_REQUEST) {
+		message->start_line.method_id = apt_string_table_id_find(
+			synth_method_string_table,
+			SYNTHESIZER_METHOD_COUNT,
+			&message->start_line.method_name);
+		if(message->start_line.method_id >= SYNTHESIZER_METHOD_COUNT) {
+			return FALSE;
+		}
+	}
+	else if(message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		message->start_line.method_id = apt_string_table_id_find(
+			synth_event_string_table,
+			SYNTHESIZER_EVENT_COUNT,
+			&message->start_line.method_name);
+		if(message->start_line.method_id >= SYNTHESIZER_EVENT_COUNT) {
+			return FALSE;
+		}
+	}
+
+	message->header.resource_header_accessor.vtable = 
+		mrcp_synth_header_vtable_get(message->start_line.version);
+	return TRUE;
+}
+
+
+/** Create MRCP synthesizer resource */
+MRCP_DECLARE(mrcp_resource_t*) mrcp_synth_resource_create(apr_pool_t *pool)
+{
+	mrcp_resource_t *resource = apr_palloc(pool,sizeof(mrcp_resource_t));
+	mrcp_resource_init(resource);
+
+	resource->resourcify_message_by_id = synth_message_resourcify_by_id;
+	resource->resourcify_message_by_name = synth_message_resourcify_by_name;
+
+	resource->create_client_state_machine = mrcp_synth_client_state_machine_create;
+	resource->create_server_state_machine = mrcp_synth_server_state_machine_create;
+	return resource;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_server_state_machine.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/resources/src/mrcp_synth_server_state_machine.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,563 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_obj_list.h"
+#include "apt_log.h"
+#include "mrcp_state_machine.h"
+#include "mrcp_synth_state_machine.h"
+#include "mrcp_synth_header.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_synth_resource.h"
+#include "mrcp_message.h"
+
+/** MRCP synthesizer states */
+typedef enum {
+	SYNTHESIZER_STATE_IDLE,
+	SYNTHESIZER_STATE_SPEAKING,
+	SYNTHESIZER_STATE_PAUSED,
+
+	SYNTHESIZER_STATE_COUNT
+} mrcp_synth_state_e;
+
+static const char * state_names[SYNTHESIZER_STATE_COUNT] = {
+	"IDLE",
+	"SPEAKING",
+	"PAUSED"
+};
+
+typedef struct mrcp_synth_state_machine_t mrcp_synth_state_machine_t;
+struct mrcp_synth_state_machine_t {
+	/** state machine base */
+	mrcp_state_machine_t  base;
+	/** synthesizer state */
+	mrcp_synth_state_e    state;
+	/** indicate whether active_request was processed from pending request queue */
+	apt_bool_t            is_pending;
+	/** request sent to synthesizer engine and waiting for the response to be received */
+	mrcp_message_t       *active_request;
+	/** in-progress speak request */
+	mrcp_message_t       *speaker;
+	/** queue of pending speak requests */
+	apt_obj_list_t       *queue;
+	/** properties used in set/get params */
+	mrcp_message_header_t properties;
+};
+
+typedef apt_bool_t (*synth_method_f)(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message);
+
+static APR_INLINE apt_bool_t synth_request_dispatch(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	state_machine->active_request = message;
+	return state_machine->base.dispatcher(&state_machine->base,message);
+}
+
+static APR_INLINE apt_bool_t synth_response_dispatch(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	state_machine->active_request = NULL;
+	return state_machine->base.dispatcher(&state_machine->base,message);
+}
+
+static APR_INLINE apt_bool_t synth_event_dispatch(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	return state_machine->base.dispatcher(&state_machine->base,message);
+}
+
+static APR_INLINE void synth_state_change(mrcp_synth_state_machine_t *state_machine, mrcp_synth_state_e state)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"State Transition %s -> %s",state_names[state_machine->state],state_names[state]);
+	state_machine->state = state;
+	if(state == SYNTHESIZER_STATE_IDLE) {
+		state_machine->speaker = NULL;
+	}
+}
+
+
+static apt_bool_t synth_request_set_params(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process SET-PARAMS Request [%d]",message->start_line.request_id);
+	mrcp_message_header_set(&state_machine->properties,&message->header,message->pool);
+	return synth_request_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_response_set_params(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process SET-PARAMS Response [%d]",message->start_line.request_id);
+	return synth_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_request_get_params(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process GET-PARAMS Request [%d]",message->start_line.request_id);
+	return synth_request_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_response_get_params(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process GET-PARAMS Response [%d]",message->start_line.request_id);
+	mrcp_message_header_set(&message->header,&state_machine->active_request->header,message->pool);
+	mrcp_message_header_get(&message->header,&state_machine->properties,message->pool);
+	return synth_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_request_speak(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_header_inherit(&message->header,&state_machine->properties,message->pool);
+	if(state_machine->speaker) {
+		mrcp_message_t *response;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Queue Up SPEAK Request [%d]",message->start_line.request_id);
+		message->start_line.request_state = MRCP_REQUEST_STATE_PENDING;
+		apt_list_push_back(state_machine->queue,message,message->pool);
+		
+		response = mrcp_response_create(message,message->pool);
+		response->start_line.request_state = MRCP_REQUEST_STATE_PENDING;
+		return synth_response_dispatch(state_machine,response);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process SPEAK Request [%d]",message->start_line.request_id);
+	return synth_request_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_response_speak(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process SPEAK Response [%d]",message->start_line.request_id);
+	if(message->start_line.request_state == MRCP_REQUEST_STATE_INPROGRESS) {
+		state_machine->speaker = state_machine->active_request;
+		synth_state_change(state_machine,SYNTHESIZER_STATE_SPEAKING);
+	}
+	if(state_machine->is_pending == TRUE) {
+		mrcp_message_t *event_message = mrcp_event_create(
+							state_machine->active_request,
+							SYNTHESIZER_SPEECH_MARKER,
+							state_machine->active_request->pool);
+		event_message->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
+		state_machine->is_pending = FALSE;
+		/* not to send the response for pending request, instead send SPEECH-MARKER event */
+		return synth_event_dispatch(state_machine,event_message);
+	}
+	return synth_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_pending_requests_remove(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *request_message, mrcp_message_t *response_message)
+{
+	apt_list_elem_t *elem;
+	mrcp_message_t *pending_message;
+	mrcp_request_id_list_t *request_id_list = NULL;
+	mrcp_generic_header_t *generic_header = mrcp_generic_header_get(request_message);
+	mrcp_generic_header_t *response_generic_header = mrcp_generic_header_prepare(response_message);
+	if(generic_header && mrcp_generic_header_property_check(request_message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST) == TRUE) {
+		if(generic_header->active_request_id_list.ids && generic_header->active_request_id_list.count) {
+			/* selective STOP request */
+			request_id_list = &generic_header->active_request_id_list;
+		}
+	}
+
+	elem = apt_list_first_elem_get(state_machine->queue);
+	while(elem) {
+		pending_message = apt_list_elem_object_get(elem);
+		if(!request_id_list || active_request_id_list_find(generic_header,pending_message->start_line.request_id) == TRUE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remove Pending SPEAK Request [%d]",pending_message->start_line.request_id);
+			elem = apt_list_elem_remove(state_machine->queue,elem);
+			/* append active id list */
+			active_request_id_list_append(response_generic_header,pending_message->start_line.request_id);
+		}
+		else {
+			/* speak request remains in the queue, just proceed to the next one */
+			elem = apt_list_next_elem_get(state_machine->queue,elem);
+		}
+	}
+	if(response_generic_header->active_request_id_list.count) {
+		mrcp_generic_header_property_add(response_message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST);
+	}
+	return TRUE;
+}
+
+static apt_bool_t synth_request_stop(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *response_message;
+	if(state_machine->speaker) {
+		mrcp_request_id_list_t *request_id_list = NULL;
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_get(message);
+		if(generic_header && mrcp_generic_header_property_check(message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST) == TRUE) {
+			if(generic_header->active_request_id_list.ids && generic_header->active_request_id_list.count) {
+				/* selective STOP request */
+				request_id_list = &generic_header->active_request_id_list;
+			}
+		}
+
+		if(!request_id_list || active_request_id_list_find(generic_header,state_machine->speaker->start_line.request_id) == TRUE) {
+			/* found in-progress SPEAK request, stop it */
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process STOP Request [%d]",message->start_line.request_id);
+			return synth_request_dispatch(state_machine,message);
+		}
+	}
+
+	/* found no in-progress SPEAK request, sending immediate response */
+	response_message = mrcp_response_create(message,message->pool);
+	synth_pending_requests_remove(state_machine,message,response_message);
+	return synth_response_dispatch(state_machine,response_message);
+}
+
+static apt_bool_t synth_response_stop(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *pending_request;
+	mrcp_generic_header_t *generic_header = mrcp_generic_header_prepare(message);
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process STOP Response [%d]",message->start_line.request_id);
+	/* append active id list */
+	active_request_id_list_append(generic_header,state_machine->speaker->start_line.request_id);
+	mrcp_generic_header_property_add(message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST);
+	synth_pending_requests_remove(state_machine,state_machine->active_request,message);
+	synth_state_change(state_machine,SYNTHESIZER_STATE_IDLE);
+	synth_response_dispatch(state_machine,message);
+
+	/* process pending SPEAK requests / if any */
+	pending_request = apt_list_pop_front(state_machine->queue);
+	if(pending_request) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process Pending SPEAK Request [%d]",pending_request->start_line.request_id);
+		state_machine->is_pending = TRUE;
+		synth_request_dispatch(state_machine,pending_request);
+	}
+	return TRUE;
+}
+
+static apt_bool_t synth_request_pause(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	if(state_machine->speaker) {
+		/* speaking or paused state */
+		if(state_machine->state == SYNTHESIZER_STATE_SPEAKING) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process PAUSE Request [%d]",state_machine->speaker->start_line.request_id);
+			synth_request_dispatch(state_machine,message);
+		}
+		else {
+			/* paused state */
+			mrcp_message_t *response_message = mrcp_response_create(message,message->pool);
+			synth_response_dispatch(state_machine,response_message);
+		}
+	}
+	else {
+		/* idle state */
+		mrcp_message_t *response_message = mrcp_response_create(message,message->pool);
+		response_message->start_line.status_code = MRCP_STATUS_CODE_METHOD_NOT_VALID;
+		synth_response_dispatch(state_machine,response_message);
+	}
+	return TRUE;
+}
+
+static apt_bool_t synth_response_pause(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process PAUSE Response [%d]",message->start_line.request_id);
+	if(message->start_line.status_code == MRCP_STATUS_CODE_SUCCESS) {
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_prepare(message);
+		/* append active id list */
+		active_request_id_list_append(generic_header,state_machine->speaker->start_line.request_id);
+		mrcp_generic_header_property_add(message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST);
+		synth_state_change(state_machine,SYNTHESIZER_STATE_PAUSED);
+	}
+	synth_response_dispatch(state_machine,message);
+	return TRUE;
+}
+
+static apt_bool_t synth_request_resume(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	if(state_machine->speaker) {
+		/* speaking or paused state */
+		if(state_machine->state == SYNTHESIZER_STATE_PAUSED) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process RESUME Request [%d]",state_machine->speaker->start_line.request_id);
+			synth_request_dispatch(state_machine,message);
+		}
+		else {
+			/* speaking state */
+			mrcp_message_t *response_message = mrcp_response_create(message,message->pool);
+			synth_response_dispatch(state_machine,response_message);
+		}
+	}
+	else {
+		/* idle state */
+		mrcp_message_t *response_message = mrcp_response_create(message,message->pool);
+		response_message->start_line.status_code = MRCP_STATUS_CODE_METHOD_NOT_VALID;
+		synth_response_dispatch(state_machine,response_message);
+	}
+	return TRUE;
+}
+
+static apt_bool_t synth_response_resume(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process RESUME Response [%d]",message->start_line.request_id);
+	if(message->start_line.status_code == MRCP_STATUS_CODE_SUCCESS) {
+		mrcp_generic_header_t *generic_header = mrcp_generic_header_prepare(message);
+		/* append active id list */
+		active_request_id_list_append(generic_header,state_machine->speaker->start_line.request_id);
+		mrcp_generic_header_property_add(message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST);
+		synth_state_change(state_machine,SYNTHESIZER_STATE_SPEAKING);
+	}
+	synth_response_dispatch(state_machine,message);
+	return TRUE;
+}
+
+static apt_bool_t synth_request_barge_in_occurred(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *response_message;
+	if(state_machine->speaker) {
+		apt_bool_t kill_on_barge_in = TRUE;
+		mrcp_synth_header_t *synth_header = mrcp_resource_header_get(message);
+		if(synth_header) {
+			if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_KILL_ON_BARGE_IN) == TRUE) {
+				kill_on_barge_in = synth_header->kill_on_barge_in;
+			}
+		}
+	
+		if(kill_on_barge_in == TRUE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process BARGE-IN Request [%d]",message->start_line.request_id);
+			return synth_request_dispatch(state_machine,message);
+		}
+	}
+
+	/* found no kill-on-bargein enabled in-progress SPEAK request, sending immediate response */
+	response_message = mrcp_response_create(message,message->pool);
+	return synth_response_dispatch(state_machine,response_message);
+}
+
+static apt_bool_t synth_response_barge_in_occurred(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_generic_header_t *generic_header = mrcp_generic_header_prepare(message);
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process BARGE-IN Response [%d]",message->start_line.request_id);
+	/* append active id list */
+	active_request_id_list_append(generic_header,state_machine->speaker->start_line.request_id);
+	mrcp_generic_header_property_add(message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST);
+	synth_pending_requests_remove(state_machine,state_machine->active_request,message);
+	synth_state_change(state_machine,SYNTHESIZER_STATE_IDLE);
+	return synth_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_request_control(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *response_message;
+	if(state_machine->state == SYNTHESIZER_STATE_SPEAKING) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process CONTROL Request [%d]",message->start_line.request_id);
+		return synth_request_dispatch(state_machine,message);
+	}
+
+	/* found no in-progress SPEAK request, sending immediate response */
+	response_message = mrcp_response_create(message,message->pool);
+	return synth_response_dispatch(state_machine,response_message);
+}
+
+static apt_bool_t synth_response_control(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_generic_header_t *generic_header = mrcp_generic_header_prepare(message);
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process CONTROL Response [%d]",message->start_line.request_id);
+	/* append active id list */
+	active_request_id_list_append(generic_header,state_machine->speaker->start_line.request_id);
+	mrcp_generic_header_property_add(message,GENERIC_HEADER_ACTIVE_REQUEST_ID_LIST);
+	return synth_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_request_define_lexicon(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *response_message;
+	if(state_machine->state == SYNTHESIZER_STATE_IDLE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process DEFINE-LEXICON Request [%d]",message->start_line.request_id);
+		return synth_request_dispatch(state_machine,message);
+	}
+
+	/* sending failure response */
+	response_message = mrcp_response_create(message,message->pool);
+	response_message->start_line.status_code = MRCP_STATUS_CODE_METHOD_NOT_VALID;
+	return synth_response_dispatch(state_machine,response_message);
+}
+
+static apt_bool_t synth_response_define_lexicon(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process DEFINE-LEXICON Response [%d]",message->start_line.request_id);
+	return synth_response_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_event_speech_marker(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	if(!state_machine->speaker) {
+		/* unexpected event, no in-progress speak request */
+		return FALSE;
+	}
+
+	if(state_machine->speaker->start_line.request_id != message->start_line.request_id) {
+		/* unexpected event */
+		return FALSE;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process SPEECH-MARKER Event [%d]",message->start_line.request_id);
+	message->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
+	return synth_event_dispatch(state_machine,message);
+}
+
+static apt_bool_t synth_event_speak_complete(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_message_t *pending_request;
+	if(!state_machine->speaker) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Unexpected SPEAK-COMPLETE Event [%d]",message->start_line.request_id);
+		return FALSE;
+	}
+
+	if(state_machine->speaker->start_line.request_id != message->start_line.request_id) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Unexpected SPEAK-COMPLETE Event [%d]",message->start_line.request_id);
+		return FALSE;
+	}
+
+	if(state_machine->active_request && state_machine->active_request->start_line.method_id == SYNTHESIZER_STOP) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Ignore SPEAK-COMPLETE Event [%d]: waiting for STOP response",message->start_line.request_id);
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process SPEAK-COMPLETE Event [%d]",message->start_line.request_id);
+	if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_COMPLETION_CAUSE) != TRUE) {
+		mrcp_synth_header_t *synth_header = mrcp_resource_header_prepare(message);
+		synth_header->completion_cause = SYNTHESIZER_COMPLETION_CAUSE_NORMAL;
+		mrcp_resource_header_property_add(message,SYNTHESIZER_HEADER_COMPLETION_CAUSE);
+	}
+	synth_state_change(state_machine,SYNTHESIZER_STATE_IDLE);
+	synth_event_dispatch(state_machine,message);
+
+	/* process pending SPEAK requests */
+	pending_request = apt_list_pop_front(state_machine->queue);
+	if(pending_request) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Process Pending SPEAK Request [%d]",pending_request->start_line.request_id);
+		state_machine->is_pending = TRUE;
+		synth_request_dispatch(state_machine,pending_request);
+	}
+	return TRUE;
+}
+
+static synth_method_f synth_request_method_array[SYNTHESIZER_METHOD_COUNT] = {
+	synth_request_set_params,
+	synth_request_get_params,
+	synth_request_speak,
+	synth_request_stop,
+	synth_request_pause,
+	synth_request_resume,
+	synth_request_barge_in_occurred,
+	synth_request_control,
+	synth_request_define_lexicon
+};
+
+static synth_method_f synth_response_method_array[SYNTHESIZER_METHOD_COUNT] = {
+	synth_response_set_params,
+	synth_response_get_params,
+	synth_response_speak,
+	synth_response_stop,
+	synth_response_pause,
+	synth_response_resume,
+	synth_response_barge_in_occurred,
+	synth_response_control,
+	synth_response_define_lexicon,
+};
+
+static synth_method_f synth_event_method_array[SYNTHESIZER_EVENT_COUNT] = {
+	synth_event_speech_marker,
+	synth_event_speak_complete
+};
+
+/** Update state according to received incoming request from MRCP client */
+static apt_bool_t synth_request_state_update(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	synth_method_f method;
+	if(message->start_line.method_id >= SYNTHESIZER_METHOD_COUNT) {
+		return FALSE;
+	}
+	
+	method = synth_request_method_array[message->start_line.method_id];
+	if(method) {
+		return method(state_machine,message);
+	}
+	return synth_request_dispatch(state_machine,message);
+}
+
+/** Update state according to received outgoing response from synthesizer engine */
+static apt_bool_t synth_response_state_update(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	synth_method_f method;
+	if(!state_machine->active_request) {
+		/* unexpected response, no active request waiting for response */
+		return FALSE;
+	}
+	if(state_machine->active_request->start_line.request_id != message->start_line.request_id) {
+		/* unexpected response, request id doesn't match */
+		return FALSE;
+	}
+
+	if(message->start_line.method_id >= SYNTHESIZER_METHOD_COUNT) {
+		return FALSE;
+	}
+	
+	method = synth_response_method_array[message->start_line.method_id];
+	if(method) {
+		return method(state_machine,message);
+	}
+	return synth_response_dispatch(state_machine,message);
+}
+
+/** Update state according to received outgoing event from synthesizer engine */
+static apt_bool_t synth_event_state_update(mrcp_synth_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	synth_method_f method;
+	if(message->start_line.method_id >= SYNTHESIZER_EVENT_COUNT) {
+		return FALSE;
+	}
+	
+	method = synth_event_method_array[message->start_line.method_id];
+	if(method) {
+		return method(state_machine,message);
+	}
+	return synth_event_dispatch(state_machine,message);
+}
+
+/** Update state according to request received from MRCP client or response/event received from synthesizer engine */
+static apt_bool_t synth_state_update(mrcp_state_machine_t *state_machine, mrcp_message_t *message)
+{
+	mrcp_synth_state_machine_t *synth_state_machine = (mrcp_synth_state_machine_t*)state_machine;
+	apt_bool_t status = TRUE;
+	switch(message->start_line.message_type) {
+		case MRCP_MESSAGE_TYPE_REQUEST:
+			status = synth_request_state_update(synth_state_machine,message);
+			break;
+		case MRCP_MESSAGE_TYPE_RESPONSE:
+			status = synth_response_state_update(synth_state_machine,message);
+			break;
+		case MRCP_MESSAGE_TYPE_EVENT:
+			status = synth_event_state_update(synth_state_machine,message);
+			break;
+		default:
+			status = FALSE;
+			break;
+	}
+	return status;
+}
+
+/** Create MRCP synthesizer server state machine */
+mrcp_state_machine_t* mrcp_synth_server_state_machine_create(void *obj, mrcp_message_dispatcher_f dispatcher, mrcp_version_e version, apr_pool_t *pool)
+{
+	mrcp_message_header_t *properties;
+	mrcp_synth_state_machine_t *state_machine = apr_palloc(pool,sizeof(mrcp_synth_state_machine_t));
+	mrcp_state_machine_init(&state_machine->base,obj,dispatcher);
+	state_machine->base.update = synth_state_update;
+	state_machine->state = SYNTHESIZER_STATE_IDLE;
+	state_machine->is_pending = FALSE;
+	state_machine->active_request = NULL;
+	state_machine->speaker = NULL;
+	state_machine->queue = apt_list_create(pool);
+	properties = &state_machine->properties;
+	mrcp_message_header_init(properties);
+	properties->generic_header_accessor.vtable = mrcp_generic_header_vtable_get(version);
+	properties->resource_header_accessor.vtable = mrcp_synth_header_vtable_get(version);
+	return &state_machine->base;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,21 @@
+MAINTAINERCLEANFILES 	      = Makefile.in
+
+INCLUDES                      = -I$(top_srcdir)/libs/mrcpv2-transport/include \
+                                -I$(top_srcdir)/libs/mrcp/include \
+                                -I$(top_srcdir)/libs/mrcp/message/include \
+                                -I$(top_srcdir)/libs/mrcp/control/include \
+                                -I$(top_srcdir)/libs/apr-toolkit/include \
+                                $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES            = libmrcpv2transport.la
+
+include_HEADERS               = include/mrcp_connection_types.h \
+                                include/mrcp_control_descriptor.h \
+                                include/mrcp_connection.h \
+                                include/mrcp_client_connection.h \
+                                include/mrcp_server_connection.h
+
+libmrcpv2transport_la_SOURCES = src/mrcp_control_descriptor.c \
+                                src/mrcp_connection.c \
+                                src/mrcp_client_connection.c \
+                                src/mrcp_server_connection.c

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_client_connection.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_client_connection.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_CLIENT_CONNECTION_H__
+#define __MRCP_CLIENT_CONNECTION_H__
+
+/**
+ * @file mrcp_client_connection.h
+ * @brief MRCPv2 Client Connection
+ */ 
+
+#include "apt_task.h"
+#include "mrcp_connection_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create connection agent.
+ * @param max_connection_count the number of max MRCPv2 connections
+ * @param offer_new_connection the connection establishment policy in o/a
+ * @param pool the pool to allocate memory from
+ */
+MRCP_DECLARE(mrcp_connection_agent_t*) mrcp_client_connection_agent_create(
+											apr_size_t max_connection_count, 
+											apt_bool_t offer_new_connection,
+											apr_pool_t *pool);
+
+/**
+ * Destroy connection agent.
+ * @param agent the agent to destroy
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_connection_agent_destroy(mrcp_connection_agent_t *agent);
+
+/**
+ * Start connection agent and wait for incoming requests.
+ * @param agent the agent to start
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_connection_agent_start(mrcp_connection_agent_t *agent);
+
+/**
+ * Terminate connection agent.
+ * @param agent the agent to terminate
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_connection_agent_terminate(mrcp_connection_agent_t *agent);
+
+
+/**
+ * Set connection event handler.
+ * @param agent the agent to set event hadler for
+ * @param obj the external object to associate with the agent
+ * @param vtable the event handler virtual methods
+ */
+MRCP_DECLARE(void) mrcp_client_connection_agent_handler_set(
+								mrcp_connection_agent_t *agent, 
+								void *obj, 
+								const mrcp_connection_event_vtable_t *vtable);
+
+/**
+ * Set MRCP resource factory.
+ * @param agent the agent to set resource factory for
+ * @param resource_factory the MRCP resource factory to set
+ */
+MRCP_DECLARE(void) mrcp_client_connection_resource_factory_set(
+								mrcp_connection_agent_t *agent, 
+								mrcp_resource_factory_t *resource_factory);
+
+/**
+ * Get task.
+ * @param agent the agent to get task from
+ */
+MRCP_DECLARE(apt_task_t*) mrcp_client_connection_agent_task_get(mrcp_connection_agent_t *agent);
+
+/**
+ * Get external object.
+ * @param agent the agent to get object from
+ */
+MRCP_DECLARE(void*) mrcp_client_connection_agent_object_get(mrcp_connection_agent_t *agent);
+
+
+/**
+ * Create control channel.
+ * @param agent the agent to create channel for
+ * @param obj the external object to associate with the control channel
+ * @param pool the pool to allocate memory from
+ */
+MRCP_DECLARE(mrcp_control_channel_t*) mrcp_client_control_channel_create(mrcp_connection_agent_t *agent, void *obj, apr_pool_t *pool);
+
+/**
+ * Add MRCPv2 control channel.
+ * @param channel the control channel to add
+ * @param descriptor the control descriptor
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_channel_add(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor);
+
+/**
+ * Modify MRCPv2 control channel.
+ * @param channel the control channel to modify
+ * @param descriptor the control descriptor
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_channel_modify(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor);
+
+/**
+ * Remove MRCPv2 control channel.
+ * @param channel the control channel to remove
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_channel_remove(mrcp_control_channel_t *channel);
+
+/**
+ * Destroy MRCPv2 control channel.
+ * @param channel the control channel to destroy
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_channel_destroy(mrcp_control_channel_t *channel);
+
+/**
+ * Send MRCPv2 message.
+ * @param channel the control channel to send message through
+ * @param message the message to send
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_message_send(mrcp_control_channel_t *channel, mrcp_message_t *message);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_CLIENT_CONNECTION_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_connection.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_connection.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_CONNECTION_H__
+#define __MRCP_CONNECTION_H__
+
+/**
+ * @file mrcp_connection.h
+ * @brief MRCP Connection
+ */ 
+
+#include 
+#include 
+#include "apt_obj_list.h"
+#include "mrcp_connection_types.h"
+#include "mrcp_stream.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Size of the buffer used for MRCP rx/tx stream */
+#define MRCP_STREAM_BUFFER_SIZE 1024
+
+/** MRCPv2 connection */
+struct mrcp_connection_t {
+	/** Memory pool */
+	apr_pool_t       *pool;
+
+	/** Accepted/Connected socket */
+	apr_socket_t     *sock;
+	/** Socket poll descriptor */
+	apr_pollfd_t      sock_pfd;
+	/** Local sockaddr */
+	apr_sockaddr_t   *l_sockaddr;
+	/** Remote sockaddr */
+	apr_sockaddr_t   *r_sockaddr;
+	/** Remote IP */
+	apt_str_t         remote_ip;
+	/** String identifier used for traces */
+	const char       *id;
+
+	/** Reference count */
+	apr_size_t        access_count;
+	/** Agent list element */
+	apt_list_elem_t  *it;
+	/** Opaque agent */
+	void             *agent;
+
+	/** Table of control channels */
+	apr_hash_t       *channel_table;
+
+	/** Rx buffer */
+	char              rx_buffer[MRCP_STREAM_BUFFER_SIZE];
+	/** Rx stream */
+	apt_text_stream_t rx_stream;
+	/** MRCP parser to parser MRCP messages out of rx stream */
+	mrcp_parser_t    *parser;
+
+	/** Tx buffer */
+	char              tx_buffer[MRCP_STREAM_BUFFER_SIZE];
+	/** Tx stream */
+	apt_text_stream_t tx_stream;
+	/** MRCP generator to generate MRCP messages out of tx stream */
+	mrcp_generator_t *generator;
+};
+
+/** Create MRCP connection. */
+mrcp_connection_t* mrcp_connection_create();
+
+/** Destroy MRCP connection. */
+void mrcp_connection_destroy(mrcp_connection_t *connection);
+
+/** Add Control Channel to MRCP connection. */
+apt_bool_t mrcp_connection_channel_add(mrcp_connection_t *connection, mrcp_control_channel_t *channel);
+
+/** Find Control Channel by Channel Identifier. */
+mrcp_control_channel_t* mrcp_connection_channel_find(mrcp_connection_t *connection, const apt_str_t *identifier);
+
+/** Remove Control Channel from MRCP connection. */
+apt_bool_t mrcp_connection_channel_remove(mrcp_connection_t *connection, mrcp_control_channel_t *channel);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_CONNECTION_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_connection_types.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_connection_types.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_CONNECTION_TYPES_H__
+#define __MRCP_CONNECTION_TYPES_H__
+
+/**
+ * @file mrcp_connection_types.h
+ * @brief MRCP Connection Types Declaration
+ */ 
+
+#include 
+#include "apt_string.h"
+#include "mrcp_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque MRCPv2 control descriptor declaration */
+typedef struct mrcp_control_descriptor_t mrcp_control_descriptor_t;
+
+/** Opaque MRCPv2 connection declaration */
+typedef struct mrcp_connection_t mrcp_connection_t;
+
+/** Opaque MRCPv2 control channel declaration */
+typedef struct mrcp_control_channel_t mrcp_control_channel_t;
+
+/** Opaque MRCPv2 connection agent declaration */
+typedef struct mrcp_connection_agent_t mrcp_connection_agent_t;
+
+/** MRCPv2 connection event vtable declaration */
+typedef struct mrcp_connection_event_vtable_t mrcp_connection_event_vtable_t;
+
+/** MRCPv2 connection event vtable */
+struct mrcp_connection_event_vtable_t {
+	/** Channel add event handler */
+	apt_bool_t (*on_add)(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status);
+	/** Channel modify event handler */
+	apt_bool_t (*on_modify)(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor, apt_bool_t status);
+	/** Channel remove event handler */
+	apt_bool_t (*on_remove)(mrcp_control_channel_t *channel, apt_bool_t status);
+	/** Message receive event handler */
+	apt_bool_t (*on_receive)(mrcp_control_channel_t *channel, mrcp_message_t *message);
+};
+
+/** MRCPv2 control channel */
+struct mrcp_control_channel_t {
+	/** MRCPv2 Connection agent */
+	mrcp_connection_agent_t *agent;
+	/** MRCPv2 (shared) connection */
+	mrcp_connection_t       *connection;
+	/** Indicate removed connection (safe to destroy) */
+	apt_bool_t               removed;
+	/** External object associated with the channel */
+	void                    *obj;
+	/** Pool to allocate memory from */
+	apr_pool_t              *pool;
+	/** Channel identifier (id at resource) */
+	apt_str_t                identifier;
+};
+
+/** Send channel add response */
+static APR_INLINE apt_bool_t mrcp_control_channel_add_respond(
+						const mrcp_connection_event_vtable_t *vtable, 
+						mrcp_control_channel_t *channel, 
+						mrcp_control_descriptor_t *descriptor,
+						apt_bool_t status)
+{
+	if(vtable && vtable->on_add) {
+		return vtable->on_add(channel,descriptor,status);
+	}
+	return FALSE;
+}
+
+/** Send channel modify response */
+static APR_INLINE apt_bool_t mrcp_control_channel_modify_respond(
+						const mrcp_connection_event_vtable_t *vtable, 
+						mrcp_control_channel_t *channel, 
+						mrcp_control_descriptor_t *descriptor,
+						apt_bool_t status)
+{
+	if(vtable && vtable->on_modify) {
+		return vtable->on_modify(channel,descriptor,status);
+	}
+	return FALSE;
+}
+
+/** Send channel remove response */
+static APR_INLINE apt_bool_t mrcp_control_channel_remove_respond(
+						const mrcp_connection_event_vtable_t *vtable, 
+						mrcp_control_channel_t *channel,
+						apt_bool_t status)
+{
+	if(vtable && vtable->on_remove) {
+		return vtable->on_remove(channel,status);
+	}
+	return FALSE;
+}
+
+/** Send MRCP message receive event */
+static APR_INLINE apt_bool_t mrcp_connection_message_receive(
+						const mrcp_connection_event_vtable_t *vtable,
+						mrcp_control_channel_t *channel, 
+						mrcp_message_t *message)
+{
+	if(vtable && vtable->on_receive) {
+		return vtable->on_receive(channel,message);
+	}
+	return FALSE;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_CONNECTION_TYPES_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_control_descriptor.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_control_descriptor.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_CONTROL_DESCRIPTOR_H__
+#define __MRCP_CONTROL_DESCRIPTOR_H__
+
+/**
+ * @file mrcp_control_descriptor.h
+ * @brief MRCPv2 Control Descriptor
+ */ 
+
+#include "apt_string.h"
+#include "mrcp_connection_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** MRCPv2 proto transport */
+typedef enum {
+	MRCP_PROTO_TCP,
+	MRCP_PROTO_TLS,
+
+	MRCP_PROTO_COUNT,
+	MRCP_PROTO_UNKNOWN = MRCP_PROTO_COUNT
+}mrcp_proto_type_e;
+
+
+/** MRCPv2 attributes */
+typedef enum {
+	MRCP_ATTRIB_SETUP,
+	MRCP_ATTRIB_CONNECTION,
+	MRCP_ATTRIB_RESOURCE,
+	MRCP_ATTRIB_CHANNEL,
+	MRCP_ATTRIB_CMID,
+
+	MRCP_ATTRIB_COUNT,
+	MRCP_ATTRIB_UNKNOWN = MRCP_ATTRIB_COUNT
+}mrcp_attrib_e;
+
+
+/** MRCPv2 setup attributes */
+typedef enum {
+	MRCP_SETUP_TYPE_ACTIVE,
+	MRCP_SETUP_TYPE_PASSIVE,
+
+	MRCP_SETUP_TYPE_COUNT,
+	MRCP_SETUP_TYPE_UNKNOWN = MRCP_SETUP_TYPE_COUNT
+} mrcp_setup_type_e;
+
+/** MRCPv2 connection attributes */
+typedef enum {
+	MRCP_CONNECTION_TYPE_NEW,
+	MRCP_CONNECTION_TYPE_EXISTING,
+
+	MRCP_CONNECTION_TYPE_COUNT,
+	MRCP_CONNECTION_TYPE_UNKNOWN = MRCP_CONNECTION_TYPE_COUNT
+} mrcp_connection_type_e;
+
+
+/** MRCPv2 control descriptor */
+struct mrcp_control_descriptor_t {
+	/** IP address */
+	apt_str_t              ip;
+	/** Port */
+	apr_port_t             port;
+	/** Protocol type */
+	mrcp_proto_type_e      proto;
+	/** Setup type */
+	mrcp_setup_type_e      setup_type;
+	/** Connection type */
+	mrcp_connection_type_e connection_type;
+	/** Resource name */
+	apt_str_t              resource_name;
+	/** Session identifier */
+	apt_str_t              session_id;
+	/** Control media identifier */
+	apr_size_t             cmid;
+	/** Base identifier */
+	apr_size_t             id;
+};
+
+/** Initialize MRCP control descriptor */
+static APR_INLINE void mrcp_control_descriptor_init(mrcp_control_descriptor_t *descriptor)
+{
+	apt_string_reset(&descriptor->ip);
+	descriptor->port = 0;
+	descriptor->proto = MRCP_PROTO_UNKNOWN;
+	descriptor->setup_type = MRCP_SETUP_TYPE_UNKNOWN;
+	descriptor->connection_type = MRCP_CONNECTION_TYPE_UNKNOWN;
+	apt_string_reset(&descriptor->resource_name);
+	apt_string_reset(&descriptor->session_id);
+	descriptor->cmid = 0;
+	descriptor->id = 0;
+}
+
+/** Create MRCP control offer */
+MRCP_DECLARE(mrcp_control_descriptor_t*) mrcp_control_offer_create(apr_pool_t *pool);
+
+/** Create MRCP control answer */
+MRCP_DECLARE(mrcp_control_descriptor_t*) mrcp_control_answer_create(mrcp_control_descriptor_t *offer, apr_pool_t *pool);
+
+/** Get MRCP protocol transport name by identifier */
+MRCP_DECLARE(const apt_str_t*) mrcp_proto_get(mrcp_proto_type_e proto);
+
+/** Find MRCP protocol transport identifier by name */
+MRCP_DECLARE(mrcp_proto_type_e) mrcp_proto_find(const apt_str_t *attrib);
+
+
+/** Get MRCP attribute name by identifier */
+MRCP_DECLARE(const apt_str_t*) mrcp_attrib_str_get(mrcp_attrib_e attrib_id);
+
+/** Find MRCP attribute identifier by name */
+MRCP_DECLARE(mrcp_attrib_e) mrcp_attrib_id_find(const apt_str_t *attrib);
+
+
+/** Get MRCP setup type name by identifier */
+MRCP_DECLARE(const apt_str_t*) mrcp_setup_type_get(mrcp_setup_type_e setup_type);
+
+/** Find MRCP setup type identifier by name */
+MRCP_DECLARE(mrcp_setup_type_e) mrcp_setup_type_find(const apt_str_t *attrib);
+
+
+/** Get MRCP connection type name by identifier */
+MRCP_DECLARE(const apt_str_t*) mrcp_connection_type_get(mrcp_connection_type_e connection_type);
+
+/** Find MRCP connection type identifier by name */
+MRCP_DECLARE(mrcp_connection_type_e) mrcp_connection_type_find(const apt_str_t *attrib);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_CONTROL_DESCRIPTOR_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_server_connection.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/include/mrcp_server_connection.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SERVER_CONNECTION_H__
+#define __MRCP_SERVER_CONNECTION_H__
+
+/**
+ * @file mrcp_server_connection.h
+ * @brief MRCPv2 Server Connection
+ */ 
+
+#include "apt_task.h"
+#include "mrcp_connection_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create connection agent.
+ * @param listen_ip the listen IP address
+ * @param listen_port the listen port
+ * @param max_connection_count the number of max MRCPv2 connections
+ * @param force_new_connection the connection establishment policy in o/a
+ * @param pool the pool to allocate memory from
+ */
+MRCP_DECLARE(mrcp_connection_agent_t*) mrcp_server_connection_agent_create(
+										const char *listen_ip, 
+										apr_port_t listen_port, 
+										apr_size_t max_connection_count,
+										apt_bool_t force_new_connection,
+										apr_pool_t *pool);
+
+/**
+ * Destroy connection agent.
+ * @param agent the agent to destroy
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_connection_agent_destroy(mrcp_connection_agent_t *agent);
+
+/**
+ * Start connection agent and wait for incoming requests.
+ * @param agent the agent to start
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_connection_agent_start(mrcp_connection_agent_t *agent);
+
+/**
+ * Terminate connection agent.
+ * @param agent the agent to terminate
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_connection_agent_terminate(mrcp_connection_agent_t *agent);
+
+/**
+ * Set connection event handler.
+ * @param agent the agent to set event hadler for
+ * @param obj the external object to associate with the agent
+ * @param vtable the event handler virtual methods
+ */
+MRCP_DECLARE(void) mrcp_server_connection_agent_handler_set(
+								mrcp_connection_agent_t *agent, 
+								void *obj, 
+								const mrcp_connection_event_vtable_t *vtable);
+
+/**
+ * Set MRCP resource factory.
+ * @param agent the agent to set resource factory for
+ * @param resource_factory the MRCP resource factory to set
+ */
+MRCP_DECLARE(void) mrcp_server_connection_resource_factory_set(
+								mrcp_connection_agent_t *agent, 
+								mrcp_resource_factory_t *resource_factory);
+
+/**
+ * Get task.
+ * @param agent the agent to get task from
+ */
+MRCP_DECLARE(apt_task_t*) mrcp_server_connection_agent_task_get(mrcp_connection_agent_t *agent);
+
+/**
+ * Get external object.
+ * @param agent the agent to get object from
+ */
+MRCP_DECLARE(void*) mrcp_server_connection_agent_object_get(mrcp_connection_agent_t *agent);
+
+
+/**
+ * Create control channel.
+ * @param agent the agent to create channel for
+ * @param obj the external object to associate with the control channel
+ * @param pool the pool to allocate memory from
+ */
+MRCP_DECLARE(mrcp_control_channel_t*) mrcp_server_control_channel_create(mrcp_connection_agent_t *agent, void *obj, apr_pool_t *pool);
+
+/**
+ * Add MRCPv2 control channel.
+ * @param channel the control channel to add
+ * @param descriptor the control descriptor
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_channel_add(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor);
+
+/**
+ * Modify MRCPv2 control channel.
+ * @param channel the control channel to modify
+ * @param descriptor the control descriptor
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_channel_modify(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor);
+
+/**
+ * Remove MRCPv2 control channel.
+ * @param channel the control channel to remove
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_channel_remove(mrcp_control_channel_t *channel);
+
+/**
+ * Destroy MRCPv2 control channel.
+ * @param channel the control channel to destroy
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_channel_destroy(mrcp_control_channel_t *channel);
+
+/**
+ * Send MRCPv2 message.
+ * @param channel the control channel to send message through
+ * @param message the message to send
+ */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_message_send(mrcp_control_channel_t *channel, mrcp_message_t *message);
+
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SERVER_CONNECTION_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,177 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_client_connection.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_client_connection.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,636 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_connection.h"
+#include "mrcp_client_connection.h"
+#include "mrcp_control_descriptor.h"
+#include "mrcp_resource_factory.h"
+#include "mrcp_message.h"
+#include "apt_text_stream.h"
+#include "apt_task.h"
+#include "apt_pollset.h"
+#include "apt_cyclic_queue.h"
+#include "apt_log.h"
+
+#define MRCPV2_CONNECTION_TASK_NAME "TCP/MRCPv2 Connection Agent"
+
+struct mrcp_connection_agent_t {
+	apr_pool_t              *pool;
+	apt_task_t              *task;
+
+	mrcp_resource_factory_t *resource_factory;
+
+	apt_obj_list_t          *connection_list;
+
+	apt_bool_t               offer_new_connection;
+	apr_size_t               max_connection_count;
+
+	apr_thread_mutex_t      *guard;
+	apt_cyclic_queue_t      *msg_queue;
+	apt_pollset_t           *pollset;
+
+	void                                 *obj;
+	const mrcp_connection_event_vtable_t *vtable;
+};
+
+typedef enum {
+	CONNECTION_TASK_MSG_ADD_CHANNEL,
+	CONNECTION_TASK_MSG_MODIFY_CHANNEL,
+	CONNECTION_TASK_MSG_REMOVE_CHANNEL,
+	CONNECTION_TASK_MSG_SEND_MESSAGE,
+	CONNECTION_TASK_MSG_TERMINATE
+} connection_task_msg_type_e;
+
+typedef struct connection_task_msg_t connection_task_msg_t;
+struct connection_task_msg_t {
+	connection_task_msg_type_e type;
+	mrcp_connection_agent_t   *agent;
+	mrcp_control_channel_t    *channel;
+	mrcp_control_descriptor_t *descriptor;
+	mrcp_message_t            *message;
+};
+
+
+static apt_bool_t mrcp_client_agent_task_run(apt_task_t *task);
+static apt_bool_t mrcp_client_agent_task_terminate(apt_task_t *task);
+static apt_bool_t mrcp_client_agent_task_on_destroy(apt_task_t *task);
+
+/** Create connection agent. */
+MRCP_DECLARE(mrcp_connection_agent_t*) mrcp_client_connection_agent_create(
+											apr_size_t max_connection_count, 
+											apt_bool_t offer_new_connection,
+											apr_pool_t *pool)
+{
+	apt_task_vtable_t *vtable;
+	mrcp_connection_agent_t *agent;
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "MRCPV2_CONNECTION_TASK_NAME" [%d]",max_connection_count);
+	agent = apr_palloc(pool,sizeof(mrcp_connection_agent_t));
+	agent->pool = pool;
+	agent->pollset = NULL;
+	agent->max_connection_count = max_connection_count;
+	agent->offer_new_connection = offer_new_connection;
+
+	agent->task = apt_task_create(agent,NULL,pool);
+	if(!agent->task) {
+		return NULL;
+	}
+
+	apt_task_name_set(agent->task,MRCPV2_CONNECTION_TASK_NAME);
+	vtable = apt_task_vtable_get(agent->task);
+	if(vtable) {
+		vtable->run = mrcp_client_agent_task_run;
+		vtable->terminate = mrcp_client_agent_task_terminate;
+		vtable->destroy = mrcp_client_agent_task_on_destroy;
+	}
+
+	agent->connection_list = apt_list_create(pool);
+
+	agent->msg_queue = apt_cyclic_queue_create(CYCLIC_QUEUE_DEFAULT_SIZE);
+	apr_thread_mutex_create(&agent->guard,APR_THREAD_MUTEX_UNNESTED,pool);
+	return agent;
+}
+
+/** Virtual destroy handler. */
+static apt_bool_t mrcp_client_agent_task_on_destroy(apt_task_t *task)
+{
+	mrcp_connection_agent_t *agent = apt_task_object_get(task);
+	if(agent->guard) {
+		apr_thread_mutex_destroy(agent->guard);
+		agent->guard = NULL;
+	}
+	if(agent->msg_queue) {
+		apt_cyclic_queue_destroy(agent->msg_queue);
+		agent->msg_queue = NULL;
+	}
+	return TRUE;
+}
+
+/** Destroy connection agent. */
+MRCP_DECLARE(apt_bool_t) mrcp_client_connection_agent_destroy(mrcp_connection_agent_t *agent)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy MRCPv2 Agent");
+	return apt_task_destroy(agent->task);
+}
+
+/** Start connection agent. */
+MRCP_DECLARE(apt_bool_t) mrcp_client_connection_agent_start(mrcp_connection_agent_t *agent)
+{
+	return apt_task_start(agent->task);
+}
+
+/** Terminate connection agent. */
+MRCP_DECLARE(apt_bool_t) mrcp_client_connection_agent_terminate(mrcp_connection_agent_t *agent)
+{
+	return apt_task_terminate(agent->task,TRUE);
+}
+
+/** Set connection event handler. */
+MRCP_DECLARE(void) mrcp_client_connection_agent_handler_set(
+									mrcp_connection_agent_t *agent, 
+									void *obj, 
+									const mrcp_connection_event_vtable_t *vtable)
+{
+	agent->obj = obj;
+	agent->vtable = vtable;
+}
+
+/** Set MRCP resource factory */
+MRCP_DECLARE(void) mrcp_client_connection_resource_factory_set(
+								mrcp_connection_agent_t *agent, 
+								mrcp_resource_factory_t *resource_factroy)
+{
+	agent->resource_factory = resource_factroy;
+}
+
+/** Get task */
+MRCP_DECLARE(apt_task_t*) mrcp_client_connection_agent_task_get(mrcp_connection_agent_t *agent)
+{
+	return agent->task;
+}
+
+/** Get external object */
+MRCP_DECLARE(void*) mrcp_client_connection_agent_object_get(mrcp_connection_agent_t *agent)
+{
+	return agent->obj;
+}
+
+
+/** Create control channel */
+MRCP_DECLARE(mrcp_control_channel_t*) mrcp_client_control_channel_create(mrcp_connection_agent_t *agent, void *obj, apr_pool_t *pool)
+{
+	mrcp_control_channel_t *channel = apr_palloc(pool,sizeof(mrcp_control_channel_t));
+	channel->agent = agent;
+	channel->connection = NULL;
+	channel->removed = FALSE;
+	channel->obj = obj;
+	channel->pool = pool;
+	return channel;
+}
+
+/** Destroy MRCPv2 control channel */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_channel_destroy(mrcp_control_channel_t *channel)
+{
+	if(channel && channel->connection && channel->removed == TRUE) {
+		mrcp_connection_t *connection = channel->connection;
+		channel->connection = NULL;
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy TCP/MRCPv2 Connection %s",connection->id);
+		mrcp_connection_destroy(connection);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_control_message_signal(
+								connection_task_msg_type_e type,
+								mrcp_connection_agent_t *agent,
+								mrcp_control_channel_t *channel,
+								mrcp_control_descriptor_t *descriptor,
+								mrcp_message_t *message)
+{
+	apt_bool_t status;
+	connection_task_msg_t *msg = apr_palloc(channel->pool,sizeof(connection_task_msg_t));
+	msg->type = type;
+	msg->agent = agent;
+	msg->channel = channel;
+	msg->descriptor = descriptor;
+	msg->message = message;
+
+	apr_thread_mutex_lock(agent->guard);
+	status = apt_cyclic_queue_push(agent->msg_queue,msg);
+	apr_thread_mutex_unlock(agent->guard);
+	if(apt_pollset_wakeup(agent->pollset) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Signal Control Message");
+		status = FALSE;
+	}
+	return status;
+}
+
+/** Add MRCPv2 control channel */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_channel_add(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor)
+{
+	return mrcp_client_control_message_signal(CONNECTION_TASK_MSG_ADD_CHANNEL,channel->agent,channel,descriptor,NULL);
+}
+
+/** Modify MRCPv2 control channel */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_channel_modify(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor)
+{
+	return mrcp_client_control_message_signal(CONNECTION_TASK_MSG_MODIFY_CHANNEL,channel->agent,channel,descriptor,NULL);
+}
+
+/** Remove MRCPv2 control channel */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_channel_remove(mrcp_control_channel_t *channel)
+{
+	return mrcp_client_control_message_signal(CONNECTION_TASK_MSG_REMOVE_CHANNEL,channel->agent,channel,NULL,NULL);
+}
+
+/** Send MRCPv2 message */
+MRCP_DECLARE(apt_bool_t) mrcp_client_control_message_send(mrcp_control_channel_t *channel, mrcp_message_t *message)
+{
+	return mrcp_client_control_message_signal(CONNECTION_TASK_MSG_SEND_MESSAGE,channel->agent,channel,NULL,message);
+}
+
+static mrcp_connection_t* mrcp_client_agent_connection_create(mrcp_connection_agent_t *agent, mrcp_control_descriptor_t *descriptor)
+{
+	char *local_ip = NULL;
+	char *remote_ip = NULL;
+	mrcp_connection_t *connection = mrcp_connection_create();
+
+	apr_sockaddr_info_get(&connection->r_sockaddr,descriptor->ip.buf,APR_INET,descriptor->port,0,connection->pool);
+	if(!connection->r_sockaddr) {
+		mrcp_connection_destroy(connection);
+		return NULL;
+	}
+
+	if(apr_socket_create(&connection->sock,connection->r_sockaddr->family,SOCK_STREAM,APR_PROTO_TCP,connection->pool) != APR_SUCCESS) {
+		mrcp_connection_destroy(connection);
+		return NULL;
+	}
+
+	apr_socket_opt_set(connection->sock, APR_SO_NONBLOCK, 0);
+	apr_socket_timeout_set(connection->sock, -1);
+	apr_socket_opt_set(connection->sock, APR_SO_REUSEADDR, 1);
+
+	if(apr_socket_connect(connection->sock, connection->r_sockaddr) != APR_SUCCESS) {
+		apr_socket_close(connection->sock);
+		mrcp_connection_destroy(connection);
+		return NULL;
+	}
+
+	if(apr_socket_addr_get(&connection->l_sockaddr,APR_LOCAL,connection->sock) != APR_SUCCESS) {
+		apr_socket_close(connection->sock);
+		mrcp_connection_destroy(connection);
+		return NULL;
+	}
+
+	apr_sockaddr_ip_get(&local_ip,connection->l_sockaddr);
+	apr_sockaddr_ip_get(&remote_ip,connection->r_sockaddr);
+	connection->id = apr_psprintf(connection->pool,"%s:%hu <-> %s:%hu",
+		local_ip,connection->l_sockaddr->port,
+		remote_ip,connection->r_sockaddr->port);
+
+	memset(&connection->sock_pfd,0,sizeof(apr_pollfd_t));
+	connection->sock_pfd.desc_type = APR_POLL_SOCKET;
+	connection->sock_pfd.reqevents = APR_POLLIN;
+	connection->sock_pfd.desc.s = connection->sock;
+	connection->sock_pfd.client_data = connection;
+	if(apt_pollset_add(agent->pollset, &connection->sock_pfd) != TRUE) {
+		apr_socket_close(connection->sock);
+		mrcp_connection_destroy(connection);
+		return NULL;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Established TCP/MRCPv2 Connection %s",connection->id);
+	connection->agent = agent;
+	connection->it = apt_list_push_back(agent->connection_list,connection,connection->pool);
+	connection->parser = mrcp_parser_create(agent->resource_factory,connection->pool);
+	connection->generator = mrcp_generator_create(agent->resource_factory,connection->pool);
+	return connection;
+}
+
+static mrcp_connection_t* mrcp_client_agent_connection_find(mrcp_connection_agent_t *agent, mrcp_control_descriptor_t *descriptor)
+{
+	apr_sockaddr_t *sockaddr;
+	mrcp_connection_t *connection = NULL;
+	apt_list_elem_t *elem = apt_list_first_elem_get(agent->connection_list);
+	/* walk through the list of connections */
+	while(elem) {
+		connection = apt_list_elem_object_get(elem);
+		if(connection) {
+			if(apr_sockaddr_info_get(&sockaddr,descriptor->ip.buf,APR_INET,descriptor->port,0,connection->pool) == APR_SUCCESS) {
+				if(apr_sockaddr_equal(sockaddr,connection->r_sockaddr) != 0) {
+					return connection;
+				}
+			}
+		}
+		elem = apt_list_next_elem_get(agent->connection_list,elem);
+	}
+	return NULL;
+}
+
+static apt_bool_t mrcp_client_agent_connection_remove(mrcp_connection_agent_t *agent, mrcp_connection_t *connection)
+{
+	/* remove from the list */
+	if(connection->it) {
+		apt_list_elem_remove(agent->connection_list,connection->it);
+		connection->it = NULL;
+	}
+	apt_pollset_remove(agent->pollset,&connection->sock_pfd);
+	if(connection->sock) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Close TCP/MRCPv2 Connection %s",connection->id);
+		apr_socket_close(connection->sock);
+		connection->sock = NULL;
+	}
+	return TRUE;
+}
+
+
+static apt_bool_t mrcp_client_agent_channel_add(mrcp_connection_agent_t *agent, mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor)
+{
+	if(agent->offer_new_connection == TRUE) {
+		descriptor->connection_type = MRCP_CONNECTION_TYPE_NEW;
+	}
+	else {
+		descriptor->connection_type = MRCP_CONNECTION_TYPE_EXISTING;
+		if(apt_list_is_empty(agent->connection_list) == TRUE) {
+			/* offer new connection if there is no established connection yet */
+			descriptor->connection_type = MRCP_CONNECTION_TYPE_NEW;
+		}
+	}
+	/* send response */
+	return mrcp_control_channel_add_respond(agent->vtable,channel,descriptor,TRUE);
+}
+
+static apt_bool_t mrcp_client_agent_channel_modify(mrcp_connection_agent_t *agent, mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor)
+{
+	apt_bool_t status = TRUE;
+	if(descriptor->port) {
+		if(!channel->connection) {
+			mrcp_connection_t *connection = NULL;
+			apt_id_resource_generate(&descriptor->session_id,&descriptor->resource_name,'@',&channel->identifier,channel->pool);
+			/* no connection yet */
+			if(descriptor->connection_type == MRCP_CONNECTION_TYPE_EXISTING) {
+				/* try to find existing connection */
+				connection = mrcp_client_agent_connection_find(agent,descriptor);
+				if(!connection) {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Found No Existing TCP/MRCPv2 Connection");
+				}
+			}
+			if(!connection) {
+				/* create new connection */
+				connection = mrcp_client_agent_connection_create(agent,descriptor);
+				if(!connection) {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Establish TCP/MRCPv2 Connection");
+				}
+			}
+
+			if(connection) {
+				mrcp_connection_channel_add(connection,channel);
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add Control Channel <%s> %s [%d]",
+						channel->identifier.buf,
+						connection->id,
+						apr_hash_count(connection->channel_table));
+				if(descriptor->connection_type == MRCP_CONNECTION_TYPE_NEW) {
+					/* set connection type to existing for the next offers / if any */
+					descriptor->connection_type = MRCP_CONNECTION_TYPE_EXISTING;
+				}
+			}
+			else {
+				descriptor->port = 0;
+				status = FALSE;
+			}
+		}
+	}
+	/* send response */
+	return mrcp_control_channel_modify_respond(agent->vtable,channel,descriptor,status);
+}
+
+static apt_bool_t mrcp_client_agent_channel_remove(mrcp_connection_agent_t *agent, mrcp_control_channel_t *channel)
+{
+	if(channel->connection) {
+		mrcp_connection_t *connection = channel->connection;
+		mrcp_connection_channel_remove(connection,channel);
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remove Control Channel <%s> [%d]",
+				channel->identifier.buf,
+				apr_hash_count(connection->channel_table));
+		if(!connection->access_count) {
+			mrcp_client_agent_connection_remove(agent,connection);
+			/* set connection to be destroyed on channel destroy */
+			channel->connection = connection;
+			channel->removed = TRUE;
+		}
+	}
+	
+	/* send response */
+	return mrcp_control_channel_remove_respond(agent->vtable,channel,TRUE);
+}
+
+static apt_bool_t mrcp_client_agent_messsage_send(mrcp_connection_agent_t *agent, mrcp_control_channel_t *channel, mrcp_message_t *message)
+{
+	apt_bool_t status = FALSE;
+	mrcp_connection_t *connection = channel->connection;
+	apt_text_stream_t *stream;
+	mrcp_stream_result_e result;
+
+	if(!connection || !connection->sock) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No MRCPv2 Connection");
+		return FALSE;
+	}
+	stream = &connection->tx_stream;
+
+	mrcp_generator_message_set(connection->generator,message);
+	do {
+		apt_text_stream_init(&connection->tx_stream,connection->tx_buffer,sizeof(connection->tx_buffer)-1);
+		result = mrcp_generator_run(connection->generator,stream);
+		if(result == MRCP_STREAM_MESSAGE_COMPLETE || result == MRCP_STREAM_MESSAGE_TRUNCATED) {
+			stream->text.length = stream->pos - stream->text.buf;
+			*stream->pos = '\0';
+
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send MRCPv2 Stream %s [%lu bytes]\n%s",
+				connection->id,
+				stream->text.length,
+				stream->text.buf);
+			if(apr_socket_send(connection->sock,stream->text.buf,&stream->text.length) == APR_SUCCESS) {
+				status = TRUE;
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Send MRCPv2 Stream");
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Generate MRCPv2 Stream");
+		}
+	}
+	while(result == MRCP_STREAM_MESSAGE_TRUNCATED);
+
+	if(status == FALSE) {
+		mrcp_message_t *response = mrcp_response_create(message,message->pool);
+		response->start_line.method_id = message->start_line.method_id;
+		response->start_line.method_name = message->start_line.method_name;
+		response->start_line.status_code = MRCP_STATUS_CODE_METHOD_FAILED;
+		mrcp_connection_message_receive(agent->vtable,channel,response);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_message_handler(void *obj, mrcp_message_t *message, mrcp_stream_result_e result)
+{
+	if(result == MRCP_STREAM_MESSAGE_COMPLETE) {
+		/* message is completely parsed */
+		mrcp_connection_t *connection = obj;
+		mrcp_control_channel_t *channel;
+		apt_str_t identifier;
+		apt_id_resource_generate(&message->channel_id.session_id,&message->channel_id.resource_name,'@',&identifier,message->pool);
+		channel = mrcp_connection_channel_find(connection,&identifier);
+		if(channel) {
+			mrcp_connection_agent_t *agent = connection->agent;
+			mrcp_connection_message_receive(agent->vtable,channel,message);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Find Channel <%s@%s> in Connection %s [%d]",
+				message->channel_id.session_id.buf,
+				message->channel_id.resource_name.buf,
+				connection->id,
+				apr_hash_count(connection->channel_table));
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_agent_messsage_receive(mrcp_connection_agent_t *agent, mrcp_connection_t *connection)
+{
+	apr_status_t status;
+	apr_size_t offset;
+	apr_size_t length;
+	apt_text_stream_t *stream;
+
+	if(!connection || !connection->sock) {
+		return FALSE;
+	}
+	stream = &connection->rx_stream;
+
+	/* init length of the stream */
+	stream->text.length = sizeof(connection->rx_buffer)-1;
+	/* calculate offset remaining from the previous receive / if any */
+	offset = stream->pos - stream->text.buf;
+	/* calculate available length */
+	length = stream->text.length - offset;
+	status = apr_socket_recv(connection->sock,stream->pos,&length);
+	if(status == APR_EOF || length == 0) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"TCP/MRCPv2 Peer Disconnected %s",connection->id);
+		apt_pollset_remove(agent->pollset,&connection->sock_pfd);
+		apr_socket_close(connection->sock);
+		connection->sock = NULL;
+
+//		agent->vtable->on_disconnect(agent,connection);
+		return TRUE;
+	}
+	/* calculate actual length of the stream */
+	stream->text.length = offset + length;
+	stream->pos[length] = '\0';
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive MRCPv2 Stream %s [%lu bytes]\n%s",
+		connection->id,
+		length,
+		stream->pos);
+
+	/* reset pos */
+	stream->pos = stream->text.buf;
+	/* walk through the stream parsing RTSP messages */
+	return mrcp_stream_walk(connection->parser,stream,mrcp_client_message_handler,connection);
+}
+
+static apt_bool_t mrcp_client_agent_control_process(mrcp_connection_agent_t *agent)
+{
+	apt_bool_t status = TRUE;
+	apt_bool_t running = TRUE;
+	connection_task_msg_t *msg;
+
+	do {
+		apr_thread_mutex_lock(agent->guard);
+		msg = apt_cyclic_queue_pop(agent->msg_queue);
+		apr_thread_mutex_unlock(agent->guard);
+		if(msg) {
+			switch(msg->type) {
+				case CONNECTION_TASK_MSG_ADD_CHANNEL:
+					mrcp_client_agent_channel_add(agent,msg->channel,msg->descriptor);
+					break;
+				case CONNECTION_TASK_MSG_MODIFY_CHANNEL:
+					mrcp_client_agent_channel_modify(agent,msg->channel,msg->descriptor);
+					break;
+				case CONNECTION_TASK_MSG_REMOVE_CHANNEL:
+					mrcp_client_agent_channel_remove(agent,msg->channel);
+					break;
+				case CONNECTION_TASK_MSG_SEND_MESSAGE:
+					mrcp_client_agent_messsage_send(agent,msg->channel,msg->message);
+					break;
+				case CONNECTION_TASK_MSG_TERMINATE:
+					status = FALSE;
+					break;
+			}
+		}
+		else {
+			running = FALSE;
+		}
+	}
+	while(running == TRUE);
+	return status;
+}
+
+static apt_bool_t mrcp_client_agent_task_run(apt_task_t *task)
+{
+	mrcp_connection_agent_t *agent = apt_task_object_get(task);
+	apt_bool_t running = TRUE;
+	apr_status_t status;
+	apr_int32_t num;
+	const apr_pollfd_t *ret_pfd;
+	int i;
+
+	if(!agent) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start MRCPv2 Agent");
+		return FALSE;
+	}
+
+	agent->pollset = apt_pollset_create((apr_uint32_t)agent->max_connection_count,agent->pool);
+	if(!agent->pollset) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Pollset");
+		return FALSE;
+	}
+
+	while(running) {
+		status = apt_pollset_poll(agent->pollset, -1, &num, &ret_pfd);
+		if(status != APR_SUCCESS) {
+			continue;
+		}
+		for(i = 0; i < num; i++) {
+			if(apt_pollset_is_wakeup(agent->pollset,&ret_pfd[i])) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process Control Message");
+				if(mrcp_client_agent_control_process(agent) == FALSE) {
+					running = FALSE;
+					break;
+				}
+				continue;
+			}
+	
+			mrcp_client_agent_messsage_receive(agent,ret_pfd[i].client_data);
+		}
+	}
+
+	apt_pollset_destroy(agent->pollset);
+	agent->pollset = NULL;
+
+	apt_task_child_terminate(agent->task);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_client_agent_task_terminate(apt_task_t *task)
+{
+	apt_bool_t status = FALSE;
+	mrcp_connection_agent_t *agent = apt_task_object_get(task);
+	if(agent->pollset) {
+		connection_task_msg_t *msg = apr_pcalloc(agent->pool,sizeof(connection_task_msg_t));
+		msg->type = CONNECTION_TASK_MSG_TERMINATE;
+
+		apr_thread_mutex_lock(agent->guard);
+		status = apt_cyclic_queue_push(agent->msg_queue,msg);
+		apr_thread_mutex_unlock(agent->guard);
+		if(apt_pollset_wakeup(agent->pollset) == TRUE) {
+			status = TRUE;
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Signal Control Message");
+		}
+	}
+	return status;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_connection.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_connection.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_connection.h"
+#include "apt_pool.h"
+
+mrcp_connection_t* mrcp_connection_create()
+{
+	mrcp_connection_t *connection;
+	apr_pool_t *pool = apt_pool_create();
+	if(!pool) {
+		return NULL;
+	}
+	
+	connection = apr_palloc(pool,sizeof(mrcp_connection_t));
+	connection->pool = pool;
+	apt_string_reset(&connection->remote_ip);
+	connection->l_sockaddr = NULL;
+	connection->r_sockaddr = NULL;
+	connection->sock = NULL;
+	connection->id = NULL;
+	connection->access_count = 0;
+	connection->it = NULL;
+	connection->channel_table = apr_hash_make(pool);
+	apt_text_stream_init(&connection->rx_stream,connection->rx_buffer,sizeof(connection->rx_buffer)-1);
+	apt_text_stream_init(&connection->tx_stream,connection->tx_buffer,sizeof(connection->tx_buffer)-1);
+	connection->parser = NULL;
+	connection->generator = NULL;
+	return connection;
+}
+
+void mrcp_connection_destroy(mrcp_connection_t *connection)
+{
+	if(connection && connection->pool) {
+		apr_pool_destroy(connection->pool);
+	}
+}
+
+apt_bool_t mrcp_connection_channel_add(mrcp_connection_t *connection, mrcp_control_channel_t *channel)
+{
+	if(!connection || !channel) {
+		return FALSE;
+	}
+	apr_hash_set(connection->channel_table,channel->identifier.buf,channel->identifier.length,channel);
+	channel->connection = connection;
+	connection->access_count++;
+	return TRUE;
+}
+
+mrcp_control_channel_t* mrcp_connection_channel_find(mrcp_connection_t *connection, const apt_str_t *identifier)
+{
+	if(!connection || !identifier) {
+		return NULL;
+	}
+	return apr_hash_get(connection->channel_table,identifier->buf,identifier->length);
+}
+
+apt_bool_t mrcp_connection_channel_remove(mrcp_connection_t *connection, mrcp_control_channel_t *channel)
+{
+	if(!connection || !channel) {
+		return FALSE;
+	}
+	apr_hash_set(connection->channel_table,channel->identifier.buf,channel->identifier.length,NULL);
+	channel->connection = NULL;
+	connection->access_count--;
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_control_descriptor.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_control_descriptor.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_string_table.h"
+#include "mrcp_control_descriptor.h"
+
+/** String table of mrcp proto types (mrcp_proto_type_e) */
+static const apt_str_table_item_t mrcp_proto_type_table[] = {
+	{{"TCP/MRCPv2",    10},4},
+	{{"TCP/TLS/MRCPv2",14},4}
+};
+
+/** String table of mrcp attributes (mrcp_attrib_e) */
+static const apt_str_table_item_t mrcp_attrib_table[] = {
+	{{"setup",      5},0},
+	{{"connection",10},1},
+	{{"resource",   8},0},
+	{{"channel",    7},1},
+	{{"cmid",       4},1}
+};
+
+/** String table of mrcp setup attribute values (mrcp_setup_type_e) */
+static const apt_str_table_item_t mrcp_setup_value_table[] = {
+	{{"active",      6},0},
+	{{"passive",     7},0}
+};
+
+/** String table of mrcp connection attribute values (mrcp_connection_type_e) */
+static const apt_str_table_item_t mrcp_connection_value_table[] = {
+	{{"new",         3},0},
+	{{"existing",    8},0}
+};
+
+
+MRCP_DECLARE(const apt_str_t*) mrcp_proto_get(mrcp_proto_type_e proto)
+{
+	return apt_string_table_str_get(mrcp_proto_type_table,MRCP_PROTO_COUNT,proto);
+}
+
+MRCP_DECLARE(mrcp_proto_type_e) mrcp_proto_find(const apt_str_t *attrib)
+{
+	return apt_string_table_id_find(mrcp_proto_type_table,MRCP_PROTO_COUNT,attrib);
+}
+
+MRCP_DECLARE(const apt_str_t*) mrcp_attrib_str_get(mrcp_attrib_e attrib_id)
+{
+	return apt_string_table_str_get(mrcp_attrib_table,MRCP_ATTRIB_COUNT,attrib_id);
+}
+
+MRCP_DECLARE(mrcp_attrib_e) mrcp_attrib_id_find(const apt_str_t *attrib)
+{
+	return apt_string_table_id_find(mrcp_attrib_table,MRCP_ATTRIB_COUNT,attrib);
+}
+
+MRCP_DECLARE(const apt_str_t*) mrcp_setup_type_get(mrcp_setup_type_e setup_type)
+{
+	return apt_string_table_str_get(mrcp_setup_value_table,MRCP_SETUP_TYPE_COUNT,setup_type);
+}
+
+MRCP_DECLARE(mrcp_setup_type_e) mrcp_setup_type_find(const apt_str_t *attrib)
+{
+	return apt_string_table_id_find(mrcp_setup_value_table,MRCP_SETUP_TYPE_COUNT,attrib);
+}
+
+MRCP_DECLARE(const apt_str_t*) mrcp_connection_type_get(mrcp_connection_type_e connection_type)
+{
+	return apt_string_table_str_get(mrcp_connection_value_table,MRCP_CONNECTION_TYPE_COUNT,connection_type);
+}
+
+MRCP_DECLARE(mrcp_connection_type_e) mrcp_connection_type_find(const apt_str_t *attrib)
+{
+	return apt_string_table_id_find(mrcp_connection_value_table,MRCP_CONNECTION_TYPE_COUNT,attrib);
+}
+
+/** Create MRCP control offer */
+MRCP_DECLARE(mrcp_control_descriptor_t*) mrcp_control_offer_create(apr_pool_t *pool)
+{
+	mrcp_control_descriptor_t *offer;
+	offer = apr_palloc(pool,sizeof(mrcp_control_descriptor_t));
+	mrcp_control_descriptor_init(offer);
+	offer->proto = MRCP_PROTO_TCP;
+	offer->port = 9;
+	offer->setup_type = MRCP_SETUP_TYPE_ACTIVE;
+	offer->connection_type = MRCP_CONNECTION_TYPE_EXISTING;
+	return offer;
+}
+
+/** Create MRCP control answer */
+MRCP_DECLARE(mrcp_control_descriptor_t*) mrcp_control_answer_create(mrcp_control_descriptor_t *offer, apr_pool_t *pool)
+{
+	mrcp_control_descriptor_t *answer;
+	answer = apr_palloc(pool,sizeof(mrcp_control_descriptor_t));
+	mrcp_control_descriptor_init(answer);
+	if(offer) {
+		*answer = *offer;
+	}
+	answer->setup_type = MRCP_SETUP_TYPE_PASSIVE;
+	return answer;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_server_connection.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/src/mrcp_server_connection.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,766 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mrcp_connection.h"
+#include "mrcp_server_connection.h"
+#include "mrcp_control_descriptor.h"
+#include "mrcp_resource_factory.h"
+#include "mrcp_message.h"
+#include "apt_text_stream.h"
+#include "apt_task.h"
+#include "apt_pool.h"
+#include "apt_pollset.h"
+#include "apt_cyclic_queue.h"
+#include "apt_log.h"
+
+#define MRCPV2_CONNECTION_TASK_NAME "TCP/MRCPv2 Connection Agent"
+
+struct mrcp_connection_agent_t {
+	apr_pool_t              *pool;
+	apt_task_t              *task;
+	mrcp_resource_factory_t *resource_factory;
+
+	apt_obj_list_t          *connection_list;
+	mrcp_connection_t       *null_connection;
+
+	apt_bool_t               force_new_connection;
+	apr_size_t               max_connection_count;
+
+	apr_sockaddr_t          *sockaddr;
+	/* Listening socket */
+	apr_socket_t            *listen_sock;
+	apr_pollfd_t             listen_sock_pfd;
+
+	apr_thread_mutex_t      *guard;
+	apt_cyclic_queue_t      *msg_queue;
+	apt_pollset_t           *pollset;
+
+	void                                 *obj;
+	const mrcp_connection_event_vtable_t *vtable;
+};
+
+typedef enum {
+	CONNECTION_TASK_MSG_ADD_CHANNEL,
+	CONNECTION_TASK_MSG_MODIFY_CHANNEL,
+	CONNECTION_TASK_MSG_REMOVE_CHANNEL,
+	CONNECTION_TASK_MSG_SEND_MESSAGE,
+	CONNECTION_TASK_MSG_TERMINATE
+} connection_task_msg_type_e;
+
+typedef struct connection_task_msg_t connection_task_msg_t;
+struct connection_task_msg_t {
+	connection_task_msg_type_e type;
+	mrcp_connection_agent_t   *agent;
+	mrcp_control_channel_t    *channel;
+	mrcp_control_descriptor_t *descriptor;
+	mrcp_message_t            *message;
+};
+
+static apt_bool_t mrcp_server_agent_task_run(apt_task_t *task);
+static apt_bool_t mrcp_server_agent_task_terminate(apt_task_t *task);
+static apt_bool_t mrcp_server_agent_task_on_destroy(apt_task_t *task);
+
+/** Create connection agent */
+MRCP_DECLARE(mrcp_connection_agent_t*) mrcp_server_connection_agent_create(
+										const char *listen_ip,
+										apr_port_t listen_port,
+										apr_size_t max_connection_count,
+										apt_bool_t force_new_connection,
+										apr_pool_t *pool)
+{
+	apt_task_vtable_t *vtable;
+	mrcp_connection_agent_t *agent;
+
+	if(!listen_ip) {
+		return NULL;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "MRCPV2_CONNECTION_TASK_NAME" %s:%hu [%d]",listen_ip,listen_port,max_connection_count);
+	agent = apr_palloc(pool,sizeof(mrcp_connection_agent_t));
+	agent->pool = pool;
+	agent->sockaddr = NULL;
+	agent->listen_sock = NULL;
+	agent->pollset = NULL;
+	agent->max_connection_count = max_connection_count;
+	agent->force_new_connection = force_new_connection;
+
+	apr_sockaddr_info_get(&agent->sockaddr,listen_ip,APR_INET,listen_port,0,agent->pool);
+	if(!agent->sockaddr) {
+		return NULL;
+	}
+
+	agent->task = apt_task_create(agent,NULL,pool);
+	if(!agent->task) {
+		return NULL;
+	}
+
+	apt_task_name_set(agent->task,MRCPV2_CONNECTION_TASK_NAME);
+	vtable = apt_task_vtable_get(agent->task);
+	if(vtable) {
+		vtable->run = mrcp_server_agent_task_run;
+		vtable->terminate = mrcp_server_agent_task_terminate;
+		vtable->destroy = mrcp_server_agent_task_on_destroy;
+	}
+
+	agent->msg_queue = apt_cyclic_queue_create(CYCLIC_QUEUE_DEFAULT_SIZE);
+	apr_thread_mutex_create(&agent->guard,APR_THREAD_MUTEX_UNNESTED,pool);
+
+	agent->connection_list = NULL;
+	agent->null_connection = NULL;
+	return agent;
+}
+
+/** Virtual destroy handler. */
+static apt_bool_t mrcp_server_agent_task_on_destroy(apt_task_t *task)
+{
+	mrcp_connection_agent_t *agent = apt_task_object_get(task);
+	if(agent->guard) {
+		apr_thread_mutex_destroy(agent->guard);
+		agent->guard = NULL;
+	}
+	if(agent->msg_queue) {
+		apt_cyclic_queue_destroy(agent->msg_queue);
+		agent->msg_queue = NULL;
+	}
+	return TRUE;
+}
+
+/** Destroy connection agent. */
+MRCP_DECLARE(apt_bool_t) mrcp_server_connection_agent_destroy(mrcp_connection_agent_t *agent)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy MRCPv2 Agent");
+	return apt_task_destroy(agent->task);
+}
+
+/** Start connection agent. */
+MRCP_DECLARE(apt_bool_t) mrcp_server_connection_agent_start(mrcp_connection_agent_t *agent)
+{
+	return apt_task_start(agent->task);
+}
+
+/** Terminate connection agent. */
+MRCP_DECLARE(apt_bool_t) mrcp_server_connection_agent_terminate(mrcp_connection_agent_t *agent)
+{
+	return apt_task_terminate(agent->task,TRUE);
+}
+
+/** Set connection event handler. */
+MRCP_DECLARE(void) mrcp_server_connection_agent_handler_set(
+									mrcp_connection_agent_t *agent, 
+									void *obj, 
+									const mrcp_connection_event_vtable_t *vtable)
+{
+	agent->obj = obj;
+	agent->vtable = vtable;
+}
+
+/** Set MRCP resource factory */
+MRCP_DECLARE(void) mrcp_server_connection_resource_factory_set(
+								mrcp_connection_agent_t *agent, 
+								mrcp_resource_factory_t *resource_factroy)
+{
+	agent->resource_factory = resource_factroy;
+}
+
+/** Get task */
+MRCP_DECLARE(apt_task_t*) mrcp_server_connection_agent_task_get(mrcp_connection_agent_t *agent)
+{
+	return agent->task;
+}
+
+/** Get external object */
+MRCP_DECLARE(void*) mrcp_server_connection_agent_object_get(mrcp_connection_agent_t *agent)
+{
+	return agent->obj;
+}
+
+/** Create MRCPv2 control channel */
+MRCP_DECLARE(mrcp_control_channel_t*) mrcp_server_control_channel_create(mrcp_connection_agent_t *agent, void *obj, apr_pool_t *pool)
+{
+	mrcp_control_channel_t *channel = apr_palloc(pool,sizeof(mrcp_control_channel_t));
+	channel->agent = agent;
+	channel->connection = NULL;
+	channel->removed = FALSE;
+	channel->obj = obj;
+	channel->pool = pool;
+	return channel;
+}
+
+/** Destroy MRCPv2 control channel */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_channel_destroy(mrcp_control_channel_t *channel)
+{
+	if(channel && channel->connection && channel->removed == TRUE) {
+		mrcp_connection_t *connection = channel->connection;
+		channel->connection = NULL;
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy TCP/MRCPv2 Connection %s",connection->id);
+		mrcp_connection_destroy(connection);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_control_message_signal(
+								connection_task_msg_type_e type,
+								mrcp_connection_agent_t *agent,
+								mrcp_control_channel_t *channel,
+								mrcp_control_descriptor_t *descriptor,
+								mrcp_message_t *message)
+{
+	apt_bool_t status;
+	connection_task_msg_t *msg = apr_palloc(channel->pool,sizeof(connection_task_msg_t));
+	msg->type = type;
+	msg->agent = agent;
+	msg->channel = channel;
+	msg->descriptor = descriptor;
+	msg->message = message;
+
+	apr_thread_mutex_lock(agent->guard);
+	status = apt_cyclic_queue_push(agent->msg_queue,msg);
+	apr_thread_mutex_unlock(agent->guard);
+	if(apt_pollset_wakeup(agent->pollset) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Signal Control Message");
+		status = FALSE;
+	}
+	return status;
+}
+
+/** Add MRCPv2 control channel */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_channel_add(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor)
+{
+	return mrcp_server_control_message_signal(CONNECTION_TASK_MSG_ADD_CHANNEL,channel->agent,channel,descriptor,NULL);
+}
+
+/** Modify MRCPv2 control channel */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_channel_modify(mrcp_control_channel_t *channel, mrcp_control_descriptor_t *descriptor)
+{
+	return mrcp_server_control_message_signal(CONNECTION_TASK_MSG_MODIFY_CHANNEL,channel->agent,channel,descriptor,NULL);
+}
+
+/** Remove MRCPv2 control channel */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_channel_remove(mrcp_control_channel_t *channel)
+{
+	return mrcp_server_control_message_signal(CONNECTION_TASK_MSG_REMOVE_CHANNEL,channel->agent,channel,NULL,NULL);
+}
+
+/** Send MRCPv2 message */
+MRCP_DECLARE(apt_bool_t) mrcp_server_control_message_send(mrcp_control_channel_t *channel, mrcp_message_t *message)
+{
+	return mrcp_server_control_message_signal(CONNECTION_TASK_MSG_SEND_MESSAGE,channel->agent,channel,NULL,message);
+}
+
+
+static apt_bool_t mrcp_server_agent_listen_socket_create(mrcp_connection_agent_t *agent)
+{
+	apr_status_t status;
+	if(!agent->sockaddr) {
+		return FALSE;
+	}
+
+	/* create listening socket */
+	status = apr_socket_create(&agent->listen_sock, agent->sockaddr->family, SOCK_STREAM, APR_PROTO_TCP, agent->pool);
+	if(status != APR_SUCCESS) {
+		return FALSE;
+	}
+
+	apr_socket_opt_set(agent->listen_sock, APR_SO_NONBLOCK, 0);
+	apr_socket_timeout_set(agent->listen_sock, -1);
+	apr_socket_opt_set(agent->listen_sock, APR_SO_REUSEADDR, 1);
+
+	status = apr_socket_bind(agent->listen_sock, agent->sockaddr);
+	if(status != APR_SUCCESS) {
+		apr_socket_close(agent->listen_sock);
+		agent->listen_sock = NULL;
+		return FALSE;
+	}
+	status = apr_socket_listen(agent->listen_sock, SOMAXCONN);
+	if(status != APR_SUCCESS) {
+		apr_socket_close(agent->listen_sock);
+		agent->listen_sock = NULL;
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void mrcp_server_agent_listen_socket_destroy(mrcp_connection_agent_t *agent)
+{
+	if(agent->listen_sock) {
+		apr_socket_close(agent->listen_sock);
+		agent->listen_sock = NULL;
+	}
+}
+
+static apt_bool_t mrcp_server_agent_pollset_create(mrcp_connection_agent_t *agent)
+{
+	/* create pollset */
+	agent->pollset = apt_pollset_create((apr_uint32_t)agent->max_connection_count + 1, agent->pool);
+	if(!agent->pollset) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Pollset");
+		return FALSE;
+	}
+
+	if(mrcp_server_agent_listen_socket_create(agent) == TRUE) {
+		/* add listen socket to pollset */
+		memset(&agent->listen_sock_pfd,0,sizeof(apr_pollfd_t));
+		agent->listen_sock_pfd.desc_type = APR_POLL_SOCKET;
+		agent->listen_sock_pfd.reqevents = APR_POLLIN;
+		agent->listen_sock_pfd.desc.s = agent->listen_sock;
+		agent->listen_sock_pfd.client_data = agent->listen_sock;
+		if(apt_pollset_add(agent->pollset, &agent->listen_sock_pfd) != TRUE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Add Listen Socket to Pollset");
+			mrcp_server_agent_listen_socket_destroy(agent);
+		}
+	}
+	else {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Listen Socket");
+	}
+
+	return TRUE;
+}
+
+static void mrcp_server_agent_pollset_destroy(mrcp_connection_agent_t *agent)
+{
+	mrcp_server_agent_listen_socket_destroy(agent);
+	if(agent->pollset) {
+		apt_pollset_destroy(agent->pollset);
+		agent->pollset = NULL;
+	}
+}
+
+
+static mrcp_control_channel_t* mrcp_connection_channel_associate(mrcp_connection_agent_t *agent, mrcp_connection_t *connection, const mrcp_message_t *message)
+{
+	apt_str_t identifier;
+	mrcp_control_channel_t *channel;
+	if(!connection || !message) {
+		return NULL;
+	}
+	apt_id_resource_generate(&message->channel_id.session_id,&message->channel_id.resource_name,'@',&identifier,connection->pool);
+	channel = mrcp_connection_channel_find(connection,&identifier);
+	if(!channel) {
+		channel = mrcp_connection_channel_find(agent->null_connection,&identifier);
+		if(channel) {
+			mrcp_connection_channel_remove(agent->null_connection,channel);
+			mrcp_connection_channel_add(connection,channel);
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Move Control Channel <%s> to Connection %s [%d]",
+				channel->identifier.buf,
+				connection->id,
+				apr_hash_count(connection->channel_table));
+		}
+	}
+	return channel;
+}
+
+static mrcp_connection_t* mrcp_connection_find(mrcp_connection_agent_t *agent, const apt_str_t *remote_ip)
+{
+	mrcp_connection_t *connection = NULL;
+	apt_list_elem_t *elem;
+	if(!agent || !agent->connection_list || !remote_ip) {
+		return NULL;
+	}
+
+	elem = apt_list_first_elem_get(agent->connection_list);
+	/* walk through the list of connections */
+	while(elem) {
+		connection = apt_list_elem_object_get(elem);
+		if(connection) {
+			if(apt_string_compare(&connection->remote_ip,remote_ip) == TRUE) {
+				return connection;
+			}
+		}
+		elem = apt_list_next_elem_get(agent->connection_list,elem);
+	}
+	return NULL;
+}
+
+static apt_bool_t mrcp_connection_remove(mrcp_connection_agent_t *agent, mrcp_connection_t *connection)
+{
+	if(connection->it) {
+		apt_list_elem_remove(agent->connection_list,connection->it);
+		connection->it = NULL;
+	}
+	if(agent->null_connection) {
+		if(apt_list_is_empty(agent->connection_list) == TRUE && apr_hash_count(agent->null_connection->channel_table) == 0) {
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Destroy Pending Connection");
+			mrcp_connection_destroy(agent->null_connection);
+			agent->null_connection = NULL;
+			agent->connection_list = NULL;
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_agent_connection_accept(mrcp_connection_agent_t *agent)
+{
+	char *local_ip = NULL;
+	char *remote_ip = NULL;
+	apr_socket_t *sock;
+	apr_pool_t *pool;
+	mrcp_connection_t *connection;
+
+	if(!agent->null_connection) {
+		pool = apt_pool_create();
+		if(apr_socket_accept(&sock,agent->listen_sock,pool) != APR_SUCCESS) {
+			return FALSE;
+		}
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Rejected TCP/MRCPv2 Connection");
+		apr_socket_close(sock);
+		apr_pool_destroy(pool);
+		return FALSE;
+	}
+
+	pool = agent->null_connection->pool;
+	if(apr_socket_accept(&sock,agent->listen_sock,pool) != APR_SUCCESS) {
+		return FALSE;
+	}
+
+	connection = mrcp_connection_create();
+	connection->sock = sock;
+
+	if(apr_socket_addr_get(&connection->r_sockaddr,APR_REMOTE,sock) != APR_SUCCESS ||
+		apr_socket_addr_get(&connection->l_sockaddr,APR_LOCAL,sock) != APR_SUCCESS) {
+		apr_socket_close(sock);
+		mrcp_connection_destroy(connection);
+		return FALSE;
+	}
+
+	apr_sockaddr_ip_get(&local_ip,connection->l_sockaddr);
+	apr_sockaddr_ip_get(&remote_ip,connection->r_sockaddr);
+	apt_string_set(&connection->remote_ip,remote_ip);
+	connection->id = apr_psprintf(connection->pool,"%s:%hu <-> %s:%hu",
+		local_ip,connection->l_sockaddr->port,
+		remote_ip,connection->r_sockaddr->port);
+
+	memset(&connection->sock_pfd,0,sizeof(apr_pollfd_t));
+	connection->sock_pfd.desc_type = APR_POLL_SOCKET;
+	connection->sock_pfd.reqevents = APR_POLLIN;
+	connection->sock_pfd.desc.s = connection->sock;
+	connection->sock_pfd.client_data = connection;
+	if(apt_pollset_add(agent->pollset, &connection->sock_pfd) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Add to Pollset");
+		apr_socket_close(sock);
+		mrcp_connection_destroy(connection);
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Accepted TCP/MRCPv2 Connection %s",connection->id);
+	connection->agent = agent;
+	connection->it = apt_list_push_back(agent->connection_list,connection,connection->pool);
+	connection->parser = mrcp_parser_create(agent->resource_factory,connection->pool);
+	connection->generator = mrcp_generator_create(agent->resource_factory,connection->pool);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_agent_connection_close(mrcp_connection_agent_t *agent, mrcp_connection_t *connection)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"TCP/MRCPv2 Peer Disconnected %s",connection->id);
+	apt_pollset_remove(agent->pollset,&connection->sock_pfd);
+	apr_socket_close(connection->sock);
+	connection->sock = NULL;
+	if(!connection->access_count) {
+		mrcp_connection_remove(agent,connection);
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy TCP/MRCPv2 Connection %s",connection->id);
+		mrcp_connection_destroy(connection);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_agent_channel_add(mrcp_connection_agent_t *agent, mrcp_control_channel_t *channel, mrcp_control_descriptor_t *offer)
+{
+	mrcp_control_descriptor_t *answer = mrcp_control_answer_create(offer,channel->pool);
+	apt_id_resource_generate(&offer->session_id,&offer->resource_name,'@',&channel->identifier,channel->pool);
+	if(offer->port) {
+		answer->port = agent->sockaddr->port;
+	}
+	if(offer->connection_type == MRCP_CONNECTION_TYPE_EXISTING) {
+		if(agent->force_new_connection == TRUE) {
+			/* force client to establish new connection */
+			answer->connection_type = MRCP_CONNECTION_TYPE_NEW;
+		}
+		else {
+			mrcp_connection_t *connection = NULL;
+			/* try to find any existing connection */
+			connection = mrcp_connection_find(agent,&offer->ip);
+			if(!connection) {
+				/* no existing conection found, force the new one */
+				answer->connection_type = MRCP_CONNECTION_TYPE_NEW;
+			}
+		}
+	}
+
+	if(!agent->null_connection) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Create Pending Connection");
+		agent->null_connection = mrcp_connection_create();
+		agent->connection_list = apt_list_create(agent->null_connection->pool);
+	}
+	mrcp_connection_channel_add(agent->null_connection,channel);	
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add Control Channel <%s> to Pending Connection [%d]",
+			channel->identifier.buf,
+			apr_hash_count(agent->null_connection->channel_table));
+	/* send response */
+	return mrcp_control_channel_add_respond(agent->vtable,channel,answer,TRUE);
+}
+
+static apt_bool_t mrcp_server_agent_channel_modify(mrcp_connection_agent_t *agent, mrcp_control_channel_t *channel, mrcp_control_descriptor_t *offer)
+{
+	mrcp_control_descriptor_t *answer = mrcp_control_answer_create(offer,channel->pool);
+	if(offer->port) {
+		answer->port = agent->sockaddr->port;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Modify Control Channel <%s>",channel->identifier.buf);
+	/* send response */
+	return mrcp_control_channel_modify_respond(agent->vtable,channel,answer,TRUE);
+}
+
+static apt_bool_t mrcp_server_agent_channel_remove(mrcp_connection_agent_t *agent, mrcp_control_channel_t *channel)
+{
+	mrcp_connection_t *connection = channel->connection;
+	mrcp_connection_channel_remove(connection,channel);
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remove Control Channel <%s> [%d]",
+			channel->identifier.buf,
+			apr_hash_count(connection->channel_table));
+	if(!connection->access_count) {
+		if(connection == agent->null_connection) {
+			if(apt_list_is_empty(agent->connection_list) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Destroy Pending Connection");
+				mrcp_connection_destroy(agent->null_connection);
+				agent->null_connection = NULL;
+				agent->connection_list = NULL;
+			}
+		}
+		else if(!connection->sock) {
+			mrcp_connection_remove(agent,connection);
+			/* set connection to be destroyed on channel destroy */
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Mark Connection for Late Destroy");
+			channel->connection = connection;
+			channel->removed = TRUE;
+		}
+	}
+	/* send response */
+	return mrcp_control_channel_remove_respond(agent->vtable,channel,TRUE);
+}
+
+static apt_bool_t mrcp_server_agent_messsage_send(mrcp_connection_agent_t *agent, mrcp_connection_t *connection, mrcp_message_t *message)
+{
+	apt_bool_t status = FALSE;
+	apt_text_stream_t *stream;
+	mrcp_stream_result_e result;
+	if(!connection || !connection->sock) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No MRCPv2 Connection");
+		return FALSE;
+	}
+	stream = &connection->tx_stream;
+
+	mrcp_generator_message_set(connection->generator,message);
+	do {
+		apt_text_stream_init(&connection->tx_stream,connection->tx_buffer,sizeof(connection->tx_buffer)-1);
+		result = mrcp_generator_run(connection->generator,stream);
+		if(result == MRCP_STREAM_MESSAGE_COMPLETE || result == MRCP_STREAM_MESSAGE_TRUNCATED) {
+			stream->text.length = stream->pos - stream->text.buf;
+			*stream->pos = '\0';
+
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send MRCPv2 Stream %s [%lu bytes]\n%s",
+				connection->id,
+				stream->text.length,
+				stream->text.buf);
+			if(apr_socket_send(connection->sock,stream->text.buf,&stream->text.length) == APR_SUCCESS) {
+				status = TRUE;
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Send MRCPv2 Stream");
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Generate MRCPv2 Stream");
+		}
+	}
+	while(result == MRCP_STREAM_MESSAGE_TRUNCATED);
+
+	return status;
+}
+
+static apt_bool_t mrcp_server_message_handler(void *obj, mrcp_message_t *message, mrcp_stream_result_e result)
+{
+	mrcp_connection_t *connection = obj;
+	mrcp_connection_agent_t *agent = connection->agent;
+	if(result == MRCP_STREAM_MESSAGE_COMPLETE) {
+		/* message is completely parsed */
+		mrcp_control_channel_t *channel = mrcp_connection_channel_associate(agent,connection,message);
+		if(channel) {
+			mrcp_connection_message_receive(agent->vtable,channel,message);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Find Channel <%s@%s> in Connection %s",
+				message->channel_id.session_id.buf,
+				message->channel_id.resource_name.buf,
+				connection->id);
+		}
+	}
+	else if(result == MRCP_STREAM_MESSAGE_INVALID) {
+		/* error case */
+		mrcp_message_t *response;
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse MRCPv2 Stream");
+		response = mrcp_response_create(message,message->pool);
+		response->start_line.status_code = MRCP_STATUS_CODE_UNRECOGNIZED_MESSAGE;
+		if(mrcp_server_agent_messsage_send(agent,connection,response) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Send MRCPv2 Response");
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_agent_messsage_receive(mrcp_connection_agent_t *agent, mrcp_connection_t *connection)
+{
+	apr_status_t status;
+	apr_size_t offset;
+	apr_size_t length;
+	apt_text_stream_t *stream;
+
+	if(!connection || !connection->sock) {
+		return FALSE;
+	}
+	stream = &connection->rx_stream;
+	
+	/* init length of the stream */
+	stream->text.length = sizeof(connection->rx_buffer)-1;
+	/* calculate offset remaining from the previous receive / if any */
+	offset = stream->pos - stream->text.buf;
+	/* calculate available length */
+	length = stream->text.length - offset;
+	status = apr_socket_recv(connection->sock,stream->pos,&length);
+	if(status == APR_EOF || length == 0) {
+		return mrcp_server_agent_connection_close(agent,connection);
+	}
+	/* calculate actual length of the stream */
+	stream->text.length = offset + length;
+	stream->pos[length] = '\0';
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive MRCPv2 Stream %s [%lu bytes]\n%s",
+		connection->id,
+		length,
+		stream->pos);
+
+	/* reset pos */
+	stream->pos = stream->text.buf;
+	/* walk through the stream parsing RTSP messages */
+	return mrcp_stream_walk(connection->parser,stream,mrcp_server_message_handler,connection);
+}
+
+static apt_bool_t mrcp_server_agent_control_process(mrcp_connection_agent_t *agent)
+{
+	apt_bool_t status = TRUE;
+	apt_bool_t running = TRUE;
+	connection_task_msg_t *msg;
+
+	do {
+		apr_thread_mutex_lock(agent->guard);
+		msg = apt_cyclic_queue_pop(agent->msg_queue);
+		apr_thread_mutex_unlock(agent->guard);
+		if(msg) {
+			switch(msg->type) {
+				case CONNECTION_TASK_MSG_ADD_CHANNEL:
+					mrcp_server_agent_channel_add(agent,msg->channel,msg->descriptor);
+					break;
+				case CONNECTION_TASK_MSG_MODIFY_CHANNEL:
+					mrcp_server_agent_channel_modify(agent,msg->channel,msg->descriptor);
+					break;
+				case CONNECTION_TASK_MSG_REMOVE_CHANNEL:
+					mrcp_server_agent_channel_remove(agent,msg->channel);
+					break;
+				case CONNECTION_TASK_MSG_SEND_MESSAGE:
+					mrcp_server_agent_messsage_send(agent,msg->channel->connection,msg->message);
+					break;
+				case CONNECTION_TASK_MSG_TERMINATE:
+					status = FALSE;
+					break;
+			}
+		}
+		else {
+			running = FALSE;
+		}
+	}
+	while(running == TRUE);
+	return status;
+}
+
+static apt_bool_t mrcp_server_agent_task_run(apt_task_t *task)
+{
+	mrcp_connection_agent_t *agent = apt_task_object_get(task);
+	apt_bool_t running = TRUE;
+	apr_status_t status;
+	apr_int32_t num;
+	const apr_pollfd_t *ret_pfd;
+	int i;
+
+	if(!agent) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start MRCPv2 Agent");
+		return FALSE;
+	}
+
+	if(mrcp_server_agent_pollset_create(agent) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Pollset");
+		return FALSE;
+	}
+
+	while(running) {
+		status = apt_pollset_poll(agent->pollset, -1, &num, &ret_pfd);
+		if(status != APR_SUCCESS) {
+			continue;
+		}
+		for(i = 0; i < num; i++) {
+			if(ret_pfd[i].desc.s == agent->listen_sock) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Accept MRCPv2 Connection");
+				mrcp_server_agent_connection_accept(agent);
+				continue;
+			}
+			if(apt_pollset_is_wakeup(agent->pollset,&ret_pfd[i])) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process Control Message");
+				if(mrcp_server_agent_control_process(agent) == FALSE) {
+					running = FALSE;
+					break;
+				}
+				continue;
+			}
+	
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process MRCPv2 Message");
+			mrcp_server_agent_messsage_receive(agent,ret_pfd[i].client_data);
+		}
+	}
+
+	mrcp_server_agent_pollset_destroy(agent);
+
+	apt_task_child_terminate(agent->task);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_server_agent_task_terminate(apt_task_t *task)
+{
+	apt_bool_t status = FALSE;
+	mrcp_connection_agent_t *agent = apt_task_object_get(task);
+	if(agent->pollset) {
+		connection_task_msg_t *msg = apr_pcalloc(agent->pool,sizeof(connection_task_msg_t));
+		msg->type = CONNECTION_TASK_MSG_TERMINATE;
+
+		apr_thread_mutex_lock(agent->guard);
+		status = apt_cyclic_queue_push(agent->msg_queue,msg);
+		apr_thread_mutex_unlock(agent->guard);
+		if(apt_pollset_wakeup(agent->pollset) == TRUE) {
+			status = TRUE;
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Signal Control Message");
+		}
+	}
+	return status;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES 	 = Makefile.in
+
+INCLUDES                 = -I$(top_srcdir)/libs/uni-rtsp/include \
+                           -I$(top_srcdir)/libs/apr-toolkit/include \
+                           $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_LTLIBRARIES       = libunirtsp.la
+
+include_HEADERS          = include/rtsp.h \
+                           include/rtsp_header.h \
+                           include/rtsp_start_line.h \
+                           include/rtsp_message.h \
+                           include/rtsp_stream.h \
+                           include/rtsp_server.h \
+                           include/rtsp_client.h
+
+libunirtsp_la_SOURCES    = src/rtsp_header.c \
+                           src/rtsp_start_line.c \
+                           src/rtsp_message.c \
+                           src/rtsp_stream.c \
+                           src/rtsp_server.c \
+                           src/rtsp_client.c

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __RTSP_H__
+#define __RTSP_H__
+
+/**
+ * @file rtsp.h
+ * @brief RTSP Core Definitions
+ */ 
+
+#include 
+#include 
+
+/** Library export/import defines */
+#ifdef WIN32
+#ifdef RTSP_STATIC_LIB
+#define RTSP_DECLARE(type)   type __stdcall
+#else
+#ifdef RTSP_LIB_EXPORT
+#define RTSP_DECLARE(type)   __declspec(dllexport) type __stdcall
+#else
+#define RTSP_DECLARE(type)   __declspec(dllimport) type __stdcall
+#endif
+#endif
+#else
+#define RTSP_DECLARE(type) type
+#endif
+
+#endif /*__RTSP_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_client.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_client.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __RTSP_CLIENT_H__
+#define __RTSP_CLIENT_H__
+
+/**
+ * @file rtsp_client.h
+ * @brief RTSP Client
+ */ 
+
+#include "apt_task.h"
+#include "rtsp_message.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque RTSP client declaration */
+typedef struct rtsp_client_t rtsp_client_t;
+/** Opaque RTSP client session declaration */
+typedef struct rtsp_client_session_t rtsp_client_session_t;
+
+/** RTSP client vtable declaration */
+typedef struct rtsp_client_vtable_t rtsp_client_vtable_t;
+
+/** RTSP client vtable */
+struct rtsp_client_vtable_t {
+	/** Sesssion termination response handler */
+	apt_bool_t (*on_session_terminate_response)(rtsp_client_t *client, rtsp_client_session_t *session);
+	/** Sesssion termination event handler */
+	apt_bool_t (*on_session_terminate_event)(rtsp_client_t *client, rtsp_client_session_t *session);
+	/** Sesssion setup response handler */
+	apt_bool_t (*on_session_response)(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *request, rtsp_message_t *response);
+	/** Sesssion event handler */
+	apt_bool_t (*on_session_event)(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *message);
+};
+
+/**
+ * Create RTSP client.
+ * @param max_connection_count the number of max RTSP connections
+ * @param obj the external object to send event to
+ * @param handler the response/event handler
+ * @param pool the pool to allocate memory from
+ */
+RTSP_DECLARE(rtsp_client_t*) rtsp_client_create(
+								apr_size_t max_connection_count,
+								void *obj,
+								const rtsp_client_vtable_t *handler,
+								apr_pool_t *pool);
+
+/**
+ * Destroy RTSP client.
+ * @param client the client to destroy
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_client_destroy(rtsp_client_t *client);
+
+/**
+ * Start client and wait for incoming requests.
+ * @param client the client to start
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_client_start(rtsp_client_t *client);
+
+/**
+ * Terminate client.
+ * @param client the client to terminate
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_client_terminate(rtsp_client_t *client);
+
+/**
+ * Get task.
+ * @param client the client to get task from
+ */
+RTSP_DECLARE(apt_task_t*) rtsp_client_task_get(rtsp_client_t *client);
+
+/**
+ * Get external object.
+ * @param client the client to get object from
+ */
+RTSP_DECLARE(void*) rtsp_client_object_get(rtsp_client_t *client);
+
+
+/**
+ * Create RTSP session.
+ * @param client the client to create session for
+ * @param server_ip the IP address of RTSP server
+ * @param server_port the port of RTSP server
+ * @param resource_location the location of RTSP resource (path in RTSP URI)
+ */
+RTSP_DECLARE(rtsp_client_session_t*) rtsp_client_session_create(
+											rtsp_client_t *client, 
+											const char *server_ip, 
+											apr_port_t server_port,
+											const char *resource_location);
+
+/**
+ * Destroy RTSP session.
+ * @param session the session to destroy
+ */
+RTSP_DECLARE(void) rtsp_client_session_destroy(rtsp_client_session_t *session);
+
+/**
+ * Terminate RTSP session.
+ * @param client the client to use
+ * @param session the session to terminate
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_client_session_terminate(rtsp_client_t *client, rtsp_client_session_t *session);
+
+/**
+ * Send RTSP message.
+ * @param client the client to use
+ * @param session the session to send RTSP request for
+ * @param message the RTSP request to send
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_client_session_request(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *message);
+
+/**
+ * Get object associated with the session.
+ * @param session the session to get object from
+ */
+RTSP_DECLARE(void*) rtsp_client_session_object_get(const rtsp_client_session_t *session);
+
+/**
+ * Set object associated with the session.
+ * @param session the session to set object for
+ * @param obj the object to set
+ */
+RTSP_DECLARE(void) rtsp_client_session_object_set(rtsp_client_session_t *session, void *obj);
+
+/**
+ * Get the session identifier.
+ * @param session the session to get identifier from
+ */
+RTSP_DECLARE(const apt_str_t*) rtsp_client_session_id_get(const rtsp_client_session_t *session);
+
+APT_END_EXTERN_C
+
+#endif /*__RTSP_CLIENT_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_header.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_header.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __RTSP_HEADER_H__
+#define __RTSP_HEADER_H__
+
+/**
+ * @file rtsp_header.h
+ * @brief RTSP Header
+ */ 
+
+#include "rtsp.h"
+#include "apt_text_stream.h"
+
+APT_BEGIN_EXTERN_C
+
+/** RTSP transport protocol */
+typedef enum{
+	RTSP_TRANSPORT_RTP,
+
+	RTSP_TRANSPORT_COUNT,
+	RTSP_TRANSPORT_NONE = RTSP_TRANSPORT_COUNT
+} rtsp_transport_e;
+
+/** RTSP transport profile */
+typedef enum{
+	RTSP_PROFILE_AVP,
+	RTSP_PROFILE_SAVP,
+
+	RTSP_PROFILE_COUNT,
+	RTSP_PROFILE_NONE = RTSP_PROFILE_COUNT
+} rtsp_profile_e;
+
+/** RTSP lower-transport */
+typedef enum{
+	RTSP_LOWER_TRANSPORT_UDP,
+	RTSP_LOWER_TRANSPORT_TCP,
+
+	RTSP_LOWER_TRANSPORT_COUNT,
+	RTSP_LOWER_TRANSPORT_NONE = RTSP_LOWER_TRANSPORT_COUNT
+} rtsp_lower_transport_e;
+
+/** RTSP transport attributes */
+typedef enum{
+	RTSP_TRANSPORT_ATTRIB_CLIENT_PORT,
+	RTSP_TRANSPORT_ATTRIB_SERVER_PORT,
+	RTSP_TRANSPORT_ATTRIB_SOURCE,
+	RTSP_TRANSPORT_ATTRIB_DESTINATION,
+	RTSP_TRANSPORT_ATTRIB_UNICAST,
+	RTSP_TRANSPORT_ATTRIB_MULTICAST,
+
+	RTSP_TRANSPORT_ATTRIB_COUNT,
+	RTSP_TRANSPORT_ATTRIB_NONE = RTSP_TRANSPORT_ATTRIB_COUNT
+} rtsp_transport_attrib_e;
+
+/** RTSP delivery */
+typedef enum{
+	RTSP_DELIVERY_UNICAST,
+	RTSP_DELIVERY_MULTICAST,
+
+	RTSP_DELIVERY_COUNT,
+	RTSP_DELIVERY_NONE = RTSP_DELIVERY_COUNT
+} rtsp_delivery_e;
+
+/** RTSP header fields */
+typedef enum{
+	RTSP_HEADER_FIELD_CSEQ,
+	RTSP_HEADER_FIELD_TRANSPORT,
+	RTSP_HEADER_FIELD_SESSION_ID,
+	RTSP_HEADER_FIELD_RTP_INFO,
+	RTSP_HEADER_FIELD_CONTENT_TYPE,
+	RTSP_HEADER_FIELD_CONTENT_LENGTH,
+
+	RTSP_HEADER_FIELD_COUNT,
+	RTSP_HEADER_FIELD_UNKNOWN = RTSP_HEADER_FIELD_COUNT
+} rtsp_header_field_id;
+
+/** RTSP content types */
+typedef enum {
+	RTSP_CONTENT_TYPE_SDP,
+	RTSP_CONTENT_TYPE_MRCP,
+
+	RTSP_CONTENT_TYPE_COUNT,
+	RTSP_CONTENT_TYPE_NONE = RTSP_CONTENT_TYPE_COUNT
+} rtsp_content_type_e;
+
+
+/** Bit field masks are used to define property set */
+typedef int rtsp_header_property_t;
+
+
+/** RTSP/RTP port range declaration */
+typedef struct rtsp_port_range_t rtsp_port_range_t;
+/** RTSP transport declaration */
+typedef struct rtsp_transport_t rtsp_transport_t;
+/** RTSP header declaration */
+typedef struct rtsp_header_t rtsp_header_t;
+
+/** RTSP/RTP port range */
+struct rtsp_port_range_t {
+	/** Min (low) port */
+	apr_port_t min;
+	/** Max (high) port */
+	apr_port_t max;
+};
+
+/** RTSP transport */
+struct rtsp_transport_t {
+	/** Transport profile */
+	rtsp_transport_e         protocol;
+	/** Transport profile */
+	rtsp_profile_e           profile;
+	/** Lower transport */
+	rtsp_lower_transport_e   lower_protocol;
+	/** Delivery method */
+	rtsp_delivery_e          delivery;
+	/** Client port range */
+	rtsp_port_range_t        client_port_range;
+	/** Server port range */
+	rtsp_port_range_t        server_port_range;
+	/** Source IP address */
+	apt_str_t                source;
+	/** Destination IP address */
+	apt_str_t                destination;
+};
+
+/** RTSP header */
+struct rtsp_header_t {
+	/** Sequence number */
+	apr_size_t             cseq;
+	/** Transport */
+	rtsp_transport_t       transport; 
+	/** Session identifier */
+	apt_str_t              session_id;
+	/** RTP-info */
+	apt_str_t              rtp_info;
+
+	/** Content type */
+	rtsp_content_type_e    content_type;
+	/** Content length */
+	apr_size_t             content_length;
+
+	/** Property set */
+	rtsp_header_property_t property_set;
+};
+
+
+/** Initialize port range */
+static APR_INLINE void rtsp_port_range_init(rtsp_port_range_t *port_range)
+{
+	port_range->min = 0;
+	port_range->max = 0;
+}
+
+/** Initialize port range */
+static APR_INLINE apt_bool_t rtsp_port_range_is_valid(const rtsp_port_range_t *port_range)
+{
+	return (port_range->min == 0 && port_range->max == 0) == FALSE;
+}
+
+/** Initialize transport */
+static APR_INLINE void rtsp_transport_init(rtsp_transport_t *transport)
+{
+	transport->protocol = RTSP_TRANSPORT_RTP;
+	transport->profile = RTSP_PROFILE_NONE;
+	transport->lower_protocol = RTSP_LOWER_TRANSPORT_NONE;
+	rtsp_port_range_init(&transport->client_port_range);
+	rtsp_port_range_init(&transport->server_port_range);
+	apt_string_reset(&transport->source);
+	apt_string_reset(&transport->destination);
+}
+
+/** Initialize header */
+static APR_INLINE void rtsp_header_init(rtsp_header_t *header)
+{
+	header->cseq = 0;
+	rtsp_transport_init(&header->transport);
+	apt_string_reset(&header->session_id);
+	apt_string_reset(&header->rtp_info);
+	header->content_type = RTSP_CONTENT_TYPE_NONE;
+	header->content_length = 0;
+	header->property_set = 0;
+}
+
+/** Parse RTSP message */
+RTSP_DECLARE(apt_bool_t) rtsp_header_parse(rtsp_header_t *header, apt_text_stream_t *text_stream, apr_pool_t *pool);
+/** Generate RTSP message */
+RTSP_DECLARE(apt_bool_t) rtsp_header_generate(rtsp_header_t *header, apt_text_stream_t *text_stream);
+
+
+
+/** Add property to property set */
+static APR_INLINE void rtsp_header_property_add(rtsp_header_property_t *property_set, apr_size_t id)
+{
+	int mask = 1 << id;
+	*property_set |= mask;
+}
+
+/** Remove property from property set */
+static APR_INLINE void rtsp_header_property_remove(rtsp_header_property_t *property_set, apr_size_t id)
+{
+	int mask = 1 << id;
+	*property_set &= ~mask;
+}
+
+/** Check property in property set */
+static APR_INLINE apt_bool_t rtsp_header_property_check(const rtsp_header_property_t *property_set, apr_size_t id)
+{
+	int mask = 1 << id;
+	return ((*property_set & mask) == mask) ? TRUE : FALSE;
+}
+
+APT_END_EXTERN_C
+
+#endif /*__RTSP_HEADER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_message.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_message.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __RTSP_MESSAGE_H__
+#define __RTSP_MESSAGE_H__
+
+/**
+ * @file rtsp_message.h
+ * @brief RTSP Message Definition
+ */ 
+
+#include "rtsp_start_line.h"
+#include "rtsp_header.h"
+
+APT_BEGIN_EXTERN_C
+
+/** RTSP message declaration */
+typedef struct rtsp_message_t rtsp_message_t;
+
+/** RTSP message */
+struct rtsp_message_t {
+	/** RTSP mesage type (request/response) */
+	rtsp_start_line_t start_line;     
+	/** RTSP header */
+	rtsp_header_t     header;
+	/** RTSP message body */
+	apt_str_t         body;
+
+	/** Pool to allocate memory from */
+	apr_pool_t       *pool;
+};
+
+/** 
+ * Create RTSP message.
+ * @param message_type the message type
+ * @param pool the pool to allocate memory from
+ */
+RTSP_DECLARE(rtsp_message_t*) rtsp_message_create(rtsp_message_type_e message_type, apr_pool_t *pool);
+
+/** 
+ * Create RTSP request message.
+ * @param pool the pool to allocate memory from
+ */
+RTSP_DECLARE(rtsp_message_t*) rtsp_request_create(apr_pool_t *pool);
+
+/** 
+ * Create RTSP response message.
+ * @param request the request to create response to
+ * @param status_code the status code of the response
+ * @param reason the reason phrase id of the response
+ * @param pool the pool to allocate memory from
+ */
+RTSP_DECLARE(rtsp_message_t*) rtsp_response_create(const rtsp_message_t *request, rtsp_status_code_e status_code, rtsp_reason_phrase_e reason, apr_pool_t *pool);
+
+/** 
+ * Destroy RTSP message 
+ * @param message the message to destroy
+ */
+RTSP_DECLARE(void) rtsp_message_destroy(rtsp_message_t *message);
+
+APT_END_EXTERN_C
+
+#endif /*__RTSP_MESSAGE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_server.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_server.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __RTSP_SERVER_H__
+#define __RTSP_SERVER_H__
+
+/**
+ * @file rtsp_server.h
+ * @brief RTSP Server
+ */ 
+
+#include "apt_task.h"
+#include "rtsp_message.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque RTSP server declaration */
+typedef struct rtsp_server_t rtsp_server_t;
+/** Opaque RTSP server session declaration */
+typedef struct rtsp_server_session_t rtsp_server_session_t;
+
+/** RTSP server vtable declaration */
+typedef struct rtsp_server_vtable_t rtsp_server_vtable_t;
+
+/** RTSP server vtable declaration */
+struct rtsp_server_vtable_t {
+	/** Virtual create session */
+	apt_bool_t (*create_session)(rtsp_server_t *server, rtsp_server_session_t *session);
+	/** Virtual terminate session */
+	apt_bool_t (*terminate_session)(rtsp_server_t *server, rtsp_server_session_t *session);
+	/** Virtual message handler */
+	apt_bool_t (*handle_message)(rtsp_server_t *server, rtsp_server_session_t *session, rtsp_message_t *message);
+};
+
+/**
+ * Create RTSP server.
+ * @param listen_ip the listen IP address
+ * @param listen_port the listen port
+ * @param max_connection_count the number of max RTSP connections
+ * @param obj the external object to send events to
+ * @param handler the request handler
+ * @param pool the pool to allocate memory from
+ */
+RTSP_DECLARE(rtsp_server_t*) rtsp_server_create(
+								const char *listen_ip, 
+								apr_port_t listen_port, 
+								apr_size_t max_connection_count,
+								void *obj,
+								const rtsp_server_vtable_t *handler,
+								apr_pool_t *pool);
+
+/**
+ * Destroy RTSP server.
+ * @param server the server to destroy
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_server_destroy(rtsp_server_t *server);
+
+/**
+ * Start server and wait for incoming requests.
+ * @param server the server to start
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_server_start(rtsp_server_t *server);
+
+/**
+ * Terminate server.
+ * @param server the server to terminate
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_server_terminate(rtsp_server_t *server);
+
+/**
+ * Get task.
+ * @param server the server to get task from
+ */
+RTSP_DECLARE(apt_task_t*) rtsp_server_task_get(rtsp_server_t *server);
+
+/**
+ * Get external object.
+ * @param server the server to get object from
+ */
+RTSP_DECLARE(void*) rtsp_server_object_get(rtsp_server_t *server);
+
+/**
+ * Send RTSP message.
+ * @param server the server to use
+ * @param session the session to send RTSP response for
+ * @param message the RTSP response to send
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_server_session_respond(rtsp_server_t *server, rtsp_server_session_t *session, rtsp_message_t *message);
+
+/**
+ * Terminate RTSP session (respond to terminate request).
+ * @param server the server to use
+ * @param session the session to terminate
+ */
+RTSP_DECLARE(apt_bool_t) rtsp_server_session_terminate(rtsp_server_t *server, rtsp_server_session_t *session);
+
+/**
+ * Get object associated with the session.
+ * @param session the session to get object from
+ */
+RTSP_DECLARE(void*) rtsp_server_session_object_get(const rtsp_server_session_t *session);
+
+/**
+ * Set object associated with the session.
+ * @param session the session to set object for
+ * @param obj the object to set
+ */
+RTSP_DECLARE(void) rtsp_server_session_object_set(rtsp_server_session_t *session, void *obj);
+
+/**
+ * Get the session identifier.
+ * @param session the session to get identifier from
+ */
+RTSP_DECLARE(const apt_str_t*) rtsp_server_session_id_get(const rtsp_server_session_t *session);
+
+/**
+ * Get active (in-progress) session request.
+ * @param session the session to get from
+ */
+RTSP_DECLARE(const rtsp_message_t*) rtsp_server_session_request_get(const rtsp_server_session_t *session);
+
+/**
+ * Get the session destination (client) ip address.
+ * @param session the session to get ip address from
+ */
+RTSP_DECLARE(const char*) rtsp_server_session_destination_get(const rtsp_server_session_t *session);
+
+APT_END_EXTERN_C
+
+#endif /*__RTSP_SERVER_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_start_line.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_start_line.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __RTSP_START_LINE_H__
+#define __RTSP_START_LINE_H__
+
+/**
+ * @file rtsp_start_line.h
+ * @brief RTSP Start Line (request-line/status-line)
+ */ 
+
+#include "rtsp.h"
+#include "apt_text_stream.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Protocol version */
+typedef enum {
+	/** Unknown version */
+	RTSP_VERSION_UNKNOWN = 0, 
+	/** RTSP 1.0 */
+	RTSP_VERSION_1 = 1, 
+} rtsp_version_e;
+
+/** RTSP message types */
+typedef enum {
+	RTSP_MESSAGE_TYPE_UNKNOWN,
+	RTSP_MESSAGE_TYPE_REQUEST,
+	RTSP_MESSAGE_TYPE_RESPONSE
+} rtsp_message_type_e;
+
+/** RTSP methods */
+typedef enum{
+	RTSP_METHOD_SETUP,
+	RTSP_METHOD_ANNOUNCE,
+	RTSP_METHOD_TEARDOWN,
+	RTSP_METHOD_DESCRIBE,
+
+	RTSP_METHOD_COUNT,
+	RTSP_METHOD_UNKNOWN = RTSP_METHOD_COUNT
+} rtsp_method_id;
+
+/** Status codes */
+typedef enum {
+	RTSP_STATUS_CODE_UNKNOWN                   = 0,
+	/** Success codes (2xx) */
+	RTSP_STATUS_CODE_OK                        = 200,
+	RTSP_STATUS_CODE_CREATED                   = 201,
+	/** Failure codec (4xx) */
+	RTSP_STATUS_CODE_BAD_REQUEST               = 400,
+	RTSP_STATUS_CODE_UNAUTHORIZED              = 401,
+	RTSP_STATUS_CODE_NOT_FOUND                 = 404,
+	RTSP_STATUS_CODE_METHOD_NOT_ALLOWED        = 405,
+	RTSP_STATUS_CODE_NOT_ACCEPTABLE            = 406,
+	RTSP_STATUS_CODE_SESSION_NOT_FOUND         = 454,
+
+	RTSP_STATUS_CODE_INTERNAL_SERVER_ERROR     = 500,
+	RTSP_STATUS_CODE_NOT_IMPLEMENTED           = 501,
+} rtsp_status_code_e;
+
+/** Reason phrases */
+typedef enum {
+	RTSP_REASON_PHRASE_OK,
+	RTSP_REASON_PHRASE_CREATED,
+	RTSP_REASON_PHRASE_BAD_REQUEST,
+	RTSP_REASON_PHRASE_UNAUTHORIZED,
+	RTSP_REASON_PHRASE_NOT_FOUND,
+	RTSP_REASON_PHRASE_METHOD_NOT_ALLOWED,
+	RTSP_REASON_PHRASE_NOT_ACCEPTABLE,
+	RTSP_REASON_PHRASE_SESSION_NOT_FOUND,
+	RTSP_REASON_PHRASE_INTERNAL_SERVER_ERROR,
+	RTSP_REASON_PHRASE_NOT_IMPLEMENTED,
+	RTSP_REASON_PHRASE_COUNT,
+
+	/** Unknown reason phrase */
+	RTSP_REASON_PHRASE_UNKNOWN = RTSP_REASON_PHRASE_COUNT
+} rtsp_reason_phrase_e;
+
+
+/** RTSP request-line declaration */
+typedef struct rtsp_request_line_t rtsp_request_line_t;
+/** RTSP status-line declaration */
+typedef struct rtsp_status_line_t rtsp_status_line_t;
+/** RTSP start-line declaration */
+typedef struct rtsp_start_line_t rtsp_start_line_t;
+
+/** RTSP request-line */
+struct rtsp_request_line_t {
+	/** Method name */
+	apt_str_t      method_name;
+	/** Method id */
+	rtsp_method_id method_id;
+	/** RTSP URL */
+	apt_str_t      url;
+	/** Resource name parsed from RTSP URL */
+	const char    *resource_name;
+	/** Version of protocol in use */
+	rtsp_version_e version;
+};
+
+/** RTSP status-line */
+struct rtsp_status_line_t {
+	/** Version of protocol in use */
+	rtsp_version_e     version;
+	/** success or failure or other status of the request */
+	rtsp_status_code_e status_code;
+	/** Reason phrase */
+	apt_str_t          reason;
+};
+
+/** RTSP start-line */
+struct rtsp_start_line_t {
+	/** RTSP message type */
+	rtsp_message_type_e     message_type;
+	/** RTSP start-line */
+	union {
+		rtsp_request_line_t request_line;
+		rtsp_status_line_t  status_line;
+	} common;
+};
+
+
+static APR_INLINE void rtsp_request_line_init(rtsp_request_line_t *request_line)
+{
+	apt_string_reset(&request_line->method_name);
+	request_line->method_id = RTSP_METHOD_UNKNOWN;
+	apt_string_reset(&request_line->url);
+	request_line->resource_name = NULL;
+	request_line->version = RTSP_VERSION_1;
+}
+
+static APR_INLINE void rtsp_status_line_init(rtsp_status_line_t *status_line)
+{
+	status_line->version = RTSP_VERSION_1;
+	status_line->status_code = RTSP_STATUS_CODE_OK;
+	apt_string_reset(&status_line->reason);
+}
+
+/** Initialize RTSP start-line */
+static APR_INLINE void rtsp_start_line_init(rtsp_start_line_t *start_line, rtsp_message_type_e message_type)
+{
+	start_line->message_type = message_type;
+	if(message_type == RTSP_MESSAGE_TYPE_REQUEST) {
+		rtsp_request_line_init(&start_line->common.request_line);
+	}
+	else if(message_type == RTSP_MESSAGE_TYPE_RESPONSE) {
+		rtsp_status_line_init(&start_line->common.status_line);
+	}
+}
+
+/** Parse RTSP start-line */
+RTSP_DECLARE(apt_bool_t) rtsp_start_line_parse(rtsp_start_line_t *start_line, apt_text_stream_t *text_stream, apr_pool_t *pool);
+
+/** Generate RTSP start-line */
+RTSP_DECLARE(apt_bool_t) rtsp_start_line_generate(rtsp_start_line_t *start_line, apt_text_stream_t *text_stream);
+
+/** Get reason phrase by status code */
+RTSP_DECLARE(const apt_str_t*) rtsp_reason_phrase_get(rtsp_reason_phrase_e reason);
+
+APT_END_EXTERN_C
+
+#endif /*__RTSP_START_LINE_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_stream.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/include/rtsp_stream.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __RTSP_STREAM_H__
+#define __RTSP_STREAM_H__
+
+/**
+ * @file rtsp_stream.h
+ * @brief RTSP Stream Parser and Generator
+ */ 
+
+#include "rtsp_message.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Result of RTSP stream processing (parse/generate) */
+typedef enum {
+	RTSP_STREAM_MESSAGE_COMPLETE,
+	RTSP_STREAM_MESSAGE_TRUNCATED,
+	RTSP_STREAM_MESSAGE_INVALID
+} rtsp_stream_result_e;
+
+/** Opaque RTSP parser declaration */
+typedef struct rtsp_parser_t rtsp_parser_t;
+/** Opaque RTSP generator declaration */
+typedef struct rtsp_generator_t rtsp_generator_t;
+
+/** RTSP message handler */
+typedef apt_bool_t (*rtsp_message_handler_f)(void *obj, rtsp_message_t *message, rtsp_stream_result_e result);
+
+/** Create RTSP stream parser */
+RTSP_DECLARE(rtsp_parser_t*) rtsp_parser_create(apr_pool_t *pool);
+
+/** Parse RTSP stream */
+RTSP_DECLARE(rtsp_stream_result_e) rtsp_parser_run(rtsp_parser_t *parser, apt_text_stream_t *stream);
+
+/** Get parsed RTSP message */
+RTSP_DECLARE(rtsp_message_t*) rtsp_parser_message_get(const rtsp_parser_t *parser);
+
+
+/** Create RTSP stream generator */
+RTSP_DECLARE(rtsp_generator_t*) rtsp_generator_create(apr_pool_t *pool);
+
+/** Set RTSP message to generate */
+RTSP_DECLARE(apt_bool_t) rtsp_generator_message_set(rtsp_generator_t *generator, rtsp_message_t *message);
+
+/** Generate RTSP stream */
+RTSP_DECLARE(rtsp_stream_result_e) rtsp_generator_run(rtsp_generator_t *generator, apt_text_stream_t *stream);
+
+
+/** Walk through RTSP stream and call message handler for each parsed message */
+RTSP_DECLARE(apt_bool_t) rtsp_stream_walk(rtsp_parser_t *parser, apt_text_stream_t *stream, rtsp_message_handler_f handler, void *obj);
+
+APT_END_EXTERN_C
+
+#endif /*__RTSP_STREAM_H__*/

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_client.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_client.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,824 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "rtsp_client.h"
+#include "rtsp_stream.h"
+#include "apt_net_client_task.h"
+#include "apt_text_stream.h"
+#include "apt_pool.h"
+#include "apt_obj_list.h"
+#include "apt_log.h"
+
+#define RTSP_STREAM_BUFFER_SIZE 1024
+
+typedef struct rtsp_client_connection_t rtsp_client_connection_t;
+
+typedef enum {
+	TERMINATION_STATE_NONE,
+	TERMINATION_STATE_REQUESTED,
+	TERMINATION_STATE_INPROGRESS
+} termination_state_e;
+
+/** RTSP client */
+struct rtsp_client_t {
+	apr_pool_t                 *pool;
+	apt_net_client_task_t      *task;
+
+	apr_pool_t                 *sub_pool;
+	apt_obj_list_t             *connection_list;
+
+	void                       *obj;
+	const rtsp_client_vtable_t *vtable;
+};
+
+/** RTSP connection */
+struct rtsp_client_connection_t {
+	/** Connection base */
+	apt_net_client_connection_t *base;
+	/** RTSP client, connection belongs to */
+	rtsp_client_t               *client;
+	/** Element of the connection list in agent */
+	apt_list_elem_t             *it;
+
+	/** Handle table (rtsp_client_session_t*) */
+	apr_hash_t                  *handle_table;
+	/** Session table (rtsp_client_session_t*) */
+	apr_hash_t                  *session_table;
+	
+	/** Inprogress request/session queue (rtsp_client_session_t*) */
+	apt_obj_list_t              *inprogress_request_queue;
+
+	/** Last CSeq sent */
+	apr_size_t                   last_cseq;
+
+	char                         rx_buffer[RTSP_STREAM_BUFFER_SIZE];
+	apt_text_stream_t            rx_stream;
+	rtsp_parser_t               *parser;
+
+	char                         tx_buffer[RTSP_STREAM_BUFFER_SIZE];
+	apt_text_stream_t            tx_stream;
+	rtsp_generator_t            *generator;
+};
+
+/** RTSP session */
+struct rtsp_client_session_t {
+	apr_pool_t               *pool;
+	void                     *obj;
+	
+	/** Connection */
+	rtsp_client_connection_t *connection;
+	/** Session identifier */
+	apt_str_t                 id;
+
+	apt_str_t                 server_ip;
+	apr_port_t                server_port;
+	apt_str_t                 resource_location;
+
+	/** In-progress request */
+	rtsp_message_t           *active_request;
+	/** Pending request queue (rtsp_message_t*) */
+	apt_obj_list_t           *pending_request_queue;
+
+	/** Resource table */
+	apr_hash_t               *resource_table;
+
+	/** termination state (none -> requested -> terminating) */
+	termination_state_e       term_state;
+};
+
+typedef enum {
+	TASK_MSG_SEND_MESSAGE,
+	TASK_MSG_TERMINATE_SESSION
+} task_msg_data_type_e;
+
+typedef struct task_msg_data_t task_msg_data_t;
+
+struct task_msg_data_t {
+	task_msg_data_type_e   type;
+	rtsp_client_t         *client;
+	rtsp_client_session_t *session;
+	rtsp_message_t        *message;
+};
+
+static apt_bool_t rtsp_client_task_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+
+static apt_bool_t rtsp_client_message_receive(apt_net_client_task_t *task, apt_net_client_connection_t *connection);
+
+static const apt_net_client_vtable_t client_vtable = {
+	rtsp_client_message_receive
+};
+
+static apt_bool_t rtsp_client_message_send(rtsp_client_t *client, apt_net_client_connection_t *connection, rtsp_message_t *message);
+static apt_bool_t rtsp_client_session_message_process(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *message);
+static apt_bool_t rtsp_client_session_request_process(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *message);
+static apt_bool_t rtsp_client_session_response_process(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *request, rtsp_message_t *response);
+
+/** Create RTSP client */
+RTSP_DECLARE(rtsp_client_t*) rtsp_client_create(
+										apr_size_t max_connection_count,
+										void *obj,
+										const rtsp_client_vtable_t *handler,
+										apr_pool_t *pool)
+{
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+	rtsp_client_t *client;
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Create RTSP Client [%d]",max_connection_count);
+	client = apr_palloc(pool,sizeof(rtsp_client_t));
+	client->pool = pool;
+	client->obj = obj;
+	client->vtable = handler;
+
+	msg_pool = apt_task_msg_pool_create_dynamic(sizeof(task_msg_data_t),pool);
+
+	client->task = apt_net_client_task_create(max_connection_count,client,&client_vtable,msg_pool,pool);
+	if(!client->task) {
+		return NULL;
+	}
+
+	vtable = apt_net_client_task_vtable_get(client->task);
+	if(vtable) {
+		vtable->process_msg = rtsp_client_task_msg_process;
+	}
+
+	client->sub_pool = apt_subpool_create(pool);
+	client->connection_list = NULL;
+	return client;
+}
+
+/** Destroy RTSP client */
+RTSP_DECLARE(apt_bool_t) rtsp_client_destroy(rtsp_client_t *client)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Destroy RTSP Client");
+	return apt_net_client_task_destroy(client->task);
+}
+
+/** Start connection agent */
+RTSP_DECLARE(apt_bool_t) rtsp_client_start(rtsp_client_t *client)
+{
+	return apt_net_client_task_start(client->task);
+}
+
+/** Terminate connection agent */
+RTSP_DECLARE(apt_bool_t) rtsp_client_terminate(rtsp_client_t *client)
+{
+	return apt_net_client_task_terminate(client->task);
+}
+
+/** Get task */
+RTSP_DECLARE(apt_task_t*) rtsp_client_task_get(rtsp_client_t *client)
+{
+	return apt_net_client_task_base_get(client->task);
+}
+
+/** Get external object */
+RTSP_DECLARE(void*) rtsp_client_object_get(rtsp_client_t *client)
+{
+	return client->obj;
+}
+
+/** Get object associated with the session */
+RTSP_DECLARE(void*) rtsp_client_session_object_get(const rtsp_client_session_t *session)
+{
+	return session->obj;
+}
+
+/** Set object associated with the session */
+RTSP_DECLARE(void) rtsp_client_session_object_set(rtsp_client_session_t *session, void *obj)
+{
+	session->obj = obj;
+}
+
+/** Get the session identifier */
+RTSP_DECLARE(const apt_str_t*) rtsp_client_session_id_get(const rtsp_client_session_t *session)
+{
+	return &session->id;
+}
+
+/** Signal task message */
+static apt_bool_t rtsp_client_control_message_signal(
+								task_msg_data_type_e type,
+								rtsp_client_t *client,
+								rtsp_client_session_t *session,
+								rtsp_message_t *message)
+{
+	apt_task_t *task = apt_net_client_task_base_get(client->task);
+	apt_task_msg_t *task_msg = apt_task_msg_get(task);
+	if(task_msg) {
+		task_msg_data_t *data = (task_msg_data_t*)task_msg->data;
+		data->type = type;
+		data->client = client;
+		data->session = session;
+		data->message = message;
+		apt_task_msg_signal(task,task_msg);
+	}
+	return TRUE;
+}
+
+/** Create RTSP session handle */
+RTSP_DECLARE(rtsp_client_session_t*) rtsp_client_session_create(
+											rtsp_client_t *client,
+											const char *server_ip, 
+											apr_port_t server_port,
+											const char *resource_location)
+{
+	rtsp_client_session_t *session;
+	apr_pool_t *pool = apt_pool_create();
+	session = apr_palloc(pool,sizeof(rtsp_client_session_t));
+	session->pool = pool;
+	session->obj = NULL;
+	session->connection = NULL;
+	session->active_request = NULL;
+	session->pending_request_queue = apt_list_create(pool);
+	session->resource_table = apr_hash_make(pool);
+	session->term_state = TERMINATION_STATE_NONE;
+
+	apt_string_assign(&session->server_ip,server_ip,pool);
+	session->server_port = server_port;
+	apt_string_assign(&session->resource_location,resource_location,pool);
+	apt_string_reset(&session->id);
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create RTSP Handle "APT_PTR_FMT,session);
+	return session;
+}
+
+/** Destroy RTSP session handle */
+RTSP_DECLARE(void) rtsp_client_session_destroy(rtsp_client_session_t *session)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy RTSP Handle "APT_PTR_FMT,session);
+	if(session && session->pool) {
+		apr_pool_destroy(session->pool);
+	}
+}
+
+/** Signal terminate request */
+RTSP_DECLARE(apt_bool_t) rtsp_client_session_terminate(rtsp_client_t *client, rtsp_client_session_t *session)
+{
+	return rtsp_client_control_message_signal(TASK_MSG_TERMINATE_SESSION,client,session,NULL);
+}
+
+/** Signal RTSP message */
+RTSP_DECLARE(apt_bool_t) rtsp_client_session_request(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *message)
+{
+	return rtsp_client_control_message_signal(TASK_MSG_SEND_MESSAGE,client,session,message);
+}
+
+/* Create RTSP connection */
+static apt_bool_t rtsp_client_connection_create(rtsp_client_t *client, rtsp_client_session_t *session)
+{
+	rtsp_client_connection_t *rtsp_connection;
+	apt_net_client_connection_t *connection = apt_net_client_connect(client->task,session->server_ip.buf,session->server_port);
+	if(!connection) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Connect to RTSP Server %s:%d",session->server_ip.buf,session->server_port);
+		return FALSE;
+	}
+	rtsp_connection = apr_palloc(connection->pool,sizeof(rtsp_client_connection_t));
+	rtsp_connection->handle_table = apr_hash_make(connection->pool);
+	rtsp_connection->session_table = apr_hash_make(connection->pool);
+	rtsp_connection->inprogress_request_queue = apt_list_create(connection->pool);
+	apt_text_stream_init(&rtsp_connection->rx_stream,rtsp_connection->rx_buffer,sizeof(rtsp_connection->rx_buffer)-1);
+	apt_text_stream_init(&rtsp_connection->tx_stream,rtsp_connection->tx_buffer,sizeof(rtsp_connection->tx_buffer)-1);
+	rtsp_connection->parser = rtsp_parser_create(connection->pool);
+	rtsp_connection->generator = rtsp_generator_create(connection->pool);
+	rtsp_connection->last_cseq = 0;
+	rtsp_connection->base = connection;
+	connection->obj = rtsp_connection;
+	if(!client->connection_list) {
+		client->connection_list = apt_list_create(client->sub_pool);
+	}
+	rtsp_connection->client = client;
+	rtsp_connection->it = apt_list_push_back(client->connection_list,rtsp_connection,connection->pool);
+	session->connection = rtsp_connection;
+	return TRUE;
+}
+
+/* Destroy RTSP connection */
+static apt_bool_t rtsp_client_connection_destroy(rtsp_client_t *client, rtsp_client_connection_t *rtsp_connection)
+{
+	apt_list_elem_remove(client->connection_list,rtsp_connection->it);
+	apt_net_client_disconnect(client->task,rtsp_connection->base);
+
+	if(apt_list_is_empty(client->connection_list) == TRUE) {
+		apr_pool_clear(client->sub_pool);
+		client->connection_list = NULL;
+	}
+	return TRUE;
+}
+
+/* Respond to session termination request */
+static apt_bool_t rtsp_client_session_terminate_respond(rtsp_client_t *client, rtsp_client_session_t *session)
+{
+	rtsp_client_connection_t *rtsp_connection = session->connection;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remove RTSP Handle "APT_PTR_FMT,session);
+	apr_hash_set(rtsp_connection->handle_table,session,sizeof(session),NULL);
+
+	session->term_state = TERMINATION_STATE_NONE;
+	client->vtable->on_session_terminate_response(client,session);
+	
+	if(apr_hash_count(rtsp_connection->handle_table) == 0) {
+		rtsp_client_connection_destroy(client,rtsp_connection);
+	}
+	return TRUE;
+}
+
+/* Teardown session resources */
+static apt_bool_t rtsp_client_session_resources_teardown(rtsp_client_t *client, rtsp_client_session_t *session)
+{
+	void *val;
+	rtsp_message_t *setup_request;
+	rtsp_message_t *teardown_request;
+	apr_hash_index_t *it;
+
+	/* set termination state to in-progress and teardown remaining resources */
+	session->term_state = TERMINATION_STATE_INPROGRESS;
+	it = apr_hash_first(session->pool,session->resource_table);
+	for(; it; it = apr_hash_next(it)) {
+		apr_hash_this(it,NULL,NULL,&val);
+		setup_request = val;
+		if(!setup_request) continue;
+
+		teardown_request = rtsp_request_create(session->pool);
+		teardown_request->start_line.common.request_line.resource_name = setup_request->start_line.common.request_line.resource_name;
+		teardown_request->start_line.common.request_line.method_id = RTSP_METHOD_TEARDOWN;
+		rtsp_client_session_message_process(client,session,teardown_request);
+	}
+	return TRUE;
+}
+
+/* Process session termination request */
+static apt_bool_t rtsp_client_session_terminate_process(rtsp_client_t *client, rtsp_client_session_t *session)
+{
+	rtsp_client_connection_t *rtsp_connection = session->connection;
+	if(!rtsp_connection) {
+		client->vtable->on_session_terminate_response(client,session);
+		return FALSE;
+	}
+
+	if(session->active_request) {
+		/* set termination state to requested */
+		session->term_state = TERMINATION_STATE_REQUESTED;
+	}
+	else {
+		rtsp_client_session_resources_teardown(client,session);
+		
+		/* respond immediately if no resources left */
+		if(apr_hash_count(session->resource_table) == 0) {
+			rtsp_client_session_terminate_respond(client,session);
+		}
+	}
+
+	return TRUE;
+}
+
+static apt_bool_t rtsp_client_session_url_generate(rtsp_client_session_t *session, rtsp_message_t *message)
+{
+	apt_str_t *url = &message->start_line.common.request_line.url;
+	if(session->resource_location.length) {
+		url->buf = apr_psprintf(message->pool,"rtsp://%s:%d/%s/%s",
+						session->server_ip.buf,
+						session->server_port,
+						session->resource_location.buf,
+						message->start_line.common.request_line.resource_name);
+	}
+	else {
+		url->buf = apr_psprintf(message->pool,"rtsp://%s:%d/%s",
+						session->server_ip.buf,
+						session->server_port,
+						message->start_line.common.request_line.resource_name);
+	}
+	url->length = strlen(url->buf);
+	return TRUE;
+}
+
+static apt_bool_t rtsp_client_request_push(rtsp_client_connection_t *rtsp_connection, rtsp_client_session_t *session, rtsp_message_t *message)
+{
+	/* add request to inprogress request queue */
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Push RTSP Request to In-Progress Queue "APT_PTRSID_FMT" CSeq:%d",
+		session,
+		message->header.session_id.buf ? message->header.session_id.buf : "new",
+		message->header.cseq);
+	apt_list_push_back(rtsp_connection->inprogress_request_queue,session,session->pool);
+	session->active_request = message;
+	return TRUE;
+}
+
+static apt_bool_t rtsp_client_request_pop(rtsp_client_connection_t *rtsp_connection, rtsp_message_t *response, rtsp_message_t **ret_request, rtsp_client_session_t **ret_session)
+{
+	rtsp_client_session_t *session;
+	apt_list_elem_t *elem = apt_list_first_elem_get(rtsp_connection->inprogress_request_queue);
+	while(elem) {
+		session = apt_list_elem_object_get(elem);
+		if(session->active_request && session->active_request->header.cseq == response->header.cseq) {
+			if(ret_session) {
+				*ret_session = session;
+			}
+			if(ret_request) {
+				*ret_request = session->active_request;
+			}
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Pop In-Progress RTSP Request "APT_PTR_FMT" CSeq:%d", 
+				session, 
+				response->header.cseq);
+			apt_list_elem_remove(rtsp_connection->inprogress_request_queue,elem);
+			session->active_request = NULL;
+			return TRUE;
+		}
+		elem = apt_list_next_elem_get(rtsp_connection->inprogress_request_queue,elem);
+	}
+	return FALSE;
+}
+
+/* Process outgoing RTSP request */
+static apt_bool_t rtsp_client_session_request_process(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *message)
+{
+	if(!session->connection) {
+		/* create RTSP connection */
+		if(rtsp_client_connection_create(client,session) == FALSE) {
+			/* respond with error */
+			return FALSE;
+		}
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add RTSP Handle "APT_PTR_FMT,session);
+		apr_hash_set(session->connection->handle_table,session,sizeof(session),session);
+	}
+
+	rtsp_client_session_url_generate(session,message);
+
+	if(session->id.length) {
+		message->header.session_id = session->id;
+		rtsp_header_property_add(&message->header.property_set,RTSP_HEADER_FIELD_SESSION_ID);
+	}
+	
+	message->header.cseq = ++session->connection->last_cseq;
+	rtsp_header_property_add(&message->header.property_set,RTSP_HEADER_FIELD_CSEQ);
+
+	if(rtsp_client_message_send(client,session->connection->base,message) == FALSE) {
+		/* respond with error */
+		return FALSE;
+	}
+
+	return rtsp_client_request_push(session->connection,session,message);
+}
+
+/* Process pending RTSP requests */
+static apt_bool_t rtsp_client_session_pending_requests_process(rtsp_client_t *client, rtsp_client_session_t *session)
+{
+	rtsp_message_t *request = apt_list_pop_front(session->pending_request_queue);
+	if(!request) {
+		/* pending queue is empty, no in-progress request */
+		return FALSE;
+	}
+
+	/* process pending request; get the next one, if current is failed */
+	do {
+		rtsp_message_t *response;
+		if(rtsp_client_session_request_process(client,session,request) == TRUE) {
+			return TRUE;
+		}
+			
+		/* respond with error */
+		response = rtsp_response_create(
+							request,
+							RTSP_STATUS_CODE_INTERNAL_SERVER_ERROR,
+							RTSP_REASON_PHRASE_INTERNAL_SERVER_ERROR,
+							session->pool);
+		rtsp_client_session_response_process(client,session,request,response);
+		
+		/* process the next pending request / if any */
+		request = apt_list_pop_front(session->pending_request_queue);
+	}
+	while(request);
+
+	/* no in-progress request */
+	return FALSE;
+}
+
+
+/* Process outgoing RTSP message */
+static apt_bool_t rtsp_client_session_message_process(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *message)
+{
+	if(session->active_request) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Push RTSP Request to Pending Queue "APT_PTR_FMT,session);
+		apt_list_push_back(session->pending_request_queue,message,message->pool);
+		return TRUE;
+	}
+
+	if(rtsp_client_session_request_process(client,session,message) == FALSE) {
+		/* respond with error in case request cannot be processed */
+		rtsp_message_t *response = rtsp_response_create(
+							message,
+							RTSP_STATUS_CODE_INTERNAL_SERVER_ERROR,
+							RTSP_REASON_PHRASE_INTERNAL_SERVER_ERROR,
+							session->pool);
+		rtsp_client_session_response_process(client,session,message,response);
+	}
+	return TRUE;
+}
+
+/* Process incoming RTSP event (request) */
+static apt_bool_t rtsp_client_session_event_process(rtsp_client_t *client, rtsp_client_connection_t *rtsp_connection, rtsp_message_t *message)
+{
+	rtsp_message_t *response = NULL;
+	rtsp_client_session_t *session = NULL;
+	if(rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_SESSION_ID) == TRUE) {
+		/* find existing session */
+		session = apr_hash_get(
+					rtsp_connection->session_table,
+					message->header.session_id.buf,
+					message->header.session_id.length);
+	}
+
+	if(session) {
+		response = rtsp_response_create(message,RTSP_STATUS_CODE_OK,RTSP_REASON_PHRASE_OK,message->pool);
+		if(rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_SESSION_ID) == TRUE) {
+			response->header.session_id = message->header.session_id;
+			rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_SESSION_ID);
+		}
+		client->vtable->on_session_event(client,session,message);
+	}
+	else {
+		response = rtsp_response_create(message,RTSP_STATUS_CODE_NOT_FOUND,RTSP_REASON_PHRASE_NOT_FOUND,message->pool);
+	}
+
+	return rtsp_client_message_send(client,rtsp_connection->base,response);
+}
+
+/* Process incoming RTSP response */
+static apt_bool_t rtsp_client_session_response_process(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *request, rtsp_message_t *response)
+{
+	const char *resource_name;
+	if(request->start_line.common.request_line.method_id == RTSP_METHOD_SETUP &&
+		response->start_line.common.status_line.status_code == RTSP_STATUS_CODE_OK) {
+		
+		if(apr_hash_count(session->resource_table) == 0) {
+			if(rtsp_header_property_check(&response->header.property_set,RTSP_HEADER_FIELD_SESSION_ID) == TRUE) {
+				session->id = response->header.session_id;
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add RTSP Session "APT_PTRSID_FMT,
+					session,
+					session->id.buf);
+				apr_hash_set(session->connection->session_table,session->id.buf,session->id.length,session);
+			}
+		}
+		
+		/* add resource */
+		resource_name = request->start_line.common.request_line.resource_name;
+		apr_hash_set(session->resource_table,resource_name,APR_HASH_KEY_STRING,request);
+	}
+	else if(request->start_line.common.request_line.method_id == RTSP_METHOD_TEARDOWN) {
+		/* remove resource */
+		resource_name = request->start_line.common.request_line.resource_name;
+		apr_hash_set(session->resource_table,resource_name,APR_HASH_KEY_STRING,NULL);
+
+		if(apr_hash_count(session->resource_table) == 0) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remove RTSP Session "APT_PTRSID_FMT,
+				session,
+				session->id.buf);
+			apr_hash_set(session->connection->session_table,session->id.buf,session->id.length,NULL);
+		}
+	}
+
+	if(session->term_state != TERMINATION_STATE_INPROGRESS) {
+		client->vtable->on_session_response(client,session,request,response);
+	}
+
+	return TRUE;
+}
+
+/* Raise RTSP session terminate event */
+static apt_bool_t rtsp_client_session_terminate_raise(rtsp_client_t *client, rtsp_client_session_t *session)
+{
+	rtsp_message_t *request;
+	rtsp_message_t *response;
+
+	/* cancel pending requests */
+	do {
+		request = apt_list_pop_front(session->pending_request_queue);
+		if(request) {
+			response = rtsp_response_create(
+							session->active_request,
+							RTSP_STATUS_CODE_INTERNAL_SERVER_ERROR,
+							RTSP_REASON_PHRASE_INTERNAL_SERVER_ERROR,
+							session->pool);
+			rtsp_client_session_response_process(client,session,request,response);
+		}
+	}
+	while(request);
+
+	
+	if(session->term_state == TERMINATION_STATE_NONE) {
+		client->vtable->on_session_terminate_event(client,session);
+	}
+	else {
+		rtsp_client_session_terminate_respond(client,session);
+	}
+	return TRUE;
+}
+
+/* RTSP connection disconnected */
+static apt_bool_t rtsp_client_on_disconnect(rtsp_client_t *client, rtsp_client_connection_t *rtsp_connection)
+{
+	rtsp_client_session_t *session;
+	rtsp_message_t *request;
+	rtsp_message_t *response;
+	apr_size_t remaining_handles = 0;
+	apr_size_t cancelled_requests = 0;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"TCP Peer Disconnected %s", rtsp_connection->base->id);
+	apt_net_client_connection_close(client->task,rtsp_connection->base);
+
+	/* Cancel in-progreess requests */
+	do {
+		session = apt_list_pop_front(rtsp_connection->inprogress_request_queue);
+		if(session && session->active_request) {
+			request = session->active_request;
+			session->active_request = NULL;
+			cancelled_requests++;
+
+			response = rtsp_response_create(
+								request,
+								RTSP_STATUS_CODE_INTERNAL_SERVER_ERROR,
+								RTSP_REASON_PHRASE_INTERNAL_SERVER_ERROR,
+								session->pool);
+			rtsp_client_session_response_process(client,session,request,response);
+		}
+	}
+	while(session);
+
+	/* Walk through RTSP handles and raise termination event for them */
+	remaining_handles = apr_hash_count(rtsp_connection->handle_table);
+	if(remaining_handles) {
+		void *val;
+		apr_hash_index_t *it;
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Terminate Remaining RTSP Handles [%d]",remaining_handles);
+		it = apr_hash_first(rtsp_connection->base->pool,rtsp_connection->session_table);
+		for(; it; it = apr_hash_next(it)) {
+			apr_hash_this(it,NULL,NULL,&val);
+			session = val;
+			if(session) {
+				rtsp_client_session_terminate_raise(client,session);
+			}
+		}
+		remaining_handles = apr_hash_count(rtsp_connection->session_table);
+	}
+
+	if(!remaining_handles && !cancelled_requests) {
+		rtsp_client_connection_destroy(client,rtsp_connection);
+	}
+	return TRUE;
+}
+
+/* Send RTSP message through RTSP connection */
+static apt_bool_t rtsp_client_message_send(rtsp_client_t *client, apt_net_client_connection_t *connection, rtsp_message_t *message)
+{
+	apt_bool_t status = FALSE;
+	rtsp_client_connection_t *rtsp_connection;
+	apt_text_stream_t *stream;
+	rtsp_stream_result_e result;
+
+	if(!connection || !connection->sock) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No RTSP Connection");
+		return FALSE;
+	}
+	rtsp_connection = connection->obj;
+	stream = &rtsp_connection->tx_stream;
+		
+	rtsp_generator_message_set(rtsp_connection->generator,message);
+	do {
+		stream->text.length = sizeof(rtsp_connection->tx_buffer)-1;
+		stream->pos = stream->text.buf;
+		result = rtsp_generator_run(rtsp_connection->generator,stream);
+		if(result == RTSP_STREAM_MESSAGE_COMPLETE || result == RTSP_STREAM_MESSAGE_TRUNCATED) {
+			stream->text.length = stream->pos - stream->text.buf;
+			*stream->pos = '\0';
+
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send RTSP Stream %s [%lu bytes]\n%s",
+				connection->id,
+				stream->text.length,
+				stream->text.buf);
+			if(apr_socket_send(connection->sock,stream->text.buf,&stream->text.length) == APR_SUCCESS) {
+				status = TRUE;
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Send RTSP Stream");
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Generate RTSP Stream");
+		}
+	}
+	while(result == RTSP_STREAM_MESSAGE_TRUNCATED);
+
+	return status;
+}
+
+static apt_bool_t rtsp_client_message_handler(void *obj, rtsp_message_t *message, rtsp_stream_result_e result)
+{
+	rtsp_client_connection_t *rtsp_connection = obj;
+	if(result != RTSP_STREAM_MESSAGE_COMPLETE) {
+		/* message is not completely parsed, nothing to do */
+		return TRUE;
+	}
+	/* process parsed message */
+	if(message->start_line.message_type == RTSP_MESSAGE_TYPE_RESPONSE) {
+		rtsp_message_t *request;
+		rtsp_client_session_t *session;
+		/* at first, pop in-progress request/session */
+		if(rtsp_client_request_pop(rtsp_connection,message,&request,&session) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unexpected RTSP Response Received CSeq:%d",message->header.cseq);
+			return FALSE;
+		}
+
+		/* next, process session response */
+		rtsp_client_session_response_process(rtsp_connection->client,session,request,message);
+
+		/* process session pending requests */
+		if(rtsp_client_session_pending_requests_process(rtsp_connection->client,session) == FALSE) {
+			/* no in-progress request, check the termination state now */
+			if(session->term_state != TERMINATION_STATE_NONE) {
+				if(session->term_state == TERMINATION_STATE_REQUESTED) {
+					rtsp_client_session_resources_teardown(rtsp_connection->client,session);
+				}
+				
+				/* respond if no resources left */
+				if(apr_hash_count(session->resource_table) == 0) {
+					rtsp_client_session_terminate_respond(rtsp_connection->client,session);
+				}
+			}
+		}
+	}
+	else if(message->start_line.message_type == RTSP_MESSAGE_TYPE_REQUEST) {
+		rtsp_client_session_event_process(rtsp_connection->client,rtsp_connection,message);
+	}
+	return TRUE;
+}
+
+/* Receive RTSP message through RTSP connection */
+static apt_bool_t rtsp_client_message_receive(apt_net_client_task_t *task, apt_net_client_connection_t *connection)
+{
+	rtsp_client_t *client = apt_net_client_task_object_get(task);
+	rtsp_client_connection_t *rtsp_connection;
+	apr_status_t status;
+	apr_size_t offset;
+	apr_size_t length;
+	apt_text_stream_t *stream;
+
+	if(!connection || !connection->sock) {
+		return FALSE;
+	}
+	rtsp_connection = connection->obj;
+	stream = &rtsp_connection->rx_stream;
+
+	/* init length of the stream */
+	stream->text.length = sizeof(rtsp_connection->rx_buffer)-1;
+	/* calculate offset remaining from the previous receive / if any */
+	offset = stream->pos - stream->text.buf;
+	/* calculate available length */
+	length = stream->text.length - offset;
+	status = apr_socket_recv(connection->sock,stream->pos,&length);
+	if(status == APR_EOF || length == 0) {
+		return rtsp_client_on_disconnect(client,rtsp_connection);
+	}
+	/* calculate actual length of the stream */
+	stream->text.length = offset + length;
+	stream->pos[length] = '\0';
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive RTSP Stream %s [%lu bytes]\n%s",
+		connection->id,
+		length,
+		stream->pos);
+
+	/* reset pos */
+	stream->pos = stream->text.buf;
+	/* walk through the stream parsing RTSP messages */
+	return rtsp_stream_walk(rtsp_connection->parser,stream,rtsp_client_message_handler,rtsp_connection);
+}
+
+/* Process task message */
+static apt_bool_t rtsp_client_task_msg_process(apt_task_t *task, apt_task_msg_t *task_msg)
+{
+	apt_net_client_task_t *net_task = apt_task_object_get(task);
+	rtsp_client_t *client = apt_net_client_task_object_get(net_task);
+
+	task_msg_data_t *data = (task_msg_data_t*) task_msg->data;
+	switch(data->type) {
+		case TASK_MSG_SEND_MESSAGE:
+			rtsp_client_session_message_process(client,data->session,data->message);
+			break;
+		case TASK_MSG_TERMINATE_SESSION:
+			rtsp_client_session_terminate_process(client,data->session);
+			break;
+	}
+
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_header.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_header.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,394 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "rtsp_header.h"
+#include "apt_string_table.h"
+
+/** String table of RTSP header fields (rtsp_header_field_id) */
+static const apt_str_table_item_t rtsp_header_string_table[] = {
+	{{"CSeq",           4},1},
+	{{"Transport",      9},0},
+	{{"Session",        7},0},
+	{{"RTP-Info",       8},0},
+	{{"Content-Type",  12},8},
+	{{"Content-Length",14},8}
+};
+
+/** String table of RTSP content types (rtsp_content_type) */
+static const apt_str_table_item_t rtsp_content_type_string_table[] = {
+	{{"application/sdp", 15},12},
+	{{"application/mrcp",16},12}
+};
+
+/** String table of RTSP transport protocols (rtsp_transport_e) */
+static const apt_str_table_item_t rtsp_transport_string_table[] = {
+	{{"RTP", 3},0}
+};
+
+/** String table of RTSP lower transport protocols (rtsp_lower_transport_e) */
+static const apt_str_table_item_t rtsp_lower_transport_string_table[] = {
+	{{"UDP", 3},0},
+	{{"TCP", 3},0}
+};
+
+/** String table of RTSP transport profiles (rtsp_profile_e) */
+static const apt_str_table_item_t rtsp_profile_string_table[] = {
+	{{"AVP", 3},0},
+	{{"SAVP",4},0}
+};
+
+/** String table of RTSP transport attributes (rtsp_transport_attrib_e) */
+static const apt_str_table_item_t rtsp_transport_attrib_string_table[] = {
+	{{"client_port", 11},0},
+	{{"server_port", 11},1},
+	{{"source",      6}, 1},
+	{{"destination", 11},0},
+	{{"unicast",     7}, 0},
+	{{"multicast",   9}, 0}
+};
+
+/** Parse RTSP transport port range */
+static apt_bool_t rtsp_port_range_parse(rtsp_port_range_t *port_range, apt_text_stream_t *stream)
+{
+	apt_str_t value;
+	/* read min value */
+	if(apt_text_field_read(stream,'-',TRUE,&value) == FALSE) {
+		return FALSE;
+	}
+	port_range->min = (apr_port_t)apt_size_value_parse(&value);
+	
+	/* read optional max value */
+	if(apt_text_field_read(stream,';',TRUE,&value) == TRUE) {
+		port_range->max = (apr_port_t)apt_size_value_parse(&value);
+	}
+
+	return TRUE;
+}
+
+/** Generate RTSP transport port range */
+static apt_bool_t rtsp_port_range_generate(rtsp_transport_attrib_e attrib, const rtsp_port_range_t *port_range, apt_text_stream_t *text_stream)
+{
+	const apt_str_t *str;
+	str = apt_string_table_str_get(rtsp_transport_attrib_string_table,RTSP_TRANSPORT_ATTRIB_COUNT,attrib);
+	if(!str) {
+		return FALSE;
+	}
+	apt_string_value_generate(str,text_stream);
+	apt_text_char_insert(text_stream,'=');
+	apt_size_value_generate(port_range->min,text_stream);
+	if(port_range->max > port_range->min) {
+		apt_text_char_insert(text_stream,'-');
+		apt_size_value_generate(port_range->max,text_stream);
+	}
+	return TRUE;
+}
+
+/** Parse RTSP source/destination address */
+static apt_bool_t rtsp_address_parse(apt_str_t *address, apt_text_stream_t *stream, apr_pool_t *pool)
+{
+	apt_str_t value;
+	/* read min value */
+	if(apt_text_field_read(stream,';',TRUE,&value) == FALSE) {
+		return FALSE;
+	}
+	apt_string_copy(address,&value,pool);
+	return TRUE;
+}
+
+/** Parse RTSP transport */
+static apt_bool_t rtsp_transport_attrib_parse(rtsp_transport_t *transport, const apt_str_t *field, apr_pool_t *pool)
+{
+	rtsp_transport_attrib_e attrib;
+	apt_str_t name;
+	apt_text_stream_t stream;
+
+	stream.text = *field;
+	stream.pos = stream.text.buf;
+
+	/* read attrib name */
+	if(apt_text_field_read(&stream,'=',TRUE,&name) == FALSE) {
+		return FALSE;
+	}
+
+	attrib = apt_string_table_id_find(rtsp_transport_attrib_string_table,RTSP_TRANSPORT_ATTRIB_COUNT,&name);
+	switch(attrib) {
+		case RTSP_TRANSPORT_ATTRIB_CLIENT_PORT:
+			rtsp_port_range_parse(&transport->client_port_range,&stream);
+			break;
+		case RTSP_TRANSPORT_ATTRIB_SERVER_PORT:
+			rtsp_port_range_parse(&transport->client_port_range,&stream);
+			break;
+		case RTSP_TRANSPORT_ATTRIB_SOURCE:
+			rtsp_address_parse(&transport->source,&stream,pool);
+			break;
+		case RTSP_TRANSPORT_ATTRIB_DESTINATION:
+			rtsp_address_parse(&transport->destination,&stream,pool);
+			break;
+		case RTSP_TRANSPORT_ATTRIB_UNICAST:
+			transport->delivery = RTSP_DELIVERY_UNICAST;
+			break;
+		case RTSP_TRANSPORT_ATTRIB_MULTICAST:
+			transport->delivery = RTSP_DELIVERY_MULTICAST;
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}
+
+/** Parse RTSP transport protocol (RTP/AVP[/UDP]) */
+static apt_bool_t rtsp_transport_protocol_parse(rtsp_transport_t *transport, const apt_str_t *value)
+{
+	apt_str_t field;
+	apt_text_stream_t stream;
+
+	stream.text = *value;
+	stream.pos = stream.text.buf;
+
+	/* set the defaults */
+	transport->protocol = RTSP_TRANSPORT_RTP;
+	transport->profile = RTSP_PROFILE_AVP;
+	transport->lower_protocol = RTSP_LOWER_TRANSPORT_UDP;
+
+	/* read transport protocol (RTP) */
+	if(apt_text_field_read(&stream,'/',TRUE,&field) == FALSE) {
+		return FALSE;
+	}
+	transport->protocol = apt_string_table_id_find(rtsp_transport_string_table,RTSP_TRANSPORT_COUNT,&field);
+	if(transport->protocol >= RTSP_TRANSPORT_COUNT) {
+		return FALSE;
+	}
+
+	/* read transport profile (AVP) */
+	if(apt_text_field_read(&stream,'/',TRUE,&field) == FALSE) {
+		return FALSE;
+	}
+	transport->profile = apt_string_table_id_find(rtsp_profile_string_table,RTSP_PROFILE_COUNT,&field);
+	if(transport->profile >= RTSP_PROFILE_COUNT) {
+		return FALSE;
+	}
+		
+	/* read optional lower transport protocol (UDP) */
+	if(apt_text_field_read(&stream,'/',TRUE,&field) == TRUE) {
+		transport->lower_protocol = apt_string_table_id_find(rtsp_lower_transport_string_table,RTSP_LOWER_TRANSPORT_COUNT,&field);
+		if(transport->lower_protocol >= RTSP_LOWER_TRANSPORT_COUNT) {
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+/** Parse RTSP transport */
+static apt_bool_t rtsp_transport_parse(rtsp_transport_t *transport, const apt_str_t *line, apr_pool_t *pool)
+{
+	apt_str_t field;
+	apt_text_stream_t stream;
+
+	stream.text = *line;
+	stream.pos = stream.text.buf;
+	/* read transport protocol (RTP/AVP[/UDP]) */
+	if(apt_text_field_read(&stream,';',TRUE,&field) == FALSE) {
+		return FALSE;
+	}
+	
+	/* parse transport protocol (RTP/AVP[/UDP]) */
+	if(rtsp_transport_protocol_parse(transport,&field) == FALSE) {
+		return FALSE;
+	}
+
+	/* read transport attributes */
+	while(apt_text_field_read(&stream,';',TRUE,&field) == TRUE) {
+		rtsp_transport_attrib_parse(transport,&field,pool);
+	}
+
+	return TRUE;
+}
+
+/** Generate RTSP transport */
+static apt_bool_t rtsp_transport_generate(rtsp_transport_t *transport, apt_text_stream_t *text_stream)
+{
+	const apt_str_t *protocol = apt_string_table_str_get(rtsp_transport_string_table,RTSP_TRANSPORT_COUNT,transport->protocol);
+	const apt_str_t *profile = apt_string_table_str_get(rtsp_profile_string_table,RTSP_PROFILE_COUNT,transport->profile);
+	if(!protocol || !profile) {
+		return FALSE;
+	}
+	apt_string_value_generate(protocol,text_stream);
+	apt_text_char_insert(text_stream,'/');
+	apt_string_value_generate(profile,text_stream);
+
+	if(transport->delivery != RTSP_DELIVERY_NONE) {
+		const apt_str_t *delivery = NULL;
+		rtsp_transport_attrib_e attrib = RTSP_TRANSPORT_ATTRIB_NONE;
+		if(transport->delivery == RTSP_DELIVERY_UNICAST) {
+			attrib = RTSP_TRANSPORT_ATTRIB_UNICAST;
+		}
+		else if(transport->delivery == RTSP_DELIVERY_MULTICAST) {
+			attrib = RTSP_TRANSPORT_ATTRIB_MULTICAST;
+		}
+		delivery = apt_string_table_str_get(rtsp_transport_attrib_string_table,RTSP_TRANSPORT_ATTRIB_COUNT,attrib);
+		if(!delivery) {
+			return FALSE;
+		}
+	
+		apt_text_char_insert(text_stream,';');
+		apt_string_value_generate(delivery,text_stream);
+	}
+
+	if(rtsp_port_range_is_valid(&transport->client_port_range) == TRUE) {
+		apt_text_char_insert(text_stream,';');
+		rtsp_port_range_generate(RTSP_TRANSPORT_ATTRIB_CLIENT_PORT,&transport->client_port_range,text_stream);
+	}
+	if(rtsp_port_range_is_valid(&transport->server_port_range) == TRUE) {
+		apt_text_char_insert(text_stream,';');
+		rtsp_port_range_generate(RTSP_TRANSPORT_ATTRIB_SERVER_PORT,&transport->server_port_range,text_stream);
+	}
+	return TRUE;
+}
+
+/** Parse RTSP transport */
+static apt_bool_t rtsp_session_id_parse(apt_str_t *session_id, const apt_str_t *value, apr_pool_t *pool)
+{
+	char *sep;
+	if(!value->buf) {
+		return FALSE;
+	}
+	apt_string_copy(session_id,value,pool);
+	sep = strchr(session_id->buf,';');
+	if(sep) {
+		session_id->length = sep - session_id->buf;
+		*sep = '\0';
+	}
+	return TRUE;
+}
+
+/** Parse RTSP header field */
+static apt_bool_t rtsp_header_field_parse(rtsp_header_t *header, rtsp_header_field_id id, const apt_str_t *value, apr_pool_t *pool)
+{
+	apt_bool_t status = TRUE;
+	switch(id) {
+		case RTSP_HEADER_FIELD_CSEQ:
+			header->cseq = apt_size_value_parse(value);
+			break;
+		case RTSP_HEADER_FIELD_TRANSPORT:
+			status = rtsp_transport_parse(&header->transport,value,pool);
+			break;
+		case RTSP_HEADER_FIELD_SESSION_ID:
+			status = rtsp_session_id_parse(&header->session_id,value,pool);
+			break;
+		case RTSP_HEADER_FIELD_RTP_INFO:
+			apt_string_copy(&header->rtp_info,value,pool);
+			break;
+		case RTSP_HEADER_FIELD_CONTENT_TYPE:
+			header->content_type = apt_string_table_id_find(rtsp_content_type_string_table,RTSP_CONTENT_TYPE_COUNT,value);
+			break;
+		case RTSP_HEADER_FIELD_CONTENT_LENGTH:
+			header->content_length = apt_size_value_parse(value);
+			break;
+		default:
+			status = FALSE;
+	}
+	return status;
+}
+
+/** Generate RTSP header field */
+static apr_size_t rtsp_header_field_generate(rtsp_header_t *header, apr_size_t id, apt_text_stream_t *value)
+{
+	switch(id) {
+		case RTSP_HEADER_FIELD_CSEQ:
+			apt_size_value_generate(header->cseq,value);
+			break;
+		case RTSP_HEADER_FIELD_TRANSPORT:
+			rtsp_transport_generate(&header->transport,value);
+			break;
+		case RTSP_HEADER_FIELD_SESSION_ID:
+			apt_string_value_generate(&header->session_id,value);
+			break;
+		case RTSP_HEADER_FIELD_RTP_INFO:
+			apt_string_value_generate(&header->rtp_info,value);
+			break;
+		case RTSP_HEADER_FIELD_CONTENT_TYPE:
+		{
+			const apt_str_t *name = apt_string_table_str_get(rtsp_content_type_string_table,RTSP_CONTENT_TYPE_COUNT,header->content_type);
+			if(name) {
+				apt_string_value_generate(name,value);
+			}
+			break;
+		}
+		case RTSP_HEADER_FIELD_CONTENT_LENGTH:
+			apt_size_value_generate(header->content_length,value);
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}
+
+/** Parse RTSP header */
+RTSP_DECLARE(apt_bool_t) rtsp_header_parse(rtsp_header_t *header, apt_text_stream_t *text_stream, apr_pool_t *pool)
+{
+	apt_pair_t pair;
+	apt_bool_t result = FALSE;
+
+	do {
+		if(apt_text_header_read(text_stream,&pair) == TRUE) {
+			if(pair.name.length) {
+				/* parse header_field (name/value) */
+				rtsp_header_field_id id = apt_string_table_id_find(rtsp_header_string_table,RTSP_HEADER_FIELD_COUNT,&pair.name);
+				if(id < RTSP_HEADER_FIELD_COUNT) {
+					if(rtsp_header_field_parse(header,id,&pair.value,pool) == TRUE) {
+						rtsp_header_property_add(&header->property_set,id);
+					}
+				}
+			}
+			else {
+				/* empty header -> exit */
+				result = TRUE;
+				break;
+			}
+		}
+	}
+	while(apt_text_is_eos(text_stream) == FALSE);
+
+	return result;
+}
+
+/** Generate RTSP header */
+RTSP_DECLARE(apt_bool_t) rtsp_header_generate(rtsp_header_t *header, apt_text_stream_t *text_stream)
+{
+	const apt_str_t *name;
+	apr_size_t i;
+	rtsp_header_property_t property_set;
+
+	property_set = header->property_set;
+	for(i=0; ipool = pool;
+	rtsp_start_line_init(&message->start_line,message_type);
+	rtsp_header_init(&message->header);
+	apt_string_reset(&message->body);
+}
+
+/** Create RTSP message */
+RTSP_DECLARE(rtsp_message_t*) rtsp_message_create(rtsp_message_type_e message_type, apr_pool_t *pool)
+{
+	rtsp_message_t *message = apr_palloc(pool,sizeof(rtsp_message_t));
+	rtsp_message_init(message,message_type,pool);
+	return message;
+}
+
+/** Create RTSP request message */
+RTSP_DECLARE(rtsp_message_t*) rtsp_request_create(apr_pool_t *pool)
+{
+	rtsp_message_t *request = rtsp_message_create(RTSP_MESSAGE_TYPE_REQUEST,pool);
+	request->start_line.common.request_line.version = RTSP_VERSION_1;
+	return request;
+}
+
+/** Create RTSP response message */
+RTSP_DECLARE(rtsp_message_t*) rtsp_response_create(const rtsp_message_t *request, rtsp_status_code_e status_code, rtsp_reason_phrase_e reason, apr_pool_t *pool)
+{
+	const apt_str_t *reason_str;
+	rtsp_status_line_t *status_line;
+	rtsp_message_t *response = rtsp_message_create(RTSP_MESSAGE_TYPE_RESPONSE,request->pool);
+	status_line = &response->start_line.common.status_line;
+	status_line->version = request->start_line.common.request_line.version;
+	status_line->status_code = status_code;
+	reason_str = rtsp_reason_phrase_get(reason);
+	if(reason_str) {
+		apt_string_copy(&status_line->reason,reason_str,request->pool);
+	}
+
+	if(rtsp_header_property_check(&request->header.property_set,RTSP_HEADER_FIELD_CSEQ) == TRUE) {
+		response->header.cseq = request->header.cseq;
+		rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_CSEQ);
+	}
+
+	return response;
+}
+
+/** Destroy RTSP message */
+RTSP_DECLARE(void) rtsp_message_destroy(rtsp_message_t *message)
+{
+	/* nothing to do message is allocated from pool */
+}

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_server.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_server.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,650 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "rtsp_server.h"
+#include "rtsp_stream.h"
+#include "apt_net_server_task.h"
+#include "apt_text_stream.h"
+#include "apt_pool.h"
+#include "apt_obj_list.h"
+#include "apt_log.h"
+
+#define RTSP_SESSION_ID_HEX_STRING_LENGTH 16
+#define RTSP_STREAM_BUFFER_SIZE 1024
+
+typedef struct rtsp_server_connection_t rtsp_server_connection_t;
+
+/** RTSP server */
+struct rtsp_server_t {
+	apr_pool_t                 *pool;
+	apt_net_server_task_t      *task;
+
+	apr_pool_t                 *sub_pool;
+	apt_obj_list_t             *connection_list;
+
+	void                       *obj;
+	const rtsp_server_vtable_t *vtable;
+};
+
+/** RTSP connection */
+struct rtsp_server_connection_t {
+	/** Connection base */
+	apt_net_server_connection_t *base;
+
+	/** RTSP server, connection belongs to */
+	rtsp_server_t               *server;
+	/** Element of the connection list in agent */
+	apt_list_elem_t             *it;
+
+	/** Session table (rtsp_server_session_t*) */
+	apr_hash_t                  *session_table;
+
+	char                         rx_buffer[RTSP_STREAM_BUFFER_SIZE];
+	apt_text_stream_t            rx_stream;
+	rtsp_parser_t               *parser;
+
+	char                         tx_buffer[RTSP_STREAM_BUFFER_SIZE];
+	apt_text_stream_t            tx_stream;
+	rtsp_generator_t            *generator;
+};
+
+/** RTSP session */
+struct rtsp_server_session_t {
+	apr_pool_t               *pool;
+	void                     *obj;
+	rtsp_server_connection_t *connection;
+
+	/** Session identifier */
+	apt_str_t                 id;
+	apt_str_t                 url;
+
+	/** Last cseq sent */
+	apr_size_t                last_cseq;
+
+	/** In-progress request */
+	rtsp_message_t           *active_request;
+	/** request queue */
+	apt_obj_list_t           *request_queue;
+
+	/** In-progress termination request */
+	apt_bool_t                terminating;
+};
+
+typedef enum {
+	TASK_MSG_SEND_MESSAGE,
+	TASK_MSG_TERMINATE_SESSION
+} task_msg_data_type_e;
+
+typedef struct task_msg_data_t task_msg_data_t;
+
+struct task_msg_data_t {
+	task_msg_data_type_e   type;
+	rtsp_server_t         *server;
+	rtsp_server_session_t *session;
+	rtsp_message_t        *message;
+};
+
+static apt_bool_t rtsp_server_task_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+
+static apt_bool_t rtsp_server_on_connect(apt_net_server_task_t *task, apt_net_server_connection_t *connection);
+static apt_bool_t rtsp_server_on_disconnect(apt_net_server_task_t *task, apt_net_server_connection_t *connection);
+static apt_bool_t rtsp_server_message_receive(apt_net_server_task_t *task, apt_net_server_connection_t *connection);
+
+static const apt_net_server_vtable_t server_vtable = {
+	rtsp_server_on_connect,
+	rtsp_server_on_disconnect,
+	rtsp_server_message_receive
+};
+
+static apt_bool_t rtsp_server_message_send(rtsp_server_t *server, apt_net_server_connection_t *connection, rtsp_message_t *message);
+
+/** Create RTSP server */
+RTSP_DECLARE(rtsp_server_t*) rtsp_server_create(
+										const char *listen_ip,
+										apr_port_t listen_port,
+										apr_size_t max_connection_count,
+										void *obj,
+										const rtsp_server_vtable_t *handler,
+										apr_pool_t *pool)
+{
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+	rtsp_server_t *server;
+
+	if(!listen_ip) {
+		return NULL;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Create RTSP Server %s:%hu [%d]",listen_ip,listen_port,max_connection_count);
+	server = apr_palloc(pool,sizeof(rtsp_server_t));
+	server->pool = pool;
+	server->obj = obj;
+	server->vtable = handler;
+
+	msg_pool = apt_task_msg_pool_create_dynamic(sizeof(task_msg_data_t),pool);
+
+	server->task = apt_net_server_task_create(
+						listen_ip,listen_port,max_connection_count,
+						server,&server_vtable,msg_pool,pool);
+	if(!server->task) {
+		return NULL;
+	}
+
+	vtable = apt_net_server_task_vtable_get(server->task);
+	if(vtable) {
+		vtable->process_msg = rtsp_server_task_msg_process;
+	}
+
+	server->sub_pool = apt_subpool_create(pool);
+	server->connection_list = NULL;
+	return server;
+}
+
+/** Destroy RTSP server */
+RTSP_DECLARE(apt_bool_t) rtsp_server_destroy(rtsp_server_t *server)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Destroy RTSP Server");
+	return apt_net_server_task_destroy(server->task);
+}
+
+/** Start connection agent. */
+RTSP_DECLARE(apt_bool_t) rtsp_server_start(rtsp_server_t *server)
+{
+	return apt_net_server_task_start(server->task);
+}
+
+/** Terminate connection agent. */
+RTSP_DECLARE(apt_bool_t) rtsp_server_terminate(rtsp_server_t *server)
+{
+	return apt_net_server_task_terminate(server->task);
+}
+
+/** Get task */
+RTSP_DECLARE(apt_task_t*) rtsp_server_task_get(rtsp_server_t *server)
+{
+	return apt_net_server_task_base_get(server->task);
+}
+
+/** Get external object */
+RTSP_DECLARE(void*) rtsp_server_object_get(rtsp_server_t *server)
+{
+	return server->obj;
+}
+
+/** Get object associated with the session */
+RTSP_DECLARE(void*) rtsp_server_session_object_get(const rtsp_server_session_t *session)
+{
+	return session->obj;
+}
+
+/** Set object associated with the session */
+RTSP_DECLARE(void) rtsp_server_session_object_set(rtsp_server_session_t *session, void *obj)
+{
+	session->obj = obj;
+}
+
+/** Get the session identifier */
+RTSP_DECLARE(const apt_str_t*) rtsp_server_session_id_get(const rtsp_server_session_t *session)
+{
+	return &session->id;
+}
+
+/** Get active request */
+RTSP_DECLARE(const rtsp_message_t*) rtsp_server_session_request_get(const rtsp_server_session_t *session)
+{
+	return session->active_request;
+}
+
+/** Get the session destination (client) ip address */
+RTSP_DECLARE(const char*) rtsp_server_session_destination_get(const rtsp_server_session_t *session)
+{
+	if(session->connection) {
+		return session->connection->base->client_ip;
+	}
+	return NULL;
+}
+
+/** Signal task message */
+static apt_bool_t rtsp_server_control_message_signal(
+								task_msg_data_type_e type,
+								rtsp_server_t *server,
+								rtsp_server_session_t *session,
+								rtsp_message_t *message)
+{
+	apt_task_t *task = apt_net_server_task_base_get(server->task);
+	apt_task_msg_t *task_msg = apt_task_msg_get(task);
+	if(task_msg) {
+		task_msg_data_t *data = (task_msg_data_t*)task_msg->data;
+		data->type = type;
+		data->server = server;
+		data->session = session;
+		data->message = message;
+		apt_task_msg_signal(task,task_msg);
+	}
+	return TRUE;
+}
+
+/** Signal RTSP message */
+RTSP_DECLARE(apt_bool_t) rtsp_server_session_respond(rtsp_server_t *server, rtsp_server_session_t *session, rtsp_message_t *message)
+{
+	return rtsp_server_control_message_signal(TASK_MSG_SEND_MESSAGE,server,session,message);
+}
+
+/** Signal terminate response */
+RTSP_DECLARE(apt_bool_t) rtsp_server_session_terminate(rtsp_server_t *server, rtsp_server_session_t *session)
+{
+	return rtsp_server_control_message_signal(TASK_MSG_TERMINATE_SESSION,server,session,NULL);
+}
+
+/* Create RTSP session */
+static rtsp_server_session_t* rtsp_server_session_create(rtsp_server_t *server)
+{
+	rtsp_server_session_t *session;
+	apr_pool_t *pool = apt_pool_create();
+	session = apr_palloc(pool,sizeof(rtsp_server_session_t));
+	session->pool = pool;
+	session->obj = NULL;
+	session->last_cseq = 0;
+	session->active_request = NULL;
+	session->request_queue = apt_list_create(pool);
+	session->terminating = FALSE;
+
+	apt_string_reset(&session->url);
+	apt_unique_id_generate(&session->id,RTSP_SESSION_ID_HEX_STRING_LENGTH,pool);
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create RTSP Session "APT_SID_FMT,session->id.buf);
+	if(server->vtable->create_session(server,session) != TRUE) {
+		apr_pool_destroy(pool);
+		return NULL;
+	}
+	return session;
+}
+
+/* Destroy RTSP session */
+static void rtsp_server_session_destroy(rtsp_server_session_t *session)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy RTSP Session "APT_SID_FMT,session->id.buf);
+	if(session && session->pool) {
+		apr_pool_destroy(session->pool);
+	}
+}
+
+/* Finally terminate RTSP session */
+static apt_bool_t rtsp_server_session_do_terminate(rtsp_server_t *server, rtsp_server_session_t *session)
+{		
+	rtsp_server_connection_t *rtsp_connection = session->connection;
+
+	if(session->active_request) {
+		rtsp_message_t *response = rtsp_response_create(session->active_request,
+			RTSP_STATUS_CODE_OK,RTSP_REASON_PHRASE_OK,session->active_request->pool);
+		if(response) {
+			if(session->id.buf) {
+				response->header.session_id = session->id;
+				rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_SESSION_ID);
+			}
+
+			if(rtsp_connection) {
+				rtsp_server_message_send(server,rtsp_connection->base,response);
+			}
+		}
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remove RTSP Session "APT_SID_FMT,session->id.buf);
+	apr_hash_set(rtsp_connection->session_table,session->id.buf,session->id.length,NULL);
+	rtsp_server_session_destroy(session);
+
+	if(rtsp_connection && !rtsp_connection->it) {
+		if(apr_hash_count(rtsp_connection->session_table) == 0) {
+			apt_net_server_connection_destroy(rtsp_connection->base);
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t rtsp_server_error_respond(rtsp_server_t *server, rtsp_server_connection_t *rtsp_connection, rtsp_message_t *request, 
+											rtsp_status_code_e status_code, rtsp_reason_phrase_e reason)
+{
+	/* send error response to client */
+	rtsp_message_t *response = rtsp_response_create(request,status_code,reason,request->pool);
+	if(rtsp_server_message_send(server,rtsp_connection->base,response) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Send RTSP Response");
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static apt_bool_t rtsp_server_session_terminate_request(rtsp_server_t *server, rtsp_server_session_t *session)
+{
+	session->terminating = TRUE;
+	return server->vtable->terminate_session(server,session);
+}
+
+static apt_bool_t rtsp_server_session_message_handle(rtsp_server_t *server, rtsp_server_session_t *session, rtsp_message_t *message)
+{
+	if(message->start_line.common.request_line.method_id == RTSP_METHOD_TEARDOWN) {
+		rtsp_server_session_terminate_request(server,session);
+		return TRUE;
+	}
+
+	if(server->vtable->handle_message(server,session,message) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Handle Message "APT_SID_FMT,session->id.buf);
+		rtsp_server_error_respond(server,session->connection,message,
+								RTSP_STATUS_CODE_INTERNAL_SERVER_ERROR,
+								RTSP_REASON_PHRASE_INTERNAL_SERVER_ERROR);
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/* Process incoming SETUP request */
+static rtsp_server_session_t* rtsp_server_session_setup_process(rtsp_server_t *server, rtsp_server_connection_t *rtsp_connection, rtsp_message_t *message)
+{
+	rtsp_server_session_t *session = NULL;
+	if(message->start_line.common.request_line.method_id == RTSP_METHOD_SETUP) {
+		/* create new session */
+		session = rtsp_server_session_create(server);
+		session->connection = rtsp_connection;
+		session->url = message->start_line.common.request_line.url;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add RTSP Session "APT_SID_FMT,session->id.buf);
+		apr_hash_set(rtsp_connection->session_table,session->id.buf,session->id.length,session);
+	}
+	else if(message->start_line.common.request_line.method_id == RTSP_METHOD_DESCRIBE) {
+		/* create new session as a communication object */
+		session = rtsp_server_session_create(server);
+		session->connection = rtsp_connection;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add RTSP Session "APT_SID_FMT,session->id.buf);
+		apr_hash_set(rtsp_connection->session_table,session->id.buf,session->id.length,session);
+	}
+	else {
+		/* error case */
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Missing RTSP Session-ID");
+		rtsp_server_error_respond(server,rtsp_connection,message,
+								RTSP_STATUS_CODE_BAD_REQUEST,
+								RTSP_REASON_PHRASE_BAD_REQUEST);
+	}
+	return session;
+}
+
+/* Process incoming RTSP request */
+static apt_bool_t rtsp_server_session_request_process(rtsp_server_t *server, rtsp_server_connection_t *rtsp_connection, rtsp_message_t *message)
+{
+	rtsp_server_session_t *session = NULL;
+	if(message->start_line.message_type != RTSP_MESSAGE_TYPE_REQUEST) {
+		/* received response to ANNOUNCE request/event */
+		return TRUE;
+	}
+
+	if(rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_SESSION_ID) != TRUE) {
+		/* no session-id specified */
+		session = rtsp_server_session_setup_process(server,rtsp_connection,message);
+		if(session) {
+			session->active_request = message;
+			if(rtsp_server_session_message_handle(server,session,message) != TRUE) {
+				rtsp_server_session_destroy(session);
+			}
+		}
+		return TRUE;
+	}
+
+	/* existing session */
+	session = apr_hash_get(
+				rtsp_connection->session_table,
+				message->header.session_id.buf,
+				message->header.session_id.length);
+	if(!session) {
+		/* error case */
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Such RTSP Session "APT_SID_FMT,message->header.session_id.buf);
+		return rtsp_server_error_respond(server,rtsp_connection,message,
+								RTSP_STATUS_CODE_NOT_FOUND,
+								RTSP_REASON_PHRASE_NOT_FOUND);
+	}
+	
+	if(session->active_request) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Push RTSP Request to Queue "APT_SID_FMT,session->id.buf);
+		apt_list_push_back(session->request_queue,message,message->pool);
+		return TRUE;
+	}
+
+	/* handle the request */
+	session->active_request = message;
+	rtsp_server_session_message_handle(server,session,message);
+	return TRUE;
+}
+
+/* Process outgoing RTSP response */
+static apt_bool_t rtsp_server_session_response_process(rtsp_server_t *server, rtsp_server_session_t *session, rtsp_message_t *message)
+{
+	if(session->id.buf) {
+		message->header.session_id = session->id;
+		rtsp_header_property_add(&message->header.property_set,RTSP_HEADER_FIELD_SESSION_ID);
+	}
+
+	if(message->start_line.message_type == RTSP_MESSAGE_TYPE_REQUEST) {
+		/* RTSP ANNOUNCE request (asynch event) */
+		message->start_line.common.request_line.url = session->url;
+		message->header.cseq = session->last_cseq;
+		rtsp_header_property_add(&message->header.property_set,RTSP_HEADER_FIELD_CSEQ);
+		
+		rtsp_server_message_send(server,session->connection->base,message);
+		return TRUE;
+	}
+
+	session->last_cseq = message->header.cseq;
+	rtsp_server_message_send(server,session->connection->base,message);
+
+	if(session->active_request) {
+		rtsp_message_t *request = session->active_request;
+		if(request->start_line.common.request_line.method_id == RTSP_METHOD_SETUP) {
+			if(message->start_line.common.status_line.status_code != RTSP_STATUS_CODE_OK) {
+				rtsp_server_session_terminate_request(server,session);
+			}
+		}
+		else if(request->start_line.common.request_line.method_id == RTSP_METHOD_DESCRIBE) {
+			rtsp_server_session_terminate_request(server,session);
+		}
+	}
+
+	session->active_request = apt_list_pop_front(session->request_queue);
+	if(session->active_request) {
+		rtsp_server_session_message_handle(server,session,session->active_request);
+	}
+	return TRUE;
+}
+
+/* Send RTSP message through RTSP connection */
+static apt_bool_t rtsp_server_message_send(rtsp_server_t *server, apt_net_server_connection_t *connection, rtsp_message_t *message)
+{
+	apt_bool_t status = FALSE;
+	rtsp_server_connection_t *rtsp_connection;
+	apt_text_stream_t *stream;
+	rtsp_stream_result_e result;
+
+	if(!connection || !connection->sock) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No RTSP Connection");
+		return FALSE;
+	}
+	rtsp_connection = connection->obj;
+	stream = &rtsp_connection->tx_stream;
+		
+	rtsp_generator_message_set(rtsp_connection->generator,message);
+	do {
+		stream->text.length = sizeof(rtsp_connection->tx_buffer)-1;
+		stream->pos = stream->text.buf;
+		result = rtsp_generator_run(rtsp_connection->generator,stream);
+		if(result == RTSP_STREAM_MESSAGE_COMPLETE || result == RTSP_STREAM_MESSAGE_TRUNCATED) {
+			stream->text.length = stream->pos - stream->text.buf;
+			*stream->pos = '\0';
+
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Send RTSP Stream %s [%lu bytes]\n%s",
+				connection->id,
+				stream->text.length,
+				stream->text.buf);
+			if(apr_socket_send(connection->sock,stream->text.buf,&stream->text.length) == APR_SUCCESS) {
+				status = TRUE;
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Send RTSP Stream");
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Generate RTSP Stream");
+		}
+	}
+	while(result == RTSP_STREAM_MESSAGE_TRUNCATED);
+
+	return status;
+}
+
+static apt_bool_t rtsp_server_message_handler(void *obj, rtsp_message_t *message, rtsp_stream_result_e result)
+{
+	rtsp_server_connection_t *rtsp_connection = obj;
+	if(result == RTSP_STREAM_MESSAGE_COMPLETE) {
+		/* message is completely parsed */
+		apt_str_t *destination;
+		rtsp_message_t *message = rtsp_parser_message_get(rtsp_connection->parser);
+		destination = &message->header.transport.destination;
+		if(!destination->buf && rtsp_connection->base->client_ip) {
+			apt_string_assign(destination,rtsp_connection->base->client_ip,rtsp_connection->base->pool);
+		}
+		rtsp_server_session_request_process(rtsp_connection->server,rtsp_connection,message);
+	}
+	else if(result == RTSP_STREAM_MESSAGE_INVALID) {
+		/* error case */
+		rtsp_message_t *response;
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse RTSP Stream");
+		if(message) {
+			response = rtsp_response_create(message,RTSP_STATUS_CODE_BAD_REQUEST,
+									RTSP_REASON_PHRASE_BAD_REQUEST,message->pool);
+			if(rtsp_server_message_send(rtsp_connection->server,rtsp_connection->base,response) == FALSE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Send RTSP Response");
+			}
+		}
+	}
+	return TRUE;
+}
+
+/* Receive RTSP message through RTSP connection */
+static apt_bool_t rtsp_server_message_receive(apt_net_server_task_t *task, apt_net_server_connection_t *connection)
+{
+	rtsp_server_connection_t *rtsp_connection;
+	apr_status_t status;
+	apr_size_t offset;
+	apr_size_t length;
+	apt_text_stream_t *stream;
+
+	if(!connection || !connection->sock) {
+		return FALSE;
+	}
+	rtsp_connection = connection->obj;
+	stream = &rtsp_connection->rx_stream;
+
+	/* init length of the stream */
+	stream->text.length = sizeof(rtsp_connection->rx_buffer)-1;
+	/* calculate offset remaining from the previous receive / if any */
+	offset = stream->pos - stream->text.buf;
+	/* calculate available length */
+	length = stream->text.length - offset;
+	status = apr_socket_recv(connection->sock,stream->pos,&length);
+	if(status == APR_EOF || length == 0) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"TCP Peer Disconnected %s",connection->id);
+		return apt_net_server_connection_close(task,connection);
+	}
+	/* calculate actual length of the stream */
+	stream->text.length = offset + length;
+	stream->pos[length] = '\0';
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive RTSP Stream %s [%lu bytes]\n%s",
+		connection->id,
+		length,
+		stream->pos);
+
+	/* reset pos */
+	stream->pos = stream->text.buf;
+	/* walk through the stream parsing RTSP messages */
+	return rtsp_stream_walk(rtsp_connection->parser,stream,rtsp_server_message_handler,rtsp_connection);
+}
+
+/* New RTSP connection accepted */
+static apt_bool_t rtsp_server_on_connect(apt_net_server_task_t *task, apt_net_server_connection_t *connection)
+{
+	rtsp_server_t *server = apt_net_server_task_object_get(task);
+	rtsp_server_connection_t *rtsp_connection = apr_palloc(connection->pool,sizeof(rtsp_server_connection_t));
+	rtsp_connection->session_table = apr_hash_make(connection->pool);
+	apt_text_stream_init(&rtsp_connection->rx_stream,rtsp_connection->rx_buffer,sizeof(rtsp_connection->rx_buffer)-1);
+	apt_text_stream_init(&rtsp_connection->tx_stream,rtsp_connection->tx_buffer,sizeof(rtsp_connection->tx_buffer)-1);
+	rtsp_connection->parser = rtsp_parser_create(connection->pool);
+	rtsp_connection->generator = rtsp_generator_create(connection->pool);
+	rtsp_connection->base = connection;
+	connection->obj = rtsp_connection;
+	if(!server->connection_list) {
+		server->connection_list = apt_list_create(server->sub_pool);
+	}
+	rtsp_connection->server = server;
+	rtsp_connection->it = apt_list_push_back(server->connection_list,rtsp_connection,connection->pool);
+	return TRUE;
+}
+
+/* RTSP connection disconnected */
+static apt_bool_t rtsp_server_on_disconnect(apt_net_server_task_t *task, apt_net_server_connection_t *connection)
+{
+	apr_size_t remaining_sessions = 0;
+	rtsp_server_t *server = apt_net_server_task_object_get(task);
+	rtsp_server_connection_t *rtsp_connection = connection->obj;
+	apt_list_elem_remove(server->connection_list,rtsp_connection->it);
+	rtsp_connection->it = NULL;
+	if(apt_list_is_empty(server->connection_list) == TRUE) {
+		apr_pool_clear(server->sub_pool);
+		server->connection_list = NULL;
+	}
+
+	remaining_sessions = apr_hash_count(rtsp_connection->session_table);
+	if(remaining_sessions) {
+		rtsp_server_session_t *session;
+		void *val;
+		apr_hash_index_t *it;
+		apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Terminate Remaining RTSP Sessions [%d]",remaining_sessions);
+		it = apr_hash_first(connection->pool,rtsp_connection->session_table);
+		for(; it; it = apr_hash_next(it)) {
+			apr_hash_this(it,NULL,NULL,&val);
+			session = val;
+			if(session && session->terminating == FALSE) {
+				rtsp_server_session_terminate_request(server,session);
+			}
+		}
+	}
+	else {
+		apt_net_server_connection_destroy(connection);
+	}
+	return TRUE;
+}
+
+/* Process task message */
+static apt_bool_t rtsp_server_task_msg_process(apt_task_t *task, apt_task_msg_t *task_msg)
+{
+	apt_net_server_task_t *net_task = apt_task_object_get(task);
+	rtsp_server_t *server = apt_net_server_task_object_get(net_task);
+
+	task_msg_data_t *data = (task_msg_data_t*) task_msg->data;
+	switch(data->type) {
+		case TASK_MSG_SEND_MESSAGE:
+			rtsp_server_session_response_process(server,data->session,data->message);
+			break;
+		case TASK_MSG_TERMINATE_SESSION:
+			rtsp_server_session_do_terminate(server,data->session);
+			break;
+	}
+
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_start_line.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_start_line.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "rtsp_start_line.h"
+#include "apt_string_table.h"
+#include "apt_log.h"
+
+/** Protocol name used in version string */
+#define RTSP_NAME "RTSP"
+#define RTSP_NAME_LENGTH        (sizeof(RTSP_NAME)-1)
+
+/** Separators used in RTSP version string parse/generate */
+#define RTSP_NAME_VERSION_SEPARATOR        '/'
+#define RTSP_VERSION_MAJOR_MINOR_SEPARATOR '.'
+
+/** String table of RTSP methods (rtsp_method_id) */
+static const apt_str_table_item_t rtsp_method_string_table[] = {
+	{{"SETUP",    5},0},
+	{{"ANNOUNCE", 8},0},
+	{{"TEARDOWN", 8},0},
+	{{"DESCRIBE", 8},0}
+};
+
+/** String table of RTSP reason phrases (rtsp_reason_phrase_e) */
+static const apt_str_table_item_t rtsp_reason_string_table[] = {
+	{{"OK",                     2},0},
+	{{"Created",                7},0},
+	{{"Bad Request",           11},0},
+	{{"Unauthorized",          12},0},
+	{{"Not Found",              9},4},
+	{{"Method Not Allowed",    18},0},
+	{{"Not Acceptable",        14},4},
+	{{"Session Not Found",     17},0},
+	{{"Internal Server Error", 21},0},
+	{{"Not Implemented",       15},4}
+};
+
+/** Parse RTSP URI */
+static apt_bool_t rtsp_resource_uri_parse(const apt_str_t *field, rtsp_request_line_t *request_line, apr_pool_t *pool)
+{
+	char *str;
+	apt_str_t *url = &request_line->url;
+	if(!field->length || !field->buf) {
+		return FALSE;
+	}
+
+	apt_string_copy(url,field,pool);
+	if(url->buf[url->length-1] == '/') {
+		url->length--;
+		url->buf[url->length] = '\0';
+	}
+
+	str = strrchr(url->buf,'/');
+	if(str) {
+		str++;
+	}
+	request_line->resource_name = str;
+	return TRUE;
+}
+
+/** Parse RTSP version */
+static rtsp_version_e rtsp_version_parse(const apt_str_t *field)
+{
+	rtsp_version_e version = RTSP_VERSION_UNKNOWN;
+	const char *pos;
+	if(field->length <= RTSP_NAME_LENGTH || strncasecmp(field->buf,RTSP_NAME,RTSP_NAME_LENGTH) != 0) {
+		/* unexpected protocol name */
+		return version;
+	}
+
+	pos = field->buf + RTSP_NAME_LENGTH;
+	if(*pos == RTSP_NAME_VERSION_SEPARATOR) {
+		pos++;
+		switch(*pos) {
+			case '1': version = RTSP_VERSION_1; break;
+			default: ;
+		}
+	}
+	return version;
+}
+
+/** Generate RTSP version */
+static apt_bool_t rtsp_version_generate(rtsp_version_e version, apt_text_stream_t *stream)
+{
+	memcpy(stream->pos,RTSP_NAME,RTSP_NAME_LENGTH);
+	stream->pos += RTSP_NAME_LENGTH;
+	*stream->pos++ = RTSP_NAME_VERSION_SEPARATOR;
+	apt_size_value_generate(version,stream);
+	*stream->pos++ = RTSP_VERSION_MAJOR_MINOR_SEPARATOR;
+	*stream->pos++ = '0';
+	return TRUE;
+}
+
+/** Parse RTSP status-code */
+static APR_INLINE rtsp_status_code_e rtsp_status_code_parse(const apt_str_t *field)
+{
+	return apt_size_value_parse(field);
+}
+
+/** Generate RTSP status-code */
+static APR_INLINE apt_bool_t rtsp_status_code_generate(rtsp_status_code_e status_code, apt_text_stream_t *stream)
+{
+	return apt_size_value_generate(status_code,stream);
+}
+
+/** Generate RTSP request-line */
+static apt_bool_t rtsp_request_line_generate(rtsp_request_line_t *start_line, apt_text_stream_t *stream)
+{
+	const apt_str_t *method_name = apt_string_table_str_get(rtsp_method_string_table,RTSP_METHOD_COUNT,start_line->method_id);
+	if(!method_name) {
+		return FALSE;
+	}
+	start_line->method_name = *method_name;
+	apt_string_value_generate(&start_line->method_name,stream);
+	apt_text_space_insert(stream);
+
+	apt_string_value_generate(&start_line->url,stream);
+	apt_text_space_insert(stream);
+
+	rtsp_version_generate(start_line->version,stream);
+	return TRUE;
+}
+
+/** Generate RTSP status-line */
+static apt_bool_t rtsp_status_line_generate(rtsp_status_line_t *start_line, apt_text_stream_t *stream)
+{
+	rtsp_version_generate(start_line->version,stream);
+	apt_text_space_insert(stream);
+
+	rtsp_status_code_generate(start_line->status_code,stream);
+	apt_text_space_insert(stream);
+
+	apt_string_value_generate(&start_line->reason,stream);
+	return TRUE;
+}
+
+/** Parse RTSP start-line */
+RTSP_DECLARE(apt_bool_t) rtsp_start_line_parse(rtsp_start_line_t *start_line, apt_text_stream_t *stream, apr_pool_t *pool)
+{
+	apt_text_stream_t line;
+	apt_str_t field;
+	if(apt_text_line_read(stream,&line.text) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse RTSP start-line");
+		return FALSE;
+	}
+	line.pos = line.text.buf;
+
+	if(apt_text_field_read(&line,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot read the first field in start-line");
+		return FALSE;
+	}
+
+	if(field.buf == strstr(field.buf,RTSP_NAME)) {
+		/* parsing RTSP response */
+		rtsp_status_line_t  *status_line = &start_line->common.status_line;
+		start_line->message_type = RTSP_MESSAGE_TYPE_RESPONSE;
+		rtsp_status_line_init(status_line);
+
+		status_line->version = rtsp_version_parse(&field);
+
+		if(apt_text_field_read(&line,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse status-code in status-line");
+			return FALSE;
+		}
+		status_line->status_code = rtsp_status_code_parse(&field);
+
+		if(apt_text_field_read(&line,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse reason phrase in status-line");
+			return FALSE;
+		}
+		apt_string_copy(&status_line->reason,&field,pool);
+	}
+	else {
+		/* parsing RTSP request */
+		rtsp_request_line_t *request_line = &start_line->common.request_line;
+		start_line->message_type = RTSP_MESSAGE_TYPE_REQUEST;
+		rtsp_request_line_init(request_line);
+
+		apt_string_copy(&request_line->method_name,&field,pool);
+		request_line->method_id = apt_string_table_id_find(rtsp_method_string_table,RTSP_METHOD_COUNT,&field);
+
+		if(apt_text_field_read(&line,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse URL in request-line");
+			return FALSE;
+		}
+		rtsp_resource_uri_parse(&field,request_line,pool);
+
+		if(apt_text_field_read(&line,APT_TOKEN_SP,TRUE,&field) == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot parse version in request-line");
+			return FALSE;
+		}
+		request_line->version = rtsp_version_parse(&field);
+	}
+
+	return TRUE;
+}
+
+/** Generate RTSP start-line */
+RTSP_DECLARE(apt_bool_t) rtsp_start_line_generate(rtsp_start_line_t *start_line, apt_text_stream_t *stream)
+{
+	apt_bool_t status = FALSE;
+	switch(start_line->message_type) {
+		case RTSP_MESSAGE_TYPE_REQUEST:
+			status = rtsp_request_line_generate(&start_line->common.request_line,stream);
+			break;
+		case RTSP_MESSAGE_TYPE_RESPONSE:
+			status = rtsp_status_line_generate(&start_line->common.status_line,stream);
+			break;
+		default:
+			break;
+	}
+
+	if(status == TRUE) {
+		apt_text_eol_insert(stream);
+	}
+	
+	return status;
+}
+
+/** Get reason phrase by status code */
+RTSP_DECLARE(const apt_str_t*) rtsp_reason_phrase_get(rtsp_reason_phrase_e reason)
+{
+	return apt_string_table_str_get(rtsp_reason_string_table,RTSP_REASON_PHRASE_COUNT,reason);
+}

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_stream.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/src/rtsp_stream.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "rtsp_stream.h"
+#include "apt_log.h"
+
+/** RTSP parser */
+struct rtsp_parser_t {
+	rtsp_stream_result_e result;
+	char                *pos;
+	apt_bool_t           skip_lf;
+	rtsp_message_t      *message;
+	apr_pool_t          *pool;
+};
+
+/** RTSP generator */
+struct rtsp_generator_t {
+	rtsp_stream_result_e result;
+	char                *pos;
+	rtsp_message_t      *message;
+	apr_pool_t          *pool;
+};
+
+/** Read RTSP message-body */
+static rtsp_stream_result_e rtsp_message_body_read(rtsp_message_t *message, apt_text_stream_t *stream)
+{
+	rtsp_stream_result_e result = RTSP_STREAM_MESSAGE_COMPLETE;
+	if(message->body.buf) {
+		/* stream length available to read */
+		apr_size_t stream_length = stream->text.length - (stream->pos - stream->text.buf);
+		/* required/remaining length to read */
+		apr_size_t required_length = message->header.content_length - message->body.length;
+		if(required_length > stream_length) {
+			required_length = stream_length;
+			/* not complete */
+			result = RTSP_STREAM_MESSAGE_TRUNCATED;
+		}
+		memcpy(message->body.buf+message->body.length,stream->pos,required_length);
+		message->body.length += required_length;
+		stream->pos += required_length;
+		message->body.buf[message->body.length] = '\0';
+	}
+
+	return result;
+}
+
+/** Parse RTSP message-body */
+static rtsp_stream_result_e rtsp_message_body_parse(rtsp_message_t *message, apt_text_stream_t *stream, apr_pool_t *pool)
+{
+	if(rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH) == TRUE) {
+		if(message->header.content_length) {
+			apt_str_t *body = &message->body;
+			body->buf = apr_palloc(pool,message->header.content_length+1);
+			body->length = 0;
+			return rtsp_message_body_read(message,stream);
+		}
+	}
+	return RTSP_STREAM_MESSAGE_COMPLETE;
+}
+
+/** Write RTSP message-body */
+static rtsp_stream_result_e rtsp_message_body_write(rtsp_message_t *message, apt_text_stream_t *stream)
+{
+	rtsp_stream_result_e result = RTSP_STREAM_MESSAGE_COMPLETE;
+	if(message->body.length < message->header.content_length) {
+		/* stream length available to write */
+		apr_size_t stream_length = stream->text.length - (stream->pos - stream->text.buf);
+		/* required/remaining length to write */
+		apr_size_t required_length = message->header.content_length - message->body.length;
+		if(required_length > stream_length) {
+			required_length = stream_length;
+			/* not complete */
+			result = RTSP_STREAM_MESSAGE_TRUNCATED;
+		}
+
+		memcpy(stream->pos,message->body.buf+message->body.length,required_length);
+		message->body.length += required_length;
+		stream->pos += required_length;
+	}
+
+	return result;
+}
+
+/** Generate RTSP message-body */
+static rtsp_stream_result_e rtsp_message_body_generate(rtsp_message_t *message, apt_text_stream_t *stream, apr_pool_t *pool)
+{
+	if(rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH) == TRUE) {
+		if(message->header.content_length) {
+			apt_str_t *body = &message->body;
+			body->length = 0;
+			return rtsp_message_body_write(message,stream);
+		}
+	}
+	return RTSP_STREAM_MESSAGE_COMPLETE;
+}
+
+/** Create RTSP parser */
+RTSP_DECLARE(rtsp_parser_t*) rtsp_parser_create(apr_pool_t *pool)
+{
+	rtsp_parser_t *parser = apr_palloc(pool,sizeof(rtsp_parser_t));
+	parser->result = RTSP_STREAM_MESSAGE_INVALID;
+	parser->pos = NULL;
+	parser->skip_lf = FALSE;
+	parser->message = NULL;
+	parser->pool = pool;
+	return parser;
+}
+
+static rtsp_stream_result_e rtsp_parser_break(rtsp_parser_t *parser, apt_text_stream_t *stream)
+{
+	/* failed to parse either start-line or header */
+	if(apt_text_is_eos(stream) == TRUE) {
+		/* end of stream reached, rewind/restore stream */
+		stream->pos = parser->pos;
+		parser->result = RTSP_STREAM_MESSAGE_TRUNCATED;
+		parser->message = NULL;
+	}
+	else {
+		/* error case */
+		parser->result = RTSP_STREAM_MESSAGE_INVALID;
+	}
+	return parser->result;
+}
+
+/** Parse RTSP stream */
+RTSP_DECLARE(rtsp_stream_result_e) rtsp_parser_run(rtsp_parser_t *parser, apt_text_stream_t *stream)
+{
+	rtsp_message_t *message = parser->message;
+	if(message && parser->result == RTSP_STREAM_MESSAGE_TRUNCATED) {
+		/* process continuation data */
+		parser->result = rtsp_message_body_read(message,stream);
+		return parser->result;
+	}
+
+	/* create new RTSP message */
+	message = rtsp_message_create(RTSP_MESSAGE_TYPE_UNKNOWN,parser->pool);
+	parser->message = message;
+	/* store current position to be able to rewind/restore stream if needed */
+	parser->pos = stream->pos;
+	/* parse start-line */
+	if(rtsp_start_line_parse(&message->start_line,stream,message->pool) == FALSE) {
+		return rtsp_parser_break(parser,stream);
+	}
+	/* parse header */
+	if(rtsp_header_parse(&message->header,stream,message->pool) == FALSE) {
+		return rtsp_parser_break(parser,stream);
+	}
+	/* parse body */
+	parser->result = rtsp_message_body_parse(message,stream,message->pool);
+	
+	/* in the worst case message segmentation may occur between  and  
+	   of the final empty header */
+	if(!message->body.length && *(stream->pos-1)== APT_TOKEN_CR) {
+		/* if this is the case be prepared to skip  */
+		parser->skip_lf = TRUE;
+	}
+	return parser->result;
+}
+
+/** Get parsed RTSP message */
+RTSP_DECLARE(rtsp_message_t*) rtsp_parser_message_get(const rtsp_parser_t *parser)
+{
+	return parser->message;
+}
+
+
+/** Create RTSP stream generator */
+RTSP_DECLARE(rtsp_generator_t*) rtsp_generator_create(apr_pool_t *pool)
+{
+	rtsp_generator_t *generator = apr_palloc(pool,sizeof(rtsp_generator_t));
+	generator->result = RTSP_STREAM_MESSAGE_INVALID;
+	generator->pos = NULL;
+	generator->message = NULL;
+	generator->pool = pool;
+	return generator;
+}
+
+/** Set RTSP message to generate */
+RTSP_DECLARE(apt_bool_t) rtsp_generator_message_set(rtsp_generator_t *generator, rtsp_message_t *message)
+{
+	if(!message) {
+		return FALSE;
+	}
+	generator->message = message;
+	return TRUE;
+}
+
+static rtsp_stream_result_e rtsp_generator_break(rtsp_generator_t *generator, apt_text_stream_t *stream)
+{
+	/* failed to generate either start-line or header */
+	if(apt_text_is_eos(stream) == TRUE) {
+		/* end of stream reached, rewind/restore stream */
+		stream->pos = generator->pos;
+		generator->result = RTSP_STREAM_MESSAGE_TRUNCATED;
+	}
+	else {
+		/* error case */
+		generator->result = RTSP_STREAM_MESSAGE_INVALID;
+	}
+	return generator->result;
+}
+
+/** Generate RTSP stream */
+RTSP_DECLARE(rtsp_stream_result_e) rtsp_generator_run(rtsp_generator_t *generator, apt_text_stream_t *stream)
+{
+	rtsp_message_t *message = generator->message;
+	if(!message) {
+		return RTSP_STREAM_MESSAGE_INVALID;
+	}
+
+	if(message && generator->result == RTSP_STREAM_MESSAGE_TRUNCATED) {
+		/* process continuation data */
+		generator->result = rtsp_message_body_write(message,stream);
+		return generator->result;
+	}
+
+	/* generate start-line */
+	if(rtsp_start_line_generate(&message->start_line,stream) == FALSE) {
+		return rtsp_generator_break(generator,stream);
+	}
+
+	/* generate header */
+	if(rtsp_header_generate(&message->header,stream) == FALSE) {
+		return rtsp_generator_break(generator,stream);
+	}
+
+	/* generate body */
+	generator->result = rtsp_message_body_generate(message,stream,message->pool);
+	return generator->result;
+}
+
+
+/** Walk through RTSP stream and invoke message handler for each parsed message */
+RTSP_DECLARE(apt_bool_t) rtsp_stream_walk(rtsp_parser_t *parser, apt_text_stream_t *stream, rtsp_message_handler_f handler, void *obj)
+{
+	rtsp_stream_result_e result;
+	if(parser->skip_lf == TRUE) {
+		/* skip  occurred as a result of message segmentation between  and  */
+		apt_text_char_skip(stream,APT_TOKEN_LF);
+		parser->skip_lf = FALSE;
+	}
+	do {
+		result = rtsp_parser_run(parser,stream);
+		if(result == RTSP_STREAM_MESSAGE_COMPLETE) {
+			/* message is completely parsed */
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Parsed RTSP Message [%lu]", stream->pos - stream->text.buf);
+			/* invoke message handler */
+			handler(obj,parser->message,result);
+		}
+		else if(result == RTSP_STREAM_MESSAGE_TRUNCATED) {
+			/* message is partially parsed, to be continued */
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Truncated RTSP Message [%lu]", stream->pos - stream->text.buf);
+			/* prepare stream for further processing */
+			if(apt_text_stream_scroll(stream) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Scroll RTSP Stream", stream->text.buf);
+			}
+			return TRUE;
+		}
+		else if(result == RTSP_STREAM_MESSAGE_INVALID){
+			/* error case */
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse RTSP Message");
+			/* invoke message handler */
+			handler(obj,parser->message,result);
+			/* reset stream pos */
+			stream->pos = stream->text.buf;
+			return FALSE;
+		}
+	}
+	while(apt_text_is_eos(stream) == FALSE);
+
+	/* reset stream pos */
+	stream->pos = stream->text.buf;
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,195 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/modules/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+SUBDIRS                = mrcp-sofiasip mrcp-unirtsp

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,21 @@
+MAINTAINERCLEANFILES 	   = Makefile.in
+
+INCLUDES                   = -Iinclude \
+                             -I$(top_srcdir)/libs/mrcpv2-transport/include \
+                             -I$(top_srcdir)/libs/mrcp-signaling/include \
+                             -I$(top_srcdir)/libs/mrcp/include \
+                             -I$(top_srcdir)/libs/mrcp/message/include \
+                             -I$(top_srcdir)/libs/mrcp/control/include \
+                             -I$(top_srcdir)/libs/mrcp/resources/include \
+                             -I$(top_srcdir)/libs/mpf/include \
+                             -I$(top_srcdir)/libs/apr-toolkit/include \
+                             $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) $(UNIMRCP_SOFIA_INCLUDES)
+
+noinst_LTLIBRARIES         = libmrcpsofiasip.la
+
+include_HEADERS            = include/mrcp_sdp.h \
+                             include/mrcp_sofiasip_server_agent.h \
+                             include/mrcp_sofiasip_client_agent.h
+libmrcpsofiasip_la_SOURCES = src/mrcp_sdp.c \
+                             src/mrcp_sofiasip_server_agent.c \
+                             src/mrcp_sofiasip_client_agent.c

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sdp.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sdp.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SDP_H__
+#define __MRCP_SDP_H__
+
+/**
+ * @file mrcp_sdp.h
+ * @brief MRCP SDP Transformations
+ */ 
+
+#include "mrcp_sig_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Generate SDP string by MRCP descriptor */
+MRCP_DECLARE(apr_size_t) sdp_string_generate_by_mrcp_descriptor(char *buffer, apr_size_t size, const mrcp_session_descriptor_t *descriptor, apt_bool_t offer);
+
+/** Generate MRCP descriptor by SDP session */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_descriptor_generate_by_sdp_session(const sdp_session_t *sdp, const char *force_destination_ip, apr_pool_t *pool);
+
+/** Generate SDP resource discovery string */
+MRCP_DECLARE(apr_size_t) sdp_resource_discovery_string_generate(const char *ip, const char *origin, char *buffer, apr_size_t size);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SDP_H__*/

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sofiasip_client_agent.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sofiasip_client_agent.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SOFIASIP_CLIENT_AGENT_H__
+#define __MRCP_SOFIASIP_CLIENT_AGENT_H__
+
+/**
+ * @file mrcp_sofiasip_client_agent.h
+ * @brief Implementation of MRCP Signaling Interface using Sofia-SIP
+ */ 
+
+#include 
+#include "mrcp_sig_agent.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Sofia-SIP config declaration */
+typedef struct mrcp_sofia_client_config_t mrcp_sofia_client_config_t;
+
+/** Sofia-SIP config */
+struct mrcp_sofia_client_config_t {
+	/** Local IP address */
+	char      *local_ip;
+	/** External (NAT) IP address */
+	char      *ext_ip;
+	/** Local SIP port */
+	apr_port_t local_port;
+	/** Local SIP user name */
+	char      *local_user_name;
+	
+	/** Remote IP address */
+	char      *remote_ip;
+	/** Remote SIP port */
+	apr_port_t remote_port;
+	/** Remote SIP user name */
+	char      *remote_user_name;
+
+	/** Force destination ip address. Should be used only in case 
+	SDP contains incorrect connection address (local IP address behind NAT) */
+	apt_bool_t force_destination;
+
+	/** User agent name */
+	char      *user_agent_name;
+	/** SDP origin */
+	char      *origin;
+	/** SIP transport */
+	char      *transport;
+};
+
+/**
+ * Create Sofia-SIP signaling agent.
+ */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_sofiasip_client_agent_create(mrcp_sofia_client_config_t *config, apr_pool_t *pool);
+
+/**
+ * Allocate Sofia-SIP config.
+ */
+MRCP_DECLARE(mrcp_sofia_client_config_t*) mrcp_sofiasip_client_config_alloc(apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SOFIASIP_CLIENT_AGENT_H__*/

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sofiasip_server_agent.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/include/mrcp_sofiasip_server_agent.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_SOFIASIP_SERVER_AGENT_H__
+#define __MRCP_SOFIASIP_SERVER_AGENT_H__
+
+/**
+ * @file mrcp_sofiasip_server_agent.h
+ * @brief Implementation of MRCP Signaling Interface using Sofia-SIP
+ */ 
+
+#include 
+#include "mrcp_sig_agent.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Sofia-SIP config declaration */
+typedef struct mrcp_sofia_server_config_t mrcp_sofia_server_config_t;
+
+/** Sofia-SIP config */
+struct mrcp_sofia_server_config_t {
+	/** Local IP address to bind to */
+	char      *local_ip;
+	/** External (NAT) IP address */
+	char      *ext_ip;
+	/** Local port to bind to */
+	apr_port_t local_port;
+
+	/** SIP user name */
+	char      *user_name;
+	/** User agent name */
+	char      *user_agent_name;
+	/** SDP origin */
+	char      *origin;
+	/** SIP transport */
+	char      *transport;
+
+	/** Force destination ip address. Should be used only in case 
+	SDP contains incorrect connection address (local IP address behind NAT) */
+	apt_bool_t force_destination;
+};
+
+/**
+ * Create Sofia-SIP signaling agent.
+ */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_sofiasip_server_agent_create(mrcp_sofia_server_config_t *config, apr_pool_t *pool);
+
+/**
+ * Allocate Sofia-SIP config.
+ */
+MRCP_DECLARE(mrcp_sofia_server_config_t*) mrcp_sofiasip_server_config_alloc(apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_SOFIASIP_SERVER_AGENT_H__*/

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,167 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sdp.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sdp.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,395 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include 
+#include 
+#include "mrcp_sdp.h"
+#include "mrcp_session_descriptor.h"
+#include "mrcp_control_descriptor.h"
+#include "mpf_rtp_attribs.h"
+#include "apt_text_stream.h"
+#include "apt_log.h"
+
+static apr_size_t sdp_rtp_media_generate(char *buffer, apr_size_t size, const mrcp_session_descriptor_t *descriptor, const mpf_rtp_media_descriptor_t *audio_descriptor);
+static apr_size_t sdp_control_media_generate(char *buffer, apr_size_t size, const mrcp_session_descriptor_t *descriptor, const mrcp_control_descriptor_t *control_media, apt_bool_t offer);
+
+static apt_bool_t mpf_rtp_media_generate(mpf_rtp_media_descriptor_t *rtp_media, const sdp_media_t *sdp_media, const apt_str_t *ip, apr_pool_t *pool);
+static apt_bool_t mrcp_control_media_generate(mrcp_control_descriptor_t *mrcp_media, const sdp_media_t *sdp_media, const apt_str_t *ip, apr_pool_t *pool);
+
+/** Generate SDP string by MRCP descriptor */
+MRCP_DECLARE(apr_size_t) sdp_string_generate_by_mrcp_descriptor(char *buffer, apr_size_t size, const mrcp_session_descriptor_t *descriptor, apt_bool_t offer)
+{
+	apr_size_t i;
+	apr_size_t count;
+	apr_size_t audio_index = 0;
+	mpf_rtp_media_descriptor_t *audio_media;
+	apr_size_t video_index = 0;
+	mpf_rtp_media_descriptor_t *video_media;
+	apr_size_t control_index = 0;
+	mrcp_control_descriptor_t *control_media;
+	apr_size_t offset = 0;
+	const char *ip = descriptor->ext_ip.buf ? descriptor->ext_ip.buf : (descriptor->ip.buf ? descriptor->ip.buf : "0.0.0.0");
+	buffer[0] = '\0';
+	offset += snprintf(buffer+offset,size-offset,
+			"v=0\r\n"
+			"o=%s 0 0 IN IP4 %s\r\n"
+			"s=-\r\n"
+			"c=IN IP4 %s\r\n"
+			"t=0 0\r\n",
+			descriptor->origin.buf ? descriptor->origin.buf : "-",
+			ip,
+			ip);
+	count = mrcp_session_media_count_get(descriptor);
+	for(i=0; ibase.id == i) {
+			/* generate audio media */
+			audio_index++;
+			offset += sdp_rtp_media_generate(buffer+offset,size-offset,descriptor,audio_media);
+			continue;
+		}
+		video_media = mrcp_session_video_media_get(descriptor,video_index);
+		if(video_media && video_media->base.id == i) {
+			/* generate video media */
+			video_index++;
+			offset += sdp_rtp_media_generate(buffer+offset,size-offset,descriptor,video_media);
+			continue;
+		}
+		control_media = mrcp_session_control_media_get(descriptor,control_index);
+		if(control_media && control_media->id == i) {
+			/** generate mrcp control media */
+			control_index++;
+			offset += sdp_control_media_generate(buffer+offset,size-offset,descriptor,control_media,offer);
+			continue;
+		}
+	}
+	return offset;
+}
+
+/** Generate MRCP descriptor by SDP session */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_descriptor_generate_by_sdp_session(const sdp_session_t *sdp, const char *force_destination_ip, apr_pool_t *pool)
+{
+	sdp_media_t *sdp_media;
+	mrcp_session_descriptor_t *descriptor;
+
+	if(!sdp) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Invalid SDP Message");
+		return NULL;
+	}
+	
+	descriptor = mrcp_session_descriptor_create(pool);
+
+	if(force_destination_ip) {
+		apt_string_assign(&descriptor->ip,force_destination_ip,pool);
+	}
+	else if(sdp->sdp_connection) {
+		apt_string_assign(&descriptor->ip,sdp->sdp_connection->c_address,pool);
+	}
+
+	for(sdp_media=sdp->sdp_media; sdp_media; sdp_media=sdp_media->m_next) {
+		switch(sdp_media->m_type) {
+			case sdp_media_audio:
+			{
+				mpf_rtp_media_descriptor_t *media = apr_palloc(pool,sizeof(mpf_rtp_media_descriptor_t));
+				mpf_rtp_media_descriptor_init(media);
+				media->base.id = mrcp_session_audio_media_add(descriptor,media);
+				mpf_rtp_media_generate(media,sdp_media,&descriptor->ip,pool);
+				break;
+			}
+			case sdp_media_video:
+			{
+				mpf_rtp_media_descriptor_t *media = apr_palloc(pool,sizeof(mpf_rtp_media_descriptor_t));
+				mpf_rtp_media_descriptor_init(media);
+				media->base.id = mrcp_session_video_media_add(descriptor,media);
+				mpf_rtp_media_generate(media,sdp_media,&descriptor->ip,pool);
+				break;
+			}
+			case sdp_media_application:
+			{
+				mrcp_control_descriptor_t *control_media = apr_palloc(pool,sizeof(mrcp_control_descriptor_t));
+				mrcp_control_descriptor_init(control_media);
+				control_media->id = mrcp_session_control_media_add(descriptor,control_media);
+				mrcp_control_media_generate(control_media,sdp_media,&descriptor->ip,pool);
+				break;
+			}
+			default:
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Not Supported SDP Media [%s]", sdp_media->m_type_name);
+				break;
+		}
+	}
+	return descriptor;
+}
+
+
+/** Generate SDP media by RTP media descriptor */
+static apr_size_t sdp_rtp_media_generate(char *buffer, apr_size_t size, const mrcp_session_descriptor_t *descriptor, const mpf_rtp_media_descriptor_t *audio_media)
+{
+	apr_size_t offset = 0;
+	int i;
+	mpf_codec_descriptor_t *codec_descriptor;
+	apr_array_header_t *descriptor_arr = audio_media->codec_list.descriptor_arr;
+	if(!descriptor_arr) {
+		return 0;
+	}
+	offset += snprintf(buffer+offset,size-offset,
+		"m=audio %d RTP/AVP", 
+		audio_media->base.state == MPF_MEDIA_ENABLED ? audio_media->base.port : 0);
+	for(i=0; inelts; i++) {
+		codec_descriptor = (mpf_codec_descriptor_t*)descriptor_arr->elts + i;
+		if(codec_descriptor->enabled == TRUE) {
+			offset += snprintf(buffer+offset,size-offset," %d", codec_descriptor->payload_type);
+		}
+	}
+	offset += snprintf(buffer+offset,size-offset,"\r\n");
+	if(descriptor->ip.length && audio_media->base.ip.length && 
+		apt_string_compare(&descriptor->ip,&audio_media->base.ip) != TRUE) {
+		const char *media_ip = audio_media->base.ext_ip.buf ? audio_media->base.ext_ip.buf : audio_media->base.ip.buf;
+		offset += sprintf(buffer+offset,"c=IN IP4 %s\r\n",media_ip);
+	}
+	if(audio_media->base.state == MPF_MEDIA_ENABLED) {
+		const apt_str_t *mode_str = mpf_stream_mode_str_get(audio_media->mode);
+		for(i=0; inelts; i++) {
+			codec_descriptor = (mpf_codec_descriptor_t*)descriptor_arr->elts + i;
+			if(codec_descriptor->enabled == TRUE && codec_descriptor->name.buf) {
+				offset += snprintf(buffer+offset,size-offset,"a=rtpmap:%d %s/%d\r\n",
+					codec_descriptor->payload_type,
+					codec_descriptor->name.buf,
+					codec_descriptor->sampling_rate);
+			}
+		}
+		offset += snprintf(buffer+offset,size-offset,"a=%s\r\n",mode_str ? mode_str->buf : "");
+		
+		if(audio_media->ptime) {
+			offset += snprintf(buffer+offset,size-offset,"a=ptime:%hu\r\n",audio_media->ptime);
+		}
+	}
+	offset += snprintf(buffer+offset,size-offset,"a=mid:%d\r\n",audio_media->mid);
+	return offset;
+}
+
+/** Generate SDP media by MRCP control media descriptor */
+static apr_size_t sdp_control_media_generate(char *buffer, apr_size_t size, const mrcp_session_descriptor_t *descriptor, const mrcp_control_descriptor_t *control_media, apt_bool_t offer)
+{
+	apr_size_t offset = 0;
+	const apt_str_t *proto;
+	const apt_str_t *setup_type;
+	const apt_str_t *connection_type;
+	proto = mrcp_proto_get(control_media->proto);
+	setup_type = mrcp_setup_type_get(control_media->setup_type);
+	connection_type = mrcp_connection_type_get(control_media->connection_type);
+	if(offer == TRUE) { /* offer */
+		if(control_media->port) {
+			offset += snprintf(buffer+offset,size-offset,
+				"m=application %d %s 1\r\n"
+				"a=setup:%s\r\n"
+				"a=connection:%s\r\n"
+				"a=resource:%s\r\n"
+				"a=cmid:%d\r\n",
+				control_media->port,
+				proto ? proto->buf : "",
+				setup_type ? setup_type->buf : "",
+				connection_type ? connection_type->buf : "",
+				control_media->resource_name.buf,
+				control_media->cmid);
+		}
+		else {
+			offset += snprintf(buffer+offset,size-offset,
+				"m=application %d %s 1\r\n"
+				"a=resource:%s\r\n"
+				"a=cmid:%d\r\n",
+				control_media->port,
+				proto ? proto->buf : "",
+				control_media->resource_name.buf,
+				control_media->cmid);
+		}
+	}
+	else { /* answer */
+		if(control_media->port) {
+			offset += sprintf(buffer+offset,
+				"m=application %d %s 1\r\n"
+				"a=setup:%s\r\n"
+				"a=connection:%s\r\n"
+				"a=channel:%s@%s\r\n"
+				"a=cmid:%d\r\n",
+				control_media->port,
+				proto ? proto->buf : "",
+				setup_type ? setup_type->buf : "",
+				connection_type ? connection_type->buf : "",
+				control_media->session_id.buf,
+				control_media->resource_name.buf,
+				control_media->cmid);
+		}
+		else {
+			offset += sprintf(buffer+offset,
+				"m=application %d %s 1\r\n"
+				"a=channel:%s@%s\r\n"
+				"a=cmid:%d\r\n",
+				control_media->port,
+				proto ? proto->buf : "",
+				control_media->session_id.buf,
+				control_media->resource_name.buf,
+				control_media->cmid);
+		}
+	}
+
+	return offset;
+}
+
+/** Generate RTP media descriptor by SDP media */
+static apt_bool_t mpf_rtp_media_generate(mpf_rtp_media_descriptor_t *rtp_media, const sdp_media_t *sdp_media, const apt_str_t *ip, apr_pool_t *pool)
+{
+	mpf_rtp_attrib_e id;
+	apt_str_t name;
+	sdp_attribute_t *attrib = NULL;
+	sdp_rtpmap_t *map;
+	mpf_codec_descriptor_t *codec;
+	for(attrib = sdp_media->m_attributes; attrib; attrib=attrib->a_next) {
+		apt_string_set(&name,attrib->a_name);
+		id = mpf_rtp_attrib_id_find(&name);
+		switch(id) {
+			case RTP_ATTRIB_MID:
+				rtp_media->mid = atoi(attrib->a_value);
+				break;
+			case RTP_ATTRIB_PTIME:
+				rtp_media->ptime = (apr_uint16_t)atoi(attrib->a_value);
+				break;
+			default:
+				break;
+		}
+	}
+
+	mpf_codec_list_init(&rtp_media->codec_list,5,pool);
+	for(map = sdp_media->m_rtpmaps; map; map = map->rm_next) {
+		codec = mpf_codec_list_add(&rtp_media->codec_list);
+		if(codec) {
+			codec->payload_type = (apr_byte_t)map->rm_pt;
+			apt_string_assign(&codec->name,map->rm_encoding,pool);
+			codec->sampling_rate = (apr_uint16_t)map->rm_rate;
+			codec->channel_count = 1;
+		}
+	}
+
+	switch(sdp_media->m_mode) {
+		case sdp_inactive:
+			rtp_media->mode = STREAM_MODE_NONE;
+			break;
+		case sdp_sendonly:
+			rtp_media->mode = STREAM_MODE_SEND;
+			break;
+		case sdp_recvonly:
+			rtp_media->mode = STREAM_MODE_RECEIVE;
+			break;
+		case sdp_sendrecv:
+			rtp_media->mode = STREAM_MODE_SEND_RECEIVE;
+			break;
+	}
+
+	if(sdp_media->m_connections) {
+		apt_string_assign(&rtp_media->base.ip,sdp_media->m_connections->c_address,pool);
+	}
+	else {
+		rtp_media->base.ip = *ip;
+	}
+	if(sdp_media->m_port) {
+		rtp_media->base.port = (apr_port_t)sdp_media->m_port;
+		rtp_media->base.state = MPF_MEDIA_ENABLED;
+	}
+	else {
+		rtp_media->base.state = MPF_MEDIA_DISABLED;
+	}
+	return TRUE;
+}
+
+/** Generate MRCP control media by SDP media */
+static apt_bool_t mrcp_control_media_generate(mrcp_control_descriptor_t *control_media, const sdp_media_t *sdp_media, const apt_str_t *ip, apr_pool_t *pool)
+{
+	mrcp_attrib_e id;
+	apt_str_t name;
+	apt_str_t value;
+	sdp_attribute_t *attrib = NULL;
+	apt_string_set(&name,sdp_media->m_proto_name);
+	control_media->proto = mrcp_proto_find(&name);
+	if(control_media->proto != MRCP_PROTO_TCP) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Not supported SDP Proto [%s], expected [%s]",sdp_media->m_proto_name,mrcp_proto_get(MRCP_PROTO_TCP));
+		return FALSE;
+	}
+	
+	for(attrib = sdp_media->m_attributes; attrib; attrib=attrib->a_next) {
+		apt_string_set(&name,attrib->a_name);
+		id = mrcp_attrib_id_find(&name);
+		switch(id) {
+			case MRCP_ATTRIB_SETUP:
+				apt_string_set(&value,attrib->a_value);
+				control_media->setup_type = mrcp_setup_type_find(&value);
+				break;
+			case MRCP_ATTRIB_CONNECTION:
+				apt_string_set(&value,attrib->a_value);
+				control_media->connection_type = mrcp_connection_type_find(&value);
+				break;
+			case MRCP_ATTRIB_RESOURCE:
+				apt_string_assign(&control_media->resource_name,attrib->a_value,pool);
+				break;
+			case MRCP_ATTRIB_CHANNEL:
+				apt_string_set(&value,attrib->a_value);
+				apt_id_resource_parse(&value,'@',&control_media->session_id,&control_media->resource_name,pool);
+				break;
+			case MRCP_ATTRIB_CMID:
+				control_media->cmid = atoi(attrib->a_value);
+				break;
+			default:
+				break;
+		}
+	}
+
+	if(sdp_media->m_connections) {
+		apt_string_assign(&control_media->ip,sdp_media->m_connections->c_address,pool);
+	}
+	else {
+		control_media->ip = *ip;
+	}
+	control_media->port = (apr_port_t)sdp_media->m_port;
+	return TRUE;
+}
+
+/** Generate SDP resource discovery string */
+MRCP_DECLARE(apr_size_t) sdp_resource_discovery_string_generate(const char *ip, const char *origin, char *buffer, apr_size_t size)
+{
+	apr_size_t offset = 0;
+	if(!ip) {
+		ip = "0.0.0.0";
+	}
+	if(!origin) {
+		origin = "-";
+	}
+	buffer[0] = '\0';
+	offset += snprintf(buffer+offset,size-offset,
+			"v=0\r\n"
+			"o=%s 0 0 IN IP4 %s\r\n"
+			"s=-\r\n"
+			"c=IN IP4 %s\r\n"
+			"t=0 0\r\n"
+			"m=application 0 TCP/MRCPv2 1\r\n"
+			"a=resource:speechsynth\r\n"
+			"a=resource:speechrecog\r\n"
+			"m=audio 0 RTP/AVP 0 8\r\n"
+			"a=rtpmap:0 PCMU/8000\r\n"
+			"a=rtpmap:8 PCMA/8000\r\n",
+			origin,
+			ip,
+			ip);
+	return offset;
+}

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,528 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+typedef struct mrcp_sofia_agent_t mrcp_sofia_agent_t;
+#define NUA_MAGIC_T mrcp_sofia_agent_t
+
+typedef struct mrcp_sofia_session_t mrcp_sofia_session_t;
+#define NUA_HMAGIC_T mrcp_sofia_session_t
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "mrcp_sofiasip_client_agent.h"
+#include "mrcp_session.h"
+#include "mrcp_session_descriptor.h"
+#include "mrcp_sdp.h"
+#include "apt_log.h"
+
+#define SOFIA_TASK_NAME "SofiaSIP Agent"
+
+struct mrcp_sofia_agent_t {
+	mrcp_sig_agent_t           *sig_agent;
+
+	mrcp_sofia_client_config_t *config;
+	char                       *sip_contact_str;
+	char                       *sip_to_str;
+	char                       *sip_from_str;
+	char                       *sip_bind_str;
+
+	su_root_t                  *root;
+	nua_t                      *nua;
+};
+
+struct mrcp_sofia_session_t {
+	mrcp_session_t     *session;
+	su_home_t          *home;
+	nua_handle_t       *nh;
+
+	apt_bool_t          terminate_requested;
+	apr_thread_mutex_t *mutex;
+};
+
+/* Task Interface */
+static void mrcp_sofia_task_initialize(apt_task_t *task);
+static apt_bool_t mrcp_sofia_task_run(apt_task_t *task);
+static apt_bool_t mrcp_sofia_task_terminate(apt_task_t *task);
+
+/* MRCP Signaling Interface */
+static apt_bool_t mrcp_sofia_session_offer(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_sofia_session_terminate_request(mrcp_session_t *session);
+static apt_bool_t mrcp_sofia_session_discover_request(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+
+static const mrcp_session_request_vtable_t session_request_vtable = {
+	mrcp_sofia_session_offer,
+	mrcp_sofia_session_terminate_request,
+	NULL,
+	mrcp_sofia_session_discover_request
+};
+
+static apt_bool_t mrcp_sofia_config_validate(mrcp_sofia_agent_t *sofia_agent, mrcp_sofia_client_config_t *config, apr_pool_t *pool);
+static apt_bool_t mrcp_sofia_session_create(mrcp_session_t *session);
+
+static void mrcp_sofia_event_callback( nua_event_t           nua_event,
+									   int                   status,
+									   char const           *phrase,
+									   nua_t                *nua,
+									   mrcp_sofia_agent_t   *sofia_agent,
+									   nua_handle_t         *nh,
+									   mrcp_sofia_session_t *sofia_session,
+									   sip_t const          *sip,
+									   tagi_t                tags[]);
+
+
+/** Create Sofia-SIP Signaling Agent */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_sofiasip_client_agent_create(mrcp_sofia_client_config_t *config, apr_pool_t *pool)
+{
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	mrcp_sofia_agent_t *sofia_agent;
+	sofia_agent = apr_palloc(pool,sizeof(mrcp_sofia_agent_t));
+	sofia_agent->sig_agent = mrcp_signaling_agent_create(sofia_agent,MRCP_VERSION_2,pool);
+	sofia_agent->sig_agent->create_client_session = mrcp_sofia_session_create;
+	sofia_agent->root = NULL;
+	sofia_agent->nua = NULL;
+
+	if(mrcp_sofia_config_validate(sofia_agent,config,pool) == FALSE) {
+		return NULL;
+	}
+
+	task = apt_task_create(sofia_agent,NULL,pool);
+	if(!task) {
+		return NULL;
+	}
+	apt_task_name_set(task,SOFIA_TASK_NAME);
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->on_pre_run = mrcp_sofia_task_initialize;
+		vtable->run = mrcp_sofia_task_run;
+		vtable->terminate = mrcp_sofia_task_terminate;
+	}
+	sofia_agent->sig_agent->task = task;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "SOFIA_TASK_NAME" ["SOFIA_SIP_VERSION"] %s:%hu -> %s:%hu %s",
+			config->local_ip,config->local_port,
+			config->remote_ip,config->remote_port,
+			config->transport ? config->transport : "");
+	return sofia_agent->sig_agent;
+}
+
+/** Allocate Sofia-SIP config */
+MRCP_DECLARE(mrcp_sofia_client_config_t*) mrcp_sofiasip_client_config_alloc(apr_pool_t *pool)
+{
+	mrcp_sofia_client_config_t *config = apr_palloc(pool,sizeof(mrcp_sofia_client_config_t));
+	config->local_ip = NULL;
+	config->ext_ip = NULL;
+	config->local_port = 0;
+	config->local_user_name = NULL;
+	config->remote_ip = NULL;
+	config->remote_port = 0;
+	config->remote_user_name = NULL;
+
+	config->force_destination = FALSE;
+	
+	config->user_agent_name = NULL;
+	config->origin = NULL;
+	config->transport = NULL;
+	return config;
+}
+
+static apt_bool_t mrcp_sofia_config_validate(mrcp_sofia_agent_t *sofia_agent, mrcp_sofia_client_config_t *config, apr_pool_t *pool)
+{
+	const char *local_ip = config->ext_ip ? config->ext_ip : config->local_ip;
+	if(!config->local_ip || !config->remote_ip) {
+		return FALSE;
+	}
+
+	sofia_agent->config = config;
+	sofia_agent->sip_contact_str = apr_psprintf(pool,"sip:%s:%d", local_ip, config->local_port);
+	sofia_agent->sip_from_str = apr_psprintf(pool,"sip:%s:%d", local_ip, config->local_port);
+
+	if(config->remote_user_name && config->remote_user_name != '\0') {
+		sofia_agent->sip_to_str = apr_psprintf(pool,"sip:%s@%s:%d",
+										config->remote_user_name,
+										config->remote_ip,
+										config->remote_port);
+	}
+	else {
+		sofia_agent->sip_to_str = apr_psprintf(pool,"sip:%s:%d",
+										config->remote_ip,
+										config->remote_port);
+	}
+	if(config->transport) {
+		sofia_agent->sip_bind_str = apr_psprintf(pool,"sip:%s:%d;transport=%s",
+										config->local_ip,
+										config->local_port,
+										config->transport);
+	}
+	else {
+		sofia_agent->sip_bind_str = apr_psprintf(pool,"sip:%s:%d",
+										config->local_ip,
+										config->local_port);
+	}
+	return TRUE;
+}
+
+static void mrcp_sofia_task_initialize(apt_task_t *task)
+{
+	mrcp_sofia_agent_t *sofia_agent = apt_task_object_get(task);
+
+	/* Initialize Sofia-SIP library and create event loop */
+	su_init();
+	sofia_agent->root = su_root_create(NULL);
+
+	/* Create a user agent instance. The stack will call the 'event_callback()' 
+	 * callback when events such as succesful registration to network, 
+	 * an incoming call, etc, occur. 
+	 */
+	sofia_agent->nua = nua_create(
+					sofia_agent->root,         /* Event loop */
+					mrcp_sofia_event_callback, /* Callback for processing events */
+					sofia_agent,               /* Additional data to pass to callback */
+					NUTAG_URL(sofia_agent->sip_bind_str), /* Address to bind to */
+					TAG_END());                /* Last tag should always finish the sequence */
+	if(sofia_agent->nua) {
+		nua_set_params(
+					sofia_agent->nua,
+					NUTAG_AUTOANSWER(0),
+					NUTAG_APPL_METHOD("OPTIONS"),
+					SIPTAG_USER_AGENT_STR(sofia_agent->config->user_agent_name),
+					TAG_END());
+	}
+}
+
+static apt_bool_t mrcp_sofia_task_run(apt_task_t *task)
+{
+	mrcp_sofia_agent_t *sofia_agent = apt_task_object_get(task);
+
+	if(sofia_agent->nua) {
+		/* Run event loop */
+		su_root_run(sofia_agent->root);
+		
+		/* Destroy allocated resources */
+		nua_destroy(sofia_agent->nua);
+		sofia_agent->nua = NULL;
+	}
+	su_root_destroy(sofia_agent->root);
+	sofia_agent->root = NULL;
+	su_deinit();
+
+	apt_task_child_terminate(task);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_sofia_task_terminate(apt_task_t *task)
+{
+	mrcp_sofia_agent_t *sofia_agent = apt_task_object_get(task);
+	if(sofia_agent->nua) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Send Shutdown Signal to NUA");
+		nua_shutdown(sofia_agent->nua);
+	}
+	return TRUE;
+}
+
+static APR_INLINE mrcp_sofia_agent_t* mrcp_sofia_agent_get(mrcp_session_t *session)
+{
+	return session->signaling_agent->obj;
+}
+
+static apt_bool_t mrcp_sofia_session_create(mrcp_session_t *session)
+{
+	mrcp_sofia_agent_t *sofia_agent = mrcp_sofia_agent_get(session);
+	mrcp_sofia_session_t *sofia_session;
+	session->request_vtable = &session_request_vtable;
+
+	sofia_session = apr_palloc(session->pool,sizeof(mrcp_sofia_session_t));
+	sofia_session->mutex = NULL;
+	sofia_session->home = su_home_new(sizeof(*sofia_session->home));
+	sofia_session->session = session;
+	sofia_session->terminate_requested = FALSE;
+	session->obj = sofia_session;
+	
+	sofia_session->nh = nua_handle(
+				sofia_agent->nua,
+				sofia_session,
+				SIPTAG_TO_STR(sofia_agent->sip_to_str),
+				SIPTAG_FROM_STR(sofia_agent->sip_from_str),
+				SIPTAG_CONTACT_STR(sofia_agent->sip_contact_str),
+				TAG_END());
+
+	apr_thread_mutex_create(&sofia_session->mutex,APR_THREAD_MUTEX_DEFAULT,session->pool);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_sofia_session_destroy(mrcp_sofia_session_t *sofia_session)
+{
+	if(sofia_session->mutex) {
+		apr_thread_mutex_destroy(sofia_session->mutex);
+		sofia_session->mutex = NULL;
+	}
+	if(sofia_session->home) {
+		su_home_unref(sofia_session->home);
+		sofia_session->home = NULL;
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_sofia_session_unref(mrcp_sofia_session_t *sofia_session)
+{
+	if(sofia_session->nh) {
+		nua_handle_bind(sofia_session->nh, NULL);
+		nua_handle_destroy(sofia_session->nh);
+		sofia_session->nh = NULL;
+	}
+	sofia_session->session = NULL;
+	return TRUE;
+}
+
+static apt_bool_t mrcp_sofia_session_offer(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	char sdp_str[2048];
+	char *local_sdp_str = NULL;
+	apt_bool_t res = FALSE;
+	mrcp_sofia_session_t *sofia_session = session->obj;
+	if(!sofia_session) {
+		return FALSE;
+	}
+
+	if(session->signaling_agent) {
+		mrcp_sofia_agent_t *sofia_agent = mrcp_sofia_agent_get(session);
+		if(sofia_agent) {
+			if(sofia_agent->config->origin) {
+				apt_string_set(&descriptor->origin,sofia_agent->config->origin);
+			}
+		}
+	}
+	if(sdp_string_generate_by_mrcp_descriptor(sdp_str,sizeof(sdp_str),descriptor,TRUE) > 0) {
+		local_sdp_str = sdp_str;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Local SDP "APT_PTRSID_FMT"\n%s", 
+			MRCP_SESSION_PTRSID(session), 
+			local_sdp_str);
+	}
+
+	apr_thread_mutex_lock(sofia_session->mutex);
+
+	if(sofia_session->nh) {
+		res = TRUE;
+		nua_invite(sofia_session->nh,
+				TAG_IF(local_sdp_str,SOATAG_USER_SDP_STR(local_sdp_str)),
+				TAG_END());
+	}
+
+	apr_thread_mutex_unlock(sofia_session->mutex);
+	return res;
+}
+
+static apt_bool_t mrcp_sofia_session_terminate_request(mrcp_session_t *session)
+{
+	mrcp_sofia_session_t *sofia_session = session->obj;
+	if(!sofia_session) {
+		return FALSE;
+	}
+
+	sofia_session->terminate_requested = FALSE;
+	apr_thread_mutex_lock(sofia_session->mutex);
+	if(sofia_session->nh) {
+		sofia_session->terminate_requested = TRUE;
+		nua_bye(sofia_session->nh,TAG_END());
+	}
+	apr_thread_mutex_unlock(sofia_session->mutex);
+
+	if(sofia_session->terminate_requested == FALSE) {
+		mrcp_sofia_session_destroy(sofia_session);
+		mrcp_session_terminate_response(session);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_sofia_session_discover_request(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	apt_bool_t res = FALSE;
+	mrcp_sofia_session_t *sofia_session = session->obj;
+	if(!sofia_session) {
+		return FALSE;
+	}
+	
+	apr_thread_mutex_lock(sofia_session->mutex);
+	if(sofia_session->nh) {
+		res = TRUE;
+		nua_options(sofia_session->nh,TAG_END());
+	}
+	apr_thread_mutex_unlock(sofia_session->mutex);
+	return res;
+}
+
+static void mrcp_sofia_on_session_ready(
+						int                   status,
+						mrcp_sofia_agent_t   *sofia_agent,
+						nua_handle_t         *nh,
+						mrcp_sofia_session_t *sofia_session,
+						sip_t const          *sip,
+						tagi_t                tags[])
+{
+	mrcp_session_t *session = sofia_session->session;
+	if(session) {
+		const char *local_sdp_str = NULL, *remote_sdp_str = NULL;
+		mrcp_session_descriptor_t *descriptor = NULL;
+
+		tl_gets(tags, 
+				SOATAG_LOCAL_SDP_STR_REF(local_sdp_str),
+				SOATAG_REMOTE_SDP_STR_REF(remote_sdp_str),
+				TAG_END());
+
+		if(remote_sdp_str) {
+			sdp_parser_t *parser = NULL;
+			sdp_session_t *sdp = NULL;
+			const char *force_destination_ip = NULL;
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remote SDP "APT_PTRSID_FMT"\n%s",
+				MRCP_SESSION_PTRSID(session),
+				remote_sdp_str);
+
+			parser = sdp_parse(sofia_session->home,remote_sdp_str,(int)strlen(remote_sdp_str),0);
+			sdp = sdp_session(parser);
+			if(sofia_agent && sofia_agent->config->force_destination == TRUE) {
+				force_destination_ip = sofia_agent->config->remote_ip;
+			}
+			descriptor = mrcp_descriptor_generate_by_sdp_session(sdp,force_destination_ip,session->pool);
+			sdp_parser_free(parser);
+		}
+
+		mrcp_session_answer(session,descriptor);
+	}
+}
+
+static void mrcp_sofia_on_session_terminate(
+						int                   status,
+						mrcp_sofia_agent_t   *sofia_agent,
+						nua_handle_t         *nh,
+						mrcp_sofia_session_t *sofia_session,
+						sip_t const          *sip,
+						tagi_t                tags[])
+{
+	mrcp_session_t *session = sofia_session->session;
+	if(session) {
+		apt_bool_t terminate_requested;
+	
+		apr_thread_mutex_lock(sofia_session->mutex);
+		terminate_requested = sofia_session->terminate_requested;
+		session = sofia_session->session;
+		mrcp_sofia_session_unref(sofia_session);
+		apr_thread_mutex_unlock(sofia_session->mutex);
+
+		if(terminate_requested == TRUE) {
+			mrcp_sofia_session_destroy(sofia_session);
+			mrcp_session_terminate_response(session);
+		}
+		else {
+			mrcp_session_terminate_event(session);
+		}
+	}
+}
+
+static void mrcp_sofia_on_state_change(
+						int                   status,
+						mrcp_sofia_agent_t   *sofia_agent,
+						nua_handle_t         *nh,
+						mrcp_sofia_session_t *sofia_session,
+						sip_t const          *sip,
+						tagi_t                tags[])
+{
+	int ss_state = nua_callstate_init;
+	tl_gets(tags,
+			NUTAG_CALLSTATE_REF(ss_state),
+			TAG_END());
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"SIP Call State "APT_PTR_FMT" [%s]",
+		sofia_session ? MRCP_SESSION_PTR(sofia_session->session) : NULL,
+		nua_callstate_name(ss_state));
+
+	switch(ss_state) {
+		case nua_callstate_ready:
+			mrcp_sofia_on_session_ready(status,sofia_agent,nh,sofia_session,sip,tags);
+			break;
+		case nua_callstate_terminated:
+			mrcp_sofia_on_session_terminate(status,sofia_agent,nh,sofia_session,sip,tags);
+			break;
+	}
+}
+
+static void mrcp_sofia_on_resource_discover(
+						int                   status,
+						mrcp_sofia_agent_t   *sofia_agent,
+						nua_handle_t         *nh,
+						mrcp_sofia_session_t *sofia_session,
+						sip_t const          *sip,
+						tagi_t                tags[])
+{
+	mrcp_session_t *session = sofia_session->session;
+	if(session) {
+		const char *remote_sdp_str = NULL;
+		mrcp_session_descriptor_t *descriptor = NULL;
+
+		tl_gets(tags, 
+				SOATAG_REMOTE_SDP_STR_REF(remote_sdp_str),
+				TAG_END());
+
+		if(remote_sdp_str) {
+			sdp_parser_t *parser = NULL;
+			sdp_session_t *sdp = NULL;
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Resource Discovery SDP "APT_PTR_FMT"\n%s", 
+				MRCP_SESSION_PTR(session),
+				remote_sdp_str);
+
+			parser = sdp_parse(sofia_session->home,remote_sdp_str,(int)strlen(remote_sdp_str),0);
+			sdp = sdp_session(parser);
+			descriptor = mrcp_descriptor_generate_by_sdp_session(sdp,NULL,session->pool);
+			sdp_parser_free(parser);
+		}
+
+		mrcp_session_discover_response(session,descriptor);
+	}
+}
+
+/** This callback will be called by SIP stack to process incoming events */
+static void mrcp_sofia_event_callback( 
+						nua_event_t           nua_event,
+						int                   status,
+						char const           *phrase,
+						nua_t                *nua,
+						mrcp_sofia_agent_t   *sofia_agent,
+						nua_handle_t         *nh,
+						mrcp_sofia_session_t *sofia_session,
+						sip_t const          *sip,
+						tagi_t                tags[])
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive SIP Event [%s] Status %d %s",
+		nua_event_name(nua_event),status,phrase);
+
+	switch(nua_event) {
+		case nua_i_state:
+			mrcp_sofia_on_state_change(status,sofia_agent,nh,sofia_session,sip,tags);
+			break;
+		case nua_r_options:
+			mrcp_sofia_on_resource_discover(status,sofia_agent,nh,sofia_session,sip,tags);
+			break;
+		case nua_r_shutdown:
+			/* break main loop of sofia thread */
+			su_root_break(sofia_agent->root);
+			break;
+		default: 
+			break;
+	}
+}

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,434 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+typedef struct mrcp_sofia_agent_t mrcp_sofia_agent_t;
+#define NUA_MAGIC_T mrcp_sofia_agent_t
+
+typedef struct mrcp_sofia_session_t mrcp_sofia_session_t;
+#define NUA_HMAGIC_T mrcp_sofia_session_t
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "mrcp_sofiasip_server_agent.h"
+#include "mrcp_session.h"
+#include "mrcp_session_descriptor.h"
+#include "mrcp_sdp.h"
+#include "apt_log.h"
+
+#define SOFIA_TASK_NAME "SofiaSIP Agent"
+
+struct mrcp_sofia_agent_t {
+	mrcp_sig_agent_t           *sig_agent;
+
+	mrcp_sofia_server_config_t *config;
+	char                       *sip_contact_str;
+	char                       *sip_bind_str;
+
+	su_root_t                  *root;
+	nua_t                      *nua;
+};
+
+struct mrcp_sofia_session_t {
+	mrcp_session_t *session;
+	su_home_t      *home;
+	nua_handle_t   *nh;
+};
+
+/* Task Interface */
+static void mrcp_sofia_task_initialize(apt_task_t *task);
+static apt_bool_t mrcp_sofia_task_run(apt_task_t *task);
+static apt_bool_t mrcp_sofia_task_terminate(apt_task_t *task);
+
+/* MRCP Signaling Interface */
+static apt_bool_t mrcp_sofia_on_session_answer(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_sofia_on_session_terminate(mrcp_session_t *session);
+
+static const mrcp_session_response_vtable_t session_response_vtable = {
+	mrcp_sofia_on_session_answer,
+	mrcp_sofia_on_session_terminate
+};
+
+static apt_bool_t mrcp_sofia_config_validate(mrcp_sofia_agent_t *sofia_agent, mrcp_sofia_server_config_t *config, apr_pool_t *pool);
+
+static void mrcp_sofia_event_callback( nua_event_t           nua_event,
+									   int                   status,
+									   char const           *phrase,
+									   nua_t                *nua,
+									   mrcp_sofia_agent_t   *sofia_agent,
+									   nua_handle_t         *nh,
+									   mrcp_sofia_session_t *sofia_session,
+									   sip_t const          *sip,
+									   tagi_t                tags[]);
+
+
+/** Create Sofia-SIP Signaling Agent */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_sofiasip_server_agent_create(mrcp_sofia_server_config_t *config, apr_pool_t *pool)
+{
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	mrcp_sofia_agent_t *sofia_agent;
+	sofia_agent = apr_palloc(pool,sizeof(mrcp_sofia_agent_t));
+	sofia_agent->sig_agent = mrcp_signaling_agent_create(sofia_agent,MRCP_VERSION_2,pool);
+	sofia_agent->config = config;
+	sofia_agent->root = NULL;
+	sofia_agent->nua = NULL;
+
+	if(mrcp_sofia_config_validate(sofia_agent,config,pool) == FALSE) {
+		return NULL;
+	}
+
+	task = apt_task_create(sofia_agent,NULL,pool);
+	if(!task) {
+		return NULL;
+	}
+	apt_task_name_set(task,SOFIA_TASK_NAME);
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->on_pre_run = mrcp_sofia_task_initialize;
+		vtable->run = mrcp_sofia_task_run;
+		vtable->terminate = mrcp_sofia_task_terminate;
+	}
+	sofia_agent->sig_agent->task = task;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "SOFIA_TASK_NAME" ["SOFIA_SIP_VERSION"] %s:%hu %s",
+								config->local_ip,
+								config->local_port,
+								config->transport ? config->transport : "");
+	return sofia_agent->sig_agent;
+}
+
+/** Allocate Sofia-SIP config */
+MRCP_DECLARE(mrcp_sofia_server_config_t*) mrcp_sofiasip_server_config_alloc(apr_pool_t *pool)
+{
+	mrcp_sofia_server_config_t *config = apr_palloc(pool,sizeof(mrcp_sofia_server_config_t));
+	config->local_ip = NULL;
+	config->ext_ip = NULL;
+	config->local_port = 0;
+	config->user_name = NULL;
+	config->user_agent_name = NULL;
+	config->origin = NULL;
+	config->transport = NULL;
+	config->force_destination = FALSE;
+	return config;
+}
+
+static apt_bool_t mrcp_sofia_config_validate(mrcp_sofia_agent_t *sofia_agent, mrcp_sofia_server_config_t *config, apr_pool_t *pool)
+{
+	const char *local_ip = config->ext_ip ? config->ext_ip : config->local_ip;
+	sofia_agent->config = config;
+	sofia_agent->sip_contact_str = apr_psprintf(pool,"sip:%s:%d",local_ip,config->local_port);
+	if(config->transport) {
+		sofia_agent->sip_bind_str = apr_psprintf(pool,"sip:%s:%d;transport=%s",
+											config->local_ip,
+											config->local_port,
+											config->transport);
+	}
+	else {
+		sofia_agent->sip_bind_str = apr_psprintf(pool,"sip:%s:%d",
+											config->local_ip,
+											config->local_port);
+	}
+	return TRUE;
+}
+
+static void mrcp_sofia_task_initialize(apt_task_t *task)
+{
+	mrcp_sofia_agent_t *sofia_agent = apt_task_object_get(task);
+
+	/* Initialize Sofia-SIP library and create event loop */
+	su_init();
+	sofia_agent->root = su_root_create(NULL);
+
+	/* Create a user agent instance. The stack will call the 'event_callback()' 
+	 * callback when events such as succesful registration to network, 
+	 * an incoming call, etc, occur. 
+	 */
+	sofia_agent->nua = nua_create(
+					sofia_agent->root,         /* Event loop */
+					mrcp_sofia_event_callback, /* Callback for processing events */
+					sofia_agent,               /* Additional data to pass to callback */
+					NUTAG_URL(sofia_agent->sip_bind_str), /* Address to bind to */
+					TAG_END());                /* Last tag should always finish the sequence */
+	if(sofia_agent->nua) {
+		nua_set_params(
+					sofia_agent->nua,
+					NUTAG_AUTOANSWER(0),
+					NUTAG_APPL_METHOD("OPTIONS"),
+					SIPTAG_USER_AGENT_STR(sofia_agent->config->user_agent_name),
+					TAG_END());
+	}
+}
+
+static apt_bool_t mrcp_sofia_task_run(apt_task_t *task)
+{
+	mrcp_sofia_agent_t *sofia_agent = apt_task_object_get(task);
+
+	if(sofia_agent->nua) {
+		/* Run event loop */
+		su_root_run(sofia_agent->root);
+		
+		/* Destroy allocated resources */
+		nua_destroy(sofia_agent->nua);
+		sofia_agent->nua = NULL;
+	}
+	su_root_destroy(sofia_agent->root);
+	sofia_agent->root = NULL;
+	su_deinit();
+
+	apt_task_child_terminate(task);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_sofia_task_terminate(apt_task_t *task)
+{
+	mrcp_sofia_agent_t *sofia_agent = apt_task_object_get(task);
+	if(sofia_agent->nua) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Send Shutdown Signal to NUA");
+		nua_shutdown(sofia_agent->nua);
+	}
+	return TRUE;
+}
+
+static mrcp_sofia_session_t* mrcp_sofia_session_create(mrcp_sofia_agent_t *sofia_agent, nua_handle_t *nh)
+{
+	mrcp_sofia_session_t *sofia_session;
+	mrcp_session_t* session = sofia_agent->sig_agent->create_server_session(sofia_agent->sig_agent);
+	if(!session) {
+		return NULL;
+	}
+	session->response_vtable = &session_response_vtable;
+	session->event_vtable = NULL;
+
+	sofia_session = apr_palloc(session->pool,sizeof(mrcp_sofia_session_t));
+	sofia_session->home = su_home_new(sizeof(*sofia_session->home));
+	sofia_session->session = session;
+	session->obj = sofia_session;
+	
+	nua_handle_bind(nh, sofia_session);
+	sofia_session->nh = nh;
+	return sofia_session;
+}
+
+static int sip_status_get(mrcp_session_status_e status)
+{
+	switch (status) {
+		case MRCP_SESSION_STATUS_OK:
+			return 200;
+		case MRCP_SESSION_STATUS_NO_SUCH_RESOURCE:
+			return 404;
+		case MRCP_SESSION_STATUS_UNACCEPTABLE_RESOURCE:
+			return 406;
+		case MRCP_SESSION_STATUS_UNAVAILABLE_RESOURCE:
+			return 480;
+		case MRCP_SESSION_STATUS_ERROR:
+			return 500;
+	}
+	return 200;
+}
+
+static apt_bool_t mrcp_sofia_on_session_answer(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor)
+{
+	mrcp_sofia_session_t *sofia_session = session->obj;
+	mrcp_sofia_agent_t *sofia_agent = session->signaling_agent->obj;
+	const char *local_sdp_str = NULL;
+	char sdp_str[2048];
+
+	if(!sofia_agent || !sofia_session || !sofia_session->nh) {
+		return FALSE;
+	}
+
+	if(descriptor->status != MRCP_SESSION_STATUS_OK) {
+		int status = sip_status_get(descriptor->status);
+		nua_respond(sofia_session->nh, status, sip_status_phrase(status),
+					SIPTAG_CONTACT_STR(sofia_agent->sip_contact_str),
+					TAG_END());
+		return TRUE;
+	}
+
+	if(sofia_agent->config->origin) {
+		apt_string_set(&descriptor->origin,sofia_agent->config->origin);
+	}
+
+	if(sdp_string_generate_by_mrcp_descriptor(sdp_str,sizeof(sdp_str),descriptor,FALSE) > 0) {
+		local_sdp_str = sdp_str;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Local SDP\n%s", local_sdp_str);
+	}
+
+	nua_respond(sofia_session->nh, SIP_200_OK, 
+				SIPTAG_CONTACT_STR(sofia_agent->sip_contact_str),
+				TAG_IF(local_sdp_str,SOATAG_USER_SDP_STR(local_sdp_str)),
+			    NUTAG_AUTOANSWER(0),
+				TAG_END());
+	
+	return TRUE;
+}
+
+static apt_bool_t mrcp_sofia_on_session_terminate(mrcp_session_t *session)
+{
+	mrcp_sofia_session_t *sofia_session = session->obj;
+	if(sofia_session) {
+		if(sofia_session->nh) {
+			nua_handle_bind(sofia_session->nh, NULL);
+			nua_handle_destroy(sofia_session->nh);
+		}
+		if(sofia_session->home) {
+			su_home_unref(sofia_session->home);
+			sofia_session->home = NULL;
+		}
+		sofia_session->session = NULL;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy Session "APT_SID_FMT, MRCP_SESSION_SID(session));
+	mrcp_session_destroy(session);
+	return TRUE;
+}
+
+static void mrcp_sofia_on_call_receive(mrcp_sofia_agent_t   *sofia_agent,
+									   nua_handle_t         *nh,
+									   mrcp_sofia_session_t *sofia_session,
+									   sip_t const          *sip,
+									   tagi_t                tags[])
+{
+	int offer_recv = 0, answer_recv = 0, offer_sent = 0, answer_sent = 0;
+	const char *local_sdp_str = NULL, *remote_sdp_str = NULL;
+	mrcp_session_descriptor_t *descriptor = NULL;
+
+	tl_gets(tags, 
+			NUTAG_OFFER_RECV_REF(offer_recv),
+			NUTAG_ANSWER_RECV_REF(answer_recv),
+			NUTAG_OFFER_SENT_REF(offer_sent),
+			NUTAG_ANSWER_SENT_REF(answer_sent),
+			SOATAG_LOCAL_SDP_STR_REF(local_sdp_str),
+			SOATAG_REMOTE_SDP_STR_REF(remote_sdp_str),
+			TAG_END());
+	
+	if(!sofia_session) {
+		sofia_session = mrcp_sofia_session_create(sofia_agent,nh);
+		if(!sofia_session) {
+			nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END());
+			return;
+		}
+	}
+
+	if(remote_sdp_str) {
+		sdp_parser_t *parser = NULL;
+		sdp_session_t *sdp = NULL;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Remote SDP\n%s", remote_sdp_str);
+
+		parser = sdp_parse(sofia_session->home,remote_sdp_str,(int)strlen(remote_sdp_str),0);
+		sdp = sdp_session(parser);		
+		descriptor = mrcp_descriptor_generate_by_sdp_session(sdp,NULL,sofia_session->session->pool);
+		sdp_parser_free(parser);
+	}
+
+	if(!descriptor) {
+		nua_respond(nh, SIP_400_BAD_REQUEST, TAG_END());
+		return;
+	}
+
+	mrcp_session_offer(sofia_session->session,descriptor);
+}
+
+static void mrcp_sofia_on_call_terminate(mrcp_sofia_agent_t          *sofia_agent,
+									     nua_handle_t                *nh,
+									     mrcp_sofia_session_t        *sofia_session,
+									     sip_t const                 *sip,
+									     tagi_t                       tags[])
+{
+	if(sofia_session) {
+		mrcp_session_terminate_request(sofia_session->session);
+	}
+}
+
+static void mrcp_sofia_on_state_change(mrcp_sofia_agent_t   *sofia_agent,
+									   nua_handle_t         *nh,
+									   mrcp_sofia_session_t *sofia_session,
+									   sip_t const          *sip,
+									   tagi_t                tags[])
+{
+	int ss_state = nua_callstate_init;
+	tl_gets(tags, 
+			NUTAG_CALLSTATE_REF(ss_state),
+			TAG_END()); 
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"SIP Call State [%s]", nua_callstate_name(ss_state));
+
+	switch(ss_state) {
+		case nua_callstate_received:
+			mrcp_sofia_on_call_receive(sofia_agent,nh,sofia_session,sip,tags);
+			break;
+		case nua_callstate_terminated:
+			mrcp_sofia_on_call_terminate(sofia_agent,nh,sofia_session,sip,tags);
+			break;
+	}
+}
+
+static void mrcp_sofia_on_resource_discover(mrcp_sofia_agent_t   *sofia_agent,
+									        nua_handle_t         *nh,
+									        mrcp_sofia_session_t *sofia_session,
+									        sip_t const          *sip,
+									        tagi_t                tags[])
+{
+	char sdp_str[2048];
+	char *local_sdp_str = NULL;
+
+	const char *ip = sofia_agent->config->ext_ip ? 
+		sofia_agent->config->ext_ip : sofia_agent->config->local_ip;
+
+	if(sdp_resource_discovery_string_generate(ip,sofia_agent->config->origin,sdp_str,sizeof(sdp_str)) > 0) {
+		local_sdp_str = sdp_str;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Resource Discovery SDP\n[%s]\n", local_sdp_str);
+	}
+
+	nua_respond(nh, SIP_200_OK, 
+				NUTAG_WITH_CURRENT(sofia_agent->nua),
+				SIPTAG_CONTACT_STR(sofia_agent->sip_contact_str),
+				TAG_IF(local_sdp_str,SOATAG_USER_SDP_STR(local_sdp_str)),
+				TAG_END());
+}
+
+/** This callback will be called by SIP stack to process incoming events */
+static void mrcp_sofia_event_callback( nua_event_t           nua_event,
+									   int                   status,
+									   char const           *phrase,
+									   nua_t                *nua,
+									   mrcp_sofia_agent_t   *sofia_agent,
+									   nua_handle_t         *nh,
+									   mrcp_sofia_session_t *sofia_session,
+									   sip_t const          *sip,
+									   tagi_t                tags[])
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Receive SIP Event [%s] Status %d %s",nua_event_name(nua_event),status,phrase);
+
+	switch(nua_event) {
+		case nua_i_state:
+			mrcp_sofia_on_state_change(sofia_agent,nh,sofia_session,sip,tags);
+			break;
+		case nua_i_options:
+			mrcp_sofia_on_resource_discover(sofia_agent,nh,sofia_session,sip,tags);
+			break;
+		case nua_r_shutdown:
+			/* break main loop of sofia thread */
+			su_root_break(sofia_agent->root);
+			break;
+		default: 
+			break;
+	}
+}

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES 	   = Makefile.in
+
+INCLUDES                   = -Iinclude \
+                             -I$(top_srcdir)/libs/mrcp-signaling/include \
+                             -I$(top_srcdir)/libs/mrcp/include \
+                             -I$(top_srcdir)/libs/mrcp/message/include \
+                             -I$(top_srcdir)/libs/mrcp/control/include \
+                             -I$(top_srcdir)/libs/mrcp/resources/include \
+                             -I$(top_srcdir)/libs/mpf/include \
+                             -I$(top_srcdir)/libs/uni-rtsp/include \
+                             -I$(top_srcdir)/libs/apr-toolkit/include \
+                             $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) $(UNIMRCP_SOFIA_INCLUDES)
+
+noinst_LTLIBRARIES         = libmrcpunirtsp.la
+
+include_HEADERS            = include/mrcp_unirtsp_sdp.h \
+                             include/mrcp_unirtsp_server_agent.h \
+                             include/mrcp_unirtsp_client_agent.h
+libmrcpunirtsp_la_SOURCES  = src/mrcp_unirtsp_sdp.c \
+                             src/mrcp_unirtsp_server_agent.c \
+                             src/mrcp_unirtsp_client_agent.c
+libmrcpunirtsp_la_LIBADD   = $(top_builddir)/libs/uni-rtsp/libunirtsp.la

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_client_agent.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_client_agent.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_UNIRTSP_CLIENT_AGENT_H__
+#define __MRCP_UNIRTSP_CLIENT_AGENT_H__
+
+/**
+ * @file mrcp_unirtsp_client_agent.h
+ * @brief Implementation of MRCP Signaling Interface using UniRTSP
+ */ 
+
+#include 
+#include "apt_string.h"
+#include "mrcp_sig_agent.h"
+
+APT_BEGIN_EXTERN_C
+
+/** UniRTSP config declaration */
+typedef struct rtsp_client_config_t rtsp_client_config_t;
+
+/** UniRTSP config */
+struct rtsp_client_config_t {
+	/** Server IP address */
+	char        *server_ip;
+	/** Server port */
+	apr_port_t   server_port;
+	/** Resource location */
+	char        *resource_location;
+	/** SDP origin */
+	char        *origin;
+
+	/** Map of the MRCP resource names */
+	apr_table_t *resource_map;
+
+	/** Number of max RTSP connections */
+	apr_size_t   max_connection_count;
+
+	/** Force destination ip address. Should be used only in case 
+	SDP contains incorrect connection address (local IP address behind NAT) */
+	apt_bool_t force_destination;
+};
+
+/**
+ * Create UniRTSP signaling agent.
+ */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_unirtsp_client_agent_create(rtsp_client_config_t *config, apr_pool_t *pool);
+
+/**
+ * Allocate UniRTSP config.
+ */
+MRCP_DECLARE(rtsp_client_config_t*) mrcp_unirtsp_client_config_alloc(apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_UNIRTSP_CLIENT_AGENT_H__*/

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_sdp.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_sdp.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_UNIRTSP_SDP_H__
+#define __MRCP_UNIRTSP_SDP_H__
+
+/**
+ * @file mrcp_unirtsp_sdp.h
+ * @brief MRCP RTSP SDP Transformations
+ */ 
+
+#include "mrcp_session_descriptor.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Generate MRCP descriptor by RTSP request */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_descriptor_generate_by_rtsp_request(
+											const rtsp_message_t *request,
+											const char *force_destination_ip,
+											const apr_table_t *resource_map,
+											apr_pool_t *pool,
+											su_home_t *home);
+
+/** Generate MRCP descriptor by RTSP response */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_descriptor_generate_by_rtsp_response(
+											const rtsp_message_t *request,
+											const rtsp_message_t *response,
+											const char *force_destination_ip,
+											const apr_table_t *resource_map,
+											apr_pool_t *pool,
+											su_home_t *home);
+
+/** Generate RTSP request by MRCP descriptor */
+MRCP_DECLARE(rtsp_message_t*) rtsp_request_generate_by_mrcp_descriptor(
+											const mrcp_session_descriptor_t *descriptor, 
+											const apr_table_t *resource_map, 
+											apr_pool_t *pool);
+/** Generate RTSP response by MRCP descriptor */
+MRCP_DECLARE(rtsp_message_t*) rtsp_response_generate_by_mrcp_descriptor(
+											const rtsp_message_t *request, 
+											const mrcp_session_descriptor_t *descriptor, 
+											const apr_table_t *resource_map, 
+											apr_pool_t *pool);
+
+/** Generate RTSP resource discovery request */
+MRCP_DECLARE(rtsp_message_t*) rtsp_resource_discovery_request_generate(
+											const char *resource_name,
+											const apr_table_t *resource_map,
+											apr_pool_t *pool);
+
+/** Generate resource descovery descriptor by RTSP response */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_resource_discovery_response_generate(
+											const rtsp_message_t *request, 
+											const rtsp_message_t *response,
+											const apr_table_t *resource_map,
+											apr_pool_t *pool,
+											su_home_t *home);
+
+/** Generate RTSP resource discovery response */
+MRCP_DECLARE(rtsp_message_t*) rtsp_resource_discovery_response_generate(
+											const rtsp_message_t *request,
+											const char *ip,
+											const char *origin,
+											apr_pool_t *pool);
+
+
+/** Get MRCP resource name by RTSP resource name */
+MRCP_DECLARE(const char*) mrcp_name_get_by_rtsp_name(const apr_table_t *resource_map, const char *rtsp_name);
+/** Get RTSP resource name by MRCP resource name */
+MRCP_DECLARE(const char*) rtsp_name_get_by_mrcp_name(const apr_table_t *resource_map, const char *mrcp_name);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_UNIRTSP_SDP_H__*/

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_server_agent.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/include/mrcp_unirtsp_server_agent.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MRCP_UNIRTSP_SERVER_AGENT_H__
+#define __MRCP_UNIRTSP_SERVER_AGENT_H__
+
+/**
+ * @file mrcp_unirtsp_server_agent.h
+ * @brief Implementation of MRCP Signaling Interface using UniRTSP
+ */ 
+
+#include 
+#include "mrcp_sig_agent.h"
+
+APT_BEGIN_EXTERN_C
+
+/** UniRTSP config declaration */
+typedef struct rtsp_server_config_t rtsp_server_config_t;
+
+/** UniRTSP config */
+struct rtsp_server_config_t {
+	/** Local IP address to bind to */
+	char        *local_ip;
+	/** Local port to bind to */
+	apr_port_t   local_port;
+
+	/** Resource location */
+	char        *resource_location;
+	/** SDP origin */
+	char        *origin;
+
+	/** Map of the MRCP resource names */
+	apr_table_t *resource_map;
+
+	/** Number of max RTSP connections */
+	apr_size_t   max_connection_count;
+
+	/** Force destination ip address. Should be used only in case 
+	SDP contains incorrect connection address (local IP address behind NAT) */
+	apt_bool_t   force_destination;
+};
+
+/**
+ * Create UniRTSP signaling agent.
+ */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_unirtsp_server_agent_create(rtsp_server_config_t *config, apr_pool_t *pool);
+
+/**
+ * Allocate UniRTSP config.
+ */
+MRCP_DECLARE(rtsp_server_config_t*) mrcp_unirtsp_server_config_alloc(apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__MRCP_UNIRTSP_SERVER_AGENT_H__*/

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,167 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_client_agent.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_client_agent.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,437 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+
+#include "mrcp_unirtsp_client_agent.h"
+#include "mrcp_session.h"
+#include "mrcp_session_descriptor.h"
+#include "mrcp_message.h"
+#include "mrcp_stream.h"
+#include "mrcp_resource_factory.h"
+#include "rtsp_client.h"
+#include "mrcp_unirtsp_sdp.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+#define UNIRTSP_TASK_NAME "UniRTSP Agent"
+
+typedef struct mrcp_unirtsp_agent_t mrcp_unirtsp_agent_t;
+typedef struct mrcp_unirtsp_session_t mrcp_unirtsp_session_t;
+
+struct mrcp_unirtsp_agent_t {
+	mrcp_sig_agent_t     *sig_agent;
+	rtsp_client_t        *rtsp_client;
+
+	rtsp_client_config_t *config;
+};
+
+struct mrcp_unirtsp_session_t {
+	mrcp_message_t        *mrcp_message;
+	mrcp_session_t        *mrcp_session;
+	rtsp_client_session_t *rtsp_session;
+	su_home_t             *home;
+};
+
+
+static apt_bool_t mrcp_unirtsp_session_offer(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_unirtsp_session_terminate(mrcp_session_t *session);
+static apt_bool_t mrcp_unirtsp_session_control(mrcp_session_t *session, mrcp_message_t *message);
+static apt_bool_t mrcp_unirtsp_resource_discover(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+
+static const mrcp_session_request_vtable_t session_request_vtable = {
+	mrcp_unirtsp_session_offer,
+	mrcp_unirtsp_session_terminate,
+	mrcp_unirtsp_session_control,
+	mrcp_unirtsp_resource_discover
+};
+
+static apt_bool_t mrcp_unirtsp_on_session_terminate_response(rtsp_client_t *client, rtsp_client_session_t *session);
+static apt_bool_t mrcp_unirtsp_on_session_terminate_event(rtsp_client_t *client, rtsp_client_session_t *session);
+static apt_bool_t mrcp_unirtsp_on_session_response(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *request, rtsp_message_t *response);
+static apt_bool_t mrcp_unirtsp_on_session_event(rtsp_client_t *client, rtsp_client_session_t *session, rtsp_message_t *message);
+
+static const rtsp_client_vtable_t session_response_vtable = {
+	mrcp_unirtsp_on_session_terminate_response,
+	mrcp_unirtsp_on_session_terminate_event,
+	mrcp_unirtsp_on_session_response,
+	mrcp_unirtsp_on_session_event
+};
+
+static apt_bool_t mrcp_unirtsp_session_create(mrcp_session_t *session);
+static apt_bool_t rtsp_config_validate(mrcp_unirtsp_agent_t *agent, rtsp_client_config_t *config, apr_pool_t *pool);
+static apt_bool_t mrcp_unirtsp_on_resource_discover(mrcp_unirtsp_agent_t *agent, mrcp_unirtsp_session_t *session, rtsp_message_t *request, rtsp_message_t *response);
+
+
+/** Create UniRTSP Signaling Agent */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_unirtsp_client_agent_create(rtsp_client_config_t *config, apr_pool_t *pool)
+{
+	apt_task_t *task;
+	mrcp_unirtsp_agent_t *agent;
+	agent = apr_palloc(pool,sizeof(mrcp_unirtsp_agent_t));
+	agent->sig_agent = mrcp_signaling_agent_create(agent,MRCP_VERSION_1,pool);
+	agent->sig_agent->create_client_session = mrcp_unirtsp_session_create;
+	agent->config = config;
+
+	if(rtsp_config_validate(agent,config,pool) == FALSE) {
+		return NULL;
+	}
+
+	agent->rtsp_client = rtsp_client_create(config->max_connection_count,
+										agent,&session_response_vtable,pool);
+	if(!agent->rtsp_client) {
+		return NULL;
+	}
+
+	task = rtsp_client_task_get(agent->rtsp_client);
+	apt_task_name_set(task,UNIRTSP_TASK_NAME);
+	agent->sig_agent->task = task;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "UNIRTSP_TASK_NAME" %s:%hu [%d]",
+								config->server_ip,
+								config->server_port,
+								config->max_connection_count);
+	return agent->sig_agent;
+}
+
+/** Allocate UniRTSP config */
+MRCP_DECLARE(rtsp_client_config_t*) mrcp_unirtsp_client_config_alloc(apr_pool_t *pool)
+{
+	rtsp_client_config_t *config = apr_palloc(pool,sizeof(rtsp_client_config_t));
+	config->server_ip = NULL;
+	config->server_port = 0;
+	config->resource_location = NULL;
+	config->origin = NULL;
+	config->resource_map = apr_table_make(pool,2);
+	config->max_connection_count = 100;
+	config->force_destination = FALSE;
+	return config;
+}
+
+
+static apt_bool_t rtsp_config_validate(mrcp_unirtsp_agent_t *agent, rtsp_client_config_t *config, apr_pool_t *pool)
+{
+	if(!config->server_ip) {
+		return FALSE;
+	}
+	agent->config = config;
+	return TRUE;
+}
+
+static APR_INLINE mrcp_unirtsp_agent_t* client_agent_get(apt_task_t *task)
+{
+	apt_consumer_task_t *consumer_task = apt_task_object_get(task);
+	mrcp_unirtsp_agent_t *agent = apt_consumer_task_object_get(consumer_task);
+	return agent;
+}
+
+static apt_bool_t mrcp_unirtsp_session_create(mrcp_session_t *mrcp_session)
+{
+	mrcp_unirtsp_agent_t *agent = mrcp_session->signaling_agent->obj;
+	mrcp_unirtsp_session_t *session;
+	mrcp_session->request_vtable = &session_request_vtable;
+
+	session = apr_palloc(mrcp_session->pool,sizeof(mrcp_unirtsp_session_t));
+	session->home = su_home_new(sizeof(*session->home));
+	session->mrcp_message = NULL;
+	session->mrcp_session = mrcp_session;
+	mrcp_session->obj = session;
+	
+	session->rtsp_session = rtsp_client_session_create(
+									agent->rtsp_client,
+									agent->config->server_ip,
+									agent->config->server_port,
+									agent->config->resource_location);
+	if(!session->rtsp_session) {
+		su_home_unref(session->home);
+		return FALSE;
+	}
+	rtsp_client_session_object_set(session->rtsp_session,session);
+	return TRUE;
+}
+
+static void mrcp_unirtsp_session_destroy(mrcp_unirtsp_session_t *session)
+{
+	if(session->home) {
+		su_home_unref(session->home);
+		session->home = NULL;
+	}
+	rtsp_client_session_object_set(session->rtsp_session,NULL);
+	rtsp_client_session_destroy(session->rtsp_session);
+}
+
+static apt_bool_t mrcp_unirtsp_on_session_terminate_response(rtsp_client_t *rtsp_client, rtsp_client_session_t *rtsp_session)
+{
+	mrcp_unirtsp_session_t *session	= rtsp_client_session_object_get(rtsp_session);
+
+	mrcp_unirtsp_session_destroy(session);
+	mrcp_session_terminate_response(session->mrcp_session);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_on_session_terminate_event(rtsp_client_t *rtsp_client, rtsp_client_session_t *rtsp_session)
+{
+	mrcp_unirtsp_session_t *session	= rtsp_client_session_object_get(rtsp_session);
+	mrcp_session_terminate_event(session->mrcp_session);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_on_announce_response(mrcp_unirtsp_agent_t *agent, mrcp_unirtsp_session_t *session, rtsp_message_t *message, const char *resource_name)
+{
+	mrcp_message_t *mrcp_message = NULL;
+
+	if(!session || !resource_name) {
+		return FALSE;
+	}
+	
+	if(rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE) == TRUE &&
+		message->header.content_type == RTSP_CONTENT_TYPE_MRCP &&
+		rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH) == TRUE &&
+		message->header.content_length > 0) {
+
+		apt_text_stream_t text_stream;
+		mrcp_parser_t *parser;
+		apt_str_t resource_name_str;
+
+		text_stream.text = message->body;
+		text_stream.pos = text_stream.text.buf;
+		apt_string_set(&resource_name_str,resource_name);
+
+		parser = mrcp_parser_create(agent->sig_agent->resource_factory,session->mrcp_session->pool);
+		mrcp_parser_resource_name_set(parser,&resource_name_str);
+		if(mrcp_parser_run(parser,&text_stream) == MRCP_STREAM_MESSAGE_COMPLETE) {
+			mrcp_message = mrcp_parser_message_get(parser);
+			mrcp_message->channel_id.session_id = message->header.session_id;
+		}
+		else {
+			/* error case */
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse MRCPv1 Message");
+		}
+	}
+	else {
+		/* error case */
+	}
+
+	if(!mrcp_message) {
+		if(!session->mrcp_message) {
+			return FALSE;
+		}
+		mrcp_message = mrcp_response_create(session->mrcp_message,session->mrcp_session->pool);
+		mrcp_message->start_line.status_code = MRCP_STATUS_CODE_METHOD_FAILED;
+	}
+
+	session->mrcp_message = NULL;
+	mrcp_session_control_response(session->mrcp_session,mrcp_message);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_on_session_response(rtsp_client_t *rtsp_client, rtsp_client_session_t *rtsp_session, rtsp_message_t *request, rtsp_message_t *response)
+{
+	apt_bool_t status = FALSE;
+	mrcp_unirtsp_agent_t *agent = rtsp_client_object_get(rtsp_client);
+	mrcp_unirtsp_session_t *session	= rtsp_client_session_object_get(rtsp_session);
+	if(!agent || !session) {
+		return FALSE;
+	}
+
+	switch(request->start_line.common.request_line.method_id) {
+		case RTSP_METHOD_SETUP:
+		{
+			const apt_str_t *session_id;
+			const char *force_destination_ip = NULL;
+			mrcp_session_descriptor_t *descriptor;
+
+			if(agent->config->force_destination == TRUE) {
+				force_destination_ip = agent->config->server_ip;
+			}
+
+			descriptor = mrcp_descriptor_generate_by_rtsp_response(
+							request,
+							response,
+							force_destination_ip,
+							agent->config->resource_map,
+							session->mrcp_session->pool,
+							session->home);
+			if(!descriptor) {
+				return FALSE;
+			}
+			session_id = rtsp_client_session_id_get(session->rtsp_session);
+			if(session_id) {
+				apt_string_copy(
+					&session->mrcp_session->id,
+					session_id,
+					session->mrcp_session->pool);
+			}
+			status = mrcp_session_answer(session->mrcp_session,descriptor);
+			break;
+		}
+		case RTSP_METHOD_TEARDOWN:
+		{
+			mrcp_session_descriptor_t *descriptor;
+			descriptor = mrcp_descriptor_generate_by_rtsp_response(
+							request,
+							response,
+							NULL,
+							agent->config->resource_map,
+							session->mrcp_session->pool,
+							session->home);
+			if(!descriptor) {
+				return FALSE;
+			}
+			status = mrcp_session_answer(session->mrcp_session,descriptor);
+			break;
+		}
+		case RTSP_METHOD_ANNOUNCE:
+		{
+			mrcp_unirtsp_agent_t *agent = rtsp_client_object_get(rtsp_client);
+			const char *resource_name = mrcp_name_get_by_rtsp_name(
+				agent->config->resource_map,
+				request->start_line.common.request_line.resource_name);
+			mrcp_unirtsp_on_announce_response(agent,session,response,resource_name);
+			break;
+		}
+		case RTSP_METHOD_DESCRIBE:
+		{
+			mrcp_unirtsp_agent_t *agent = rtsp_client_object_get(rtsp_client);
+			mrcp_unirtsp_on_resource_discover(agent,session,request,response);
+			break;
+		}
+		default:
+			break;
+	}
+
+	return status;
+}
+
+static apt_bool_t mrcp_unirtsp_on_session_event(rtsp_client_t *rtsp_client, rtsp_client_session_t *rtsp_session, rtsp_message_t *message)
+{
+	mrcp_unirtsp_agent_t *agent = rtsp_client_object_get(rtsp_client);
+	mrcp_unirtsp_session_t *session	= rtsp_client_session_object_get(rtsp_session);
+	const char *resource_name = mrcp_name_get_by_rtsp_name(
+		agent->config->resource_map,
+		message->start_line.common.request_line.resource_name);
+	if(!session || !resource_name) {
+		return FALSE;
+	}
+
+	mrcp_unirtsp_on_announce_response(agent,session,message,resource_name);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_session_offer(mrcp_session_t *mrcp_session, mrcp_session_descriptor_t *descriptor)
+{
+	mrcp_unirtsp_session_t *session = mrcp_session->obj;
+	mrcp_unirtsp_agent_t *agent = mrcp_session->signaling_agent->obj;
+	rtsp_message_t *request;
+
+	if(agent->config->origin) {
+		apt_string_set(&descriptor->origin,agent->config->origin);
+	}
+
+	request = rtsp_request_generate_by_mrcp_descriptor(descriptor,agent->config->resource_map,mrcp_session->pool);
+	return rtsp_client_session_request(agent->rtsp_client,session->rtsp_session,request);
+}
+
+static apt_bool_t mrcp_unirtsp_session_terminate(mrcp_session_t *mrcp_session)
+{
+	mrcp_unirtsp_session_t *session = mrcp_session->obj;
+	mrcp_unirtsp_agent_t *agent = mrcp_session->signaling_agent->obj;
+
+	return rtsp_client_session_terminate(agent->rtsp_client,session->rtsp_session);
+}
+
+static apt_bool_t mrcp_unirtsp_session_control(mrcp_session_t *mrcp_session, mrcp_message_t *mrcp_message)
+{
+	mrcp_unirtsp_session_t *session = mrcp_session->obj;
+	mrcp_unirtsp_agent_t *agent = mrcp_session->signaling_agent->obj;
+
+	char buffer[500];
+	apt_text_stream_t stream;
+	rtsp_message_t *rtsp_message = NULL;
+	apt_str_t *body;
+
+	apt_text_stream_init(&stream,buffer,sizeof(buffer));
+
+	mrcp_message->start_line.version = MRCP_VERSION_1;
+	if(mrcp_message_generate(agent->sig_agent->resource_factory,mrcp_message,&stream) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Generate MRCPv1 Message");
+		return FALSE;
+	}
+	stream.text.length = stream.pos - stream.text.buf;
+
+	rtsp_message = rtsp_request_create(mrcp_session->pool);
+	rtsp_message->start_line.common.request_line.resource_name = rtsp_name_get_by_mrcp_name(
+									agent->config->resource_map,
+									mrcp_message->channel_id.resource_name.buf);
+	rtsp_message->start_line.common.request_line.method_id = RTSP_METHOD_ANNOUNCE;
+
+	body = &rtsp_message->body;
+	body->length = mrcp_message->start_line.length;
+	body->buf = apr_palloc(rtsp_message->pool,body->length+1);
+	memcpy(body->buf,stream.text.buf,stream.text.length);
+	if(mrcp_message->body.length) {
+		memcpy(body->buf+stream.text.length,mrcp_message->body.buf,mrcp_message->body.length);
+	}
+	body->buf[body->length] = '\0';
+
+	rtsp_message->header.content_type = RTSP_CONTENT_TYPE_MRCP;
+	rtsp_header_property_add(&rtsp_message->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE);
+	rtsp_message->header.content_length = body->length;
+	rtsp_header_property_add(&rtsp_message->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH);
+
+	session->mrcp_message = mrcp_message;
+	rtsp_client_session_request(agent->rtsp_client,session->rtsp_session,rtsp_message);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_resource_discover(mrcp_session_t *mrcp_session, mrcp_session_descriptor_t *descriptor)
+{
+	mrcp_unirtsp_session_t *session = mrcp_session->obj;
+	mrcp_unirtsp_agent_t *agent = mrcp_session->signaling_agent->obj;
+	rtsp_message_t *request;
+
+	if(!descriptor) {
+		return FALSE;
+	}
+	request = rtsp_resource_discovery_request_generate(
+							descriptor->resource_name.buf,
+							agent->config->resource_map,
+							mrcp_session->pool);
+	if(request) {
+		rtsp_client_session_request(agent->rtsp_client,session->rtsp_session,request);
+	}
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_on_resource_discover(mrcp_unirtsp_agent_t *agent, mrcp_unirtsp_session_t *session, rtsp_message_t *request, rtsp_message_t *response)
+{
+	mrcp_session_descriptor_t *descriptor;
+	if(!session) {
+		return FALSE;
+	}
+
+	descriptor = mrcp_resource_discovery_response_generate(
+									request,
+									response,
+									agent->config->resource_map,
+									session->mrcp_session->pool,
+									session->home);
+	if(descriptor) {
+		mrcp_session_discover_response(session->mrcp_session,descriptor);
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_sdp.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_sdp.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,576 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "rtsp_message.h"
+#include "mrcp_unirtsp_sdp.h"
+#include "mpf_rtp_attribs.h"
+#include "apt_text_stream.h"
+#include "apt_log.h"
+
+
+/** Generate SDP media by RTP media descriptor */
+static apr_size_t sdp_rtp_media_generate(char *buffer, apr_size_t size, const mrcp_session_descriptor_t *descriptor, const mpf_rtp_media_descriptor_t *audio_media)
+{
+	apr_size_t offset = 0;
+	int i;
+	mpf_codec_descriptor_t *codec_descriptor;
+	apr_array_header_t *descriptor_arr = audio_media->codec_list.descriptor_arr;
+	if(!descriptor_arr) {
+		return 0;
+	}
+	offset += snprintf(buffer+offset,size-offset,
+		"m=audio %d RTP/AVP", 
+		audio_media->base.state == MPF_MEDIA_ENABLED ? audio_media->base.port : 0);
+	for(i=0; inelts; i++) {
+		codec_descriptor = (mpf_codec_descriptor_t*)descriptor_arr->elts + i;
+		if(codec_descriptor->enabled == TRUE) {
+			offset += snprintf(buffer+offset,size-offset," %d", codec_descriptor->payload_type);
+		}
+	}
+	offset += snprintf(buffer+offset,size-offset,"\r\n");
+	if(audio_media->base.state == MPF_MEDIA_ENABLED) {
+		const apt_str_t *mode_str = mpf_stream_mode_str_get(audio_media->mode);
+		for(i=0; inelts; i++) {
+			codec_descriptor = (mpf_codec_descriptor_t*)descriptor_arr->elts + i;
+			if(codec_descriptor->enabled == TRUE && codec_descriptor->name.buf) {
+				offset += snprintf(buffer+offset,size-offset,"a=rtpmap:%d %s/%d\r\n",
+					codec_descriptor->payload_type,
+					codec_descriptor->name.buf,
+					codec_descriptor->sampling_rate);
+			}
+		}
+		offset += snprintf(buffer+offset,size-offset,"a=%s\r\n",mode_str ? mode_str->buf : "");
+		
+		if(audio_media->ptime) {
+			offset += snprintf(buffer+offset,size-offset,"a=ptime:%hu\r\n",
+				audio_media->ptime);
+		}
+	}
+	return offset;
+}
+
+/** Generate RTP media descriptor by SDP media */
+static apt_bool_t mpf_rtp_media_generate(mpf_rtp_media_descriptor_t *rtp_media, const sdp_media_t *sdp_media, const apt_str_t *ip, apr_pool_t *pool)
+{
+	mpf_rtp_attrib_e id;
+	apt_str_t name;
+	sdp_attribute_t *attrib = NULL;
+	sdp_rtpmap_t *map;
+	mpf_codec_descriptor_t *codec;
+	for(attrib = sdp_media->m_attributes; attrib; attrib=attrib->a_next) {
+		apt_string_set(&name,attrib->a_name);
+		id = mpf_rtp_attrib_id_find(&name);
+		switch(id) {
+			case RTP_ATTRIB_PTIME:
+				rtp_media->ptime = (apr_uint16_t)atoi(attrib->a_value);
+				break;
+			default:
+				break;
+		}
+	}
+
+	mpf_codec_list_init(&rtp_media->codec_list,5,pool);
+	for(map = sdp_media->m_rtpmaps; map; map = map->rm_next) {
+		codec = mpf_codec_list_add(&rtp_media->codec_list);
+		if(codec) {
+			codec->payload_type = (apr_byte_t)map->rm_pt;
+			apt_string_assign(&codec->name,map->rm_encoding,pool);
+			codec->sampling_rate = (apr_uint16_t)map->rm_rate;
+			codec->channel_count = 1;
+		}
+	}
+
+	switch(sdp_media->m_mode) {
+		case sdp_inactive:
+			rtp_media->mode = STREAM_MODE_NONE;
+			break;
+		case sdp_sendonly:
+			rtp_media->mode = STREAM_MODE_SEND;
+			break;
+		case sdp_recvonly:
+			rtp_media->mode = STREAM_MODE_RECEIVE;
+			break;
+		case sdp_sendrecv:
+			rtp_media->mode = STREAM_MODE_SEND_RECEIVE;
+			break;
+	}
+
+	if(sdp_media->m_connections) {
+		apt_string_assign(&rtp_media->base.ip,sdp_media->m_connections->c_address,pool);
+	}
+	else {
+		rtp_media->base.ip = *ip;
+	}
+	if(sdp_media->m_port) {
+		rtp_media->base.port = (apr_port_t)sdp_media->m_port;
+		rtp_media->base.state = MPF_MEDIA_ENABLED;
+	}
+	else {
+		rtp_media->base.state = MPF_MEDIA_DISABLED;
+	}
+	return TRUE;
+}
+
+/** Generate MRCP descriptor by SDP session */
+static mrcp_session_descriptor_t* mrcp_descriptor_generate_by_sdp_session(mrcp_session_descriptor_t *descriptor, const sdp_session_t *sdp, const char *force_destination_ip, apr_pool_t *pool)
+{
+	sdp_media_t *sdp_media;
+
+	if(force_destination_ip) {
+		apt_string_assign(&descriptor->ip,force_destination_ip,pool);
+	}
+	else if(sdp->sdp_connection) {
+		apt_string_assign(&descriptor->ip,sdp->sdp_connection->c_address,pool);
+	}
+
+	for(sdp_media=sdp->sdp_media; sdp_media; sdp_media=sdp_media->m_next) {
+		switch(sdp_media->m_type) {
+			case sdp_media_audio:
+			{
+				mpf_rtp_media_descriptor_t *media = apr_palloc(pool,sizeof(mpf_rtp_media_descriptor_t));
+				mpf_rtp_media_descriptor_init(media);
+				media->base.id = mrcp_session_audio_media_add(descriptor,media);
+				mpf_rtp_media_generate(media,sdp_media,&descriptor->ip,pool);
+				break;
+			}
+			case sdp_media_video:
+			{
+				mpf_rtp_media_descriptor_t *media = apr_palloc(pool,sizeof(mpf_rtp_media_descriptor_t));
+				mpf_rtp_media_descriptor_init(media);
+				media->base.id = mrcp_session_video_media_add(descriptor,media);
+				mpf_rtp_media_generate(media,sdp_media,&descriptor->ip,pool);
+				break;
+			}
+			default:
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Not Supported SDP Media [%s]", sdp_media->m_type_name);
+				break;
+		}
+	}
+	return descriptor;
+}
+
+
+/** Generate MRCP descriptor by RTSP request */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_descriptor_generate_by_rtsp_request(
+											const rtsp_message_t *request,
+											const char *force_destination_ip,
+											const apr_table_t *resource_map,
+											apr_pool_t *pool,
+											su_home_t *home)
+{
+	mrcp_session_descriptor_t *descriptor = NULL;
+	const char *resource_name = mrcp_name_get_by_rtsp_name(
+		resource_map,
+		request->start_line.common.request_line.resource_name);
+	if(!resource_name) {
+		return NULL;
+	}
+	
+	if(request->start_line.common.request_line.method_id == RTSP_METHOD_SETUP) {
+		if(rtsp_header_property_check(&request->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE) == TRUE &&
+			rtsp_header_property_check(&request->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH) == TRUE &&
+			request->body.buf) {
+			
+			sdp_parser_t *parser;
+			sdp_session_t *sdp;
+
+			parser = sdp_parse(home,request->body.buf,request->body.length,0);
+			sdp = sdp_session(parser);
+			if(sdp) {
+				descriptor = mrcp_session_descriptor_create(pool);
+				mrcp_descriptor_generate_by_sdp_session(descriptor,sdp,force_destination_ip,pool);
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse SDP Message");
+			}
+			sdp_parser_free(parser);
+		}
+		else {
+			/* create default descriptor in case RTSP SETUP contains no SDP */
+			mpf_rtp_media_descriptor_t *media;
+			descriptor = mrcp_session_descriptor_create(pool);
+			media = apr_palloc(pool,sizeof(mpf_rtp_media_descriptor_t));
+			mpf_rtp_media_descriptor_init(media);
+			media->base.state = MPF_MEDIA_ENABLED;
+			media->base.id = mrcp_session_audio_media_add(descriptor,media);
+			if(rtsp_header_property_check(&request->header.property_set,RTSP_HEADER_FIELD_TRANSPORT) == TRUE) {
+				media->base.port = request->header.transport.client_port_range.min;
+				media->base.ip = request->header.transport.destination;
+			}
+		}
+
+		if(descriptor) {
+			apt_string_assign(&descriptor->resource_name,resource_name,pool);
+			descriptor->resource_state = TRUE;
+		}
+	}
+	else if(request->start_line.common.request_line.method_id == RTSP_METHOD_TEARDOWN) {
+		descriptor = mrcp_session_descriptor_create(pool);
+		apt_string_assign(&descriptor->resource_name,resource_name,pool);
+		descriptor->resource_state = FALSE;
+	}
+	return descriptor;
+}
+
+/** Generate MRCP descriptor by RTSP response */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_descriptor_generate_by_rtsp_response(
+											const rtsp_message_t *request, 
+											const rtsp_message_t *response, 
+											const char *force_destination_ip,
+											const apr_table_t *resource_map, 
+											apr_pool_t *pool, 
+											su_home_t *home)
+{
+	mrcp_session_descriptor_t *descriptor = NULL;
+	const char *resource_name = mrcp_name_get_by_rtsp_name(
+		resource_map,
+		request->start_line.common.request_line.resource_name);
+	if(!resource_name) {
+		return NULL;
+	}
+	
+	if(request->start_line.common.request_line.method_id == RTSP_METHOD_SETUP) {
+		if(rtsp_header_property_check(&response->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE) == TRUE &&
+			rtsp_header_property_check(&response->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH) == TRUE &&
+			response->body.buf) {
+			
+			sdp_parser_t *parser;
+			sdp_session_t *sdp;
+
+			parser = sdp_parse(home,response->body.buf,response->body.length,0);
+			sdp = sdp_session(parser);
+			if(sdp) {
+				descriptor = mrcp_session_descriptor_create(pool);
+				mrcp_descriptor_generate_by_sdp_session(descriptor,sdp,force_destination_ip,pool);
+
+				apt_string_assign(&descriptor->resource_name,resource_name,pool);
+				descriptor->resource_state = TRUE;
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse SDP Message");
+			}
+			
+			sdp_parser_free(parser);
+		}
+		else {
+			descriptor = mrcp_session_descriptor_create(pool);
+			apt_string_assign(&descriptor->resource_name,resource_name,pool);
+			descriptor->resource_state = FALSE;
+		}
+	}
+	else if(request->start_line.common.request_line.method_id == RTSP_METHOD_TEARDOWN) {
+		descriptor = mrcp_session_descriptor_create(pool);
+		apt_string_assign(&descriptor->resource_name,resource_name,pool);
+		descriptor->resource_state = FALSE;
+	}
+	return descriptor;
+}
+
+/** Generate RTSP request by MRCP descriptor */
+MRCP_DECLARE(rtsp_message_t*) rtsp_request_generate_by_mrcp_descriptor(const mrcp_session_descriptor_t *descriptor, const apr_table_t *resource_map, apr_pool_t *pool)
+{
+	apr_size_t i;
+	apr_size_t count;
+	apr_size_t audio_index = 0;
+	mpf_rtp_media_descriptor_t *audio_media;
+	apr_size_t video_index = 0;
+	mpf_rtp_media_descriptor_t *video_media;
+	apr_size_t offset = 0;
+	char buffer[2048];
+	apr_size_t size = sizeof(buffer);
+	rtsp_message_t *request;
+	const char *ip = descriptor->ext_ip.buf ? descriptor->ext_ip.buf : (descriptor->ip.buf ? descriptor->ip.buf : "0.0.0.0");
+
+	request = rtsp_request_create(pool);
+	request->start_line.common.request_line.resource_name = rtsp_name_get_by_mrcp_name(
+		resource_map,
+		descriptor->resource_name.buf);
+	if(descriptor->resource_state != TRUE) {
+		request->start_line.common.request_line.method_id = RTSP_METHOD_TEARDOWN;
+		return request;
+	}
+
+	request->start_line.common.request_line.method_id = RTSP_METHOD_SETUP;
+
+	buffer[0] = '\0';
+	offset += snprintf(buffer+offset,size-offset,
+			"v=0\r\n"
+			"o=%s 0 0 IN IP4 %s\r\n"
+			"s=-\r\n"
+			"c=IN IP4 %s\r\n"
+			"t=0 0\r\n",
+			descriptor->origin.buf ? descriptor->origin.buf : "-",
+			ip,
+			ip);
+	count = mrcp_session_media_count_get(descriptor);
+	for(i=0; ibase.id == i) {
+			/* generate audio media */
+			audio_index++;
+			offset += sdp_rtp_media_generate(buffer+offset,size-offset,descriptor,audio_media);
+			request->header.transport.client_port_range.min = audio_media->base.port;
+			request->header.transport.client_port_range.max = audio_media->base.port+1;
+			continue;
+		}
+		video_media = mrcp_session_video_media_get(descriptor,video_index);
+		if(video_media && video_media->base.id == i) {
+			/* generate video media */
+			video_index++;
+			offset += sdp_rtp_media_generate(buffer+offset,size-offset,descriptor,video_media);
+			continue;
+		}
+	}
+
+	request->header.transport.protocol = RTSP_TRANSPORT_RTP;
+	request->header.transport.profile = RTSP_PROFILE_AVP;
+	request->header.transport.delivery = RTSP_DELIVERY_UNICAST;
+	rtsp_header_property_add(&request->header.property_set,RTSP_HEADER_FIELD_TRANSPORT);
+
+	if(offset) {
+		apt_string_assign_n(&request->body,buffer,offset,pool);
+		request->header.content_type = RTSP_CONTENT_TYPE_SDP;
+		rtsp_header_property_add(&request->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE);
+		request->header.content_length = offset;
+		rtsp_header_property_add(&request->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH);
+	}
+	return request;
+}
+
+/** Generate RTSP response by MRCP descriptor */
+MRCP_DECLARE(rtsp_message_t*) rtsp_response_generate_by_mrcp_descriptor(const rtsp_message_t *request, const mrcp_session_descriptor_t *descriptor, const apr_table_t *resource_map, apr_pool_t *pool)
+{
+	rtsp_message_t *response = NULL;
+
+	switch(descriptor->status) {
+		case MRCP_SESSION_STATUS_OK:
+			response = rtsp_response_create(request,RTSP_STATUS_CODE_OK,RTSP_REASON_PHRASE_OK,pool);
+			break;
+		case MRCP_SESSION_STATUS_NO_SUCH_RESOURCE:
+			response = rtsp_response_create(request,RTSP_STATUS_CODE_NOT_FOUND,RTSP_REASON_PHRASE_NOT_FOUND,pool);
+			break;
+		case MRCP_SESSION_STATUS_UNACCEPTABLE_RESOURCE:
+		case MRCP_SESSION_STATUS_UNAVAILABLE_RESOURCE:
+			response = rtsp_response_create(request,RTSP_STATUS_CODE_NOT_ACCEPTABLE,RTSP_REASON_PHRASE_NOT_ACCEPTABLE,pool);
+			break;
+		case MRCP_SESSION_STATUS_ERROR:
+			response = rtsp_response_create(request,RTSP_STATUS_CODE_INTERNAL_SERVER_ERROR,RTSP_REASON_PHRASE_INTERNAL_SERVER_ERROR,pool);
+			break;
+	}
+
+	if(!response) {
+		return NULL;
+	}
+
+	if(descriptor->status == MRCP_SESSION_STATUS_OK) {
+		apr_size_t i;
+		apr_size_t count;
+		apr_size_t audio_index = 0;
+		mpf_rtp_media_descriptor_t *audio_media;
+		apr_size_t video_index = 0;
+		mpf_rtp_media_descriptor_t *video_media;
+		apr_size_t offset = 0;
+		char buffer[2048];
+		apr_size_t size = sizeof(buffer);
+		const char *ip = descriptor->ext_ip.buf ? descriptor->ext_ip.buf : (descriptor->ip.buf ? descriptor->ip.buf : "0.0.0.0");
+
+		buffer[0] = '\0';
+		offset += snprintf(buffer+offset,size-offset,
+				"v=0\r\n"
+				"o=%s 0 0 IN IP4 %s\r\n"
+				"s=-\r\n"
+				"c=IN IP4 %s\r\n"
+				"t=0 0\r\n",
+				descriptor->origin.buf ? descriptor->origin.buf : "-",
+				ip,
+				ip);
+		count = mrcp_session_media_count_get(descriptor);
+		for(i=0; ibase.id == i) {
+				/* generate audio media */
+				audio_index++;
+				offset += sdp_rtp_media_generate(buffer+offset,size-offset,descriptor,audio_media);
+				response->header.transport.server_port_range.min = audio_media->base.port;
+				response->header.transport.server_port_range.max = audio_media->base.port+1;
+				response->header.transport.client_port_range = request->header.transport.client_port_range;
+				continue;
+			}
+			video_media = mrcp_session_video_media_get(descriptor,video_index);
+			if(video_media && video_media->base.id == i) {
+				/* generate video media */
+				video_index++;
+				offset += sdp_rtp_media_generate(buffer+offset,size-offset,descriptor,video_media);
+				continue;
+			}
+		}
+
+		/* ok */
+		response->header.transport.protocol = RTSP_TRANSPORT_RTP;
+		response->header.transport.profile = RTSP_PROFILE_AVP;
+		response->header.transport.delivery = RTSP_DELIVERY_UNICAST;
+		rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_TRANSPORT);
+
+		if(offset) {
+			apt_string_assign_n(&response->body,buffer,offset,pool);
+			response->header.content_type = RTSP_CONTENT_TYPE_SDP;
+			rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE);
+			response->header.content_length = offset;
+			rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH);
+		}
+	}
+	return response;
+}
+
+/** Generate RTSP resource discovery request */
+MRCP_DECLARE(rtsp_message_t*) rtsp_resource_discovery_request_generate(
+											const char *resource_name,
+											const apr_table_t *resource_map,
+											apr_pool_t *pool)
+{
+	rtsp_message_t *request = rtsp_request_create(pool);
+	request->start_line.common.request_line.resource_name = rtsp_name_get_by_mrcp_name(
+		resource_map,
+		resource_name);
+	
+	request->start_line.common.request_line.method_id = RTSP_METHOD_DESCRIBE;
+	return request;
+}
+
+/** Generate resource descovery descriptor by RTSP response */
+MRCP_DECLARE(mrcp_session_descriptor_t*) mrcp_resource_discovery_response_generate(
+											const rtsp_message_t *request, 
+											const rtsp_message_t *response,
+											const apr_table_t *resource_map,
+											apr_pool_t *pool,
+											su_home_t *home)
+{
+	mrcp_session_descriptor_t *descriptor = NULL;
+	const char *resource_name = mrcp_name_get_by_rtsp_name(
+					resource_map,
+					request->start_line.common.request_line.resource_name);
+	if(!resource_name) {
+		return NULL;
+	}
+	
+	descriptor = mrcp_session_descriptor_create(pool);
+	apt_string_assign(&descriptor->resource_name,resource_name,pool);
+	
+	if(rtsp_header_property_check(&response->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE) == TRUE &&
+		rtsp_header_property_check(&response->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH) == TRUE &&
+		response->body.buf) {
+			
+		sdp_parser_t *parser;
+		sdp_session_t *sdp;
+
+		parser = sdp_parse(home,response->body.buf,response->body.length,0);
+		sdp = sdp_session(parser);
+		if(sdp) {
+			mrcp_descriptor_generate_by_sdp_session(descriptor,sdp,0,pool);
+			descriptor->resource_state = TRUE;
+		}
+		else {
+			apt_string_assign(&descriptor->resource_name,resource_name,pool);
+			descriptor->resource_state = TRUE;
+		}
+
+		sdp_parser_free(parser);
+	}
+	else {
+		descriptor->resource_state = FALSE;
+	}
+	return descriptor;
+}
+
+/** Generate RTSP resource discovery response */
+MRCP_DECLARE(rtsp_message_t*) rtsp_resource_discovery_response_generate(
+											const rtsp_message_t *request, 
+											const char *ip,
+											const char *origin,
+											apr_pool_t *pool)
+{
+	rtsp_message_t *response = rtsp_response_create(request,RTSP_STATUS_CODE_OK,RTSP_REASON_PHRASE_OK,pool);
+	if(response) {
+		apr_size_t offset = 0;
+		char buffer[2048];
+		apr_size_t size = sizeof(buffer);
+		
+		if(!ip) {
+			ip = "0.0.0.0";
+		}
+		if(!origin) {
+			origin = "-";
+		}
+		
+		buffer[0] = '\0';
+		offset += snprintf(buffer+offset,size-offset,
+			"v=0\r\n"
+			"o=%s 0 0 IN IP4 %s\r\n"
+			"s=-\r\n"
+			"c=IN IP4 %s\r\n"
+			"t=0 0\r\n"
+			"m=audio 0 RTP/AVP 0 8\r\n"
+			"a=rtpmap:0 PCMU/8000\r\n"
+			"a=rtpmap:8 PCMA/8000\r\n",
+			origin,
+			ip,
+			ip);
+		
+		response->header.transport.protocol = RTSP_TRANSPORT_RTP;
+		response->header.transport.profile = RTSP_PROFILE_AVP;
+		response->header.transport.delivery = RTSP_DELIVERY_UNICAST;
+		rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_TRANSPORT);
+
+		if(offset) {
+			apt_string_assign_n(&response->body,buffer,offset,pool);
+			response->header.content_type = RTSP_CONTENT_TYPE_SDP;
+			rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE);
+			response->header.content_length = offset;
+			rtsp_header_property_add(&response->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH);
+		}
+	}
+
+	return response;
+}
+
+/** Get MRCP resource name by RTSP resource name */
+MRCP_DECLARE(const char*) mrcp_name_get_by_rtsp_name(const apr_table_t *resource_map, const char *rtsp_name)
+{
+	const apr_array_header_t *header = apr_table_elts(resource_map);
+	apr_table_entry_t *entry = (apr_table_entry_t *)header->elts;
+	int i;
+	
+	for(i=0; inelts; i++) {
+		if(entry[i].val && rtsp_name) {
+			if(apr_strnatcasecmp(entry[i].val,rtsp_name) == 0) {
+				return entry[i].key;
+			}
+		}
+	}
+	return rtsp_name;
+}
+
+/** Get RTSP resource name by MRCP resource name */
+MRCP_DECLARE(const char*) rtsp_name_get_by_mrcp_name(const apr_table_t *resource_map, const char *mrcp_name)
+{
+	const char *rtsp_name = apr_table_get(resource_map,mrcp_name);
+	if(rtsp_name) {
+		return rtsp_name;
+	}
+	return mrcp_name;
+}

Added: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_server_agent.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/src/mrcp_unirtsp_server_agent.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,381 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+
+#include "mrcp_unirtsp_server_agent.h"
+#include "mrcp_session.h"
+#include "mrcp_session_descriptor.h"
+#include "mrcp_message.h"
+#include "mrcp_resource_factory.h"
+#include "mrcp_stream.h"
+#include "rtsp_server.h"
+#include "mrcp_unirtsp_sdp.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+#define UNIRTSP_TASK_NAME "UniRTSP Agent"
+
+typedef struct mrcp_unirtsp_agent_t mrcp_unirtsp_agent_t;
+typedef struct mrcp_unirtsp_session_t mrcp_unirtsp_session_t;
+
+struct mrcp_unirtsp_agent_t {
+	mrcp_sig_agent_t     *sig_agent;
+	rtsp_server_t        *rtsp_server;
+
+	rtsp_server_config_t *config;
+};
+
+struct mrcp_unirtsp_session_t {
+	mrcp_session_t        *mrcp_session;
+	rtsp_server_session_t *rtsp_session;
+	su_home_t             *home;
+};
+
+
+static apt_bool_t mrcp_unirtsp_on_session_answer(mrcp_session_t *session, mrcp_session_descriptor_t *descriptor);
+static apt_bool_t mrcp_unirtsp_on_session_terminate(mrcp_session_t *session);
+static apt_bool_t mrcp_unirtsp_on_session_control(mrcp_session_t *session, mrcp_message_t *message);
+
+static const mrcp_session_response_vtable_t session_response_vtable = {
+	mrcp_unirtsp_on_session_answer,
+	mrcp_unirtsp_on_session_terminate,
+	mrcp_unirtsp_on_session_control
+};
+
+static apt_bool_t mrcp_unirtsp_session_create(rtsp_server_t *server, rtsp_server_session_t *session);
+static apt_bool_t mrcp_unirtsp_session_terminate(rtsp_server_t *server, rtsp_server_session_t *session);
+static apt_bool_t mrcp_unirtsp_message_handle(rtsp_server_t *server, rtsp_server_session_t *session, rtsp_message_t *message);
+
+static const rtsp_server_vtable_t session_request_vtable = {
+	mrcp_unirtsp_session_create,
+	mrcp_unirtsp_session_terminate,
+	mrcp_unirtsp_message_handle
+};
+
+
+static apt_bool_t rtsp_config_validate(mrcp_unirtsp_agent_t *agent, rtsp_server_config_t *config, apr_pool_t *pool);
+
+
+/** Create UniRTSP Signaling Agent */
+MRCP_DECLARE(mrcp_sig_agent_t*) mrcp_unirtsp_server_agent_create(rtsp_server_config_t *config, apr_pool_t *pool)
+{
+	apt_task_t *task;
+	mrcp_unirtsp_agent_t *agent;
+	agent = apr_palloc(pool,sizeof(mrcp_unirtsp_agent_t));
+	agent->sig_agent = mrcp_signaling_agent_create(agent,MRCP_VERSION_1,pool);
+	agent->config = config;
+
+	if(rtsp_config_validate(agent,config,pool) == FALSE) {
+		return NULL;
+	}
+
+	agent->rtsp_server = rtsp_server_create(
+								config->local_ip,
+								config->local_port,
+								config->max_connection_count,
+								agent,
+								&session_request_vtable,
+								pool);
+	if(!agent->rtsp_server) {
+		return NULL;
+	}
+	
+	task = rtsp_server_task_get(agent->rtsp_server);
+	apt_task_name_set(task,UNIRTSP_TASK_NAME);
+	agent->sig_agent->task = task;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create "UNIRTSP_TASK_NAME" %s:%hu [%d]",
+		config->local_ip,
+		config->local_port,
+		config->max_connection_count);
+	return agent->sig_agent;
+}
+
+/** Allocate UniRTSP config */
+MRCP_DECLARE(rtsp_server_config_t*) mrcp_unirtsp_server_config_alloc(apr_pool_t *pool)
+{
+	rtsp_server_config_t *config = apr_palloc(pool,sizeof(rtsp_server_config_t));
+	config->local_ip = NULL;
+	config->local_port = 0;
+	config->origin = NULL;
+	config->resource_location = NULL;
+	config->resource_map = apr_table_make(pool,2);
+	config->max_connection_count = 100;
+	config->force_destination = FALSE;
+	return config;
+}
+
+
+static apt_bool_t rtsp_config_validate(mrcp_unirtsp_agent_t *agent, rtsp_server_config_t *config, apr_pool_t *pool)
+{
+	if(!config->local_ip) {
+		return FALSE;
+	}
+	agent->config = config;
+	return TRUE;
+}
+
+static APR_INLINE mrcp_unirtsp_agent_t* server_agent_get(apt_task_t *task)
+{
+	apt_consumer_task_t *consumer_task = apt_task_object_get(task);
+	mrcp_unirtsp_agent_t *agent = apt_consumer_task_object_get(consumer_task);
+	return agent;
+}
+
+static apt_bool_t mrcp_unirtsp_session_create(rtsp_server_t *rtsp_server, rtsp_server_session_t *rtsp_session)
+{
+	mrcp_unirtsp_agent_t *agent = rtsp_server_object_get(rtsp_server);
+	const apt_str_t *session_id;
+	mrcp_unirtsp_session_t *session;
+	mrcp_session_t* mrcp_session = agent->sig_agent->create_server_session(agent->sig_agent);
+	if(!mrcp_session) {
+		return FALSE;
+	}
+	session_id = rtsp_server_session_id_get(rtsp_session);
+	if(session_id) {
+		mrcp_session->id = *session_id;
+	}
+	mrcp_session->response_vtable = &session_response_vtable;
+	mrcp_session->event_vtable = NULL;
+
+	session = apr_palloc(mrcp_session->pool,sizeof(mrcp_unirtsp_session_t));
+	session->mrcp_session = mrcp_session;
+	mrcp_session->obj = session;
+	
+	session->home = su_home_new(sizeof(*session->home));
+
+	rtsp_server_session_object_set(rtsp_session,session);
+	session->rtsp_session = rtsp_session;
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_session_terminate(rtsp_server_t *rtsp_server, rtsp_server_session_t *rtsp_session)
+{
+	mrcp_unirtsp_session_t *session	= rtsp_server_session_object_get(rtsp_session);
+	if(!session) {
+		return FALSE;
+	}
+	return mrcp_session_terminate_request(session->mrcp_session);
+}
+
+static void mrcp_unirtsp_session_destroy(mrcp_unirtsp_session_t *session)
+{
+	if(session->home) {
+		su_home_unref(session->home);
+		session->home = NULL;
+	}
+	rtsp_server_session_object_set(session->rtsp_session,NULL);
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy Session "APT_SID_FMT,MRCP_SESSION_SID(session->mrcp_session));
+	mrcp_session_destroy(session->mrcp_session);
+}
+
+static apt_bool_t mrcp_unirtsp_session_announce(mrcp_unirtsp_agent_t *agent, mrcp_unirtsp_session_t *session, rtsp_message_t *message)
+{
+	const char *resource_name = mrcp_name_get_by_rtsp_name(
+		agent->config->resource_map,
+		message->start_line.common.request_line.resource_name);
+	apt_bool_t status = TRUE;
+
+	if(session && resource_name &&
+		rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE) == TRUE &&
+		message->header.content_type == RTSP_CONTENT_TYPE_MRCP &&
+		rtsp_header_property_check(&message->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH) == TRUE &&
+		message->header.content_length > 0) {
+
+		apt_text_stream_t text_stream;
+		mrcp_parser_t *parser;
+		apt_str_t resource_name_str;
+
+		text_stream.text = message->body;
+		text_stream.pos = text_stream.text.buf;
+		apt_string_set(&resource_name_str,resource_name);
+
+		parser = mrcp_parser_create(agent->sig_agent->resource_factory,session->mrcp_session->pool);
+		mrcp_parser_resource_name_set(parser,&resource_name_str);
+		if(mrcp_parser_run(parser,&text_stream) == MRCP_STREAM_MESSAGE_COMPLETE) {
+			mrcp_message_t *mrcp_message = mrcp_parser_message_get(parser);
+			mrcp_message->channel_id.session_id = message->header.session_id;
+			status = mrcp_session_control_request(session->mrcp_session,mrcp_message);
+		}
+		else {
+			/* error response */
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse MRCPv1 Message");
+			status = FALSE;
+		}
+	}
+	else {
+		/* error response */
+		status = FALSE;
+	}
+	return status;
+}
+
+static apt_bool_t mrcp_unirtsp_message_handle(rtsp_server_t *rtsp_server, rtsp_server_session_t *rtsp_session, rtsp_message_t *rtsp_message)
+{
+	apt_bool_t status = FALSE;
+	mrcp_unirtsp_agent_t *agent = rtsp_server_object_get(rtsp_server);
+	mrcp_unirtsp_session_t *session	= rtsp_server_session_object_get(rtsp_session);
+	if(!session) {
+		return FALSE;
+	}
+
+	switch(rtsp_message->start_line.common.request_line.method_id) {
+		case RTSP_METHOD_SETUP:
+		case RTSP_METHOD_TEARDOWN:
+		{
+			const char *force_destination_ip = NULL;
+			mrcp_session_descriptor_t *descriptor;
+
+			if(agent->config->force_destination == TRUE) {
+				force_destination_ip = rtsp_server_session_destination_get(rtsp_session);
+			}
+			descriptor = mrcp_descriptor_generate_by_rtsp_request(
+							rtsp_message,
+							force_destination_ip,
+							agent->config->resource_map,
+							session->mrcp_session->pool,
+							session->home);
+			if(!descriptor) {
+				rtsp_message_t *response = rtsp_response_create(rtsp_message,
+										RTSP_STATUS_CODE_BAD_REQUEST,
+										RTSP_REASON_PHRASE_BAD_REQUEST,
+										rtsp_message->pool);
+				status = rtsp_server_session_respond(rtsp_server,session->rtsp_session,response);
+				break;
+			}
+			status = mrcp_session_offer(session->mrcp_session,descriptor);
+			break;
+		}
+		case RTSP_METHOD_ANNOUNCE:
+		{
+			status = mrcp_unirtsp_session_announce(agent,session,rtsp_message);
+			break;
+		}
+		case RTSP_METHOD_DESCRIBE:
+		{
+			rtsp_message_t *response = rtsp_resource_discovery_response_generate(
+						rtsp_message,
+						agent->config->local_ip,
+						agent->config->origin,
+						session->mrcp_session->pool);
+			status = rtsp_server_session_respond(rtsp_server,session->rtsp_session,response);
+			break;
+		}
+		default:
+			break;
+	}
+
+	return status;
+}
+
+static apt_bool_t mrcp_unirtsp_on_session_answer(mrcp_session_t *mrcp_session, mrcp_session_descriptor_t *descriptor)
+{
+	mrcp_unirtsp_session_t *session = mrcp_session->obj;
+	mrcp_unirtsp_agent_t *agent = mrcp_session->signaling_agent->obj;
+	rtsp_message_t *response = NULL;
+	const rtsp_message_t *request = rtsp_server_session_request_get(session->rtsp_session);
+	if(!request) {
+		return FALSE;
+	}
+
+	if(request->start_line.common.request_line.method_id == RTSP_METHOD_SETUP) {
+		if(agent->config->origin) {
+			apt_string_set(&descriptor->origin,agent->config->origin);
+		}
+
+		response = rtsp_response_generate_by_mrcp_descriptor(
+						request,
+						descriptor,
+						agent->config->resource_map,
+						mrcp_session->pool);
+	}
+	else if(request->start_line.common.request_line.method_id == RTSP_METHOD_TEARDOWN) {
+		response = rtsp_response_create(request,RTSP_STATUS_CODE_OK,RTSP_REASON_PHRASE_OK,mrcp_session->pool);
+	}
+
+	if(!response) {
+		return FALSE;
+	}
+	rtsp_server_session_respond(agent->rtsp_server,session->rtsp_session,response);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_on_session_terminate(mrcp_session_t *mrcp_session)
+{
+	mrcp_unirtsp_session_t *session = mrcp_session->obj;
+	rtsp_server_session_t *rtsp_session = session->rtsp_session;
+	mrcp_unirtsp_agent_t *agent = mrcp_session->signaling_agent->obj;
+
+	mrcp_unirtsp_session_destroy(session);
+	rtsp_server_session_terminate(agent->rtsp_server,rtsp_session);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_unirtsp_on_session_control(mrcp_session_t *mrcp_session, mrcp_message_t *mrcp_message)
+{
+	mrcp_unirtsp_session_t *session = mrcp_session->obj;
+	mrcp_unirtsp_agent_t *agent = mrcp_session->signaling_agent->obj;
+
+	char buffer[500];
+	apt_text_stream_t stream;
+	rtsp_message_t *rtsp_message = NULL;
+	apt_str_t *body;
+
+	apt_text_stream_init(&stream,buffer,sizeof(buffer));
+
+	mrcp_message->start_line.version = MRCP_VERSION_1;
+	if(mrcp_message_generate(agent->sig_agent->resource_factory,mrcp_message,&stream) != TRUE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Generate MRCPv1 Message");
+		return FALSE;
+	}
+	stream.text.length = stream.pos - stream.text.buf;
+
+	if(mrcp_message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		/* send RTSP response (OK) */
+		const rtsp_message_t *request = rtsp_server_session_request_get(session->rtsp_session);
+		if(request) {
+			rtsp_message = rtsp_response_create(request,RTSP_STATUS_CODE_OK,RTSP_REASON_PHRASE_OK,mrcp_session->pool);
+		}
+	}
+	else if(mrcp_message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		/* send RTSP announce */
+		rtsp_message = rtsp_request_create(mrcp_session->pool);
+		rtsp_message->start_line.common.request_line.method_id = RTSP_METHOD_ANNOUNCE;
+	}
+
+	if(!rtsp_message) {
+		return FALSE;
+	}
+
+	body = &rtsp_message->body;
+	body->length = mrcp_message->start_line.length;
+	body->buf = apr_palloc(rtsp_message->pool,body->length+1);
+	memcpy(body->buf,stream.text.buf,stream.text.length);
+	if(mrcp_message->body.length) {
+		memcpy(body->buf+stream.text.length,mrcp_message->body.buf,mrcp_message->body.length);
+	}
+	body->buf[body->length] = '\0';
+
+	rtsp_message->header.content_type = RTSP_CONTENT_TYPE_MRCP;
+	rtsp_header_property_add(&rtsp_message->header.property_set,RTSP_HEADER_FIELD_CONTENT_TYPE);
+	rtsp_message->header.content_length = body->length;
+	rtsp_header_property_add(&rtsp_message->header.property_set,RTSP_HEADER_FIELD_CONTENT_LENGTH);
+
+	rtsp_server_session_respond(agent->rtsp_server,session->rtsp_session,rtsp_message);
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/packages/inno-setup/setup.iss
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/packages/inno-setup/setup.iss	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,14 @@
+#define uni_version "0.6.0"
+
+AppName=UniMRCP
+AppVerName=UniMRCP-{#= uni_version}
+AppPublisher=UniMRCP
+AppPublisherURL=http://www.unimrcp.org/
+AppSupportURL=http://groups.google.com/group/unimrcp
+AppUpdatesURL=http://code.google.com/p/unimrcp/downloads/list
+DefaultDirName={pf}\UniMRCP
+DefaultGroupName=UniMRCP
+Compression=lzma
+InternalCompressLevel=max
+SolidCompression=true
+

Added: freeswitch/trunk/libs/unimrcp/packages/inno-setup/unimrcp-sdk.iss
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/packages/inno-setup/unimrcp-sdk.iss	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,56 @@
+[Setup]
+#include "setup.iss"
+OutputBaseFilename=unimrcp-sdk-{#= uni_version}
+
+[Types]
+Name: "full"; Description: "Full installation"
+Name: "sdk"; Description: "SDK installation"
+Name: "docs"; Description: "Documentation installation"
+Name: "custom"; Description: "Custom installation"; Flags: iscustom
+
+[Components]
+Name: "sdk"; Description: "UniMRCP SDK (client, server and plugin development)"; Types: full sdk
+Name: "docs"; Description: "UniMRCP documentation"; Types: full docs
+Name: "docs\design"; Description: "Design concepts"; Types: full docs
+Name: "docs\api"; Description: "API"; Types: full docs
+
+[Files]
+Source: "..\..\libs\apr\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\apr-toolkit\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mpf\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcp\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcp\message\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcp\control\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcp\resources\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcp-engine\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcp-signaling\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcpv2-transport\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcp-client\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\libs\mrcp-server\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\platforms\libunimrcp-client\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\platforms\libunimrcp-server\include\*.h"; DestDir: "{app}\include"; Components: sdk
+Source: "..\..\Release\bin\*.lib"; DestDir: "{app}\lib"; Components: sdk
+Source: "..\..\libs\apr\Release\*.lib"; DestDir: "{app}\lib"; Components: sdk
+Source: "..\..\libs\apr-util\Release\*.lib"; DestDir: "{app}\lib"; Components: sdk
+Source: "..\..\libs\sofia-sip\win32\libsofia-sip-ua\Release\*.lib"; DestDir: "{app}\lib"; Components: sdk
+Source: "..\..\build\vsprops\sdk\*.vsprops"; DestDir: "{app}\vsprops"; Components: sdk; AfterInstall: SetProjectPath()
+Source: "..\..\docs\ea\*"; DestDir: "{app}\doc\ea"; Components: docs/design; Flags: recursesubdirs
+Source: "..\..\docs\dox\*"; DestDir: "{app}\doc\dox"; Components: docs/api; Flags: recursesubdirs
+
+[Icons]
+Name: "{group}\UniMRCP Docs\Design concepts"; Filename: "{app}\doc\ea\index.htm"; Components: docs\design
+Name: "{group}\UniMRCP Docs\API"; Filename: "{app}\doc\dox\html\index.html"; Components: docs\api
+Name: "{group}\Uninstall"; Filename: "{uninstallexe}"
+
+[Code]
+procedure SetProjectPath();
+var
+  VspropsFile: String;
+  Content: String;
+begin
+  VspropsFile := ExpandConstant('{app}\vsprops\unimrcpsdk.vsprops');
+  LoadStringFromFile (VspropsFile, Content);
+  StringChange (Content, 'Value="C:\Program Files\UniMRCP"', ExpandConstant('Value="{app}"'));
+  SaveStringToFile (VspropsFile, Content, False);
+end;
+

Added: freeswitch/trunk/libs/unimrcp/packages/inno-setup/unimrcp.iss
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/packages/inno-setup/unimrcp.iss	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,85 @@
+[Setup]
+#include "setup.iss"
+OutputBaseFilename=unimrcp-{#= uni_version}
+
+[Types]
+Name: "full"; Description: "Full installation"
+Name: "server"; Description: "Server installation"
+Name: "client"; Description: "Client installation"
+Name: "custom"; Description: "Custom installation"; Flags: iscustom
+
+[Components]
+Name: "server"; Description: "UniMRCP server"; Types: full server
+Name: "server\cepstral"; Description: "Cepstral synthesizer plugin"; Types: full server
+Name: "server\demosynth"; Description: "Demo synthesizer plugin"; Types: full server
+Name: "server\demorecog"; Description: "Demo recognizer plugin"; Types: full server
+Name: "client"; Description: "UniMRCP client (demo application)"; Types: full client
+
+[Dirs]
+Name: "{app}\data"; Permissions: everyone-full;
+Name: "{app}\log"; Permissions: everyone-full;
+
+[Files]
+#define uni_root "..\..\Release"
+Source: "{#= uni_root}\bin\unimrcpserver.exe"; DestDir: "{app}\bin"; Components: server
+Source: "{#= uni_root}\bin\unimrcpservice.exe"; DestDir: "{app}\bin"; Components: server
+Source: "{#= uni_root}\bin\unimrcpclient.exe"; DestDir: "{app}\bin"; Components: client
+Source: "{#= uni_root}\bin\*.dll"; DestDir: "{app}\bin"; Components: server client
+Source: "{#= uni_root}\plugin\mrcpcepstral.dll"; DestDir: "{app}\plugin"; Components: server/cepstral
+Source: "{#= uni_root}\plugin\demosynth.dll"; DestDir: "{app}\plugin"; Components: server/demosynth
+Source: "{#= uni_root}\plugin\demorecog.dll"; DestDir: "{app}\plugin"; Components: server/demorecog
+Source: "{#= uni_root}\conf\unimrcpserver.xml"; DestDir: "{app}\conf"; Components: server
+Source: "{#= uni_root}\conf\unimrcpclient.xml"; DestDir: "{app}\conf"; Components: client
+Source: "{#= uni_root}\data\*.pcm"; DestDir: "{app}\data"; Components: server client
+Source: "{#= uni_root}\data\*.xml"; DestDir: "{app}\data"; Components: server client
+
+[Icons]
+Name: "{group}\UniMRCP Server Console"; Filename: "{app}\bin\unimrcpserver.exe"; Parameters: "--root-dir ""{app}"""; Components: server
+Name: "{group}\UniMRCP Client Console"; Filename: "{app}\bin\unimrcpclient.exe"; Parameters: "--root-dir ""{app}"""; Components: client
+Name: "{group}\UniMRCP Service\Start Server"; Filename: "{app}\bin\unimrcpservice.exe"; Parameters: "--start"; Components: server
+Name: "{group}\UniMRCP Service\Stop Server"; Filename: "{app}\bin\unimrcpservice.exe"; Parameters: "--stop"; Components: server
+Name: "{group}\Uninstall"; Filename: "{uninstallexe}"
+
+[Run]
+Filename: "{app}\bin\unimrcpservice.exe"; Description: "Register service"; Parameters: "--register ""{app}"""; Components: server
+
+[UninstallRun]
+Filename: "{app}\bin\unimrcpservice.exe"; Parameters: "--unregister"; Components: server
+
+[Code]
+var
+  Content: String;
+  
+procedure ModifyPluginConf(PluginName: String; Enable: Boolean);
+var
+  TextFrom: String;
+  TextTo: String;
+begin
+  if Enable = True then
+  begin
+    TextFrom := 'class="' + PluginName + '" enable="0"';
+    TextTo := 'class="' + PluginName + '" enable="1"';
+  end
+  else
+  begin
+    TextFrom := 'class="' + PluginName + '" enable="1"';
+    TextTo := 'class="' + PluginName + '" enable="0"';
+  end
+  StringChange (Content, TextFrom, TextTo);
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+  CfgFile: String;
+begin
+  if CurStep = ssPostInstall then
+  begin
+    CfgFile := ExpandConstant('{app}\conf\unimrcpserver.xml');
+    LoadStringFromFile (CfgFile, Content);
+    ModifyPluginConf ('mrcpcepstral', IsComponentSelected('server\cepstral'));
+    ModifyPluginConf ('demosynth', IsComponentSelected('server\demosynth'));
+    ModifyPluginConf ('demorecog', IsComponentSelected('server\demorecog'));
+    SaveStringToFile (CfgFile, Content, False);
+  end
+end;
+

Added: freeswitch/trunk/libs/unimrcp/platforms/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,4 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+SUBDIRS                = libunimrcp-server unimrcp-server \
+                         libunimrcp-client unimrcp-client

Added: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,34 @@
+MAINTAINERCLEANFILES 	    = Makefile.in
+
+INCLUDES                    = -I$(top_srcdir)/platforms/libunimrcp-client/include \
+                              -I$(top_srcdir)/modules/mrcp-sofiasip/include \
+                              -I$(top_srcdir)/modules/mrcp-unirtsp/include \
+                              -I$(top_srcdir)/libs/mrcp-client/include \
+                              -I$(top_srcdir)/libs/mrcp-signaling/include \
+                              -I$(top_srcdir)/libs/mrcpv2-transport/include \
+                              -I$(top_srcdir)/libs/mrcp/include \
+                              -I$(top_srcdir)/libs/mrcp/message/include \
+                              -I$(top_srcdir)/libs/mrcp/control/include \
+                              -I$(top_srcdir)/libs/mrcp/resources/include \
+                              -I$(top_srcdir)/libs/mpf/include \
+                              -I$(top_srcdir)/libs/apr-toolkit/include \
+                              -I$(top_srcdir)/build \
+                              $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+lib_LTLIBRARIES             = libunimrcpclient.la
+
+include_HEADERS             = include/unimrcp_client.h
+
+libunimrcpclient_la_SOURCES = src/unimrcp_client.c
+
+libunimrcpclient_la_LIBADD  = $(top_builddir)/modules/mrcp-sofiasip/libmrcpsofiasip.la \
+                              $(top_builddir)/modules/mrcp-unirtsp/libmrcpunirtsp.la \
+                              $(top_builddir)/libs/mrcpv2-transport/libmrcpv2transport.la \
+                              $(top_builddir)/libs/mrcp-client/libmrcpclient.la \
+                              $(top_builddir)/libs/mrcp-signaling/libmrcpsignaling.la \
+                              $(top_builddir)/libs/mrcp/libmrcp.la \
+                              $(top_builddir)/libs/mpf/libmpf.la \
+                              $(top_builddir)/libs/apr-toolkit/libaprtoolkit.la \
+                              $(UNIMRCP_APR_LIBS) $(UNIMRCP_APU_LIBS) $(UNIMRCP_SOFIA_LIBS)
+                              
+libunimrcpclient_la_LDFLAGS = $(UNI_LT_VERSION)

Added: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/include/unimrcp_client.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/include/unimrcp_client.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __UNIMRCP_CLIENT_H__
+#define __UNIMRCP_CLIENT_H__
+
+/**
+ * @file unimrcp_client.h
+ * @brief UniMRCP Client
+ */ 
+
+#include "mrcp_client.h"
+
+APT_BEGIN_EXTERN_C
+
+/**
+ * Create UniMRCP client.
+ * @param dir_layout the dir layout structure
+ */
+MRCP_DECLARE(mrcp_client_t*) unimrcp_client_create(apt_dir_layout_t *dir_layout);
+
+
+APT_END_EXTERN_C
+
+#endif /*__UNIMRCP_CLIENT_H__*/

Added: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,155 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/src/unimrcp_client.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/src/unimrcp_client.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,596 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "unimrcp_client.h"
+#include "uni_version.h"
+#include "mrcp_default_factory.h"
+#include "mpf_engine.h"
+#include "mpf_codec_manager.h"
+#include "mpf_rtp_termination_factory.h"
+#include "mrcp_sofiasip_client_agent.h"
+#include "mrcp_unirtsp_client_agent.h"
+#include "mrcp_client_connection.h"
+#include "apt_net.h"
+#include "apt_log.h"
+
+#define CONF_FILE_NAME            "unimrcpclient.xml"
+#define DEFAULT_CONF_DIR_PATH     "../conf"
+
+#define DEFAULT_LOCAL_IP_ADDRESS  "127.0.0.1"
+#define DEFAULT_REMOTE_IP_ADDRESS "127.0.0.1"
+#define DEFAULT_SIP_LOCAL_PORT    8062
+#define DEFAULT_SIP_REMOTE_PORT   8060
+#define DEFAULT_RTP_PORT_MIN      4000
+#define DEFAULT_RTP_PORT_MAX      5000
+
+#define DEFAULT_SOFIASIP_UA_NAME  "UniMRCP SofiaSIP"
+#define DEFAULT_SDP_ORIGIN        "UniMRCPClient"
+#define DEFAULT_RESOURCE_LOCATION "media"
+
+#define XML_FILE_BUFFER_LENGTH    2000
+
+static apr_xml_doc* unimrcp_client_config_parse(const char *path, apr_pool_t *pool);
+static apt_bool_t unimrcp_client_config_load(mrcp_client_t *client, const apr_xml_doc *doc, apr_pool_t *pool);
+
+/** Start UniMRCP client */
+MRCP_DECLARE(mrcp_client_t*) unimrcp_client_create(apt_dir_layout_t *dir_layout)
+{
+	apr_pool_t *pool;
+	apr_xml_doc *doc;
+	mrcp_resource_factory_t *resource_factory;
+	mpf_codec_manager_t *codec_manager;
+	mrcp_client_t *client;
+
+	if(!dir_layout) {
+		return NULL;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"UniMRCP Client ["UNI_VERSION_STRING"]");
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"APR ["APR_VERSION_STRING"]");
+	client = mrcp_client_create(dir_layout);
+	if(!client) {
+		return NULL;
+	}
+	pool = mrcp_client_memory_pool_get(client);
+	if(!pool) {
+		return NULL;
+	}
+
+	resource_factory = mrcp_default_factory_create(pool);
+	if(resource_factory) {
+		mrcp_client_resource_factory_register(client,resource_factory);
+	}
+
+	codec_manager = mpf_engine_codec_manager_create(pool);
+	if(codec_manager) {
+		mrcp_client_codec_manager_register(client,codec_manager);
+	}
+
+	doc = unimrcp_client_config_parse(dir_layout->conf_dir_path,pool);
+	if(doc) {
+		unimrcp_client_config_load(client,doc,pool);
+	}
+
+	return client;
+}
+
+/** Parse config file */
+static apr_xml_doc* unimrcp_client_config_parse(const char *dir_path, apr_pool_t *pool)
+{
+	apr_xml_parser *parser = NULL;
+	apr_xml_doc *doc = NULL;
+	apr_file_t *fd = NULL;
+	apr_status_t rv;
+	const char *file_path;
+
+	if(!dir_path) {
+		dir_path = DEFAULT_CONF_DIR_PATH;
+	}
+	if(*dir_path == '\0') {
+		file_path = CONF_FILE_NAME;
+	}
+	else {
+		file_path = apr_psprintf(pool,"%s/%s",dir_path,CONF_FILE_NAME);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Open Config File [%s]",file_path);
+	rv = apr_file_open(&fd,file_path,APR_READ|APR_BINARY,0,pool);
+	if(rv != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Config File [%s]",file_path);
+		return NULL;
+	}
+
+	rv = apr_xml_parse_file(pool,&parser,&doc,fd,XML_FILE_BUFFER_LENGTH);
+	if(rv != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse Config File [%s]",file_path);
+		return NULL;
+	}
+
+	apr_file_close(fd);
+	return doc;
+}
+
+static apt_bool_t param_name_value_get(const apr_xml_elem *elem, const apr_xml_attr **name, const apr_xml_attr **value)
+{
+	const apr_xml_attr *attr;
+	if(!name || !value) {
+		return FALSE;
+	}
+
+	*name = NULL;
+	*value = NULL;
+	for(attr = elem->attr; attr; attr = attr->next) {
+		if(strcasecmp(attr->name,"name") == 0) {
+			*name = attr;
+		}
+		else if(strcasecmp(attr->name,"value") == 0) {
+			*value = attr;
+		}
+	}
+	return (*name && *value) ? TRUE : FALSE;
+}
+
+static char* ip_addr_get(const char *value, apr_pool_t *pool)
+{
+	if(!value || strcasecmp(value,"auto") == 0) {
+		char *addr = DEFAULT_LOCAL_IP_ADDRESS;
+		apt_ip_get(&addr,pool);
+		return addr;
+	}
+	return apr_pstrdup(pool,value);
+}
+
+/** Load map of MRCP resource names */
+static apt_bool_t resource_map_load(apr_table_t *resource_map, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_attr *attr_name;
+	const apr_xml_attr *attr_value;
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Resource Map");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				apr_table_set(resource_map,attr_name->value,attr_value->value);
+			}
+		}
+	}    
+	return TRUE;
+}
+
+/** Load SofiaSIP signaling agent */
+static mrcp_sig_agent_t* unimrcp_client_sofiasip_agent_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	mrcp_sofia_client_config_t *config = mrcp_sofiasip_client_config_alloc(pool);
+	config->local_ip = DEFAULT_LOCAL_IP_ADDRESS;
+	config->local_port = DEFAULT_SIP_LOCAL_PORT;
+	config->remote_ip = DEFAULT_REMOTE_IP_ADDRESS;
+	config->remote_port = DEFAULT_SIP_REMOTE_PORT;
+	config->ext_ip = NULL;
+	config->user_agent_name = DEFAULT_SOFIASIP_UA_NAME;
+	config->origin = DEFAULT_SDP_ORIGIN;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading SofiaSIP Agent");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"client-ip") == 0) {
+					config->local_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"client-ext-ip") == 0) {
+					config->ext_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"client-port") == 0) {
+					config->local_port = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"server-ip") == 0) {
+					config->remote_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"server-port") == 0) {
+					config->remote_port = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"server-username") == 0) {
+					config->remote_user_name = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"force-destination") == 0) {
+					config->force_destination = atoi(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"sip-transport") == 0) {
+					config->transport = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"ua-name") == 0) {
+					config->user_agent_name = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"sdp-origin") == 0) {
+					config->origin = apr_pstrdup(pool,attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+	}    
+	return mrcp_sofiasip_client_agent_create(config,pool);
+}
+
+/** Load UniRTSP signaling agent */
+static mrcp_sig_agent_t* unimrcp_client_rtsp_agent_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	rtsp_client_config_t *config = mrcp_unirtsp_client_config_alloc(pool);
+	config->origin = DEFAULT_SDP_ORIGIN;
+	config->resource_location = DEFAULT_RESOURCE_LOCATION;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading UniRTSP Agent");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"server-ip") == 0) {
+					config->server_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"server-port") == 0) {
+					config->server_port = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"resource-location") == 0) {
+					config->resource_location = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"sdp-origin") == 0) {
+					config->origin = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"max-connection-count") == 0) {
+					config->max_connection_count = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"force-destination") == 0) {
+					config->force_destination = atoi(attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+		else if(strcasecmp(elem->name,"resourcemap") == 0) {
+			resource_map_load(config->resource_map,elem,pool);
+		}
+	}    
+	return mrcp_unirtsp_client_agent_create(config,pool);
+}
+
+/** Load signaling agents */
+static apt_bool_t unimrcp_client_signaling_agents_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Signaling Agents");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"agent") == 0) {
+			mrcp_sig_agent_t *sig_agent = NULL;
+			const char *name = NULL;
+			const apr_xml_attr *attr;
+			for(attr = elem->attr; attr; attr = attr->next) {
+				if(strcasecmp(attr->name,"name") == 0) {
+					name = apr_pstrdup(pool,attr->value);
+				}
+				else if(strcasecmp(attr->name,"class") == 0) {
+					if(strcasecmp(attr->value,"SofiaSIP") == 0) {
+						sig_agent = unimrcp_client_sofiasip_agent_load(client,elem,pool);
+					}
+					else if(strcasecmp(attr->value,"UniRTSP") == 0) {
+						sig_agent = unimrcp_client_rtsp_agent_load(client,elem,pool);
+					}
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+				}
+			}
+			if(sig_agent) {
+				mrcp_client_signaling_agent_register(client,sig_agent,name);
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+/** Load MRCPv2 connection agent */
+static mrcp_connection_agent_t* unimrcp_client_connection_agent_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apr_size_t max_connection_count = 100;
+	apt_bool_t offer_new_connection = FALSE;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading MRCPv2 Agent");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"max-connection-count") == 0) {
+					max_connection_count = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"offer-new-connection") == 0) {
+					offer_new_connection = atoi(attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+	}    
+	return mrcp_client_connection_agent_create(max_connection_count,offer_new_connection,pool);
+}
+
+/** Load MRCPv2 conection agents */
+static apt_bool_t unimrcp_client_connection_agents_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Connection Agents");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"agent") == 0) {
+			mrcp_connection_agent_t *connection_agent;
+			const char *name = NULL;
+			const apr_xml_attr *attr;
+			for(attr = elem->attr; attr; attr = attr->next) {
+				if(strcasecmp(attr->name,"name") == 0) {
+					name = apr_pstrdup(pool,attr->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+				}
+			}
+			connection_agent = unimrcp_client_connection_agent_load(client,elem,pool);
+			if(connection_agent) {
+				mrcp_client_connection_agent_register(client,connection_agent,name);
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+/** Load RTP termination factory */
+static mpf_termination_factory_t* unimrcp_client_rtp_factory_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	char *rtp_ip = DEFAULT_LOCAL_IP_ADDRESS;
+	char *rtp_ext_ip = NULL;
+	mpf_rtp_config_t *rtp_config = mpf_rtp_config_create(pool);
+	rtp_config->rtp_port_min = DEFAULT_RTP_PORT_MIN;
+	rtp_config->rtp_port_max = DEFAULT_RTP_PORT_MAX;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading RTP Termination Factory");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"rtp-ip") == 0) {
+					rtp_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"rtp-ext-ip") == 0) {
+					rtp_ext_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"rtp-port-min") == 0) {
+					rtp_config->rtp_port_min = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"rtp-port-max") == 0) {
+					rtp_config->rtp_port_max = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"playout-delay") == 0) {
+					rtp_config->jb_config.initial_playout_delay = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"min-playout-delay") == 0) {
+					rtp_config->jb_config.min_playout_delay = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"max-playout-delay") == 0) {
+					rtp_config->jb_config.max_playout_delay = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"codecs") == 0) {
+					const mpf_codec_manager_t *codec_manager = mrcp_client_codec_manager_get(client);
+					if(codec_manager) {
+						mpf_codec_manager_codec_list_load(codec_manager,&rtp_config->codec_list,attr_value->value,pool);
+					}
+				}
+				else if(strcasecmp(attr_name->value,"ptime") == 0) {
+					rtp_config->ptime = (apr_uint16_t)atol(attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+	}    
+	apt_string_set(&rtp_config->ip,rtp_ip);
+	if(rtp_ext_ip) {
+		apt_string_set(&rtp_config->ext_ip,rtp_ext_ip);
+	}
+	return mpf_rtp_termination_factory_create(rtp_config,pool);
+}
+
+/** Load media engines */
+static apt_bool_t unimrcp_client_media_engines_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Media Engines");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"engine") == 0) {
+			mpf_engine_t *media_engine;
+			const char *name = NULL;
+			const apr_xml_attr *attr;
+			for(attr = elem->attr; attr; attr = attr->next) {
+				if(strcasecmp(attr->name,"name") == 0) {
+					name = apr_pstrdup(pool,attr->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+				}
+			}
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Media Engine");
+			media_engine = mpf_engine_create(pool);
+			if(media_engine) {
+				mrcp_client_media_engine_register(client,media_engine,name);
+			}
+		}
+		else if(strcasecmp(elem->name,"rtp") == 0) {
+			mpf_termination_factory_t *rtp_factory;
+			const char *name = NULL;
+			const apr_xml_attr *attr;
+			for(attr = elem->attr; attr; attr = attr->next) {
+				if(strcasecmp(attr->name,"name") == 0) {
+					name = apr_pstrdup(pool,attr->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+				}
+			}
+			rtp_factory = unimrcp_client_rtp_factory_load(client,elem,pool);
+			if(rtp_factory) {
+				mrcp_client_rtp_factory_register(client,rtp_factory,name);
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+/** Load settings */
+static apt_bool_t unimrcp_client_settings_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Settings");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"signaling") == 0) {
+			unimrcp_client_signaling_agents_load(client,elem,pool);
+		}
+		else if(strcasecmp(elem->name,"connection") == 0) {
+			unimrcp_client_connection_agents_load(client,elem,pool);
+		}
+		else if(strcasecmp(elem->name,"media") == 0) {
+			unimrcp_client_media_engines_load(client,elem,pool);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+/** Load profile */
+static apt_bool_t unimrcp_client_profile_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const char *name = NULL;
+	mrcp_profile_t *profile;
+	mrcp_sig_agent_t *sig_agent = NULL;
+	mrcp_connection_agent_t *cnt_agent = NULL;
+	mpf_engine_t *media_engine = NULL;
+	mpf_termination_factory_t *rtp_factory = NULL;
+	const apr_xml_elem *elem;
+	const apr_xml_attr *attr;
+	for(attr = root->attr; attr; attr = attr->next) {
+		if(strcasecmp(attr->name,"name") == 0) {
+			name = apr_pstrdup(pool,attr->value);
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Profile [%s]",name);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+		}
+	}
+	if(!name) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Load Profile: no profile name specified");
+		return FALSE;
+	}
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Loading Profile %s [%s]",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"signaling-agent") == 0) {
+					sig_agent = mrcp_client_signaling_agent_get(client,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"connection-agent") == 0) {
+					cnt_agent = mrcp_client_connection_agent_get(client,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"media-engine") == 0) {
+					media_engine = mrcp_client_media_engine_get(client,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"rtp-factory") == 0) {
+					rtp_factory = mrcp_client_rtp_factory_get(client,attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create Profile [%s]",name);
+	profile = mrcp_client_profile_create(NULL,sig_agent,cnt_agent,media_engine,rtp_factory,pool);
+	return mrcp_client_profile_register(client,profile,name);
+}
+
+/** Load profiles */
+static apt_bool_t unimrcp_client_profiles_load(mrcp_client_t *client, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Profiles");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"profile") == 0) {
+			unimrcp_client_profile_load(client,elem,pool);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}
+    return TRUE;
+}
+
+/** Load configuration (settings and profiles) */
+static apt_bool_t unimrcp_client_config_load(mrcp_client_t *client, const apr_xml_doc *doc, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	const apr_xml_elem *root = doc->root;
+	if(!root || strcasecmp(root->name,"unimrcpclient") != 0) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Document");
+		return FALSE;
+	}
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"settings") == 0) {
+			unimrcp_client_settings_load(client,elem,pool);
+		}
+		else if(strcasecmp(elem->name,"profiles") == 0) {
+			unimrcp_client_profiles_load(client,elem,pool);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}
+    
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,36 @@
+MAINTAINERCLEANFILES 	    = Makefile.in
+
+INCLUDES                    = -I$(top_srcdir)/platforms/libunimrcp-server/include \
+                              -I$(top_srcdir)/modules/mrcp-sofiasip/include \
+                              -I$(top_srcdir)/modules/mrcp-unirtsp/include \
+                              -I$(top_srcdir)/libs/mrcp-server/include \
+                              -I$(top_srcdir)/libs/mrcp-engine/include \
+                              -I$(top_srcdir)/libs/mrcp-signaling/include \
+                              -I$(top_srcdir)/libs/mrcpv2-transport/include \
+                              -I$(top_srcdir)/libs/mrcp/include \
+                              -I$(top_srcdir)/libs/mrcp/message/include \
+                              -I$(top_srcdir)/libs/mrcp/control/include \
+                              -I$(top_srcdir)/libs/mrcp/resources/include \
+                              -I$(top_srcdir)/libs/mpf/include \
+                              -I$(top_srcdir)/libs/apr-toolkit/include \
+                              -I$(top_srcdir)/build \
+                              $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+lib_LTLIBRARIES             = libunimrcpserver.la
+
+include_HEADERS             = include/unimrcp_server.h
+
+libunimrcpserver_la_SOURCES = src/unimrcp_server.c
+
+libunimrcpserver_la_LIBADD  = $(top_builddir)/modules/mrcp-sofiasip/libmrcpsofiasip.la \
+                              $(top_builddir)/modules/mrcp-unirtsp/libmrcpunirtsp.la \
+                              $(top_builddir)/libs/mrcp-server/libmrcpserver.la \
+                              $(top_builddir)/libs/mrcp-signaling/libmrcpsignaling.la \
+                              $(top_builddir)/libs/mrcpv2-transport/libmrcpv2transport.la \
+                              $(top_builddir)/libs/mrcp-engine/libmrcpengine.la \
+                              $(top_builddir)/libs/mrcp/libmrcp.la \
+                              $(top_builddir)/libs/mpf/libmpf.la \
+                              $(top_builddir)/libs/apr-toolkit/libaprtoolkit.la \
+                              $(UNIMRCP_APR_LIBS) $(UNIMRCP_APU_LIBS) $(UNIMRCP_SOFIA_LIBS)
+
+libunimrcpserver_la_LDFLAGS = $(UNI_LT_VERSION)

Added: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/include/unimrcp_server.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/include/unimrcp_server.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __UNIMRCP_SERVER_H__
+#define __UNIMRCP_SERVER_H__
+
+/**
+ * @file unimrcp_server.h
+ * @brief UniMRCP Server
+ */ 
+
+#include "mrcp_server.h"
+
+APT_BEGIN_EXTERN_C
+
+/** 
+ * Start UniMRCP server.
+ * @param dir_layout the dir layout structure
+ */
+MRCP_DECLARE(mrcp_server_t*) unimrcp_server_start(apt_dir_layout_t *dir_layout);
+
+/** 
+ * Shutdown UniMRCP server.
+ * @param server the MRCP server to shutdown
+ */
+MRCP_DECLARE(apt_bool_t) unimrcp_server_shutdown(mrcp_server_t *server);
+
+APT_END_EXTERN_C
+
+#endif /*__UNIMRCP_SERVER_H__*/

Added: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,155 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/src/unimrcp_server.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/src/unimrcp_server.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,701 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "unimrcp_server.h"
+#include "uni_version.h"
+#include "mrcp_default_factory.h"
+#include "mpf_engine.h"
+#include "mpf_codec_manager.h"
+#include "mpf_rtp_termination_factory.h"
+#include "mrcp_sofiasip_server_agent.h"
+#include "mrcp_unirtsp_server_agent.h"
+#include "mrcp_server_connection.h"
+#include "apt_net.h"
+#include "apt_log.h"
+
+#define CONF_FILE_NAME            "unimrcpserver.xml"
+#define DEFAULT_CONF_DIR_PATH     "../conf"
+#define DEFAULT_PLUGIN_DIR_PATH   "../plugin"
+#ifdef WIN32
+#define DEFAULT_PLUGIN_EXT        "dll"
+#else
+#define DEFAULT_PLUGIN_EXT        "so"
+#endif
+
+#define DEFAULT_IP_ADDRESS        "127.0.0.1"
+#define DEFAULT_SIP_PORT          8060
+#define DEFAULT_RTSP_PORT         1554
+#define DEFAULT_MRCP_PORT         1544
+#define DEFAULT_RTP_PORT_MIN      5000
+#define DEFAULT_RTP_PORT_MAX      6000
+
+#define DEFAULT_SOFIASIP_UA_NAME  "UniMRCP SofiaSIP"
+#define DEFAULT_SDP_ORIGIN        "UniMRCPServer"
+
+#define XML_FILE_BUFFER_LENGTH    2000
+
+static apr_xml_doc* unimrcp_server_config_parse(const char *path, apr_pool_t *pool);
+static apt_bool_t unimrcp_server_config_load(mrcp_server_t *server, const char *plugin_dir_path, const apr_xml_doc *doc, apr_pool_t *pool);
+
+/** Start UniMRCP server */
+MRCP_DECLARE(mrcp_server_t*) unimrcp_server_start(apt_dir_layout_t *dir_layout)
+{
+	apr_pool_t *pool;
+	apr_xml_doc *doc;
+	mrcp_resource_factory_t *resource_factory;
+	mpf_codec_manager_t *codec_manager;
+	mrcp_server_t *server;
+
+	if(!dir_layout) {
+		return NULL;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"UniMRCP Server ["UNI_VERSION_STRING"]");
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"APR ["APR_VERSION_STRING"]");
+	server = mrcp_server_create(dir_layout);
+	if(!server) {
+		return NULL;
+	}
+	pool = mrcp_server_memory_pool_get(server);
+	if(!pool) {
+		return NULL;
+	}
+
+	resource_factory = mrcp_default_factory_create(pool);
+	if(resource_factory) {
+		mrcp_server_resource_factory_register(server,resource_factory);
+	}
+
+	codec_manager = mpf_engine_codec_manager_create(pool);
+	if(codec_manager) {
+		mrcp_server_codec_manager_register(server,codec_manager);
+	}
+
+	doc = unimrcp_server_config_parse(dir_layout->conf_dir_path,pool);
+	if(doc) {
+		unimrcp_server_config_load(server,dir_layout->plugin_dir_path,doc,pool);
+	}
+
+	mrcp_server_start(server);
+	return server;
+}
+
+/** Shutdown UniMRCP server */
+MRCP_DECLARE(apt_bool_t) unimrcp_server_shutdown(mrcp_server_t *server)
+{
+	if(mrcp_server_shutdown(server) == FALSE) {
+		return FALSE;
+	}
+	return mrcp_server_destroy(server);
+}
+
+
+/** Parse config file */
+static apr_xml_doc* unimrcp_server_config_parse(const char *dir_path, apr_pool_t *pool)
+{
+	apr_xml_parser *parser = NULL;
+	apr_xml_doc *doc = NULL;
+	apr_file_t *fd = NULL;
+	apr_status_t rv;
+	const char *file_path;
+
+	if(!dir_path) {
+		dir_path = DEFAULT_CONF_DIR_PATH;
+	}
+	if(*dir_path == '\0') {
+		file_path = CONF_FILE_NAME;
+	}
+	else {
+		file_path = apr_psprintf(pool,"%s/%s",dir_path,CONF_FILE_NAME);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Open Config File [%s]",file_path);
+	rv = apr_file_open(&fd,file_path,APR_READ|APR_BINARY,0,pool);
+	if(rv != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Config File [%s]",file_path);
+		return NULL;
+	}
+
+	rv = apr_xml_parse_file(pool,&parser,&doc,fd,XML_FILE_BUFFER_LENGTH);
+	if(rv != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse Config File [%s]",file_path);
+		return NULL;
+	}
+
+	apr_file_close(fd);
+	return doc;
+}
+
+static apt_bool_t param_name_value_get(const apr_xml_elem *elem, const apr_xml_attr **name, const apr_xml_attr **value)
+{
+	const apr_xml_attr *attr;
+	if(!name || !value) {
+		return FALSE;
+	}
+
+	*name = NULL;
+	*value = NULL;
+	for(attr = elem->attr; attr; attr = attr->next) {
+		if(strcasecmp(attr->name,"name") == 0) {
+			*name = attr;
+		}
+		else if(strcasecmp(attr->name,"value") == 0) {
+			*value = attr;
+		}
+	}
+	return (*name && *value) ? TRUE : FALSE;
+}
+
+static char* ip_addr_get(const char *value, apr_pool_t *pool)
+{
+	if(!value || strcasecmp(value,"auto") == 0) {
+		char *addr = DEFAULT_IP_ADDRESS;
+		apt_ip_get(&addr,pool);
+		return addr;
+	}
+	return apr_pstrdup(pool,value);
+}
+
+/** Load map of MRCP resource names */
+static apt_bool_t resource_map_load(apr_table_t *resource_map, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_attr *attr_name;
+	const apr_xml_attr *attr_value;
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Resource Map");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				apr_table_set(resource_map,attr_name->value,attr_value->value);
+			}
+		}
+	}    
+	return TRUE;
+}
+
+/** Load map of plugins */
+static apt_bool_t plugin_map_load(apr_table_t *plugin_map, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_attr *attr_name;
+	const apr_xml_attr *attr_value;
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Plugin Map");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				apr_table_set(plugin_map,attr_name->value,attr_value->value);
+			}
+		}
+	}    
+	return TRUE;
+}
+
+/** Load SofiaSIP signaling agent */
+static mrcp_sig_agent_t* unimrcp_server_sofiasip_agent_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	mrcp_sofia_server_config_t *config = mrcp_sofiasip_server_config_alloc(pool);
+	config->local_ip = DEFAULT_IP_ADDRESS;
+	config->local_port = DEFAULT_SIP_PORT;
+	config->ext_ip = NULL;
+	config->user_agent_name = DEFAULT_SOFIASIP_UA_NAME;
+	config->origin = DEFAULT_SDP_ORIGIN;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading SofiaSIP Agent");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"sip-ip") == 0) {
+					config->local_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"sip-ext-ip") == 0) {
+					config->ext_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"sip-port") == 0) {
+					config->local_port = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"sip-transport") == 0) {
+					config->transport = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"ua-name") == 0) {
+					config->user_agent_name = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"sdp-origin") == 0) {
+					config->origin = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"force-destination") == 0) {
+					config->force_destination = atoi(attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+	}    
+	return mrcp_sofiasip_server_agent_create(config,pool);
+}
+
+/** Load UniRTSP signaling agent */
+static mrcp_sig_agent_t* unimrcp_server_rtsp_agent_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	rtsp_server_config_t *config = mrcp_unirtsp_server_config_alloc(pool);
+	config->local_ip = DEFAULT_IP_ADDRESS;
+	config->local_port = DEFAULT_RTSP_PORT;
+	config->origin = DEFAULT_SDP_ORIGIN;
+
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading UniRTSP Agent");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"rtsp-ip") == 0) {
+					config->local_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"rtsp-port") == 0) {
+					config->local_port = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"sdp-origin") == 0) {
+					config->origin = apr_pstrdup(pool,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"max-connection-count") == 0) {
+					config->max_connection_count = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"force-destination") == 0) {
+					config->force_destination = atoi(attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+		else if(strcasecmp(elem->name,"resourcemap") == 0) {
+			resource_map_load(config->resource_map,elem,pool);
+		}
+	}
+	return mrcp_unirtsp_server_agent_create(config,pool);
+}
+
+/** Load signaling agents */
+static apt_bool_t unimrcp_server_signaling_agents_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Signaling Agents");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"agent") == 0) {
+			mrcp_sig_agent_t *sig_agent = NULL;
+			const char *name = NULL;
+			const apr_xml_attr *attr;
+			for(attr = elem->attr; attr; attr = attr->next) {
+				if(strcasecmp(attr->name,"name") == 0) {
+					name = apr_pstrdup(pool,attr->value);
+				}
+				else if(strcasecmp(attr->name,"class") == 0) {
+					if(strcasecmp(attr->value,"SofiaSIP") == 0) {
+						sig_agent = unimrcp_server_sofiasip_agent_load(server,elem,pool);
+					}
+					else if(strcasecmp(attr->value,"UniRTSP") == 0) {
+						sig_agent = unimrcp_server_rtsp_agent_load(server,elem,pool);
+					}
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+				}
+			}
+			if(sig_agent) {
+				mrcp_server_signaling_agent_register(server,sig_agent,name);
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+/** Load MRCPv2 connection agent */
+static mrcp_connection_agent_t* unimrcp_server_connection_agent_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	char *mrcp_ip = DEFAULT_IP_ADDRESS;
+	apr_port_t mrcp_port = DEFAULT_MRCP_PORT;
+	apr_size_t max_connection_count = 100;
+	apt_bool_t force_new_connection = FALSE;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading MRCPv2 Agent");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"mrcp-ip") == 0) {
+					mrcp_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"mrcp-port") == 0) {
+					mrcp_port = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"max-connection-count") == 0) {
+					max_connection_count = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"force-new-connection") == 0) {
+					force_new_connection = atoi(attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+	}    
+	return mrcp_server_connection_agent_create(mrcp_ip,mrcp_port,max_connection_count,force_new_connection,pool);
+}
+
+/** Load MRCPv2 conection agents */
+static apt_bool_t unimrcp_server_connection_agents_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Connection Agents");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"agent") == 0) {
+			mrcp_connection_agent_t *connection_agent;
+			const char *name = NULL;
+			const apr_xml_attr *attr;
+			for(attr = elem->attr; attr; attr = attr->next) {
+				if(strcasecmp(attr->name,"name") == 0) {
+					name = apr_pstrdup(pool,attr->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+				}
+			}
+			connection_agent = unimrcp_server_connection_agent_load(server,elem,pool);
+			if(connection_agent) {
+				mrcp_server_connection_agent_register(server,connection_agent,name);
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+/** Load RTP termination factory */
+static mpf_termination_factory_t* unimrcp_server_rtp_factory_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	char *rtp_ip = DEFAULT_IP_ADDRESS;
+	char *rtp_ext_ip = NULL;
+	mpf_rtp_config_t *rtp_config = mpf_rtp_config_create(pool);
+	rtp_config->rtp_port_min = DEFAULT_RTP_PORT_MIN;
+	rtp_config->rtp_port_max = DEFAULT_RTP_PORT_MAX;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading RTP Termination Factory");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Param %s:%s",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"rtp-ip") == 0) {
+					rtp_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"rtp-ext-ip") == 0) {
+					rtp_ext_ip = ip_addr_get(attr_value->value,pool);
+				}
+				else if(strcasecmp(attr_name->value,"rtp-port-min") == 0) {
+					rtp_config->rtp_port_min = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"rtp-port-max") == 0) {
+					rtp_config->rtp_port_max = (apr_port_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"playout-delay") == 0) {
+					rtp_config->jb_config.initial_playout_delay = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"min-playout-delay") == 0) {
+					rtp_config->jb_config.min_playout_delay = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"max-playout-delay") == 0) {
+					rtp_config->jb_config.max_playout_delay = atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"codecs") == 0) {
+					const mpf_codec_manager_t *codec_manager = mrcp_server_codec_manager_get(server);
+					if(codec_manager) {
+						mpf_codec_manager_codec_list_load(codec_manager,&rtp_config->codec_list,attr_value->value,pool);
+					}
+				}
+				else if(strcasecmp(attr_name->value,"ptime") == 0) {
+					rtp_config->ptime = (apr_uint16_t)atol(attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"own-preference") == 0) {
+					rtp_config->own_preferrence = atoi(attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+	}
+	apt_string_set(&rtp_config->ip,rtp_ip);
+	if(rtp_ext_ip) {
+		apt_string_set(&rtp_config->ext_ip,rtp_ext_ip);
+	}
+	return mpf_rtp_termination_factory_create(rtp_config,pool);
+}
+
+/** Load media engines */
+static apt_bool_t unimrcp_server_media_engines_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Media Engines");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"engine") == 0) {
+			mpf_engine_t *media_engine;
+			const char *name = NULL;
+			const apr_xml_attr *attr;
+			for(attr = elem->attr; attr; attr = attr->next) {
+				if(strcasecmp(attr->name,"name") == 0) {
+					name = apr_pstrdup(pool,attr->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+				}
+			}
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Media Engine");
+			media_engine = mpf_engine_create(pool);
+			if(media_engine) {
+				mrcp_server_media_engine_register(server,media_engine,name);
+			}
+		}
+		else if(strcasecmp(elem->name,"rtp") == 0) {
+			mpf_termination_factory_t *rtp_factory;
+			const char *name = NULL;
+			const apr_xml_attr *attr;
+			for(attr = elem->attr; attr; attr = attr->next) {
+				if(strcasecmp(attr->name,"name") == 0) {
+					name = apr_pstrdup(pool,attr->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+				}
+			}
+			rtp_factory = unimrcp_server_rtp_factory_load(server,elem,pool);
+			if(rtp_factory) {
+				mrcp_server_rtp_factory_register(server,rtp_factory,name);
+			}
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+/** Load plugin */
+static apt_bool_t unimrcp_server_plugin_load(mrcp_server_t *server, const char *plugin_dir_path, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const char *plugin_name = NULL;
+	const char *plugin_class = NULL;
+	const char *plugin_ext = NULL;
+	const char *plugin_path = NULL;
+	apt_bool_t plugin_enabled = TRUE;
+	const apr_xml_attr *attr;
+	for(attr = root->attr; attr; attr = attr->next) {
+		if(strcasecmp(attr->name,"name") == 0) {
+			plugin_name = apr_pstrdup(pool,attr->value);
+		}
+		else if(strcasecmp(attr->name,"class") == 0) {
+			plugin_class = attr->value;
+		}
+		else if(strcasecmp(attr->name,"ext") == 0) {
+			plugin_ext = attr->value;
+		}
+		else if(strcasecmp(attr->name,"enable") == 0) {
+			plugin_enabled = atoi(attr->value);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+		}
+	}
+
+	if(!plugin_class || !plugin_enabled) {
+		return FALSE;
+	}
+	if(!plugin_dir_path) {
+		plugin_dir_path = DEFAULT_PLUGIN_DIR_PATH;
+	}
+	if(!plugin_ext) {
+		plugin_ext = DEFAULT_PLUGIN_EXT;
+	}
+
+	if(*plugin_dir_path == '\0') {
+		plugin_path = apr_psprintf(pool,"%s.%s",plugin_class,plugin_ext);
+	}
+	else {
+		plugin_path = apr_psprintf(pool,"%s/%s.%s",plugin_dir_path,plugin_class,plugin_ext);
+	}
+
+	return mrcp_server_plugin_register(server,plugin_path,plugin_name);
+}
+
+/** Load plugins */
+static apt_bool_t unimrcp_server_plugins_load(mrcp_server_t *server, const char *plugin_dir_path, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Plugins (Resource Engines)");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"engine") == 0) {
+			unimrcp_server_plugin_load(server,plugin_dir_path,elem,pool);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+
+/** Load settings */
+static apt_bool_t unimrcp_server_settings_load(mrcp_server_t *server, const char *plugin_dir_path, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Settings");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"signaling") == 0) {
+			unimrcp_server_signaling_agents_load(server,elem,pool);
+		}
+		else if(strcasecmp(elem->name,"connection") == 0) {
+			unimrcp_server_connection_agents_load(server,elem,pool);
+		}
+		else if(strcasecmp(elem->name,"media") == 0) {
+			unimrcp_server_media_engines_load(server,elem,pool);
+		}
+		else if(strcasecmp(elem->name,"plugin") == 0) {
+			unimrcp_server_plugins_load(server,plugin_dir_path,elem,pool);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}    
+	return TRUE;
+}
+
+/** Load profile */
+static apt_bool_t unimrcp_server_profile_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const char *name = NULL;
+	mrcp_profile_t *profile;
+	mrcp_sig_agent_t *sig_agent = NULL;
+	mrcp_connection_agent_t *cnt_agent = NULL;
+	mpf_engine_t *media_engine = NULL;
+	mpf_termination_factory_t *rtp_factory = NULL;
+	apr_table_t *plugin_map = NULL;
+	const apr_xml_elem *elem;
+	const apr_xml_attr *attr;
+	for(attr = root->attr; attr; attr = attr->next) {
+		if(strcasecmp(attr->name,"name") == 0) {
+			name = apr_pstrdup(pool,attr->value);
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Profile [%s]",name);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+		}
+	}
+	if(!name) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Load Profile: no profile name specified");
+		return FALSE;
+	}
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"param") == 0) {
+			const apr_xml_attr *attr_name;
+			const apr_xml_attr *attr_value;
+			if(param_name_value_get(elem,&attr_name,&attr_value) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Loading Profile %s [%s]",attr_name->value,attr_value->value);
+				if(strcasecmp(attr_name->value,"signaling-agent") == 0) {
+					sig_agent = mrcp_server_signaling_agent_get(server,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"connection-agent") == 0) {
+					cnt_agent = mrcp_server_connection_agent_get(server,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"media-engine") == 0) {
+					media_engine = mrcp_server_media_engine_get(server,attr_value->value);
+				}
+				else if(strcasecmp(attr_name->value,"rtp-factory") == 0) {
+					rtp_factory = mrcp_server_rtp_factory_get(server,attr_value->value);
+				}
+				else {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr_name->value);
+				}
+			}
+		}
+		else if(strcasecmp(elem->name,"pluginmap") == 0) {
+			plugin_map = apr_table_make(pool,2);
+			plugin_map_load(plugin_map,elem,pool);
+		}
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create Profile [%s]",name);
+	profile = mrcp_server_profile_create(NULL,sig_agent,cnt_agent,media_engine,rtp_factory,pool);
+	return mrcp_server_profile_register(server,profile,plugin_map,name);
+}
+
+/** Load profiles */
+static apt_bool_t unimrcp_server_profiles_load(mrcp_server_t *server, const apr_xml_elem *root, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Loading Profiles");
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"profile") == 0) {
+			unimrcp_server_profile_load(server,elem,pool);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}
+    return TRUE;
+}
+
+/** Load configuration (settings and profiles) */
+static apt_bool_t unimrcp_server_config_load(mrcp_server_t *server, const char *plugin_dir_path, const apr_xml_doc *doc, apr_pool_t *pool)
+{
+	const apr_xml_elem *elem;
+	const apr_xml_elem *root = doc->root;
+	if(!root || strcasecmp(root->name,"unimrcpserver") != 0) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Document");
+		return FALSE;
+	}
+	for(elem = root->first_child; elem; elem = elem->next) {
+		if(strcasecmp(elem->name,"settings") == 0) {
+			unimrcp_server_settings_load(server,plugin_dir_path,elem,pool);
+		}
+		else if(strcasecmp(elem->name,"profiles") == 0) {
+			unimrcp_server_profiles_load(server,elem,pool);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+		}
+	}
+    
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,24 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+INCLUDES               = -Iinclude \
+                         -I$(top_srcdir)/platforms/libunimrcp-client/include \
+                         -I$(top_srcdir)/libs/mrcp-client/include \
+                         -I$(top_srcdir)/libs/mrcp-signaling/include \
+                         -I$(top_srcdir)/libs/mrcpv2-transport/include \
+                         -I$(top_srcdir)/libs/mrcp/include \
+                         -I$(top_srcdir)/libs/mrcp/message/include \
+                         -I$(top_srcdir)/libs/mrcp/control/include \
+                         -I$(top_srcdir)/libs/mrcp/resources/include \
+                         -I$(top_srcdir)/libs/mpf/include \
+                         -I$(top_srcdir)/libs/apr-toolkit/include \
+                         $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+bin_PROGRAMS           = unimrcpclient
+unimrcpclient_SOURCES  = src/main.c \
+                         src/demo_framework.c \
+                         src/demo_synth_application.c \
+                         src/demo_recog_application.c \
+                         src/demo_bypass_application.c \
+                         src/demo_discover_application.c \
+                         src/demo_util.c
+unimrcpclient_LDADD    = $(top_builddir)/platforms/libunimrcp-client/libunimrcpclient.la

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_application.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_application.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __DEMO_APPLICATION_H__
+#define __DEMO_APPLICATION_H__
+
+/**
+ * @file demo_application.h
+ * @brief Demo MRCP Application
+ */ 
+
+#include "mrcp_application.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Demo application declaration */
+typedef struct demo_application_t demo_application_t;
+
+/** Demo application */
+struct demo_application_t {
+	/** MRCP application */
+	mrcp_application_t              *application;
+	/** Demo framework */
+	void                            *framework;
+
+	/** Virtual run method */
+	apt_bool_t (*run)(demo_application_t *application, const char *profile);
+	/** Virtual app_message handler */
+	apt_bool_t (*handler)(demo_application_t *application, const mrcp_app_message_t *app_message);
+};
+
+
+/** Create demo synthesizer application */
+demo_application_t* demo_synth_application_create(apr_pool_t *pool);
+
+/** Create demo recognizer application */
+demo_application_t* demo_recog_application_create(apr_pool_t *pool);
+
+/** Create demo bypass media application */
+demo_application_t* demo_bypass_application_create(apr_pool_t *pool);
+
+/** Create demo resource discover application */
+demo_application_t* demo_discover_application_create(apr_pool_t *pool);
+
+
+APT_END_EXTERN_C
+
+#endif /*__DEMO_APPLICATION_H__*/

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_framework.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_framework.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __DEMO_FRAMEWORK_H__
+#define __DEMO_FRAMEWORK_H__
+
+/**
+ * @file demo_framework.h
+ * @brief Demo MRCP Application Framework
+ */ 
+
+#include "mrcp_types.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Opaque demo framework declaration */
+typedef struct demo_framework_t demo_framework_t;
+
+/**
+ * Create demo framework.
+ */
+demo_framework_t* demo_framework_create(apt_dir_layout_t *dir_layout);
+
+/**
+ * Run demo application.
+ * @param framework the framework to run application for
+ * @param app_name the name of the application to run
+ * @param profile_name the name of the profile to use
+ */
+apt_bool_t demo_framework_app_run(demo_framework_t *framework, const char *app_name, const char *profile_name);
+
+/**
+ * Destroy demo framework.
+ * @param framework the framework to destroy
+ */
+apt_bool_t demo_framework_destroy(demo_framework_t *framework);
+
+APT_END_EXTERN_C
+
+#endif /*__DEMO_FRAMEWORK_H__*/

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_util.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/include/demo_util.h	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __DEMO_UTIL_H__
+#define __DEMO_UTIL_H__
+
+/**
+ * @file demo_util.h
+ * @brief Demo MRCP Utilities
+ */ 
+
+#include "mrcp_application.h"
+
+APT_BEGIN_EXTERN_C
+
+/** Create demo MRCP message (SPEAK request) */
+mrcp_message_t* demo_speak_message_create(mrcp_session_t *session, mrcp_channel_t *channel, const apt_dir_layout_t *dir_layout);
+
+/** Create demo MRCP message (DEFINE-GRAMMAR request) */
+mrcp_message_t* demo_define_grammar_message_create(mrcp_session_t *session, mrcp_channel_t *channel, const apt_dir_layout_t *dir_layout);
+/** Create demo MRCP message (RECOGNIZE request) */
+mrcp_message_t* demo_recognize_message_create(mrcp_session_t *session, mrcp_channel_t *channel, const apt_dir_layout_t *dir_layout);
+
+
+/** Create demo RTP termination descriptor */
+mpf_rtp_termination_descriptor_t* demo_rtp_descriptor_create(apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__DEMO_UTIL_H__*/

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_bypass_application.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_bypass_application.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Demo synthesizer scenario (client stack stays out of media path).
+ * C -> S: SIP INVITE or RTPS SETUP   (add synthesizer channel)
+ * S -> C: SIP OK or RTPS OK
+ * C -> S: MRCP SPEAK
+ * S -> C: MRCP IN-PROGRESS
+ * S -> X: RTP Start Transmission     (RTP stream is sent directly to external endpoint bypassing client stack)
+ * S -> C: MRCP SPEAK-COMPLETE
+ * S -> X: RTP Stop Transmission
+ * C -> S: SIP INVITE or RTPS SETUP   (optionally remove synthesizer channel)
+ * S -> C: SIP OK or RTPS OK
+ * C -> S: SIP BYE or RTPS TEARDOWN
+ * S -> C: SIP OK or RTPS OK
+ */
+
+#include "demo_application.h"
+#include "demo_util.h"
+#include "mrcp_session.h"
+#include "mrcp_message.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_synth_header.h"
+#include "mrcp_synth_resource.h"
+#include "apt_log.h"
+
+typedef struct demo_app_channel_t demo_app_channel_t;
+
+/** Declaration of synthesizer application channel */
+struct demo_app_channel_t {
+	/** MRCP control channel */
+	mrcp_channel_t     *channel;
+};
+
+/** Declaration of demo application methods */
+static apt_bool_t demo_application_run(demo_application_t *demo_application, const char *profile);
+static apt_bool_t demo_application_handler(demo_application_t *application, const mrcp_app_message_t *app_message);
+
+static apt_bool_t demo_application_on_session_update(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t demo_application_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t demo_application_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+static apt_bool_t demo_application_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+static apt_bool_t demo_application_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message);
+
+static const mrcp_app_message_dispatcher_t demo_application_dispatcher = {
+	demo_application_on_session_update,
+	demo_application_on_session_terminate,
+	demo_application_on_channel_add,
+	demo_application_on_channel_remove,
+	demo_application_on_message_receive
+};
+
+
+/** Create demo bypass media application */
+demo_application_t* demo_bypass_application_create(apr_pool_t *pool)
+{
+	demo_application_t *demo_application = apr_palloc(pool,sizeof(demo_application_t));
+	demo_application->application = NULL;
+	demo_application->framework = NULL;
+	demo_application->handler = demo_application_handler;
+	demo_application->run = demo_application_run;
+	return demo_application;
+}
+
+/** Create demo channel */
+static mrcp_channel_t* demo_application_channel_create(mrcp_session_t *session)
+{
+	mrcp_channel_t *channel;
+	/* create channel */
+	demo_app_channel_t *demo_channel = apr_palloc(session->pool,sizeof(demo_app_channel_t));
+	mpf_rtp_termination_descriptor_t *rtp_descriptor = demo_rtp_descriptor_create(session->pool);
+	channel = mrcp_application_channel_create(
+			session,                     /* session, channel belongs to */
+			MRCP_SYNTHESIZER_RESOURCE,   /* MRCP resource identifier */
+			NULL,                        /* no termination (not to use internal media processing)  */
+			rtp_descriptor,              /* RTP descriptor, used to create RTP termination */
+			demo_channel);               /* object to associate */
+	return channel;
+}
+
+
+/** Run demo scenario */
+static apt_bool_t demo_application_run(demo_application_t *demo_application, const char *profile)
+{
+	mrcp_channel_t *channel;
+	/* create session */
+	mrcp_session_t *session = mrcp_application_session_create(demo_application->application,profile,NULL);
+	if(!session) {
+		return FALSE;
+	}
+	
+	/* create channel and associate all the required data */
+	channel = demo_application_channel_create(session);
+	if(!channel) {
+		mrcp_application_session_destroy(session);
+		return FALSE;
+	}
+
+	/* add channel to session (send asynchronous request) */
+	if(mrcp_application_channel_add(session,channel) != TRUE) {
+		/* session and channel are still not referenced 
+		and both are allocated from session pool and will
+		be freed with session destroy call */
+		mrcp_application_session_destroy(session);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/** Handle the messages sent from the MRCP client stack */
+static apt_bool_t demo_application_handler(demo_application_t *application, const mrcp_app_message_t *app_message)
+{
+	/* app_message should be dispatched now,
+	*  the default dispatcher is used in demo. */
+	return mrcp_application_message_dispatch(&demo_application_dispatcher,app_message);
+}
+
+/** Handle the responses sent to session update requests */
+static apt_bool_t demo_application_on_session_update(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status)
+{
+	return TRUE;
+}
+
+/** Handle the responses sent to session terminate requests */
+static apt_bool_t demo_application_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status)
+{
+	/* received response to session termination request,
+	now it's safe to destroy no more referenced session */
+	mrcp_application_session_destroy(session);
+	return TRUE;
+}
+
+/** Handle the responses sent to channel add requests */
+static apt_bool_t demo_application_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
+{
+	if(status == MRCP_SIG_STATUS_CODE_SUCCESS) {
+		mpf_rtp_termination_descriptor_t *rtp_descriptor;
+		mrcp_message_t *mrcp_message;
+		const apt_dir_layout_t *dir_layout = mrcp_application_dir_layout_get(application);
+		/* create and send SPEAK request */
+		mrcp_message = demo_speak_message_create(session,channel,dir_layout);
+		if(mrcp_message) {
+			mrcp_application_message_send(session,channel,mrcp_message);
+		}
+		rtp_descriptor = mrcp_application_rtp_descriptor_get(channel);
+		if(rtp_descriptor) {
+			mpf_rtp_media_descriptor_t *local_media = rtp_descriptor->audio.local;
+			mpf_rtp_media_descriptor_t *remote_media = rtp_descriptor->audio.remote;
+			if(local_media && remote_media) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Media Attributes: L[%s/%d] R[%s/%d]",
+					local_media->base.ip.buf,
+					local_media->base.port,
+					remote_media->base.ip.buf,
+					remote_media->base.port);
+			}
+		}
+	}
+	else {
+		/* error case, just terminate the demo */
+		mrcp_application_session_terminate(session);
+	}
+	return TRUE;
+}
+
+/** Handle the responses sent to channel remove requests */
+static apt_bool_t demo_application_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
+{
+	/* terminate the demo */
+	mrcp_application_session_terminate(session);
+	return TRUE;
+}
+
+/** Handle the MRCP responses/events */
+static apt_bool_t demo_application_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	if(message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		/* received MRCP response */
+		if(message->start_line.method_id == SYNTHESIZER_SPEAK) {
+			/* received the response to SPEAK request, 
+			waiting for SPEAK-COMPLETE event */
+		}
+		else {
+			/* received unexpected response */
+		}
+	}
+	else if(message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		/* received MRCP event */
+		if(message->start_line.method_id == SYNTHESIZER_SPEAK_COMPLETE) {
+			/* received SPEAK-COMPLETE event, remove channel */
+			mrcp_application_channel_remove(session,channel);
+		}
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_discover_application.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_discover_application.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Demo resource discovery.
+ * C -> S: SIP OPTIONS or RTPS DESCRIBE
+ * S -> C: SIP OK or RTPS OK
+ */
+
+#include "demo_application.h"
+#include "mrcp_session_descriptor.h"
+#include "mrcp_control_descriptor.h"
+#include "apt_log.h"
+
+
+/** Declaration of synthesizer application methods */
+static apt_bool_t discover_application_run(demo_application_t *demo_application, const char *profile);
+static apt_bool_t discover_application_handler(demo_application_t *application, const mrcp_app_message_t *app_message);
+
+/** Declaration of application message handlers */
+static apt_bool_t discover_application_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t discover_application_on_resource_discover(mrcp_application_t *application, mrcp_session_t *session, mrcp_session_descriptor_t *descriptor, mrcp_sig_status_code_e status);
+
+static const mrcp_app_message_dispatcher_t discover_application_dispatcher = {
+	NULL,
+	discover_application_on_session_terminate,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	discover_application_on_resource_discover
+};
+
+/** Create demo resource discover application */
+demo_application_t* demo_discover_application_create(apr_pool_t *pool)
+{
+	demo_application_t *discover_application = apr_palloc(pool,sizeof(demo_application_t));
+	discover_application->application = NULL;
+	discover_application->framework = NULL;
+	discover_application->handler = discover_application_handler;
+	discover_application->run = discover_application_run;
+	return discover_application;
+}
+
+/** Run demo resource discover scenario */
+static apt_bool_t discover_application_run(demo_application_t *demo_application, const char *profile)
+{
+	/* create session */
+	mrcp_session_t *session = mrcp_application_session_create(demo_application->application,profile,NULL);
+	if(!session) {
+		return FALSE;
+	}
+	
+	/* send resource discover request */
+	if(mrcp_application_resource_discover(session) != TRUE) {
+		mrcp_application_session_destroy(session);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/** Handle the messages sent from the MRCP client stack */
+static apt_bool_t discover_application_handler(demo_application_t *application, const mrcp_app_message_t *app_message)
+{
+	/* app_message should be dispatched now,
+	*  the default dispatcher is used in demo. */
+	return mrcp_application_message_dispatch(&discover_application_dispatcher,app_message);
+}
+
+/** Handle the responses sent to session terminate requests */
+static apt_bool_t discover_application_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status)
+{
+	/* received response to session termination request,
+	now it's safe to destroy no more referenced session */
+	mrcp_application_session_destroy(session);
+	return TRUE;
+}
+
+/** Handle the responses sent to resource discover requests */
+static apt_bool_t discover_application_on_resource_discover(mrcp_application_t *application, mrcp_session_t *session, mrcp_session_descriptor_t *descriptor, mrcp_sig_status_code_e status)
+{
+	if(descriptor && status == MRCP_SIG_STATUS_CODE_SUCCESS) {
+		int i;
+		int count = descriptor->control_media_arr->nelts;
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"On Resource Discover [%d]", count);
+
+		for(i = 0; i < count; i++) {
+			mrcp_control_descriptor_t *control_media = mrcp_session_control_media_get(descriptor,i);
+			if(control_media) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"[%d] - %s", i,control_media->resource_name.buf);
+			}
+		}
+	}
+	else {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Failed to Discover Resources");
+	}
+	
+	mrcp_application_session_terminate(session);
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_framework.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_framework.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "demo_framework.h"
+#include "demo_application.h"
+#include "unimrcp_client.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+#define FRAMEWORK_TASK_NAME "Framework Task"
+
+#define MAX_APP_NAME_LENGTH     16
+#define MAX_PROFILE_NAME_LENGTH 16
+
+/** Demo framework */
+struct demo_framework_t {
+	/** MRCP client stack instance */
+	mrcp_client_t       *client;
+	/** Message processing task */
+	apt_consumer_task_t *task;
+	/** Table of demo applications */
+	apr_hash_t          *application_table;
+	/** Memory to allocate memory from */
+	apr_pool_t          *pool;
+};
+
+typedef struct framework_task_data_t framework_task_data_t;
+struct framework_task_data_t {
+	char                      app_name[MAX_APP_NAME_LENGTH];
+	char                      profile_name[MAX_PROFILE_NAME_LENGTH];
+	demo_application_t       *demo_application;
+	const mrcp_app_message_t *app_message;
+};
+
+typedef enum {
+	DEMO_APPLICATION_MSG_ID,
+	DEMO_CONSOLE_MSG_ID
+} framework_msg_type_e;
+
+static apt_bool_t demo_framework_message_handler(const mrcp_app_message_t *app_message);
+static apt_bool_t demo_framework_consumer_task_create(demo_framework_t *framework);
+static apt_bool_t demo_framework_app_register(demo_framework_t *framework, demo_application_t *demo_application, const char *name);
+
+/** Create demo framework */
+demo_framework_t* demo_framework_create(apt_dir_layout_t *dir_layout)
+{
+	demo_framework_t *framework = NULL;
+	mrcp_client_t *client = unimrcp_client_create(dir_layout);
+	if(client) {
+		demo_application_t *demo_application;
+		apr_pool_t *pool = mrcp_client_memory_pool_get(client);
+		/* create demo framework */
+		framework = apr_palloc(pool,sizeof(demo_framework_t));
+		framework->pool = pool;
+		framework->client = client;
+		framework->application_table = apr_hash_make(pool);
+
+		/* create demo synthesizer application */
+		demo_application = demo_synth_application_create(framework->pool);
+		if(demo_application) {
+			demo_framework_app_register(framework,demo_application,"synth");
+		}
+
+		/* create demo recognizer application */
+		demo_application = demo_recog_application_create(framework->pool);
+		if(demo_application) {
+			demo_framework_app_register(framework,demo_application,"recog");
+		}
+
+		/* create demo bypass media application */
+		demo_application = demo_bypass_application_create(framework->pool);
+		if(demo_application) {
+			demo_framework_app_register(framework,demo_application,"bypass");
+		}
+
+		/* create demo resource discover application */
+		demo_application = demo_discover_application_create(framework->pool);
+		if(demo_application) {
+			demo_framework_app_register(framework,demo_application,"discover");
+		}
+
+		demo_framework_consumer_task_create(framework);
+
+		if(framework->task) {
+			apt_task_t *task = apt_consumer_task_base_get(framework->task);
+			apt_task_start(task);
+		}
+		
+		/* start client stack */
+		mrcp_client_start(client);
+	}
+
+	return framework;
+}
+
+/** Run demo application */
+apt_bool_t demo_framework_app_run(demo_framework_t *framework, const char *app_name, const char *profile_name)
+{
+	apt_task_t *task = apt_consumer_task_base_get(framework->task);
+	apt_task_msg_t *task_msg = apt_task_msg_get(task);
+	if(task_msg) {
+		framework_task_data_t *framework_task_data = (framework_task_data_t*)task_msg->data;
+		task_msg->type = TASK_MSG_USER;
+		task_msg->sub_type = DEMO_CONSOLE_MSG_ID;
+		framework_task_data = (framework_task_data_t*) task_msg->data;
+		strcpy(framework_task_data->app_name,app_name);
+		strcpy(framework_task_data->profile_name,profile_name);
+		framework_task_data->app_message = NULL;
+		framework_task_data->demo_application = NULL;
+		apt_task_msg_signal(task,task_msg);
+	}
+	return TRUE;
+}
+
+/** Destroy demo framework */
+apt_bool_t demo_framework_destroy(demo_framework_t *framework)
+{
+	if(!framework) {
+		return FALSE;
+	}
+
+	if(framework->task) {
+		apt_task_t *task = apt_consumer_task_base_get(framework->task);
+		apt_task_terminate(task,TRUE);
+		apt_task_destroy(task);
+		framework->task = NULL;
+	}
+
+	mrcp_client_shutdown(framework->client);
+	return mrcp_client_destroy(framework->client);
+}
+
+static apt_bool_t demo_framework_app_register(demo_framework_t *framework, demo_application_t *demo_application, const char *name)
+{
+	apr_hash_set(framework->application_table,name,APR_HASH_KEY_STRING,demo_application);
+	demo_application->framework = framework;
+	demo_application->application = mrcp_application_create(
+										demo_framework_message_handler,
+										demo_application,
+										framework->pool);
+	return mrcp_client_application_register(framework->client,demo_application->application,name);
+}
+
+static void demo_framework_on_start_complete(apt_task_t *task)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Run Demo Framework");
+}
+
+static apt_bool_t demo_framework_console_msg_process(demo_framework_t *framework, const char *app_name, const char *profile_name)
+{
+	demo_application_t *demo_application = apr_hash_get(framework->application_table,app_name,APR_HASH_KEY_STRING);
+	if(!demo_application) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Such Demo Application [%s]",app_name);
+		return FALSE;
+	}
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Run Demo Application Scenario [%s]",app_name);
+	return demo_application->run(demo_application,profile_name);
+}
+
+static apt_bool_t demo_framework_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	if(msg->type == TASK_MSG_USER) {
+		framework_task_data_t *data = (framework_task_data_t*)msg->data;
+		switch(msg->sub_type) {
+			case DEMO_APPLICATION_MSG_ID:
+			{
+				data->demo_application->handler(data->demo_application,data->app_message);
+				break;
+			}
+			case DEMO_CONSOLE_MSG_ID:
+			{
+				apt_consumer_task_t *consumer_task = apt_task_object_get(task);
+				demo_framework_t *framework = apt_consumer_task_object_get(consumer_task);
+				demo_framework_console_msg_process(framework,data->app_name,data->profile_name);
+				break;
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t demo_framework_consumer_task_create(demo_framework_t *framework)
+{
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+
+	msg_pool = apt_task_msg_pool_create_dynamic(sizeof(framework_task_data_t),framework->pool);
+	framework->task = apt_consumer_task_create(framework,msg_pool,framework->pool);
+	if(!framework->task) {
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(framework->task);
+	apt_task_name_set(task,FRAMEWORK_TASK_NAME);
+	vtable = apt_consumer_task_vtable_get(framework->task);
+	if(vtable) {
+		vtable->process_msg = demo_framework_msg_process;
+		vtable->on_start_complete = demo_framework_on_start_complete;
+	}
+
+	return TRUE;
+}
+
+/** Callback is called from MRCP client stack (task) context.
+ *  Signal app_message to the main consumer task of the demo framework
+ *  for further processing (see demo_framework_msg_process).
+ */
+static apt_bool_t demo_framework_message_handler(const mrcp_app_message_t *app_message)
+{
+	demo_application_t *demo_application;
+	if(!app_message->application) {
+		return FALSE;
+	}
+	demo_application = mrcp_application_object_get(app_message->application);
+	if(demo_application && demo_application->framework) {
+		demo_framework_t *framework = demo_application->framework;
+		apt_task_t *task = apt_consumer_task_base_get(framework->task);
+		apt_task_msg_t *task_msg = apt_task_msg_get(task);
+		if(task_msg) {
+			framework_task_data_t *framework_task_data = (framework_task_data_t*)task_msg->data;
+			task_msg->type = TASK_MSG_USER;
+			task_msg->sub_type = DEMO_APPLICATION_MSG_ID;
+			framework_task_data = (framework_task_data_t*) task_msg->data;
+			framework_task_data->app_message = app_message;
+			framework_task_data->demo_application = demo_application;
+			apt_task_msg_signal(task,task_msg);
+		}
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_recog_application.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_recog_application.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,352 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Demo recognizer scenario.
+ * C -> S: SIP INVITE or RTPS SETUP   (add recognizer channel)
+ * S -> C: SIP OK or RTPS OK
+ * C -> S: MRCP RECOGNIZE
+ * S -> C: MRCP IN-PROGRESS
+ * C -> S: RTP Start Transmission
+ * S -> C: MRCP START-OF-INPUT
+ * S -> C: MRCP RECOGNITION-COMPLETE
+ * C -> S: RTP Stop Transmission
+ * C -> S: SIP INVITE or RTPS SETUP   (optionally remove recognizer channel)
+ * S -> C: SIP OK or RTPS OK
+ * C -> S: SIP BYE or RTPS TEARDOWN
+ * S -> C: SIP OK or RTPS OK
+ */
+
+#include "demo_application.h"
+#include "demo_util.h"
+#include "mrcp_session.h"
+#include "mrcp_message.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_recog_header.h"
+#include "mrcp_recog_resource.h"
+#include "apt_log.h"
+
+#define DEMO_SPEECH_SOURCE_FILE "one.pcm"
+
+typedef struct recog_app_channel_t recog_app_channel_t;
+
+/** Declaration of recognizer application channel */
+struct recog_app_channel_t {
+	/** MRCP control channel */
+	mrcp_channel_t *channel;
+
+	/** Streaming is in-progress */
+	apt_bool_t      streaming;
+	/** File to read audio stream from */
+	FILE           *audio_in;
+	/** Estimated time to complete (used if no audio_in available) */
+	apr_size_t      time_to_complete;
+};
+
+/** Declaration of recognizer application methods */
+static apt_bool_t recog_application_run(demo_application_t *demo_application, const char *profile);
+static apt_bool_t recog_application_handler(demo_application_t *application, const mrcp_app_message_t *app_message);
+
+/** Declaration of application message handlers */
+static apt_bool_t recog_application_on_session_update(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t recog_application_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t recog_application_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+static apt_bool_t recog_application_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+static apt_bool_t recog_application_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message);
+
+static const mrcp_app_message_dispatcher_t recog_application_dispatcher = {
+	recog_application_on_session_update,
+	recog_application_on_session_terminate,
+	recog_application_on_channel_add,
+	recog_application_on_channel_remove,
+	recog_application_on_message_receive
+};
+
+/** Declaration of recognizer audio stream methods */
+static apt_bool_t recog_app_stream_destroy(mpf_audio_stream_t *stream);
+static apt_bool_t recog_app_stream_open(mpf_audio_stream_t *stream);
+static apt_bool_t recog_app_stream_close(mpf_audio_stream_t *stream);
+static apt_bool_t recog_app_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame);
+
+static const mpf_audio_stream_vtable_t audio_stream_vtable = {
+	recog_app_stream_destroy,
+	recog_app_stream_open,
+	recog_app_stream_close,
+	recog_app_stream_read,
+	NULL,
+	NULL,
+	NULL
+};
+
+
+/** Create demo recognizer application */
+demo_application_t* demo_recog_application_create(apr_pool_t *pool)
+{
+	demo_application_t *recog_application = apr_palloc(pool,sizeof(demo_application_t));
+	recog_application->application = NULL;
+	recog_application->framework = NULL;
+	recog_application->handler = recog_application_handler;
+	recog_application->run = recog_application_run;
+	return recog_application;
+}
+
+/** Create demo recognizer channel */
+static mrcp_channel_t* recog_application_channel_create(mrcp_session_t *session)
+{
+	mrcp_channel_t *channel;
+	mpf_termination_t *termination;
+	mpf_codec_descriptor_t *codec_descriptor = NULL;
+
+	/* create channel */
+	recog_app_channel_t *recog_channel = apr_palloc(session->pool,sizeof(recog_app_channel_t));
+	recog_channel->streaming = FALSE;
+	recog_channel->audio_in = NULL;
+	recog_channel->time_to_complete = 0;
+
+#if 0 /* in case your audio source isn't in linear PCM, create appropriate codec descriptor below */
+	codec_descriptor = apr_palloc(session->pool,sizeof(mpf_codec_descriptor_t));
+	mpf_codec_descriptor_init(codec_descriptor);
+	codec_descriptor->channel_count = 1;
+	codec_descriptor->payload_type = 0;
+	apt_string_set(&codec_descriptor->name,"PCMU");
+	codec_descriptor->sampling_rate = 8000;
+#endif
+
+	termination = mrcp_application_source_termination_create(
+			session,                   /* session, termination belongs to */
+			&audio_stream_vtable,      /* virtual methods table of audio stream */
+			codec_descriptor,          /* codec descriptor of audio stream (NULL by default) */
+			recog_channel);            /* object to associate */
+	
+	channel = mrcp_application_channel_create(
+			session,                   /* session, channel belongs to */
+			MRCP_RECOGNIZER_RESOURCE,  /* MRCP resource identifier */
+			termination,               /* media termination, used to terminate audio stream */
+			NULL,                      /* RTP descriptor, used to create RTP termination (NULL by default) */
+			recog_channel);            /* object to associate */
+	return channel;
+}
+
+/** Run demo recognizer scenario */
+static apt_bool_t recog_application_run(demo_application_t *demo_application, const char *profile)
+{
+	mrcp_channel_t *channel;
+	/* create session */
+	mrcp_session_t *session = mrcp_application_session_create(demo_application->application,profile,NULL);
+	if(!session) {
+		return FALSE;
+	}
+	
+	/* create channel and associate all the required data */
+	channel = recog_application_channel_create(session);
+	if(!channel) {
+		mrcp_application_session_destroy(session);
+		return FALSE;
+	}
+
+	/* add channel to session (send asynchronous request) */
+	if(mrcp_application_channel_add(session,channel) != TRUE) {
+		/* session and channel are still not referenced 
+		and both are allocated from session pool and will
+		be freed with session destroy call */
+		mrcp_application_session_destroy(session);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/** Handle the messages sent from the MRCP client stack */
+static apt_bool_t recog_application_handler(demo_application_t *application, const mrcp_app_message_t *app_message)
+{
+	/* app_message should be dispatched now,
+	*  the default dispatcher is used in demo. */
+	return mrcp_application_message_dispatch(&recog_application_dispatcher,app_message);
+}
+
+/** Handle the responses sent to session update requests */
+static apt_bool_t recog_application_on_session_update(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status)
+{
+	/* not used in demo */
+	return TRUE;
+}
+
+/** Handle the responses sent to session terminate requests */
+static apt_bool_t recog_application_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status)
+{
+	/* received response to session termination request,
+	now it's safe to destroy no more referenced session */
+	mrcp_application_session_destroy(session);
+	return TRUE;
+}
+
+/** Handle the responses sent to channel add requests */
+static apt_bool_t recog_application_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
+{
+	if(status == MRCP_SIG_STATUS_CODE_SUCCESS) {
+		mrcp_message_t *mrcp_message;
+		const apt_dir_layout_t *dir_layout = mrcp_application_dir_layout_get(application);
+		/* create and send DEFINE-GRAMMAR request */
+		mrcp_message = demo_define_grammar_message_create(session,channel,dir_layout);
+		if(mrcp_message) {
+			mrcp_application_message_send(session,channel,mrcp_message);
+		}
+	}
+	else {
+		/* error case, just terminate the demo */
+		mrcp_application_session_terminate(session);
+	}
+	return TRUE;
+}
+
+static apt_bool_t recog_application_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
+{
+	recog_app_channel_t *recog_channel = mrcp_application_channel_object_get(channel);
+
+	/* terminate the demo */
+	mrcp_application_session_terminate(session);
+
+	if(recog_channel) {
+		FILE *audio_in = recog_channel->audio_in;
+		if(audio_in) {
+			recog_channel->audio_in = NULL;
+			fclose(audio_in);
+		}
+	}
+	return TRUE;
+}
+
+/** Handle the DEFINE-GRAMMAR responses */
+static apt_bool_t recog_application_on_define_grammar(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel)
+{
+	recog_app_channel_t *recog_channel = mrcp_application_channel_object_get(channel);
+	mrcp_message_t *mrcp_message;
+	const apt_dir_layout_t *dir_layout = mrcp_application_dir_layout_get(application);
+	/* create and send RECOGNIZE request */
+	mrcp_message = demo_recognize_message_create(session,channel,dir_layout);
+	if(mrcp_message) {
+		mrcp_application_message_send(session,channel,mrcp_message);
+	}
+	if(recog_channel) {
+		char *file_path = apt_datadir_filepath_get(dir_layout,DEMO_SPEECH_SOURCE_FILE,session->pool);
+		if(file_path) {
+			recog_channel->audio_in = fopen(file_path,"rb");
+			if(recog_channel->audio_in) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set [%s] as Speech Source",file_path);
+			}
+			else {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Cannot Find [%s]",file_path);
+				/* set some estimated time to complete */
+				recog_channel->time_to_complete = 5000; // 5 sec
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t recog_application_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	recog_app_channel_t *recog_channel = mrcp_application_channel_object_get(channel);
+	if(message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		/* received MRCP response */
+		if(message->start_line.method_id == RECOGNIZER_DEFINE_GRAMMAR) {
+			/* received the response to DEFINE-GRAMMAR request */
+			if(message->start_line.request_state == MRCP_REQUEST_STATE_COMPLETE) {
+				recog_application_on_define_grammar(application,session,channel);
+			}
+			else {
+				/* received unexpected response, remove channel */
+				mrcp_application_channel_remove(session,channel);
+			}
+		}
+		else if(message->start_line.method_id == RECOGNIZER_RECOGNIZE) {
+			/* received the response to RECOGNIZE request */
+			if(message->start_line.request_state == MRCP_REQUEST_STATE_INPROGRESS) {
+				/* start to stream the speech to recognize */
+				if(recog_channel) {
+					recog_channel->streaming = TRUE;
+				}
+			}
+			else {
+				/* received unexpected response, remove channel */
+				mrcp_application_channel_remove(session,channel);
+			}
+		}
+		else {
+			/* received unexpected response */
+		}
+	}
+	else if(message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		if(message->start_line.method_id == RECOGNIZER_RECOGNITION_COMPLETE) {
+			if(recog_channel) {
+				recog_channel->streaming = FALSE;
+			}
+			mrcp_application_channel_remove(session,channel);
+		}
+		else if(message->start_line.method_id == RECOGNIZER_START_OF_INPUT) {
+			/* received start-of-input, do whatever you need here */
+		}
+	}
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to destroy any additional data associated with audio stream */
+static apt_bool_t recog_app_stream_destroy(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform application stream specific action before open */
+static apt_bool_t recog_app_stream_open(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform application stream specific action after close */
+static apt_bool_t recog_app_stream_close(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to read new frame */
+static apt_bool_t recog_app_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame)
+{
+	recog_app_channel_t *recog_channel = stream->obj;
+	if(recog_channel && recog_channel->streaming == TRUE) {
+		if(recog_channel->audio_in) {
+			if(fread(frame->codec_frame.buffer,1,frame->codec_frame.size,recog_channel->audio_in) == frame->codec_frame.size) {
+				/* normal read */
+				frame->type |= MEDIA_FRAME_TYPE_AUDIO;
+			}
+			else {
+				/* file is over */
+				recog_channel->streaming = FALSE;
+			}
+		}
+		else {
+			/* fill with silence in case no file available */
+			if(recog_channel->time_to_complete >= CODEC_FRAME_TIME_BASE) {
+				frame->type |= MEDIA_FRAME_TYPE_AUDIO;
+				memset(frame->codec_frame.buffer,0,frame->codec_frame.size);
+				recog_channel->time_to_complete -= CODEC_FRAME_TIME_BASE;
+			}
+			else {
+				recog_channel->streaming = FALSE;
+			}
+		}
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_synth_application.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_synth_application.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,288 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Demo synthesizer scenario.
+ * C -> S: SIP INVITE or RTPS SETUP   (add synthesizer channel)
+ * S -> C: SIP OK or RTPS OK
+ * C -> S: MRCP SPEAK
+ * S -> C: MRCP IN-PROGRESS
+ * S -> C: RTP Start Transmission
+ * S -> C: MRCP SPEAK-COMPLETE
+ * S -> C: RTP Stop Transmission
+ * C -> S: SIP INVITE or RTPS SETUP   (optionally remove synthesizer channel)
+ * S -> C: SIP OK or RTPS OK
+ * C -> S: SIP BYE or RTPS TEARDOWN
+ * S -> C: SIP OK or RTPS OK
+ */
+
+#include "demo_application.h"
+#include "demo_util.h"
+#include "mrcp_session.h"
+#include "mrcp_message.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_synth_header.h"
+#include "mrcp_synth_resource.h"
+
+typedef struct synth_app_channel_t synth_app_channel_t;
+
+/** Declaration of synthesizer application channel */
+struct synth_app_channel_t {
+	/** MRCP control channel */
+	mrcp_channel_t *channel;
+	/** File to write audio stream to */
+	FILE           *audio_out;
+};
+
+/** Declaration of synthesizer application methods */
+static apt_bool_t synth_application_run(demo_application_t *demo_application, const char *profile);
+static apt_bool_t synth_application_handler(demo_application_t *application, const mrcp_app_message_t *app_message);
+
+/** Declaration of application message handlers */
+static apt_bool_t synth_application_on_session_update(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t synth_application_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status);
+static apt_bool_t synth_application_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+static apt_bool_t synth_application_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
+static apt_bool_t synth_application_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message);
+
+static const mrcp_app_message_dispatcher_t synth_application_dispatcher = {
+	synth_application_on_session_update,
+	synth_application_on_session_terminate,
+	synth_application_on_channel_add,
+	synth_application_on_channel_remove,
+	synth_application_on_message_receive
+};
+
+/** Declaration of synthesizer audio stream methods */
+static apt_bool_t synth_app_stream_destroy(mpf_audio_stream_t *stream);
+static apt_bool_t synth_app_stream_open(mpf_audio_stream_t *stream);
+static apt_bool_t synth_app_stream_close(mpf_audio_stream_t *stream);
+static apt_bool_t synth_app_stream_write(mpf_audio_stream_t *stream, const mpf_frame_t *frame);
+
+static const mpf_audio_stream_vtable_t audio_stream_vtable = {
+	synth_app_stream_destroy,
+	NULL,
+	NULL,
+	NULL,
+	synth_app_stream_open,
+	synth_app_stream_close,
+	synth_app_stream_write
+};
+
+
+/** Create demo synthesizer application */
+demo_application_t* demo_synth_application_create(apr_pool_t *pool)
+{
+	demo_application_t *synth_application = apr_palloc(pool,sizeof(demo_application_t));
+	synth_application->application = NULL;
+	synth_application->framework = NULL;
+	synth_application->handler = synth_application_handler;
+	synth_application->run = synth_application_run;
+	return synth_application;
+}
+
+/** Create demo synthesizer channel */
+static mrcp_channel_t* synth_application_channel_create(mrcp_session_t *session)
+{
+	mrcp_channel_t *channel;
+	mpf_termination_t *termination;
+	mpf_codec_descriptor_t *codec_descriptor = NULL;
+
+	/* create channel */
+	synth_app_channel_t *synth_channel = apr_palloc(session->pool,sizeof(synth_app_channel_t));
+	synth_channel->audio_out = NULL;
+
+#if 0
+	codec_descriptor = apr_palloc(session->pool,sizeof(mpf_codec_descriptor_t));
+	mpf_codec_descriptor_init(codec_descriptor);
+	codec_descriptor->channel_count = 1;
+	codec_descriptor->payload_type = 0;
+	apt_string_set(&codec_descriptor->name,"PCMU");
+	codec_descriptor->sampling_rate = 8000;
+#endif
+
+	termination = mrcp_application_sink_termination_create(
+			session,                   /* session, termination belongs to */
+			&audio_stream_vtable,      /* virtual methods table of audio stream */
+			codec_descriptor,          /* codec descriptor of audio stream (NULL by default) */
+			synth_channel);            /* object to associate */
+	
+	channel = mrcp_application_channel_create(
+			session,                   /* session, channel belongs to */
+			MRCP_SYNTHESIZER_RESOURCE, /* MRCP resource identifier */
+			termination,               /* media termination, used to terminate audio stream */
+			NULL,                      /* RTP descriptor, used to create RTP termination (NULL by default) */
+			synth_channel);            /* object to associate */
+	return channel;
+}
+
+
+/** Run demo synthesizer scenario */
+static apt_bool_t synth_application_run(demo_application_t *demo_application, const char *profile)
+{
+	mrcp_channel_t *channel;
+	/* create session */
+	mrcp_session_t *session = mrcp_application_session_create(demo_application->application,profile,NULL);
+	if(!session) {
+		return FALSE;
+	}
+	
+	/* create channel and associate all the required data */
+	channel = synth_application_channel_create(session);
+	if(!channel) {
+		mrcp_application_session_destroy(session);
+		return FALSE;
+	}
+
+	/* add channel to session (send asynchronous request) */
+	if(mrcp_application_channel_add(session,channel) != TRUE) {
+		/* session and channel are still not referenced 
+		and both are allocated from session pool and will
+		be freed with session destroy call */
+		mrcp_application_session_destroy(session);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/** Handle the messages sent from the MRCP client stack */
+static apt_bool_t synth_application_handler(demo_application_t *application, const mrcp_app_message_t *app_message)
+{
+	/* app_message should be dispatched now,
+	*  the default dispatcher is used in demo. */
+	return mrcp_application_message_dispatch(&synth_application_dispatcher,app_message);
+}
+
+/** Handle the responses sent to session update requests */
+static apt_bool_t synth_application_on_session_update(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status)
+{
+	/* not used in demo */
+	return TRUE;
+}
+
+/** Handle the responses sent to session terminate requests */
+static apt_bool_t synth_application_on_session_terminate(mrcp_application_t *application, mrcp_session_t *session, mrcp_sig_status_code_e status)
+{
+	/* received response to session termination request,
+	now it's safe to destroy no more referenced session */
+	mrcp_application_session_destroy(session);
+	return TRUE;
+}
+
+/** Handle the responses sent to channel add requests */
+static apt_bool_t synth_application_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
+{
+	synth_app_channel_t *synth_channel = mrcp_application_channel_object_get(channel);
+	if(status == MRCP_SIG_STATUS_CODE_SUCCESS) {
+		mrcp_message_t *mrcp_message;
+		const apt_dir_layout_t *dir_layout = mrcp_application_dir_layout_get(application);
+		/* create and send SPEAK request */
+		mrcp_message = demo_speak_message_create(session,channel,dir_layout);
+		if(mrcp_message) {
+			mrcp_application_message_send(session,channel,mrcp_message);
+		}
+
+		if(synth_channel && session) {
+			char *file_name = apr_pstrcat(session->pool,"synth-",session->id.buf,".pcm",NULL);
+			char *file_path = apt_datadir_filepath_get(dir_layout,file_name,session->pool);
+			if(file_path) {
+				synth_channel->audio_out = fopen(file_path,"wb");
+			}
+		}
+	}
+	else {
+		/* error case, just terminate the demo */
+		mrcp_application_session_terminate(session);
+	}
+	return TRUE;
+}
+
+/** Handle the responses sent to channel remove requests */
+static apt_bool_t synth_application_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
+{
+	synth_app_channel_t *synth_channel = mrcp_application_channel_object_get(channel);
+
+	/* terminate the demo */
+	mrcp_application_session_terminate(session);
+
+	if(synth_channel) {
+		FILE *audio_out = synth_channel->audio_out;
+		if(audio_out) {
+			synth_channel->audio_out = NULL;
+			fclose(audio_out);
+		}
+	}
+	return TRUE;
+}
+
+/** Handle the MRCP responses/events */
+static apt_bool_t synth_application_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
+{
+	if(message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
+		/* received MRCP response */
+		if(message->start_line.method_id == SYNTHESIZER_SPEAK) {
+			/* received the response to SPEAK request */
+			if(message->start_line.request_state == MRCP_REQUEST_STATE_INPROGRESS) {
+				/* waiting for SPEAK-COMPLETE event */
+			}
+			else {
+				/* received unexpected response, remove channel */
+				mrcp_application_channel_remove(session,channel);
+			}
+		}
+		else {
+			/* received unexpected response */
+		}
+	}
+	else if(message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) {
+		/* received MRCP event */
+		if(message->start_line.method_id == SYNTHESIZER_SPEAK_COMPLETE) {
+			/* received SPEAK-COMPLETE event, remove channel */
+			mrcp_application_channel_remove(session,channel);
+		}
+	}
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to destroy any additional data associated with audio stream */
+static apt_bool_t synth_app_stream_destroy(mpf_audio_stream_t *stream)
+{
+	/* nothing to destroy in demo */
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform application stream specific action before open */
+static apt_bool_t synth_app_stream_open(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform application stream specific action after close */
+static apt_bool_t synth_app_stream_close(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to make new frame available to write/send */
+static apt_bool_t synth_app_stream_write(mpf_audio_stream_t *stream, const mpf_frame_t *frame)
+{
+	synth_app_channel_t *synth_channel = stream->obj;
+	if(synth_channel && synth_channel->audio_out) {
+		fwrite(frame->codec_frame.buffer,1,frame->codec_frame.size,synth_channel->audio_out);
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_util.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/demo_util.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "demo_util.h"
+/* common includes */
+#include "mrcp_session.h"
+#include "mrcp_message.h"
+#include "mrcp_generic_header.h"
+/* synthesizer includes */
+#include "mrcp_synth_header.h"
+#include "mrcp_synth_resource.h"
+/* recognizer includes */
+#include "mrcp_recog_header.h"
+#include "mrcp_recog_resource.h"
+
+static void demo_message_body_set(mrcp_message_t *mrcp_message, const apt_dir_layout_t *dir_layout, const char *file_name)
+{
+	char *file_path = apt_datadir_filepath_get(dir_layout,file_name,mrcp_message->pool);
+	if(file_path) {
+		FILE *file = fopen(file_path,"r");
+		if(file) {
+			char text[1024];
+			apr_size_t size;
+			size = fread(text,1,sizeof(text),file);
+			apt_string_assign_n(&mrcp_message->body,text,size,mrcp_message->pool);
+			fclose(file);
+		}
+	}
+}
+
+/** Create demo MRCP message (SPEAK request) */
+mrcp_message_t* demo_speak_message_create(mrcp_session_t *session, mrcp_channel_t *channel, const apt_dir_layout_t *dir_layout)
+{
+	/* create MRCP message */
+	mrcp_message_t *mrcp_message = mrcp_application_message_create(session,channel,SYNTHESIZER_SPEAK);
+	if(mrcp_message) {
+		mrcp_generic_header_t *generic_header;
+		mrcp_synth_header_t *synth_header;
+		/* get/allocate generic header */
+		generic_header = mrcp_generic_header_prepare(mrcp_message);
+		if(generic_header) {
+			/* set generic header fields */
+			apt_string_assign(&generic_header->content_type,"application/synthesis+ssml",mrcp_message->pool);
+			mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_TYPE);
+		}
+		/* get/allocate synthesizer header */
+		synth_header = mrcp_resource_header_prepare(mrcp_message);
+		if(synth_header) {
+			/* set synthesizer header fields */
+			synth_header->voice_param.age = 28;
+			mrcp_resource_header_property_add(mrcp_message,SYNTHESIZER_HEADER_VOICE_AGE);
+		}
+		/* set message body */
+		demo_message_body_set(mrcp_message,dir_layout,"speak.xml");
+	}
+	return mrcp_message;
+}
+
+/** Create demo MRCP message (DEFINE-GRAMMAR request) */
+mrcp_message_t* demo_define_grammar_message_create(mrcp_session_t *session, mrcp_channel_t *channel, const apt_dir_layout_t *dir_layout)
+{
+	/* create MRCP message */
+	mrcp_message_t *mrcp_message = mrcp_application_message_create(session,channel,RECOGNIZER_DEFINE_GRAMMAR);
+	if(mrcp_message) {
+		mrcp_generic_header_t *generic_header;
+		/* get/allocate generic header */
+		generic_header = mrcp_generic_header_prepare(mrcp_message);
+		if(generic_header) {
+			/* set generic header fields */
+			if(mrcp_message->start_line.version == MRCP_VERSION_2) {
+				apt_string_assign(&generic_header->content_type,"application/srgs+xml",mrcp_message->pool);
+			}
+			else {
+				apt_string_assign(&generic_header->content_type,"application/grammar+xml",mrcp_message->pool);
+			}
+			mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_TYPE);
+			apt_string_assign(&generic_header->content_id,"request1 at form-level.store",mrcp_message->pool);
+			mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_ID);
+		}
+		/* set message body */
+		demo_message_body_set(mrcp_message,dir_layout,"grammar.xml");
+	}
+	return mrcp_message;
+}
+
+/** Create demo MRCP message (RECOGNIZE request) */
+mrcp_message_t* demo_recognize_message_create(mrcp_session_t *session, mrcp_channel_t *channel, const apt_dir_layout_t *dir_layout)
+{
+	const char text[] = "session:request1 at form-level.store";
+
+	/* create MRCP message */
+	mrcp_message_t *mrcp_message = mrcp_application_message_create(session,channel,RECOGNIZER_RECOGNIZE);
+	if(mrcp_message) {
+		mrcp_recog_header_t *recog_header;
+		mrcp_generic_header_t *generic_header;
+		/* get/allocate generic header */
+		generic_header = mrcp_generic_header_prepare(mrcp_message);
+		if(generic_header) {
+			/* set generic header fields */
+			apt_string_assign(&generic_header->content_type,"text/uri-list",mrcp_message->pool);
+			mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_TYPE);
+		}
+		/* get/allocate recognizer header */
+		recog_header = mrcp_resource_header_prepare(mrcp_message);
+		if(recog_header) {
+			if(mrcp_message->start_line.version == MRCP_VERSION_2) {
+				/* set recognizer header fields */
+				recog_header->cancel_if_queue = FALSE;
+				mrcp_resource_header_property_add(mrcp_message,RECOGNIZER_HEADER_CANCEL_IF_QUEUE);
+			}
+			recog_header->no_input_timeout = 5000;
+			mrcp_resource_header_property_add(mrcp_message,RECOGNIZER_HEADER_NO_INPUT_TIMEOUT);
+			recog_header->recognition_timeout = 10000;
+			mrcp_resource_header_property_add(mrcp_message,RECOGNIZER_HEADER_RECOGNITION_TIMEOUT);
+			recog_header->start_input_timers = TRUE;
+			mrcp_resource_header_property_add(mrcp_message,RECOGNIZER_HEADER_START_INPUT_TIMERS);
+		}
+		/* set message body */
+		apt_string_assign(&mrcp_message->body,text,mrcp_message->pool);
+	}
+	return mrcp_message;
+}
+
+
+/** Create demo RTP termination descriptor */
+mpf_rtp_termination_descriptor_t* demo_rtp_descriptor_create(apr_pool_t *pool)
+{
+	mpf_codec_descriptor_t *codec_descriptor;
+	mpf_rtp_media_descriptor_t *media;
+	/* create rtp descriptor */
+	mpf_rtp_termination_descriptor_t *rtp_descriptor = apr_palloc(pool,sizeof(mpf_rtp_termination_descriptor_t));
+	mpf_rtp_termination_descriptor_init(rtp_descriptor);
+	/* create rtp local media */
+	media = apr_palloc(pool,sizeof(mpf_rtp_media_descriptor_t));
+	mpf_rtp_media_descriptor_init(media);
+	apt_string_assign(&media->base.ip,"127.0.0.1",pool);
+	media->base.port = 6000;
+	media->base.state = MPF_MEDIA_ENABLED;
+	media->mode = STREAM_MODE_RECEIVE;
+
+	/* initialize codec list */
+	mpf_codec_list_init(&media->codec_list,2,pool);
+	/* set codec descriptor */
+	codec_descriptor = mpf_codec_list_add(&media->codec_list);
+	if(codec_descriptor) {
+		codec_descriptor->payload_type = 0;
+	}
+	/* set another codec descriptor */
+	codec_descriptor = mpf_codec_list_add(&media->codec_list);
+	if(codec_descriptor) {
+		codec_descriptor->payload_type = 96;
+		apt_string_set(&codec_descriptor->name,"PCMU");
+		codec_descriptor->sampling_rate = 16000;
+		codec_descriptor->channel_count = 1;
+	}
+
+	rtp_descriptor->audio.local = media;
+	return rtp_descriptor;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/main.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/src/main.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include "demo_framework.h"
+#include "apt_pool.h"
+#include "apt_log.h"
+
+typedef struct {
+	const char        *root_dir_path;
+	apt_log_priority_e log_priority;
+	apt_log_output_e   log_output;
+} client_options_t;
+
+static apt_bool_t demo_framework_cmdline_process(demo_framework_t *framework, char *cmdline)
+{
+	apt_bool_t running = TRUE;
+	char *name;
+	char *last;
+	name = apr_strtok(cmdline, " ", &last);
+
+	if(strcasecmp(name,"run") == 0) {
+		char *app_name = apr_strtok(NULL, " ", &last);
+		if(app_name) {
+			char *profile_name = apr_strtok(NULL, " ", &last);
+			if(!profile_name) {
+				profile_name = "MRCPv2-Default";
+			}
+			demo_framework_app_run(framework,app_name,profile_name);
+		}
+	}
+	else if(strcasecmp(name,"loglevel") == 0) {
+		char *priority = apr_strtok(NULL, " ", &last);
+		if(priority) {
+			apt_log_priority_set(atol(priority));
+		}
+	}
+	else if(strcasecmp(name,"exit") == 0 || strcmp(name,"quit") == 0) {
+		running = FALSE;
+	}
+	else if(strcasecmp(name,"help") == 0) {
+		printf("usage:\n"
+		       "\n- run [app_name] [profile_name] (run demo application)\n"
+			   "       app_name is one of 'synth', 'recog', 'bypass', 'discover'\n"
+			   "       profile_name is one of 'MRCPv2-Default', 'MRCPv1-Default', ...\n"
+			   "\n       examples: \n"
+			   "           run synth\n"
+			   "           run recog\n"
+			   "           run synth MRCPv1-Default\n"
+			   "           run recog MRCPv1-Default\n"
+		       "\n- loglevel [level] (set loglevel, one of 0,1...7)\n"
+		       "\n- quit, exit\n");
+	}
+	else {
+		printf("unknown command: %s (input help for usage)\n",name);
+	}
+	return running;
+}
+
+static apt_bool_t demo_framework_cmdline_run(demo_framework_t *framework)
+{
+	apt_bool_t running = TRUE;
+	char cmdline[1024];
+	int i;
+	do {
+		printf(">");
+		memset(&cmdline, 0, sizeof(cmdline));
+		for(i = 0; i < sizeof(cmdline); i++) {
+			cmdline[i] = (char) getchar();
+			if(cmdline[i] == '\n') {
+				cmdline[i] = '\0';
+				break;
+			}
+		}
+		if(*cmdline) {
+			running = demo_framework_cmdline_process(framework,cmdline);
+		}
+	}
+	while(running != 0);
+	return TRUE;
+}
+
+static void usage()
+{
+	printf(
+		"\n"
+		"Usage:\n"
+		"\n"
+		"  unimrcpclient [options]\n"
+		"\n"
+		"  Available options:\n"
+		"\n"
+		"   -r [--root-dir] path     : Set the project root directory path.\n"
+		"\n"
+		"   -l [--log-prio] priority : Set the log priority.\n"
+		"                              (0-emergency, ..., 7-debug)\n"
+		"\n"
+		"   -o [--log-output] mode   : Set the log output mode.\n"
+		"                              (0-none, 1-console only, 2-file only, 3-both)\n"
+		"\n"
+		"   -h [--help]              : Show the help.\n"
+		"\n");
+}
+
+static apt_bool_t demo_framework_options_load(client_options_t *options, int argc, const char * const *argv, apr_pool_t *pool)
+{
+	apr_status_t rv;
+	apr_getopt_t *opt = NULL;
+	int optch;
+	const char *optarg;
+
+	const apr_getopt_option_t opt_option[] = {
+		/* long-option, short-option, has-arg flag, description */
+		{ "root-dir",    'r', TRUE,  "path to root dir" },  /* -r arg or --root-dir arg */
+		{ "log-prio",    'l', TRUE,  "log priority" },      /* -l arg or --log-prio arg */
+		{ "log-output",  'o', TRUE,  "log output mode" },   /* -o arg or --log-output arg */
+		{ "help",        'h', FALSE, "show help" },         /* -h or --help */
+		{ NULL, 0, 0, NULL },                               /* end */
+	};
+
+	rv = apr_getopt_init(&opt, pool , argc, argv);
+	if(rv != APR_SUCCESS) {
+		return FALSE;
+	}
+
+	while((rv = apr_getopt_long(opt, opt_option, &optch, &optarg)) == APR_SUCCESS) {
+		switch(optch) {
+			case 'r':
+				options->root_dir_path = optarg;
+				break;
+			case 'l':
+				if(optarg) {
+					options->log_priority = atoi(optarg);
+				}
+				break;
+			case 'o':
+				if(optarg) {
+					options->log_output = atoi(optarg);
+				}
+				break;
+			case 'h':
+				usage();
+				return FALSE;
+		}
+	}
+
+	if(rv != APR_EOF) {
+		usage();
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+int main(int argc, const char * const *argv)
+{
+	apr_pool_t *pool = NULL;
+	client_options_t options;
+	apt_dir_layout_t *dir_layout;
+	demo_framework_t *framework;
+
+	/* APR global initialization */
+	if(apr_initialize() != APR_SUCCESS) {
+		apr_terminate();
+		return 0;
+	}
+
+	/* create APR pool */
+	pool = apt_pool_create();
+	if(!pool) {
+		apr_terminate();
+		return 0;
+	}
+
+	/* set the default options */
+	options.root_dir_path = "../";
+	options.log_priority = APT_PRIO_INFO;
+	options.log_output = APT_LOG_OUTPUT_CONSOLE;
+
+	/* load options */
+	if(demo_framework_options_load(&options,argc,argv,pool) != TRUE) {
+		apr_pool_destroy(pool);
+		apr_terminate();
+		return 0;
+	}
+
+	/* create the structure of default directories layout */
+	dir_layout = apt_default_dir_layout_create(options.root_dir_path,pool);
+	/* create singleton logger */
+	apt_log_instance_create(options.log_output,options.log_priority,pool);
+
+	if((options.log_output & APT_LOG_OUTPUT_FILE) == APT_LOG_OUTPUT_FILE) {
+		/* open the log file */
+		apt_log_file_open(dir_layout->log_dir_path,"unimrcpclient",MAX_LOG_FILE_SIZE,MAX_LOG_FILE_COUNT,pool);
+	}
+
+	/* create demo framework */
+	framework = demo_framework_create(dir_layout);
+	if(framework) {
+		/* run command line  */
+		demo_framework_cmdline_run(framework);
+		/* destroy demo framework */
+		demo_framework_destroy(framework);
+	}
+
+	/* destroy singleton logger */
+	apt_log_instance_destroy();
+	/* destroy APR pool */
+	apr_pool_destroy(pool);
+	/* APR global termination */
+	apr_terminate();
+	return 0;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,201 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,19 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+INCLUDES               = -Iinclude \
+                         -I$(top_srcdir)/platforms/libunimrcp-server/include \
+                         -I$(top_srcdir)/libs/mrcp-server/include \
+                         -I$(top_srcdir)/libs/mrcp-engine/include \
+                         -I$(top_srcdir)/libs/mrcp-signaling/include \
+                         -I$(top_srcdir)/libs/mrcpv2-transport/include \
+                         -I$(top_srcdir)/libs/mrcp/include \
+                         -I$(top_srcdir)/libs/mrcp/message/include \
+                         -I$(top_srcdir)/libs/mrcp/control/include \
+                         -I$(top_srcdir)/libs/mrcp/resources/include \
+                         -I$(top_srcdir)/libs/mpf/include \
+                         -I$(top_srcdir)/libs/apr-toolkit/include \
+                         $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+bin_PROGRAMS           = unimrcpserver
+unimrcpserver_SOURCES  = src/main.c src/uni_cmdline.c src/uni_daemon.c
+unimrcpserver_LDADD    = $(top_builddir)/platforms/libunimrcp-server/libunimrcpserver.la

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/main.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/main.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include 
+#include "apt_pool.h"
+#include "apt_dir_layout.h"
+#include "apt_log.h"
+
+typedef struct {
+	const char        *root_dir_path;
+	apt_bool_t         foreground;
+	apt_log_priority_e log_priority;
+	apt_log_output_e   log_output;
+} server_options_t;
+
+#ifdef WIN32
+apt_bool_t uni_service_run(apt_dir_layout_t *dir_layout, apr_pool_t *pool);
+#else
+apt_bool_t uni_daemon_run(apt_dir_layout_t *dir_layout, apr_pool_t *pool);
+#endif
+
+apt_bool_t uni_cmdline_run(apt_dir_layout_t *dir_layout, apr_pool_t *pool);
+
+
+static void usage()
+{
+	printf(
+		"\n"
+		"Usage:\n"
+		"\n"
+		"  unimrcpserver [options]\n"
+		"\n"
+		"  Available options:\n"
+		"\n"
+		"   -r [--root-dir] path     : Set the project root directory path.\n"
+		"\n"
+		"   -l [--log-prio] priority : Set the log priority.\n"
+		"                              (0-emergency, ..., 7-debug)\n"
+		"\n"
+		"   -o [--log-output] mode   : Set the log output mode.\n"
+		"                              (0-none, 1-console only, 2-file only, 3-both)\n"
+		"\n"
+#ifdef WIN32
+		"   -s [--service]           : Run as the Windows service.\n"
+		"\n"
+#else
+		"   -d [--daemon]            : Run as the daemon.\n"
+		"\n"
+#endif
+		"   -h [--help]              : Show the help.\n"
+		"\n");
+}
+
+static apt_bool_t options_load(server_options_t *options, int argc, const char * const *argv, apr_pool_t *pool)
+{
+	apr_status_t rv;
+	apr_getopt_t *opt = NULL;
+	int optch;
+	const char *optarg;
+
+	const apr_getopt_option_t opt_option[] = {
+		/* long-option, short-option, has-arg flag, description */
+		{ "root-dir",    'r', TRUE,  "path to root dir" },  /* -r arg or --root-dir arg */
+		{ "log-prio",    'l', TRUE,  "log priority" },      /* -l arg or --log-prio arg */
+		{ "log-output",  'o', TRUE,  "log output mode" },   /* -o arg or --log-output arg */
+#ifdef WIN32
+		{ "service",     's', FALSE, "run as service" },    /* -s or --service */
+#else
+		{ "daemon",      'd', FALSE, "start as daemon" },   /* -d or --daemon */
+#endif
+		{ "help",        'h', FALSE, "show help" },         /* -h or --help */
+		{ NULL, 0, 0, NULL },                               /* end */
+	};
+
+	rv = apr_getopt_init(&opt, pool , argc, argv);
+	if(rv != APR_SUCCESS) {
+		return FALSE;
+	}
+
+	while((rv = apr_getopt_long(opt, opt_option, &optch, &optarg)) == APR_SUCCESS) {
+		switch(optch) {
+			case 'r':
+				options->root_dir_path = optarg;
+				break;
+			case 'l':
+				if(optarg) {
+					options->log_priority = atoi(optarg);
+				}
+				break;
+			case 'o':
+				if(optarg) {
+					options->log_output = atoi(optarg);
+				}
+				break;
+#ifdef WIN32
+			case 's':
+				options->foreground = FALSE;
+				break;
+#else
+			case 'd':
+				options->foreground = FALSE;
+				break;
+#endif
+			case 'h':
+				usage();
+				return FALSE;
+		}
+	}
+
+	if(rv != APR_EOF) {
+		usage();
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+int main(int argc, const char * const *argv)
+{
+	apr_pool_t *pool = NULL;
+	server_options_t options;
+	apt_dir_layout_t *dir_layout;
+
+	/* APR global initialization */
+	if(apr_initialize() != APR_SUCCESS) {
+		apr_terminate();
+		return 0;
+	}
+
+	/* create APR pool */
+	pool = apt_pool_create();
+	if(!pool) {
+		apr_terminate();
+		return 0;
+	}
+
+	/* set the default options */
+	options.root_dir_path = "../";
+	options.foreground = TRUE;
+	options.log_priority = APT_PRIO_INFO;
+	options.log_output = APT_LOG_OUTPUT_CONSOLE;
+
+	/* load options */
+	if(options_load(&options,argc,argv,pool) != TRUE) {
+		apr_pool_destroy(pool);
+		apr_terminate();
+		return 0;
+	}
+
+	/* create the structure of default directories layout */
+	dir_layout = apt_default_dir_layout_create(options.root_dir_path,pool);
+	/* create singleton logger */
+	apt_log_instance_create(options.log_output,options.log_priority,pool);
+
+	if((options.log_output & APT_LOG_OUTPUT_FILE) == APT_LOG_OUTPUT_FILE) {
+		/* open the log file */
+		apt_log_file_open(dir_layout->log_dir_path,"unimrcpserver",MAX_LOG_FILE_SIZE,MAX_LOG_FILE_COUNT,pool);
+	}
+
+	if(options.foreground == TRUE) {
+		/* run command line */
+		uni_cmdline_run(dir_layout,pool);
+	}
+#ifdef WIN32
+	else {
+		/* run as windows service */
+		uni_service_run(dir_layout,pool);
+	}
+#else
+	else {
+		/* run as daemon */
+		uni_daemon_run(dir_layout,pool);
+	}
+#endif
+
+	/* destroy singleton logger */
+	apt_log_instance_destroy();
+	/* destroy APR pool */
+	apr_pool_destroy(pool);
+	/* APR global termination */
+	apr_terminate();
+	return 0;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_cmdline.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_cmdline.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "unimrcp_server.h"
+#include "apt_log.h"
+
+static apt_bool_t cmdline_process(char *cmdline)
+{
+	apt_bool_t running = TRUE;
+	char *name;
+	char *last;
+	name = apr_strtok(cmdline, " ", &last);
+
+	if(strcasecmp(name,"loglevel") == 0) {
+		char *priority = apr_strtok(NULL, " ", &last);
+		if(priority) {
+			apt_log_priority_set(atol(priority));
+		}
+	}
+	else if(strcasecmp(name,"exit") == 0 || strcmp(name,"quit") == 0) {
+		running = FALSE;
+	}
+	else if(strcasecmp(name,"help") == 0) {
+		printf("usage:\n");
+		printf("- loglevel [level] (set loglevel, one of 0,1...7)\n");
+		printf("- quit, exit\n");
+	}
+	else {
+		printf("unknown command: %s (input help for usage)\n",name);
+	}
+	return running;
+}
+
+apt_bool_t uni_cmdline_run(apt_dir_layout_t *dir_layout, apr_pool_t *pool)
+{
+	apt_bool_t running = TRUE;
+	char cmdline[1024];
+	int i;
+	mrcp_server_t *server;
+
+	/* start server */
+	server = unimrcp_server_start(dir_layout);
+	if(!server) {
+		return FALSE;
+	}
+
+	do {
+		printf(">");
+		memset(&cmdline, 0, sizeof(cmdline));
+		for(i = 0; i < sizeof(cmdline); i++) {
+			cmdline[i] = (char) getchar();
+			if(cmdline[i] == '\n') {
+				cmdline[i] = '\0';
+				break;
+			}
+		}
+		if(*cmdline) {
+			running = cmdline_process(cmdline);
+		}
+	}
+	while(running != 0);
+
+	/* shutdown server */
+	unimrcp_server_shutdown(server);
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_daemon.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_daemon.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "unimrcp_server.h"
+#include "apt_log.h"
+
+static apt_bool_t daemon_running;
+
+static void sigterm_handler(int signo)
+{
+	daemon_running = FALSE;
+}
+
+apt_bool_t uni_daemon_run(apt_dir_layout_t *dir_layout, apr_pool_t *pool)
+{
+	mrcp_server_t *server;
+
+	daemon_running = TRUE;
+	apr_signal(SIGTERM,sigterm_handler);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Run as Daemon");
+	apr_proc_detach(APR_PROC_DETACH_DAEMONIZE);
+
+	/* start server */
+	server = unimrcp_server_start(dir_layout);
+	if(!server) {
+		return FALSE;
+	}
+
+	while(daemon_running) apr_sleep(1000000);
+
+	/* shutdown server */
+	unimrcp_server_shutdown(server);
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_service.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/src/uni_service.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "unimrcp_server.h"
+#include "apt_log.h"
+
+#define WIN_SERVICE_NAME "unimrcp"
+
+static SERVICE_STATUS_HANDLE win_service_status_handle = NULL;
+static SERVICE_STATUS win_service_status;
+
+static mrcp_server_t *server = NULL;
+static apt_dir_layout_t *service_dir_layout = NULL;
+
+/** SCM state change handler */
+static void WINAPI win_service_handler(DWORD control)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Service Handler %d",control);
+	switch (control)
+	{
+		case SERVICE_CONTROL_INTERROGATE:
+			break;
+		case SERVICE_CONTROL_SHUTDOWN:
+		case SERVICE_CONTROL_STOP:
+			if(server) {
+				win_service_status.dwCurrentState = SERVICE_STOP_PENDING; 
+				if(!SetServiceStatus(win_service_status_handle, &win_service_status)) { 
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Set Service Status %d",GetLastError());
+				}
+
+				/* shutdown server */
+				unimrcp_server_shutdown(server);
+			}
+			win_service_status.dwCurrentState = SERVICE_STOPPED; 
+			win_service_status.dwCheckPoint = 0; 
+			win_service_status.dwWaitHint = 0; 
+			break;
+	}
+
+	if(!SetServiceStatus(win_service_status_handle, &win_service_status)) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Set Service Status %d",GetLastError());
+	}
+}
+
+static void WINAPI win_service_main(DWORD argc, LPTSTR *argv)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Service Main");
+	win_service_status.dwServiceType = SERVICE_WIN32;
+	win_service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP;
+	win_service_status.dwWin32ExitCode = 0;
+	win_service_status.dwServiceSpecificExitCode = 0;
+	win_service_status.dwCheckPoint = 0;
+	win_service_status.dwWaitHint = 0;
+
+	win_service_status_handle = RegisterServiceCtrlHandler(WIN_SERVICE_NAME, win_service_handler);
+	if(win_service_status_handle == (SERVICE_STATUS_HANDLE)0) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Register Service Control Handler %d",GetLastError());
+		return;
+	} 
+
+	win_service_status.dwCurrentState = SERVICE_START_PENDING;
+	if(!SetServiceStatus(win_service_status_handle, &win_service_status)) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Set Service Status %d",GetLastError());
+	} 
+
+	/* start server */
+	server = unimrcp_server_start(service_dir_layout);
+
+	win_service_status.dwCurrentState =  server ? SERVICE_RUNNING : SERVICE_STOPPED;
+	if(!SetServiceStatus(win_service_status_handle, &win_service_status)) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Set Service Status %d",GetLastError());
+	} 
+}
+
+/** Run SCM service */
+apt_bool_t uni_service_run(apt_dir_layout_t *dir_layout, apr_pool_t *pool)
+{
+	SERVICE_TABLE_ENTRY win_service_table[] = {
+		{ WIN_SERVICE_NAME, win_service_main },
+		{ NULL, NULL }
+	};
+
+	service_dir_layout = dir_layout;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Run as Service");
+	if(!StartServiceCtrlDispatcher(win_service_table)) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Connect to SCM %d",GetLastError());
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,175 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/plugins/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,15 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+SUBDIRS                =
+
+if DEMOSYNTH_PLUGIN
+SUBDIRS               += demo-synth
+endif
+
+if DEMORECOG_PLUGIN
+SUBDIRS               += demo-recog
+endif
+
+if CEPSTRAL_PLUGIN
+SUBDIRS               += mrcp-cepstral
+endif

Added: freeswitch/trunk/libs/unimrcp/plugins/demo-recog/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-recog/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+MAINTAINERCLEANFILES 	   = Makefile.in
+
+INCLUDES                   = -Iinclude \
+                             -I$(top_srcdir)/libs/mrcp-engine/include \
+                             -I$(top_srcdir)/libs/mrcp/include \
+                             -I$(top_srcdir)/libs/mrcp/message/include \
+                             -I$(top_srcdir)/libs/mrcp/control/include \
+                             -I$(top_srcdir)/libs/mrcp/resources/include \
+                             -I$(top_srcdir)/libs/mpf/include \
+                             -I$(top_srcdir)/libs/apr-toolkit/include \
+                             $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+plugin_LTLIBRARIES         = demorecog.la
+
+demorecog_la_SOURCES       = src/demo_recog_engine.c
+demorecog_la_LDFLAGS       = -module $(PLUGIN_LT_VERSION)

Added: freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,165 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/plugins/demo-recog/src/demo_recog_engine.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-recog/src/demo_recog_engine.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,508 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Some mandatory rules for plugin implementation.
+ * 1. Each plugin MUST contain the following function as an entry point of the plugin
+ *        MRCP_PLUGIN_DECLARE(mrcp_resource_engine_t*) mrcp_plugin_create(apr_pool_t *pool)
+ * 2. One and only one response MUST be sent back to the received request.
+ * 3. Methods (callbacks) of the MRCP engine channel MUST not block.
+ *   (asynch response can be sent from the context of other thread)
+ * 4. Methods (callbacks) of the MPF engine stream MUST not block.
+ */
+
+#include "mrcp_resource_engine.h"
+#include "mrcp_recog_resource.h"
+#include "mrcp_recog_header.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_message.h"
+#include "mpf_activity_detector.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+#define RECOG_ENGINE_TASK_NAME "Demo Recog Engine"
+
+typedef struct demo_recog_engine_t demo_recog_engine_t;
+typedef struct demo_recog_channel_t demo_recog_channel_t;
+typedef struct demo_recog_msg_t demo_recog_msg_t;
+
+/** Declaration of recognizer engine methods */
+static apt_bool_t demo_recog_engine_destroy(mrcp_resource_engine_t *engine);
+static apt_bool_t demo_recog_engine_open(mrcp_resource_engine_t *engine);
+static apt_bool_t demo_recog_engine_close(mrcp_resource_engine_t *engine);
+static mrcp_engine_channel_t* demo_recog_engine_channel_create(mrcp_resource_engine_t *engine, apr_pool_t *pool);
+
+static const struct mrcp_engine_method_vtable_t engine_vtable = {
+	demo_recog_engine_destroy,
+	demo_recog_engine_open,
+	demo_recog_engine_close,
+	demo_recog_engine_channel_create
+};
+
+
+/** Declaration of recognizer channel methods */
+static apt_bool_t demo_recog_channel_destroy(mrcp_engine_channel_t *channel);
+static apt_bool_t demo_recog_channel_open(mrcp_engine_channel_t *channel);
+static apt_bool_t demo_recog_channel_close(mrcp_engine_channel_t *channel);
+static apt_bool_t demo_recog_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *request);
+
+static const struct mrcp_engine_channel_method_vtable_t channel_vtable = {
+	demo_recog_channel_destroy,
+	demo_recog_channel_open,
+	demo_recog_channel_close,
+	demo_recog_channel_request_process
+};
+
+/** Declaration of recognizer audio stream methods */
+static apt_bool_t demo_recog_stream_destroy(mpf_audio_stream_t *stream);
+static apt_bool_t demo_recog_stream_open(mpf_audio_stream_t *stream);
+static apt_bool_t demo_recog_stream_close(mpf_audio_stream_t *stream);
+static apt_bool_t demo_recog_stream_write(mpf_audio_stream_t *stream, const mpf_frame_t *frame);
+
+static const mpf_audio_stream_vtable_t audio_stream_vtable = {
+	demo_recog_stream_destroy,
+	NULL,
+	NULL,
+	NULL,
+	demo_recog_stream_open,
+	demo_recog_stream_close,
+	demo_recog_stream_write
+};
+
+/** Declaration of demo recognizer engine */
+struct demo_recog_engine_t {
+	apt_consumer_task_t    *task;
+};
+
+/** Declaration of demo recognizer channel */
+struct demo_recog_channel_t {
+	/** Back pointer to engine */
+	demo_recog_engine_t     *demo_engine;
+	/** Engine channel base */
+	mrcp_engine_channel_t   *channel;
+
+	/** Active (in-progress) recognition request */
+	mrcp_message_t          *recog_request;
+	/** Pending stop response */
+	mrcp_message_t          *stop_response;
+	/** Indicates whether input timers are started */
+	apt_bool_t               timers_started;
+	/** Voice activity detector */
+	mpf_activity_detector_t *detector;
+	/** File to write utterance to */
+	FILE                    *audio_out;
+};
+
+typedef enum {
+	DEMO_RECOG_MSG_OPEN_CHANNEL,
+	DEMO_RECOG_MSG_CLOSE_CHANNEL,
+	DEMO_RECOG_MSG_REQUEST_PROCESS
+} demo_recog_msg_type_e;
+
+/** Declaration of demo recognizer task message */
+struct demo_recog_msg_t {
+	demo_recog_msg_type_e  type;
+	mrcp_engine_channel_t *channel; 
+	mrcp_message_t        *request;
+};
+
+static apt_bool_t demo_recog_msg_signal(demo_recog_msg_type_e type, mrcp_engine_channel_t *channel, mrcp_message_t *request);
+static apt_bool_t demo_recog_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+
+/** Declare this macro to use log routine of the server, plugin is loaded from */
+MRCP_PLUGIN_LOGGER_IMPLEMENT
+
+/** Create demo recognizer engine */
+MRCP_PLUGIN_DECLARE(mrcp_resource_engine_t*) mrcp_plugin_create(apr_pool_t *pool)
+{
+	demo_recog_engine_t *demo_engine = apr_palloc(pool,sizeof(demo_recog_engine_t));
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+
+	msg_pool = apt_task_msg_pool_create_dynamic(sizeof(demo_recog_msg_t),pool);
+	demo_engine->task = apt_consumer_task_create(demo_engine,msg_pool,pool);
+	if(!demo_engine->task) {
+		return NULL;
+	}
+	task = apt_consumer_task_base_get(demo_engine->task);
+	apt_task_name_set(task,RECOG_ENGINE_TASK_NAME);
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->process_msg = demo_recog_msg_process;
+	}
+
+	/* create resource engine base */
+	return mrcp_resource_engine_create(
+					MRCP_RECOGNIZER_RESOURCE,  /* MRCP resource identifier */
+					demo_engine,               /* object to associate */
+					&engine_vtable,            /* virtual methods table of resource engine */
+					pool);                     /* pool to allocate memory from */
+}
+
+/** Destroy recognizer engine */
+static apt_bool_t demo_recog_engine_destroy(mrcp_resource_engine_t *engine)
+{
+	demo_recog_engine_t *demo_engine = engine->obj;
+	if(demo_engine->task) {
+		apt_task_t *task = apt_consumer_task_base_get(demo_engine->task);
+		apt_task_destroy(task);
+		demo_engine->task = NULL;
+	}
+	return TRUE;
+}
+
+/** Open recognizer engine */
+static apt_bool_t demo_recog_engine_open(mrcp_resource_engine_t *engine)
+{
+	demo_recog_engine_t *demo_engine = engine->obj;
+	if(demo_engine->task) {
+		apt_task_t *task = apt_consumer_task_base_get(demo_engine->task);
+		apt_task_start(task);
+	}
+	return TRUE;
+}
+
+/** Close recognizer engine */
+static apt_bool_t demo_recog_engine_close(mrcp_resource_engine_t *engine)
+{
+	demo_recog_engine_t *demo_engine = engine->obj;
+	if(demo_engine->task) {
+		apt_task_t *task = apt_consumer_task_base_get(demo_engine->task);
+		apt_task_terminate(task,TRUE);
+	}
+	return TRUE;
+}
+
+static mrcp_engine_channel_t* demo_recog_engine_channel_create(mrcp_resource_engine_t *engine, apr_pool_t *pool)
+{
+	/* create demo recog channel */
+	demo_recog_channel_t *recog_channel = apr_palloc(pool,sizeof(demo_recog_channel_t));
+	recog_channel->demo_engine = engine->obj;
+	recog_channel->recog_request = NULL;
+	recog_channel->stop_response = NULL;
+	recog_channel->detector = mpf_activity_detector_create(pool);
+	recog_channel->audio_out = NULL;
+	/* create engine channel base */
+	recog_channel->channel = mrcp_engine_sink_channel_create(
+			engine,               /* resource engine */
+			&channel_vtable,      /* virtual methods table of engine channel */
+			&audio_stream_vtable, /* virtual methods table of audio stream */
+			recog_channel,        /* object to associate */
+			NULL,                 /* codec descriptor might be NULL by default */
+			pool);                /* pool to allocate memory from */
+	return recog_channel->channel;
+}
+
+/** Destroy engine channel */
+static apt_bool_t demo_recog_channel_destroy(mrcp_engine_channel_t *channel)
+{
+	demo_recog_channel_t *recog_channel = channel->method_obj;
+	if(recog_channel->audio_out) {
+		fclose(recog_channel->audio_out);
+		recog_channel->audio_out = NULL;
+	}
+
+	return TRUE;
+}
+
+/** Open engine channel (asynchronous response MUST be sent)*/
+static apt_bool_t demo_recog_channel_open(mrcp_engine_channel_t *channel)
+{
+	return demo_recog_msg_signal(DEMO_RECOG_MSG_OPEN_CHANNEL,channel,NULL);
+}
+
+/** Close engine channel (asynchronous response MUST be sent)*/
+static apt_bool_t demo_recog_channel_close(mrcp_engine_channel_t *channel)
+{
+	return demo_recog_msg_signal(DEMO_RECOG_MSG_CLOSE_CHANNEL,channel,NULL);
+}
+
+/** Process MRCP channel request (asynchronous response MUST be sent)*/
+static apt_bool_t demo_recog_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *request)
+{
+	return demo_recog_msg_signal(DEMO_RECOG_MSG_REQUEST_PROCESS,channel,request);
+}
+
+/** Process RECOGNIZE request */
+static apt_bool_t demo_recog_channel_recognize(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	/* process RECOGNIZE request */
+	mrcp_recog_header_t *recog_header;
+	demo_recog_channel_t *recog_channel = channel->method_obj;
+	recog_channel->timers_started = TRUE;
+
+	/* get recognizer header */
+	recog_header = mrcp_resource_header_get(request);
+	if(recog_header) {
+		if(mrcp_resource_header_property_check(request,RECOGNIZER_HEADER_START_INPUT_TIMERS) == TRUE) {
+			recog_channel->timers_started = recog_header->start_input_timers;
+		}
+		if(mrcp_resource_header_property_check(request,RECOGNIZER_HEADER_NO_INPUT_TIMEOUT) == TRUE) {
+			mpf_activity_detector_noinput_timeout_set(recog_channel->detector,recog_header->no_input_timeout);
+		}
+		if(mrcp_resource_header_property_check(request,RECOGNIZER_HEADER_SPEECH_COMPLETE_TIMEOUT) == TRUE) {
+			mpf_activity_detector_complete_timeout_set(recog_channel->detector,recog_header->speech_complete_timeout);
+		}
+	}
+
+	if(!recog_channel->audio_out) {
+		const apt_dir_layout_t *dir_layout = channel->engine->dir_layout;
+		char *file_name = apr_pstrcat(channel->pool,"utter-",request->channel_id.session_id.buf,".pcm",NULL);
+		char *file_path = apt_datadir_filepath_get(dir_layout,file_name,channel->pool);
+		if(file_path) {
+			recog_channel->audio_out = fopen(file_path,"wb");
+		}
+	}
+
+	response->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	recog_channel->recog_request = request;
+	return TRUE;
+}
+
+/** Process STOP request */
+static apt_bool_t demo_recog_channel_stop(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	/* process STOP request */
+	demo_recog_channel_t *recog_channel = channel->method_obj;
+	/* store STOP request, make sure there is no more activity and only then send the response */
+	recog_channel->stop_response = response;
+	return TRUE;
+}
+
+/** Process START-INPUT-TIMERS request */
+static apt_bool_t demo_recog_channel_timers_start(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	demo_recog_channel_t *recog_channel = channel->method_obj;
+	recog_channel->timers_started = TRUE;
+	return mrcp_engine_channel_message_send(channel,response);
+}
+
+/** Dispatch MRCP request */
+static apt_bool_t demo_recog_channel_request_dispatch(mrcp_engine_channel_t *channel, mrcp_message_t *request)
+{
+	apt_bool_t processed = FALSE;
+	mrcp_message_t *response = mrcp_response_create(request,request->pool);
+	switch(request->start_line.method_id) {
+		case RECOGNIZER_SET_PARAMS:
+			break;
+		case RECOGNIZER_GET_PARAMS:
+			break;
+		case RECOGNIZER_DEFINE_GRAMMAR:
+			break;
+		case RECOGNIZER_RECOGNIZE:
+			processed = demo_recog_channel_recognize(channel,request,response);
+			break;
+		case RECOGNIZER_GET_RESULT:
+			break;
+		case RECOGNIZER_START_INPUT_TIMERS:
+			processed = demo_recog_channel_timers_start(channel,request,response);
+			break;
+		case RECOGNIZER_STOP:
+			processed = demo_recog_channel_stop(channel,request,response);
+			break;
+		default:
+			break;
+	}
+	if(processed == FALSE) {
+		/* send asynchronous response for not handled request */
+		mrcp_engine_channel_message_send(channel,response);
+	}
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to destroy any additional data associated with audio stream */
+static apt_bool_t demo_recog_stream_destroy(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform any action before open */
+static apt_bool_t demo_recog_stream_open(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform any action after close */
+static apt_bool_t demo_recog_stream_close(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/* Raise demo START-OF-INPUT event */
+static apt_bool_t demo_recog_start_of_input(demo_recog_channel_t *recog_channel)
+{
+	/* create START-OF-INPUT event */
+	mrcp_message_t *message = mrcp_event_create(
+						recog_channel->recog_request,
+						RECOGNIZER_START_OF_INPUT,
+						recog_channel->recog_request->pool);
+	if(!message) {
+		return FALSE;
+	}
+
+	/* set request state */
+	message->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
+	/* send asynch event */
+	return mrcp_engine_channel_message_send(recog_channel->channel,message);
+}
+
+/* Load demo recognition result */
+static apt_bool_t demo_recog_result_load(demo_recog_channel_t *recog_channel, mrcp_message_t *message)
+{
+	FILE *file;
+	mrcp_engine_channel_t *channel = recog_channel->channel;
+	const apt_dir_layout_t *dir_layout = channel->engine->dir_layout;
+	char *file_path = apt_datadir_filepath_get(dir_layout,"result.xml",message->pool);
+	if(!file_path) {
+		return FALSE;
+	}
+	
+	/* read the demo result from file */
+	file = fopen(file_path,"r");
+	if(file) {
+		mrcp_generic_header_t *generic_header;
+		char text[1024];
+		apr_size_t size;
+		size = fread(text,1,sizeof(text),file);
+		apt_string_assign_n(&message->body,text,size,message->pool);
+		fclose(file);
+
+		/* get/allocate generic header */
+		generic_header = mrcp_generic_header_prepare(message);
+		if(generic_header) {
+			/* set content types */
+			apt_string_assign(&generic_header->content_type,"application/x-nlsml",message->pool);
+			mrcp_generic_header_property_add(message,GENERIC_HEADER_CONTENT_TYPE);
+		}
+	}
+	return TRUE;
+}
+
+/* Raise demo RECOGNITION-COMPLETE event */
+static apt_bool_t demo_recog_recognition_complete(demo_recog_channel_t *recog_channel, mrcp_recog_completion_cause_e cause)
+{
+	mrcp_recog_header_t *recog_header;
+	/* create RECOGNITION-COMPLETE event */
+	mrcp_message_t *message = mrcp_event_create(
+						recog_channel->recog_request,
+						RECOGNIZER_RECOGNITION_COMPLETE,
+						recog_channel->recog_request->pool);
+	if(!message) {
+		return FALSE;
+	}
+
+	/* get/allocate recognizer header */
+	recog_header = mrcp_resource_header_prepare(message);
+	if(recog_header) {
+		/* set completion cause */
+		recog_header->completion_cause = cause;
+		mrcp_resource_header_property_add(message,RECOGNIZER_HEADER_COMPLETION_CAUSE);
+	}
+	/* set request state */
+	message->start_line.request_state = MRCP_REQUEST_STATE_COMPLETE;
+
+	if(cause == RECOGNIZER_COMPLETION_CAUSE_SUCCESS) {
+		demo_recog_result_load(recog_channel,message);
+	}
+
+	recog_channel->recog_request = NULL;
+	/* send asynch event */
+	return mrcp_engine_channel_message_send(recog_channel->channel,message);
+}
+
+/** Callback is called from MPF engine context to write/send new frame */
+static apt_bool_t demo_recog_stream_write(mpf_audio_stream_t *stream, const mpf_frame_t *frame)
+{
+	demo_recog_channel_t *recog_channel = stream->obj;
+	if(recog_channel->stop_response) {
+		/* send asynchronous response to STOP request */
+		mrcp_engine_channel_message_send(recog_channel->channel,recog_channel->stop_response);
+		recog_channel->stop_response = NULL;
+		recog_channel->recog_request = NULL;
+		return TRUE;
+	}
+
+	if(recog_channel->recog_request) {
+		mpf_detector_event_e det_event = mpf_activity_detector_process(recog_channel->detector,frame);
+		switch(det_event) {
+			case MPF_DETECTOR_EVENT_ACTIVITY:
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Detected Voice Activity");
+				demo_recog_start_of_input(recog_channel);
+				break;
+			case MPF_DETECTOR_EVENT_INACTIVITY:
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Detected Voice Inactivity");
+				demo_recog_recognition_complete(recog_channel,RECOGNIZER_COMPLETION_CAUSE_SUCCESS);
+				break;
+			case MPF_DETECTOR_EVENT_NOINPUT:
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Detected Noinput");
+				if(recog_channel->timers_started == TRUE) {
+					demo_recog_recognition_complete(recog_channel,RECOGNIZER_COMPLETION_CAUSE_NO_INPUT_TIMEOUT);
+				}
+				break;
+			default:
+				break;
+		}
+
+		if(recog_channel->audio_out) {
+			fwrite(frame->codec_frame.buffer,1,frame->codec_frame.size,recog_channel->audio_out);
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t demo_recog_msg_signal(demo_recog_msg_type_e type, mrcp_engine_channel_t *channel, mrcp_message_t *request)
+{
+	apt_bool_t status = FALSE;
+	demo_recog_channel_t *demo_channel = channel->method_obj;
+	demo_recog_engine_t *demo_engine = demo_channel->demo_engine;
+	apt_task_t *task = apt_consumer_task_base_get(demo_engine->task);
+	apt_task_msg_t *msg = apt_task_msg_get(task);
+	if(msg) {
+		demo_recog_msg_t *demo_msg;
+		msg->type = TASK_MSG_USER;
+		demo_msg = (demo_recog_msg_t*) msg->data;
+
+		demo_msg->type = type;
+		demo_msg->channel = channel;
+		demo_msg->request = request;
+		status = apt_task_msg_signal(task,msg);
+	}
+	return status;
+}
+
+static apt_bool_t demo_recog_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	demo_recog_msg_t *demo_msg = (demo_recog_msg_t*)msg->data;
+	switch(demo_msg->type) {
+		case DEMO_RECOG_MSG_OPEN_CHANNEL:
+			/* open channel and send asynch response */
+			mrcp_engine_channel_open_respond(demo_msg->channel,TRUE);
+			break;
+		case DEMO_RECOG_MSG_CLOSE_CHANNEL:
+			/* close channel, make sure there is no activity and send asynch response */
+			mrcp_engine_channel_close_respond(demo_msg->channel);
+			break;
+		case DEMO_RECOG_MSG_REQUEST_PROCESS:
+			demo_recog_channel_request_dispatch(demo_msg->channel,demo_msg->request);
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/plugins/demo-synth/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-synth/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+MAINTAINERCLEANFILES 	   = Makefile.in
+
+INCLUDES                   = -Iinclude \
+                             -I$(top_srcdir)/libs/mrcp-engine/include \
+                             -I$(top_srcdir)/libs/mrcp/include \
+                             -I$(top_srcdir)/libs/mrcp/message/include \
+                             -I$(top_srcdir)/libs/mrcp/control/include \
+                             -I$(top_srcdir)/libs/mrcp/resources/include \
+                             -I$(top_srcdir)/libs/mpf/include \
+                             -I$(top_srcdir)/libs/apr-toolkit/include \
+                             $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+plugin_LTLIBRARIES         = demosynth.la
+
+demosynth_la_SOURCES       = src/demo_synth_engine.c
+demosynth_la_LDFLAGS       = -module $(PLUGIN_LT_VERSION)

Added: freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,165 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/plugins/demo-synth/src/demo_synth_engine.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-synth/src/demo_synth_engine.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,521 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Some mandatory rules for plugin implementation.
+ * 1. Each plugin MUST contain the following function as an entry point of the plugin
+ *        MRCP_PLUGIN_DECLARE(mrcp_resource_engine_t*) mrcp_plugin_create(apr_pool_t *pool)
+ * 2. One and only one response MUST be sent back to the received request.
+ * 3. Methods (callbacks) of the MRCP engine channel MUST not block.
+ *   (asynch response can be sent from the context of other thread)
+ * 4. Methods (callbacks) of the MPF engine stream MUST not block.
+ */
+
+#include "mrcp_resource_engine.h"
+#include "mrcp_synth_resource.h"
+#include "mrcp_synth_header.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_message.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+#define SYNTH_ENGINE_TASK_NAME "Demo Synth Engine"
+
+typedef struct demo_synth_engine_t demo_synth_engine_t;
+typedef struct demo_synth_channel_t demo_synth_channel_t;
+typedef struct demo_synth_msg_t demo_synth_msg_t;
+
+/** Declaration of synthesizer engine methods */
+static apt_bool_t demo_synth_engine_destroy(mrcp_resource_engine_t *engine);
+static apt_bool_t demo_synth_engine_open(mrcp_resource_engine_t *engine);
+static apt_bool_t demo_synth_engine_close(mrcp_resource_engine_t *engine);
+static mrcp_engine_channel_t* demo_synth_engine_channel_create(mrcp_resource_engine_t *engine, apr_pool_t *pool);
+
+static const struct mrcp_engine_method_vtable_t engine_vtable = {
+	demo_synth_engine_destroy,
+	demo_synth_engine_open,
+	demo_synth_engine_close,
+	demo_synth_engine_channel_create
+};
+
+
+/** Declaration of synthesizer channel methods */
+static apt_bool_t demo_synth_channel_destroy(mrcp_engine_channel_t *channel);
+static apt_bool_t demo_synth_channel_open(mrcp_engine_channel_t *channel);
+static apt_bool_t demo_synth_channel_close(mrcp_engine_channel_t *channel);
+static apt_bool_t demo_synth_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *request);
+
+static const struct mrcp_engine_channel_method_vtable_t channel_vtable = {
+	demo_synth_channel_destroy,
+	demo_synth_channel_open,
+	demo_synth_channel_close,
+	demo_synth_channel_request_process
+};
+
+/** Declaration of synthesizer audio stream methods */
+static apt_bool_t demo_synth_stream_destroy(mpf_audio_stream_t *stream);
+static apt_bool_t demo_synth_stream_open(mpf_audio_stream_t *stream);
+static apt_bool_t demo_synth_stream_close(mpf_audio_stream_t *stream);
+static apt_bool_t demo_synth_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame);
+
+static const mpf_audio_stream_vtable_t audio_stream_vtable = {
+	demo_synth_stream_destroy,
+	demo_synth_stream_open,
+	demo_synth_stream_close,
+	demo_synth_stream_read,
+	NULL,
+	NULL,
+	NULL
+};
+
+/** Declaration of demo synthesizer engine */
+struct demo_synth_engine_t {
+	apt_consumer_task_t    *task;
+};
+
+/** Declaration of demo synthesizer channel */
+struct demo_synth_channel_t {
+	/** Back pointer to engine */
+	demo_synth_engine_t   *demo_engine;
+	/** Engine channel base */
+	mrcp_engine_channel_t *channel;
+
+	/** Active (in-progress) speak request */
+	mrcp_message_t        *speak_request;
+	/** Pending stop response */
+	mrcp_message_t        *stop_response;
+	/** Estimated time to complete */
+	apr_size_t             time_to_complete;
+	/** Is paused */
+	apt_bool_t             paused;
+	/** Speech source (used instead of actual synthesizing) */
+	FILE                  *audio_file;
+};
+
+typedef enum {
+	DEMO_SYNTH_MSG_OPEN_CHANNEL,
+	DEMO_SYNTH_MSG_CLOSE_CHANNEL,
+	DEMO_SYNTH_MSG_REQUEST_PROCESS
+} demo_synth_msg_type_e;
+
+/** Declaration of demo synthesizer task message */
+struct demo_synth_msg_t {
+	demo_synth_msg_type_e  type;
+	mrcp_engine_channel_t *channel; 
+	mrcp_message_t        *request;
+};
+
+
+#define DEMO_SPEECH_SOURCE_FILE "demo.pcm"
+static apt_bool_t demo_synth_msg_signal(demo_synth_msg_type_e type, mrcp_engine_channel_t *channel, mrcp_message_t *request);
+static apt_bool_t demo_synth_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+
+/** Declare this macro to use log routine of the server, plugin is loaded from */
+MRCP_PLUGIN_LOGGER_IMPLEMENT
+
+/** Create demo synthesizer engine */
+MRCP_PLUGIN_DECLARE(mrcp_resource_engine_t*) mrcp_plugin_create(apr_pool_t *pool)
+{
+	/* create demo engine */
+	demo_synth_engine_t *demo_engine = apr_palloc(pool,sizeof(demo_synth_engine_t));
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+
+	/* create task/thread to run demo engine in the context of this task */
+	msg_pool = apt_task_msg_pool_create_dynamic(sizeof(demo_synth_msg_t),pool);
+	demo_engine->task = apt_consumer_task_create(demo_engine,msg_pool,pool);
+	if(!demo_engine->task) {
+		return NULL;
+	}
+	task = apt_consumer_task_base_get(demo_engine->task);
+	apt_task_name_set(task,SYNTH_ENGINE_TASK_NAME);
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->process_msg = demo_synth_msg_process;
+	}
+
+	/* create resource engine base */
+	return mrcp_resource_engine_create(
+					MRCP_SYNTHESIZER_RESOURCE, /* MRCP resource identifier */
+					demo_engine,               /* object to associate */
+					&engine_vtable,            /* virtual methods table of resource engine */
+					pool);                     /* pool to allocate memory from */
+}
+
+/** Destroy synthesizer engine */
+static apt_bool_t demo_synth_engine_destroy(mrcp_resource_engine_t *engine)
+{
+	demo_synth_engine_t *demo_engine = engine->obj;
+	if(demo_engine->task) {
+		apt_task_t *task = apt_consumer_task_base_get(demo_engine->task);
+		apt_task_destroy(task);
+		demo_engine->task = NULL;
+	}
+	return TRUE;
+}
+
+/** Open synthesizer engine */
+static apt_bool_t demo_synth_engine_open(mrcp_resource_engine_t *engine)
+{
+	demo_synth_engine_t *demo_engine = engine->obj;
+	if(demo_engine->task) {
+		apt_task_t *task = apt_consumer_task_base_get(demo_engine->task);
+		apt_task_start(task);
+	}
+	return TRUE;
+}
+
+/** Close synthesizer engine */
+static apt_bool_t demo_synth_engine_close(mrcp_resource_engine_t *engine)
+{
+	demo_synth_engine_t *demo_engine = engine->obj;
+	if(demo_engine->task) {
+		apt_task_t *task = apt_consumer_task_base_get(demo_engine->task);
+		apt_task_terminate(task,TRUE);
+	}
+	return TRUE;
+}
+
+/** Create demo synthesizer channel derived from engine channel base */
+static mrcp_engine_channel_t* demo_synth_engine_channel_create(mrcp_resource_engine_t *engine, apr_pool_t *pool)
+{
+	/* create demo synth channel */
+	demo_synth_channel_t *synth_channel = apr_palloc(pool,sizeof(demo_synth_channel_t));
+	synth_channel->demo_engine = engine->obj;
+	synth_channel->speak_request = NULL;
+	synth_channel->stop_response = NULL;
+	synth_channel->time_to_complete = 0;
+	synth_channel->paused = FALSE;
+	synth_channel->audio_file = NULL;
+	/* create engine channel base */
+	synth_channel->channel = mrcp_engine_source_channel_create(
+			engine,               /* resource engine */
+			&channel_vtable,      /* virtual methods table of engine channel */
+			&audio_stream_vtable, /* virtual methods table of audio stream */
+			synth_channel,        /* object to associate */
+			NULL,                 /* codec descriptor might be NULL by default */
+			pool);                /* pool to allocate memory from */
+	return synth_channel->channel;
+}
+
+/** Destroy engine channel */
+static apt_bool_t demo_synth_channel_destroy(mrcp_engine_channel_t *channel)
+{
+	/* nothing to destroy */
+	return TRUE;
+}
+
+/** Open engine channel (asynchronous response MUST be sent)*/
+static apt_bool_t demo_synth_channel_open(mrcp_engine_channel_t *channel)
+{
+	return demo_synth_msg_signal(DEMO_SYNTH_MSG_OPEN_CHANNEL,channel,NULL);
+}
+
+/** Close engine channel (asynchronous response MUST be sent)*/
+static apt_bool_t demo_synth_channel_close(mrcp_engine_channel_t *channel)
+{
+	return demo_synth_msg_signal(DEMO_SYNTH_MSG_CLOSE_CHANNEL,channel,NULL);
+}
+
+/** Process MRCP channel request (asynchronous response MUST be sent)*/
+static apt_bool_t demo_synth_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *request)
+{
+	return demo_synth_msg_signal(DEMO_SYNTH_MSG_REQUEST_PROCESS,channel,request);
+}
+
+/** Process SPEAK request */
+static apt_bool_t demo_synth_channel_speak(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	char *file_path = NULL;
+	demo_synth_channel_t *synth_channel = channel->method_obj;
+	synth_channel->time_to_complete = 0;
+	if(channel->engine) {
+		file_path = apt_datadir_filepath_get(channel->engine->dir_layout,DEMO_SPEECH_SOURCE_FILE,channel->pool);
+	}
+	if(file_path) {
+		synth_channel->audio_file = fopen(file_path,"rb");
+		if(synth_channel->audio_file) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set [%s] as Speech Source",file_path);
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"No Speech Source [%s] Found",file_path);
+			/* calculate estimated time to complete */
+			if(mrcp_generic_header_property_check(request,GENERIC_HEADER_CONTENT_LENGTH) == TRUE) {
+				mrcp_generic_header_t *generic_header = mrcp_generic_header_get(request);
+				if(generic_header) {
+					synth_channel->time_to_complete = generic_header->content_length * 10; /* 10 msec per character */
+				}
+			}
+		}
+	}
+	
+	response->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	synth_channel->speak_request = request;
+	return TRUE;
+}
+
+/** Process STOP request */
+static apt_bool_t demo_synth_channel_stop(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	demo_synth_channel_t *synth_channel = channel->method_obj;
+	/* store the request, make sure there is no more activity and only then send the response */
+	synth_channel->stop_response = response;
+	return TRUE;
+}
+
+/** Process PAUSE request */
+static apt_bool_t demo_synth_channel_pause(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	demo_synth_channel_t *synth_channel = channel->method_obj;
+	synth_channel->paused = TRUE;
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	return TRUE;
+}
+
+/** Process RESUME request */
+static apt_bool_t demo_synth_channel_resume(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	demo_synth_channel_t *synth_channel = channel->method_obj;
+	synth_channel->paused = FALSE;
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	return TRUE;
+}
+
+/** Process SET-PARAMS request */
+static apt_bool_t demo_synth_channel_set_params(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	mrcp_synth_header_t *req_synth_header;
+	/* get synthesizer header */
+	req_synth_header = mrcp_resource_header_get(request);
+	if(req_synth_header) {
+		/* check voice age header */
+		if(mrcp_resource_header_property_check(request,SYNTHESIZER_HEADER_VOICE_AGE) == TRUE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Voice Age [%d]",req_synth_header->voice_param.age);
+		}
+		/* check voice name header */
+		if(mrcp_resource_header_property_check(request,SYNTHESIZER_HEADER_VOICE_NAME) == TRUE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Voice Name [%s]",req_synth_header->voice_param.name);
+		}
+	}
+	
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	return TRUE;
+}
+
+/** Process GET-PARAMS request */
+static apt_bool_t demo_synth_channel_get_params(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	mrcp_synth_header_t *req_synth_header;
+	/* get synthesizer header */
+	req_synth_header = mrcp_resource_header_get(request);
+	if(req_synth_header) {
+		mrcp_synth_header_t *res_synth_header = mrcp_resource_header_prepare(response);
+		/* check voice age header */
+		if(mrcp_resource_header_property_check(request,SYNTHESIZER_HEADER_VOICE_AGE) == TRUE) {
+			res_synth_header->voice_param.age = 25;
+			mrcp_resource_header_property_add(response,SYNTHESIZER_HEADER_VOICE_AGE);
+		}
+		/* check voice name header */
+		if(mrcp_resource_header_property_check(request,SYNTHESIZER_HEADER_VOICE_NAME) == TRUE) {
+			apt_string_set(&res_synth_header->voice_param.name,"David");
+			mrcp_resource_header_property_add(response,SYNTHESIZER_HEADER_VOICE_NAME);
+		}
+	}
+
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	return TRUE;
+}
+
+/** Dispatch MRCP request */
+static apt_bool_t demo_synth_channel_request_dispatch(mrcp_engine_channel_t *channel, mrcp_message_t *request)
+{
+	apt_bool_t processed = FALSE;
+	mrcp_message_t *response = mrcp_response_create(request,request->pool);
+	switch(request->start_line.method_id) {
+		case SYNTHESIZER_SET_PARAMS:
+			processed = demo_synth_channel_set_params(channel,request,response);
+			break;
+		case SYNTHESIZER_GET_PARAMS:
+			processed = demo_synth_channel_get_params(channel,request,response);
+			break;
+		case SYNTHESIZER_SPEAK:
+			processed = demo_synth_channel_speak(channel,request,response);
+			break;
+		case SYNTHESIZER_STOP:
+			processed = demo_synth_channel_stop(channel,request,response);
+			break;
+		case SYNTHESIZER_PAUSE:
+			processed = demo_synth_channel_pause(channel,request,response);
+			break;
+		case SYNTHESIZER_RESUME:
+			processed = demo_synth_channel_resume(channel,request,response);
+			break;
+		case SYNTHESIZER_BARGE_IN_OCCURRED:
+			processed = demo_synth_channel_stop(channel,request,response);
+			break;
+		case SYNTHESIZER_CONTROL:
+			break;
+		case SYNTHESIZER_DEFINE_LEXICON:
+			break;
+		default:
+			break;
+	}
+	if(processed == FALSE) {
+		/* send asynchronous response for not handled request */
+		mrcp_engine_channel_message_send(channel,response);
+	}
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to destroy any additional data associated with audio stream */
+static apt_bool_t demo_synth_stream_destroy(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform any action before open */
+static apt_bool_t demo_synth_stream_open(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform any action after close */
+static apt_bool_t demo_synth_stream_close(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to read/get new frame */
+static apt_bool_t demo_synth_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame)
+{
+	demo_synth_channel_t *synth_channel = stream->obj;
+	/* check if STOP was requested */
+	if(synth_channel->stop_response) {
+		/* send asynchronous response to STOP request */
+		mrcp_engine_channel_message_send(synth_channel->channel,synth_channel->stop_response);
+		synth_channel->stop_response = NULL;
+		synth_channel->speak_request = NULL;
+		synth_channel->paused = FALSE;
+		if(synth_channel->audio_file) {
+			fclose(synth_channel->audio_file);
+			synth_channel->audio_file = NULL;
+		}
+		return TRUE;
+	}
+
+	/* check if there is active SPEAK request and it isn't in paused state */
+	if(synth_channel->speak_request && synth_channel->paused == FALSE) {
+		/* normal processing */
+		apt_bool_t completed = FALSE;
+		if(synth_channel->audio_file) {
+			/* read speech from file */
+			apr_size_t size = frame->codec_frame.size;
+			if(fread(frame->codec_frame.buffer,1,size,synth_channel->audio_file) == size) {
+				frame->type |= MEDIA_FRAME_TYPE_AUDIO;
+			}
+			else {
+				completed = TRUE;
+			}
+		}
+		else {
+			/* fill with silence in case no file available */
+			if(synth_channel->time_to_complete >= CODEC_FRAME_TIME_BASE) {
+				memset(frame->codec_frame.buffer,0,frame->codec_frame.size);
+				frame->type |= MEDIA_FRAME_TYPE_AUDIO;
+				synth_channel->time_to_complete -= CODEC_FRAME_TIME_BASE;
+			}
+			else {
+				completed = TRUE;
+			}
+		}
+		
+		if(completed) {
+			/* raise SPEAK-COMPLETE event */
+			mrcp_message_t *message = mrcp_event_create(
+								synth_channel->speak_request,
+								SYNTHESIZER_SPEAK_COMPLETE,
+								synth_channel->speak_request->pool);
+			if(message) {
+				/* get/allocate synthesizer header */
+				mrcp_synth_header_t *synth_header = mrcp_resource_header_prepare(message);
+				if(synth_header) {
+					/* set completion cause */
+					synth_header->completion_cause = SYNTHESIZER_COMPLETION_CAUSE_NORMAL;
+					mrcp_resource_header_property_add(message,SYNTHESIZER_HEADER_COMPLETION_CAUSE);
+				}
+				/* set request state */
+				message->start_line.request_state = MRCP_REQUEST_STATE_COMPLETE;
+
+				synth_channel->speak_request = NULL;
+				if(synth_channel->audio_file) {
+					fclose(synth_channel->audio_file);
+					synth_channel->audio_file = NULL;
+				}
+				/* send asynch event */
+				mrcp_engine_channel_message_send(synth_channel->channel,message);
+			}
+		}
+	}
+	return TRUE;
+}
+
+static apt_bool_t demo_synth_msg_signal(demo_synth_msg_type_e type, mrcp_engine_channel_t *channel, mrcp_message_t *request)
+{
+	apt_bool_t status = FALSE;
+	demo_synth_channel_t *demo_channel = channel->method_obj;
+	demo_synth_engine_t *demo_engine = demo_channel->demo_engine;
+	apt_task_t *task = apt_consumer_task_base_get(demo_engine->task);
+	apt_task_msg_t *msg = apt_task_msg_get(task);
+	if(msg) {
+		demo_synth_msg_t *demo_msg;
+		msg->type = TASK_MSG_USER;
+		demo_msg = (demo_synth_msg_t*) msg->data;
+
+		demo_msg->type = type;
+		demo_msg->channel = channel;
+		demo_msg->request = request;
+		status = apt_task_msg_signal(task,msg);
+	}
+	return status;
+}
+
+static apt_bool_t demo_synth_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	demo_synth_msg_t *demo_msg = (demo_synth_msg_t*)msg->data;
+	switch(demo_msg->type) {
+		case DEMO_SYNTH_MSG_OPEN_CHANNEL:
+			/* open channel and send asynch response */
+			mrcp_engine_channel_open_respond(demo_msg->channel,TRUE);
+			break;
+		case DEMO_SYNTH_MSG_CLOSE_CHANNEL:
+			/* close channel, make sure there is no activity and send asynch response */
+			mrcp_engine_channel_close_respond(demo_msg->channel);
+			break;
+		case DEMO_SYNTH_MSG_REQUEST_PROCESS:
+			demo_synth_channel_request_dispatch(demo_msg->channel,demo_msg->request);
+			break;
+		default:
+			break;
+	}
+	return TRUE;
+}

Added: freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,17 @@
+MAINTAINERCLEANFILES 	   = Makefile.in
+
+INCLUDES                   = -Iinclude \
+                             -I$(top_srcdir)/libs/mrcp-engine/include \
+                             -I$(top_srcdir)/libs/mrcp/include \
+                             -I$(top_srcdir)/libs/mrcp/message/include \
+                             -I$(top_srcdir)/libs/mrcp/control/include \
+                             -I$(top_srcdir)/libs/mrcp/resources/include \
+                             -I$(top_srcdir)/libs/mpf/include \
+                             -I$(top_srcdir)/libs/apr-toolkit/include \
+                             $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) $(UNIMRCP_SWIFT_INCLUDES)
+
+plugin_LTLIBRARIES         = mrcpcepstral.la
+
+mrcpcepstral_la_SOURCES    = src/mrcp_swift.c
+mrcpcepstral_la_LDFLAGS    = -module $(PLUGIN_LT_VERSION) $(UNIMRCP_SWIFT_LDFLAGS)
+mrcpcepstral_la_LIBADD     = $(UNIMRCP_SWIFT_LIBS) 

Added: freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,165 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/src/mrcp_swift.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/src/mrcp_swift.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,701 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Some mandatory rules concerning plugin implementation.
+ * 1. Each plugin MUST contain the following function as an entry point of the plugin
+ *        MRCP_PLUGIN_DECLARE(mrcp_resource_engine_t*) mrcp_plugin_create(apr_pool_t *pool)
+ * 2. One and only one response MUST be sent back to the received request.
+ * 3. Methods (callbacks) of the MRCP engine channel MUST not block.
+ *   (asynch response can be sent from the context of other thread)
+ * 4. Methods (callbacks) of the MPF engine stream MUST not block.
+ */
+
+#include 
+#include "mrcp_resource_engine.h"
+#include "mrcp_synth_resource.h"
+#include "mrcp_synth_header.h"
+#include "mrcp_generic_header.h"
+#include "mrcp_message.h"
+#include "mpf_buffer.h"
+#include "apt_log.h"
+
+/** Declaration of synthesizer engine methods */
+static apt_bool_t mrcp_swift_engine_destroy(mrcp_resource_engine_t *engine);
+static apt_bool_t mrcp_swift_engine_open(mrcp_resource_engine_t *engine);
+static apt_bool_t mrcp_swift_engine_close(mrcp_resource_engine_t *engine);
+static mrcp_engine_channel_t* mrcp_swift_engine_channel_create(mrcp_resource_engine_t *engine, apr_pool_t *pool);
+
+static const struct mrcp_engine_method_vtable_t engine_vtable = {
+	mrcp_swift_engine_destroy,
+	mrcp_swift_engine_open,
+	mrcp_swift_engine_close,
+	mrcp_swift_engine_channel_create
+};
+
+
+/** Declaration of synthesizer channel methods */
+static apt_bool_t mrcp_swift_channel_destroy(mrcp_engine_channel_t *channel);
+static apt_bool_t mrcp_swift_channel_open(mrcp_engine_channel_t *channel);
+static apt_bool_t mrcp_swift_channel_close(mrcp_engine_channel_t *channel);
+static apt_bool_t mrcp_swift_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *request);
+
+static const struct mrcp_engine_channel_method_vtable_t channel_vtable = {
+	mrcp_swift_channel_destroy,
+	mrcp_swift_channel_open,
+	mrcp_swift_channel_close,
+	mrcp_swift_channel_request_process
+};
+
+/** Declaration of synthesizer audio stream methods */
+static apt_bool_t synth_stream_destroy(mpf_audio_stream_t *stream);
+static apt_bool_t synth_stream_open(mpf_audio_stream_t *stream);
+static apt_bool_t synth_stream_close(mpf_audio_stream_t *stream);
+static apt_bool_t synth_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame);
+
+static const mpf_audio_stream_vtable_t audio_stream_vtable = {
+	synth_stream_destroy,
+	synth_stream_open,
+	synth_stream_close,
+	synth_stream_read,
+	NULL,
+	NULL,
+	NULL
+};
+
+typedef struct mrcp_swift_channel_t mrcp_swift_channel_t;
+/** Declaration of Swift synthesizer channel */
+struct mrcp_swift_channel_t {
+	/** Swift port */
+	swift_port            *port;
+	swift_background_t     tts_stream;
+
+	/** Audio buffer */
+	mpf_buffer_t          *audio_buffer;
+
+	/** Engine channel base */
+	mrcp_engine_channel_t *channel;
+
+	/** Active (in-progress) speak request */
+	mrcp_message_t        *speak_request;
+	/** Pending stop response */
+	mrcp_message_t        *stop_response;
+	/** Is paused */
+	apt_bool_t             paused;
+};
+
+/** Table of prosody volumes for Swift engine */
+static const int swift_prosody_volume_table[PROSODY_VOLUME_COUNT] = {
+	25,  /* PROSODY_VOLUME_SILENT */
+	50,  /* PROSODY_VOLUME_XSOFT */
+	75,  /* PROSODY_VOLUME_SOFT */
+	100, /* PROSODY_VOLUME_MEDIUM */
+	125, /* PROSODY_VOLUME_LOUD */
+	150, /* PROSODY_VOLUME_XLOUD */
+	100  /* PROSODY_VOLUME_DEFAULT */
+};
+
+/** Table of prosody rates for Swift engine */
+static const int swift_prosody_rate_table[PROSODY_RATE_COUNT] = {
+	85,  /* PROSODY_RATE_XSLOW */
+	113, /* PROSODY_RATE_SLOW */
+	170, /* PROSODY_RATE_MEDIUM */
+	225, /* PROSODY_RATE_FAST */
+	340, /* PROSODY_RATE_XFAST */
+	170  /* PROSODY_RATE_DEFAULT */
+};
+
+static apr_table_t *swift_speech_language_table;
+
+static apr_table_t* mrcp_swift_language_table_create(apr_pool_t *pool);
+static void mrcp_swift_voices_show(swift_engine *engine);
+static swift_result_t mrcp_swift_write_audio(swift_event *event, swift_event_t type, void *udata);
+static apt_bool_t mrcp_swift_channel_voice_set(mrcp_swift_channel_t *synth_channel, mrcp_message_t *message);
+static apt_bool_t mrcp_swift_channel_params_set(mrcp_swift_channel_t *synth_channel, mrcp_message_t *message);
+
+/** Declare this macro to use log routine of the server, plugin is loaded from */
+MRCP_PLUGIN_LOGGER_IMPLEMENT
+
+/** Create Swift synthesizer engine */
+MRCP_PLUGIN_DECLARE(mrcp_resource_engine_t*) mrcp_plugin_create(apr_pool_t *pool)
+{
+	swift_engine *synth_engine;
+	mrcp_resource_engine_t *engine;
+	/* open swift engine */
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Swift Engine [%s]",swift_version);
+	if((synth_engine = swift_engine_open(NULL)) ==  NULL) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Swift Engine");
+		return NULL;
+	}
+	swift_speech_language_table = mrcp_swift_language_table_create(pool);
+	mrcp_swift_voices_show(synth_engine);
+
+	/* create resource engine base */
+	engine = mrcp_resource_engine_create(
+					MRCP_SYNTHESIZER_RESOURCE, /* MRCP resource identifier */
+					synth_engine,              /* object to associate */
+					&engine_vtable,            /* virtual methods table of resource engine */
+					pool);                     /* pool to allocate memory from */
+	if(!engine) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Resource Engine");
+		swift_engine_close(synth_engine);
+	}
+	return engine;
+}
+
+/** Destroy synthesizer engine */
+static apt_bool_t mrcp_swift_engine_destroy(mrcp_resource_engine_t *engine)
+{
+	swift_engine *synth_engine = engine->obj;
+	/* close swift engine */
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Close Swift Engine");
+	if(synth_engine) {
+		swift_engine_close(synth_engine);
+		engine->obj = NULL;
+	}
+	return TRUE;
+}
+
+/** Open synthesizer engine */
+static apt_bool_t mrcp_swift_engine_open(mrcp_resource_engine_t *engine)
+{
+	return TRUE;
+}
+
+/** Close synthesizer engine */
+static apt_bool_t mrcp_swift_engine_close(mrcp_resource_engine_t *engine)
+{
+	return TRUE;
+}
+
+/** Create demo synthesizer channel derived from engine channel base */
+static mrcp_engine_channel_t* mrcp_swift_engine_channel_create(mrcp_resource_engine_t *engine, apr_pool_t *pool)
+{
+	swift_engine *synth_engine = engine->obj;
+	mrcp_swift_channel_t *synth_channel;
+	mrcp_engine_channel_t *channel;
+	swift_params *params;
+	swift_port *port;
+	mpf_codec_descriptor_t *codec_descriptor;
+
+	codec_descriptor = apr_palloc(pool,sizeof(mpf_codec_descriptor_t));
+	mpf_codec_descriptor_init(codec_descriptor);
+	codec_descriptor->channel_count = 1;
+	codec_descriptor->payload_type = 96;
+	apt_string_set(&codec_descriptor->name,"L16");
+	codec_descriptor->sampling_rate = 8000;
+
+	params = swift_params_new(NULL);
+	swift_params_set_string(params, "audio/encoding", "pcm16");
+	swift_params_set_int(params, "audio/sampling-rate", codec_descriptor->sampling_rate);
+	/* open swift port */ 
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Swift Port");
+	if((port = swift_port_open(synth_engine,params)) == NULL) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Swift Port");
+		return NULL;
+	}
+
+	/* create swift synth channel */
+	synth_channel = apr_palloc(pool,sizeof(mrcp_swift_channel_t));
+	synth_channel->speak_request = NULL;
+	synth_channel->stop_response = NULL;
+	synth_channel->paused = FALSE;
+	synth_channel->channel = NULL;
+	synth_channel->port = port;
+	synth_channel->tts_stream = 0;
+	/* create engine channel base */
+	channel = mrcp_engine_source_channel_create(
+			engine,               /* resource engine */
+			&channel_vtable,      /* virtual methods table of engine channel */
+			&audio_stream_vtable, /* virtual methods table of audio stream */
+			synth_channel,        /* object to associate */
+			codec_descriptor,     /* codec descriptor might be NULL by default */
+			pool);                /* pool to allocate memory from */
+
+	if(!channel) {
+		swift_port_close(port);
+		synth_channel->port = NULL;
+		return NULL;
+	}
+
+	synth_channel->audio_buffer = mpf_buffer_create(pool);
+
+	/* set swift_write_audio as a callback, with the output file as its param */
+	swift_port_set_callback(port, &mrcp_swift_write_audio, SWIFT_EVENT_AUDIO | SWIFT_EVENT_END, synth_channel);
+	synth_channel->channel = channel;
+	return channel;
+}
+
+/** Destroy engine channel */
+static apt_bool_t mrcp_swift_channel_destroy(mrcp_engine_channel_t *channel)
+{
+	mrcp_swift_channel_t *synth_channel = channel->method_obj;
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Close Swift Port");
+	if(synth_channel->port) {
+		/* close swift port */ 
+		swift_port_close(synth_channel->port);
+		synth_channel->port = NULL;
+	}
+	return TRUE;
+}
+
+/** Open engine channel (asynchronous response MUST be sent)*/
+static apt_bool_t mrcp_swift_channel_open(mrcp_engine_channel_t *channel)
+{
+	/* open channel and send asynch response */
+	return mrcp_engine_channel_open_respond(channel,TRUE);
+}
+
+/** Close engine channel (asynchronous response MUST be sent)*/
+static apt_bool_t mrcp_swift_channel_close(mrcp_engine_channel_t *channel)
+{
+	/* close channel, make sure there is no activity and send asynch response */
+	return mrcp_engine_channel_close_respond(channel);
+}
+
+/** Process SPEAK request */
+static apt_bool_t mrcp_swift_channel_speak(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	mrcp_swift_channel_t *synth_channel = channel->method_obj;
+
+	/* set voice */
+	mrcp_swift_channel_voice_set(synth_channel,request);
+	/* set params */
+	mrcp_swift_channel_params_set(synth_channel,request);
+	/* (re)start audio buffer */
+	mpf_buffer_restart(synth_channel->audio_buffer);
+	response->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
+	/* start to synthesize */
+	if(swift_port_speak_text(synth_channel->port,request->body.buf,0,NULL,&synth_channel->tts_stream,NULL) != SWIFT_SUCCESS) {
+		response->start_line.request_state = MRCP_REQUEST_STATE_COMPLETE;
+		response->start_line.status_code = MRCP_STATUS_CODE_METHOD_FAILED;
+	}
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	synth_channel->speak_request = request;
+	return TRUE;
+}
+
+/** Process STOP request */
+static apt_bool_t mrcp_swift_channel_stop(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	mrcp_swift_channel_t *synth_channel = channel->method_obj;
+	/* store the request, make sure there is no more activity and only then send the response */
+	swift_port_stop(synth_channel->port,synth_channel->tts_stream,SWIFT_EVENT_NOW);
+	synth_channel->stop_response = response;
+	return TRUE;
+}
+
+/** Process PAUSE request */
+static apt_bool_t mrcp_swift_channel_pause(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	mrcp_swift_channel_t *synth_channel = channel->method_obj;
+	synth_channel->paused = TRUE;
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	return TRUE;
+}
+
+/** Process RESUME request */
+static apt_bool_t mrcp_swift_channel_resume(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	mrcp_swift_channel_t *synth_channel = channel->method_obj;
+	synth_channel->paused = FALSE;
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	return TRUE;
+}
+
+/** Process CONTROL request */
+static apt_bool_t mrcp_swift_channel_control(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
+{
+	mrcp_swift_channel_t *synth_channel = channel->method_obj;
+	/* set params */
+	mrcp_swift_channel_params_set(synth_channel,request);
+	/* send asynchronous response */
+	mrcp_engine_channel_message_send(channel,response);
+	return TRUE;
+}
+
+/** Process MRCP channel request (asynchronous response MUST be sent)*/
+static apt_bool_t mrcp_swift_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *request)
+{
+	apt_bool_t processed = FALSE;
+	mrcp_message_t *response = mrcp_response_create(request,request->pool);
+	switch(request->start_line.method_id) {
+		case SYNTHESIZER_SET_PARAMS:
+			break;
+		case SYNTHESIZER_GET_PARAMS:
+			break;
+		case SYNTHESIZER_SPEAK:
+			processed = mrcp_swift_channel_speak(channel,request,response);
+			break;
+		case SYNTHESIZER_STOP:
+			processed = mrcp_swift_channel_stop(channel,request,response);
+			break;
+		case SYNTHESIZER_PAUSE:
+			processed = mrcp_swift_channel_pause(channel,request,response);
+			break;
+		case SYNTHESIZER_RESUME:
+			processed = mrcp_swift_channel_resume(channel,request,response);
+			break;
+		case SYNTHESIZER_BARGE_IN_OCCURRED:
+			processed = mrcp_swift_channel_stop(channel,request,response);
+			break;
+		case SYNTHESIZER_CONTROL:
+			processed = mrcp_swift_channel_control(channel,request,response);
+			break;
+		case SYNTHESIZER_DEFINE_LEXICON:
+			break;
+		default:
+			break;
+	}
+	if(processed == FALSE) {
+		/* send asynchronous response for not handled request */
+		mrcp_engine_channel_message_send(channel,response);
+	}
+	return TRUE;
+}
+
+
+
+/** Callback is called from MPF engine context to destroy any additional data associated with audio stream */
+static apt_bool_t synth_stream_destroy(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform any action before open */
+static apt_bool_t synth_stream_open(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Callback is called from MPF engine context to perform any action after close */
+static apt_bool_t synth_stream_close(mpf_audio_stream_t *stream)
+{
+	return TRUE;
+}
+
+/** Raise SPEAK-COMPLETE event */
+static apt_bool_t synth_speak_complete_raise(mrcp_swift_channel_t *synth_channel)
+{
+	mrcp_message_t *message;
+	mrcp_synth_header_t *synth_header;
+	if(!synth_channel->speak_request) {
+		return FALSE;
+	}
+	message = mrcp_event_create(
+						synth_channel->speak_request,
+						SYNTHESIZER_SPEAK_COMPLETE,
+						synth_channel->speak_request->pool);
+	if(!message) {
+		return FALSE;
+	}
+	
+	/* get/allocate synthesizer header */
+	synth_header = mrcp_resource_header_prepare(message);
+	if(synth_header) {
+		/* set completion cause */
+		synth_header->completion_cause = SYNTHESIZER_COMPLETION_CAUSE_NORMAL;
+		mrcp_resource_header_property_add(message,SYNTHESIZER_HEADER_COMPLETION_CAUSE);
+	}
+	/* set request state */
+	message->start_line.request_state = MRCP_REQUEST_STATE_COMPLETE;
+
+	synth_channel->speak_request = NULL;
+	/* send asynch event */
+	return mrcp_engine_channel_message_send(synth_channel->channel,message);
+}
+
+/** Callback is called from MPF engine context to read/get new frame */
+static apt_bool_t synth_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame)
+{
+	mrcp_swift_channel_t *synth_channel = stream->obj;
+	/* check if STOP was requested */
+	if(synth_channel->stop_response) {
+		/* send asynchronous response to STOP request */
+		mrcp_engine_channel_message_send(synth_channel->channel,synth_channel->stop_response);
+		synth_channel->stop_response = NULL;
+		synth_channel->speak_request = NULL;
+		synth_channel->paused = FALSE;
+		return TRUE;
+	}
+
+	/* check if there is active SPEAK request and it isn't in paused state */
+	if(synth_channel->speak_request && synth_channel->paused == FALSE) {
+		/* normal processing */
+		mpf_buffer_frame_read(synth_channel->audio_buffer,frame);
+		
+		if((frame->type & MEDIA_FRAME_TYPE_EVENT) == MEDIA_FRAME_TYPE_EVENT) {
+			synth_speak_complete_raise(synth_channel);
+		}
+	}
+	return TRUE;
+}
+
+/** Swift engine callback */
+static swift_result_t mrcp_swift_write_audio(swift_event *event, swift_event_t type, void *udata)
+{
+	void *buf;
+	int len;
+	mrcp_swift_channel_t *synth_channel = udata;
+	swift_event_t rv = SWIFT_SUCCESS;
+
+	if(type & SWIFT_EVENT_END) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Swift Engine: Write End-of-Speech Event");
+		mpf_buffer_event_write(synth_channel->audio_buffer,MEDIA_FRAME_TYPE_EVENT);
+		return rv;
+	}
+
+	rv = swift_event_get_audio(event, &buf, &len);
+	if(!SWIFT_FAILED(rv)) {
+#if 0
+		/* Get the event times */
+		float time_start, time_len; 
+		swift_event_get_times(event, &time_start, &time_len);
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Swift Engine: Write Audio [%d | %0.4f | %0.4f]",len, time_start, time_len);
+#endif
+		mpf_buffer_audio_write(synth_channel->audio_buffer,buf,len);
+	}
+
+	return rv;
+}
+
+/** Add delimiter (&) to search criteria */
+static APR_INLINE int search_criteria_delimiter_add(char *search_criteria, int size, apt_bool_t initial)
+{
+	if(initial == FALSE && size >= 3) {
+		search_criteria[0] = ' ';
+		search_criteria[1] = '&';
+		search_criteria[2] = ' ';
+		return 3;
+	}
+	return 0;
+}
+
+/** Set voice matching specified criteria */
+static apt_bool_t mrcp_swift_channel_voice_set(mrcp_swift_channel_t *synth_channel, mrcp_message_t *message)
+{
+	mrcp_synth_header_t *synth_header = mrcp_resource_header_get(message);
+	char search_criteria[1024];
+	int offset = 0;
+	swift_voice *voice;
+	swift_result_t res;
+
+	if(!synth_header) {
+		/* no params to set */
+		return TRUE;
+	}
+
+	if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_VOICE_NAME) == TRUE) {
+		offset += search_criteria_delimiter_add(search_criteria+offset,sizeof(search_criteria)-offset,(offset == 0));
+		offset += apr_snprintf(search_criteria+offset,sizeof(search_criteria)-offset,"speaker/name=%s",synth_header->voice_param.name.buf);
+	}
+	if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_VOICE_GENDER) == TRUE) {
+		switch(synth_header->voice_param.gender) {
+			case VOICE_GENDER_MALE:
+				offset += search_criteria_delimiter_add(search_criteria+offset,sizeof(search_criteria)-offset,offset == 0);
+				offset += apr_snprintf(search_criteria+offset,sizeof(search_criteria)-offset,"speaker/gender=male");
+				break;
+			case VOICE_GENDER_FEMALE:
+				offset += search_criteria_delimiter_add(search_criteria+offset,sizeof(search_criteria)-offset,offset == 0);
+				offset += apr_snprintf(search_criteria+offset,sizeof(search_criteria)-offset,"speaker/gender=female");
+				break;
+			default:
+				break;
+		}
+	}
+	if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_VOICE_AGE) == TRUE) {
+		offset += search_criteria_delimiter_add(search_criteria+offset,sizeof(search_criteria)-offset,offset == 0);
+		offset += apr_snprintf(search_criteria+offset,sizeof(search_criteria)-offset,"speaker/age=%d",synth_header->voice_param.age);
+	}
+	if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_SPEECH_LANGUAGE) == TRUE) {
+		const char *swift_lang_name = NULL;
+		if(swift_speech_language_table) {
+			swift_lang_name = apr_table_get(swift_speech_language_table,synth_header->speech_language.buf);
+		}
+		if(!swift_lang_name) {
+			swift_lang_name = synth_header->speech_language.buf;
+		}
+		offset += search_criteria_delimiter_add(search_criteria+offset,sizeof(search_criteria)-offset,offset == 0);
+		offset += apr_snprintf(search_criteria+offset,sizeof(search_criteria)-offset,"language/name=%s",swift_lang_name);
+	}
+
+	if(offset > 0) {
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Find Voices Matching the Criteria [%s]",search_criteria);
+		if((voice = swift_port_find_first_voice(synth_channel->port,search_criteria,NULL)) == NULL) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"No Swift Voice Available Matching the Criteria [%s]",search_criteria);
+			voice = swift_port_find_first_voice(synth_channel->port,NULL,NULL);
+		}
+		if(SWIFT_FAILED(res = swift_port_set_voice(synth_channel->port,voice)) ) {
+			const char *error_string = swift_strerror(res);
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,error_string);
+			return FALSE;
+		} 
+	}
+	return TRUE;
+}
+
+apt_bool_t swift_prosody_volume_get(const mrcp_prosody_volume_t *prosody_volume, int *volume)
+{
+	apt_bool_t res = FALSE;
+	if(prosody_volume->type == PROSODY_VOLUME_TYPE_LABEL) {
+		if(prosody_volume->value.label < PROSODY_VOLUME_COUNT) {
+			*volume = swift_prosody_volume_table[prosody_volume->value.label];
+			res = TRUE;
+		}
+	}
+	else if(prosody_volume->type == PROSODY_VOLUME_TYPE_NUMERIC) {
+		*volume = (int)prosody_volume->value.numeric;
+		res = TRUE;
+	}
+	else if(prosody_volume->type == PROSODY_VOLUME_TYPE_RELATIVE_CHANGE) {
+		int def = swift_prosody_volume_table[PROSODY_VOLUME_DEFAULT];
+		*volume = (int)(prosody_volume->value.relative * def);
+		res = TRUE;
+	}
+	return res;
+}
+
+apt_bool_t swift_prosody_rate_get(const mrcp_prosody_rate_t *prosody_rate, int *rate)
+{
+	apt_bool_t res = FALSE;
+	if(prosody_rate->type == PROSODY_RATE_TYPE_LABEL) {
+		if(prosody_rate->value.label < PROSODY_RATE_COUNT) {
+			*rate = swift_prosody_rate_table[prosody_rate->value.label];
+			res = TRUE;
+		}
+	}
+	else if(prosody_rate->type == PROSODY_RATE_TYPE_RELATIVE_CHANGE) {
+		int def = swift_prosody_rate_table[PROSODY_RATE_DEFAULT];
+		*rate = (int)(prosody_rate->value.relative * def);
+		res = TRUE;
+	}
+	return res;
+}
+
+
+/** Set Swift port param */
+static apt_bool_t mrcp_swift_channel_param_set(mrcp_swift_channel_t *synth_channel, const char *name, swift_val *val)
+{
+	swift_result_t res;
+	if(SWIFT_FAILED(res = swift_port_set_param(synth_channel->port,name,val,synth_channel->tts_stream)) ) {
+		const char *error_string = swift_strerror(res);
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Swift Param %s: %s",name,error_string);
+		return FALSE;
+	}
+	return TRUE;
+}
+
+/** Set Swift port params */
+static apt_bool_t mrcp_swift_channel_params_set(mrcp_swift_channel_t *synth_channel, mrcp_message_t *message)
+{
+	const char *name;
+	mrcp_synth_header_t *synth_header = mrcp_resource_header_get(message);
+	mrcp_generic_header_t *generic_header = mrcp_generic_header_get(message);
+
+	if(synth_header) {
+		if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_PROSODY_VOLUME) == TRUE) {
+			int volume = 0;
+			if(swift_prosody_volume_get(&synth_header->prosody_param.volume,&volume) == TRUE) {
+				name = "audio/volume";
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Swift Param %s=%d",name,volume);
+				mrcp_swift_channel_param_set(synth_channel,name,swift_val_int(volume));
+			}
+		}
+		if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_PROSODY_RATE) == TRUE) {
+			int rate = 0;
+			if(swift_prosody_rate_get(&synth_header->prosody_param.rate,&rate) == TRUE) {
+				name = "speech/rate";
+				apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Swift Param %s=%d",name,rate);
+				mrcp_swift_channel_param_set(synth_channel,name,swift_val_int(rate));
+			}
+		}
+	}
+
+	if(generic_header) {
+		if(mrcp_generic_header_property_check(message,GENERIC_HEADER_CONTENT_TYPE) == TRUE) {
+			name = "tts/content-type";
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Swift Param %s=%s",name,generic_header->content_type);
+			mrcp_swift_channel_param_set(synth_channel,name,swift_val_string(generic_header->content_type.buf));
+		}
+		if(mrcp_generic_header_property_check(message,GENERIC_HEADER_CONTENT_ENCODING) == TRUE) {
+			name = "tts/text-encoding";
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Swift Param %s=%s",name,generic_header->content_encoding);
+			mrcp_swift_channel_param_set(synth_channel,name,swift_val_string(generic_header->content_encoding.buf));
+		}
+	}
+	
+	return TRUE;
+}
+
+/** Show Swift available voices */
+static void mrcp_swift_voices_show(swift_engine *engine) 
+{
+	swift_port *port;
+	swift_voice *voice;
+	const char *license_status;
+
+	/* open swift port*/
+	if((port = swift_port_open(engine, NULL)) == NULL) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Swift Port");
+		return;    
+	}
+
+	/* find the first voice on the system */
+	if((voice = swift_port_find_first_voice(port, NULL, NULL)) == NULL) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"No Swift Voice Available");
+		swift_port_close(port);
+		return;
+	}
+	/* go through all of the voices on the system and print some info about each */
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Swift Available Voices:");
+	for(; voice; voice = swift_port_find_next_voice(port)) {
+		if(swift_voice_get_attribute(voice, "license/key")) {
+			license_status = "licensed";
+		}
+		else {
+			license_status = "unlicensed";
+		}
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"%s: %s, age %s, %s, %sHz, %s",
+			swift_voice_get_attribute(voice, "name"),
+			swift_voice_get_attribute(voice, "speaker/gender"),
+			swift_voice_get_attribute(voice, "speaker/age"),
+			swift_voice_get_attribute(voice, "language/name"),
+			swift_voice_get_attribute(voice, "sample-rate"),
+			license_status);
+	}
+
+	swift_port_close(port);
+}
+
+/** Create speech language lookup table */
+static apr_table_t* mrcp_swift_language_table_create(apr_pool_t *pool)
+{
+	apr_table_t *table = apr_table_make(pool,1);
+	if(!table) {
+		return NULL;
+	}
+
+	apr_table_setn(table,"en-US","US English");
+	apr_table_setn(table,"en-UK","UK English");
+	apr_table_setn(table,"fr-CA","Canadian French");
+	apr_table_setn(table,"es-MX","Americas Spanish");
+	apr_table_setn(table,"de-DE","German");
+	apr_table_setn(table,"it-IT","Italian");
+	return table;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES   = Makefile.in
+
+SUBDIRS                = apttest mpftest mrcptest rtsptest strtablegen

Added: freeswitch/trunk/libs/unimrcp/tests/apttest/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,11 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INCLUDES             = -I$(top_srcdir)/libs/apr-toolkit/include \
+                       $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_PROGRAMS      = apttest
+apttest_LDADD        = $(top_builddir)/libs/apr-toolkit/libaprtoolkit.la \
+                       $(UNIMRCP_APR_LIBS) $(UNIMRCP_APU_LIBS)
+apttest_SOURCES      = src/main.c \
+                       src/task_suite.c \
+                       src/consumer_task_suite.c

Added: freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,171 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/tests/apttest/src/consumer_task_suite.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/src/consumer_task_suite.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_test_suite.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+typedef struct {
+	apr_time_t timestamp;
+	int        number;
+} sample_msg_data_t;
+
+static void task_on_start_complete(apt_task_t *task)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"On Task Start");
+}
+
+static void task_on_terminate_complete(apt_task_t *task)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"On Task Terminate");
+}
+
+static apt_bool_t task_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	sample_msg_data_t *data = (sample_msg_data_t*)msg->data;
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process Message [%d]",data->number);
+	return TRUE;
+}
+
+
+static apt_bool_t consumer_task_test_run(apt_test_suite_t *suite, int argc, const char * const *argv)
+{
+	apt_consumer_task_t *consumer_task;
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+	apt_task_msg_t *msg;
+	sample_msg_data_t *data;
+	int i;
+	
+	msg_pool = apt_task_msg_pool_create_dynamic(sizeof(sample_msg_data_t),suite->pool);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create Consumer Task");
+	consumer_task = apt_consumer_task_create(NULL,msg_pool,suite->pool);
+	if(!consumer_task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Consumer Task");
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(consumer_task);
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->process_msg = task_msg_process;
+		vtable->on_start_complete = task_on_start_complete;
+		vtable->on_terminate_complete = task_on_terminate_complete;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Start Task");
+	if(apt_task_start(task) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start Task");
+		apt_task_destroy(task);
+		return FALSE;
+	}
+
+	for(i=0; i<10; i++) {
+		msg = apt_task_msg_acquire(msg_pool);
+		msg->type = TASK_MSG_USER;
+		data = (sample_msg_data_t*) msg->data;
+
+		data->number = i;
+		data->timestamp = apr_time_now();
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Signal Message [%d]",data->number);
+		apt_task_msg_signal(task,msg);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Terminate Task [wait till complete]");
+	apt_task_terminate(task,TRUE);
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy Task");
+	apt_task_destroy(task);
+	return TRUE;
+}
+
+apt_test_suite_t* consumer_task_test_suite_create(apr_pool_t *pool)
+{
+	apt_test_suite_t *suite = apt_test_suite_create(pool,"consumer",NULL,consumer_task_test_run);
+	return suite;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/apttest/src/main.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/src/main.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_test_suite.h"
+#include "apt_log.h"
+
+apt_test_suite_t* task_test_suite_create(apr_pool_t *pool);
+apt_test_suite_t* consumer_task_test_suite_create(apr_pool_t *pool);
+
+int main(int argc, const char * const *argv)
+{
+	apt_test_framework_t *test_framework;
+	apt_test_suite_t *test_suite;
+	apr_pool_t *pool;
+	
+	/* one time apr global initialization */
+	if(apr_initialize() != APR_SUCCESS) {
+		return 0;
+	}
+
+	/* create test framework */
+	test_framework = apt_test_framework_create();
+	pool = apt_test_framework_pool_get(test_framework);
+
+	/* create test suites and add them to test framework */
+	test_suite = task_test_suite_create(pool);
+	apt_test_framework_suite_add(test_framework,test_suite);
+
+	test_suite = consumer_task_test_suite_create(pool);
+	apt_test_framework_suite_add(test_framework,test_suite);
+
+	/* run tests */
+	apt_test_framework_run(test_framework,argc,argv);
+
+	/* destroy test framework */
+	apt_test_framework_destroy(test_framework);
+
+	/* final apr global termination */
+	apr_terminate();
+	return 0;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/apttest/src/task_suite.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/src/task_suite.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_test_suite.h"
+#include "apt_task.h"
+#include "apt_log.h"
+
+static apt_bool_t task_main(apt_task_t *task)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Do the Job");
+	apt_task_delay(3000);
+	return TRUE;
+}
+
+static apt_bool_t task_test_run(apt_test_suite_t *suite, int argc, const char * const *argv)
+{
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create Task");
+	task = apt_task_create(NULL,NULL,suite->pool);
+	if(!task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Task");
+		return FALSE;
+	}
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->run = task_main;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Start Task");
+	if(apt_task_start(task) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start Task");
+		apt_task_destroy(task);
+		return FALSE;
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Wait for Task to Complete");
+	apt_task_wait_till_complete(task);
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy Task");
+	apt_task_destroy(task);
+	return TRUE;
+}
+
+apt_test_suite_t* task_test_suite_create(apr_pool_t *pool)
+{
+	apt_test_suite_t *suite = apt_test_suite_create(pool,"task",NULL,task_test_run);
+	return suite;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/mpftest/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mpftest/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,12 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INCLUDES             = -I$(top_srcdir)/libs/mpf/include \
+                       -I$(top_srcdir)/libs/apr-toolkit/include \
+                       $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_PROGRAMS      = mpftest
+mpftest_LDADD        = $(top_builddir)/libs/mpf/libmpf.la \
+                       $(top_builddir)/libs/apr-toolkit/libaprtoolkit.la \
+                       $(UNIMRCP_APR_LIBS) $(UNIMRCP_APU_LIBS)
+mpftest_SOURCES      = src/main.c \
+                       src/mpf_suite.c

Added: freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,167 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/tests/mpftest/src/main.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mpftest/src/main.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_test_suite.h"
+#include "apt_log.h"
+
+apt_test_suite_t* mpf_suite_create(apr_pool_t *pool);
+
+int main(int argc, const char * const *argv)
+{
+	apt_test_framework_t *test_framework;
+	apt_test_suite_t *test_suite;
+	apr_pool_t *pool;
+	
+	/* one time apr global initialization */
+	if(apr_initialize() != APR_SUCCESS) {
+		return 0;
+	}
+
+	/* create test framework */
+	test_framework = apt_test_framework_create();
+	pool = apt_test_framework_pool_get(test_framework);
+
+	/* create test suites and add them to test framework */
+	test_suite = mpf_suite_create(pool);
+	apt_test_framework_suite_add(test_framework,test_suite);
+
+	/* run tests */
+	apt_test_framework_run(test_framework,argc,argv);
+
+	/* destroy test framework */
+	apt_test_framework_destroy(test_framework);
+
+	/* final apr global termination */
+	apr_terminate();
+	return 0;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/mpftest/src/mpf_suite.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mpftest/src/mpf_suite.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,416 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_test_suite.h"
+#include "mpf_engine.h"
+#include "mpf_user.h"
+#include "mpf_termination.h"
+#include "mpf_rtp_termination_factory.h"
+#include "mpf_file_termination_factory.h"
+#include "mpf_audio_file_descriptor.h"
+#include "mpf_rtp_descriptor.h"
+#include "apt_pool.h"
+#include "apt_consumer_task.h"
+#include "apt_log.h"
+
+typedef struct mpf_suite_session_t mpf_suite_session_t;
+typedef struct mpf_suite_engine_t mpf_suite_engine_t;
+
+
+/** Test suite session */
+struct mpf_suite_session_t {
+	/** Pool to allocate memory from */
+	apr_pool_t        *pool;
+
+	/** Media context associated with the session */
+	mpf_context_t     *context;
+	/** The first termination in the context */
+	mpf_termination_t *termination1;
+	/** The second termination in the context */
+	mpf_termination_t *termination2;
+	/** RTP or file termination mode */
+	apt_bool_t         rtp_mode;
+};
+
+/** Test suite engine */
+struct mpf_suite_engine_t {
+	/** The main task of the test engine, which sends messages to MPF engine and 
+	 * processes responses and events sent back from MPF engine */
+	apt_consumer_task_t       *consumer_task;
+	/** MPF engine task */
+	apt_task_t                *engine_task;
+	/** RTP termination factory */
+	mpf_termination_factory_t *rtp_termination_factory;
+	/** File termination factory */
+	mpf_termination_factory_t *file_termination_factory;
+
+	/** Wait object, which is signalled to indicate shutdown */
+	apr_thread_cond_t         *wait_object;
+	/** Mutex of the wait object */
+	apr_thread_mutex_t        *wait_object_mutex;
+};
+
+static apt_bool_t mpf_test_run(apt_test_suite_t *suite, int argc, const char * const *argv);
+
+static void mpf_suite_on_start_complete(apt_task_t *task);
+static void mpf_suite_on_terminate_complete(apt_task_t *task);
+static apt_bool_t mpf_suite_msg_process(apt_task_t *task, apt_task_msg_t *msg);
+
+static mpf_audio_file_descriptor_t* mpf_file_reader_descriptor_create(mpf_suite_session_t *session);
+static mpf_audio_file_descriptor_t* mpf_file_writer_descriptor_create(mpf_suite_session_t *session);
+static mpf_rtp_stream_descriptor_t* mpf_rtp_local_descriptor_create(mpf_suite_session_t *session);
+static mpf_rtp_stream_descriptor_t* mpf_rtp_remote_descriptor_create(mpf_suite_session_t *session);
+
+
+/** Create MPF test suite */
+apt_test_suite_t* mpf_suite_create(apr_pool_t *pool)
+{
+	apt_test_suite_t *suite = apt_test_suite_create(pool,"mpf",NULL,mpf_test_run);
+	return suite;
+}
+
+/** Run MPF test suite */
+static apt_bool_t mpf_test_run(apt_test_suite_t *suite, int argc, const char * const *argv)
+{
+	mpf_suite_engine_t *suite_engine;
+	mpf_codec_manager_t *codec_manager;
+	mpf_rtp_config_t *config;
+	mpf_engine_t *engine;
+
+	apt_task_t *task;
+	apt_task_vtable_t *vtable;
+	apt_task_msg_pool_t *msg_pool;
+
+	suite_engine = apr_palloc(suite->pool,sizeof(mpf_suite_engine_t));
+
+	engine = mpf_engine_create(suite->pool);
+	if(!engine) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create MPF Engine");
+		return FALSE;
+	}
+	codec_manager = mpf_engine_codec_manager_create(suite->pool);
+	if(codec_manager) {
+		mpf_engine_codec_manager_register(engine,codec_manager);
+	}
+	suite_engine->engine_task = mpf_task_get(engine);
+
+	config = mpf_rtp_config_create(suite->pool);
+	apt_string_set(&config->ip,"127.0.0.1");
+	config->rtp_port_min = 5000;
+	config->rtp_port_min = 6000;
+	suite_engine->rtp_termination_factory = mpf_rtp_termination_factory_create(config,suite->pool);
+	suite_engine->file_termination_factory = mpf_file_termination_factory_create(suite->pool);
+
+	msg_pool = apt_task_msg_pool_create_dynamic(sizeof(mpf_message_t),suite->pool);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create Consumer Task");
+	suite_engine->consumer_task = apt_consumer_task_create(suite_engine,msg_pool,suite->pool);
+	if(!suite_engine->consumer_task) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Consumer Task");
+		return FALSE;
+	}
+	task = apt_consumer_task_base_get(suite_engine->consumer_task);
+	vtable = apt_task_vtable_get(task);
+	if(vtable) {
+		vtable->process_msg = mpf_suite_msg_process;
+		vtable->on_start_complete = mpf_suite_on_start_complete;
+		vtable->on_terminate_complete = mpf_suite_on_terminate_complete;
+	}
+
+	apt_task_add(task,suite_engine->engine_task);
+
+	apr_thread_mutex_create(&suite_engine->wait_object_mutex,APR_THREAD_MUTEX_UNNESTED,suite->pool);
+	apr_thread_cond_create(&suite_engine->wait_object,suite->pool);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Start Task");
+	if(apt_task_start(task) == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Start Task");
+		apt_task_destroy(task);
+		return FALSE;
+	}
+
+	apr_thread_mutex_lock(suite_engine->wait_object_mutex);
+	apr_thread_cond_wait(suite_engine->wait_object,suite_engine->wait_object_mutex);
+	apr_thread_mutex_unlock(suite_engine->wait_object_mutex);
+	
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Terminate Task [wait till complete]");
+	apt_task_terminate(task,TRUE);
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Destroy Task");
+	apt_task_destroy(task);
+
+	apr_thread_cond_destroy(suite_engine->wait_object);
+	apr_thread_mutex_destroy(suite_engine->wait_object_mutex);
+	return TRUE;
+}
+
+/** Start execution of MPF test suite scenario  */
+static void mpf_suite_on_start_complete(apt_task_t *task)
+{
+	mpf_suite_session_t *session;
+	apt_task_t *consumer_task;
+	mpf_suite_engine_t *suite_engine;
+	apt_task_msg_t *msg;
+	mpf_message_t *mpf_message;
+	apr_pool_t *pool = NULL;
+
+	consumer_task = apt_task_object_get(task);
+	suite_engine = apt_task_object_get(consumer_task);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"On MPF Suite Start");
+	pool = apt_pool_create();
+	session = apr_palloc(pool,sizeof(mpf_suite_session_t));
+	session->pool = pool;
+	session->context = NULL;
+	session->termination1 = NULL;
+	session->termination2 = NULL;
+	session->rtp_mode = TRUE;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Create MPF Context");
+	session->context = mpf_context_create(session,2,pool);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Create Termination [1]");
+	session->termination1 = mpf_termination_create(suite_engine->file_termination_factory,session,session->pool);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add Termination [1]");
+	msg = apt_task_msg_get(task);
+	msg->type = TASK_MSG_USER;
+	mpf_message = (mpf_message_t*) msg->data;
+
+	mpf_message->message_type = MPF_MESSAGE_TYPE_REQUEST;
+	mpf_message->command_id = MPF_COMMAND_ADD;
+	mpf_message->context = session->context;
+	mpf_message->termination = session->termination1;
+	mpf_message->descriptor = mpf_file_reader_descriptor_create(session);
+	apt_task_msg_signal(suite_engine->engine_task,msg);
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Create Termination [2]");
+	if(session->rtp_mode == TRUE) {
+		session->termination2 = mpf_termination_create(suite_engine->rtp_termination_factory,session,session->pool);
+	}
+	else {
+		session->termination2 = mpf_termination_create(suite_engine->file_termination_factory,session,session->pool);
+	}
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Add Termination [2]");
+	msg = apt_task_msg_get(task);
+	msg->type = TASK_MSG_USER;
+	mpf_message = (mpf_message_t*) msg->data;
+
+	mpf_message->message_type = MPF_MESSAGE_TYPE_REQUEST;
+	mpf_message->command_id = MPF_COMMAND_ADD;
+	mpf_message->context = session->context;
+	mpf_message->termination = session->termination2;
+	if(session->rtp_mode == TRUE) {
+		mpf_message->descriptor = mpf_rtp_local_descriptor_create(session);
+	}
+	else {
+		mpf_message->descriptor = mpf_file_writer_descriptor_create(session);
+	}
+	apt_task_msg_signal(suite_engine->engine_task,msg);
+}
+
+/** Execution of MPF test suite scenario is terminated  */
+static void mpf_suite_on_terminate_complete(apt_task_t *task)
+{
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"On MPF Suite Terminate");
+}
+
+/** Process task messages  */
+static apt_bool_t mpf_suite_msg_process(apt_task_t *task, apt_task_msg_t *msg)
+{
+	const mpf_message_t *mpf_message = (const mpf_message_t*) msg->data;
+	if(mpf_message->message_type == MPF_MESSAGE_TYPE_RESPONSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process MPF Response");
+		if(mpf_message->command_id == MPF_COMMAND_ADD) {
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Add Termination");
+			if(mpf_message->termination) {
+				mpf_suite_session_t *session;
+				session = mpf_termination_object_get(mpf_message->termination);
+				if(session->termination2 == mpf_message->termination && session->rtp_mode == TRUE) {
+					apt_task_msg_t *msg;
+					mpf_message_t *request;
+					apt_task_t *consumer_task;
+					mpf_suite_engine_t *suite_engine;
+
+					consumer_task = apt_task_object_get(task);
+					suite_engine = apt_task_object_get(consumer_task);
+
+					msg = apt_task_msg_get(task);
+					msg->type = TASK_MSG_USER;
+					request = (mpf_message_t*) msg->data;
+
+					request->message_type = MPF_MESSAGE_TYPE_REQUEST;
+					request->command_id = MPF_COMMAND_MODIFY;
+					request->context = session->context;
+					request->termination = session->termination2;
+					request->descriptor = mpf_rtp_remote_descriptor_create(session);
+					apt_task_msg_signal(suite_engine->engine_task,msg);
+				}
+			}
+		}
+		else if(mpf_message->command_id == MPF_COMMAND_SUBTRACT) {
+			apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"On Subtract Termination");
+			if(mpf_message->termination) {
+				mpf_suite_session_t *session;
+				session = mpf_termination_object_get(mpf_message->termination);
+				if(session->termination1 == mpf_message->termination) {
+					session->termination1 = NULL;
+				}
+				if(session->termination2 == mpf_message->termination) {
+					session->termination2 = NULL;
+				}
+				mpf_termination_destroy(mpf_message->termination);
+
+				if(!session->termination1 && !session->termination2) {
+					apt_task_t *consumer_task;
+					mpf_suite_engine_t *suite_engine;
+
+					mpf_context_destroy(session->context);
+					session->context = NULL;
+					apr_pool_destroy(session->pool);
+
+					consumer_task = apt_task_object_get(task);
+					suite_engine = apt_task_object_get(consumer_task);
+
+					apr_thread_mutex_lock(suite_engine->wait_object_mutex);
+					apr_thread_cond_signal(suite_engine->wait_object);
+					apr_thread_mutex_unlock(suite_engine->wait_object_mutex);
+				}
+			}
+		}
+	}
+	else if(mpf_message->message_type == MPF_MESSAGE_TYPE_EVENT) {
+		apt_task_t *consumer_task;
+		mpf_suite_engine_t *suite_engine;
+		apt_task_msg_t *msg;
+		mpf_message_t *request;
+		mpf_suite_session_t *session;
+		apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Process MPF Event");
+		if(mpf_message->termination) {
+			session = mpf_termination_object_get(mpf_message->termination);
+			if(session->termination1) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Subtract Termination [1]");
+				msg = apt_task_msg_get(task);
+				msg->type = TASK_MSG_USER;
+				request = (mpf_message_t*) msg->data;
+
+				request->message_type = MPF_MESSAGE_TYPE_REQUEST;
+				request->command_id = MPF_COMMAND_SUBTRACT;
+				request->context = session->context;
+				request->termination = session->termination1;
+
+				consumer_task = apt_task_object_get(task);
+				suite_engine = apt_task_object_get(consumer_task);
+				apt_task_msg_signal(suite_engine->engine_task,msg);
+			}
+			if(session->termination2) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Subtract Termination [2]");
+				msg = apt_task_msg_get(task);
+				msg->type = TASK_MSG_USER;
+				request = (mpf_message_t*) msg->data;
+
+				request->message_type = MPF_MESSAGE_TYPE_REQUEST;
+				request->command_id = MPF_COMMAND_SUBTRACT;
+				request->context = session->context;
+				request->termination = session->termination2;
+
+				consumer_task = apt_task_object_get(task);
+				suite_engine = apt_task_object_get(consumer_task);
+				apt_task_msg_signal(suite_engine->engine_task,msg);
+			}
+		}
+	}
+
+	return TRUE;
+}
+
+/** Create sample file reader descriptor */
+static mpf_audio_file_descriptor_t* mpf_file_reader_descriptor_create(mpf_suite_session_t *session)
+{
+	mpf_codec_descriptor_t *codec_descriptor;
+	mpf_audio_file_descriptor_t *descriptor = apr_palloc(session->pool,sizeof(mpf_audio_file_descriptor_t));
+	descriptor->mask = FILE_READER;
+	descriptor->read_handle = fopen("demo.pcm","rb");
+	descriptor->write_handle = NULL;
+
+	codec_descriptor = &descriptor->codec_descriptor;
+	codec_descriptor->payload_type = 11;
+	apt_string_set(&codec_descriptor->name,"L16");
+	codec_descriptor->sampling_rate = 8000;
+	codec_descriptor->channel_count = 1;
+	return descriptor;
+}
+
+/** Create sample file writer descriptor */
+static mpf_audio_file_descriptor_t* mpf_file_writer_descriptor_create(mpf_suite_session_t *session)
+{
+	mpf_codec_descriptor_t *codec_descriptor;
+	mpf_audio_file_descriptor_t *descriptor = apr_palloc(session->pool,sizeof(mpf_audio_file_descriptor_t));
+	descriptor->mask = FILE_WRITER;
+	descriptor->max_write_size = 500000; /* 500Kb */
+	descriptor->write_handle = fopen("demo_out.pcm","wb");
+	descriptor->read_handle = NULL;
+
+	codec_descriptor = &descriptor->codec_descriptor;
+	codec_descriptor->payload_type = 11;
+	apt_string_set(&codec_descriptor->name,"L16");
+	codec_descriptor->sampling_rate = 8000;
+	codec_descriptor->channel_count = 1;
+	return descriptor;
+}
+
+/** Create sample RTP local descriptor */
+static mpf_rtp_stream_descriptor_t* mpf_rtp_local_descriptor_create(mpf_suite_session_t *session)
+{
+	mpf_rtp_stream_descriptor_t *descriptor = apr_palloc(session->pool,sizeof(mpf_rtp_stream_descriptor_t));
+	mpf_rtp_stream_descriptor_init(descriptor);
+	descriptor->local = apr_palloc(session->pool,sizeof(mpf_rtp_media_descriptor_t));
+	mpf_rtp_media_descriptor_init(descriptor->local);
+	descriptor->local->mode = STREAM_MODE_NONE;
+	apt_string_set(&descriptor->local->base.ip,"127.0.0.1");
+	descriptor->local->base.port = 5000;
+	return descriptor;
+}
+
+/** Create sample RTP remote descriptor */
+static mpf_rtp_stream_descriptor_t* mpf_rtp_remote_descriptor_create(mpf_suite_session_t *session)
+{
+	mpf_codec_list_t *codec_list;
+	mpf_codec_descriptor_t *codec_descriptor;
+	mpf_rtp_stream_descriptor_t *descriptor = apr_palloc(session->pool,sizeof(mpf_rtp_stream_descriptor_t));
+	mpf_rtp_stream_descriptor_init(descriptor);
+	descriptor->remote = apr_palloc(session->pool,sizeof(mpf_rtp_media_descriptor_t));
+	mpf_rtp_media_descriptor_init(descriptor->remote);
+	descriptor->remote->mode = STREAM_MODE_SEND_RECEIVE;
+	apt_string_set(&descriptor->remote->base.ip,"127.0.0.1");
+	descriptor->remote->base.port = 5002;
+	codec_list = &descriptor->remote->codec_list;
+	mpf_codec_list_init(codec_list,2,session->pool);
+	codec_descriptor = mpf_codec_list_add(codec_list);
+	if(codec_descriptor) {
+		codec_descriptor->payload_type = 0;
+	}
+	codec_descriptor = mpf_codec_list_add(codec_list);
+	if(codec_descriptor) {
+		codec_descriptor->payload_type = 96;
+		apt_string_set(&codec_descriptor->name,"PCMU");
+		codec_descriptor->sampling_rate = 16000;
+		codec_descriptor->channel_count = 1;
+	}
+
+	return descriptor;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INCLUDES             = -I$(top_srcdir)/libs/mrcp/include \
+                       -I$(top_srcdir)/libs/mrcp/message/include \
+                       -I$(top_srcdir)/libs/mrcp/control/include \
+                       -I$(top_srcdir)/libs/mrcp/resources/include \
+                       -I$(top_srcdir)/libs/apr-toolkit/include \
+                       $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_PROGRAMS      = mrcptest
+mrcptest_LDADD       = $(top_builddir)/libs/mrcp/libmrcp.la \
+                       $(top_builddir)/libs/apr-toolkit/libaprtoolkit.la \
+                       $(UNIMRCP_APR_LIBS) $(UNIMRCP_APU_LIBS)
+mrcptest_SOURCES     = src/main.c \
+                       src/parse_gen_suite.c \
+                       src/set_get_suite.c

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,171 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/main.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/main.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_test_suite.h"
+#include "apt_log.h"
+
+apt_test_suite_t* parse_gen_test_suite_create(apr_pool_t *pool);
+apt_test_suite_t* set_get_test_suite_create(apr_pool_t *pool);
+
+int main(int argc, const char * const *argv)
+{
+	apt_test_framework_t *test_framework;
+	apt_test_suite_t *test_suite;
+	apr_pool_t *pool;
+	
+	/* one time apr global initialization */
+	if(apr_initialize() != APR_SUCCESS) {
+		return 0;
+	}
+
+	/* create test framework */
+	test_framework = apt_test_framework_create();
+	pool = apt_test_framework_pool_get(test_framework);
+
+	/* create test suites and add them to test framework */
+	test_suite = set_get_test_suite_create(pool);
+	apt_test_framework_suite_add(test_framework,test_suite);
+	test_suite = parse_gen_test_suite_create(pool);
+	apt_test_framework_suite_add(test_framework,test_suite);
+
+	/* run tests */
+	apt_test_framework_run(test_framework,argc,argv);
+
+	/* destroy test framework */
+	apt_test_framework_destroy(test_framework);
+
+	/* final apr global termination */
+	apr_terminate();
+	return 0;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/parse_gen_suite.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/parse_gen_suite.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "apt_test_suite.h"
+#include "apt_log.h"
+#include "mrcp_default_factory.h"
+#include "mrcp_message.h"
+#include "mrcp_stream.h"
+
+static apt_bool_t test_stream_generate(mrcp_generator_t *generator, mrcp_message_t *message)
+{
+	char buffer[500];
+	apt_text_stream_t stream;
+	mrcp_stream_result_e result;
+	apt_bool_t continuation;
+
+	mrcp_generator_message_set(generator,message);
+	do {
+		apt_text_stream_init(&stream,buffer,sizeof(buffer)-1);
+		continuation = FALSE;
+		result = mrcp_generator_run(generator,&stream);
+		if(result == MRCP_STREAM_MESSAGE_COMPLETE) {
+			stream.text.length = stream.pos - stream.text.buf;
+			*stream.pos = '\0';
+			apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Generated MRCP Stream [%lu bytes]\n%s",stream.text.length,stream.text.buf);
+		}
+		else if(result == MRCP_STREAM_MESSAGE_TRUNCATED) {
+			*stream.pos = '\0';
+			apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Generated MRCP Stream [%lu bytes] continuation awaiting\n%s",stream.text.length,stream.text.buf);
+			continuation = TRUE;
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Generate MRCP Stream");
+		}
+	}
+	while(continuation == TRUE);
+	return TRUE;
+}
+
+static apt_bool_t mrcp_message_handler(void *obj, mrcp_message_t *message, mrcp_stream_result_e result)
+{
+	if(result == MRCP_STREAM_MESSAGE_COMPLETE) {
+		/* message is completely parsed */
+		mrcp_generator_t *generator = obj;
+		test_stream_generate(generator,message);
+	}
+	return TRUE;
+}
+
+static apt_bool_t resource_name_read(apr_file_t *file, mrcp_parser_t *parser)
+{
+	char buffer[100];
+	apt_text_stream_t stream;
+	apt_bool_t status = FALSE;
+	apt_text_stream_init(&stream,buffer,sizeof(buffer)-1);
+	if(apr_file_read(file,stream.pos,&stream.text.length) != APR_SUCCESS) {
+		return FALSE;
+	}
+
+	/* skip the first line in a test file, which indicates resource name */
+	if(*stream.pos =='/' && *(stream.pos+1)=='/') {
+		apt_str_t line;
+		stream.pos += 2;
+		if(apt_text_line_read(&stream,&line) == TRUE) {
+			apr_off_t offset = stream.pos - stream.text.buf;
+			apr_file_seek(file,APR_SET,&offset);
+			mrcp_parser_resource_name_set(parser,&line);
+			status = TRUE;
+		}
+	}
+	return status;
+}
+
+static apt_bool_t test_file_process(apt_test_suite_t *suite, mrcp_resource_factory_t *factory, mrcp_version_e version, const char *file_path)
+{
+	apr_file_t *file;
+	char buffer[500];
+	apt_text_stream_t stream;
+	mrcp_parser_t *parser;
+	mrcp_generator_t *generator;
+	apr_size_t length;
+	apr_size_t offset;
+	apt_str_t resource_name;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open File [%s]",file_path);
+	if(apr_file_open(&file,file_path,APR_FOPEN_READ | APR_FOPEN_BINARY,APR_OS_DEFAULT,suite->pool) != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open File");
+		return FALSE;
+	}
+
+	parser = mrcp_parser_create(factory,suite->pool);
+	generator = mrcp_generator_create(factory,suite->pool);
+
+	apt_string_reset(&resource_name);
+	if(version == MRCP_VERSION_1) {
+		resource_name_read(file,parser);
+	}
+
+	apt_text_stream_init(&stream,buffer,sizeof(buffer)-1);
+	do {
+		/* init length of the stream */
+		stream.text.length = sizeof(buffer)-1;
+		/* calculate offset remaining from the previous receive / if any */
+		offset = stream.pos - stream.text.buf;
+		/* calculate available length */
+		length = stream.text.length - offset;
+
+		if(apr_file_read(file,stream.pos,&length) != APR_SUCCESS) {
+			break;
+		}
+		/* calculate actual length of the stream */
+		stream.text.length = offset + length;
+		stream.pos[length] = '\0';
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Parse MRCP Stream [%lu bytes]\n%s",length,stream.pos);
+		
+		/* reset pos */
+		stream.pos = stream.text.buf;
+		mrcp_stream_walk(parser,&stream,mrcp_message_handler,generator);
+	}
+	while(apr_file_eof(file) != APR_EOF);
+
+	apr_file_close(file);
+	return TRUE;
+}
+
+static apt_bool_t test_dir_process(apt_test_suite_t *suite, mrcp_resource_factory_t *factory, mrcp_version_e version)
+{
+	apr_status_t rv;
+	apr_dir_t *dir;
+
+	const char *dir_name = "v2";
+	if(version == MRCP_VERSION_1) {
+		dir_name = "v1";
+	}
+	if(apr_dir_open(&dir,dir_name,suite->pool) != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot Open Directory [%s]",dir_name);
+		return FALSE;
+	}
+
+	do {
+		apr_finfo_t finfo;
+		rv = apr_dir_read(&finfo,APR_FINFO_DIRENT,dir);
+		if(rv == APR_SUCCESS) {
+			if(finfo.filetype == APR_REG && finfo.name) {
+				char *file_path;
+				apr_filepath_merge(&file_path,dir_name,finfo.name,0,suite->pool);
+				test_file_process(suite,factory,version,file_path);
+				printf("\nPress ENTER to continue\n");
+				getchar();
+			}
+		}
+	} 
+	while(rv == APR_SUCCESS);
+
+	apr_dir_close(dir);
+	return TRUE;
+}
+
+static apt_bool_t parse_gen_test_run(apt_test_suite_t *suite, int argc, const char * const *argv)
+{
+	mrcp_resource_factory_t *factory = mrcp_default_factory_create(suite->pool);
+	if(!factory) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Resource Factory");
+		return FALSE;
+	}
+
+	test_dir_process(suite,factory,MRCP_VERSION_2);
+	test_dir_process(suite,factory,MRCP_VERSION_1);
+
+	mrcp_resource_factory_destroy(factory);
+	return TRUE;
+}
+
+apt_test_suite_t* parse_gen_test_suite_create(apr_pool_t *pool)
+{
+	apt_test_suite_t *suite = apt_test_suite_create(pool,"parse-gen",NULL,parse_gen_test_run);
+	return suite;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/set_get_suite.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/src/set_get_suite.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_test_suite.h"
+#include "apt_log.h"
+/* common includes */
+#include "mrcp_default_factory.h"
+#include "mrcp_message.h"
+#include "mrcp_generic_header.h"
+/* synthesizer includes */
+#include "mrcp_synth_header.h"
+#include "mrcp_synth_resource.h"
+/* recognizer includes */
+#include "mrcp_recog_header.h"
+#include "mrcp_recog_resource.h"
+
+#define SAMPLE_VOICE_AGE 28
+#define SAMPLE_CONTENT_TYPE "application/synthesis+ssml"
+#define SAMPLE_CONTENT_ID "123456"
+#define SAMPLE_CONTENT "SSML content goes here"
+#define SAMPLE_PARAM_NAME "SampleParamName"
+#define SAMPLE_PARAM_VALUE "SampleParamValue"
+
+/* Create SPEAK request */
+static mrcp_message_t* speak_request_create(mrcp_resource_factory_t *factory, apr_pool_t *pool)
+{
+	mrcp_message_t *message;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create SPEAK Request");
+	message = mrcp_request_create(MRCP_SYNTHESIZER_RESOURCE,SYNTHESIZER_SPEAK,pool);
+	mrcp_message_resourcify_by_id(factory,message);
+	if(message) {
+		mrcp_generic_header_t *generic_header;
+		mrcp_synth_header_t *synth_header;
+		/* get/allocate generic header */
+		generic_header = mrcp_generic_header_prepare(message);
+		if(generic_header) {
+			/* set generic header fields */
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Content-Type: %s",SAMPLE_CONTENT_TYPE);
+			apt_string_assign(&generic_header->content_type,SAMPLE_CONTENT_TYPE,message->pool);
+			mrcp_generic_header_property_add(message,GENERIC_HEADER_CONTENT_TYPE);
+		}
+		/* get/allocate synthesizer header */
+		synth_header = mrcp_resource_header_prepare(message);
+		if(synth_header) {
+			/* set synthesizer header fields */
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Voice-Age: %d",SAMPLE_VOICE_AGE);
+			synth_header->voice_param.age = SAMPLE_VOICE_AGE;
+			mrcp_resource_header_property_add(message,SYNTHESIZER_HEADER_VOICE_AGE);
+		}
+		/* set message body */
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Body: %s",SAMPLE_CONTENT);
+		apt_string_assign(&message->body,SAMPLE_CONTENT,message->pool);
+	}
+	return message;
+}
+
+/* Test SPEAK request */
+static apt_bool_t speak_request_test(mrcp_resource_factory_t *factory, mrcp_message_t *message)
+{
+	apt_bool_t res;
+	mrcp_generic_header_t *generic_header;
+	mrcp_synth_header_t *synth_header;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Test SPEAK Request");
+	res = FALSE;
+	/* get generic header */
+	generic_header = mrcp_generic_header_get(message);
+	if(generic_header) {
+		/* test content type header */
+		if(mrcp_generic_header_property_check(message,GENERIC_HEADER_CONTENT_TYPE) == TRUE) {
+			if(strncasecmp(generic_header->content_type.buf,SAMPLE_CONTENT_TYPE,generic_header->content_type.length) == 0) {
+				/* OK */
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Get Content-Type: %s",generic_header->content_type.buf);
+				res = TRUE;
+			}
+		}
+	}
+	if(res == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Test Generic Header");
+		return FALSE;
+	}
+
+	res = FALSE;
+	/* get synthesizer header */
+	synth_header = mrcp_resource_header_get(message);
+	if(synth_header) {
+		/* test voice age header */
+		if(mrcp_resource_header_property_check(message,SYNTHESIZER_HEADER_VOICE_AGE) == TRUE) {
+			if(synth_header->voice_param.age == SAMPLE_VOICE_AGE) {
+				/* OK */
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Get Voice-Age: %d",synth_header->voice_param.age);
+				res = TRUE;
+			}
+		}
+	}
+	if(res == FALSE) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Test Synthesizer Header");
+		return FALSE;
+	}
+	
+	if(strncasecmp(message->body.buf,SAMPLE_CONTENT,message->body.length) != 0) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Test Message Body");
+		return FALSE;
+	}
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Get Body: %s",message->body.buf);
+	return TRUE;
+}
+
+/* Create SPEAK response */
+static mrcp_message_t* speak_response_create(mrcp_resource_factory_t *factory, const mrcp_message_t *request)
+{
+	mrcp_message_t *response;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create SPEAK Response");
+	response = mrcp_response_create(request,request->pool);
+	if(response) {
+		/* set IN-PROGRESS state */
+		response->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
+	}
+	return response;
+}
+
+/* Create SPEAK-COMPLETE event */
+static mrcp_message_t* speak_event_create(mrcp_resource_factory_t *factory, const mrcp_message_t *request)
+{
+	mrcp_message_t *event_message;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create SPEAK-COMPLETE Event");
+	event_message = mrcp_event_create(request,SYNTHESIZER_SPEAK_COMPLETE,request->pool);
+	if(event_message) {
+		/* get/allocate synthesizer header */
+		mrcp_synth_header_t *synth_header = mrcp_resource_header_prepare(event_message);
+		if(synth_header) {
+			/* set completion cause */
+			synth_header->completion_cause = SYNTHESIZER_COMPLETION_CAUSE_NORMAL;
+			mrcp_resource_header_property_add(event_message,SYNTHESIZER_HEADER_COMPLETION_CAUSE);
+		}
+		/* set request state */
+		event_message->start_line.request_state = MRCP_REQUEST_STATE_COMPLETE;
+	}
+	return event_message;
+}
+
+
+/* Create GET-PARAMS request */
+static mrcp_message_t* get_params_request_create(mrcp_resource_factory_t *factory, apr_pool_t *pool)
+{
+	mrcp_message_t *message;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create GET-PARAMS Request");
+	message = mrcp_request_create(MRCP_SYNTHESIZER_RESOURCE,SYNTHESIZER_GET_PARAMS,pool);
+	mrcp_message_resourcify_by_id(factory,message);
+	if(message) {
+		apt_str_t param_name;
+		apt_str_t param_value;
+		mrcp_generic_header_t *generic_header;
+		mrcp_synth_header_t *synth_header;
+		/* get/allocate generic header */
+		generic_header = mrcp_generic_header_prepare(message);
+		if(generic_header) {
+			/* set content id empty header */
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Content-ID: ");
+			mrcp_generic_header_name_property_add(message,GENERIC_HEADER_CONTENT_ID);
+			
+			/* set vendor specific params header */
+			generic_header->vendor_specific_params = apt_pair_array_create(1,pool);
+			apt_string_set(¶m_name,SAMPLE_PARAM_NAME);
+			apt_string_reset(¶m_value);
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Vendor-Specific-Params: %s",param_name.buf);
+			apt_pair_array_append(generic_header->vendor_specific_params,¶m_name,¶m_value,pool);
+			mrcp_generic_header_property_add(message,GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS);
+		}
+		/* get/allocate synthesizer header */
+		synth_header = mrcp_resource_header_prepare(message);
+		if(synth_header) {
+			/* set voice age empty header */
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Voice-Age: ");
+			mrcp_resource_header_name_property_add(message,SYNTHESIZER_HEADER_VOICE_AGE);
+		}
+	}
+	return message;
+}
+
+/* Create GET-PARAMS response */
+static mrcp_message_t* get_params_response_create(mrcp_resource_factory_t *factory, mrcp_message_t *request)
+{
+	apt_bool_t res;
+	mrcp_message_t *response;
+	apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create GET-PARAMS Response");
+	response = mrcp_response_create(request,request->pool);
+	if(response) {
+		mrcp_generic_header_t *generic_header;
+		mrcp_synth_header_t *synth_header;
+		res = FALSE;
+		/* get generic header */
+		generic_header = mrcp_generic_header_get(request);
+		if(generic_header) {
+			mrcp_generic_header_t *res_generic_header = mrcp_generic_header_prepare(response);
+			/* test content id header */
+			if(mrcp_generic_header_property_check(request,GENERIC_HEADER_CONTENT_ID) == TRUE) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Content-ID: %s",SAMPLE_CONTENT_ID);
+				apt_string_assign(&res_generic_header->content_id,SAMPLE_CONTENT_ID,response->pool);
+				mrcp_generic_header_property_add(response,GENERIC_HEADER_CONTENT_ID);
+				res = TRUE;
+			}
+			/* test vendor specific header */
+			if(mrcp_generic_header_property_check(request,GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS) == TRUE) {
+				apt_str_t name;
+				const apt_pair_t *pair;
+				res_generic_header->vendor_specific_params = apt_pair_array_create(1,response->pool);
+				apt_string_set(&name,SAMPLE_PARAM_NAME);
+				pair = apt_pair_array_find(generic_header->vendor_specific_params,&name);
+				if(pair) {
+					apt_str_t value;
+					apt_string_set(&value,SAMPLE_PARAM_VALUE);
+					apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Vendor-Specific-Params: %s=%s",name.buf,value.buf);
+					apt_pair_array_append(res_generic_header->vendor_specific_params,&name,&value,response->pool);
+				}
+				mrcp_generic_header_property_add(response,GENERIC_HEADER_VENDOR_SPECIFIC_PARAMS);
+				res = TRUE;
+			}
+		}
+
+		if(res == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Test Generic Header");
+			return NULL;
+		}	
+
+		res = FALSE;
+		/* get synthesizer header */
+		synth_header = mrcp_resource_header_get(request);
+		if(synth_header) {
+			mrcp_synth_header_t *res_synth_header = mrcp_resource_header_prepare(response);
+			/* test voice age header */
+			if(mrcp_resource_header_property_check(request,SYNTHESIZER_HEADER_VOICE_AGE) == TRUE) {
+				res_synth_header->voice_param.age = SAMPLE_VOICE_AGE;
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Set Voice-Age: %d",res_synth_header->voice_param.age);
+				mrcp_resource_header_property_add(response,SYNTHESIZER_HEADER_VOICE_AGE);
+				res = TRUE;
+			}
+		}
+		if(res == FALSE) {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Test Synthesizer Header");
+			return NULL;
+		}
+	
+	}
+	return response;
+}
+
+
+
+
+static apt_bool_t speak_test_run(apt_test_suite_t *suite, mrcp_resource_factory_t *factory)
+{
+	mrcp_message_t *message = speak_request_create(factory,suite->pool);
+	if(!message) {
+		return FALSE;
+	}
+	
+	if(speak_request_test(factory,message) != TRUE) {
+		return FALSE;
+	}
+
+	speak_response_create(factory,message);
+	speak_event_create(factory,message);
+	return TRUE;
+}
+
+static apt_bool_t get_params_test_run(apt_test_suite_t *suite, mrcp_resource_factory_t *factory)
+{
+	mrcp_message_t *message = get_params_request_create(factory,suite->pool);
+	if(!message) {
+		return FALSE;
+	}
+
+	get_params_response_create(factory,message);
+	return TRUE;
+}
+
+static apt_bool_t set_get_test_run(apt_test_suite_t *suite, int argc, const char * const *argv)
+{
+	mrcp_resource_factory_t *factory = mrcp_default_factory_create(suite->pool);
+	if(!factory) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Create Resource Factory");
+		return FALSE;
+	}
+
+	speak_test_run(suite,factory);
+	get_params_test_run(suite,factory);
+	
+	mrcp_resource_factory_destroy(factory);
+	return TRUE;
+}
+
+apt_test_suite_t* set_get_test_suite_create(apr_pool_t *pool)
+{
+	apt_test_suite_t *suite = apt_test_suite_create(pool,"set-gen",NULL,set_get_test_run);
+	return suite;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/definegrammar.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/definegrammar.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,18 @@
+//speechrecog
+DEFINE-GRAMMAR 543257 MRCP/1.0
+Content-Type:application/grammar+xml
+Content-Id:request1 at form-level.store
+Content-Length:309
+
+
+
+
+
+
+
+
+    
+        oui
+        yes
+     
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/getparams.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/getparams.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,5 @@
+//speechsynth
+GET-PARAMS 543256 MRCP/1.0
+Voice-gender:
+Voice-variant:
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/multi.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/multi.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,27 @@
+//speechsynth
+GET-PARAMS 543256 MRCP/1.0
+Voice-gender:
+Voice-variant:
+
+SET-PARAMS 543256 MRCP/1.0
+Voice-gender:female
+Voice-variant:3
+
+SPEAK 543257 MRCP/1.0
+Kill-On-Barge-In:false
+Voice-gender:neutral
+Prosody-volume:medium
+Content-Type:application/synthesis+ssml
+Content-Length:412
+
+
+
+
+       You have 4 new messages.
+       The first is from Stephanie Williams 
+        and arrived at 
+       3:45pm.
+       
+       The subject is ski trip
+
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/pause.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/pause.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+//speechsynth
+PAUSE 543258 MRCP/1.0
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/recognitioncomplete.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/recognitioncomplete.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,20 @@
+//speechrecog
+RECOGNITION-COMPLETE 543257 COMPLETE MRCP/1.0
+Completion-Cause:000 success
+Waveform-URL:http://web.media.com/session123/audio.wav
+Content-Type:application/x-nlsml
+Content-Length:446
+
+  
+  
+      
+          
+              
+                   Andre Roy 
+              
+          
+                       may I speak to Andre Roy 
+      
+  
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/recognize.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/recognize.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,30 @@
+//speechrecog
+RECOGNIZE 543257 MRCP/1.0
+Confidence-Threshold:90
+Content-Type:application/grammar+xml
+Content-Id:request1 at form-level.store
+Content-Length:608
+
+
+
+
+
+
+
+   
+       
+                oui
+                yes
+       
+   
+
+
+   
+       may I speak to
+       
+                Michel Tremblay
+                Andre Roy
+       
+   
+
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/response.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/response.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+//speechsynth
+MRCP/1.0 543257 200 IN-PROGRESS
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/resume.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/resume.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+//speechsynth
+RESUME 543260 MRCP/1.0
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/setparams.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/setparams.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,5 @@
+//speechsynth
+SET-PARAMS 543256 MRCP/1.0
+Voice-gender:female
+Voice-variant:3
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/speak.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/speak.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,19 @@
+//speechsynth
+SPEAK 543257 MRCP/1.0
+Kill-On-Barge-In:false
+Voice-gender:neutral
+Prosody-volume:medium
+Content-Type:application/synthesis+ssml
+Content-Length:412
+
+
+
+
+       You have 4 new messages.
+       The first is from Stephanie Williams 
+        and arrived at 
+       3:45pm.
+       
+       The subject is ski trip
+
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/speakcomplete.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/speakcomplete.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,4 @@
+//speechsynth
+SPEAK-COMPLETE 543260 COMPLETE MRCP/1.0
+Completion-Cause:000 normal
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/stop.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v1/stop.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+//speechsynth
+STOP 543258 MRCP/1.0
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/definegrammar.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/definegrammar.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,30 @@
+MRCP/2.0 865 DEFINE-GRAMMAR 543257
+Channel-Identifier:32AECB23433801 at speechrecog
+Content-Type:application/srgs+xml
+Content-ID:
+Content-Length:685
+
+
+
+
+
+
+
+	
+           
+                 oui
+                 yes
+           
+     
+
+
+     
+           may I speak to
+           
+                 Michel Tremblay
+                 Andre Roy
+           
+     
+
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/getparams.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/getparams.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,5 @@
+MRCP/2.0 112 GET-PARAMS 543256
+Channel-Identifier:32AECB23433802 at speechsynth
+Voice-gender:
+Voice-variant:
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/recognitioncomplete.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/recognitioncomplete.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,20 @@
+MRCP/2.0 616 RECOGNITION-COMPLETE 543257 COMPLETE
+Channel-Identifier:32AECB23433801 at speechrecog
+Completion-Cause:000 success
+Waveform-URI:;size=342456;duration=25435
+Content-Type:application/nlsml+xml
+Content-Length:430
+
+
+
+   
+       
+           
+                Andre Roy 
+           
+       
+          may I speak to Andre Roy 
+   
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/recognize.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/recognize.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,30 @@
+MRCP/2.0 903 RECOGNIZE 543257
+Channel-Identifier:32AECB23433801 at speechrecog
+Confidence-Threshold:0.9
+Content-Type:application/srgs+xml
+Content-ID:
+Content-Length:702
+
+
+
+
+
+
+
+     
+           
+                 oui
+                 yes
+           
+     
+
+
+     
+           may I speak to
+           
+                 Michel Tremblay
+                 Andre Roy
+           
+     
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/setparams.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/setparams.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,5 @@
+MRCP/2.0 119 SET-PARAMS 543256
+Channel-Identifier:32AECB23433802 at speechsynth
+Voice-gender:female
+Voice-variant:3
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/speak.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/speak.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,26 @@
+MRCP/2.0 732 SPEAK 543257
+Channel-Identifier:32AECB23433802 at speechsynth
+Voice-gender:neutral
+Voice-Age:25
+Prosody-volume:medium
+Content-Type:application/ssml+xml
+Content-Length:542
+
+
+
+	

+	 You have 4 new messages.
+	 The first is from Stephanie Williams and arrived at
+		
+		0345p.
+		
+	 The subject is
+			ski trip
+	 
+	

+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/speakcomplete.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/speakcomplete.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,5 @@
+MRCP/2.0 161 SPEAK-COMPLETE 543257 COMPLETE
+Channel-Identifier:32AECB23433802 at speechsynth
+Completion-Cause:000 normal
+Speech-Marker:timestamp=857206027059
+

Added: freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/stop.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/v2/stop.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,3 @@
+MRCP/2.0 74 STOP 543258
+Channel-Identifier:32AECB23433802 at speechsynth
+

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,12 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INCLUDES             = -I$(top_srcdir)/libs/uni-rtsp/include \
+                       -I$(top_srcdir)/libs/apr-toolkit/include \
+                       $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_PROGRAMS      = rtsptest
+rtsptest_LDADD       = $(top_builddir)/libs/uni-rtsp/libunirtsp.la \
+                       $(top_builddir)/libs/apr-toolkit/libaprtoolkit.la \
+                       $(UNIMRCP_APR_LIBS) $(UNIMRCP_APU_LIBS)
+rtsptest_SOURCES     = src/main.c \
+                       src/parse_gen_suite.c

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/announce.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/announce.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,24 @@
+ANNOUNCE rtsp://media.server.com/media/synthesizer RTSP/1.0
+CSeq:4
+Session:12345678
+Content-Type:application/mrcp
+Content-Length:567
+
+SPEAK 543257 MRCP/1.0
+Kill-On-Barge-In:false
+Voice-gender:neutral
+Prosody-volume:medium
+Content-Type:application/synthesis+ssml
+Content-Length:412
+
+
+
+
+       You have 4 new messages.
+       The first is from Stephanie Williams 
+        and arrived at 
+       3:45pm.
+       
+       The subject is ski trip
+
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/ok.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/ok.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+RTSP/1.0 200 OK
+CSeq:2
+Transport:RTP/AVP;unicast;client_port=46456-46457;server_port=46460-46461
+Session:12345678
+Content-Length:188
+Content-Type:application/sdp
+
+v=0
+o=- 3211724219 3211724219 IN IP4 10.3.2.88
+s=Media Server
+c=IN IP4 0.0.0.0
+t=0 0
+m=audio 46460 RTP/AVP 0 96
+a=rtpmap:0 pcmu/8000
+a=rtpmap:96 telephone-event/8000
+a=fmtp:96 0-15
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/re-ok.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/re-ok.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,6 @@
+RTSP/1.0 200 OK
+CSeq:3
+Transport:RTP/AVP;unicast;client_port=46456-46457;
+         server_port=46460-46461;mode=record;ttl=127
+Session:12345678
+

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/re-setup.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/re-setup.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,6 @@
+SETUP rtsp://media.server.com/media/recognizer RTSP/1.0
+CSeq:3
+Transport:RTP/AVP;unicast;client_port=46456-46457;
+         mode=record;ttl=127
+Session:12345678;timeout=200
+

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/setup.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/setup.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,16 @@
+SETUP rtsp://media.server.com/media/synthesizer RTSP/1.0
+CSeq:2
+Transport:RTP/AVP;unicast;client_port=46456-46457
+Content-Type:application/sdp
+Content-Length:188
+
+v=0
+o=- 123 456 IN IP4 10.0.0.1
+s=Media Server
+p=+1-888-555-1212
+c=IN IP4 0.0.0.0
+t=0 0
+m=audio 0 RTP/AVP 0 96
+a=rtpmap:0 pcmu/8000
+a=rtpmap:96 telephone-event/8000
+a=fmtp:96 0-15
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/teardown.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/teardown.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,4 @@
+TEARDOWN rtsp://media.server.com/media/synthesizer RTSP/1.0
+CSeq:12
+Session:12345678
+

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/ultimate.msg
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/msg/ultimate.msg	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,46 @@
+RTSP/1.0 200 OK
+CSeq:3
+Transport:RTP/AVP;unicast;client_port=46456-46457;
+         server_port=46460-46461;mode=record;ttl=127
+Session:12345678
+
+SETUP rtsp://media.server.com/media/synthesizer RTSP/1.0
+CSeq:2
+Transport:RTP/AVP;unicast;client_port=46456-46457
+Content-Type:application/sdp
+Content-Length:190
+
+v=0
+o=- 123 456 IN IP4 10.0.0.1
+s=Media Server
+p=+1-888-555-1212
+c=IN IP4 0.0.0.0
+t=0 0
+m=audio 0 RTP/AVP 0 96
+a=rtpmap:0 pcmu/8000
+a=rtpmap:96 telephone-event/8000
+a=fmtp:96 0-15
+ANNOUNCE rtsp://media.server.com/media/synthesizer RTSP/1.0
+CSeq:4
+Session:12345678
+Content-Type:application/mrcp
+Content-Length:567
+
+SPEAK 543257 MRCP/1.0
+Kill-On-Barge-In:false
+Voice-gender:neutral
+Prosody-volume:medium
+Content-Type:application/synthesis+ssml
+Content-Length:412
+
+
+
+
+       You have 4 new messages.
+       The first is from Stephanie Williams 
+        and arrived at 
+       3:45pm.
+       
+       The subject is ski trip
+
+
\ No newline at end of file

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,167 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/src/main.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/src/main.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apt_test_suite.h"
+#include "apt_log.h"
+
+apt_test_suite_t* parse_gen_test_suite_create(apr_pool_t *pool);
+
+int main(int argc, const char * const *argv)
+{
+	apt_test_framework_t *test_framework;
+	apt_test_suite_t *test_suite;
+	apr_pool_t *pool;
+	
+	/* one time apr global initialization */
+	if(apr_initialize() != APR_SUCCESS) {
+		return 0;
+	}
+
+	/* create test framework */
+	test_framework = apt_test_framework_create();
+	pool = apt_test_framework_pool_get(test_framework);
+
+	/* create test suites and add them to test framework */
+	test_suite = parse_gen_test_suite_create(pool);
+	apt_test_framework_suite_add(test_framework,test_suite);
+
+	/* run tests */
+	apt_test_framework_run(test_framework,argc,argv);
+
+	/* destroy test framework */
+	apt_test_framework_destroy(test_framework);
+
+	/* final apr global termination */
+	apr_terminate();
+	return 0;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/rtsptest/src/parse_gen_suite.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/src/parse_gen_suite.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include 
+#include "apt_test_suite.h"
+#include "apt_log.h"
+#include "rtsp_stream.h"
+
+static apt_bool_t test_stream_generate(rtsp_generator_t *generator, rtsp_message_t *message)
+{
+	char buffer[500];
+	apt_text_stream_t stream;
+	rtsp_stream_result_e result;
+	apt_bool_t continuation;
+
+	rtsp_generator_message_set(generator,message);
+	do {
+		apt_text_stream_init(&stream,buffer,sizeof(buffer)-1);
+		continuation = FALSE;
+		result = rtsp_generator_run(generator,&stream);
+		if(result == RTSP_STREAM_MESSAGE_COMPLETE) {
+			stream.text.length = stream.pos - stream.text.buf;
+			*stream.pos = '\0';
+			apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Generated RTSP Stream [%lu bytes]\n%s",stream.text.length,stream.text.buf);
+		}
+		else if(result == RTSP_STREAM_MESSAGE_TRUNCATED) {
+			*stream.pos = '\0';
+			apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Generated RTSP Stream [%lu bytes] continuation awaiting\n%s",stream.text.length,stream.text.buf);
+			continuation = TRUE;
+		}
+		else {
+			apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Generate RTSP Stream");
+		}
+	}
+	while(continuation == TRUE);
+	return TRUE;
+}
+
+static apt_bool_t rtsp_message_handler(void *obj, rtsp_message_t *message, rtsp_stream_result_e result)
+{
+	if(result == RTSP_STREAM_MESSAGE_COMPLETE) {
+		/* message is completely parsed */
+		rtsp_generator_t *generator = obj;
+		test_stream_generate(generator,message);
+	}
+	return TRUE;
+}
+
+static apt_bool_t test_file_process(apt_test_suite_t *suite, const char *file_path)
+{
+	apr_file_t *file;
+	char buffer[500];
+	apt_text_stream_t stream;
+	rtsp_parser_t *parser;
+	rtsp_generator_t *generator;
+	apr_size_t length;
+	apr_size_t offset;
+
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open File [%s]",file_path);
+	if(apr_file_open(&file,file_path,APR_FOPEN_READ | APR_FOPEN_BINARY,APR_OS_DEFAULT,suite->pool) != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open File");
+		return FALSE;
+	}
+
+	parser = rtsp_parser_create(suite->pool);
+	generator = rtsp_generator_create(suite->pool);
+
+	apt_text_stream_init(&stream,buffer,sizeof(buffer)-1);
+
+	do {
+		/* init length of the stream */
+		stream.text.length = sizeof(buffer)-1;
+		/* calculate offset remaining from the previous receive / if any */
+		offset = stream.pos - stream.text.buf;
+		/* calculate available length */
+		length = stream.text.length - offset;
+
+		if(apr_file_read(file,stream.pos,&length) != APR_SUCCESS) {
+			break;
+		}
+		/* calculate actual length of the stream */
+		stream.text.length = offset + length;
+		stream.pos[length] = '\0';
+		apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Parse RTSP Stream [%lu bytes]\n%s",length,stream.pos);
+		
+		/* reset pos */
+		stream.pos = stream.text.buf;
+		rtsp_stream_walk(parser,&stream,rtsp_message_handler,generator);
+	}
+	while(apr_file_eof(file) != APR_EOF);
+
+	apr_file_close(file);
+	return TRUE;
+}
+
+static apt_bool_t test_dir_process(apt_test_suite_t *suite)
+{
+	apr_status_t rv;
+	apr_dir_t *dir;
+
+	const char *dir_name = "msg";
+	if(apr_dir_open(&dir,dir_name,suite->pool) != APR_SUCCESS) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot Open Directory [%s]",dir_name);
+		return FALSE;
+	}
+
+	do {
+		apr_finfo_t finfo;
+		rv = apr_dir_read(&finfo,APR_FINFO_DIRENT,dir);
+		if(rv == APR_SUCCESS) {
+			if(finfo.filetype == APR_REG && finfo.name) {
+				char *file_path;
+				apr_filepath_merge(&file_path,dir_name,finfo.name,0,suite->pool);
+				test_file_process(suite,file_path);
+				printf("\nPress ENTER to continue\n");
+				getchar();
+			}
+		}
+	} 
+	while(rv == APR_SUCCESS);
+
+	apr_dir_close(dir);
+	return TRUE;
+}
+
+static apt_bool_t parse_gen_test_run(apt_test_suite_t *suite, int argc, const char * const *argv)
+{
+	test_dir_process(suite);
+	return TRUE;
+}
+
+apt_test_suite_t* parse_gen_test_suite_create(apr_pool_t *pool)
+{
+	apt_test_suite_t *suite = apt_test_suite_create(pool,"parse-gen",NULL,parse_gen_test_run);
+	return suite;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_multi
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_multi	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,108 @@
+
+
+
+
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut 
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 9 TCP/MRCPv2 1
+      a=setup:active
+      a=connection:new
+      a=resource:speechsynth
+      a=cmid:1
+      m=application 9 TCP/MRCPv2 1
+      a=setup:active
+      a=connection:new
+      a=resource:speechrecog
+      a=cmid:1
+      m=audio [media_port] RTP/AVP 0 8
+      a=sendrecv
+      a=mid:1
+
+	]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_recog
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_recog	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,103 @@
+
+
+
+
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut 
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 9 TCP/MRCPv2 1
+      a=setup:active
+      a=connection:new
+      a=resource:speechrecog
+      a=cmid:1
+      m=audio [media_port] RTP/AVP 0 8
+      a=sendonly
+      a=mid:1
+
+	]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_synth
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_synth	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,103 @@
+
+
+
+
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut 
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 9 TCP/MRCPv2 1
+      a=setup:active
+      a=connection:new
+      a=resource:speechsynth
+      a=cmid:1
+      m=audio [media_port] RTP/AVP 0 8
+      a=recvonly
+      a=mid:1
+
+	]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_unknown
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_unknown	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,102 @@
+
+
+
+
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut 
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 9 TCP/MRCPv2 1
+      a=setup:active
+      a=connection:new
+      a=resource:unknown
+      a=cmid:1
+      m=audio [media_port] RTP/AVP 0 8
+      a=mid:1
+
+	]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_update
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uac_update	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,179 @@
+
+
+
+
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut 
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 9 TCP/MRCPv2 1
+      a=setup:active
+      a=connection:new
+      a=resource:speechsynth
+      a=cmid:1
+      m=audio [media_port] RTP/AVP 0 8
+      a=recvonly
+      a=mid:1
+
+	]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut 
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 9 TCP/MRCPv2 1
+      a=setup:active
+      a=connection:new
+      a=resource:speechsynth
+      a=cmid:1
+      m=audio [media_port] RTP/AVP 0 8
+      a=sendrecv
+      a=mid:1
+      m=application 9 TCP/MRCPv2 1
+      a=setup:active
+      a=connection:existing
+      a=resource:speechrecog
+      a=cmid:1
+
+	]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+
+  
+  
+    ;tag=[call_number]
+      To: sut [peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: Performance Test
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_recog
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_recog	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,127 @@
+
+
+
+
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+    
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 1050 TCP/MRCPv2 1
+      a=setup:passive
+      a=connection:new
+      a=channel:dca48cf082dd584b at speechrecog
+      a=cmid:1
+      m=audio [media_port] RTP/AVP 0 8
+      a=recvonly
+      a=mid:1
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+    
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 0 TCP/MRCPv2 1
+      a=setup:passive
+      a=connection:existing
+      a=channel:dca48cf082dd584b at speechrecog
+      a=cmid:1
+      m=audio 0 RTP/AVP 0 8
+      a=recvonly
+      a=mid:1
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+    
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_reject
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_reject	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,49 @@
+
+
+
+
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+    
+      Content-Length: 0
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_synth
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_synth	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,127 @@
+
+
+
+
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+    
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 1050 TCP/MRCPv2 1
+      a=setup:passive
+      a=connection:new
+      a=channel:dca48cf082dd584b at speechsynth
+      a=cmid:1
+      m=audio [media_port] RTP/AVP 0 8
+      a=sendonly
+      a=mid:1
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+    
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 0 TCP/MRCPv2 1
+      a=setup:passive
+      a=connection:existing
+      a=channel:dca48cf082dd584b at speechsynth
+      a=cmid:1
+      m=audio 0 RTP/AVP 0 8
+      a=sendonly
+      a=mid:1
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+    
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_unknown
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/sipp/mrcp_uas_unknown	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,88 @@
+
+
+
+
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+    
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP4 [local_ip]
+      s=-
+      c=IN IP4 [media_ip]
+      t=0 0
+      m=application 0 TCP/MRCPv2 1
+      a=setup:passive
+      a=connection:new
+      a=channel:dca48cf082dd584b at unknown
+      a=cmid:1
+      m=audio 0 RTP/AVP 0 8
+      a=sendonly
+      a=mid:1
+
+    ]]>
+  
+
+  
+  
+
+  
+  
+
+  
+    
+      Content-Length: 0
+
+    ]]>
+  
+
+  
+  
+  
+
+
+  
+  
+
+  
+  
+
+

Added: freeswitch/trunk/libs/unimrcp/tests/strtablegen/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/strtablegen/Makefile.am	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,9 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INCLUDES             = -I$(top_srcdir)/libs/apr-toolkit/include \
+                       $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES)
+
+noinst_PROGRAMS      = strtablegen
+strtablegen_LDADD    = $(top_builddir)/libs/apr-toolkit/libaprtoolkit.la \
+                       $(UNIMRCP_APR_LIBS) $(UNIMRCP_APU_LIBS)
+strtablegen_SOURCES  = src/main.c

Added: freeswitch/trunk/libs/unimrcp/tests/strtablegen/src/main.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/strtablegen/src/main.c	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include 
+#include "apt_pool.h"
+#include "apt_string_table.h"
+#include "apt_text_stream.h"
+
+static apt_bool_t is_unique(const apt_str_table_item_t table[], apr_size_t count, 
+							apr_size_t item_index, apr_size_t char_index, char value)
+{
+	size_t i;
+	const char *buf;
+	for(i=0; ivalue,&line,pool);
+		item->key = 0;
+		count++;
+	}
+	while(count < max_count);
+
+	return count;
+}
+
+static apt_bool_t string_table_write(const apt_str_table_item_t table[], apr_size_t count, FILE *file)
+{
+	size_t i;
+	const apt_str_table_item_t *item;
+	for(i=0; ivalue.buf, item->value.length, item->key);
+	}
+	return TRUE;
+}
+
+int main(int argc, char *argv[])
+{
+	apr_pool_t *pool = NULL;
+	apt_str_table_item_t table[100];
+	size_t count;
+	FILE *file_in, *file_out;
+
+	/* one time apr global initialization */
+	if(apr_initialize() != APR_SUCCESS) {
+		return 0;
+	}
+	pool = apt_pool_create();
+
+	if(argc < 2) {
+		printf("usage: stringtablegen stringtable.in [stringtable.out]\n");
+		return 0;
+	}
+	file_in = fopen(argv[1], "rb");
+	if(file_in == NULL) {
+		printf("cannot open file %s\n", argv[1]);
+		return 0;
+	}
+
+	if(argc > 2) {
+		file_out = fopen(argv[2], "wb");
+	}
+	else {
+		file_out = stdout;
+	}
+
+	/* read items (strings) from the file */
+	count = string_table_read(table,100,file_in,pool);
+
+	/* generate string table */
+	string_table_key_generate(table,count);
+	
+	/* dump string table to the file */
+	string_table_write(table,count,file_out);
+
+	fclose(file_in);
+	if(file_out != stdout) {
+		fclose(file_out);
+	}
+
+	apr_pool_destroy(pool);
+	/* final apr global termination */
+	apr_terminate();
+	return 0;
+}

Added: freeswitch/trunk/libs/unimrcp/tests/strtablegen/stringtable.in
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/strtablegen/stringtable.in	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,12 @@
+Channel-Identifier
+Active-Request-Id-List
+Proxy-Sync-Id
+Accept-Charset
+Content-Type
+Content-Id
+Content-Base
+Content-Encoding
+Content-Location
+Content-Length
+Cache-Control
+Logging-Tag

Added: freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,163 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+		
+		
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/unimrcp/unimrcp.sln
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/unimrcp.sln	Tue Jun 16 17:31:19 2009
@@ -0,0 +1,272 @@
+?
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{5377DC3A-DB96-4819-8AAF-2A75F3A69119}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "platforms", "platforms", "{8E282AE2-038C-49FE-AC67-BC9615AFD800}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{09BABD45-8F30-4F99-B8B8-8DD78F6804DB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpserver", "platforms\unimrcp-server\unimrcpserver.vcproj", "{592CF22D-3F8F-4A77-A174-130D77B7623B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {C98AF157-352E-4737-BD30-A24E2647F5AE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\apr-toolkit\aprtoolkit.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\mpf\mpf.vcproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\mrcp\mrcp.vcproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\mrcp-signaling\mrcpsignaling.vcproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpserver", "libs\mrcp-server\mrcpserver.vcproj", "{18B1F35A-10F8-4287-9B37-2D10501B0B38}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpserver", "platforms\libunimrcp-server\libunimrcpserver.vcproj", "{C98AF157-352E-4737-BD30-A24E2647F5AE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {18B1F35A-10F8-4287-9B37-2D10501B0B38}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "modules\mrcp-sofiasip\mrcpsofiasip.vcproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\mrcp-client\mrcpclient.vcproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpclient", "platforms\libunimrcp-client\libunimrcpclient.vcproj", "{EE157390-1E85-416C-946E-620E32C9AD33}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {72782932-37CC-46AE-8C7F-9A7B1A6EE108}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpclient", "platforms\unimrcp-client\unimrcpclient.vcproj", "{57FAF32E-49FD-491F-895D-132D0D5EFE0A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EE157390-1E85-416C-946E-620E32C9AD33} = {EE157390-1E85-416C-946E-620E32C9AD33}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\mrcpv2-transport\mrcpv2transport.vcproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpengine", "libs\mrcp-engine\mrcpengine.vcproj", "{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demosynth", "plugins\demo-synth\demosynth.vcproj", "{92BFA534-C419-4EB2-AAA3-510653F38F08}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demorecog", "plugins\demo-recog\demorecog.vcproj", "{B495B6D9-AF84-479D-B30A-313C16EF8BFD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strtablegen", "tests\strtablegen\strtablegen.vcproj", "{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apttest", "tests\apttest\apttest.vcproj", "{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpftest", "tests\mpftest\mpftest.vcproj", "{DCF01B1C-5268-44F3-9130-D647FABFB663}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcptest", "tests\mrcptest\mrcptest.vcproj", "{3CA97077-6210-4362-998A-D15A35EEAA08}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcepstral", "plugins\mrcp-cepstral\mrcpcepstral.vcproj", "{729EF28E-38C9-40DE-A138-87785F021411}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{62083CC3-13BF-49EA-BFE8-4C9337C0D82C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\uni-rtsp\unirtsp.vcproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtsptest", "tests\rtsptest\rtsptest.vcproj", "{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}"
+	ProjectSection(ProjectDependencies) = postProject
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "modules\mrcp-unirtsp\mrcpunirtsp.vcproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prepare", "build\tools\prepare.vcproj", "{01D63BF5-7798-4746-852A-4B45229BB735}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpservice", "build\tools\unimrcpservice.vcproj", "{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.Build.0 = Debug|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.ActiveCfg = Release|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.Build.0 = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.ActiveCfg = Debug|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.Build.0 = Debug|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.ActiveCfg = Release|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.Build.0 = Release|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.Build.0 = Debug|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.ActiveCfg = Release|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.Build.0 = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.Build.0 = Debug|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.ActiveCfg = Release|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.Build.0 = Release|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.Build.0 = Debug|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.ActiveCfg = Release|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.Build.0 = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.Build.0 = Debug|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.ActiveCfg = Release|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.Build.0 = Release|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.ActiveCfg = Debug|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.Build.0 = Debug|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.ActiveCfg = Release|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.Build.0 = Release|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.Build.0 = Debug|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.ActiveCfg = Release|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.Build.0 = Release|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.ActiveCfg = Debug|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.Build.0 = Debug|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.ActiveCfg = Release|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.Build.0 = Release|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.ActiveCfg = Debug|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.Build.0 = Debug|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.ActiveCfg = Release|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.Build.0 = Release|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.Build.0 = Debug|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.ActiveCfg = Release|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.Build.0 = Release|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.Build.0 = Debug|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.ActiveCfg = Release|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.Build.0 = Release|Win32
+		{729EF28E-38C9-40DE-A138-87785F021411}.Debug|Win32.ActiveCfg = Debug|Win32
+		{729EF28E-38C9-40DE-A138-87785F021411}.Release|Win32.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.Build.0 = Debug|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.ActiveCfg = Release|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.Build.0 = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
+		{01D63BF5-7798-4746-852A-4B45229BB735}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01D63BF5-7798-4746-852A-4B45229BB735}.Release|Win32.ActiveCfg = Release|Win32
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Release|Win32.ActiveCfg = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
+		{592CF22D-3F8F-4A77-A174-130D77B7623B} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{EE157390-1E85-416C-946E-620E32C9AD33} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{92BFA534-C419-4EB2-AAA3-510653F38F08} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{729EF28E-38C9-40DE-A138-87785F021411} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{DCF01B1C-5268-44F3-9130-D647FABFB663} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{3CA97077-6210-4362-998A-D15A35EEAA08} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{01D63BF5-7798-4746-852A-4B45229BB735} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
+	EndGlobalSection
+EndGlobal


From mikej at freeswitch.org  Tue Jun 16 15:33:40 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 17:33:40 -0500
Subject: [Freeswitch-svn] [commit] r13791 - freeswitch/trunk/libs/unimrcp
Message-ID: 

Author: mikej
Date: Tue Jun 16 17:33:40 2009
New Revision: 13791

Log:
syncing things up

Added:
   freeswitch/trunk/libs/unimrcp/.gitignore

Added: freeswitch/trunk/libs/unimrcp/.gitignore
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/.gitignore	Tue Jun 16 17:33:40 2009
@@ -0,0 +1,2 @@
+.svn
+.gitignore


From crienzo at freeswitch.org  Tue Jun 16 15:38:56 2009
From: crienzo at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 17:38:56 -0500
Subject: [Freeswitch-svn] [commit] r13792 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: crienzo
Date: Tue Jun 16 17:38:55 2009
New Revision: 13792

Log:
FS config / start timers fix

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Tue Jun 16 17:38:55 2009
@@ -31,9 +31,6 @@
  */
 #include 
 
-/* undefine to use UniMRCP's "conf/unimrcpclient.xml" style config */
-#undef MOD_UNIMRCP_FREESWITCH_CONFIG
-
 /* UniMRCP includes */
 #include "apt.h"
 #include "apt_log.h"
@@ -47,7 +44,6 @@
 #include "mrcp_recog_header.h"
 #include "mrcp_recog_resource.h"
 
-#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
 #include "mrcp_default_factory.h"
 #include "mpf_engine.h"
 #include "mpf_codec_manager.h"
@@ -56,7 +52,6 @@
 #include "mrcp_unirtsp_client_agent.h"
 #include "mrcp_client_connection.h"
 #include "apt_net.h"
-#endif
 
 /*********************************************************************************************************************************************
  * mod_unimrcp : module interface to FreeSWITCH
@@ -88,15 +83,10 @@
  * module globals
  */
 struct mod_unimrcp_globals {
-#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
 	/** max-connection-count config */
 	char *unimrcp_max_connection_count;
 	/** offer-new-connection config */
 	char *unimrcp_offer_new_connection;
-#else
-	/** mrcp-profile-path config */
-	char *unimrcp_dir;
-#endif
 	/** default-tts-profile config */
 	char *unimrcp_default_synth_profile;
 	/** default-asr-profile config */
@@ -125,13 +115,9 @@
  * Defines XML parsing instructions
  */
 static switch_xml_config_item_t instructions[] = {
-#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
 	SWITCH_CONFIG_ITEM_STRING_STRDUP("max-connection-count", CONFIG_REQUIRED, &globals.unimrcp_max_connection_count, "100", "", "The max MRCPv2 connections to manage"),
 	/* TODO figure out what this param does */
 	SWITCH_CONFIG_ITEM_STRING_STRDUP("offer-new-connection", CONFIG_REQUIRED, &globals.unimrcp_offer_new_connection, "1", "", ""),
-#else
-	SWITCH_CONFIG_ITEM_STRING_STRDUP("mrcp-profile-path", CONFIG_REQUIRED, &globals.unimrcp_dir, "../", "", "The root path for conf/unimrcpclient.xml"),
-#endif
 	SWITCH_CONFIG_ITEM_STRING_STRDUP("default-tts-profile", CONFIG_REQUIRED, &globals.unimrcp_default_synth_profile, "default", "", "The default profile to use for TTS"), 
 	SWITCH_CONFIG_ITEM_STRING_STRDUP("default-asr-profile", CONFIG_REQUIRED, &globals.unimrcp_default_recog_profile, "default", "", "The default profile to use for ASR"),
 	SWITCH_CONFIG_ITEM_STRING_STRDUP("log-level", CONFIG_REQUIRED, &globals.unimrcp_log_level, "WARNING", "EMERGENCY|ALERT|CRITICAL|ERROR|WARNING|NOTICE|INFO|DEBUG", "Logging level for UniMRCP"),
@@ -145,12 +131,10 @@
 SWITCH_MODULE_DEFINITION(mod_unimrcp, mod_unimrcp_load, mod_unimrcp_shutdown, NULL);
 
 static switch_status_t mod_unimrcp_do_config();
-#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
 static mrcp_client_t *mod_unimrcp_client_create();
 static int process_rtp_config(mrcp_client_t *client, mpf_rtp_config_t *rtp_config, const char *param, const char *val, apr_pool_t *pool);
 static int process_mrcpv1_config(rtsp_client_config_t *config, const char *param, const char *val, apr_pool_t *pool);
 static int process_mrcpv2_config(mrcp_sofia_client_config_t *config, const char *param, const char *val, apr_pool_t *pool);
-#endif
 
 /* UniMRCP <--> FreeSWITCH logging bridge */
 static apt_bool_t unimrcp_log(const char *file, int line, const char *id, apt_log_priority_e priority, const char *format, va_list arg_ptr);
@@ -395,6 +379,8 @@
 	char *result;
 	/** true, if voice has started */
 	int start_of_input;
+	/** true, if input timers have started */
+	int timers_started;
 };
 typedef struct recognizer_data recognizer_data_t;
 
@@ -432,6 +418,8 @@
 static switch_status_t recog_channel_get_results(speech_channel_t *schannel, char **results);
 static switch_status_t recog_channel_set_params(speech_channel_t *schannel, mrcp_message_t *msg, mrcp_generic_header_t *gen_hdr, mrcp_recog_header_t *recog_hdr);
 static switch_status_t recog_channel_set_header(speech_channel_t *schannel, int id, char *val, mrcp_message_t *msg, mrcp_recog_header_t *recog_hdr);
+static switch_status_t recog_channel_set_timers_started(speech_channel_t *schannel);
+
 /**
  * Inspect text to determine if its first non-whitespace text matches "match"
  * @param text the text to inspect.
@@ -480,7 +468,7 @@
 		lname = switch_core_strdup(pool, name);
 	}
 
-	if ((laudio_queue = switch_core_alloc(pool, sizeof(audio_queue_t))) == NULL) {		
+	if ((laudio_queue = switch_core_alloc(pool, sizeof(audio_queue_t))) == NULL) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue\n", lname);
 		status = SWITCH_STATUS_FALSE;
 		goto done;
@@ -520,7 +508,7 @@
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue write file\n", laudio_queue->name);
 		laudio_queue->file_write = NULL;
 	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) queue tx saved to %s\n", laudio_queue->name, laudio_queue->file_read_name);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) queue tx saved to %s\n", laudio_queue->name, laudio_queue->file_write_name);
 	}
 #endif
 
@@ -560,7 +548,7 @@
 	if (switch_buffer_write(queue->buffer, data, *data_len) > 0) {
 		queue->write_bytes = queue->write_bytes + *data_len;
 #ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue write bytes = %d\trequested = %d\n", queue->name, (int)queue->write_bytes, (int)*data_len);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue write total = %d\trequested = %d\n", queue->name, queue->write_bytes, *data_len);
 #endif
 		if (queue->waiting <= switch_buffer_inuse(queue->buffer)) {
 			switch_thread_cond_signal(queue->cond);
@@ -580,7 +568,7 @@
  *
  * @param queue the queue to read from 
  * @param data the read data
- * @oaram data_len the amount of data requested / actual amount of data read (returned)
+ * @param data_len the amount of data requested / actual amount of data read (returned)
  * @param block 1 if blocking is allowed
  * @return SWITCH_STATUS_SUCCESS if successful.  SWITCH_STATUS_FALSE if the queue is not allocated
  */
@@ -596,7 +584,7 @@
 			queue->waiting = requested;
 			switch_thread_cond_timedwait(queue->cond, queue->mutex, SPEECH_CHANNEL_TIMEOUT_USEC);
 			if (switch_buffer_inuse(queue->buffer) < requested) {
-				requested = switch_buffer_inuse(queue->buffer);	
+				requested = switch_buffer_inuse(queue->buffer);
 			}
 		}
 		queue->waiting = 0;
@@ -605,7 +593,6 @@
 			requested = switch_buffer_inuse(queue->buffer);
 		}
 	}
-
 	if (requested == 0) {
 		*data_len = 0;
 		status = SWITCH_STATUS_FALSE;
@@ -614,14 +601,12 @@
 
 	/* read the data */
 	*data_len = switch_buffer_read(queue->buffer, data, requested);
-
 	queue->read_bytes = queue->read_bytes + *data_len;
 #ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue bytes total = %d\tread = %d\trequested = %d\n", queue->name, (int)queue->read_bytes, (int)*data_len, (int)requested);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue read total = %d\tread = %d\trequested = %d\n", queue->name, queue->read_bytes, *data_len, requested);
 	switch_size_t len = *data_len;
 	if (queue->file_read) {
-		switch_file
-_write(queue->file_read, data, &len);
+		switch_file_write(queue->file_read, data, &len);
 	}
 #endif
 
@@ -633,7 +618,7 @@
 
 /**
  * Empty the queue
- * 
+ *
  * @return SWITCH_STATUS_SUCCESS
  */
 static switch_status_t audio_queue_clear(audio_queue_t *queue)
@@ -808,7 +793,7 @@
 		codec->payload_type = 11;
 	}
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) requesting codec %s/%d/%d\n", schannel->name, schannel->codec, codec->payload_type, codec->sampling_rate);
-	if(schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {	
+	if(schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
 		termination = mrcp_application_sink_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
 	} else {
 		termination = mrcp_application_source_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
@@ -1238,9 +1223,11 @@
 static switch_status_t speech_channel_write(speech_channel_t *schannel, void *data, switch_size_t *len)
 {
 	audio_queue_t *queue = schannel->audio_queue;
+	switch_mutex_lock(schannel->mutex);
 	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
 		audio_queue_write(queue, data, len);
 	}
+	switch_mutex_unlock(schannel->mutex);
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -1257,11 +1244,13 @@
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	audio_queue_t *queue = schannel->audio_queue;
+	switch_mutex_lock(schannel->mutex);
 	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
 		audio_queue_read(queue, data, len, block);
 	} else {
 		status = SWITCH_STATUS_BREAK;
 	}
+	switch_mutex_unlock(schannel->mutex);
 	return status;
 }
 
@@ -1373,7 +1362,7 @@
 }
 
 /**
- * Process feed_tts request from FreeSWITCH.  This is called by FreeSWITCH after speech_open_tts.
+ * Process feed_tts request from FreeSWITCH.  This is called by FreeSWITCH after speech_open.
  * Send SPEAK request to MRCP server.
  *
  * @param sh the FreeSWITCH speech handle
@@ -1413,7 +1402,10 @@
 	if (speech_channel_read(schannel, data, &bytes_read, (*flags & SWITCH_SPEECH_FLAG_BLOCKING)) == SWITCH_STATUS_SUCCESS) {
 		/* pad data, if not enough read */
 		if (bytes_read < *datalen) {
-			memset((uint8_t *)data + bytes_read, bytes_read - *datalen, schannel->silence);
+#ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) adding %d bytes of padding\n", schannel->name, *datalen - bytes_read);
+#endif
+			memset((uint8_t *)data + bytes_read, schannel->silence, *datalen - bytes_read);
 		}
 	} else {
 		*datalen = 0;
@@ -1622,7 +1614,7 @@
 
 /**
  * Incoming TTS data from UniMRCP
- * 
+ *
  * @param stream the audio stream sending data
  * @param frame the data
  * @return TRUE
@@ -1790,6 +1782,10 @@
 	r->result = NULL;
 	r->start_of_input = 0;
 
+	/* input timers are started by default unless the start-input-timers=false param is set */
+	char *start_input_timers = switch_core_hash_find(schannel->params, "start-input-timers");
+	r->timers_started = switch_strlen_zero(start_input_timers) || strcasecmp(start_input_timers, "false");
+		
 	/* create MRCP message */
 	mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, RECOGNIZER_RECOGNIZE);
 	if (mrcp_message == NULL) {
@@ -1996,9 +1992,10 @@
 static switch_status_t recog_channel_start_input_timers(speech_channel_t *schannel)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	recognizer_data_t *r = schannel->data;
 	switch_mutex_lock(schannel->mutex);
 
-	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
+	if (schannel->state == SPEECH_CHANNEL_PROCESSING && !r->timers_started) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Starting input timers\n", schannel->name);
 		/* Send START-INPUT-TIMERS to MRCP server */
 		mrcp_message_t *mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, RECOGNIZER_START_INPUT_TIMERS);
@@ -2344,6 +2341,19 @@
 }
 
 /**
+ * Flag that the recognizer channel timers are started
+ * @param schannel the recognizer channel to flag 
+ */
+static switch_status_t recog_channel_set_timers_started(speech_channel_t *schannel)
+{
+	switch_mutex_lock(schannel->mutex);
+	recognizer_data_t *r = schannel->data;
+	r->timers_started = 1;
+	switch_mutex_unlock(schannel->mutex);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+/**
  * Process asr_open request from FreeSWITCH.
  *
  * @param ah the FreeSWITCH speech rec handle
@@ -2701,6 +2711,7 @@
 			if (message->start_line.request_state == MRCP_REQUEST_STATE_COMPLETE) {
 				if (message->start_line.status_code >= 200 && message->start_line.status_code <= 299) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) timers started\n", schannel->name);
+					recog_channel_set_timers_started(schannel);
 				} else {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) timers failed to start, status code = %d\n", schannel->name, message->start_line.status_code);
 				}
@@ -2758,7 +2769,7 @@
 	return TRUE;
 }
 
-/** 
+/**
  * UniMRCP callback requesting next frame for speech recognition
  *
  * @param stream the UniMRCP stream
@@ -2769,19 +2780,15 @@
 {
 	speech_channel_t *schannel = (speech_channel_t *)stream->obj;
 	switch_size_t to_read = frame->codec_frame.size;
-	switch_mutex_lock(schannel->mutex);
-
-	/* are we ready for data? */
-	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {	
-		/* grab the data.  pad it if there isn't enough */
-		speech_channel_read(schannel, frame->codec_frame.buffer, &to_read, 0);
+	
+	/* grab the data.  pad it if there isn't enough */
+	if (speech_channel_read(schannel, frame->codec_frame.buffer, &to_read, 0) == SWITCH_STATUS_SUCCESS) {
 		if (to_read < frame->codec_frame.size) {
 			memset((uint8_t *)frame->codec_frame.buffer + to_read, schannel->silence, frame->codec_frame.size - to_read);
 		}
 		frame->type |= MEDIA_FRAME_TYPE_AUDIO;
 	}
 
-	switch_mutex_unlock(schannel->mutex);
 	return TRUE;
 }
 
@@ -2913,8 +2920,6 @@
 	return status;
 }
 
-#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
-
 #define DEFAULT_LOCAL_IP_ADDRESS  "127.0.0.1"
 #define DEFAULT_REMOTE_IP_ADDRESS "127.0.0.1"
 #define DEFAULT_SIP_LOCAL_PORT    5090
@@ -3219,7 +3224,6 @@
 
 	return client;
 }
-#endif
 
 /**
  * Macro expands to: switch_status_t mod_unimrcp_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) 
@@ -3236,12 +3240,7 @@
 
 	/* get MRCP module configuration */
 	mod_unimrcp_do_config();
-#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
 	if ((globals.unimrcp_dir_layout = apt_default_dir_layout_create("../", pool)) == NULL) {
-#else
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mrcp-profile-path = %s\n", globals.unimrcp_dir);
-	if ((globals.unimrcp_dir_layout = apt_default_dir_layout_create(globals.unimrcp_dir, pool)) == NULL) {
-#endif
 		return SWITCH_STATUS_FALSE;
 	}
 	if (switch_strlen_zero(globals.unimrcp_default_synth_profile)) {
@@ -3262,11 +3261,7 @@
 	apt_log_ext_handler_set(unimrcp_log);
 
 	/* Create the MRCP client */
-#ifdef MOD_UNIMRCP_FREESWITCH_CONFIG
 	if ((globals.mrcp_client = mod_unimrcp_client_create()) == NULL) {
-#else
-	if ((globals.mrcp_client = unimrcp_client_create(globals.unimrcp_dir_layout)) == NULL) {
-#endif
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create mrcp client\n");
 		return SWITCH_STATUS_FALSE;
 	}


From mikej at freeswitch.org  Tue Jun 16 15:41:27 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 17:41:27 -0500
Subject: [Freeswitch-svn] [commit] r13793 - in freeswitch/trunk: .
	libs/unimrcp src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mikej
Date: Tue Jun 16 17:41:26 2009
New Revision: 13793

Log:
working on build integration for libunimrcp

Added:
   freeswitch/trunk/libs/unimrcp/.update
   freeswitch/trunk/libs/unimrcp/configure.gnu
Modified:
   freeswitch/trunk/bootstrap.sh
   freeswitch/trunk/configure.in
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile

Modified: freeswitch/trunk/bootstrap.sh
==============================================================================
--- freeswitch/trunk/bootstrap.sh	(original)
+++ freeswitch/trunk/bootstrap.sh	Tue Jun 16 17:41:26 2009
@@ -5,7 +5,7 @@
 LIBDIR=${BASEDIR}/libs;
 SUBDIRS="ilbc curl iksemel voipcodecs \
         js js/nsprpub libdingaling libedit libsndfile pcre sofia-sip \
-        speex sqlite srtp openzap spandsp libg722_1 portaudio";
+        speex sqlite srtp openzap spandsp libg722_1 portaudio unimrcp";
 
 
 if [ ! -f modules.conf ]; then 

Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in	(original)
+++ freeswitch/trunk/configure.in	Tue Jun 16 17:41:26 2009
@@ -815,6 +815,7 @@
 AC_CONFIG_SUBDIRS(libs/speex)
 AC_CONFIG_SUBDIRS(libs/portaudio)
 AC_CONFIG_SUBDIRS(libs/openzap)
+AC_CONFIG_SUBDIRS(libs/unimrcp)
 AC_CHECK_LIB([tiff], [TIFFOpen], AC_CONFIG_SUBDIRS(libs/spandsp), , -lm)
 
 AC_OUTPUT

Added: freeswitch/trunk/libs/unimrcp/.update
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/.update	Tue Jun 16 17:41:26 2009
@@ -0,0 +1 @@
+Tue Jun 16 17:36:06 CDT 2009

Added: freeswitch/trunk/libs/unimrcp/configure.gnu
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/configure.gnu	Tue Jun 16 17:41:26 2009
@@ -0,0 +1,3 @@
+#! /bin/sh
+./configure "$@" --with-apr=../apr --disable-shared --with-pic --with-apr-utils=../apr-utils --with-sofia-sip=../sofia-sip
+

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile	Tue Jun 16 17:41:26 2009
@@ -21,7 +21,7 @@
 
 include $(BASE)/build/modmake.rules
 
-$(UNIMRCPLA): $(UNIMRCP_DIR)
+$(UNIMRCPLA): $(UNIMRCP_DIR) $(UNIMRCP_DIR)/.update
 	cd $(UNIMRCP_DIR) && $(MAKE)
 	$(TOUCH_TARGET)
 


From mikej at freeswitch.org  Tue Jun 16 15:42:36 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 17:42:36 -0500
Subject: [Freeswitch-svn] [commit] r13794 - freeswitch/trunk/libs/unimrcp
Message-ID: 

Author: mikej
Date: Tue Jun 16 17:42:36 2009
New Revision: 13794

Log:
poke

Modified:
   freeswitch/trunk/libs/unimrcp/.gitignore

Modified: freeswitch/trunk/libs/unimrcp/.gitignore
==============================================================================
--- freeswitch/trunk/libs/unimrcp/.gitignore	(original)
+++ freeswitch/trunk/libs/unimrcp/.gitignore	Tue Jun 16 17:42:36 2009
@@ -1,2 +1,4 @@
 .svn
 .gitignore
+.update
+configure.gnu


From mikej at freeswitch.org  Tue Jun 16 16:02:08 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 18:02:08 -0500
Subject: [Freeswitch-svn] [commit] r13795 - freeswitch/trunk/libs/unimrcp
Message-ID: 

Author: mikej
Date: Tue Jun 16 18:02:08 2009
New Revision: 13795

Log:
fix bootstrap

Added:
   freeswitch/trunk/libs/unimrcp/acinclude.m4

Added: freeswitch/trunk/libs/unimrcp/acinclude.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/unimrcp/acinclude.m4	Tue Jun 16 18:02:08 2009
@@ -0,0 +1,6 @@
+m4_include([build/acmacros/apr.m4])
+m4_include([build/acmacros/apu.m4])
+m4_include([build/acmacros/find_apr.m4])
+m4_include([build/acmacros/find_apu.m4])
+m4_include([build/acmacros/sofia-sip.m4])
+m4_include([build/acmacros/swift.m4])


From mikej at freeswitch.org  Tue Jun 16 16:04:16 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 18:04:16 -0500
Subject: [Freeswitch-svn] [commit] r13796 - in
	freeswitch/trunk/libs/unimrcp: . build build/pkgconfig libs
	libs/apr-toolkit libs/mpf libs/mrcp libs/mrcp-client
	libs/mrcp-engine libs/mrcp-server libs/mrcp-signaling
	libs/mrcpv2-transport libs/uni-rtsp modules
	modules/mrcp-sofiasip modules/mrcp-unirtsp platforms
	platforms/libunimrcp-client platforms/libunimrcp-server
	platforms/unimrcp-client platforms/unimrcp-server plugins
	plugins/demo-recog plugins/demo-synth plugins/mrcp-cepstral
	tests tests/apttest tests/mpftest tests/mrcptest
	tests/rtsptest tests/strtablegen
Message-ID: 

Author: mikej
Date: Tue Jun 16 18:04:15 2009
New Revision: 13796

Log:
svn:ignore

Modified:
   freeswitch/trunk/libs/unimrcp/   (props changed)
   freeswitch/trunk/libs/unimrcp/build/   (props changed)
   freeswitch/trunk/libs/unimrcp/build/pkgconfig/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mpf/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/   (props changed)
   freeswitch/trunk/libs/unimrcp/modules/   (props changed)
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/   (props changed)
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/   (props changed)
   freeswitch/trunk/libs/unimrcp/plugins/   (props changed)
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/   (props changed)
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/   (props changed)
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/apttest/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/mpftest/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/   (props changed)


From mikej at freeswitch.org  Tue Jun 16 16:07:19 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 18:07:19 -0500
Subject: [Freeswitch-svn] [commit] r13797 - freeswitch/trunk/libs/unimrcp
Message-ID: 

Author: mikej
Date: Tue Jun 16 18:07:18 2009
New Revision: 13797

Log:
s/s//

Modified:
   freeswitch/trunk/libs/unimrcp/configure.gnu

Modified: freeswitch/trunk/libs/unimrcp/configure.gnu
==============================================================================
--- freeswitch/trunk/libs/unimrcp/configure.gnu	(original)
+++ freeswitch/trunk/libs/unimrcp/configure.gnu	Tue Jun 16 18:07:18 2009
@@ -1,3 +1,3 @@
 #! /bin/sh
-./configure "$@" --with-apr=../apr --disable-shared --with-pic --with-apr-utils=../apr-utils --with-sofia-sip=../sofia-sip
+./configure "$@" --with-apr=../apr --disable-shared --with-pic --with-apr-util=../apr-util --with-sofia-sip=../sofia-sip
 


From brian at freeswitch.org  Tue Jun 16 16:11:46 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 18:11:46 -0500
Subject: [Freeswitch-svn] [commit] r13798 - freeswitch/trunk/build
Message-ID: 

Author: brian
Date: Tue Jun 16 18:11:45 2009
New Revision: 13798

Log:
 adding to modules.conf.in 

Modified:
   freeswitch/trunk/build/modules.conf.in

Modified: freeswitch/trunk/build/modules.conf.in
==============================================================================
--- freeswitch/trunk/build/modules.conf.in	(original)
+++ freeswitch/trunk/build/modules.conf.in	Tue Jun 16 18:11:45 2009
@@ -23,6 +23,7 @@
 #applications/mod_memcache
 #applications/mod_spy
 applications/mod_cluechoo
+#asr_tts/mod_unimrcp
 #asr_tts/mod_flite
 #asr_tts/mod_pocketsphinx
 #asr_tts/mod_cepstral


From andrew at freeswitch.org  Tue Jun 16 20:36:45 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 22:36:45 -0500
Subject: [Freeswitch-svn] [commit] r13799 - in freeswitch/trunk/src: .
	include
Message-ID: 

Author: andrew
Date: Tue Jun 16 22:36:45 2009
New Revision: 13799

Log:
Wrap apr_mcast_hops as switch_mcast_hops


Modified:
   freeswitch/trunk/src/include/switch_apr.h
   freeswitch/trunk/src/switch_apr.c

Modified: freeswitch/trunk/src/include/switch_apr.h
==============================================================================
--- freeswitch/trunk/src/include/switch_apr.h	(original)
+++ freeswitch/trunk/src/include/switch_apr.h	Tue Jun 16 22:36:45 2009
@@ -1198,6 +1198,14 @@
  */
 SWITCH_DECLARE(switch_status_t) switch_mcast_join(switch_socket_t *sock, switch_sockaddr_t *join, switch_sockaddr_t *iface, switch_sockaddr_t *source);
 
+/**
+ * Set the Multicast Time to Live (ttl) for a multicast transmission.
+ * @param sock The socket to set the multicast ttl
+ * @param ttl Time to live to Assign. 0-255, default=1
+ * @remark If the TTL is 0, packets will only be seen by sockets on the local machine,
+ *     and only when multicast loopback is enabled.
+ */
+SWITCH_DECLARE(switch_status_t) switch_mcast_hops(switch_socket_t *sock, int32_t ttl);
 
 
 /** @} */

Modified: freeswitch/trunk/src/switch_apr.c
==============================================================================
--- freeswitch/trunk/src/switch_apr.c	(original)
+++ freeswitch/trunk/src/switch_apr.c	Tue Jun 16 22:36:45 2009
@@ -737,6 +737,11 @@
 	return apr_mcast_join(sock, join, iface, source);
 }
 
+SWITCH_DECLARE(switch_status_t) switch_mcast_hops(switch_socket_t *sock, int32_t ttl)
+{
+	return apr_mcast_hops(sock, ttl);
+}
+
 
 /* socket functions */
 


From andrew at freeswitch.org  Tue Jun 16 20:44:47 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 22:44:47 -0500
Subject: [Freeswitch-svn] [commit] r13800 - in freeswitch/trunk/src: .
	include
Message-ID: 

Author: andrew
Date: Tue Jun 16 22:44:47 2009
New Revision: 13800

Log:
int32_t -> uint8_t


Modified:
   freeswitch/trunk/src/include/switch_apr.h
   freeswitch/trunk/src/switch_apr.c

Modified: freeswitch/trunk/src/include/switch_apr.h
==============================================================================
--- freeswitch/trunk/src/include/switch_apr.h	(original)
+++ freeswitch/trunk/src/include/switch_apr.h	Tue Jun 16 22:44:47 2009
@@ -1205,7 +1205,7 @@
  * @remark If the TTL is 0, packets will only be seen by sockets on the local machine,
  *     and only when multicast loopback is enabled.
  */
-SWITCH_DECLARE(switch_status_t) switch_mcast_hops(switch_socket_t *sock, int32_t ttl);
+SWITCH_DECLARE(switch_status_t) switch_mcast_hops(switch_socket_t *sock, uint8_t ttl);
 
 
 /** @} */

Modified: freeswitch/trunk/src/switch_apr.c
==============================================================================
--- freeswitch/trunk/src/switch_apr.c	(original)
+++ freeswitch/trunk/src/switch_apr.c	Tue Jun 16 22:44:47 2009
@@ -737,7 +737,7 @@
 	return apr_mcast_join(sock, join, iface, source);
 }
 
-SWITCH_DECLARE(switch_status_t) switch_mcast_hops(switch_socket_t *sock, int32_t ttl)
+SWITCH_DECLARE(switch_status_t) switch_mcast_hops(switch_socket_t *sock, uint8_t ttl)
 {
 	return apr_mcast_hops(sock, ttl);
 }


From jmesquita at freeswitch.org  Tue Jun 16 20:56:59 2009
From: jmesquita at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 22:56:59 -0500
Subject: [Freeswitch-svn] [commit] r13801 - in
	freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp: .
	commons/include
Message-ID: 

Author: jmesquita
Date: Tue Jun 16 22:56:59 2009
New Revision: 13801

Log:
I am almost there. States are OK for outgoing call but something is missing on INCOMING call.

Modified:
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp
   freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/commons/include/k3lapi.hpp	Tue Jun 16 22:56:59 2009
@@ -49,6 +49,15 @@
 		int32         rc;
 	};
 
+	struct invalid_session
+	{
+		invalid_session(unsigned int _device, unsigned int _channel)
+		: device(_device), channel(_channel) {};
+		
+		unsigned int device;
+        unsigned int channel;
+	};
+
 	struct invalid_device
 	{
 		invalid_device(unsigned int _device)
@@ -215,9 +224,12 @@
 
     switch_core_session_t * getSession(unsigned int boardId, unsigned int chanId)
     {
+        switch_core_session_t * session = NULL;
 		if (!valid_channel(boardId, chanId))
 			throw invalid_channel(boardId, chanId);
-        return _KChannel[boardId][chanId].getSession();
+        session = _KChannel[boardId][chanId].getSession();
+        if (session == NULL) { throw invalid_session(boardId, chanId); }
+        return session;
     }
 
  protected:

Modified: freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp
==============================================================================
--- freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	(original)
+++ freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp/mod_khomp.cpp	Tue Jun 16 22:56:59 2009
@@ -132,6 +132,7 @@
 static void printChannels(switch_stream_handle_t* stream, unsigned int device, unsigned int link);
 /* Handles callbacks and events from the boards */
 static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e);
+KLibraryStatus khomp_channel_from_event(unsigned int KDeviceId, unsigned int KChannel, K3L_EVENT * event);
 
 
 
@@ -530,7 +531,7 @@
         try {
             /* Lets make the call! */
             char params[ 255 ];
-            sprintf(params, "dest_addr=\"%s\"", argv[2]);
+            sprintf(params, "dest_addr=\"%s\" orig_addr=\"%s\"", argv[2], outbound_profile->caller_id_number);
             switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "We are calling with params: %s.\n", params);
             k3l->command(tech_pvt->KDeviceId,tech_pvt->KChannel, CM_MAKE_CALL, params); 
         }
@@ -1004,6 +1005,104 @@
 }
 /* End of helper functions */
 
+/* Create a new channel on incoming call */
+KLibraryStatus khomp_channel_from_event(unsigned int KDeviceId, unsigned int KChannel, K3L_EVENT * event)
+{
+	switch_core_session_t *session = NULL;
+	private_t *tech_pvt = NULL;
+	switch_channel_t *channel = NULL;
+	char name[128];
+	
+	if (!(session = switch_core_session_request(khomp_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Initilization Error!\n");
+		return ksFail;
+	}
+	
+	switch_core_session_add_stream(session, NULL);
+	
+	tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t));
+	assert(tech_pvt != NULL);
+	channel = switch_core_session_get_channel(session);
+	if (tech_init(tech_pvt, session) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Initilization Error!\n");
+		switch_core_session_destroy(&session);
+		return ksFail;
+	}
+	
+
+    /* Get all data from event */
+    std::string cidNum; 
+    std::string destination_number; 
+    try
+    {
+        cidNum = k3l->get_param(event, "orig_addr");
+        destination_number = k3l->get_param(event, "dest_addr");
+    }
+    catch ( K3LAPI::get_param_failed & err )
+    {
+        // TODO: Can we set NULL variables? What should we do if this fails?
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not get param %s on channel %u, board %u.\n", err.name.c_str(), KChannel, KDeviceId);
+    }
+
+	/*if (switch_strlen_zero(sigmsg->channel->caller_data.cid_num.digits)) {
+		if (!switch_strlen_zero(sigmsg->channel->caller_data.ani.digits)) {
+			switch_set_string(sigmsg->channel->caller_data.cid_num.digits, sigmsg->channel->caller_data.ani.digits);
+		} else {
+			switch_set_string(sigmsg->channel->caller_data.cid_num.digits, sigmsg->channel->chan_number);
+		}
+	}
+    */
+
+    /* Set the caller profile - Look at documentation */
+	tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
+														 "Khomp",
+														 "XML", // TODO: Dialplan module to use?
+                                                         NULL,
+                                                         NULL,
+														 NULL,
+                                                         cidNum.c_str(),
+                                                         NULL,
+                                                         NULL,
+														 (char *) modname,
+														 "default", // TODO: Context to look for on the dialplan?
+														 destination_number.c_str());
+
+	assert(tech_pvt->caller_profile != NULL);
+    /* END */
+
+    /* WHAT??? - Look at documentation */
+    //switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_NONE);
+    /* END */
+	
+    /* */
+	snprintf(name, sizeof(name), "Khomp/%u/%u/%s", KDeviceId, KChannel, tech_pvt->caller_profile->destination_number);
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connect inbound channel %s\n", name);
+	switch_channel_set_name(channel, name);
+	switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
+    /* END */
+
+		
+	switch_channel_set_state(channel, CS_INIT);
+	if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
+		switch_core_session_destroy(&session);
+		return ksFail;
+	}
+
+    /* WHAT?
+	if (zap_channel_add_token(sigmsg->channel, switch_core_session_get_uuid(session), 0) != ZAP_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error adding token\n");
+		switch_core_session_destroy(&session);
+		return ZAP_FAIL;
+	}
+    */
+
+    /* Set the session to the channel */
+    k3l->setSession(KDeviceId, KChannel, session);
+
+    return ksSuccess;
+}
+
 
 static int32 Kstdcall EventCallBack(int32 obj, K3L_EVENT * e)
 {				
@@ -1012,6 +1111,11 @@
     {
         case EV_NEW_CALL:   
             switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "New call on %u to %s. [EV_NEW_CALL]\n", obj, k3l->get_param(e, "dest_addr").c_str());
+            if (khomp_channel_from_event(e->DeviceId, obj, e) != ksSuccess )
+            {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Something bad happened while getting channel session. Device:%u/Channel:%u. [EV_CONNECT]\n", e->DeviceId, obj);
+                return ksFail;
+            }
             try {
                 k3l->command(e->DeviceId, obj, CM_RINGBACK, NULL); 
                 k3l->command(e->DeviceId, obj, CM_CONNECT, NULL); 
@@ -1021,24 +1125,46 @@
                 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not set board channel status! [EV_NEW_CALL]\n");
             }
             break;
-        case EV_DISCONNECT:   
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Called party dropped the call on: %u. Releasing channel. [EV_DISCONNECT]\n", obj);
-            /* Do we need to release on the board? */
-            k3l->command(e->DeviceId, obj, CM_DISCONNECT, NULL);
-            try {
-                k3l->setSession(e->DeviceId, obj, NULL);
-            }
-            catch(K3LAPI::invalid_channel & err)
+        case EV_DISCONNECT:
             {
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Called party dropped the call on: %u. Releasing channel. [EV_DISCONNECT]\n", obj);
+                switch_core_session_t * session = NULL;
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Called party dropped the call on: %u. Releasing channel. [EV_DISCONNECT]\n", obj);
+                try
+                {
+                    session = k3l->getSession(e->DeviceId, obj);
+                }
+                catch(K3LAPI::invalid_channel & err)
+                {
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Session does not exist on channel: %u on board %u. Releasing board channel anyway. [EV_DISCONNECT]\n", obj, e->DeviceId);
+                }
+                if (channel_on_hangup(session) != SWITCH_STATUS_SUCCESS)
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not hangup channel: %u on board %u. Releasing board channel anyway. [EV_DISCONNECT]\n", obj, e->DeviceId);
+                try
+                {
+                    k3l->setSession(e->DeviceId, obj, NULL);
+                }
+                catch(K3LAPI::invalid_channel & err)
+                {
+                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "We are trying to set session on an non existent channel: %u on board %u. Releasing channel. [EV_DISCONNECT]\n", obj, e->DeviceId);
+                }
+                /* Do we need to release on the board? */
+                k3l->command(e->DeviceId, obj, CM_DISCONNECT, NULL);
             }
             break;
         case EV_CONNECT:
-            switch_channel_t *channel;
-            /* TODO: We should check if the session is there before getting the channel. */
-            channel = switch_core_session_get_channel(k3l->getSession(e->DeviceId ,obj));
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Call will be answered on board %u, channel %u. [EV_CONNECT]\n", e->DeviceId, obj);
-            switch_channel_mark_answered(channel);
+            switch_core_session_t* session;
+            try
+            {
+                session = k3l->getSession(e->DeviceId ,obj);
+                switch_channel_t *channel;
+                channel = switch_core_session_get_channel(session);
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Call will be answered on board %u, channel %u. [EV_CONNECT]\n", e->DeviceId, obj);
+                switch_channel_mark_answered(channel);
+            }
+            catch (K3LAPI::invalid_session & err)
+            {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Something bad happened while getting channel session. Device:%u/Channel:%u. [EV_CONNECT]\n", e->DeviceId, obj);
+            }
             break;
         case EV_CALL_SUCCESS:
             /* TODO: Should we bridge here? Maybe check a certain variable if we should generate ringback? */
@@ -1095,7 +1221,7 @@
             switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel %u on board %u reported failure. [EV_CHANNEL_FAIL]\n", obj, e->DeviceId);
             break;
         case EV_LINK_STATUS:
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Link %u on board %u changed. [EV_LINK_STATUS]\n", e->DeviceId, obj);
+            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Link %u on board %u changed. [EV_LINK_STATUS]\n", e->DeviceId, obj);
             break;
         case EV_PHYSICAL_LINK_DOWN:
             switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Link %u on board %u is DOWN. [EV_PHYSICAL_LINK_DOWN]\n", e->DeviceId, obj);


From andrew at freeswitch.org  Tue Jun 16 21:15:45 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 23:15:45 -0500
Subject: [Freeswitch-svn] [commit] r13802 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Tue Jun 16 23:15:45 2009
New Revision: 13802

Log:
Make ttl configurable for event_multicast


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	Tue Jun 16 23:15:45 2009
@@ -55,6 +55,7 @@
 	uint8_t event_list[SWITCH_EVENT_ALL + 1];
 	int running;
 	switch_event_node_t *node;
+	uint8_t ttl;
 } globals;
 
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address);
@@ -74,6 +75,8 @@
 	globals.host_hash = switch_hashfunc_default(globals.hostname, &hlen);
 	globals.key_count = 0;
 
+	globals.ttl = 1;
+
 	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
 		return SWITCH_STATUS_TERM;
@@ -95,7 +98,15 @@
 				set_global_bindings(val);
 			} else if (!strcasecmp(var, "port")) {
 				globals.port = (switch_port_t) atoi(val);
+			} else if (!strcasecmp(var, "ttl")) {
+				int ttl = atoi(val);
+				if ((ttl && ttl <= 255)  || !strcmp(val, "0")) {
+					globals.ttl = (uint8_t) ttl;
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid ttl '%s' specified, using default of 1\n", val);
+				}
 			}
+
 		}
 	}
 
@@ -222,6 +233,12 @@
 		return SWITCH_STATUS_TERM;
 	}
 
+	if (switch_mcast_hops(globals.udp_socket, globals.ttl) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to set ttl to '%d'\n", globals.ttl);
+		switch_socket_close(globals.udp_socket);
+		return SWITCH_STATUS_TERM;
+	}
+
 	if (switch_socket_bind(globals.udp_socket, globals.addr) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bind Error\n");
 		switch_socket_close(globals.udp_socket);


From andrew at freeswitch.org  Tue Jun 16 21:21:28 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 23:21:28 -0500
Subject: [Freeswitch-svn] [commit] r13803 -
	freeswitch/trunk/conf/autoload_configs
Message-ID: 

Author: andrew
Date: Tue Jun 16 23:21:28 2009
New Revision: 13803

Log:
Add ttl parameter to sample config


Modified:
   freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml

Modified: freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml	Tue Jun 16 23:21:28 2009
@@ -3,6 +3,7 @@
     
     
     
+    
   
 
 


From brian at freeswitch.org  Tue Jun 16 21:53:05 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Tue, 16 Jun 2009 23:53:05 -0500
Subject: [Freeswitch-svn] [commit] r13804 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: brian
Date: Tue Jun 16 23:53:04 2009
New Revision: 13804

Log:
 fix new line on this debug print 

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Tue Jun 16 23:53:04 2009
@@ -3160,7 +3160,7 @@
 						client = NULL;
 						goto done;
 					}
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading Param %s:%s", param_name, param_value);
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading Param %s:%s\n", param_name, param_value);
 					if (!process_mrcpv1_config(config, param_name, param_value, pool) && 
 						!process_rtp_config(client, rtp_config, param_name, param_value, pool)) {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown param %s\n", param_name);
@@ -3187,7 +3187,7 @@
 						client = NULL;
 						goto done;
 					}
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading Param %s:%s", param_name, param_value);
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading Param %s:%s\n", param_name, param_value);
 					if (!process_mrcpv2_config(config, param_name, param_value, pool) &&
 						!process_rtp_config(client, rtp_config, param_name, param_value, pool)) {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown param %s\n", param_name);


From brian at freeswitch.org  Tue Jun 16 22:09:00 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 00:09:00 -0500
Subject: [Freeswitch-svn] [commit] r13805 -
	freeswitch/trunk/scripts/contrib/shahzad
Message-ID: 

Author: brian
Date: Wed Jun 17 00:09:00 2009
New Revision: 13805

Log:
 add shahzad contrib 

Added:
   freeswitch/trunk/scripts/contrib/shahzad/


From mcollins at freeswitch.org  Tue Jun 16 22:15:33 2009
From: mcollins at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 00:15:33 -0500
Subject: [Freeswitch-svn] [commit] r13806 - freeswitch/trunk/docs
Message-ID: 

Author: mcollins
Date: Wed Jun 17 00:15:33 2009
New Revision: 13806

Log:
Update ChangeLog through r13805

Modified:
   freeswitch/trunk/docs/ChangeLog

Modified: freeswitch/trunk/docs/ChangeLog
==============================================================================
--- freeswitch/trunk/docs/ChangeLog	(original)
+++ freeswitch/trunk/docs/ChangeLog	Wed Jun 17 00:15:33 2009
@@ -69,6 +69,7 @@
 	build: Check for ifaddrs.h before including it (r:13600/FSBUILD-168)
 	build: fix jobserver unavailable bug in make -j (r:13623/FSBUILD-6)
 	build: clean/uninstall disabled modules as well (r:13716/FSBUILD-85)
+	build: fix msvc pcre build for pcre 7.9 (r:13729)
 	config: default config, calling own extension no longer goes to voicemail (r:12596)
 	config: default config, 1000-1019 uses $${default_password} instead of hard-coded 1234 (FSCONFIG-5/r:12838)
 	config: tweak the configs to bind siptrace on and off to F10 and F11 (r:12938)
@@ -209,6 +210,9 @@
 	core: add hunt_caller_profile (r:13625,13626)
 	core: add usec delta to log (r:13647)
 	core: add padding to cycles on session_record (r:13648)
+	core: Export swtich_inet_ntop so modules can use it (r:13738)
+	core: record_sample_rate variable influences the rate record app will use (r:13767,13768,13769)
+	core: init buffer in lead out on speak (r:13787)
 	docs: Fix filename references in phrase_en.xml (r:12976)
 	docs: Update phrase_en.xml to include v1.0.8 sound prompts (r:13041)
 	docs: Updates to phrase_es.xml (r:13067)
@@ -251,6 +255,7 @@
 	libesl: fix Phantom events when doing several bgapi calls without interleaving them with recvEvent (ESL-12/r:13217)
 	libesl: add Ruby example for ESL (ESL-15/r:13235)
 	libesl: add INFO example for Perl (r:13293)
+	libesl: add socketDescriptor() method to ESL::Connection obj (r:13770)
 	libiksemel: let return 0 be a failure on read in iks to avoid cpu race (r:13123,13124,13133)
 	libnatpmp: add (r:13510)
 	libnspr: fix bsd port packaging (r:13715/FSBUILD-170)
@@ -265,6 +270,7 @@
 	libsofiasip: subscription-state subexp-params missing (r:13439/SFSIP-148)
 	libsofiasip: fix re-register after 423 w/ Min-Expires (r:13619/SFSIP-143)
 	libsofiasip: use addres, id, and version from user sdp if they exist (r:13621)
+	libsofiasip: handle mid-line comments in resolv.conf patch from Lee Verberne (SFSIP-152/r:13749)
 	libspandsp: update to snapshot 20090308 (r:12514)
 	libspandsp: update to snapshot spandsp-20090421 (r:13086)
 	libspandsp: update to snapshot spandsp-20090427 (r:13177)
@@ -338,6 +344,7 @@
 	mod_erlang_event: Reply appropriately to net_adm:ping() (r:13066)
 	mod_erlang_event: snprintf needs a format string too, and write has the warn_unused_result attribute set, so store the return value somewhere (r:13090)
 	mod_erlang_event: fix erlang autoconf macro to deal with edge cases (MODEVENT-45/r:13288)
+	mod_erlang_event: fix FreeSWITCH crashing when sending traffic (FSCORE-379/r:13746)
 	mod_event_socket: disallow unloading mod_event_socket from event socket (r:12326,12334)
 	mod_event_socket: fix api_exec crash on OSX (MODEVENT-40,r:12349)
 	mod_event_socket: move connect command to always work on outbound socket not just the first time (r:12723)
@@ -393,6 +400,8 @@
 	mod_nibblebill: Added feature mod_nibblebill to check balance and transfer the caller to an alternate dialplan context & extension if they deplete their funds. (r:13432)
 	mod_nibblebill: cleanup, fix leak (r:13463)
 	mod_nibblebill: fix segfault (MODAPP-286/r:13662)
+	mod_nibblebill: Fixed nibblebill to bill on call start (r:13753)
+	mod_nibblebill: code before declaration (FSBUILD-172/r:13755)
 	mod_opal: Fixed transmission of Q.931 Calling-Party-Number, and DisplayName on H.323 Setup (r:12347)
 	mod_opal: allocate frame from session pool so it will not go out of scope (r:12811)
 	mod_opal: disable visibility support broken in newer gcc (MODENDP-190/r:12923)
@@ -404,6 +413,7 @@
 	mod_opal: Fixed incorrect include path (r:13239)
 	mod_perl: Libtool build fix for mod_perl: use LIBTOOL_LIB_EXTEN to make libtool-2.2 happy and CXXLINK since we are linking a C++ lib (r:13080)
 	mod_pocketsphinx: Revamp mod_pocketsphinx to use jsgf format (r:12224)
+	mod_pocketsphinx: now you can specify the dictionary to use in the config file (r:13747)
 	mod_portaudio: fix audio issue in portaudio (r:12669)
 	mod_python: fix core dump when using startup script (MODLANG-106/r:12648)
 	mod_python: fix python failing during loading startup modules (MODLANG-105/r:12658)
@@ -494,8 +504,12 @@
 	mod_sofia: Update CID on Polycom when doing an Attended transfer, Make send_display work with Polycom and others, add patch with mods from SFSIP-111 (r:13492/SFSIP-111)
 	mod_sofia: handle vegastream broken sip info packets (r:13506)
 	mod_sofia: Rewrite sofia_glue_get_user_host (r:13543)
-	mod_sofia: Move siptrace to loglevel INFO (r:13615)
 	mod_sofia: Fix NOTIFY message sending incorrect information (MODENDP-225/r:13719)
+	mod_sofia: add sofia tracelevel  and tracelevel param in  (r:13735)
+	mod_sofia: Fix wrong contact header in SIP on incoming calls and NAT (SFSIP-151/r:13736)
+	mod_sofia: increase compat on NDLB-to-in-200-contact to handle NAT (r:13759)
+	mod_sofia: fix segfault (FSCORE-382/r:13774)
+	mod_sofia: Fix multicast replication of sofia registrations (r:13786)
 	mod_spy: add new module, mod_spy (MODAPP-260/r:13035,13036)
 	mod_syslog: Keep the indent string in memory (LOGGER-1/r:12852)
 	mod_t38gateway: Introduction of the skeleton of a media bug implementing a T.38 gateway, so the
@@ -514,6 +528,7 @@
 	mod_voicemail: rework vm_boxcount api and add an optional profile parameter (r:13283)
 	mod_voicemail: add voicemail disk quota (MODAPP-173/r:13314)
 	mod_voicemail: abolish mailbox attribute in users and use number-alias attribute instead (MODAPP-218/r:13377,13378,13379,13380,13381)
+	mod_unimrcp: add to trunk (r:13788,13789,13790,13791)
 	mod_xml_curl: fix data fetch (MODXMLINT-48/r:12586)
 	support: Add print_list gdb macro (r:12687)	
 


From stkn at freeswitch.org  Wed Jun 17 02:40:47 2009
From: stkn at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 04:40:47 -0500
Subject: [Freeswitch-svn] [commit] r13807 - freeswitch/trunk
Message-ID: 

Author: stkn
Date: Wed Jun 17 04:40:47 2009
New Revision: 13807

Log:
Remove the obsolete message about libtool-2.2 not being supported and add some indentation for readability

Modified:
   freeswitch/trunk/bootstrap.sh

Modified: freeswitch/trunk/bootstrap.sh
==============================================================================
--- freeswitch/trunk/bootstrap.sh	(original)
+++ freeswitch/trunk/bootstrap.sh	Wed Jun 17 04:40:47 2009
@@ -90,11 +90,9 @@
 libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14`}
 lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
 if test -z "$lt_pversion"; then
-echo "bootstrap: libtool not found."
-echo "           You need libtool version 1.5.14 or newer (up to 1.9.x) installed. 2.x will not work! see http://jira.freeswitch.org/browse/FSBUILD-82"
-echo "           libtool version 2.0 and above WILL NOT work."
-echo "           to build FreeSWITCH from SVN."
-exit 1
+   echo "bootstrap: libtool not found."
+   echo "           You need libtool version 1.5.14 or newer to build FreeSWITCH from SVN."
+   exit 1
 fi
 lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
 IFS=.; set $lt_version; IFS=' '
@@ -117,11 +115,9 @@
 if test $lt_status = "good"; then
    echo "bootstrap: libtool version $lt_pversion (ok)"
 else
-echo "bootstrap: libtool version $lt_pversion found."
-echo "           You need libtool version 1.5.14 or newer (up to 1.9.x) installed. 2.x will not work! see http://jira.freeswitch.org/browse/FSBUILD-82"
-echo "           to build FreeSWITCH from SVN."
-
-exit 1
+   echo "bootstrap: libtool version $lt_pversion found."
+   echo "           You need libtool version 1.5.14 or newer to build FreeSWITCH from SVN."
+   exit 1
 fi
 
 # check libtoolize availability


From stkn at freeswitch.org  Wed Jun 17 02:47:36 2009
From: stkn at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 04:47:36 -0500
Subject: [Freeswitch-svn] [commit] r13808 - freeswitch/trunk
Message-ID: 

Author: stkn
Date: Wed Jun 17 04:47:36 2009
New Revision: 13808

Log:
Add libtool22 as a possible name for the libtool command (Ubuntu)

Modified:
   freeswitch/trunk/bootstrap.sh

Modified: freeswitch/trunk/bootstrap.sh
==============================================================================
--- freeswitch/trunk/bootstrap.sh	(original)
+++ freeswitch/trunk/bootstrap.sh	Wed Jun 17 04:47:36 2009
@@ -87,7 +87,7 @@
 # output is multiline from 1.5 onwards
 
 # Require libtool 1.4 or newer
-libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool15 libtool14`}
+libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool22 libtool15 libtool14`}
 lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
 if test -z "$lt_pversion"; then
    echo "bootstrap: libtool not found."


From stkn at freeswitch.org  Wed Jun 17 03:08:07 2009
From: stkn at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 05:08:07 -0500
Subject: [Freeswitch-svn] [commit] r13809 -
	freeswitch/trunk/conf/sip_profiles
Message-ID: 

Author: stkn
Date: Wed Jun 17 05:08:06 2009
New Revision: 13809

Log:
Fix c&p error in comment

Modified:
   freeswitch/trunk/conf/sip_profiles/internal.xml

Modified: freeswitch/trunk/conf/sip_profiles/internal.xml
==============================================================================
--- freeswitch/trunk/conf/sip_profiles/internal.xml	(original)
+++ freeswitch/trunk/conf/sip_profiles/internal.xml	Wed Jun 17 05:08:06 2009
@@ -136,7 +136,7 @@
     
     
     
-    
+    
     
     
     


From gmaruzz at freeswitch.org  Wed Jun 17 04:12:58 2009
From: gmaruzz at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 06:12:58 -0500
Subject: [Freeswitch-svn] [commit] r13810 -
	freeswitch/trunk/src/mod/endpoints/mod_skypiax
Message-ID: 

Author: gmaruzz
Date: Wed Jun 17 06:12:58 2009
New Revision: 13810

Log:
skypiax: removed FARMING ifdefs

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	Wed Jun 17 06:12:58 2009
@@ -1,7 +1,5 @@
 #include "skypiax.h"
 
-#undef FARMING
-
 #ifdef ASTERISK
 #define skypiax_sleep usleep
 #define skypiax_strncpy strncpy
@@ -220,7 +218,6 @@
                 tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING;
                 tech_pvt->interface_state = SKYPIAX_STATE_RING;
                 /* no owner, no active call, let's answer */
-#ifndef FARMING
                 skypiax_signaling_write(tech_pvt, "SET AGC OFF");
                 skypiax_sleep(10000);
                 skypiax_signaling_write(tech_pvt, "SET AEC OFF");
@@ -231,7 +228,6 @@
                 sprintf(msg_to_skype, "GET CALL %s PARTNER_HANDLE", id);
                 skypiax_signaling_write(tech_pvt, msg_to_skype);
                 skypiax_sleep(10000);
-#endif //FARMING
                 sprintf(msg_to_skype, "ALTER CALL %s ANSWER", id);
                 skypiax_signaling_write(tech_pvt, msg_to_skype);
                 DEBUGA_SKYPE("We answered a Skype RING on skype_call %s\n", SKYPIAX_P_LOG,
@@ -467,11 +463,7 @@
 
   memset(&my_addr, 0, sizeof(my_addr));
   my_addr.sin_family = AF_INET;
-#ifdef FARMING
-  //my_addr.sin_addr.s_addr = htonl(0x7f000001);  /* default on all addresses  */
-#else // FARMING
   my_addr.sin_addr.s_addr = htonl(0x7f000001);  /* use the localhost */
-#endif // FARMING
   my_addr.sin_port = htons(tech_pvt->tcp_srv_port);
 
   if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
@@ -516,9 +508,6 @@
       rt = select(fdselect + 1, &fs, NULL, NULL, &to);
       if (rt > 0) {
 
-#ifdef FARMING
-	      switch_sleep(500);      //seems that reconnecting through a proxy leads to half the packet size, bizarrely, 158-162, never 160 :-)
-#endif // FARMING
 	      if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
 		      len = recv(fd, (char *) srv_in, 320, 0);    //seems that Skype only sends 320 bytes at time
 	      } else {
@@ -628,11 +617,7 @@
 
   memset(&my_addr, 0, sizeof(my_addr));
   my_addr.sin_family = AF_INET;
-#ifdef FARMING
-  //my_addr.sin_addr.s_addr = htonl(0x7f000001);  /* default on all addresses */
-#else // FARMING
   my_addr.sin_addr.s_addr = htonl(0x7f000001);  /* use the localhost */
-#endif // FARMING
   my_addr.sin_port = htons(tech_pvt->tcp_cli_port);
 
   if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
@@ -1225,14 +1210,6 @@
   return (xerror != BadValue) && (xerror != BadWindow);
 }
 
-#ifdef FARMING
-int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P)
-{
-  printf("%s\n", message_P);
-  fflush(stdout);
-  return 1;
-}
-#else // FARMING
 int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P)
 {
 
@@ -1281,7 +1258,6 @@
   return 1;
 }
 
-#endif // FARMING
 int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype)
 {
   struct SkypiaxHandles *SkypiaxHandles;
@@ -1359,47 +1335,6 @@
   skypiax_sleep(1000);
 }
 
-#ifdef FARMING
-void *skypiax_do_skypeapi_thread_func(void *obj)
-{
-
-  private_t *tech_pvt = obj;
-  struct SkypiaxHandles *SkypiaxHandles;
-
-  if (!strlen(tech_pvt->X11_display))
-    strcpy(tech_pvt->X11_display, getenv("DISPLAY"));
-
-  if (!tech_pvt->tcp_srv_port)
-    tech_pvt->tcp_srv_port = 10160;
-
-  if (!tech_pvt->tcp_cli_port)
-    tech_pvt->tcp_cli_port = 10161;
-
-  if (pipe(tech_pvt->SkypiaxHandles.fdesc)) {
-    fcntl(tech_pvt->SkypiaxHandles.fdesc[0], F_SETFL, O_NONBLOCK);
-    fcntl(tech_pvt->SkypiaxHandles.fdesc[1], F_SETFL, O_NONBLOCK);
-  }
-  SkypiaxHandles = &tech_pvt->SkypiaxHandles;
-
-  SkypiaxHandles->api_connected = 1;
-
-  char *b;
-  unsigned int howmany;
-
-  while (1) {
-    char s[17000];
-
-    memset(s, '\0', 17000);
-    b = fgets(s, sizeof(s) - 1, stdin);
-    s[strlen(s) - 1] = '\0';
-    howmany = strlen(s) + 1;
-
-    howmany = write(SkypiaxHandles->fdesc[1], &s, howmany);
-
-  }
-}
-
-#else //FARMING
 void *skypiax_do_skypeapi_thread_func(void *obj)
 {
 
@@ -1551,5 +1486,4 @@
   return NULL;
 
 }
-#endif //FARMING
 #endif // WIN32


From crienzo at freeswitch.org  Wed Jun 17 05:48:06 2009
From: crienzo at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 07:48:06 -0500
Subject: [Freeswitch-svn] [commit] r13811 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: crienzo
Date: Wed Jun 17 07:48:05 2009
New Revision: 13811

Log:
specify tts profile with sh->param

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Wed Jun 17 07:48:05 2009
@@ -1309,6 +1309,7 @@
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	speech_channel_t *schannel = NULL;
+	const char *profile = sh->param;
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "speech_handle: name = %s, rate = %d, speed = %d, samples = %d, voice = %s, engine = %s, param = %s\n",
 						sh->name, sh->rate, sh->speed, sh->samples, sh->voice, sh->engine, sh->param); 
@@ -1329,7 +1330,9 @@
 	sh->private_info = schannel;
 
 	/* try to open an MRCP channel */
-	const char *profile = globals.unimrcp_default_synth_profile;
+	if (switch_strlen_zero(profile)) {
+		profile = globals.unimrcp_default_synth_profile;
+	}
 	if (speech_channel_open(schannel, profile) != SWITCH_STATUS_SUCCESS) {
 		status = SWITCH_STATUS_FALSE;
 		goto done;


From crienzo at freeswitch.org  Wed Jun 17 06:26:04 2009
From: crienzo at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 08:26:04 -0500
Subject: [Freeswitch-svn] [commit] r13812 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: crienzo
Date: Wed Jun 17 08:26:04 2009
New Revision: 13812

Log:
destroy speech channel hashes on close, module hashes on shutdown

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Wed Jun 17 08:26:04 2009
@@ -692,12 +692,6 @@
 		goto done;
 	}
 	
-	if (switch_mutex_init(&schan->mutex, SWITCH_MUTEX_UNNESTED, pool) != SWITCH_STATUS_SUCCESS || 
-		switch_thread_cond_create(&schan->cond, pool) != SWITCH_STATUS_SUCCESS ||
-		audio_queue_create(&schan->audio_queue, name, pool) != SWITCH_STATUS_SUCCESS) {
-		status = SWITCH_STATUS_FALSE;
-		goto done;
-	}
 	schan->type = type;
 	schan->application = app;
 	schan->state = SPEECH_CHANNEL_CLOSED;
@@ -705,12 +699,20 @@
 	schan->params = NULL;
 	schan->rate = rate;
 	schan->codec = switch_core_strdup(pool, codec);
+
 	if (!strcmp("L16", schan->codec)) {
 		schan->silence = 0;
 	} else {
 		/* 8-bit PCMU, PCMA */
 		schan->silence = 128;
 	}
+
+	if (switch_mutex_init(&schan->mutex, SWITCH_MUTEX_UNNESTED, pool) != SWITCH_STATUS_SUCCESS || 
+		switch_thread_cond_create(&schan->cond, pool) != SWITCH_STATUS_SUCCESS ||
+		audio_queue_create(&schan->audio_queue, name, pool) != SWITCH_STATUS_SUCCESS) {
+		status = SWITCH_STATUS_FALSE;
+		goto done;
+	}
 	switch_core_hash_init(&schan->params, pool);
 	schan->data = NULL;
 	if (switch_strlen_zero(name)) {
@@ -743,6 +745,9 @@
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Failed to destroy channel.  Continuing\n", schannel->name);
 		}
 	}
+	if (schannel->params) {
+		switch_core_hash_destroy(&schannel->params);
+	}
 	switch_mutex_unlock(schannel->mutex);
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -1710,6 +1715,12 @@
  */
 static switch_status_t synth_shutdown() 
 {
+	if (globals.synth.fs_param_map) {
+		switch_core_hash_destroy(&globals.synth.fs_param_map);
+	}
+	if (globals.synth.param_id_map) {
+		switch_core_hash_destroy(&globals.synth.param_id_map);
+	}
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -2887,6 +2898,12 @@
  */
 static switch_status_t recog_shutdown()
 {
+	if (globals.recog.fs_param_map) {
+		switch_core_hash_destroy(&globals.recog.fs_param_map);
+	}
+	if (globals.recog.param_id_map) {
+		switch_core_hash_destroy(&globals.recog.param_id_map);
+	}
 	return SWITCH_STATUS_SUCCESS;
 }
 


From brian at freeswitch.org  Wed Jun 17 07:25:36 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 09:25:36 -0500
Subject: [Freeswitch-svn] [commit] r13813 -
	freeswitch/trunk/conf/mrcp_profiles
Message-ID: 

Author: brian
Date: Wed Jun 17 09:25:35 2009
New Revision: 13813

Log:
 clean p config a little bit 

Added:
   freeswitch/trunk/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
   freeswitch/trunk/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml
   freeswitch/trunk/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml
   freeswitch/trunk/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
Removed:
   freeswitch/trunk/conf/mrcp_profiles/profiles.xml

Added: freeswitch/trunk/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml	Wed Jun 17 09:25:35 2009
@@ -0,0 +1,18 @@
+
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+

Added: freeswitch/trunk/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml	Wed Jun 17 09:25:35 2009
@@ -0,0 +1,18 @@
+
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+

Added: freeswitch/trunk/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml	Wed Jun 17 09:25:35 2009
@@ -0,0 +1,22 @@
+
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+

Added: freeswitch/trunk/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml	Wed Jun 17 09:25:35 2009
@@ -0,0 +1,18 @@
+
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+


From andrew at freeswitch.org  Wed Jun 17 09:11:53 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 11:11:53 -0500
Subject: [Freeswitch-svn] [commit] r13814 - in freeswitch/trunk: .
	libs/sofia-sip libs/sofia-sip/m4
Message-ID: 

Author: andrew
Date: Wed Jun 17 11:11:53 2009
New Revision: 13814

Log:
Use sofia's openssl configure checks in the toplevel configure script (OKed by MikeJ)


Added:
   freeswitch/trunk/libs/sofia-sip/m4/sac-pkg-config.m4
Modified:
   freeswitch/trunk/acinclude.m4
   freeswitch/trunk/configure.in
   freeswitch/trunk/libs/sofia-sip/acinclude.m4

Modified: freeswitch/trunk/acinclude.m4
==============================================================================
--- freeswitch/trunk/acinclude.m4	(original)
+++ freeswitch/trunk/acinclude.m4	Wed Jun 17 11:11:53 2009
@@ -9,4 +9,6 @@
 m4_include([build/config/erlang.m4])
 m4_include([build/config/odbc.m4])
 m4_include([libs/apr/build/apr_common.m4])
+m4_include([libs/sofia-sip/m4/sac-pkg-config.m4])
+m4_include([libs/sofia-sip/m4/sac-openssl.m4])
 m4_include([build/config/libcurl.m4])

Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in	(original)
+++ freeswitch/trunk/configure.in	Wed Jun 17 11:11:53 2009
@@ -611,6 +611,8 @@
           [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
 fi
 
+SAC_OPENSSL
+
 AX_CHECK_JAVA
 
 

Modified: freeswitch/trunk/libs/sofia-sip/acinclude.m4
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/acinclude.m4	(original)
+++ freeswitch/trunk/libs/sofia-sip/acinclude.m4	Wed Jun 17 11:11:53 2009
@@ -1,63 +1,7 @@
+m4_include([m4/sac-pkg-config.m4])
 m4_include([m4/sac-general.m4])
 m4_include([m4/sac-openssl.m4])
 m4_include([m4/sac-su2.m4])
 m4_include([m4/sac-su.m4])
 m4_include([m4/sac-tport.m4])
 m4_include([m4/sac-coverage.m4])
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
-
-

Added: freeswitch/trunk/libs/sofia-sip/m4/sac-pkg-config.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/sofia-sip/m4/sac-pkg-config.m4	Wed Jun 17 11:11:53 2009
@@ -0,0 +1,56 @@
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN([PKG_CHECK_MODULES], [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+


From mikej at freeswitch.org  Wed Jun 17 11:34:43 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 13:34:43 -0500
Subject: [Freeswitch-svn] [commit] r13815 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mikej
Date: Wed Jun 17 13:34:42 2009
New Revision: 13815

Log:
fix some windows errors (WIP)

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Wed Jun 17 13:34:42 2009
@@ -196,7 +196,7 @@
 	/** total bytes read */
 	unsigned int read_bytes;
 	/** number of bytes reader is waiting for */
-	int waiting;
+	switch_size_t waiting;
 	/** name of this queue (for logging) */
 	char *name;
 };
@@ -268,7 +268,7 @@
 	/** codec */
 	char *codec;
 	/** rate */
-	unsigned int rate;
+	uint16_t rate;
 	/** silence byte */
 	int silence;
 	/** speech channel params */
@@ -284,7 +284,7 @@
 static apt_bool_t speech_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status);
 
 /* speech_channel funcs */
-static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, const char *codec, unsigned int rate, switch_memory_pool_t *pool);
+static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, const char *codec, uint16_t rate, switch_memory_pool_t *pool);
 static switch_status_t speech_channel_open(speech_channel_t *schannel, const char *profile_name);
 static switch_status_t speech_channel_destroy(speech_channel_t *schannel);
 static switch_status_t speech_channel_stop(speech_channel_t *schannel);
@@ -431,12 +431,14 @@
 	int result = 0;
 
 	if (!switch_strlen_zero(text)) {
+		size_t textlen, matchlen;
+
 		/* find first non-space character */
 		while (switch_isspace(*text)) {
 			text++;
 		}
-		size_t textlen = strlen(text);
-		size_t matchlen = strlen(match);
+		textlen = strlen(text);
+		matchlen = strlen(match);
 		/* is there a match? */
 		result = textlen > matchlen && !strncmp(match, text, matchlen);
 	}
@@ -681,7 +683,7 @@
  * @param pool the memory pool to use
  * @return SWITCH_STATUS_SUCCESS if successful.  SWITCH_STATUS_FALSE if the channel cannot be allocated.
  */
-static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, const char *codec, unsigned int rate, switch_memory_pool_t *pool)
+static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, const char *codec, uint16_t rate, switch_memory_pool_t *pool)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	speech_channel_t *schan = NULL;
@@ -763,6 +765,7 @@
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	mpf_termination_t *termination = NULL;
+	mpf_codec_descriptor_t *codec = NULL;
 	mrcp_resource_type_e resource_type;
 
 	switch_mutex_lock(schannel->mutex);
@@ -782,7 +785,6 @@
 	}
 
 	/* create RTP endpoint and link to session channel */
-	mpf_codec_descriptor_t *codec = NULL;
 	codec = apr_palloc(schannel->unimrcp_session->pool, sizeof(mpf_codec_descriptor_t));
 	mpf_codec_descriptor_init(codec);
 	codec->channel_count = 1;
@@ -954,10 +956,11 @@
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) %s: %s\n", schannel->name, param_name, param_val);
 				synth_channel_set_header(schannel, id->id, param_val, msg, synth_hdr);
 			} else {
-				/* this is probably a vendor-specific MRCP param */
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) (vendor-specific value) %s: %s\n", schannel->name, param_name, param_val);
 				apt_str_t apt_param_name = { 0 };
 				apt_str_t apt_param_val = { 0 };
+
+				/* this is probably a vendor-specific MRCP param */
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) (vendor-specific value) %s: %s\n", schannel->name, param_name, param_val);
 				apt_string_set(&apt_param_name, param_name); /* copy isn't necessary since apt_pair_array_append will do it */
 				apt_string_set(&apt_param_val, param_val);
 				if (!gen_hdr->vendor_specific_params) {
@@ -1038,10 +1041,10 @@
 	case SYNTHESIZER_HEADER_PROSODY_VOLUME:
 		if (switch_isdigit(*val) || *val == '.') {
 			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_NUMERIC;
-			synth_hdr->prosody_param.volume.value.numeric = atof(val);
+			synth_hdr->prosody_param.volume.value.numeric = (float)atof(val);
 		} else if (*val == '+' || *val == '-') {
 			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_RELATIVE_CHANGE;
-			synth_hdr->prosody_param.volume.value.relative = atof(val);
+			synth_hdr->prosody_param.volume.value.relative = (float)atof(val);
 		} else if (!strcasecmp("silent", val)) {
 			synth_hdr->prosody_param.volume.type = PROSODY_VOLUME_TYPE_LABEL;
 			synth_hdr->prosody_param.volume.value.label = PROSODY_VOLUME_SILENT;
@@ -1073,7 +1076,7 @@
 	case SYNTHESIZER_HEADER_PROSODY_RATE:
 		if (switch_isdigit(*val) || *val == '.') {
 			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_RELATIVE_CHANGE;
-			synth_hdr->prosody_param.rate.value.relative = atof(val);
+			synth_hdr->prosody_param.rate.value.relative = (float)atof(val);
 		} else if (!strcasecmp("x-slow", val)) {
 			synth_hdr->prosody_param.rate.type = PROSODY_RATE_TYPE_LABEL;
 			synth_hdr->prosody_param.rate.value.label = PROSODY_RATE_XSLOW;
@@ -1138,6 +1141,7 @@
 
 	if (schannel->state == SPEECH_CHANNEL_PROCESSING) {
 		mrcp_method_id method;
+		mrcp_message_t *mrcp_message;
 		if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
 			method = SYNTHESIZER_STOP;
 		} else {
@@ -1145,7 +1149,7 @@
 		} 
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Stopping %s\n", schannel->name, speech_channel_type_to_string(schannel->type));
 		/* Send STOP to MRCP server */
-		mrcp_message_t *mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, method);
+		mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, method);
 		if (mrcp_message == NULL) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Failed to create STOP message\n", schannel->name);
 			status = SWITCH_STATUS_FALSE;
@@ -1315,6 +1319,8 @@
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	speech_channel_t *schannel = NULL;
 	const char *profile = sh->param;
+	int speech_channel_number = get_next_speech_channel_number();
+	char name[200] = { 0 };
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "speech_handle: name = %s, rate = %d, speed = %d, samples = %d, voice = %s, engine = %s, param = %s\n",
 						sh->name, sh->rate, sh->speed, sh->samples, sh->voice, sh->engine, sh->param); 
@@ -1322,13 +1328,11 @@
 
 	/* It would be nice if FreeSWITCH let us know which session owns this handle, but it doesn't.  So, lets
 		make our own unique name */
-	int speech_channel_number = get_next_speech_channel_number();
-	char name[200] = { 0 };
 	switch_snprintf(name, sizeof(name) - 1, "TTS-%d", speech_channel_number);
 	name[sizeof(name) - 1] = '\0';
 	
 	/* create channel container with L16 codec (what FreeSWITCH needs) */
-	if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_SYNTHESIZER, &globals.synth, "L16", rate, sh->memory_pool) != SWITCH_STATUS_SUCCESS) {
+	if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_SYNTHESIZER, &globals.synth, "L16", (uint16_t)rate, sh->memory_pool) != SWITCH_STATUS_SUCCESS) {
 		status = SWITCH_STATUS_FALSE;
 		goto done;
 	}
@@ -1781,6 +1785,9 @@
 	mrcp_message_t *mrcp_message;
 	mrcp_recog_header_t *recog_header;
 	mrcp_generic_header_t *generic_header;
+	recognizer_data_t *r;
+	char *start_input_timers;
+	const char *mime_type;
 
 	switch_mutex_lock(schannel->mutex);
 	if (schannel->state != SPEECH_CHANNEL_READY) {
@@ -1792,12 +1799,12 @@
 		status = SWITCH_STATUS_FALSE;
 		goto done;
 	}
-	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	r = (recognizer_data_t *)schannel->data;
 	r->result = NULL;
 	r->start_of_input = 0;
 
 	/* input timers are started by default unless the start-input-timers=false param is set */
-	char *start_input_timers = switch_core_hash_find(schannel->params, "start-input-timers");
+	start_input_timers = switch_core_hash_find(schannel->params, "start-input-timers");
 	r->timers_started = switch_strlen_zero(start_input_timers) || strcasecmp(start_input_timers, "false");
 		
 	/* create MRCP message */
@@ -1815,7 +1822,7 @@
 	}
 
 	/* set Content-Type */
-	const char *mime_type = grammar_type_to_mime(r->grammar->type);
+	mime_type = grammar_type_to_mime(r->grammar->type);
 	if (switch_strlen_zero(mime_type)) {
 		status = SWITCH_STATUS_FALSE;
 		goto done;
@@ -1879,10 +1886,11 @@
 static switch_status_t recog_channel_load_grammar(speech_channel_t *schannel, const char *name, grammar_type_t type, const char *data)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Loading grammar %s, data = %s\n", schannel->name, name, data);
 	grammar_t *g = NULL;
 	char *ldata = NULL;
 
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Loading grammar %s, data = %s\n", schannel->name, name, data);
+
 	switch_mutex_lock(schannel->mutex);
 	if (schannel->state != SPEECH_CHANNEL_READY) {
 		status = SWITCH_STATUS_FALSE;
@@ -1893,6 +1901,7 @@
 	if (type != GRAMMAR_TYPE_URI) {
 		mrcp_message_t *mrcp_message;
 		mrcp_generic_header_t *generic_header;
+		const char *mime_type;
 
 		/* create MRCP message */
 		mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, RECOGNIZER_DEFINE_GRAMMAR);
@@ -1907,7 +1916,7 @@
 			status = SWITCH_STATUS_FALSE;
 			goto done;
 		}
-		const char *mime_type = grammar_type_to_mime(type);
+		mime_type = grammar_type_to_mime(type);
 		if (switch_strlen_zero(mime_type)) {
 			status = SWITCH_STATUS_FALSE;
 			goto done;
@@ -1968,8 +1977,8 @@
 	if (switch_strlen_zero(grammar_name)) {
 		status = SWITCH_STATUS_FALSE;
 	} else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Unloading grammar %s\n", schannel->name, grammar_name);
 		recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Unloading grammar %s\n", schannel->name, grammar_name);
 		r->grammar = NULL;
 	}
 
@@ -1984,8 +1993,9 @@
 static switch_status_t recog_channel_check_results(speech_channel_t *schannel) 
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	recognizer_data_t *r;
 	switch_mutex_lock(schannel->mutex);
-	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	r = (recognizer_data_t *)schannel->data;
 	if (!switch_strlen_zero(r->result)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) SUCCESS, have result\n", schannel->name);
 	} else if (r->start_of_input) {
@@ -2010,9 +2020,10 @@
 	switch_mutex_lock(schannel->mutex);
 
 	if (schannel->state == SPEECH_CHANNEL_PROCESSING && !r->timers_started) {
+		mrcp_message_t *mrcp_message;
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Starting input timers\n", schannel->name);
 		/* Send START-INPUT-TIMERS to MRCP server */
-		mrcp_message_t *mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, RECOGNIZER_START_INPUT_TIMERS);
+		mrcp_message = mrcp_application_message_create(schannel->unimrcp_session, schannel->unimrcp_channel, RECOGNIZER_START_INPUT_TIMERS);
 		if (mrcp_message == NULL) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Failed to create START-INPUT-TIMERS message\n", schannel->name);
 			status = SWITCH_STATUS_FALSE;
@@ -2037,8 +2048,9 @@
 static switch_status_t recog_channel_set_start_of_input(speech_channel_t *schannel)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	recognizer_data_t *r;
 	switch_mutex_lock(schannel->mutex);
-	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	r = (recognizer_data_t *)schannel->data;
 	r->start_of_input = 1;
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) start of input\n", schannel->name);
 	switch_mutex_unlock(schannel->mutex);
@@ -2055,8 +2067,9 @@
 static switch_status_t recog_channel_set_results(speech_channel_t *schannel, const char *result)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	recognizer_data_t *r;
 	switch_mutex_lock(schannel->mutex);
-	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
+	r = (recognizer_data_t *)schannel->data;
 	if (!switch_strlen_zero(r->result)) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) result is already set\n", schannel->name);
 		status = SWITCH_STATUS_FALSE;
@@ -2132,9 +2145,9 @@
 				recog_channel_set_header(schannel, id->id, param_val, msg, recog_hdr);
 			} else {
 				/* this is probably a vendor-specific MRCP param */
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) (vendor-specific value) %s: %s\n", schannel->name, param_name, param_val);
 				apt_str_t apt_param_name = { 0 };
 				apt_str_t apt_param_val = { 0 };
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) (vendor-specific value) %s: %s\n", schannel->name, param_name, param_val);
 				apt_string_set(&apt_param_name, param_name); /* copy isn't necessary since apt_pair_array_append will do it */
 				apt_string_set(&apt_param_val, param_val);
 				if (!gen_hdr->vendor_specific_params) {
@@ -2169,17 +2182,17 @@
 
 	switch (id) {
 	case RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD:
-		recog_hdr->confidence_threshold = atof(val);
+		recog_hdr->confidence_threshold = (float)atof(val);
 		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD);
 		break;
 
 	case RECOGNIZER_HEADER_SENSITIVITY_LEVEL:
-		recog_hdr->sensitivity_level = atof(val);
+		recog_hdr->sensitivity_level = (float)atof(val);
 		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_SENSITIVITY_LEVEL);
 		break;
 
 	case RECOGNIZER_HEADER_SPEED_VS_ACCURACY:
-		recog_hdr->speed_vs_accuracy = atof(val);
+		recog_hdr->speed_vs_accuracy = (float)atof(val);
 		mrcp_resource_header_property_add(msg, RECOGNIZER_HEADER_SPEED_VS_ACCURACY);
 		break;
 
@@ -2360,8 +2373,9 @@
  */
 static switch_status_t recog_channel_set_timers_started(speech_channel_t *schannel)
 {
+	recognizer_data_t *r;
 	switch_mutex_lock(schannel->mutex);
-	recognizer_data_t *r = schannel->data;
+	r = schannel->data;
 	r->timers_started = 1;
 	switch_mutex_unlock(schannel->mutex);
 	return SWITCH_STATUS_SUCCESS;
@@ -2381,18 +2395,20 @@
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	speech_channel_t *schannel = NULL;
+	int speech_channel_number = get_next_speech_channel_number();
+	char name[200] = { 0 };
+	const char *profile;
+
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "asr_handle: name = %s, codec = %s, rate = %d, grammar = %s, param = %s\n",
 		ah->name, ah->codec, ah->rate, ah->grammar, ah->param);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "codec = %s, rate = %d, dest = %s\n", codec, rate, dest);
 
 	/* It would be nice if FreeSWITCH let us know which session owns this handle, but it doesn't.  So, lets
 		make our own unique name */
-	int speech_channel_number = get_next_speech_channel_number();
-	char name[200] = { 0 };
 	switch_snprintf(name, sizeof(name) - 1, "ASR-%d", speech_channel_number);
 	name[sizeof(name) - 1] = '\0';
 
-	if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_RECOGNIZER, &globals.recog, "L16", rate, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
+	if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_RECOGNIZER, &globals.recog, "L16", (uint16_t)rate, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
 		status = SWITCH_STATUS_FALSE;
 		goto done;
 	}
@@ -2401,7 +2417,7 @@
 	memset(schannel->data, 0, sizeof(recognizer_data_t));
 
 	/* try to open an MRCP channel */
-	const char *profile = switch_strlen_zero(dest) ? globals.unimrcp_default_recog_profile : dest;
+	profile = switch_strlen_zero(dest) ? globals.unimrcp_default_recog_profile : dest;
 	status = speech_channel_open(schannel, profile);
 
  done:
@@ -2755,15 +2771,15 @@
 					recog_channel_set_results(schannel, message->body.buf);
 				} else {
 					/* string is not null terminated */
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Recognition result is not null-terminated.  Appending null terminator.\n", schannel->name);
 					char *result = (char *)switch_core_alloc(schannel->memory_pool, message->body.length + 1);
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Recognition result is not null-terminated.  Appending null terminator.\n", schannel->name);
 					strncpy(result, message->body.buf, message->body.length);
 					result[message->body.length] = '\0';
 					recog_channel_set_results(schannel, result);
 				}
 			} else {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) No result\n", schannel->name);
 				char *completion_cause = switch_mprintf("Completion-Cause: %03d", recog_hdr->completion_cause);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) No result\n", schannel->name);
 				recog_channel_set_results(schannel, completion_cause);
 				switch_safe_free(completion_cause);
 			}
@@ -3092,6 +3108,10 @@
 	apr_pool_t *pool = NULL;
 	mrcp_resource_factory_t *resource_factory = NULL;
 	mpf_codec_manager_t *codec_manager = NULL;
+	apr_size_t max_connection_count = 0;
+	apt_bool_t offer_new_connection = FALSE;
+	mrcp_connection_agent_t *connection_agent;
+	mpf_engine_t *media_engine;
 
 	/* create the client */
 	client = mrcp_client_create(globals.unimrcp_dir_layout);
@@ -3113,24 +3133,22 @@
 	}
 
 	/* set up MRCPv2 connection agent that will be shared with all profiles */
-	apr_size_t max_connection_count = 0;
 	if (!switch_strlen_zero(globals.unimrcp_max_connection_count)) {
 		max_connection_count = atoi(globals.unimrcp_max_connection_count);
 	}
 	if (max_connection_count <= 0) {
 		max_connection_count = 100;
 	}
-	apt_bool_t offer_new_connection = FALSE;
 	if (!switch_strlen_zero(globals.unimrcp_offer_new_connection)) {
 		offer_new_connection = strcasecmp("true", globals.unimrcp_offer_new_connection);
 	}
-	mrcp_connection_agent_t *connection_agent = mrcp_client_connection_agent_create(max_connection_count, offer_new_connection, pool);
+	connection_agent = mrcp_client_connection_agent_create(max_connection_count, offer_new_connection, pool);
 	if (connection_agent) {
 		mrcp_client_connection_agent_register(client, connection_agent, "MRCPv2ConnectionAgent");
 	}
 
 	/* Set up the media engine that will be shared with all profiles */
-	mpf_engine_t *media_engine = mpf_engine_create(pool);
+	media_engine = mpf_engine_create(pool);
 	if (media_engine) {
 		mrcp_client_media_engine_register(client, media_engine, "MediaEngine");
 	}
@@ -3147,6 +3165,7 @@
 			mrcp_sig_agent_t *agent = NULL;
 			mpf_termination_factory_t *termination_factory = NULL;
 			mrcp_profile_t * mprofile = NULL;
+			mpf_rtp_config_t *rtp_config = NULL;
 			
 			/* get profile attributes */
 			const char *name = switch_xml_attr(profile, "name");
@@ -3158,7 +3177,6 @@
 			}
 
 			/* create RTP config, common to MRCPv1 and MRCPv2 */
-			mpf_rtp_config_t *rtp_config = NULL;
 			rtp_config = mpf_rtp_config_create(pool);
 			rtp_config->rtp_port_min = DEFAULT_RTP_PORT_MIN;
 			rtp_config->rtp_port_max = DEFAULT_RTP_PORT_MAX;


From mikej at freeswitch.org  Wed Jun 17 12:46:46 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 14:46:46 -0500
Subject: [Freeswitch-svn] [commit] r13816 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mikej
Date: Wed Jun 17 14:46:45 2009
New Revision: 13816

Log:
fix C++ build and a segfault

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Wed Jun 17 14:46:45 2009
@@ -470,7 +470,7 @@
 		lname = switch_core_strdup(pool, name);
 	}
 
-	if ((laudio_queue = switch_core_alloc(pool, sizeof(audio_queue_t))) == NULL) {
+	if ((laudio_queue = (audio_queue_t *)switch_core_alloc(pool, sizeof(audio_queue_t))) == NULL) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) unable to create audio queue\n", lname);
 		status = SWITCH_STATUS_FALSE;
 		goto done;
@@ -689,7 +689,7 @@
 	speech_channel_t *schan = NULL;
 	*schannel = NULL;
 
-	if ((schan = switch_core_alloc(pool, sizeof(speech_channel_t))) == NULL) {
+	if ((schan = (speech_channel_t *)switch_core_alloc(pool, sizeof(speech_channel_t))) == NULL) {
 		status = SWITCH_STATUS_FALSE;
 		goto done;
 	}
@@ -785,7 +785,7 @@
 	}
 
 	/* create RTP endpoint and link to session channel */
-	codec = apr_palloc(schannel->unimrcp_session->pool, sizeof(mpf_codec_descriptor_t));
+	codec = (mpf_codec_descriptor_t *)apr_palloc(schannel->unimrcp_session->pool, sizeof(mpf_codec_descriptor_t));
 	mpf_codec_descriptor_init(codec);
 	codec->channel_count = 1;
 	codec->payload_type = 96;
@@ -886,7 +886,7 @@
 	}
 
 	/* set generic header fields (content-type) */
-	if ((generic_header = mrcp_generic_header_prepare(mrcp_message)) == NULL) {	
+	if ((generic_header = (mrcp_generic_header_t *)mrcp_generic_header_prepare(mrcp_message)) == NULL) {	
 		status = SWITCH_STATUS_FALSE;
 		goto done;
 	}
@@ -900,7 +900,7 @@
 	mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_TYPE);
 
 	/* set synthesizer header fields (voice, rate, etc.) */
-	if ((synth_header = mrcp_resource_header_prepare(mrcp_message)) == NULL) {
+	if ((synth_header = (mrcp_synth_header_t *)mrcp_resource_header_prepare(mrcp_message)) == NULL) {
 		status = SWITCH_STATUS_FALSE;
 		goto done;
 	}
@@ -951,7 +951,7 @@
 		param_name = (char *)key;
 		param_val = (char *)val;
 		if (!switch_strlen_zero(param_name) && !switch_strlen_zero(param_val)) {
-			unimrcp_param_id_t *id = switch_core_hash_find(schannel->application->param_id_map, param_name);
+			unimrcp_param_id_t *id = (unimrcp_param_id_t *)switch_core_hash_find(schannel->application->param_id_map, param_name);
 			if (id) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) %s: %s\n", schannel->name, param_name, param_val);
 				synth_channel_set_header(schannel, id->id, param_val, msg, synth_hdr);
@@ -1207,7 +1207,7 @@
 	switch_mutex_lock(schannel->mutex);
 	if (!switch_strlen_zero(param) && val != NULL) {
 		/* check if this is a FreeSWITCH param that needs to be translated to an MRCP param: e.g. voice ==> voice-name */
-		char *mrcp_param = switch_core_hash_find(schannel->application->fs_param_map, param);
+		char *mrcp_param = (char *)switch_core_hash_find(schannel->application->fs_param_map, param);
 		char *lcparam = NULL;
 		if (switch_strlen_zero(mrcp_param)) {
 			lcparam = switch_lc_strdup(param);
@@ -1525,13 +1525,16 @@
  */
 static apt_bool_t speech_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
 {
-	speech_channel_t *schannel =  mrcp_application_channel_object_get(channel);
+	speech_channel_t *schannel =  (speech_channel_t *)mrcp_application_channel_object_get(channel);
 	if (session && schannel && status == MRCP_SIG_STATUS_CODE_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is ready\n", schannel->name, speech_channel_type_to_string(schannel->type));
 		speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
-	}
-	else {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) %s channel error!\n", schannel->name, speech_channel_type_to_string(schannel->type));
+	} else {
+		if (schannel) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) %s channel error!\n", schannel->name, speech_channel_type_to_string(schannel->type));
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(unknown) channel error!\n");
+		}
 		if (session) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Terminating MRCP session\n");
 			speech_channel_set_state(schannel, SPEECH_CHANNEL_ERROR);
@@ -1553,7 +1556,7 @@
  */
 static apt_bool_t speech_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
 {
-	speech_channel_t *schannel =  mrcp_application_channel_object_get(channel);
+	speech_channel_t *schannel = (speech_channel_t *)mrcp_application_channel_object_get(channel);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is removed\n", schannel->name, speech_channel_type_to_string(schannel->type));
 	schannel->unimrcp_channel = NULL;
 	
@@ -1650,7 +1653,7 @@
 {
 	/* link to FreeSWITCH ASR / TTS callbacks */
 	switch_speech_interface_t *speech_interface = NULL;
-	if ((speech_interface = switch_loadable_module_create_interface(module_interface, SWITCH_SPEECH_INTERFACE)) == NULL) {
+	if ((speech_interface = (switch_speech_interface_t *)switch_loadable_module_create_interface(module_interface, SWITCH_SPEECH_INTERFACE)) == NULL) {
 		return SWITCH_STATUS_FALSE;
 	}
 	speech_interface->interface_name = MOD_UNIMRCP;
@@ -1741,7 +1744,7 @@
 static switch_status_t grammar_create(grammar_t **grammar, const char *name, grammar_type_t type, const char *data, switch_memory_pool_t *pool)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	grammar_t *g = switch_core_alloc(pool, sizeof(grammar_t));
+	grammar_t *g = (grammar_t *)switch_core_alloc(pool, sizeof(grammar_t));
 	if (g == NULL) {
 		status = SWITCH_STATUS_FALSE;
 		*grammar = NULL;
@@ -1804,7 +1807,7 @@
 	r->start_of_input = 0;
 
 	/* input timers are started by default unless the start-input-timers=false param is set */
-	start_input_timers = switch_core_hash_find(schannel->params, "start-input-timers");
+	start_input_timers = (char *)switch_core_hash_find(schannel->params, "start-input-timers");
 	r->timers_started = switch_strlen_zero(start_input_timers) || strcasecmp(start_input_timers, "false");
 		
 	/* create MRCP message */
@@ -1815,7 +1818,7 @@
 	}
 
 	/* allocate generic header */
-	generic_header = mrcp_generic_header_prepare(mrcp_message);
+	generic_header = (mrcp_generic_header_t *)mrcp_generic_header_prepare(mrcp_message);
 	if (generic_header == NULL) {
 		status = SWITCH_STATUS_FALSE;
 		goto done;
@@ -1837,7 +1840,7 @@
 	}
 
 	/* allocate recognizer-specific header */
-	recog_header = mrcp_resource_header_prepare(mrcp_message);
+	recog_header = (mrcp_recog_header_t *)mrcp_resource_header_prepare(mrcp_message);
 	if (recog_header == NULL) {
 		status = SWITCH_STATUS_FALSE;
 		goto done;
@@ -1911,7 +1914,7 @@
 		}
 	
 		/* set Content-Type and Content-ID in message */
-		generic_header = mrcp_generic_header_prepare(mrcp_message);
+		generic_header = (mrcp_generic_header_t *)mrcp_generic_header_prepare(mrcp_message);
 		if (generic_header == NULL) {
 			status = SWITCH_STATUS_FALSE;
 			goto done;
@@ -2016,7 +2019,7 @@
 static switch_status_t recog_channel_start_input_timers(speech_channel_t *schannel)
 {
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
-	recognizer_data_t *r = schannel->data;
+	recognizer_data_t *r = (recognizer_data_t *)schannel->data;
 	switch_mutex_lock(schannel->mutex);
 
 	if (schannel->state == SPEECH_CHANNEL_PROCESSING && !r->timers_started) {
@@ -2139,7 +2142,7 @@
 		param_name = (char *)key;
 		param_val = (char *)val;
 		if (!switch_strlen_zero(param_name) && !switch_strlen_zero(param_val)) {
-			unimrcp_param_id_t *id = switch_core_hash_find(schannel->application->param_id_map, param_name);
+			unimrcp_param_id_t *id = (unimrcp_param_id_t *)switch_core_hash_find(schannel->application->param_id_map, param_name);
 			if (id) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) \"%s\": \"%s\"\n", schannel->name, param_name, param_val);
 				recog_channel_set_header(schannel, id->id, param_val, msg, recog_hdr);
@@ -2375,7 +2378,7 @@
 {
 	recognizer_data_t *r;
 	switch_mutex_lock(schannel->mutex);
-	r = schannel->data;
+	r = (recognizer_data_t *)schannel->data;
 	r->timers_started = 1;
 	switch_mutex_unlock(schannel->mutex);
 	return SWITCH_STATUS_SUCCESS;
@@ -2636,7 +2639,7 @@
  */
 static switch_status_t recog_asr_start_input_timers(switch_asr_handle_t *ah)
 {
-	speech_channel_t *schannel = ah->private_info;
+	speech_channel_t *schannel = (speech_channel_t *)ah->private_info;
 	return recog_channel_start_input_timers(schannel);
 }
 
@@ -2700,7 +2703,7 @@
 static apt_bool_t recog_on_message_receive(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_message_t *message)
 {
 	speech_channel_t *schannel = (speech_channel_t *)mrcp_application_channel_object_get(channel);
-	mrcp_recog_header_t *recog_hdr = mrcp_resource_header_get(message);
+	mrcp_recog_header_t *recog_hdr = (mrcp_recog_header_t *)mrcp_resource_header_get(message);
 	if (message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) {
 		/* received MRCP response */
 		if (message->start_line.method_id == RECOGNIZER_RECOGNIZE) {
@@ -2829,7 +2832,7 @@
 {
 	/* link to FreeSWITCH ASR / TTS callbacks */
 	switch_asr_interface_t *asr_interface = NULL;
-	if ((asr_interface = switch_loadable_module_create_interface(module_interface, SWITCH_ASR_INTERFACE)) == NULL) {
+	if ((asr_interface = (switch_asr_interface_t *)switch_loadable_module_create_interface(module_interface, SWITCH_ASR_INTERFACE)) == NULL) {
 		return SWITCH_STATUS_FALSE;
 	}
 	asr_interface->interface_name = MOD_UNIMRCP;
@@ -2941,7 +2944,7 @@
 	}
 
 	if ((settings = switch_xml_child(cfg, "settings"))) {
-		if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) {
+		if (switch_xml_config_parse(switch_xml_child(settings, "param"), SWITCH_FALSE, instructions) == SWITCH_STATUS_SUCCESS) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"Config parsed ok!\n");
 			goto done;
 		}
@@ -3459,7 +3462,7 @@
  */
 static unimrcp_param_id_t *unimrcp_param_id_create(int id, switch_memory_pool_t *pool)
 {
-	unimrcp_param_id_t *param = switch_core_alloc(pool, sizeof(unimrcp_param_id_t));
+	unimrcp_param_id_t *param = (unimrcp_param_id_t *)switch_core_alloc(pool, sizeof(unimrcp_param_id_t));
 	if (param) {
 		param->id = id;
 	}


From mikej at freeswitch.org  Wed Jun 17 12:49:00 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 14:49:00 -0500
Subject: [Freeswitch-svn] [commit] r13817 - freeswitch/trunk/src/include
Message-ID: 

Author: mikej
Date: Wed Jun 17 14:49:00 2009
New Revision: 13817

Log:
tweak xml_config types

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Wed Jun 17 14:49:00 2009
@@ -87,19 +87,19 @@
  * \brief A configuration instruction read by switch_xml_config_parse 
 */
 struct switch_xml_config_item {
-	char *key;					   			/*< The key of the element, or NULL to indicate the end of the list */
+	const char *key;					   			/*< The key of the element, or NULL to indicate the end of the list */
 	switch_xml_config_type_t type; 			/*< The type of variable */
-	switch_config_flags_t flags; 	   		/*< True if the var can be changed on reload */
+	int flags; 	   		/*< True if the var can be changed on reload */
 	void *ptr;					   			/*< Ptr to the var to be changed */
-	void *defaultvalue; 		   			/*< Default value */
+	const void *defaultvalue; 		   			/*< Default value */
 	void *data; 				   			/*< Custom data (depending on the type) */
 	switch_xml_config_callback_t function;	/*< Callback to be called after the var is parsed */
-	char *syntax;							/*< Optional syntax documentation for this setting */
-	char *helptext;							/*< Optional documentation text for this setting */
+	const char *syntax;							/*< Optional syntax documentation for this setting */
+	const char *helptext;							/*< Optional documentation text for this setting */
 };
 
 #define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext)	{ _key, _type, _flags, _ptr, (void*)_defaultvalue, (void*)_data, NULL, _syntax, _helptext }
-#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext)	{ _key, SWITCH_CONFIG_STRING, _flags, _ptr, (void*)_defaultvalue, &switch_config_string_strdup, NULL, _syntax, _helptext }
+#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext)	{ (_key), SWITCH_CONFIG_STRING, (_flags), (_ptr), ((void*)_defaultvalue), (&switch_config_string_strdup), (NULL), (_syntax), (_helptext) }
 #define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _function, _functiondata, _syntax, _helptext)	{ _key, _type, _flags, _ptr, (void*)_defaultvalue, _functiondata, _function, _syntax, _helptext }
 #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL, NULL, NULL, NULL, NULL, NULL }
 


From mikej at freeswitch.org  Wed Jun 17 12:52:25 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 14:52:25 -0500
Subject: [Freeswitch-svn] [commit] r13818 - in freeswitch/trunk:
	src/mod/asr_tts/mod_unimrcp w32
Message-ID: 

Author: mikej
Date: Wed Jun 17 14:52:25 2009
New Revision: 13818

Log:
initial bits of mod_unimrcp windows build

Added:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops
   freeswitch/trunk/w32/apr.vsprops
Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/   (props changed)

Added: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj	Wed Jun 17 14:52:25 2009
@@ -0,0 +1,315 @@
+
+
+	
+		
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+				
+			
+			
+				
+			
+			
+				
+			
+			
+				
+			
+		
+	
+	
+	
+

Added: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/unimrcp.vsprops	Wed Jun 17 14:52:25 2009
@@ -0,0 +1,13 @@
+
+
+	
+

Added: freeswitch/trunk/w32/apr.vsprops
==============================================================================
--- (empty file)
+++ freeswitch/trunk/w32/apr.vsprops	Wed Jun 17 14:52:25 2009
@@ -0,0 +1,12 @@
+
+
+	
+


From andrew at freeswitch.org  Wed Jun 17 12:53:39 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 14:53:39 -0500
Subject: [Freeswitch-svn] [commit] r13819 - in freeswitch/trunk: .
	src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Wed Jun 17 14:53:38 2009
New Revision: 13819

Log:
Switch mod_event_multicast over to using a Makefile.in


Added:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile.in
Modified:
   freeswitch/trunk/configure.in

Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in	(original)
+++ freeswitch/trunk/configure.in	Wed Jun 17 14:53:38 2009
@@ -751,6 +751,7 @@
                 src/mod/languages/mod_java/Makefile
                 src/mod/languages/mod_python/Makefile
                 src/mod/event_handlers/mod_erlang_event/Makefile
+                src/mod/event_handlers/mod_event_multicast/Makefile
                 src/include/switch_am_config.h
                 build/getsounds.sh
                 build/getlib.sh

Added: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile.in
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile.in	Wed Jun 17 14:53:38 2009
@@ -0,0 +1,5 @@
+
+LOCAL_CFLAGS= @openssl_CFLAGS@
+LOCAL_LDLAGS= @openssl_LIBS@
+
+include ../../../../build/modmake.rules


From andrew at freeswitch.org  Wed Jun 17 13:39:09 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 15:39:09 -0500
Subject: [Freeswitch-svn] [commit] r13820 - in freeswitch/trunk: . build
	src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Wed Jun 17 15:39:08 2009
New Revision: 13820

Log:
put OPENSSL_CFLAGS and LIBS in modmake.rules.in at MikeJ's suggestion


Added:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile
Removed:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile.in
Modified:
   freeswitch/trunk/build/modmake.rules.in
   freeswitch/trunk/configure.in

Modified: freeswitch/trunk/build/modmake.rules.in
==============================================================================
--- freeswitch/trunk/build/modmake.rules.in	(original)
+++ freeswitch/trunk/build/modmake.rules.in	Wed Jun 17 15:39:08 2009
@@ -21,6 +21,9 @@
 CURL_DIR=$(switch_srcdir)/libs/curl
 CURLLA=$(CURL_DIR)/lib/libcurl.la
 
+OPENSSL_LIBS=@openssl_LIBS@
+OPENSSL_CFLAGS=@openssl_CFLAGS@
+
 LIBS=$(switch_builddir)/libfreeswitch.la
 DEFS=@DEFS@
 PREFIX = @prefix@

Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in	(original)
+++ freeswitch/trunk/configure.in	Wed Jun 17 15:39:08 2009
@@ -751,7 +751,6 @@
                 src/mod/languages/mod_java/Makefile
                 src/mod/languages/mod_python/Makefile
                 src/mod/event_handlers/mod_erlang_event/Makefile
-                src/mod/event_handlers/mod_event_multicast/Makefile
                 src/include/switch_am_config.h
                 build/getsounds.sh
                 build/getlib.sh

Added: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile	Wed Jun 17 15:39:08 2009
@@ -0,0 +1,5 @@
+
+LOCAL_CFLAGS= $(openssl_CFLAGS)
+LOCAL_LDLAGS= $(openssl_LIBS)
+
+include ../../../../build/modmake.rules


From andrew at freeswitch.org  Wed Jun 17 13:43:54 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 15:43:54 -0500
Subject: [Freeswitch-svn] [commit] r13821 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Wed Jun 17 15:43:54 2009
New Revision: 13821

Log:
Whoops


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile	Wed Jun 17 15:43:54 2009
@@ -1,5 +1,5 @@
 
-LOCAL_CFLAGS= $(openssl_CFLAGS)
-LOCAL_LDLAGS= $(openssl_LIBS)
+LOCAL_CFLAGS= $(OPENSSL_CFLAGS)
+LOCAL_LDLAGS= $(OPENSSL_LIBS)
 
 include ../../../../build/modmake.rules


From mikej at freeswitch.org  Wed Jun 17 14:39:38 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 16:39:38 -0500
Subject: [Freeswitch-svn] [commit] r13822 - in
	freeswitch/trunk/libs/unimrcp: . platforms/unimrcp-client
	platforms/unimrcp-server
Message-ID: 

Author: mikej
Date: Wed Jun 17 16:39:38 2009
New Revision: 13822

Log:
fix mac build

Modified:
   freeswitch/trunk/libs/unimrcp/configure.ac
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am

Modified: freeswitch/trunk/libs/unimrcp/configure.ac
==============================================================================
--- freeswitch/trunk/libs/unimrcp/configure.ac	(original)
+++ freeswitch/trunk/libs/unimrcp/configure.ac	Wed Jun 17 16:39:38 2009
@@ -108,6 +108,7 @@
 
 AM_CONDITIONAL([DEMORECOG_PLUGIN],[test "${enable_demorecog_plugin}" = "yes"])
 
+AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
 
 AC_CONFIG_FILES([
   Makefile

Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/Makefile.am	Wed Jun 17 16:39:38 2009
@@ -22,3 +22,7 @@
                          src/demo_discover_application.c \
                          src/demo_util.c
 unimrcpclient_LDADD    = $(top_builddir)/platforms/libunimrcp-client/libunimrcpclient.la
+
+if ISMAC
+unimrcpclient_LDFLAGS  = -framework CoreFoundation -framework SystemConfiguration
+endif

Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/Makefile.am	Wed Jun 17 16:39:38 2009
@@ -17,3 +17,7 @@
 bin_PROGRAMS           = unimrcpserver
 unimrcpserver_SOURCES  = src/main.c src/uni_cmdline.c src/uni_daemon.c
 unimrcpserver_LDADD    = $(top_builddir)/platforms/libunimrcp-server/libunimrcpserver.la
+
+if ISMAC
+unimrcpserver_LDFLAGS  = -framework CoreFoundation -framework SystemConfiguration
+endif


From mikej at freeswitch.org  Wed Jun 17 14:40:23 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 16:40:23 -0500
Subject: [Freeswitch-svn] [commit] r13823 - in freeswitch/trunk: .
	src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mikej
Date: Wed Jun 17 16:40:22 2009
New Revision: 13823

Log:
fix mac build

Added:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am
Removed:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile
Modified:
   freeswitch/trunk/configure.in

Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in	(original)
+++ freeswitch/trunk/configure.in	Wed Jun 17 16:40:22 2009
@@ -747,6 +747,7 @@
                 src/Makefile
                 src/mod/Makefile
                 src/mod/endpoints/mod_sofia/Makefile
+                src/mod/asr_tts/mod_unimrcp/Makefile
                 src/mod/event_handlers/mod_radius_cdr/Makefile
                 src/mod/languages/mod_java/Makefile
                 src/mod/languages/mod_python/Makefile

Added: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am	Wed Jun 17 16:40:22 2009
@@ -0,0 +1,50 @@
+MODNAME=mod_unimrcp
+
+AM_CFLAGS   = $(SWITCH_AM_CFLAGS)
+AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
+#AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS)
+#we should set all these vars from configure, no reason to have these in each Makefile.am
+LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \
+then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool;  fi`
+AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s`
+# Dirty trick to override the link output
+LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi
+
+moddir=@modinstdir@
+
+UNIMRCP_DIR=$(switch_builddir)/libs/unimrcp
+UNIMRCPLA=$(UNIMRCP_DIR)/platforms/libunimrcp-client/libunimrcpclient.la
+
+mod_LTLIBRARIES = mod_unimrcp.la
+mod_unimrcp_la_SOURCES = mod_unimrcp.c
+mod_unimrcp_la_CFLAGS  = $(AM_CFLAGS) 
+mod_unimrcp_la_CFLAGS += -I.
+mod_unimrcp_la_CFLAGS += -I$(switch_srcdir)/libs/apr/include
+mod_unimrcp_la_CFLAGS += -I$(switch_srcdir)/libs/apr-util/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/platforms/libunimrcp-client/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/modules/mrcp-sofiasip/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/modules/mrcp-unirtsp/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp-client/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp-signaling/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcpv2-transport/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/message/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/control/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/resources/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mpf/include
+mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/apr-toolkit/include
+
+mod_unimrcp_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(UNIMRCPLA)
+mod_unimrcp_la_LDFLAGS = -avoid-version -module -no-undefined
+
+if ISMAC
+mod_unimrcp_la_LDFLAGS += -framework CoreFoundation -framework SystemConfiguration
+endif
+
+BUILT_SOURCES = $(UNIMRCPLA)
+
+$(UNIMRCPLA): $(UNIMRCP_DIR) $(UNIMRCP_DIR)/.update
+	cd $(UNIMRCP_DIR) && $(MAKE)
+	$(TOUCH_TARGET)
+
+$(mod_unimrcp_la_SOURCES) : $(BUILT_SOURCES)


From mikej at freeswitch.org  Wed Jun 17 15:09:42 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 17:09:42 -0500
Subject: [Freeswitch-svn] [commit] r13824 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mikej
Date: Wed Jun 17 17:09:42 2009
New Revision: 13824

Log:
fix mac build

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/Makefile.am	Wed Jun 17 17:09:42 2009
@@ -34,7 +34,7 @@
 mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mpf/include
 mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/apr-toolkit/include
 
-mod_unimrcp_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(UNIMRCPLA)
+mod_unimrcp_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(UNIMRCPLA) $(switch_builddir)/libs/apr/libapr-1.la
 mod_unimrcp_la_LDFLAGS = -avoid-version -module -no-undefined
 
 if ISMAC


From stkn at freeswitch.org  Wed Jun 17 16:11:19 2009
From: stkn at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 18:11:19 -0500
Subject: [Freeswitch-svn] [commit] r13825 - freeswitch/trunk/scripts
Message-ID: 

Author: stkn
Date: Wed Jun 17 18:11:19 2009
New Revision: 13825

Log:
Add -days option to set expiration time of certificates in gentls_cert

Modified:
   freeswitch/trunk/scripts/gentls_cert.in

Modified: freeswitch/trunk/scripts/gentls_cert.in
==============================================================================
--- freeswitch/trunk/scripts/gentls_cert.in	(original)
+++ freeswitch/trunk/scripts/gentls_cert.in	Wed Jun 17 18:11:19 2009
@@ -155,6 +155,10 @@
 			shift
 			OUTFILE="$1"
 			;;
+		-days)
+			shift
+			DAYS="$1"
+			;;
 	esac
 	shift
 done
@@ -197,6 +201,7 @@
 		   -alt      Set alternative name (use prefix 'DNS:' or 'URI:')
 		   -org      Set organization name
 		   -out      Filename for new certificate (create only)
+		   -days     Certificate expires in X days (default: 365)
 
 		EOF
 		exit 1


From andrew at freeswitch.org  Wed Jun 17 19:19:13 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 21:19:13 -0500
Subject: [Freeswitch-svn] [commit] r13826 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Wed Jun 17 21:19:13 2009
New Revision: 13826

Log:
Use OpenSSL to optionally use a pre-shared key to encrypt multicast packets (no decryption yet)


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	Wed Jun 17 21:19:13 2009
@@ -29,6 +29,9 @@
  * mod_event_multicast.c -- Multicast Events
  *
  */
+#ifdef HAVE_OPENSSL
+#include 
+#endif
 #include 
 
 #define MULTICAST_BUFFSIZE 65536
@@ -56,10 +59,14 @@
 	int running;
 	switch_event_node_t *node;
 	uint8_t ttl;
+	char *psk;
 } globals;
 
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address);
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings);
+#ifdef HAVE_OPENSSL
+SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_psk, globals.psk);
+#endif
 #define MULTICAST_EVENT "multicast::event"
 static switch_status_t load_config(void)
 {
@@ -76,6 +83,7 @@
 	globals.key_count = 0;
 
 	globals.ttl = 1;
+	globals.psk = NULL;
 
 	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
@@ -98,6 +106,12 @@
 				set_global_bindings(val);
 			} else if (!strcasecmp(var, "port")) {
 				globals.port = (switch_port_t) atoi(val);
+			} else if (!strcasecmp(var, "psk")) {
+#ifdef HAVE_OPENSSL
+				set_global_psk(val);
+#else
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot use pre shared key encryption without OpenSSL support\n");
+#endif
 			} else if (!strcasecmp(var, "ttl")) {
 				int ttl = atoi(val);
 				if ((ttl && ttl <= 255)  || !strcmp(val, "0")) {
@@ -181,11 +195,44 @@
 		default:
 			switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Multicast-Sender", globals.hostname);
 			if (switch_event_serialize(event, &packet, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) {
-				size_t len = strlen(packet) + sizeof(globals.host_hash);
-				char *buf = malloc(len + 1);
+				size_t len;
+				char *buf;
+#ifdef HAVE_OPENSSL
+				int outlen, tmplen;
+				EVP_CIPHER_CTX ctx;
+				char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1];
+				switch_uuid_t uuid;
+
+				switch_uuid_get(&uuid);
+				switch_uuid_format(uuid_str, &uuid);
+				len = strlen(packet) + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + EVP_MAX_IV_LENGTH;
+#else
+				len = strlen(packet) + sizeof(globals.host_hash);
+#endif
+				buf = malloc(len + 1);
 				switch_assert(buf);
 				memcpy(buf, &globals.host_hash, sizeof(globals.host_hash));
-				switch_copy_string(buf + sizeof(globals.host_hash), packet, len - sizeof(globals.host_hash));
+
+#ifdef HAVE_OPENSSL
+				if (globals.psk) {
+					switch_copy_string(buf + sizeof(globals.host_hash), uuid_str, SWITCH_UUID_FORMATTED_LENGTH);
+
+					EVP_CIPHER_CTX_init(&ctx);
+					EVP_EncryptInit(&ctx, EVP_bf_cfb(), NULL, NULL);
+					EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk));
+					EVP_EncryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str);
+					EVP_EncryptUpdate(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH,
+							&outlen, (unsigned char*) packet, (int) strlen(packet));
+					EVP_EncryptFinal(&ctx, (unsigned char*) buf + outlen, &tmplen);
+					outlen += tmplen;
+					len = (size_t) outlen + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH;
+				} else {
+#endif
+					switch_copy_string(buf + sizeof(globals.host_hash), packet, len - sizeof(globals.host_hash));
+#ifdef HAVE_OPENSSL
+				}
+#endif
+
 				switch_socket_sendto(globals.udp_socket, globals.addr, 0, buf, &len);
 				switch_safe_free(packet);
 				switch_safe_free(buf);


From andrew at freeswitch.org  Wed Jun 17 21:19:42 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 23:19:42 -0500
Subject: [Freeswitch-svn] [commit] r13827 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Wed Jun 17 23:19:42 2009
New Revision: 13827

Log:
Fix offset


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	Wed Jun 17 23:19:42 2009
@@ -223,7 +223,7 @@
 					EVP_EncryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str);
 					EVP_EncryptUpdate(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH,
 							&outlen, (unsigned char*) packet, (int) strlen(packet));
-					EVP_EncryptFinal(&ctx, (unsigned char*) buf + outlen, &tmplen);
+					EVP_EncryptFinal(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen);
 					outlen += tmplen;
 					len = (size_t) outlen + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH;
 				} else {


From andrew at freeswitch.org  Wed Jun 17 21:20:46 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Wed, 17 Jun 2009 23:20:46 -0500
Subject: [Freeswitch-svn] [commit] r13828 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Wed Jun 17 23:20:45 2009
New Revision: 13828

Log:
Initial decryption support


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	Wed Jun 17 23:20:45 2009
@@ -373,6 +373,36 @@
 		if (host_hash == globals.host_hash) {
 			continue;
 		}
+#ifdef HAVE_OPENSSL
+		if (globals.psk) {
+			char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1];
+			char *tmp;
+			int outl, tmplen;
+			EVP_CIPHER_CTX ctx;
+
+			len -= sizeof(host_hash) + SWITCH_UUID_FORMATTED_LENGTH;
+
+			tmp = malloc(len);
+
+			memset(tmp, 0, len);
+
+			switch_copy_string(uuid_str, packet, SWITCH_UUID_FORMATTED_LENGTH);
+			packet += SWITCH_UUID_FORMATTED_LENGTH;
+
+			EVP_CIPHER_CTX_init(&ctx);
+			EVP_DecryptInit(&ctx, EVP_bf_cfb(), NULL, NULL);
+			EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk));
+			EVP_DecryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str);
+			EVP_DecryptUpdate(&ctx, (unsigned char*) tmp,
+					&outl, (unsigned char*) packet, (int) len);
+			EVP_DecryptFinal(&ctx, (unsigned char*) tmp + outl, &tmplen);
+
+			/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "decrypted event as %s\n----------\n of actual length %d (%d) %d\n", tmp, outl + tmplen, (int) len, (int) strlen(tmp));*/
+			/*continue;*/
+			packet = tmp;
+
+		}
+#endif
 		//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet);
 		if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT) == SWITCH_STATUS_SUCCESS) {
 			char *var, *val, *term = NULL, tmpname[128];


From mrene at freeswitch.org  Wed Jun 17 23:01:45 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 01:01:45 -0500
Subject: [Freeswitch-svn] [commit] r13829 - in freeswitch/trunk/src: .
	include
Message-ID: 

Author: mrene
Date: Thu Jun 18 01:01:45 2009
New Revision: 13829

Log:
Fix up SWITCH_CONFIG_ITEM_STRING_STRDUP to please windows

Modified:
   freeswitch/trunk/src/include/switch_xml_config.h
   freeswitch/trunk/src/switch_xml_config.c

Modified: freeswitch/trunk/src/include/switch_xml_config.h
==============================================================================
--- freeswitch/trunk/src/include/switch_xml_config.h	(original)
+++ freeswitch/trunk/src/include/switch_xml_config.h	Thu Jun 18 01:01:45 2009
@@ -99,7 +99,7 @@
 };
 
 #define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext)	{ _key, _type, _flags, _ptr, (void*)_defaultvalue, (void*)_data, NULL, _syntax, _helptext }
-#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext)	{ (_key), SWITCH_CONFIG_STRING, (_flags), (_ptr), ((void*)_defaultvalue), (&switch_config_string_strdup), (NULL), (_syntax), (_helptext) }
+#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext)	{ (_key), SWITCH_CONFIG_STRING, (_flags), (_ptr), ((void*)_defaultvalue), (NULL), (NULL), (_syntax), (_helptext) }
 #define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _function, _functiondata, _syntax, _helptext)	{ _key, _type, _flags, _ptr, (void*)_defaultvalue, _functiondata, _function, _syntax, _helptext }
 #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL, NULL, NULL, NULL, NULL, NULL }
 

Modified: freeswitch/trunk/src/switch_xml_config.c
==============================================================================
--- freeswitch/trunk/src/switch_xml_config.c	(original)
+++ freeswitch/trunk/src/switch_xml_config.c	Thu Jun 18 01:01:45 2009
@@ -201,15 +201,10 @@
 				break;
 			case SWITCH_CONFIG_STRING:
 				{
-					switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data;
+					switch_xml_config_string_options_t string_options_default = { 0 };
+					switch_xml_config_string_options_t *string_options = item->data ? (switch_xml_config_string_options_t*)item->data : &string_options_default;
 					const char *newstring = NULL;
 					
-					if (!string_options) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Missing mandatory switch_xml_config_string_options_t structure for parameter [%s], skipping!\n",
-										  item->key);
-						return SWITCH_STATUS_FALSE;
-					}
-					
 					/* Perform validation */
 					if (value) {
 						if (!switch_strlen_zero(string_options->validation_regex)) {


From mikej at freeswitch.org  Wed Jun 17 23:08:03 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 01:08:03 -0500
Subject: [Freeswitch-svn] [commit] r13830 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mikej
Date: Thu Jun 18 01:08:02 2009
New Revision: 13830

Log:
build as c code again.. now that this is fixed in core for windows.

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.2008.vcproj	Thu Jun 18 01:08:02 2009
@@ -281,7 +281,7 @@
 				>
 				
 			
 			
 				
 			
 			
 				
 			
 			
 				
 			
 		


From robertj at freeswitch.org  Wed Jun 17 23:14:01 2009
From: robertj at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 01:14:01 -0500
Subject: [Freeswitch-svn] [commit] r13831 - in
	freeswitch/trunk/libs/spandsp: . spandsp spandsp-sim
	spandsp-sim/msvc spandsp-sim/spandsp src src/msvc src/spandsp
	src/spandsp/private tests
Message-ID: 

Author: robertj
Date: Thu Jun 18 01:13:59 2009
New Revision: 13831

Log:
Updated SpanDSP to snapshot on 2009-06-03 with some additions:

  Fixed VS2005 version of make_modem_filter

  Fixed a couple of places where declaration and definition of functions do not have the same calling conventions. Only relevant for Win32 compiles.


Added:
   freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.2005.vcproj
   freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.2008.vcproj
   freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.dsp
   freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/
   freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/make_line_models.2008.vcproj
   freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/msvcproj.foot
   freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/msvcproj.head
   freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc8proj.foot
   freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc8proj.head
   freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc9proj.foot
   freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc9proj.head
   freeswitch/trunk/libs/spandsp/spandsp/fax-tests.dtd
   freeswitch/trunk/libs/spandsp/src/v17_v32bis_rx_constellation_maps.h
   freeswitch/trunk/libs/spandsp/src/v17_v32bis_tx_constellation_maps.h
Modified:
   freeswitch/trunk/libs/spandsp/Makefile.am
   freeswitch/trunk/libs/spandsp/configure.ac
   freeswitch/trunk/libs/spandsp/spandsp-sim/Makefile.am
   freeswitch/trunk/libs/spandsp/spandsp-sim/g1050.c
   freeswitch/trunk/libs/spandsp/spandsp-sim/line_model.c
   freeswitch/trunk/libs/spandsp/spandsp-sim/rfc2198_sim.c
   freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/g1050.h
   freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/line_model.h
   freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/rfc2198_sim.h
   freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/test_utils.h
   freeswitch/trunk/libs/spandsp/spandsp-sim/test_utils.c
   freeswitch/trunk/libs/spandsp/spandsp/tsb85.xml
   freeswitch/trunk/libs/spandsp/src/Makefile.am
   freeswitch/trunk/libs/spandsp/src/fax.c
   freeswitch/trunk/libs/spandsp/src/fsk.c
   freeswitch/trunk/libs/spandsp/src/hdlc.c
   freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln
   freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln
   freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj
   freeswitch/trunk/libs/spandsp/src/make_modem_filter.c
   freeswitch/trunk/libs/spandsp/src/modem_connect_tones.c
   freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h
   freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj
   freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj
   freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head
   freeswitch/trunk/libs/spandsp/src/power_meter.c
   freeswitch/trunk/libs/spandsp/src/silence_gen.c
   freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h
   freeswitch/trunk/libs/spandsp/src/spandsp/expose.h
   freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h
   freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h
   freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h
   freeswitch/trunk/libs/spandsp/src/spandsp/power_meter.h
   freeswitch/trunk/libs/spandsp/src/spandsp/private/t38_gateway.h
   freeswitch/trunk/libs/spandsp/src/spandsp/silence_gen.h
   freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v17rx.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v17tx.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v18.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v22bis.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_rx.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v29rx.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h
   freeswitch/trunk/libs/spandsp/src/spandsp/v8.h
   freeswitch/trunk/libs/spandsp/src/spandsp/version.h
   freeswitch/trunk/libs/spandsp/src/t30.c
   freeswitch/trunk/libs/spandsp/src/t35.c
   freeswitch/trunk/libs/spandsp/src/t38_gateway.c
   freeswitch/trunk/libs/spandsp/src/t4.c
   freeswitch/trunk/libs/spandsp/src/tone_generate.c
   freeswitch/trunk/libs/spandsp/src/v17rx.c
   freeswitch/trunk/libs/spandsp/src/v17tx.c
   freeswitch/trunk/libs/spandsp/src/v18.c
   freeswitch/trunk/libs/spandsp/src/v22bis_rx.c
   freeswitch/trunk/libs/spandsp/src/v22bis_tx.c
   freeswitch/trunk/libs/spandsp/src/v27ter_rx.c
   freeswitch/trunk/libs/spandsp/src/v27ter_tx.c
   freeswitch/trunk/libs/spandsp/src/v29rx.c
   freeswitch/trunk/libs/spandsp/src/v29tx.c
   freeswitch/trunk/libs/spandsp/src/v8.c
   freeswitch/trunk/libs/spandsp/tests/Makefile.am
   freeswitch/trunk/libs/spandsp/tests/adsi_tests.c
   freeswitch/trunk/libs/spandsp/tests/async_tests.c
   freeswitch/trunk/libs/spandsp/tests/at_interpreter_tests.c
   freeswitch/trunk/libs/spandsp/tests/bell_mf_rx_tests.c
   freeswitch/trunk/libs/spandsp/tests/bell_mf_tx_tests.c
   freeswitch/trunk/libs/spandsp/tests/bert_tests.c
   freeswitch/trunk/libs/spandsp/tests/dds_tests.c
   freeswitch/trunk/libs/spandsp/tests/dtmf_rx_tests.c
   freeswitch/trunk/libs/spandsp/tests/dtmf_tx_tests.c
   freeswitch/trunk/libs/spandsp/tests/echo_tests.c
   freeswitch/trunk/libs/spandsp/tests/fax_decode.c
   freeswitch/trunk/libs/spandsp/tests/fax_tests.c
   freeswitch/trunk/libs/spandsp/tests/fax_utils.c
   freeswitch/trunk/libs/spandsp/tests/fsk_tests.c
   freeswitch/trunk/libs/spandsp/tests/g1050_tests.c
   freeswitch/trunk/libs/spandsp/tests/g168_tests.c
   freeswitch/trunk/libs/spandsp/tests/g711_tests.c
   freeswitch/trunk/libs/spandsp/tests/g722_tests.c
   freeswitch/trunk/libs/spandsp/tests/g726_tests.c
   freeswitch/trunk/libs/spandsp/tests/gsm0610_tests.c
   freeswitch/trunk/libs/spandsp/tests/ima_adpcm_tests.c
   freeswitch/trunk/libs/spandsp/tests/line_model_tests.c
   freeswitch/trunk/libs/spandsp/tests/lpc10_tests.c
   freeswitch/trunk/libs/spandsp/tests/make_g168_css.c
   freeswitch/trunk/libs/spandsp/tests/modem_connect_tones_tests.c
   freeswitch/trunk/libs/spandsp/tests/modem_echo_tests.c
   freeswitch/trunk/libs/spandsp/tests/noise_tests.c
   freeswitch/trunk/libs/spandsp/tests/oki_adpcm_tests.c
   freeswitch/trunk/libs/spandsp/tests/playout_tests.c
   freeswitch/trunk/libs/spandsp/tests/plc_tests.c
   freeswitch/trunk/libs/spandsp/tests/power_meter_tests.c
   freeswitch/trunk/libs/spandsp/tests/r2_mf_rx_tests.c
   freeswitch/trunk/libs/spandsp/tests/r2_mf_tx_tests.c
   freeswitch/trunk/libs/spandsp/tests/regression_tests.sh
   freeswitch/trunk/libs/spandsp/tests/rfc2198_sim_tests.c
   freeswitch/trunk/libs/spandsp/tests/sig_tone_tests.c
   freeswitch/trunk/libs/spandsp/tests/super_tone_rx_tests.c
   freeswitch/trunk/libs/spandsp/tests/super_tone_tx_tests.c
   freeswitch/trunk/libs/spandsp/tests/t31_tests.c
   freeswitch/trunk/libs/spandsp/tests/t38_gateway_tests.c
   freeswitch/trunk/libs/spandsp/tests/t38_gateway_to_terminal_tests.c
   freeswitch/trunk/libs/spandsp/tests/t38_terminal_to_gateway_tests.c
   freeswitch/trunk/libs/spandsp/tests/t4_tests.c
   freeswitch/trunk/libs/spandsp/tests/testadsi.c
   freeswitch/trunk/libs/spandsp/tests/testfax.c
   freeswitch/trunk/libs/spandsp/tests/time_scale_tests.c
   freeswitch/trunk/libs/spandsp/tests/tone_detect_tests.c
   freeswitch/trunk/libs/spandsp/tests/tone_generate_tests.c
   freeswitch/trunk/libs/spandsp/tests/tsb85_tests.c
   freeswitch/trunk/libs/spandsp/tests/tsb85_tests.sh
   freeswitch/trunk/libs/spandsp/tests/v17_tests.c
   freeswitch/trunk/libs/spandsp/tests/v18_tests.c
   freeswitch/trunk/libs/spandsp/tests/v22bis_tests.c
   freeswitch/trunk/libs/spandsp/tests/v27ter_tests.c
   freeswitch/trunk/libs/spandsp/tests/v29_tests.c
   freeswitch/trunk/libs/spandsp/tests/v8_tests.c

Modified: freeswitch/trunk/libs/spandsp/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/spandsp/Makefile.am	(original)
+++ freeswitch/trunk/libs/spandsp/Makefile.am	Thu Jun 18 01:13:59 2009
@@ -16,7 +16,7 @@
 ## License along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
-## $Id: Makefile.am,v 1.46 2009/03/19 14:13:12 steveu Exp $
+## $Id: Makefile.am,v 1.49 2009/05/30 05:55:22 steveu Exp $
 
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
@@ -27,17 +27,6 @@
 
 EXTRA_DIST = autogen.sh \
              DueDiligence \
-             README.testdata \
-             spandsp.pc \
-             spandsp.spec \
-             wrapper.xsl \
-             unpack_g722_data.sh \
-             unpack_g726_data.sh \
-             unpack_gsm0610_data.sh \
-             unpack_v56ter_data.sh \
-             spandsp/global-tones.xml \
-             spandsp/tones.dtd \
-             spandsp/tsb85.xml \
              debian/changelog \
              debian/compat \
              debian/control \
@@ -46,20 +35,33 @@
              debian/libspandsp-dev.install \
              debian/libspandsp-doc.install \
              debian/rules \
-             debian/watch
+             debian/watch \
+             README.testdata \
+             spandsp.pc \
+             spandsp.spec \
+             spandsp/fax-tests.dtd \
+             spandsp/global-tones.xml \
+             spandsp/tones.dtd \
+             spandsp/tsb85.xml \
+             unpack_g722_data.sh \
+             unpack_g726_data.sh \
+             unpack_gsm0610_data.sh \
+             unpack_v56ter_data.sh \
+             wrapper.xsl
 
 if COND_DOC
     MAYBE_DOC=doc
 endif
-if COND_TESTS
-    MAYBE_TESTS=spandsp-sim tests
-endif
 if COND_TESTDATA
     MAYBE_TESTDATA=test-data
 endif
-SUBDIRS = src $(MAYBE_DOC) $(MAYBE_TESTS) $(MAYBE_TESTDATA)
+if COND_TESTS
+    MAYBE_TESTDATA=test-data
+    MAYBE_TESTS=spandsp-sim tests
+endif
+SUBDIRS = src $(MAYBE_DOC) $(MAYBE_TESTDATA) $(MAYBE_TESTS)
 
-DIST_SUBDIRS = src doc spandsp-sim tests test-data
+DIST_SUBDIRS = src doc test-data spandsp-sim tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = spandsp.pc

Modified: freeswitch/trunk/libs/spandsp/configure.ac
==============================================================================
--- freeswitch/trunk/libs/spandsp/configure.ac	(original)
+++ freeswitch/trunk/libs/spandsp/configure.ac	Thu Jun 18 01:13:59 2009
@@ -16,7 +16,7 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $Id: configure.ac,v 1.67 2009/03/28 17:14:53 steveu Exp $
+# $Id: configure.ac,v 1.70 2009/06/02 11:51:57 steveu Exp $
 
 # @start 1
 
@@ -162,6 +162,7 @@
 AC_CHECK_FUNCS([strstr])
 AC_CHECK_FUNCS([strtol])
 AC_CHECK_FUNCS([gettimeofday])
+AC_CHECK_FUNCS([drand48])
 
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
@@ -184,7 +185,7 @@
 AC_CHECK_HEADERS([sys/select.h])
 AC_CHECK_HEADERS([sys/ioctl.h])
 AC_CHECK_HEADERS([sys/fcntl.h])
-AC_CHECK_HEADERS([audiofile.h])
+AC_CHECK_HEADERS([sndfile.h])
 AC_CHECK_HEADERS([fftw3.h], , [AC_CHECK_HEADERS([fftw.h])])
 AC_CHECK_HEADERS([tiffio.h])
 AC_CHECK_HEADERS([pthread.h])
@@ -266,12 +267,12 @@
 # Checks for libraries.
 AC_CHECK_LIB([tiff], [TIFFOpen], , AC_MSG_ERROR("Can't build without libtiff (does your system require a libtiff-devel package?)"), -lm)
 
-AC_CHECK_LIB([xml2], [xmlParseFile], [AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have the 'libxml2' library (-lxml2).]) TESTLIBS="$TESTLIBS -lxml2"])
+AC_CHECK_LIB([xml2], [xmlParseFile], [AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have the 'libxml2' library (-lxml2).]) SIMLIBS="$SIMLIBS -lxml2"])
 
 if test -n "$enable_tests" ; then
     AC_LANG([C])
-    AC_CHECK_LIB([audiofile], [afOpenFile], TESTLIBS="$TESTLIBS -laudiofile", AC_MSG_ERROR("Can't make tests without libaudiofile (does your system require a libaudiofile-devel package?)"))
-    AC_CHECK_LIB([fftw3], [fftw_plan_dft_1d], TESTLIBS="$TESTLIBS -lfftw3", [AC_CHECK_LIB([fftw], [fftw_create_plan], TESTLIBS="$TESTLIBS -lfftw", AC_MSG_ERROR("Can't make tests without FFTW 2 or 3 (does your system require an fftw?-devel package?)"))])
+    AC_CHECK_LIB([sndfile], [sf_open], SIMLIBS="$SIMLIBS -lsndfile", AC_MSG_ERROR("Can't make tests without libsndfile (does your system require a libsndfile-devel package?)"))
+    AC_CHECK_LIB([fftw3], [fftw_plan_dft_1d], SIMLIBS="$SIMLIBS -lfftw3", [AC_CHECK_LIB([fftw], [fftw_create_plan], SIMLIBS="$SIMLIBS -lfftw", AC_MSG_ERROR("Can't make tests without FFTW 2 or 3 (does your system require an fftw?-devel package?)"))])
     AC_CHECK_LIB([pthread], [pthread_attr_init], TESTLIBS="$TESTLIBS -lpthread")
     AC_CHECK_LIB([dl], [dlopen], TESTLIBS="$TESTLIBS -ldl")
     AC_CHECK_LIB([Xft], [XftFontOpen], TESTLIBS="$TESTLIBS -lXft",, $TESTLIBS)
@@ -406,10 +407,13 @@
     AC_DEFINE([SPANDSP_USE_MMX], [1], [Use the MMX instruction set (i386 and x86_64 only).])
 fi
 
+TESTLIBS="$SIMLIBS $TESTLIBS"
+
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(CPPFLAGS_FOR_BUILD)
 AC_SUBST(COMP_VENDOR_CFLAGS)
 AC_SUBST(COMP_VENDOR_LDFLAGS)
+AC_SUBST(SIMLIBS)
 AC_SUBST(TESTLIBS)
 AC_SUBST(SPANDSP_USE_FIXED_POINT)
 AC_SUBST(SPANDSP_MISALIGNED_ACCESS_FAILS)

Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/Makefile.am	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/Makefile.am	Thu Jun 18 01:13:59 2009
@@ -16,15 +16,26 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
-## $Id: Makefile.am,v 1.7 2008/05/03 13:05:04 steveu Exp $
+## $Id: Makefile.am,v 1.10 2009/06/02 16:03:55 steveu Exp $
 
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
 
-LIBS += $(TESTLIBS)
+LIBS += -L$(top_builddir)/src -lspandsp $(SIMLIBS)
 
 MAINTAINERCLEANFILES = Makefile.in
 
+EXTRA_DIST = libspandsp_sim.dsp \
+             libspandsp_sim.2005.vcproj \
+             libspandsp_sim.2008.vcproj \
+             msvc/make_line_models.2008.vcproj \
+             msvc/msvcproj.head \
+             msvc/msvcproj.foot \
+             msvc/vc8proj.head \
+             msvc/vc8proj.foot \
+             msvc/vc9proj.head \
+             msvc/vc9proj.foot
+
 INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -DDATADIR="\"$(pkgdatadir)\""
 
 noinst_PROGRAMS = make_line_models
@@ -38,7 +49,7 @@
 
 nodist_libspandsp_sim_la_SOURCES = line_models.c
 
-libspandsp_sim_la_LDFLAGS = -version-info @SPANDSP_LT_CURRENT@:@SPANDSP_LT_REVISION@:@SPANDSP_LT_AGE@
+libspandsp_sim_la_LDFLAGS = -version-info @SPANDSP_LT_CURRENT@:@SPANDSP_LT_REVISION@:@SPANDSP_LT_AGE@ $(COMP_VENDOR_LDFLAGS)
 
 nobase_include_HEADERS = spandsp/g1050.h \
                          spandsp/line_model.h \
@@ -60,14 +71,16 @@
 line_models.c: make_line_models$(EXEEXT)
 	./make_line_models$(EXEEXT)
     
-DSP = libspandsp-sim.dsp
-VCPROJ = libspandsp-sim.vcproj
+DSP = libspandsp_sim.dsp
+VCPROJ8 = libspandsp_sim.2005.vcproj
+VCPROJ9 = libspandsp_sim.2008.vcproj
 
-WIN32SOURCES = $(libspandsp_sim_la_SOURCES) msvc/gettimeofday.c
-WIN32HEADERS = $(nobase_include_HEADERS) spandsp-sim.h
+WIN32SOURCES = $(libspandsp_sim_la_SOURCES)
+WIN32HEADERS = $(nobase_include_HEADERS)
 
 DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP)
-VCPROJOUT = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ)
+VCPROJOUT8 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ8)
+VCPROJOUT9 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ9)
 
 $(DSP): msvc/msvcproj.head msvc/msvcproj.foot Makefile.am
 	echo "creating $(DSP)"
@@ -90,14 +103,26 @@
 	echo "# End Group" $(DSPOUT); \
 	cat $(srcdir)/msvc/msvcproj.foot $(DSPOUT) )
 
-$(VCPROJ): msvc/vc8proj.head msvc/vc8proj.foot Makefile.am
-	echo "creating $(VCPROJ)"
-	@(cp $(srcdir)/msvc/vc8proj.head $(VCPROJ); \
+$(VCPROJ8): msvc/vc8proj.head msvc/vc8proj.foot Makefile.am
+	echo "creating $(VCPROJ8)"
+	@(cp $(srcdir)/msvc/vc8proj.head $(VCPROJ8); \
+	for file in $(WIN32SOURCES); do \
+		echo "" $(VCPROJOUT8); \
+	done; \
+	echo "" $(VCPROJOUT8); \
+	for file in $(WIN32HEADERS); do \
+		echo "" $(VCPROJOUT8); \
+	done; \
+	cat $(srcdir)/msvc/vc8proj.foot $(VCPROJOUT8) )
+
+$(VCPROJ9): msvc/vc9proj.head msvc/vc9proj.foot Makefile.am
+	echo "creating $(VCPROJ9)"
+	@(cp $(srcdir)/msvc/vc9proj.head $(VCPROJ9); \
 	for file in $(WIN32SOURCES); do \
-		echo "" $(VCPROJOUT); \
+		echo "" $(VCPROJOUT9); \
 	done; \
-	echo "" $(VCPROJOUT); \
+	echo "" $(VCPROJOUT9); \
 	for file in $(WIN32HEADERS); do \
-		echo "" $(VCPROJOUT); \
+		echo "" $(VCPROJOUT9); \
 	done; \
-	cat $(srcdir)/msvc/vc8proj.foot $(VCPROJOUT) )
+	cat $(srcdir)/msvc/vc9proj.foot $(VCPROJOUT9) )

Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/g1050.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/g1050.c	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/g1050.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: g1050.c,v 1.13 2009/02/03 16:28:39 steveu Exp $
+ * $Id: g1050.c,v 1.17 2009/06/02 14:55:36 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 #if defined(HAVE_TGMATH_H)
 #include 
 #endif
@@ -669,11 +668,31 @@
     }
 };
 
+#if defined(HAVE_DRAND48)
+static __inline__ void q1050_rand_init(void)
+{
+    srand48(time(NULL));
+}
+/*- End of function --------------------------------------------------------*/
+
 static __inline__ double q1050_rand(void)
 {
     return drand48();
 }
 /*- End of function --------------------------------------------------------*/
+#else
+static __inline__ void q1050_rand_init(void)
+{
+    srand(time(NULL));
+}
+/*- End of function --------------------------------------------------------*/
+
+static __inline__ double q1050_rand(void)
+{
+    return (double) rand()/(double) RAND_MAX;
+}
+/*- End of function --------------------------------------------------------*/
+#endif
 
 static __inline__ double scale_probability(double prob, double scale)
 {
@@ -1070,10 +1089,10 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(g1050_state_t) *g1050_init(int model,
-                                        int speed_pattern,
-                                        int packet_size,
-                                        int packet_rate)
+SPAN_DECLARE(g1050_state_t *) g1050_init(int model,
+                                         int speed_pattern,
+                                         int packet_size,
+                                         int packet_rate)
 {
     g1050_state_t *s;
     g1050_constants_t *constants;
@@ -1089,7 +1108,7 @@
             break;
     }
     if (i >= 10)
-        srand48(time(NULL));
+        q1050_rand_init();
     if ((s = (g1050_state_t *) malloc(sizeof(*s))) == NULL)
         return NULL;
     memset(s, 0, sizeof(*s));

Added: freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.2005.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.2005.vcproj	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,110 @@
+
+
+  
+    
+  
+  
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+  
+  
+  
+  
+    
+
+
+
+
+
+
+
+
+
+
+
+		

+	

+	

+	

+


Added: freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.2008.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.2008.vcproj	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,270 @@
+
+
+	
+		
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+	
+		
+
+
+
+
+
+
+
+
+
+
+
+		

+	

+	

+	

+


Added: freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.dsp
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/libspandsp_sim.dsp	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,143 @@
+# Microsoft Developer Studio Project File - Name="spandsp" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=spandsp - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "spandsp.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "spandsp.mak" CFG="spandsp - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "spandsp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "spandsp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "spandsp - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /D "_WINDLL" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /map /debug /machine:I386 /out:"Release/libspandsp.dll"
+
+!ELSEIF  "$(CFG)" == "spandsp - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /FR /FD /GZ /c
+# SUBTRACT CPP /WX /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"Debug/libspandsp.dll" /pdbtype:sept
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "spandsp - Win32 Release"
+# Name "spandsp - Win32 Debug"
+# Begin Group "Source Files"
+# Begin Source File
+
+SOURCE=.\g1050.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\line_model.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rfc2198_sim.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\test_utils.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+# Begin Source File
+
+SOURCE=.\spandsp/g1050.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\spandsp/line_model.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\spandsp/line_models.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\spandsp/rfc2198_sim.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\spandsp/test_utils.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\spandsp-sim.h
+# End Source File
+# End Group
+

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project


Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/line_model.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/line_model.c	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/line_model.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: line_model.c,v 1.8 2009/02/03 16:28:39 steveu Exp $
+ * $Id: line_model.c,v 1.12 2009/06/01 16:27:12 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 #if defined(HAVE_TGMATH_H)
 #include 
 #endif
@@ -270,10 +269,10 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-void one_way_line_model(one_way_line_model_state_t *s, 
-                        int16_t output[],
-                        const int16_t input[],
-                        int samples)
+SPAN_DECLARE(void) one_way_line_model(one_way_line_model_state_t *s, 
+                                      int16_t output[],
+                                      const int16_t input[],
+                                      int samples)
 {
     int i;
     float in;
@@ -336,13 +335,13 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-void one_way_line_model_set_dc(one_way_line_model_state_t *s, float dc)
+SPAN_DECLARE(void) one_way_line_model_set_dc(one_way_line_model_state_t *s, float dc)
 {
     s->dc_offset = dc;
 }
 /*- End of function --------------------------------------------------------*/
 
-void one_way_line_model_set_mains_pickup(one_way_line_model_state_t *s, int f, float level)
+SPAN_DECLARE(void) one_way_line_model_set_mains_pickup(one_way_line_model_state_t *s, int f, float level)
 {
     tone_gen_descriptor_t mains_tone_desc;
 
@@ -355,12 +354,12 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-void both_ways_line_model(both_ways_line_model_state_t *s, 
-                          int16_t output1[],
-                          const int16_t input1[],
-                          int16_t output2[],
-                          const int16_t input2[],
-                          int samples)
+SPAN_DECLARE(void) both_ways_line_model(both_ways_line_model_state_t *s, 
+                                        int16_t output1[],
+                                        const int16_t input1[],
+                                        int16_t output2[],
+                                        const int16_t input2[],
+                                        int samples)
 {
     int i;
     float in1;
@@ -444,14 +443,14 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-void both_ways_line_model_set_dc(both_ways_line_model_state_t *s, float dc1, float dc2)
+SPAN_DECLARE(void) both_ways_line_model_set_dc(both_ways_line_model_state_t *s, float dc1, float dc2)
 {
     s->line1.dc_offset = dc1;
     s->line2.dc_offset = dc2;
 }
 /*- End of function --------------------------------------------------------*/
 
-void both_ways_line_model_set_mains_pickup(both_ways_line_model_state_t *s, int f, float level1, float level2)
+SPAN_DECLARE(void) both_ways_line_model_set_mains_pickup(both_ways_line_model_state_t *s, int f, float level1, float level2)
 {
     tone_gen_descriptor_t mains_tone_desc;
 
@@ -467,7 +466,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-one_way_line_model_state_t *one_way_line_model_init(int model, float noise, int codec, int rbs_pattern)
+SPAN_DECLARE(one_way_line_model_state_t *) one_way_line_model_init(int model, float noise, int codec, int rbs_pattern)
 {
     one_way_line_model_state_t *s;
 
@@ -486,8 +485,9 @@
     s->far_filter = models[model];
     s->far_filter_len = 129;
 
-    awgn_init_dbm0(&s->near_noise, 1234567, noise);
-    awgn_init_dbm0(&s->far_noise, 1234567, noise);
+    /* Put half the noise in each analogue section */
+    awgn_init_dbm0(&s->near_noise, 1234567, noise - 3.02f);
+    awgn_init_dbm0(&s->far_noise, 1234567, noise - 3.02f);
     
     s->dc_offset = 0.0f;
     s->mains_interference = 0;
@@ -496,19 +496,19 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-int one_way_line_model_release(one_way_line_model_state_t *s)
+SPAN_DECLARE(int) one_way_line_model_release(one_way_line_model_state_t *s)
 {
     free(s);
     return 0;
 }
 /*- End of function --------------------------------------------------------*/
 
-both_ways_line_model_state_t *both_ways_line_model_init(int model1,
-                                                        float noise1,
-                                                        int model2,
-                                                        float noise2,
-                                                        int codec,
-                                                        int rbs_pattern)
+SPAN_DECLARE(both_ways_line_model_state_t *) both_ways_line_model_init(int model1,
+                                                                       float noise1,
+                                                                       int model2,
+                                                                       float noise2,
+                                                                       int codec,
+                                                                       int rbs_pattern)
 {
     float echo_level;
     both_ways_line_model_state_t *s;
@@ -536,11 +536,12 @@
     s->line2.far_filter = models[model2];
     s->line2.far_filter_len = 129;
 
-    awgn_init_dbm0(&s->line1.near_noise, 1234567, noise1);
-    awgn_init_dbm0(&s->line2.near_noise, 7654321, noise2);
+    /* Put half the noise in each analogue section */
+    awgn_init_dbm0(&s->line1.near_noise, 1234567, noise1 - 3.02f);
+    awgn_init_dbm0(&s->line2.near_noise, 7654321, noise2 - 3.02f);
 
-    awgn_init_dbm0(&s->line1.far_noise, 1234567, noise1);
-    awgn_init_dbm0(&s->line2.far_noise, 7654321, noise2);
+    awgn_init_dbm0(&s->line1.far_noise, 1234567, noise1 - 3.02f);
+    awgn_init_dbm0(&s->line2.far_noise, 7654321, noise2 - 3.02f);
 
     s->line1.dc_offset = 0.0f;
     s->line2.dc_offset = 0.0f;
@@ -549,16 +550,16 @@
 
     /* Echos */
     echo_level = -15; /* in dB */
-    s->line1.near_co_hybrid_echo = pow(10, echo_level/20.0);
-    s->line2.near_co_hybrid_echo = pow(10, echo_level/20.0);
-    s->line1.near_cpe_hybrid_echo = pow(10, echo_level/20.0);
-    s->line2.near_cpe_hybrid_echo = pow(10, echo_level/20.0);
+    s->line1.near_co_hybrid_echo = pow(10, echo_level/20.0f);
+    s->line2.near_co_hybrid_echo = pow(10, echo_level/20.0f);
+    s->line1.near_cpe_hybrid_echo = pow(10, echo_level/20.0f);
+    s->line2.near_cpe_hybrid_echo = pow(10, echo_level/20.0f);
     
     return s;
 }
 /*- End of function --------------------------------------------------------*/
 
-int both_ways_line_model_release(both_ways_line_model_state_t *s)
+SPAN_DECLARE(int) both_ways_line_model_release(both_ways_line_model_state_t *s)
 {
     free(s);
     return 0;

Added: freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/make_line_models.2008.vcproj
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/make_line_models.2008.vcproj	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,121 @@
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/msvcproj.foot
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/msvcproj.foot	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,7 @@
+
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

Added: freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/msvcproj.head
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/msvcproj.head	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,92 @@
+# Microsoft Developer Studio Project File - Name="spandsp" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=spandsp - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "spandsp.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "spandsp.mak" CFG="spandsp - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "spandsp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "spandsp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "spandsp - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /D "_WINDLL" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /map /debug /machine:I386 /out:"Release/libspandsp.dll"
+
+!ELSEIF  "$(CFG)" == "spandsp - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /FR /FD /GZ /c
+# SUBTRACT CPP /WX /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"Debug/libspandsp.dll" /pdbtype:sept
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "spandsp - Win32 Release"
+# Name "spandsp - Win32 Debug"

Added: freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc8proj.foot
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc8proj.foot	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,5 @@
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc8proj.head
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc8proj.head	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,94 @@
+
+
+  
+    
+  
+  
+  
+  
+    
+      
+      
+    
+    
+      
+      
+    
+  
+  
+  
+  
+    

Added: freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc9proj.foot
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc9proj.foot	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,5 @@
+		
+	
+	
+	
+

Added: freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc9proj.head
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/msvc/vc9proj.head	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,254 @@
+
+
+	
+		
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+	
+		

Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/rfc2198_sim.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/rfc2198_sim.c	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/rfc2198_sim.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: rfc2198_sim.c,v 1.7 2009/02/03 16:28:39 steveu Exp $
+ * $Id: rfc2198_sim.c,v 1.10 2009/06/01 16:27:12 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 #if defined(HAVE_TGMATH_H)
 #include 
 #endif
@@ -55,11 +54,11 @@
 #define FALSE 0
 #define TRUE (!FALSE)
 
-rfc2198_sim_state_t *rfc2198_sim_init(int model,
-                                      int speed_pattern,
-                                      int packet_size,
-                                      int packet_rate,
-                                      int redundancy_depth)
+SPAN_DECLARE(rfc2198_sim_state_t *) rfc2198_sim_init(int model,
+                                                     int speed_pattern,
+                                                     int packet_size,
+                                                     int packet_rate,
+                                                     int redundancy_depth)
 {
     rfc2198_sim_state_t *s;
 
@@ -73,11 +72,11 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-int rfc2198_sim_put(rfc2198_sim_state_t *s,
-                    const uint8_t buf[],
-                    int len,
-                    int seq_no,
-                    double departure_time)
+SPAN_DECLARE(int) rfc2198_sim_put(rfc2198_sim_state_t *s,
+                                  const uint8_t buf[],
+                                  int len,
+                                  int seq_no,
+                                  double departure_time)
 {
     uint8_t buf2[8192];
     uint8_t *p;
@@ -110,19 +109,23 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-int rfc2198_sim_get(rfc2198_sim_state_t *s,
-                    uint8_t buf[],
-                    int max_len,
-                    double current_time,
-                    int *seq_no,
-                    double *departure_time,
-                    double *arrival_time)
+SPAN_DECLARE(int) rfc2198_sim_get(rfc2198_sim_state_t *s,
+                                  uint8_t buf[],
+                                  int max_len,
+                                  double current_time,
+                                  int *seq_no,
+                                  double *departure_time,
+                                  double *arrival_time)
 {
     int len;
     int lenx;
     int seq_nox;
     int i;
+#if defined(_MSC_VER)
+    uint8_t *bufx = (uint8_t *) _alloca(s->redundancy_depth*1024);
+#else
     uint8_t bufx[s->redundancy_depth*1024];
+#endif
     uint8_t *p;
     uint16_t *q;
     int redundancy_depth;

Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/g1050.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/g1050.h	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/g1050.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: g1050.h,v 1.10 2009/01/31 08:48:10 steveu Exp $
+ * $Id: g1050.h,v 1.12 2009/06/01 16:27:12 steveu Exp $
  */
 
 /*! \file */
@@ -269,12 +269,12 @@
 {
 #endif
 
-SPAN_DECLARE(g1050_state_t) *g1050_init(int model,
-                                        int speed_pattern,
-                                        int packet_size,
-                                        int packet_rate);
+SPAN_DECLARE(g1050_state_t *) g1050_init(int model,
+                                         int speed_pattern,
+                                         int packet_size,
+                                         int packet_rate);
 
-void g1050_dump_parms(int model, int speed_pattern);
+SPAN_DECLARE(void) g1050_dump_parms(int model, int speed_pattern);
 
 SPAN_DECLARE(int) g1050_put(g1050_state_t *s,
                             const uint8_t buf[],
@@ -290,7 +290,7 @@
                             double *departure_time,
                             double *arrival_time);
 
-void g1050_queue_dump(g1050_state_t *s);
+SPAN_DECLARE(void) g1050_queue_dump(g1050_state_t *s);
 
 #ifdef  __cplusplus
 }

Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/line_model.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/line_model.h	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/line_model.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: line_model.h,v 1.5 2009/01/31 08:48:10 steveu Exp $
+ * $Id: line_model.h,v 1.6 2009/05/31 14:47:10 steveu Exp $
  */
 
 /*! \file */
@@ -143,12 +143,12 @@
 
 SPAN_DECLARE(void) both_ways_line_model_set_mains_pickup(both_ways_line_model_state_t *s, int f, float level1, float level2);
     
-SPAN_DECLARE(both_ways_line_model_state_t) *both_ways_line_model_init(int model1,
-                                                                      float noise1,
-                                                                      int model2,
-                                                                      float noise2,
-                                                                      int codec,
-                                                                      int rbs_pattern);
+SPAN_DECLARE(both_ways_line_model_state_t *) both_ways_line_model_init(int model1,
+                                                                       float noise1,
+                                                                       int model2,
+                                                                       float noise2,
+                                                                       int codec,
+                                                                       int rbs_pattern);
 
 SPAN_DECLARE(int) both_ways_line_model_release(both_ways_line_model_state_t *s);
 
@@ -161,7 +161,7 @@
 
 SPAN_DECLARE(void) one_way_line_model_set_mains_pickup(one_way_line_model_state_t *s, int f, float level);
 
-SPAN_DECLARE(one_way_line_model_state_t) *one_way_line_model_init(int model, float noise, int codec, int rbs_pattern);
+SPAN_DECLARE(one_way_line_model_state_t *) one_way_line_model_init(int model, float noise, int codec, int rbs_pattern);
 
 SPAN_DECLARE(int) one_way_line_model_release(one_way_line_model_state_t *s);
 

Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/rfc2198_sim.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/rfc2198_sim.h	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/rfc2198_sim.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: rfc2198_sim.h,v 1.5 2009/01/31 08:48:10 steveu Exp $
+ * $Id: rfc2198_sim.h,v 1.6 2009/05/31 14:47:10 steveu Exp $
  */
 
 /*! \file */
@@ -69,11 +69,11 @@
 {
 #endif
 
-SPAN_DECLARE(rfc2198_sim_state_t) *rfc2198_sim_init(int model,
-                                                    int speed_pattern,
-                                                    int packet_size,
-                                                    int packet_rate,
-                                                    int redundancy_depth);
+SPAN_DECLARE(rfc2198_sim_state_t *) rfc2198_sim_init(int model,
+                                                     int speed_pattern,
+                                                     int packet_size,
+                                                     int packet_rate,
+                                                     int redundancy_depth);
 
 SPAN_DECLARE(int) rfc2198_sim_put(rfc2198_sim_state_t *s,
                                   const uint8_t buf[],

Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/test_utils.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/test_utils.h	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/spandsp/test_utils.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: test_utils.h,v 1.7 2009/01/31 08:48:10 steveu Exp $
+ * $Id: test_utils.h,v 1.9 2009/05/31 14:47:10 steveu Exp $
  */
 
 /*! \file */
@@ -30,7 +30,7 @@
 #if !defined(_TEST_UTILS_H_)
 #define _TEST_UTILS_H_
 
-#include 
+#include 
 
 enum
 {
@@ -51,7 +51,7 @@
 extern "C" {
 #endif
 
-SPAN_DECLARE(complexify_state_t) *complexify_init(void);
+SPAN_DECLARE(complexify_state_t *) complexify_init(void);
 
 SPAN_DECLARE(void) complexify_release(complexify_state_t *s);
 
@@ -61,15 +61,15 @@
 
 SPAN_DECLARE(void) ifft(complex_t data[], int len);
 
-SPAN_DECLARE(codec_munge_state_t) *codec_munge_init(int codec, int info);
+SPAN_DECLARE(codec_munge_state_t *) codec_munge_init(int codec, int info);
 
 SPAN_DECLARE(void) codec_munge_release(codec_munge_state_t *s);
 
 SPAN_DECLARE(void) codec_munge(codec_munge_state_t *s, int16_t amp[], int len);
 
-SPAN_DECLARE(AFfilehandle) afOpenFile_telephony_read(const char *name, int channels);
+SPAN_DECLARE(SNDFILE *) sf_open_telephony_read(const char *name, int channels);
 
-SPAN_DECLARE(AFfilehandle) afOpenFile_telephony_write(const char *name, int channels);
+SPAN_DECLARE(SNDFILE *) sf_open_telephony_write(const char *name, int channels);
 
 #ifdef __cplusplus
 }

Modified: freeswitch/trunk/libs/spandsp/spandsp-sim/test_utils.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp-sim/test_utils.c	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp-sim/test_utils.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: test_utils.c,v 1.12 2009/02/03 16:28:39 steveu Exp $
+ * $Id: test_utils.c,v 1.14 2009/06/01 16:27:12 steveu Exp $
  */
 
 /*! \file */
@@ -44,7 +44,7 @@
 #include "floating_fudge.h"
 #include 
 #include 
-#include 
+#include 
 
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
 #include "spandsp.h"
@@ -72,7 +72,7 @@
 static complex_t icircle[MAX_FFT_LEN/2];
 static int icircle_init = FALSE;
 
-SPAN_DECLARE(complexify_state_t) *complexify_init(void)
+SPAN_DECLARE(complexify_state_t *) complexify_init(void)
 {
     complexify_state_t *s;
     int i;
@@ -261,7 +261,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(codec_munge_state_t) *codec_munge_init(int codec, int info)
+SPAN_DECLARE(codec_munge_state_t *) codec_munge_init(int codec, int info)
 {
     codec_munge_state_t *s;
     
@@ -351,29 +351,25 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(AFfilehandle) afOpenFile_telephony_read(const char *name, int channels)
+SPAN_DECLARE(SNDFILE *) sf_open_telephony_read(const char *name, int channels)
 {
-    float x;
-    AFfilehandle handle;
+    SNDFILE *handle;
+    SF_INFO info;
 
-    if ((handle = afOpenFile(name, "r", 0)) == AF_NULL_FILEHANDLE)
+    memset(&info, 0, sizeof(info));
+    if ((handle = sf_open(name, SFM_READ, &info)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", name);
+        fprintf(stderr, "    Cannot open audio file '%s' for reading\n", name);
         exit(2);
     }
-    if ((x = afGetFrameSize(handle, AF_DEFAULT_TRACK, 1)) != 2.0)
+    if (info.samplerate != SAMPLE_RATE)
     {
-        fprintf(stderr, "    Unexpected frame size in wave file '%s'\n", name);
+        printf("    Unexpected sample rate in audio file '%s'\n", name);
         exit(2);
     }
-    if ((x = afGetRate(handle, AF_DEFAULT_TRACK)) != (float) SAMPLE_RATE)
+    if (info.channels != channels)
     {
-        printf("    Unexpected sample rate in wave file '%s'\n", name);
-        exit(2);
-    }
-    if ((x = afGetChannels(handle, AF_DEFAULT_TRACK)) != (float) channels)
-    {
-        printf("    Unexpected number of channels in wave file '%s'\n", name);
+        printf("    Unexpected number of channels in audio file '%s'\n", name);
         exit(2);
     }
 
@@ -381,27 +377,24 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(AFfilehandle) afOpenFile_telephony_write(const char *name, int channels)
+SPAN_DECLARE(SNDFILE *) sf_open_telephony_write(const char *name, int channels)
 {
-    AFfilesetup setup;
-    AFfilehandle handle;
+    SNDFILE *handle;
+    SF_INFO info;
 
-    if ((setup = afNewFileSetup()) == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    %s: Failed to create file setup\n", name);
-        exit(2);
-    }
-    afInitSampleFormat(setup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(setup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(setup, AF_FILE_WAVE);
-    afInitChannels(setup, AF_DEFAULT_TRACK, channels);
+    memset(&info, 0, sizeof(info));
+    info.frames = 0;
+    info.samplerate = SAMPLE_RATE;
+    info.channels = channels;
+    info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+    info.sections = 1;
+    info.seekable = 1;
 
-    if ((handle = afOpenFile(name, "w", setup)) == AF_NULL_FILEHANDLE)
+    if ((handle = sf_open(name, SFM_WRITE, &info)) == NULL)
     {
-        fprintf(stderr, "    Failed to open result file\n");
+        fprintf(stderr, "    Cannot open audio file '%s' for writing\n", name);
         exit(2);
     }
-    afFreeFileSetup(setup);
 
     return handle;
 }

Added: freeswitch/trunk/libs/spandsp/spandsp/fax-tests.dtd
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/spandsp/fax-tests.dtd	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Modified: freeswitch/trunk/libs/spandsp/spandsp/tsb85.xml
==============================================================================
--- freeswitch/trunk/libs/spandsp/spandsp/tsb85.xml	(original)
+++ freeswitch/trunk/libs/spandsp/spandsp/tsb85.xml	Thu Jun 18 01:13:59 2009
@@ -1,7 +1,7 @@
 
 
 
-
+
 
     
 
@@ -2202,7 +2202,7 @@
 
         
         
-        
+        
         
         
         
@@ -2541,8 +2541,8 @@
 
         
         
-        
-        
+        
+        
         
         
         
@@ -5513,7 +5513,7 @@
 
         
 
-        
+        
         
         
         

Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/Makefile.am	(original)
+++ freeswitch/trunk/libs/spandsp/src/Makefile.am	Thu Jun 18 01:13:59 2009
@@ -16,7 +16,7 @@
 ## License along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
-## $Id: Makefile.am,v 1.130 2009/04/16 13:09:40 steveu Exp $
+## $Id: Makefile.am,v 1.134 2009/06/02 11:51:57 steveu Exp $
 
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
@@ -24,7 +24,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = floating_fudge.h \
-             spandsp/version.h.in \
              libspandsp.dsp \
              libspandsp.2005.sln \
              libspandsp.2008.sln \
@@ -42,19 +41,20 @@
              msvc/make_at_dictionary.2008.vcproj \
              msvc/make_modem_filter.2005.vcproj \
              msvc/make_modem_filter.2008.vcproj \
-             msvc/spandsp.h \
-             msvc/unistd.h \
-             msvc/tgmath.h \
              msvc/msvcproj.head \
              msvc/msvcproj.foot \
+             msvc/spandsp.h \
+             msvc/tgmath.h \
+             msvc/tiff/cleancount \
+             msvc/unistd.h \
              msvc/util.vbs \
-             msvc/vc8proj.head \
              msvc/vc8proj.foot \
-             msvc/vc9proj.head \
+             msvc/vc8proj.head \
              msvc/vc9proj.foot \
+             msvc/vc9proj.head \
              msvc/sys/time.h \
-             msvc/tiff/cleancount \
-             spandsp/private/README
+             spandsp/private/README \
+             spandsp/version.h.in
 
 INCLUDES = -I$(top_builddir)
 
@@ -139,7 +139,7 @@
                         vector_float.c \
                         vector_int.c
 
-libspandsp_la_LDFLAGS = -version-info @SPANDSP_LT_CURRENT@:@SPANDSP_LT_REVISION@:@SPANDSP_LT_AGE@ $(COMP_VENDOR_FLAGS)
+libspandsp_la_LDFLAGS = -version-info @SPANDSP_LT_CURRENT@:@SPANDSP_LT_REVISION@:@SPANDSP_LT_AGE@ $(COMP_VENDOR_LDFLAGS)
 
 nobase_include_HEADERS = spandsp/adsi.h \
                          spandsp/async.h \
@@ -277,8 +277,8 @@
                         lpc10_encdecs.h \
                         t30_local.h \
                         t4_states.h \
-                        v17rx_constellation_maps.h \
-                        v17tx_constellation_maps.h \
+                        v17_v32bis_rx_constellation_maps.h \
+                        v17_v32bis_tx_constellation_maps.h \
                         v29tx_constellation_maps.h
 
 noinst_PROGRAMS = make_at_dictionary \
@@ -301,25 +301,25 @@
 
 t4.lo: spandsp/version.h
 
-v17rx.$(OBJEXT): v17rx_fixed_rrc.h v17rx_floating_rrc.h
+v17rx.$(OBJEXT): v17_v32bis_rx_fixed_rrc.h v17_v32bis_rx_floating_rrc.h
 
-v17rx.lo: v17rx_fixed_rrc.h v17rx_floating_rrc.h
+v17rx.lo: v17_v32bis_rx_fixed_rrc.h v17_v32bis_rx_floating_rrc.h
 
-v17rx_fixed_rrc.h: make_modem_filter$(EXEEXT)
-	./make_modem_filter$(EXEEXT) -m V.17 -i -r >v17rx_fixed_rrc.h
+v17_v32bis_rx_fixed_rrc.h: make_modem_filter$(EXEEXT)
+	./make_modem_filter$(EXEEXT) -m V.17 -i -r >v17_v32bis_rx_fixed_rrc.h
 
-v17rx_floating_rrc.h: make_modem_filter$(EXEEXT)
-	./make_modem_filter$(EXEEXT) -m V.17 -r >v17rx_floating_rrc.h
+v17_v32bis_rx_floating_rrc.h: make_modem_filter$(EXEEXT)
+	./make_modem_filter$(EXEEXT) -m V.17 -r >v17_v32bis_rx_floating_rrc.h
 
-v17tx.$(OBJEXT): v17tx_fixed_rrc.h v17tx_floating_rrc.h
+v17tx.$(OBJEXT): v17_v32bis_tx_fixed_rrc.h v17_v32bis_tx_floating_rrc.h
 
-v17tx.lo: v17tx_fixed_rrc.h v17tx_floating_rrc.h
+v17tx.lo: v17_v32bis_tx_fixed_rrc.h v17_v32bis_tx_floating_rrc.h
 
-v17tx_fixed_rrc.h: make_modem_filter$(EXEEXT)
-	./make_modem_filter$(EXEEXT) -m V.17 -i -t >v17tx_fixed_rrc.h
+v17_v32bis_tx_fixed_rrc.h: make_modem_filter$(EXEEXT)
+	./make_modem_filter$(EXEEXT) -m V.17 -i -t >v17_v32bis_tx_fixed_rrc.h
 
-v17tx_floating_rrc.h: make_modem_filter$(EXEEXT)
-	./make_modem_filter$(EXEEXT) -m V.17 -t >v17tx_floating_rrc.h
+v17_v32bis_tx_floating_rrc.h: make_modem_filter$(EXEEXT)
+	./make_modem_filter$(EXEEXT) -m V.17 -t >v17_v32bis_tx_floating_rrc.h
 
 v22bis_rx.$(OBJEXT): v22bis_rx_1200_fixed_rrc.h \
                      v22bis_rx_2400_fixed_rrc.h \

Modified: freeswitch/trunk/libs/spandsp/src/fax.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/fax.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/fax.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fax.c,v 1.92 2009/04/23 15:48:21 steveu Exp $
+ * $Id: fax.c,v 1.93 2009/05/24 07:18:36 steveu Exp $
  */
 
 /*! \file */
@@ -98,7 +98,7 @@
 #include "spandsp/private/t30.h"
 #include "spandsp/private/fax.h"
 
-#define HDLC_FRAMING_OK_THRESHOLD       5
+#define HDLC_FRAMING_OK_THRESHOLD       8
 
 static void fax_send_hdlc(void *user_data, const uint8_t *msg, int len)
 {
@@ -387,7 +387,7 @@
     {
         put_bit_func = (put_bit_func_t) hdlc_rx_put_bit;
         put_bit_user_data = (void *) &t->hdlc_rx;
-        hdlc_rx_init(&t->hdlc_rx, FALSE, FALSE, HDLC_FRAMING_OK_THRESHOLD, t30_hdlc_accept, &s->t30);
+        hdlc_rx_init(&t->hdlc_rx, FALSE, TRUE, HDLC_FRAMING_OK_THRESHOLD, t30_hdlc_accept, &s->t30);
     }
     else
     {

Modified: freeswitch/trunk/libs/spandsp/src/fsk.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/fsk.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/fsk.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fsk.c,v 1.58 2009/04/01 13:22:40 steveu Exp $
+ * $Id: fsk.c,v 1.59 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/hdlc.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/hdlc.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/hdlc.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: hdlc.c,v 1.71 2009/02/12 12:38:39 steveu Exp $
+ * $Id: hdlc.c,v 1.72 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -264,7 +264,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(void) hdlc_rx_put_byte(hdlc_rx_state_t *s, int new_byte)
+SPAN_DECLARE_NONSTD(void) hdlc_rx_put_byte(hdlc_rx_state_t *s, int new_byte)
 {
     int i;
 
@@ -282,7 +282,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(void) hdlc_rx_put(hdlc_rx_state_t *s, const uint8_t buf[], int len)
+SPAN_DECLARE_NONSTD(void) hdlc_rx_put(hdlc_rx_state_t *s, const uint8_t buf[], int len)
 {
     int i;
 
@@ -440,7 +440,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) hdlc_tx_get_byte(hdlc_tx_state_t *s)
+SPAN_DECLARE_NONSTD(int) hdlc_tx_get_byte(hdlc_tx_state_t *s)
 {
     int i;
     int byte_in_progress;
@@ -561,7 +561,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) hdlc_tx_get(hdlc_tx_state_t *s, uint8_t buf[], size_t max_len)
+SPAN_DECLARE_NONSTD(int) hdlc_tx_get(hdlc_tx_state_t *s, uint8_t buf[], size_t max_len)
 {
     size_t i;
     int x;

Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln	(original)
+++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln	Thu Jun 18 01:13:59 2009
@@ -12,6 +12,13 @@
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp_sim", "..\spandsp-sim\libspandsp_sim.2005.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838} = {329A6FA0-0FCC-4435-A950-E670AEFA9838}
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330} = {DEE932AB-5911-4700-9EEB-8C7090A0A330}
+		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.2005.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}

Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln	(original)
+++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln	Thu Jun 18 01:13:59 2009
@@ -12,6 +12,16 @@
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_line_models", "..\spandsp-sim\msvc\make_line_models.2008.vcproj", "{F290BADE-82DE-4037-B49D-D563E43169DA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp_sim", "..\spandsp-sim\libspandsp_sim.2008.vcproj", "{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.2008.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917}
@@ -91,6 +101,15 @@
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|x64
 		{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.Build.0 = Release|x64
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.All|Win32.ActiveCfg = Release|Win32
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.All|Win32.Build.0 = Release|Win32
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.All|x64.ActiveCfg = Release|Win32
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.Debug|Win32.Build.0 = Debug|Win32
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.Debug|x64.ActiveCfg = Debug|Win32
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.Release|Win32.ActiveCfg = Release|Win32
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.Release|Win32.Build.0 = Release|Win32
+		{502F1E51-F0A0-4607-AB7F-05BAB530AAE1}.Release|x64.ActiveCfg = Release|Win32
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|Win32.ActiveCfg = Release|x64
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64.ActiveCfg = Release|x64
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.All|x64.Build.0 = Release|x64
@@ -174,6 +193,15 @@
 		{C2E8B4D1-A398-4D57-94F8-B61F20C7D514}.Release|Win32.ActiveCfg = Release|Win32
 		{C2E8B4D1-A398-4D57-94F8-B61F20C7D514}.Release|Win32.Build.0 = Release|Win32
 		{C2E8B4D1-A398-4D57-94F8-B61F20C7D514}.Release|x64.ActiveCfg = Release|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.All|Win32.ActiveCfg = All|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.All|Win32.Build.0 = All|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.All|x64.ActiveCfg = All|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.Debug|Win32.ActiveCfg = All|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.Debug|Win32.Build.0 = All|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.Debug|x64.ActiveCfg = All|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.Release|Win32.ActiveCfg = All|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.Release|Win32.Build.0 = All|Win32
+		{F290BADE-82DE-4037-B49D-D563E43169DA}.Release|x64.ActiveCfg = All|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj	(original)
+++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj	Thu Jun 18 01:13:59 2009
@@ -30,7 +30,7 @@
       v21rx), amp, len);
+        break;
     case MODEM_CONNECT_TONES_FAX_CED_OR_PREAMBLE:
         /* Also look for V.21 preamble. A lot of machines don't send the 2100Hz burst. It
            might also not be seen all the way through the channel, due to switching delays. */
@@ -520,6 +526,7 @@
     s->tone_type = tone_type;
     switch (s->tone_type)
     {
+    case MODEM_CONNECT_TONES_FAX_PREAMBLE:
     case MODEM_CONNECT_TONES_FAX_CED_OR_PREAMBLE:
         fsk_rx_init(&(s->v21rx), &preset_fsk_specs[FSK_V21CH2], TRUE, v21_put_bit, s);
         fsk_rx_signal_cutoff(&(s->v21rx), -45.5f);

Modified: freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h	Thu Jun 18 01:13:59 2009
@@ -19,6 +19,11 @@
 extern "C" {
 #endif
 
+typedef __int8		__int8_t;
+typedef __int16		__int16_t;
+typedef __int32		__int32_t;
+typedef __int64		__int64_t;
+
 typedef unsigned __int8		uint8_t;
 typedef unsigned __int16	uint16_t;
 typedef unsigned __int32	uint32_t;
@@ -28,11 +33,11 @@
 typedef __int32		int32_t;
 typedef __int64		int64_t;
 
-#define  INT16_MAX   0x7fff 
+#define  INT16_MAX   0x7FFF 
 #define  INT16_MIN   (-INT16_MAX - 1) 
 
 #if !defined(INFINITY)
-#define INFINITY 0x7fffffff
+#define INFINITY 0x7FFFFFFF
 #endif
 
 #define INT32_MAX	(2147483647)

Modified: freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj	(original)
+++ freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj	Thu Jun 18 01:13:59 2009
@@ -90,7 +90,7 @@
 			/>
 			
 		
 	

Modified: freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj	(original)
+++ freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj	Thu Jun 18 01:13:59 2009
@@ -88,7 +88,7 @@
 			/>
 			
 		
 	

Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head	(original)
+++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head	Thu Jun 18 01:13:59 2009
@@ -30,7 +30,7 @@
       reading <= 0)
-        return FLT_MIN;
+        return -96.329f + DBM0_MAX_POWER;
     /* This is based on A-law, but u-law is only 0.03dB different, so don't worry. */
     return log10f((float) s->reading/(32767.0f*32767.0f))*10.0f + DBM0_MAX_POWER;
 }
@@ -131,8 +131,84 @@
 SPAN_DECLARE(float) power_meter_current_dbov(power_meter_t *s)
 {
     if (s->reading <= 0)
-        return FLT_MIN;
+        return -96.329f;
     return log10f((float) s->reading/(32767.0f*32767.0f))*10.0f;
 }
 /*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int32_t) power_surge_detector(power_surge_detector_state_t *s, int16_t amp)
+{
+    int32_t pow_short;
+    int32_t pow_medium;
+
+    pow_short = power_meter_update(&s->short_term, amp);
+    pow_medium = power_meter_update(&s->medium_term, amp);
+    if (pow_medium < s->min)
+        return 0;
+    if (!s->signal_present)
+    {
+        if (pow_short <= s->surge*(pow_medium >> 10))
+            return 0;
+        s->signal_present = TRUE;
+        s->medium_term.reading = s->short_term.reading;
+    }
+    else
+    {
+        if (pow_short < s->sag*(pow_medium >> 10))
+        {
+            s->signal_present = FALSE;
+            s->medium_term.reading = s->short_term.reading;
+            return 0;
+        }
+    }
+    return pow_short;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(float) power_surge_detector_current_dbm0(power_surge_detector_state_t *s)
+{
+    return power_meter_current_dbm0(&s->short_term);
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(float) power_surge_detector_current_dbov(power_surge_detector_state_t *s)
+{
+    return power_meter_current_dbov(&s->short_term);
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(power_surge_detector_state_t *) power_surge_detector_init(power_surge_detector_state_t *s, float min, float surge)
+{
+    float ratio;
+
+    if (s == NULL)
+    {
+        if ((s = (power_surge_detector_state_t *) malloc(sizeof(*s))) == NULL)
+            return NULL;
+    }
+    memset(s, 0, sizeof(*s));
+    power_meter_init(&s->short_term, 4);
+    power_meter_init(&s->medium_term, 7);
+    ratio = powf(10.0f, surge/10.0f);
+    s->surge = 1024.0f*ratio;
+    s->sag = 1024.0f/ratio;
+    s->min = power_meter_level_dbm0(min);
+    s->medium_term.reading = s->min + 1;
+    return s;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int) power_surge_detector_release(power_surge_detector_state_t *s)
+{
+    return 0;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int) power_surge_detector_free(power_surge_detector_state_t *s)
+{
+    if (s)
+        free(s);
+    return 0;
+}
+/*- End of function --------------------------------------------------------*/
 /*- End of file ------------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/src/silence_gen.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/silence_gen.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/silence_gen.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: silence_gen.c,v 1.21 2009/04/12 03:29:58 steveu Exp $
+ * $Id: silence_gen.c,v 1.22 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/adsi.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: adsi.h,v 1.39 2009/04/11 18:11:19 steveu Exp $
+ * $Id: adsi.h,v 1.40 2009/05/22 16:39:01 steveu Exp $
  */
 
 /*! \file */
@@ -476,7 +476,8 @@
     \param len The length of the message.
     \return The length actually added. If a message is already in progress
             in the transmitter, this function will return zero, as it will
-            not successfully add the message to the buffer.
+            not successfully add the message to the buffer. If the message is
+            invalid (e.g. it is too long), this function will return -1.
 */
 SPAN_DECLARE(int) adsi_tx_put_message(adsi_tx_state_t *s, const uint8_t *msg, int len);
 

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/expose.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/expose.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/expose.h	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: expose.h,v 1.12 2009/04/12 03:29:58 steveu Exp $
+ * $Id: expose.h,v 1.13 2009/05/16 03:34:45 steveu Exp $
  */
 
 /*! \file */
@@ -77,6 +77,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/fsk.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fsk.h,v 1.39 2009/04/01 13:22:40 steveu Exp $
+ * $Id: fsk.h,v 1.40 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/hdlc.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: hdlc.h,v 1.44 2009/02/12 12:38:39 steveu Exp $
+ * $Id: hdlc.h,v 1.45 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -160,14 +160,14 @@
     \param s A pointer to an HDLC receiver context.
     \param new_byte The byte of data.
 */
-SPAN_DECLARE(void) hdlc_rx_put_byte(hdlc_rx_state_t *s, int new_byte);
+SPAN_DECLARE_NONSTD(void) hdlc_rx_put_byte(hdlc_rx_state_t *s, int new_byte);
 
 /*! \brief Put a series of bytes of data to an HDLC receiver.
     \param s A pointer to an HDLC receiver context.
     \param buf The buffer of data.
     \param len The length of the data in the buffer.
 */
-SPAN_DECLARE(void) hdlc_rx_put(hdlc_rx_state_t *s, const uint8_t buf[], int len);
+SPAN_DECLARE_NONSTD(void) hdlc_rx_put(hdlc_rx_state_t *s, const uint8_t buf[], int len);
 
 /*! \brief Initialise an HDLC transmitter context.
     \param s A pointer to an HDLC transmitter context.
@@ -234,7 +234,7 @@
     \param s A pointer to an HDLC transmitter context.
     \return The next byte for transmission.
 */
-SPAN_DECLARE(int) hdlc_tx_get_byte(hdlc_tx_state_t *s);
+SPAN_DECLARE_NONSTD(int) hdlc_tx_get_byte(hdlc_tx_state_t *s);
 
 /*! \brief Get the next sequence of bytes for transmission.
     \param s A pointer to an HDLC transmitter context.
@@ -242,7 +242,7 @@
     \param max_len The number of bytes to get.
     \return The number of bytes actually got.
 */
-SPAN_DECLARE(int) hdlc_tx_get(hdlc_tx_state_t *s, uint8_t buf[], size_t max_len);
+SPAN_DECLARE_NONSTD(int) hdlc_tx_get(hdlc_tx_state_t *s, uint8_t buf[], size_t max_len);
 
 #if defined(__cplusplus)
 }

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/modem_connect_tones.h	Thu Jun 18 01:13:59 2009
@@ -24,7 +24,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: modem_connect_tones.h,v 1.22 2009/02/10 13:06:47 steveu Exp $
+ * $Id: modem_connect_tones.h,v 1.24 2009/06/02 16:03:56 steveu Exp $
  */
  
 /*! \file */
@@ -72,8 +72,7 @@
     /*! \brief The ANSam with phase reversals tone is a version of ANS_PR with 20% of 15Hz+-0.1Hz AM
                modulation, as per V.8 */
     MODEM_CONNECT_TONES_ANSAM_PR = 5,
-    /*! \brief FAX preamble in a string of V.21 HDLC flag octets. This is only valid as a result of tone
-               detection. It should not be specified as a tone type to transmit or receive. */
+    /*! \brief FAX preamble in a string of V.21 HDLC flag octets. */
     MODEM_CONNECT_TONES_FAX_PREAMBLE = 6,
     /*! \brief CED tone is the same as ANS tone. FAX preamble in a string of V.21 HDLC flag octets.
                This is only valid as a tone type to receive. It is never reported as a detected tone
@@ -126,8 +125,8 @@
     \return The number of samples generated.
 */
 SPAN_DECLARE_NONSTD(int) modem_connect_tones_tx(modem_connect_tones_tx_state_t *s,
-                                         int16_t amp[],
-                                         int len);
+                                                int16_t amp[],
+                                                int len);
 
 /*! \brief Process a block of samples through an instance of the modem connect
            tones detector.
@@ -136,9 +135,9 @@
     \param len The number of samples in the array.
     \return The number of unprocessed samples.
 */
-SPAN_DECLARE(int) modem_connect_tones_rx(modem_connect_tones_rx_state_t *s,
-                                         const int16_t amp[],
-                                         int len);
+SPAN_DECLARE_NONSTD(int) modem_connect_tones_rx(modem_connect_tones_rx_state_t *s,
+                                                const int16_t amp[],
+                                                int len);
                              
 /*! \brief Test if a modem_connect tone has been detected.
     \param s The context.

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/power_meter.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/power_meter.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/power_meter.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: power_meter.h,v 1.18 2009/02/10 13:06:47 steveu Exp $
+ * $Id: power_meter.h,v 1.19 2009/05/19 14:15:09 steveu Exp $
  */
 
 #if !defined(_POWER_METER_H_)
@@ -56,6 +56,16 @@
     int32_t reading;
 } power_meter_t;
 
+typedef struct
+{
+    power_meter_t short_term;
+    power_meter_t medium_term;
+    int signal_present;
+    int32_t surge;
+    int32_t sag;
+    int32_t min;
+} power_surge_detector_state_t;
+
 #if defined(__cplusplus)
 extern "C"
 {
@@ -116,6 +126,26 @@
     \return The equivalent power meter reading. */
 SPAN_DECLARE(int32_t) power_meter_level_dbov(float level);
 
+SPAN_DECLARE(int32_t) power_surge_detector(power_surge_detector_state_t *s, int16_t amp);
+
+/*! Get the current surge detector short term meter reading, in dBm0.
+    \brief Get the current surge detector meter reading, in dBm0.
+    \param s The power surge detector context.
+    \return The current power surge detector power reading, in dBm0. */
+SPAN_DECLARE(float) power_surge_detector_current_dbm0(power_surge_detector_state_t *s);
+
+/*! Get the current surge detector short term meter reading, in dBOv.
+    \brief Get the current surge detector meter reading, in dBOv.
+    \param s The power surge detector context.
+    \return The current power surge detector power reading, in dBOv. */
+SPAN_DECLARE(float) power_surge_detector_current_dbov(power_surge_detector_state_t *s);
+
+SPAN_DECLARE(power_surge_detector_state_t *) power_surge_detector_init(power_surge_detector_state_t *s, float min, float surge);
+
+SPAN_DECLARE(int) power_surge_detector_release(power_surge_detector_state_t *s);
+
+SPAN_DECLARE(int) power_surge_detector_free(power_surge_detector_state_t *s);
+
 #if defined(__cplusplus)
 }
 #endif

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/private/t38_gateway.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/private/t38_gateway.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/private/t38_gateway.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t38_gateway.h,v 1.3 2009/04/12 14:18:02 steveu Exp $
+ * $Id: t38_gateway.h,v 1.4 2009/05/16 03:34:45 steveu Exp $
  */
 
 /*! \file */
@@ -168,11 +168,8 @@
     /*! \brief The type of fast receive modem currently active, which may be T38_NONE */
     int fast_rx_active;
 
-    /*! \brief TRUE if between DCS and TCF, and we want the fast image modem to
-               start in the T.38 data at a predictable time from the end of the
-               V.21 signal. */
-    int tcf_mode_predictable_modem_start;
-
+    /*! \brief The current timed operation. */
+    int timed_mode;
     /*! \brief The number of samples until the next timeout event */
     int samples_to_timeout;
 

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/silence_gen.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/silence_gen.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/silence_gen.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: silence_gen.h,v 1.17 2009/04/12 03:29:58 steveu Exp $
+ * $Id: silence_gen.h,v 1.18 2009/06/02 16:03:56 steveu Exp $
  */
 
 #if !defined(_SPANDSP_SILENCE_GEN_H_)

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/tone_generate.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: tone_generate.h,v 1.38 2009/02/10 13:06:47 steveu Exp $
+ * $Id: tone_generate.h,v 1.39 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v17rx.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v17rx.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v17rx.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v17rx.h,v 1.63 2009/04/12 04:20:01 steveu Exp $
+ * $Id: v17rx.h,v 1.64 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v17tx.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v17tx.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v17tx.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v17tx.h,v 1.41 2009/04/12 09:12:11 steveu Exp $
+ * $Id: v17tx.h,v 1.42 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v18.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v18.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v18.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v18.h,v 1.3 2009/04/12 09:12:11 steveu Exp $
+ * $Id: v18.h,v 1.5 2009/06/02 16:03:56 steveu Exp $
  */
  
 /*! \file */
@@ -100,7 +100,7 @@
     \param max_len The number of samples to be generated.
     \return The number of samples actually generated.
 */
-SPAN_DECLARE(int) v18_tx(v18_state_t *s, int16_t amp[], int max_len);
+SPAN_DECLARE_NONSTD(int) v18_tx(v18_state_t *s, int16_t amp[], int max_len);
 
 /*! Process a block of received V.18 audio samples.
     \brief Process a block of received V.18 audio samples.
@@ -108,7 +108,7 @@
     \param amp The audio sample buffer.
     \param len The number of samples in the buffer.
 */
-SPAN_DECLARE(int) v18_rx(v18_state_t *s, const int16_t amp[], int len);
+SPAN_DECLARE_NONSTD(int) v18_rx(v18_state_t *s, const int16_t amp[], int len);
 
 /*! \brief Put a string to a V.18 context's input buffer.
     \param s The V.18 context.
@@ -116,7 +116,8 @@
     \param len The length of the string. If negative, the string is
            assumed to be a NULL terminated string.
     \return The number of characters actually added. This may be less than the
-            length of the digit string, if the buffer fills up. */
+            length of the digit string, if the buffer fills up. If the string is
+            invalid, this function will return -1. */
 SPAN_DECLARE(int) v18_put(v18_state_t *s, const char msg[], int len);
 
 /*! Convert a text string to a V.18 DTMF string.

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v22bis.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v22bis.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v22bis.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v22bis.h,v 1.42 2009/04/29 12:37:45 steveu Exp $
+ * $Id: v22bis.h,v 1.43 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -87,7 +87,7 @@
     \param amp The audio sample buffer.
     \param len The number of samples in the buffer.
     \return The number of samples unprocessed. */
-SPAN_DECLARE(int) v22bis_rx(v22bis_state_t *s, const int16_t amp[], int len);
+SPAN_DECLARE_NONSTD(int) v22bis_rx(v22bis_state_t *s, const int16_t amp[], int len);
 
 /*! Fake processing of a missing block of received V.22bis modem audio samples.
     (e.g due to packet loss).
@@ -135,7 +135,7 @@
     \param amp The audio sample buffer.
     \param len The number of samples to be generated.
     \return The number of samples actually generated. */
-SPAN_DECLARE(int) v22bis_tx(v22bis_state_t *s, int16_t amp[], int len);
+SPAN_DECLARE_NONSTD(int) v22bis_tx(v22bis_state_t *s, int16_t amp[], int len);
 
 /*! Adjust a V.22bis modem transmit context's power output.
     \brief Adjust a V.22bis modem transmit context's output power.

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_rx.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_rx.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_rx.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v27ter_rx.h,v 1.59 2009/04/12 09:12:11 steveu Exp $
+ * $Id: v27ter_rx.h,v 1.60 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v27ter_tx.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v27ter_tx.h,v 1.41 2009/04/12 09:12:11 steveu Exp $
+ * $Id: v27ter_tx.h,v 1.42 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v29rx.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v29rx.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v29rx.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v29rx.h,v 1.70 2009/04/12 09:12:11 steveu Exp $
+ * $Id: v29rx.h,v 1.71 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v29tx.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v29tx.h,v 1.39 2009/04/12 09:12:11 steveu Exp $
+ * $Id: v29tx.h,v 1.40 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/v8.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/v8.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/v8.h	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v8.h,v 1.27 2009/02/03 16:28:41 steveu Exp $
+ * $Id: v8.h,v 1.28 2009/06/02 16:03:56 steveu Exp $
  */
  
 /*! \file */
@@ -155,7 +155,7 @@
     \param max_len The number of samples to be generated.
     \return The number of samples actually generated.
 */
-SPAN_DECLARE(int) v8_tx(v8_state_t *s, int16_t *amp, int max_len);
+SPAN_DECLARE_NONSTD(int) v8_tx(v8_state_t *s, int16_t *amp, int max_len);
 
 /*! Process a block of received V.8 audio samples.
     \brief Process a block of received V.8 audio samples.
@@ -163,7 +163,7 @@
     \param amp The audio sample buffer.
     \param len The number of samples in the buffer.
 */
-SPAN_DECLARE(int) v8_rx(v8_state_t *s, const int16_t *amp, int len);
+SPAN_DECLARE_NONSTD(int) v8_rx(v8_state_t *s, const int16_t *amp, int len);
 
 /*! Log the list of supported modulations.
     \brief Log the list of supported modulations.

Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/spandsp/version.h	(original)
+++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h	Thu Jun 18 01:13:59 2009
@@ -30,9 +30,9 @@
 
 /* The date and time of the version are in UTC form. */
 
-#define SPANDSP_RELEASE_DATE            20090502
-#define SPANDSP_RELEASE_TIME            044449
-#define SPANDSP_RELEASE_DATETIME_STRING "20090502 044449"
+#define SPANDSP_RELEASE_DATE            20090602
+#define SPANDSP_RELEASE_TIME            160509
+#define SPANDSP_RELEASE_DATETIME_STRING "20090602 160509"
 
 #endif
 /*- End of file ------------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/src/t30.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/t30.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/t30.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t30.c,v 1.298 2009/04/30 18:46:14 steveu Exp $
+ * $Id: t30.c,v 1.301 2009/05/25 12:37:38 steveu Exp $
  */
 
 /*! \file */
@@ -319,6 +319,11 @@
    variable. */
 #define PPR_LIMIT_BEFORE_CTC_OR_EOR     4
 
+/* HDLC message header byte values */
+#define ADDRESS_FIELD                   0xFF
+#define CONTROL_FIELD_NON_FINAL_FRAME   0x03
+#define CONTROL_FIELD_FINAL_FRAME       0x13
+
 enum
 {
     TIMER_IS_IDLE = 0,
@@ -660,8 +665,8 @@
     for (i = 0;  i < 256;  i++)
     {
         s->ecm_len[i] = -1;
-        s->ecm_data[i][0] = 0xFF;
-        s->ecm_data[i][1] = 0x03;
+        s->ecm_data[i][0] = ADDRESS_FIELD;
+        s->ecm_data[i][1] = CONTROL_FIELD_NON_FINAL_FRAME;
         s->ecm_data[i][2] = T4_FCD;
         /* These frames contain a frame sequence number within the partial page (one octet) followed
            by some image data. */
@@ -749,8 +754,8 @@
         /* The RCP frame is an odd man out, as its a simple 1 byte control
            frame, but is specified to not have the final bit set. It doesn't
            seem to have the DIS received bit set, either. */
-        frame[0] = 0xFF;
-        frame[1] = 0x03;
+        frame[0] = ADDRESS_FIELD;
+        frame[1] = CONTROL_FIELD_NON_FINAL_FRAME;
         frame[2] = T4_RCP;
         send_frame(s, frame, 3);
         /* In case we are just after a CTC/CTR exchange, which kicked us back to long training */
@@ -806,8 +811,8 @@
     uint8_t frame[3];
 
     /* The simple command/response frames are always final frames */
-    frame[0] = 0xFF;
-    frame[1] = 0x13;
+    frame[0] = ADDRESS_FIELD;
+    frame[1] = CONTROL_FIELD_FINAL_FRAME;
     frame[2] = (uint8_t) (type | s->dis_received);
     send_frame(s, frame, 3);
 }
@@ -821,8 +826,8 @@
 
     len = strlen(msg);
     p = 0;
-    frame[p++] = 0xFF;
-    frame[p++] = 0x03;
+    frame[p++] = ADDRESS_FIELD;
+    frame[p++] = CONTROL_FIELD_NON_FINAL_FRAME;
     frame[p++] = (uint8_t) (cmd | s->dis_received);
     while (len > 0)
         frame[p++] = msg[--len];
@@ -838,8 +843,8 @@
     if (s->tx_info.nsf  &&  s->tx_info.nsf_len)
     {
         span_log(&s->logging, SPAN_LOG_FLOW, "Sending user supplied NSF - %d octets\n", s->tx_info.nsf_len);
-        s->tx_info.nsf[0] = 0xFF;
-        s->tx_info.nsf[1] = 0x03;
+        s->tx_info.nsf[0] = ADDRESS_FIELD;
+        s->tx_info.nsf[1] = CONTROL_FIELD_NON_FINAL_FRAME;
         s->tx_info.nsf[2] = (uint8_t) (T30_NSF | s->dis_received);
         send_frame(s, s->tx_info.nsf, s->tx_info.nsf_len + 3);
         return TRUE;
@@ -854,8 +859,8 @@
     if (s->tx_info.nss  &&  s->tx_info.nss_len)
     {
         span_log(&s->logging, SPAN_LOG_FLOW, "Sending user supplied NSS - %d octets\n", s->tx_info.nss_len);
-        s->tx_info.nss[0] = 0xFF;
-        s->tx_info.nss[1] = 0x03;
+        s->tx_info.nss[0] = ADDRESS_FIELD;
+        s->tx_info.nss[1] = CONTROL_FIELD_NON_FINAL_FRAME;
         s->tx_info.nss[2] = (uint8_t) (T30_NSS | s->dis_received);
         send_frame(s, s->tx_info.nss, s->tx_info.nss_len + 3);
         return TRUE;
@@ -870,8 +875,8 @@
     if (s->tx_info.nsc  &&  s->tx_info.nsc_len)
     {
         span_log(&s->logging, SPAN_LOG_FLOW, "Sending user supplied NSC - %d octets\n", s->tx_info.nsc_len);
-        s->tx_info.nsc[0] = 0xFF;
-        s->tx_info.nsc[1] = 0x03;
+        s->tx_info.nsc[0] = ADDRESS_FIELD;
+        s->tx_info.nsc[1] = CONTROL_FIELD_NON_FINAL_FRAME;
         s->tx_info.nsc[2] = (uint8_t) (T30_NSC | s->dis_received);
         send_frame(s, s->tx_info.nsc, s->tx_info.nsc_len + 3);
         return TRUE;
@@ -1033,8 +1038,8 @@
 {
     uint8_t frame[7];
     
-    frame[0] = 0xFF;
-    frame[1] = 0x13;
+    frame[0] = ADDRESS_FIELD;
+    frame[1] = CONTROL_FIELD_FINAL_FRAME;
     frame[2] = (uint8_t) (T30_PPS | s->dis_received);
     frame[3] = (s->ecm_at_page_end)  ?  ((uint8_t) (s->next_tx_step | s->dis_received))  :  T30_NULL;
     frame[4] = (uint8_t) (s->ecm_tx_page & 0xFF);
@@ -1074,8 +1079,8 @@
        it is sent. It might also be edited if the application changes our
        capabilities (e.g. disabling fine mode). Right now we set up all the
        unchanging stuff about what we are capable of doing. */
-    s->local_dis_dtc_frame[0] = 0xFF;
-    s->local_dis_dtc_frame[1] = 0x13;
+    s->local_dis_dtc_frame[0] = ADDRESS_FIELD;
+    s->local_dis_dtc_frame[1] = CONTROL_FIELD_FINAL_FRAME;
     s->local_dis_dtc_frame[2] = (uint8_t) (T30_DIS | s->dis_received);
     for (i = 3;  i < 19;  i++)
         s->local_dis_dtc_frame[i] = 0x00;
@@ -1258,8 +1263,8 @@
     
     /* Make a DCS frame based on local issues and the latest received DIS/DTC frame. Negotiate
        the result based on what both parties can do. */
-    s->dcs_frame[0] = 0xFF;
-    s->dcs_frame[1] = 0x13;
+    s->dcs_frame[0] = ADDRESS_FIELD;
+    s->dcs_frame[1] = CONTROL_FIELD_FINAL_FRAME;
     s->dcs_frame[2] = (uint8_t) (T30_DCS | s->dis_received);
     for (i = 3;  i < 19;  i++)
         s->dcs_frame[i] = 0x00;
@@ -1608,6 +1613,7 @@
 static void return_to_phase_b(t30_state_t *s, int with_fallback)
 {
     /* This is what we do after things like T30_EOM is exchanged. */
+#if 0
     if (step_fallback_entry(s) < 0)
     {
         /* We have fallen back as far as we can go. Give up. */
@@ -1622,6 +1628,12 @@
         else
             set_state(s, T30_STATE_R);
     }
+#else
+    if (s->calling_party)
+        set_state(s, T30_STATE_T);
+    else
+        set_state(s, T30_STATE_R);
+#endif
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -2309,8 +2321,8 @@
     {
         /* We need to send the PPR frame we have created, to try to fill in the missing/bad data. */
         set_state(s, T30_STATE_F_POST_RCP_PPR);
-        s->ecm_frame_map[0] = 0xFF;
-        s->ecm_frame_map[1] = 0x13;
+        s->ecm_frame_map[0] = ADDRESS_FIELD;
+        s->ecm_frame_map[1] = CONTROL_FIELD_FINAL_FRAME;
         s->ecm_frame_map[2] = (uint8_t) (T30_PPR | s->dis_received);
         send_frame(s, s->ecm_frame_map, 3 + 32);
     }
@@ -2474,8 +2486,8 @@
         {
             set_state(s, T30_STATE_IV_EOR);
             queue_phase(s, T30_PHASE_D_TX);
-            frame[0] = 0xFF;
-            frame[1] = 0x13;
+            frame[0] = ADDRESS_FIELD;
+            frame[1] = CONTROL_FIELD_FINAL_FRAME;
             frame[2] = (uint8_t) (T30_EOR | s->dis_received);
             frame[3] = (s->ecm_at_page_end)  ?  ((uint8_t) (s->next_tx_step | s->dis_received))  :  T30_NULL;
             span_log(&s->logging, SPAN_LOG_FLOW, "Sending EOR + %s\n", t30_frametype(frame[3]));
@@ -5489,7 +5501,7 @@
     */
     if (!ok)
     {
-        span_log(&s->logging, SPAN_LOG_FLOW, "Bad CRC received\n");
+        span_log(&s->logging, SPAN_LOG_FLOW, "Bad HDLC CRC received\n");
         if (s->phase != T30_PHASE_C_ECM_RX)
         {
             /* We either force a resend, or we wait until a resend occurs through a timeout. */
@@ -5502,6 +5514,13 @@
                     queue_phase(s, T30_PHASE_D_TX);
                 send_simple_frame(s, T30_CRP);
             }
+            else
+            {
+                /* Cancel the command or response timer (if one is running) */
+                span_log(&s->logging, SPAN_LOG_FLOW, "Bad CRC and timer is %d\n", s->timer_t2_t4_is);
+                if (s->timer_t2_t4_is == TIMER_IS_T2A)
+                    timer_t2_t4_stop(s);
+            }
         }
         return;
     }
@@ -5509,11 +5528,17 @@
     if (len < 3)
     {
         span_log(&s->logging, SPAN_LOG_FLOW, "Bad HDLC frame length - %d\n", len);
+        /* Cancel the command or response timer (if one is running) */
+        timer_t2_t4_stop(s);
         return;
     }
-    if (msg[0] != 0xFF  ||  !(msg[1] == 0x03  ||  msg[1] == 0x13))
+    if (msg[0] != ADDRESS_FIELD
+        ||
+        !(msg[1] == CONTROL_FIELD_NON_FINAL_FRAME  ||  msg[1] == CONTROL_FIELD_FINAL_FRAME))
     {
         span_log(&s->logging, SPAN_LOG_FLOW, "Bad HDLC frame header - %02x %02x\n", msg[0], msg[1]);
+        /* Cancel the command or response timer (if one is running) */
+        timer_t2_t4_stop(s);
         return;
     }
     s->rx_frame_received = TRUE;

Modified: freeswitch/trunk/libs/spandsp/src/t35.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/t35.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/t35.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t35.c,v 1.30 2009/04/12 09:12:10 steveu Exp $
+ * $Id: t35.c,v 1.31 2009/05/16 03:34:45 steveu Exp $
  */
 
 /*
@@ -525,7 +525,7 @@
 static const nsf_data_t known_nsf[] =
 {
     /* Japan */
-    {"\x00\x00\x00", 3, "unknown - indeterminate", TRUE, NULL},
+    {"\x00\x00\x00", 3, "Unknown - indeterminate", TRUE, NULL},
     {"\x00\x00\x01", 3, "Anjitsu", FALSE, NULL},
     {"\x00\x00\x02", 3, "Nippon Telephone", FALSE, NULL},
     {"\x00\x00\x05", 3, "Mitsuba Electric", FALSE, NULL},

Modified: freeswitch/trunk/libs/spandsp/src/t38_gateway.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/t38_gateway.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/t38_gateway.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t38_gateway.c,v 1.162 2009/04/12 14:18:02 steveu Exp $
+ * $Id: t38_gateway.c,v 1.163 2009/05/16 03:34:45 steveu Exp $
  */
 
 /*! \file */
@@ -152,11 +152,12 @@
 
 enum
 {
-    TCF_MODE_PREDICTABLE_MODEM_START_OFF = 0,
-    TCF_MODE_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED,
-    TCF_MODE_PREDICTABLE_MODEM_START_FAST_MODEM_SEEN,
-    TCF_MODE_PREDICTABLE_MODEM_START_PAST_V21_MODEM,
-    TCF_MODE_PREDICTABLE_MODEM_START_BEGIN
+    TIMED_MODE_STARTUP = 0,
+    TIMED_MODE_IDLE,
+    TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED,
+    TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_SEEN,
+    TIMED_MODE_TCF_PREDICTABLE_MODEM_START_PAST_V21_MODEM,
+    TIMED_MODE_TCF_PREDICTABLE_MODEM_START_BEGIN,
 };
 
 /*! The maximum number of bytes to be zapped, in order to corrupt NSF,
@@ -765,7 +766,7 @@
     if (len < 3)
         return;
     /*endif*/
-    s->core.tcf_mode_predictable_modem_start = TCF_MODE_PREDICTABLE_MODEM_START_OFF;
+    s->core.timed_mode = TIMED_MODE_IDLE;
     switch (buf[2])
     {
     case T30_CFR:
@@ -822,7 +823,7 @@
         s->core.image_data_mode = FALSE;
         s->core.short_train = FALSE;
         if (from_modem)
-            s->core.tcf_mode_predictable_modem_start = TCF_MODE_PREDICTABLE_MODEM_START_BEGIN;
+            s->core.timed_mode = TIMED_MODE_TCF_PREDICTABLE_MODEM_START_BEGIN;
         /*endif*/
         break;
     case T30_PPS:
@@ -1510,14 +1511,14 @@
     switch (status)
     {
     case SIG_STATUS_TRAINING_IN_PROGRESS:
-        if (s->core.tcf_mode_predictable_modem_start == TCF_MODE_PREDICTABLE_MODEM_START_OFF)
+        if (s->core.timed_mode == TIMED_MODE_IDLE)
         {
             announce_training(s);
         }
         else
         {
-            if (s->core.tcf_mode_predictable_modem_start == TCF_MODE_PREDICTABLE_MODEM_START_PAST_V21_MODEM)
-                s->core.tcf_mode_predictable_modem_start = TCF_MODE_PREDICTABLE_MODEM_START_FAST_MODEM_SEEN;
+            if (s->core.timed_mode == TIMED_MODE_TCF_PREDICTABLE_MODEM_START_PAST_V21_MODEM)
+                s->core.timed_mode = TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_SEEN;
             else
                 s->core.samples_to_timeout = ms_to_samples(500);
             set_fast_packetisation(s);
@@ -1529,7 +1530,7 @@
         /* The modem is now trained */
         s->audio.modems.rx_signal_present = TRUE;
         s->audio.modems.rx_trained = TRUE;
-        s->core.tcf_mode_predictable_modem_start = TCF_MODE_PREDICTABLE_MODEM_START_OFF;
+        s->core.timed_mode = TIMED_MODE_IDLE;
         s->core.samples_to_timeout = 0;
         to_t38_buffer_init(&s->core.to_t38);
         break;
@@ -1546,7 +1547,7 @@
         case T38_DATA_V27TER_4800:
         case T38_DATA_V29_7200:
         case T38_DATA_V29_9600:
-            if (s->core.tcf_mode_predictable_modem_start != TCF_MODE_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED)
+            if (s->core.timed_mode != TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED)
             {
                 /* TODO: If the carrier really did fall for good during the 500ms TEP blocking timeout, we
                          won't declare the no-signal condition. */
@@ -1716,7 +1717,7 @@
             t->framing_ok_announced = FALSE;
         }
         restart_rx_modem(s);
-        if (s->core.tcf_mode_predictable_modem_start == TCF_MODE_PREDICTABLE_MODEM_START_BEGIN)
+        if (s->core.timed_mode == TIMED_MODE_TCF_PREDICTABLE_MODEM_START_BEGIN)
         {
             /* If we are doing TCF, we need to announce the fast carrier training very
                quickly, to ensure it starts 75+-20ms after the HDLC carrier ends. Waiting until
@@ -1724,7 +1725,7 @@
                the end of the V.21 carrier, in anticipation of its arrival. If we announce it,
                and it doesn't arrive, we will worry about that later. */
             s->core.samples_to_timeout = ms_to_samples(75);
-            s->core.tcf_mode_predictable_modem_start = TCF_MODE_PREDICTABLE_MODEM_START_PAST_V21_MODEM;
+            s->core.timed_mode = TIMED_MODE_TCF_PREDICTABLE_MODEM_START_PAST_V21_MODEM;
         }
         break;
     default:
@@ -2001,28 +2002,35 @@
 #if defined(LOG_FAX_AUDIO)
     if (s->audio.modems.audio_rx_log >= 0)
         write(s->audio.modems.audio_rx_log, amp, len*sizeof(int16_t));
+    /*endif*/
 #endif
     if (s->core.samples_to_timeout > 0)
     {
         if ((s->core.samples_to_timeout -= len) <= 0)
         {
-            switch (s->core.tcf_mode_predictable_modem_start)
+            switch (s->core.timed_mode)
             {
-            case TCF_MODE_PREDICTABLE_MODEM_START_PAST_V21_MODEM:
+            case TIMED_MODE_TCF_PREDICTABLE_MODEM_START_PAST_V21_MODEM:
                 /* Timed announcement of training, 75ms after the DCS carrier fell. */
-                s->core.tcf_mode_predictable_modem_start = TCF_MODE_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED;
+                s->core.timed_mode = TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED;
                 announce_training(s);
                 break;
-            case TCF_MODE_PREDICTABLE_MODEM_START_FAST_MODEM_SEEN:
+            case TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_SEEN:
                 /* Timed announcement of training, 75ms after the DCS carrier fell. */
                 /* Use a timeout to ride over TEP, if it is present */
                 s->core.samples_to_timeout = ms_to_samples(500);
+                s->core.timed_mode = TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED;
                 announce_training(s);
                 break;
-            case TCF_MODE_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED:
-                s->core.tcf_mode_predictable_modem_start = TCF_MODE_PREDICTABLE_MODEM_START_OFF;
+            case TIMED_MODE_TCF_PREDICTABLE_MODEM_START_FAST_MODEM_ANNOUNCED:
+                s->core.timed_mode = TIMED_MODE_IDLE;
                 span_log(&s->logging, SPAN_LOG_FLOW, "TEP jamming expired\n");
                 break;
+            case TIMED_MODE_STARTUP:
+                /* Ensure a no-signal condition goes out the moment the received audio starts */
+                t38_core_send_indicator(&s->t38x.t38, T38_IND_NO_SIGNAL, s->t38x.t38.indicator_tx_count);
+                s->core.timed_mode = TIMED_MODE_IDLE;
+                break;
             }
             /*endswitch*/
         }
@@ -2129,10 +2137,10 @@
 /*- End of function --------------------------------------------------------*/
 
 SPAN_DECLARE(void) t38_gateway_set_nsx_suppression(t38_gateway_state_t *s,
-                                                    const uint8_t *from_t38,
-                                                    int from_t38_len,
-                                                    const uint8_t *from_modem,
-                                                    int from_modem_len)
+                                                   const uint8_t *from_t38,
+                                                   int from_t38_len,
+                                                   const uint8_t *from_modem,
+                                                   int from_modem_len)
 {
     s->t38x.suppress_nsx_len[0] = (from_t38_len < 0  ||  from_t38_len < MAX_NSX_SUPPRESSION)  ?  (from_t38_len + 3)  :  0;
     s->t38x.suppress_nsx_len[1] = (from_modem_len < 0  ||  from_modem_len < MAX_NSX_SUPPRESSION)  ?  (from_modem_len + 3)  :  0;
@@ -2232,6 +2240,8 @@
     s->core.ecm_allowed = FALSE;
     t38_non_ecm_buffer_init(&s->core.non_ecm_to_modem, FALSE, 0);
     restart_rx_modem(s);
+    s->core.timed_mode = TIMED_MODE_STARTUP;
+    s->core.samples_to_timeout = 1;
 #if defined(LOG_FAX_AUDIO)
     {
         char buf[100 + 1];

Modified: freeswitch/trunk/libs/spandsp/src/t4.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/t4.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/t4.c	Thu Jun 18 01:13:59 2009
@@ -24,7 +24,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t4.c,v 1.130 2009/04/12 09:12:10 steveu Exp $
+ * $Id: t4.c,v 1.131 2009/05/16 03:34:45 steveu Exp $
  */
 
 /*

Modified: freeswitch/trunk/libs/spandsp/src/tone_generate.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/tone_generate.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/tone_generate.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: tone_generate.c,v 1.52 2009/04/12 09:12:10 steveu Exp $
+ * $Id: tone_generate.c,v 1.53 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Added: freeswitch/trunk/libs/spandsp/src/v17_v32bis_rx_constellation_maps.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/src/v17_v32bis_rx_constellation_maps.h	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,5517 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
+ *
+ * v17rx_v32bis_constellation_maps.h - ITU V.17 and V.32bis modems
+ *                                     receive part.
+ *                                     Constellation mapping.
+ *
+ * Written by Steve Underwood 
+ *
+ * Copyright (C) 2004 Steve Underwood
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * $Id: v17_v32bis_rx_constellation_maps.h,v 1.1 2009/06/02 11:51:57 steveu Exp $
+ */
+
+/* The following table maps the 8 soft-decisions associated with every possible point in the
+   constellation space. If you look at the constellations carefully, all 4 can be accurately
+   mapped at 0.5 unit resolution. */
+static const uint8_t constel_maps[4][36][36][8] =
+{
+    {   /* 14,400bps map */
+        {
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x66, 0x7f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x66, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x76, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f}
+        },
+        {
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x66, 0x7f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x66, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x76, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f}
+        },
+        {
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x66, 0x7f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x66, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x76, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f}
+        },
+        {
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x05, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x66, 0x7f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x66, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x76, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x05, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x0d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x0d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f}
+        },
+        {
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x15, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x4c, 0x15, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x15, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x15, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x15, 0x66, 0x7f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x15, 0x66, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x15, 0x76, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x15, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x1d, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x1d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x1d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x1d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x1d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x1d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x1d, 0x56, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x1d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f}
+        },
+        {
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x15, 0x66, 0x5f},
+            {0x00, 0x49, 0x5a, 0x63, 0x6c, 0x15, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x15, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x63, 0x4c, 0x15, 0x66, 0x5f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x15, 0x66, 0x7f},
+            {0x00, 0x49, 0x7a, 0x73, 0x4c, 0x15, 0x66, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x15, 0x76, 0x7f},
+            {0x08, 0x49, 0x7a, 0x73, 0x4c, 0x15, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x1d, 0x76, 0x7f},
+            {0x08, 0x41, 0x7a, 0x73, 0x4c, 0x1d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x1d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x73, 0x44, 0x1d, 0x76, 0x7f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x1d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x1d, 0x76, 0x6f},
+            {0x08, 0x41, 0x6a, 0x53, 0x44, 0x1d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x1d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x44, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f}
+        },
+        {
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x49, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x49, 0x5a, 0x63, 0x6c, 0x15, 0x66, 0x5f},
+            {0x10, 0x49, 0x5a, 0x63, 0x6c, 0x15, 0x66, 0x5f},
+            {0x10, 0x49, 0x7a, 0x63, 0x2c, 0x15, 0x66, 0x5f},
+            {0x10, 0x49, 0x7a, 0x63, 0x2c, 0x15, 0x66, 0x5f},
+            {0x10, 0x49, 0x7a, 0x73, 0x2c, 0x15, 0x66, 0x7f},
+            {0x10, 0x49, 0x7a, 0x73, 0x2c, 0x15, 0x66, 0x7f},
+            {0x18, 0x49, 0x7a, 0x73, 0x2c, 0x15, 0x76, 0x7f},
+            {0x18, 0x49, 0x7a, 0x73, 0x2c, 0x15, 0x76, 0x7f},
+            {0x18, 0x41, 0x7a, 0x73, 0x2c, 0x1d, 0x76, 0x7f},
+            {0x18, 0x41, 0x7a, 0x73, 0x2c, 0x1d, 0x76, 0x7f},
+            {0x18, 0x41, 0x6a, 0x73, 0x24, 0x1d, 0x76, 0x7f},
+            {0x18, 0x41, 0x6a, 0x73, 0x24, 0x1d, 0x76, 0x7f},
+            {0x18, 0x41, 0x6a, 0x53, 0x24, 0x1d, 0x76, 0x6f},
+            {0x18, 0x41, 0x6a, 0x53, 0x24, 0x1d, 0x76, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x24, 0x1d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x24, 0x1d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x24, 0x5d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x24, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f}
+        },
+        {
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x69, 0x5a, 0x63, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x49, 0x5a, 0x63, 0x6c, 0x15, 0x66, 0x5f},
+            {0x10, 0x49, 0x5a, 0x63, 0x6c, 0x15, 0x66, 0x5f},
+            {0x10, 0x49, 0x7a, 0x63, 0x2c, 0x15, 0x66, 0x5f},
+            {0x10, 0x49, 0x7a, 0x63, 0x2c, 0x15, 0x66, 0x5f},
+            {0x10, 0x49, 0x7a, 0x73, 0x2c, 0x15, 0x66, 0x7f},
+            {0x10, 0x49, 0x7a, 0x73, 0x2c, 0x15, 0x66, 0x7f},
+            {0x18, 0x49, 0x7a, 0x73, 0x2c, 0x15, 0x76, 0x7f},
+            {0x18, 0x49, 0x7a, 0x73, 0x2c, 0x15, 0x76, 0x7f},
+            {0x18, 0x41, 0x7a, 0x73, 0x2c, 0x1d, 0x76, 0x7f},
+            {0x18, 0x41, 0x7a, 0x73, 0x2c, 0x1d, 0x76, 0x7f},
+            {0x18, 0x41, 0x6a, 0x73, 0x24, 0x1d, 0x76, 0x7f},
+            {0x18, 0x41, 0x6a, 0x73, 0x24, 0x1d, 0x76, 0x7f},
+            {0x18, 0x41, 0x6a, 0x53, 0x24, 0x1d, 0x76, 0x6f},
+            {0x18, 0x41, 0x6a, 0x53, 0x24, 0x1d, 0x76, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x24, 0x1d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x24, 0x1d, 0x56, 0x6f},
+            {0x58, 0x41, 0x6a, 0x53, 0x24, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x24, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x53, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f}
+        },
+        {
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x23, 0x6c, 0x55, 0x66, 0x5f},
+            {0x50, 0x69, 0x5a, 0x23, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x69, 0x5a, 0x23, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x69, 0x5a, 0x23, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x29, 0x5a, 0x23, 0x6c, 0x15, 0x66, 0x5f},
+            {0x10, 0x29, 0x5a, 0x23, 0x6c, 0x15, 0x66, 0x5f},
+            {0x10, 0x29, 0x7a, 0x23, 0x2c, 0x15, 0x66, 0x5f},
+            {0x10, 0x29, 0x7a, 0x23, 0x2c, 0x15, 0x66, 0x5f},
+            {0x10, 0x29, 0x7a, 0x33, 0x2c, 0x15, 0x66, 0x7f},
+            {0x10, 0x29, 0x7a, 0x33, 0x2c, 0x15, 0x66, 0x7f},
+            {0x18, 0x29, 0x7a, 0x33, 0x2c, 0x15, 0x76, 0x7f},
+            {0x18, 0x29, 0x7a, 0x33, 0x2c, 0x15, 0x76, 0x7f},
+            {0x18, 0x21, 0x7a, 0x33, 0x2c, 0x1d, 0x76, 0x7f},
+            {0x18, 0x21, 0x7a, 0x33, 0x2c, 0x1d, 0x76, 0x7f},
+            {0x18, 0x21, 0x6a, 0x33, 0x24, 0x1d, 0x76, 0x7f},
+            {0x18, 0x21, 0x6a, 0x33, 0x24, 0x1d, 0x76, 0x7f},
+            {0x18, 0x21, 0x6a, 0x13, 0x24, 0x1d, 0x76, 0x6f},
+            {0x18, 0x21, 0x6a, 0x13, 0x24, 0x1d, 0x76, 0x6f},
+            {0x58, 0x21, 0x6a, 0x13, 0x24, 0x1d, 0x56, 0x6f},
+            {0x58, 0x21, 0x6a, 0x13, 0x24, 0x1d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x13, 0x24, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x13, 0x24, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x13, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x13, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f}
+        },
+        {
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x23, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x5a, 0x23, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x69, 0x5a, 0x23, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x69, 0x5a, 0x23, 0x6c, 0x55, 0x66, 0x5f},
+            {0x10, 0x29, 0x5a, 0x23, 0x6c, 0x15, 0x66, 0x5f},
+            {0x10, 0x29, 0x5a, 0x23, 0x6c, 0x15, 0x66, 0x5f},
+            {0x10, 0x29, 0x7a, 0x23, 0x2c, 0x15, 0x66, 0x5f},
+            {0x10, 0x29, 0x7a, 0x23, 0x2c, 0x15, 0x66, 0x5f},
+            {0x10, 0x29, 0x7a, 0x33, 0x2c, 0x15, 0x66, 0x7f},
+            {0x10, 0x29, 0x7a, 0x33, 0x2c, 0x15, 0x66, 0x7f},
+            {0x18, 0x29, 0x7a, 0x33, 0x2c, 0x15, 0x76, 0x7f},
+            {0x18, 0x29, 0x7a, 0x33, 0x2c, 0x15, 0x76, 0x7f},
+            {0x18, 0x21, 0x7a, 0x33, 0x2c, 0x1d, 0x76, 0x7f},
+            {0x18, 0x21, 0x7a, 0x33, 0x2c, 0x1d, 0x76, 0x7f},
+            {0x18, 0x21, 0x6a, 0x33, 0x24, 0x1d, 0x76, 0x7f},
+            {0x18, 0x21, 0x6a, 0x33, 0x24, 0x1d, 0x76, 0x7f},
+            {0x18, 0x21, 0x6a, 0x13, 0x24, 0x1d, 0x76, 0x6f},
+            {0x18, 0x21, 0x6a, 0x13, 0x24, 0x1d, 0x76, 0x6f},
+            {0x58, 0x21, 0x6a, 0x13, 0x24, 0x1d, 0x56, 0x6f},
+            {0x58, 0x21, 0x6a, 0x13, 0x24, 0x1d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x13, 0x24, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x13, 0x24, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x6a, 0x13, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x56, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f}
+        },
+        {
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x1a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x1a, 0x23, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x1a, 0x23, 0x6c, 0x55, 0x46, 0x5f},
+            {0x10, 0x69, 0x1a, 0x23, 0x6c, 0x55, 0x26, 0x5f},
+            {0x10, 0x69, 0x1a, 0x23, 0x6c, 0x55, 0x26, 0x5f},
+            {0x10, 0x29, 0x1a, 0x23, 0x6c, 0x15, 0x26, 0x5f},
+            {0x10, 0x29, 0x1a, 0x23, 0x6c, 0x15, 0x26, 0x5f},
+            {0x10, 0x29, 0x3a, 0x23, 0x2c, 0x15, 0x26, 0x5f},
+            {0x10, 0x29, 0x3a, 0x23, 0x2c, 0x15, 0x26, 0x5f},
+            {0x10, 0x29, 0x3a, 0x33, 0x2c, 0x15, 0x26, 0x7f},
+            {0x10, 0x29, 0x3a, 0x33, 0x2c, 0x15, 0x26, 0x7f},
+            {0x18, 0x29, 0x3a, 0x33, 0x2c, 0x15, 0x36, 0x7f},
+            {0x18, 0x29, 0x3a, 0x33, 0x2c, 0x15, 0x36, 0x7f},
+            {0x18, 0x21, 0x3a, 0x33, 0x2c, 0x1d, 0x36, 0x7f},
+            {0x18, 0x21, 0x3a, 0x33, 0x2c, 0x1d, 0x36, 0x7f},
+            {0x18, 0x21, 0x2a, 0x33, 0x24, 0x1d, 0x36, 0x7f},
+            {0x18, 0x21, 0x2a, 0x33, 0x24, 0x1d, 0x36, 0x7f},
+            {0x18, 0x21, 0x2a, 0x13, 0x24, 0x1d, 0x36, 0x6f},
+            {0x18, 0x21, 0x2a, 0x13, 0x24, 0x1d, 0x36, 0x6f},
+            {0x58, 0x21, 0x2a, 0x13, 0x24, 0x1d, 0x16, 0x6f},
+            {0x58, 0x21, 0x2a, 0x13, 0x24, 0x1d, 0x16, 0x6f},
+            {0x58, 0x61, 0x2a, 0x13, 0x24, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x2a, 0x13, 0x24, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f}
+        },
+        {
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x43, 0x6c, 0x55, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x43, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x1a, 0x23, 0x6c, 0x55, 0x46, 0x5f},
+            {0x50, 0x69, 0x1a, 0x23, 0x6c, 0x55, 0x46, 0x5f},
+            {0x10, 0x69, 0x1a, 0x23, 0x6c, 0x55, 0x26, 0x5f},
+            {0x10, 0x69, 0x1a, 0x23, 0x6c, 0x55, 0x26, 0x5f},
+            {0x10, 0x29, 0x1a, 0x23, 0x6c, 0x15, 0x26, 0x5f},
+            {0x10, 0x29, 0x1a, 0x23, 0x6c, 0x15, 0x26, 0x5f},
+            {0x10, 0x29, 0x3a, 0x23, 0x2c, 0x15, 0x26, 0x5f},
+            {0x10, 0x29, 0x3a, 0x23, 0x2c, 0x15, 0x26, 0x5f},
+            {0x10, 0x29, 0x3a, 0x33, 0x2c, 0x15, 0x26, 0x7f},
+            {0x10, 0x29, 0x3a, 0x33, 0x2c, 0x15, 0x26, 0x7f},
+            {0x18, 0x29, 0x3a, 0x33, 0x2c, 0x15, 0x36, 0x7f},
+            {0x18, 0x29, 0x3a, 0x33, 0x2c, 0x15, 0x36, 0x7f},
+            {0x18, 0x21, 0x3a, 0x33, 0x2c, 0x1d, 0x36, 0x7f},
+            {0x18, 0x21, 0x3a, 0x33, 0x2c, 0x1d, 0x36, 0x7f},
+            {0x18, 0x21, 0x2a, 0x33, 0x24, 0x1d, 0x36, 0x7f},
+            {0x18, 0x21, 0x2a, 0x33, 0x24, 0x1d, 0x36, 0x7f},
+            {0x18, 0x21, 0x2a, 0x13, 0x24, 0x1d, 0x36, 0x6f},
+            {0x18, 0x21, 0x2a, 0x13, 0x24, 0x1d, 0x36, 0x6f},
+            {0x58, 0x21, 0x2a, 0x13, 0x24, 0x1d, 0x16, 0x6f},
+            {0x58, 0x21, 0x2a, 0x13, 0x24, 0x1d, 0x16, 0x6f},
+            {0x58, 0x61, 0x2a, 0x13, 0x24, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x2a, 0x13, 0x24, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x16, 0x6f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x16, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x5d, 0x06, 0x4f}
+        },
+        {
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x23, 0x6c, 0x75, 0x46, 0x1f},
+            {0x50, 0x69, 0x1a, 0x23, 0x6c, 0x75, 0x46, 0x1f},
+            {0x10, 0x69, 0x1a, 0x23, 0x6c, 0x75, 0x26, 0x1f},
+            {0x10, 0x69, 0x1a, 0x23, 0x6c, 0x75, 0x26, 0x1f},
+            {0x10, 0x29, 0x1a, 0x23, 0x6c, 0x35, 0x26, 0x1f},
+            {0x10, 0x29, 0x1a, 0x23, 0x6c, 0x35, 0x26, 0x1f},
+            {0x10, 0x29, 0x3a, 0x23, 0x2c, 0x35, 0x26, 0x1f},
+            {0x10, 0x29, 0x3a, 0x23, 0x2c, 0x35, 0x26, 0x1f},
+            {0x10, 0x29, 0x3a, 0x33, 0x2c, 0x35, 0x26, 0x3f},
+            {0x10, 0x29, 0x3a, 0x33, 0x2c, 0x35, 0x26, 0x3f},
+            {0x18, 0x29, 0x3a, 0x33, 0x2c, 0x35, 0x36, 0x3f},
+            {0x18, 0x29, 0x3a, 0x33, 0x2c, 0x35, 0x36, 0x3f},
+            {0x18, 0x21, 0x3a, 0x33, 0x2c, 0x3d, 0x36, 0x3f},
+            {0x18, 0x21, 0x3a, 0x33, 0x2c, 0x3d, 0x36, 0x3f},
+            {0x18, 0x21, 0x2a, 0x33, 0x24, 0x3d, 0x36, 0x3f},
+            {0x18, 0x21, 0x2a, 0x33, 0x24, 0x3d, 0x36, 0x3f},
+            {0x18, 0x21, 0x2a, 0x13, 0x24, 0x3d, 0x36, 0x2f},
+            {0x18, 0x21, 0x2a, 0x13, 0x24, 0x3d, 0x36, 0x2f},
+            {0x58, 0x21, 0x2a, 0x13, 0x24, 0x3d, 0x16, 0x2f},
+            {0x58, 0x21, 0x2a, 0x13, 0x24, 0x3d, 0x16, 0x2f},
+            {0x58, 0x61, 0x2a, 0x13, 0x24, 0x7d, 0x16, 0x2f},
+            {0x58, 0x61, 0x2a, 0x13, 0x24, 0x7d, 0x16, 0x2f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x7d, 0x16, 0x2f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x7d, 0x16, 0x2f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x16, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x16, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x06, 0x4f}
+        },
+        {
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x0a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x43, 0x6c, 0x75, 0x46, 0x0f},
+            {0x50, 0x69, 0x1a, 0x23, 0x6c, 0x75, 0x46, 0x1f},
+            {0x50, 0x69, 0x1a, 0x23, 0x6c, 0x75, 0x46, 0x1f},
+            {0x10, 0x69, 0x1a, 0x23, 0x6c, 0x75, 0x26, 0x1f},
+            {0x10, 0x69, 0x1a, 0x23, 0x6c, 0x75, 0x26, 0x1f},
+            {0x10, 0x29, 0x1a, 0x23, 0x6c, 0x35, 0x26, 0x1f},
+            {0x10, 0x29, 0x1a, 0x23, 0x6c, 0x35, 0x26, 0x1f},
+            {0x10, 0x29, 0x3a, 0x23, 0x2c, 0x35, 0x26, 0x1f},
+            {0x10, 0x29, 0x3a, 0x23, 0x2c, 0x35, 0x26, 0x1f},
+            {0x10, 0x29, 0x3a, 0x33, 0x2c, 0x35, 0x26, 0x3f},
+            {0x10, 0x29, 0x3a, 0x33, 0x2c, 0x35, 0x26, 0x3f},
+            {0x18, 0x29, 0x3a, 0x33, 0x2c, 0x35, 0x36, 0x3f},
+            {0x18, 0x29, 0x3a, 0x33, 0x2c, 0x35, 0x36, 0x3f},
+            {0x18, 0x21, 0x3a, 0x33, 0x2c, 0x3d, 0x36, 0x3f},
+            {0x18, 0x21, 0x3a, 0x33, 0x2c, 0x3d, 0x36, 0x3f},
+            {0x18, 0x21, 0x2a, 0x33, 0x24, 0x3d, 0x36, 0x3f},
+            {0x18, 0x21, 0x2a, 0x33, 0x24, 0x3d, 0x36, 0x3f},
+            {0x18, 0x21, 0x2a, 0x13, 0x24, 0x3d, 0x36, 0x2f},
+            {0x18, 0x21, 0x2a, 0x13, 0x24, 0x3d, 0x36, 0x2f},
+            {0x58, 0x21, 0x2a, 0x13, 0x24, 0x3d, 0x16, 0x2f},
+            {0x58, 0x21, 0x2a, 0x13, 0x24, 0x3d, 0x16, 0x2f},
+            {0x58, 0x61, 0x2a, 0x13, 0x24, 0x7d, 0x16, 0x2f},
+            {0x58, 0x61, 0x2a, 0x13, 0x24, 0x7d, 0x16, 0x2f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x7d, 0x16, 0x2f},
+            {0x58, 0x61, 0x4a, 0x13, 0x64, 0x7d, 0x16, 0x2f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x16, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x16, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x06, 0x4f},
+            {0x58, 0x61, 0x4a, 0x03, 0x64, 0x7d, 0x06, 0x4f}
+        },
+        {
+            {0x70, 0x69, 0x0a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x0a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x0a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x0a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x1a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x1a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x1a, 0x23, 0x7c, 0x75, 0x46, 0x1f},
+            {0x70, 0x69, 0x1a, 0x23, 0x7c, 0x75, 0x46, 0x1f},
+            {0x30, 0x69, 0x1a, 0x23, 0x7c, 0x75, 0x26, 0x1f},
+            {0x30, 0x69, 0x1a, 0x23, 0x7c, 0x75, 0x26, 0x1f},
+            {0x30, 0x29, 0x1a, 0x23, 0x7c, 0x35, 0x26, 0x1f},
+            {0x30, 0x29, 0x1a, 0x23, 0x7c, 0x35, 0x26, 0x1f},
+            {0x30, 0x29, 0x3a, 0x23, 0x3c, 0x35, 0x26, 0x1f},
+            {0x30, 0x29, 0x3a, 0x23, 0x3c, 0x35, 0x26, 0x1f},
+            {0x30, 0x29, 0x3a, 0x33, 0x3c, 0x35, 0x26, 0x3f},
+            {0x30, 0x29, 0x3a, 0x33, 0x3c, 0x35, 0x26, 0x3f},
+            {0x38, 0x29, 0x3a, 0x33, 0x3c, 0x35, 0x36, 0x3f},
+            {0x38, 0x29, 0x3a, 0x33, 0x3c, 0x35, 0x36, 0x3f},
+            {0x38, 0x21, 0x3a, 0x33, 0x3c, 0x3d, 0x36, 0x3f},
+            {0x38, 0x21, 0x3a, 0x33, 0x3c, 0x3d, 0x36, 0x3f},
+            {0x38, 0x21, 0x2a, 0x33, 0x34, 0x3d, 0x36, 0x3f},
+            {0x38, 0x21, 0x2a, 0x33, 0x34, 0x3d, 0x36, 0x3f},
+            {0x38, 0x21, 0x2a, 0x13, 0x34, 0x3d, 0x36, 0x2f},
+            {0x38, 0x21, 0x2a, 0x13, 0x34, 0x3d, 0x36, 0x2f},
+            {0x78, 0x21, 0x2a, 0x13, 0x34, 0x3d, 0x16, 0x2f},
+            {0x78, 0x21, 0x2a, 0x13, 0x34, 0x3d, 0x16, 0x2f},
+            {0x78, 0x61, 0x2a, 0x13, 0x34, 0x7d, 0x16, 0x2f},
+            {0x78, 0x61, 0x2a, 0x13, 0x34, 0x7d, 0x16, 0x2f},
+            {0x78, 0x61, 0x4a, 0x13, 0x74, 0x7d, 0x16, 0x2f},
+            {0x78, 0x61, 0x4a, 0x13, 0x74, 0x7d, 0x16, 0x2f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x16, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x16, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x06, 0x4f}
+        },
+        {
+            {0x70, 0x69, 0x0a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x0a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x0a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x0a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x1a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x1a, 0x43, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x69, 0x1a, 0x23, 0x7c, 0x75, 0x46, 0x1f},
+            {0x70, 0x69, 0x1a, 0x23, 0x7c, 0x75, 0x46, 0x1f},
+            {0x30, 0x69, 0x1a, 0x23, 0x7c, 0x75, 0x26, 0x1f},
+            {0x30, 0x69, 0x1a, 0x23, 0x7c, 0x75, 0x26, 0x1f},
+            {0x30, 0x29, 0x1a, 0x23, 0x7c, 0x35, 0x26, 0x1f},
+            {0x30, 0x29, 0x1a, 0x23, 0x7c, 0x35, 0x26, 0x1f},
+            {0x30, 0x29, 0x3a, 0x23, 0x3c, 0x35, 0x26, 0x1f},
+            {0x30, 0x29, 0x3a, 0x23, 0x3c, 0x35, 0x26, 0x1f},
+            {0x30, 0x29, 0x3a, 0x33, 0x3c, 0x35, 0x26, 0x3f},
+            {0x30, 0x29, 0x3a, 0x33, 0x3c, 0x35, 0x26, 0x3f},
+            {0x38, 0x29, 0x3a, 0x33, 0x3c, 0x35, 0x36, 0x3f},
+            {0x38, 0x29, 0x3a, 0x33, 0x3c, 0x35, 0x36, 0x3f},
+            {0x38, 0x21, 0x3a, 0x33, 0x3c, 0x3d, 0x36, 0x3f},
+            {0x38, 0x21, 0x3a, 0x33, 0x3c, 0x3d, 0x36, 0x3f},
+            {0x38, 0x21, 0x2a, 0x33, 0x34, 0x3d, 0x36, 0x3f},
+            {0x38, 0x21, 0x2a, 0x33, 0x34, 0x3d, 0x36, 0x3f},
+            {0x38, 0x21, 0x2a, 0x13, 0x34, 0x3d, 0x36, 0x2f},
+            {0x38, 0x21, 0x2a, 0x13, 0x34, 0x3d, 0x36, 0x2f},
+            {0x78, 0x21, 0x2a, 0x13, 0x34, 0x3d, 0x16, 0x2f},
+            {0x78, 0x21, 0x2a, 0x13, 0x34, 0x3d, 0x16, 0x2f},
+            {0x78, 0x61, 0x2a, 0x13, 0x34, 0x7d, 0x16, 0x2f},
+            {0x78, 0x61, 0x2a, 0x13, 0x34, 0x7d, 0x16, 0x2f},
+            {0x78, 0x61, 0x4a, 0x13, 0x74, 0x7d, 0x16, 0x2f},
+            {0x78, 0x61, 0x4a, 0x13, 0x74, 0x7d, 0x16, 0x2f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x16, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x16, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x61, 0x4a, 0x03, 0x74, 0x7d, 0x06, 0x4f}
+        },
+        {
+            {0x70, 0x79, 0x0a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x0a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x0a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x0a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x1a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x1a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x1a, 0x2b, 0x7c, 0x75, 0x46, 0x1f},
+            {0x70, 0x79, 0x1a, 0x2b, 0x7c, 0x75, 0x46, 0x1f},
+            {0x30, 0x79, 0x1a, 0x2b, 0x7c, 0x75, 0x26, 0x1f},
+            {0x30, 0x79, 0x1a, 0x2b, 0x7c, 0x75, 0x26, 0x1f},
+            {0x30, 0x39, 0x1a, 0x2b, 0x7c, 0x35, 0x26, 0x1f},
+            {0x30, 0x39, 0x1a, 0x2b, 0x7c, 0x35, 0x26, 0x1f},
+            {0x30, 0x39, 0x3a, 0x2b, 0x3c, 0x35, 0x26, 0x1f},
+            {0x30, 0x39, 0x3a, 0x2b, 0x3c, 0x35, 0x26, 0x1f},
+            {0x30, 0x39, 0x3a, 0x3b, 0x3c, 0x35, 0x26, 0x3f},
+            {0x30, 0x39, 0x3a, 0x3b, 0x3c, 0x35, 0x26, 0x3f},
+            {0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x35, 0x36, 0x3f},
+            {0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x35, 0x36, 0x3f},
+            {0x38, 0x31, 0x3a, 0x3b, 0x3c, 0x3d, 0x36, 0x3f},
+            {0x38, 0x31, 0x3a, 0x3b, 0x3c, 0x3d, 0x36, 0x3f},
+            {0x38, 0x31, 0x2a, 0x3b, 0x34, 0x3d, 0x36, 0x3f},
+            {0x38, 0x31, 0x2a, 0x3b, 0x34, 0x3d, 0x36, 0x3f},
+            {0x38, 0x31, 0x2a, 0x1b, 0x34, 0x3d, 0x36, 0x2f},
+            {0x38, 0x31, 0x2a, 0x1b, 0x34, 0x3d, 0x36, 0x2f},
+            {0x78, 0x31, 0x2a, 0x1b, 0x34, 0x3d, 0x16, 0x2f},
+            {0x78, 0x31, 0x2a, 0x1b, 0x34, 0x3d, 0x16, 0x2f},
+            {0x78, 0x71, 0x2a, 0x1b, 0x34, 0x7d, 0x16, 0x2f},
+            {0x78, 0x71, 0x2a, 0x1b, 0x34, 0x7d, 0x16, 0x2f},
+            {0x78, 0x71, 0x4a, 0x1b, 0x74, 0x7d, 0x16, 0x2f},
+            {0x78, 0x71, 0x4a, 0x1b, 0x74, 0x7d, 0x16, 0x2f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x16, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x16, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x06, 0x4f}
+        },
+        {
+            {0x70, 0x79, 0x0a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x0a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x0a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x0a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x1a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x1a, 0x4b, 0x7c, 0x75, 0x46, 0x0f},
+            {0x70, 0x79, 0x1a, 0x2b, 0x7c, 0x75, 0x46, 0x1f},
+            {0x70, 0x79, 0x1a, 0x2b, 0x7c, 0x75, 0x46, 0x1f},
+            {0x30, 0x79, 0x1a, 0x2b, 0x7c, 0x75, 0x26, 0x1f},
+            {0x30, 0x79, 0x1a, 0x2b, 0x7c, 0x75, 0x26, 0x1f},
+            {0x30, 0x39, 0x1a, 0x2b, 0x7c, 0x35, 0x26, 0x1f},
+            {0x30, 0x39, 0x1a, 0x2b, 0x7c, 0x35, 0x26, 0x1f},
+            {0x30, 0x39, 0x3a, 0x2b, 0x3c, 0x35, 0x26, 0x1f},
+            {0x30, 0x39, 0x3a, 0x2b, 0x3c, 0x35, 0x26, 0x1f},
+            {0x30, 0x39, 0x3a, 0x3b, 0x3c, 0x35, 0x26, 0x3f},
+            {0x30, 0x39, 0x3a, 0x3b, 0x3c, 0x35, 0x26, 0x3f},
+            {0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x35, 0x36, 0x3f},
+            {0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x35, 0x36, 0x3f},
+            {0x38, 0x31, 0x3a, 0x3b, 0x3c, 0x3d, 0x36, 0x3f},
+            {0x38, 0x31, 0x3a, 0x3b, 0x3c, 0x3d, 0x36, 0x3f},
+            {0x38, 0x31, 0x2a, 0x3b, 0x34, 0x3d, 0x36, 0x3f},
+            {0x38, 0x31, 0x2a, 0x3b, 0x34, 0x3d, 0x36, 0x3f},
+            {0x38, 0x31, 0x2a, 0x1b, 0x34, 0x3d, 0x36, 0x2f},
+            {0x38, 0x31, 0x2a, 0x1b, 0x34, 0x3d, 0x36, 0x2f},
+            {0x78, 0x31, 0x2a, 0x1b, 0x34, 0x3d, 0x16, 0x2f},
+            {0x78, 0x31, 0x2a, 0x1b, 0x34, 0x3d, 0x16, 0x2f},
+            {0x78, 0x71, 0x2a, 0x1b, 0x34, 0x7d, 0x16, 0x2f},
+            {0x78, 0x71, 0x2a, 0x1b, 0x34, 0x7d, 0x16, 0x2f},
+            {0x78, 0x71, 0x4a, 0x1b, 0x74, 0x7d, 0x16, 0x2f},
+            {0x78, 0x71, 0x4a, 0x1b, 0x74, 0x7d, 0x16, 0x2f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x16, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x16, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x06, 0x4f},
+            {0x78, 0x71, 0x4a, 0x0b, 0x74, 0x7d, 0x06, 0x4f}
+        },
+        {
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x12, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x12, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x12, 0x2b, 0x7c, 0x75, 0x4e, 0x1f},
+            {0x70, 0x79, 0x12, 0x2b, 0x7c, 0x75, 0x4e, 0x1f},
+            {0x30, 0x79, 0x12, 0x2b, 0x7c, 0x75, 0x2e, 0x1f},
+            {0x30, 0x79, 0x12, 0x2b, 0x7c, 0x75, 0x2e, 0x1f},
+            {0x30, 0x39, 0x12, 0x2b, 0x7c, 0x35, 0x2e, 0x1f},
+            {0x30, 0x39, 0x12, 0x2b, 0x7c, 0x35, 0x2e, 0x1f},
+            {0x30, 0x39, 0x32, 0x2b, 0x3c, 0x35, 0x2e, 0x1f},
+            {0x30, 0x39, 0x32, 0x2b, 0x3c, 0x35, 0x2e, 0x1f},
+            {0x30, 0x39, 0x32, 0x3b, 0x3c, 0x35, 0x2e, 0x3f},
+            {0x30, 0x39, 0x32, 0x3b, 0x3c, 0x35, 0x2e, 0x3f},
+            {0x38, 0x39, 0x32, 0x3b, 0x3c, 0x35, 0x3e, 0x3f},
+            {0x38, 0x39, 0x32, 0x3b, 0x3c, 0x35, 0x3e, 0x3f},
+            {0x38, 0x31, 0x32, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f},
+            {0x38, 0x31, 0x32, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f},
+            {0x38, 0x31, 0x22, 0x3b, 0x34, 0x3d, 0x3e, 0x3f},
+            {0x38, 0x31, 0x22, 0x3b, 0x34, 0x3d, 0x3e, 0x3f},
+            {0x38, 0x31, 0x22, 0x1b, 0x34, 0x3d, 0x3e, 0x2f},
+            {0x38, 0x31, 0x22, 0x1b, 0x34, 0x3d, 0x3e, 0x2f},
+            {0x78, 0x31, 0x22, 0x1b, 0x34, 0x3d, 0x1e, 0x2f},
+            {0x78, 0x31, 0x22, 0x1b, 0x34, 0x3d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x22, 0x1b, 0x34, 0x7d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x22, 0x1b, 0x34, 0x7d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x42, 0x1b, 0x74, 0x7d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x42, 0x1b, 0x74, 0x7d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x1e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x1e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x0e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x0e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x0e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x0e, 0x4f}
+        },
+        {
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x12, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x12, 0x4b, 0x7c, 0x75, 0x4e, 0x0f},
+            {0x70, 0x79, 0x12, 0x2b, 0x7c, 0x75, 0x4e, 0x1f},
+            {0x70, 0x79, 0x12, 0x2b, 0x7c, 0x75, 0x4e, 0x1f},
+            {0x30, 0x79, 0x12, 0x2b, 0x7c, 0x75, 0x2e, 0x1f},
+            {0x30, 0x79, 0x12, 0x2b, 0x7c, 0x75, 0x2e, 0x1f},
+            {0x30, 0x39, 0x12, 0x2b, 0x7c, 0x35, 0x2e, 0x1f},
+            {0x30, 0x39, 0x12, 0x2b, 0x7c, 0x35, 0x2e, 0x1f},
+            {0x30, 0x39, 0x32, 0x2b, 0x3c, 0x35, 0x2e, 0x1f},
+            {0x30, 0x39, 0x32, 0x2b, 0x3c, 0x35, 0x2e, 0x1f},
+            {0x30, 0x39, 0x32, 0x3b, 0x3c, 0x35, 0x2e, 0x3f},
+            {0x30, 0x39, 0x32, 0x3b, 0x3c, 0x35, 0x2e, 0x3f},
+            {0x38, 0x39, 0x32, 0x3b, 0x3c, 0x35, 0x3e, 0x3f},
+            {0x38, 0x39, 0x32, 0x3b, 0x3c, 0x35, 0x3e, 0x3f},
+            {0x38, 0x31, 0x32, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f},
+            {0x38, 0x31, 0x32, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f},
+            {0x38, 0x31, 0x22, 0x3b, 0x34, 0x3d, 0x3e, 0x3f},
+            {0x38, 0x31, 0x22, 0x3b, 0x34, 0x3d, 0x3e, 0x3f},
+            {0x38, 0x31, 0x22, 0x1b, 0x34, 0x3d, 0x3e, 0x2f},
+            {0x38, 0x31, 0x22, 0x1b, 0x34, 0x3d, 0x3e, 0x2f},
+            {0x78, 0x31, 0x22, 0x1b, 0x34, 0x3d, 0x1e, 0x2f},
+            {0x78, 0x31, 0x22, 0x1b, 0x34, 0x3d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x22, 0x1b, 0x34, 0x7d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x22, 0x1b, 0x34, 0x7d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x42, 0x1b, 0x74, 0x7d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x42, 0x1b, 0x74, 0x7d, 0x1e, 0x2f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x1e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x1e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x0e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x0e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x0e, 0x4f},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x7d, 0x0e, 0x4f}
+        },
+        {
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x12, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x12, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x12, 0x2b, 0x7c, 0x65, 0x4e, 0x17},
+            {0x70, 0x79, 0x12, 0x2b, 0x7c, 0x65, 0x4e, 0x17},
+            {0x30, 0x79, 0x12, 0x2b, 0x7c, 0x65, 0x2e, 0x17},
+            {0x30, 0x79, 0x12, 0x2b, 0x7c, 0x65, 0x2e, 0x17},
+            {0x30, 0x39, 0x12, 0x2b, 0x7c, 0x25, 0x2e, 0x17},
+            {0x30, 0x39, 0x12, 0x2b, 0x7c, 0x25, 0x2e, 0x17},
+            {0x30, 0x39, 0x32, 0x2b, 0x3c, 0x25, 0x2e, 0x17},
+            {0x30, 0x39, 0x32, 0x2b, 0x3c, 0x25, 0x2e, 0x17},
+            {0x30, 0x39, 0x32, 0x3b, 0x3c, 0x25, 0x2e, 0x37},
+            {0x30, 0x39, 0x32, 0x3b, 0x3c, 0x25, 0x2e, 0x37},
+            {0x38, 0x39, 0x32, 0x3b, 0x3c, 0x25, 0x3e, 0x37},
+            {0x38, 0x39, 0x32, 0x3b, 0x3c, 0x25, 0x3e, 0x37},
+            {0x38, 0x31, 0x32, 0x3b, 0x3c, 0x2d, 0x3e, 0x37},
+            {0x38, 0x31, 0x32, 0x3b, 0x3c, 0x2d, 0x3e, 0x37},
+            {0x38, 0x31, 0x22, 0x3b, 0x34, 0x2d, 0x3e, 0x37},
+            {0x38, 0x31, 0x22, 0x3b, 0x34, 0x2d, 0x3e, 0x37},
+            {0x38, 0x31, 0x22, 0x1b, 0x34, 0x2d, 0x3e, 0x27},
+            {0x38, 0x31, 0x22, 0x1b, 0x34, 0x2d, 0x3e, 0x27},
+            {0x78, 0x31, 0x22, 0x1b, 0x34, 0x2d, 0x1e, 0x27},
+            {0x78, 0x31, 0x22, 0x1b, 0x34, 0x2d, 0x1e, 0x27},
+            {0x78, 0x71, 0x22, 0x1b, 0x34, 0x6d, 0x1e, 0x27},
+            {0x78, 0x71, 0x22, 0x1b, 0x34, 0x6d, 0x1e, 0x27},
+            {0x78, 0x71, 0x42, 0x1b, 0x74, 0x6d, 0x1e, 0x27},
+            {0x78, 0x71, 0x42, 0x1b, 0x74, 0x6d, 0x1e, 0x27},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x1e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x1e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x0e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x0e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x0e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x02, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x12, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x12, 0x4b, 0x7c, 0x65, 0x4e, 0x07},
+            {0x70, 0x79, 0x12, 0x2b, 0x7c, 0x65, 0x4e, 0x17},
+            {0x70, 0x79, 0x12, 0x2b, 0x7c, 0x65, 0x4e, 0x17},
+            {0x30, 0x79, 0x12, 0x2b, 0x7c, 0x65, 0x2e, 0x17},
+            {0x30, 0x79, 0x12, 0x2b, 0x7c, 0x65, 0x2e, 0x17},
+            {0x30, 0x39, 0x12, 0x2b, 0x7c, 0x25, 0x2e, 0x17},
+            {0x30, 0x39, 0x12, 0x2b, 0x7c, 0x25, 0x2e, 0x17},
+            {0x30, 0x39, 0x32, 0x2b, 0x3c, 0x25, 0x2e, 0x17},
+            {0x30, 0x39, 0x32, 0x2b, 0x3c, 0x25, 0x2e, 0x17},
+            {0x30, 0x39, 0x32, 0x3b, 0x3c, 0x25, 0x2e, 0x37},
+            {0x30, 0x39, 0x32, 0x3b, 0x3c, 0x25, 0x2e, 0x37},
+            {0x38, 0x39, 0x32, 0x3b, 0x3c, 0x25, 0x3e, 0x37},
+            {0x38, 0x39, 0x32, 0x3b, 0x3c, 0x25, 0x3e, 0x37},
+            {0x38, 0x31, 0x32, 0x3b, 0x3c, 0x2d, 0x3e, 0x37},
+            {0x38, 0x31, 0x32, 0x3b, 0x3c, 0x2d, 0x3e, 0x37},
+            {0x38, 0x31, 0x22, 0x3b, 0x34, 0x2d, 0x3e, 0x37},
+            {0x38, 0x31, 0x22, 0x3b, 0x34, 0x2d, 0x3e, 0x37},
+            {0x38, 0x31, 0x22, 0x1b, 0x34, 0x2d, 0x3e, 0x27},
+            {0x38, 0x31, 0x22, 0x1b, 0x34, 0x2d, 0x3e, 0x27},
+            {0x78, 0x31, 0x22, 0x1b, 0x34, 0x2d, 0x1e, 0x27},
+            {0x78, 0x31, 0x22, 0x1b, 0x34, 0x2d, 0x1e, 0x27},
+            {0x78, 0x71, 0x22, 0x1b, 0x34, 0x6d, 0x1e, 0x27},
+            {0x78, 0x71, 0x22, 0x1b, 0x34, 0x6d, 0x1e, 0x27},
+            {0x78, 0x71, 0x42, 0x1b, 0x74, 0x6d, 0x1e, 0x27},
+            {0x78, 0x71, 0x42, 0x1b, 0x74, 0x6d, 0x1e, 0x27},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x1e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x1e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x0e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x0e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x0e, 0x47},
+            {0x78, 0x71, 0x42, 0x0b, 0x74, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x79, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x12, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x12, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x12, 0x2b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x60, 0x79, 0x12, 0x2b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x20, 0x79, 0x12, 0x2b, 0x5c, 0x65, 0x2e, 0x17},
+            {0x20, 0x79, 0x12, 0x2b, 0x5c, 0x65, 0x2e, 0x17},
+            {0x20, 0x39, 0x12, 0x2b, 0x5c, 0x25, 0x2e, 0x17},
+            {0x20, 0x39, 0x12, 0x2b, 0x5c, 0x25, 0x2e, 0x17},
+            {0x20, 0x39, 0x32, 0x2b, 0x1c, 0x25, 0x2e, 0x17},
+            {0x20, 0x39, 0x32, 0x2b, 0x1c, 0x25, 0x2e, 0x17},
+            {0x20, 0x39, 0x32, 0x3b, 0x1c, 0x25, 0x2e, 0x37},
+            {0x20, 0x39, 0x32, 0x3b, 0x1c, 0x25, 0x2e, 0x37},
+            {0x28, 0x39, 0x32, 0x3b, 0x1c, 0x25, 0x3e, 0x37},
+            {0x28, 0x39, 0x32, 0x3b, 0x1c, 0x25, 0x3e, 0x37},
+            {0x28, 0x31, 0x32, 0x3b, 0x1c, 0x2d, 0x3e, 0x37},
+            {0x28, 0x31, 0x32, 0x3b, 0x1c, 0x2d, 0x3e, 0x37},
+            {0x28, 0x31, 0x22, 0x3b, 0x14, 0x2d, 0x3e, 0x37},
+            {0x28, 0x31, 0x22, 0x3b, 0x14, 0x2d, 0x3e, 0x37},
+            {0x28, 0x31, 0x22, 0x1b, 0x14, 0x2d, 0x3e, 0x27},
+            {0x28, 0x31, 0x22, 0x1b, 0x14, 0x2d, 0x3e, 0x27},
+            {0x68, 0x31, 0x22, 0x1b, 0x14, 0x2d, 0x1e, 0x27},
+            {0x68, 0x31, 0x22, 0x1b, 0x14, 0x2d, 0x1e, 0x27},
+            {0x68, 0x71, 0x22, 0x1b, 0x14, 0x6d, 0x1e, 0x27},
+            {0x68, 0x71, 0x22, 0x1b, 0x14, 0x6d, 0x1e, 0x27},
+            {0x68, 0x71, 0x42, 0x1b, 0x54, 0x6d, 0x1e, 0x27},
+            {0x68, 0x71, 0x42, 0x1b, 0x54, 0x6d, 0x1e, 0x27},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x1e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x1e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x79, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x12, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x12, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x79, 0x12, 0x2b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x60, 0x79, 0x12, 0x2b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x20, 0x79, 0x12, 0x2b, 0x5c, 0x65, 0x2e, 0x17},
+            {0x20, 0x79, 0x12, 0x2b, 0x5c, 0x65, 0x2e, 0x17},
+            {0x20, 0x39, 0x12, 0x2b, 0x5c, 0x25, 0x2e, 0x17},
+            {0x20, 0x39, 0x12, 0x2b, 0x5c, 0x25, 0x2e, 0x17},
+            {0x20, 0x39, 0x32, 0x2b, 0x1c, 0x25, 0x2e, 0x17},
+            {0x20, 0x39, 0x32, 0x2b, 0x1c, 0x25, 0x2e, 0x17},
+            {0x20, 0x39, 0x32, 0x3b, 0x1c, 0x25, 0x2e, 0x37},
+            {0x20, 0x39, 0x32, 0x3b, 0x1c, 0x25, 0x2e, 0x37},
+            {0x28, 0x39, 0x32, 0x3b, 0x1c, 0x25, 0x3e, 0x37},
+            {0x28, 0x39, 0x32, 0x3b, 0x1c, 0x25, 0x3e, 0x37},
+            {0x28, 0x31, 0x32, 0x3b, 0x1c, 0x2d, 0x3e, 0x37},
+            {0x28, 0x31, 0x32, 0x3b, 0x1c, 0x2d, 0x3e, 0x37},
+            {0x28, 0x31, 0x22, 0x3b, 0x14, 0x2d, 0x3e, 0x37},
+            {0x28, 0x31, 0x22, 0x3b, 0x14, 0x2d, 0x3e, 0x37},
+            {0x28, 0x31, 0x22, 0x1b, 0x14, 0x2d, 0x3e, 0x27},
+            {0x28, 0x31, 0x22, 0x1b, 0x14, 0x2d, 0x3e, 0x27},
+            {0x68, 0x31, 0x22, 0x1b, 0x14, 0x2d, 0x1e, 0x27},
+            {0x68, 0x31, 0x22, 0x1b, 0x14, 0x2d, 0x1e, 0x27},
+            {0x68, 0x71, 0x22, 0x1b, 0x14, 0x6d, 0x1e, 0x27},
+            {0x68, 0x71, 0x22, 0x1b, 0x14, 0x6d, 0x1e, 0x27},
+            {0x68, 0x71, 0x42, 0x1b, 0x54, 0x6d, 0x1e, 0x27},
+            {0x68, 0x71, 0x42, 0x1b, 0x54, 0x6d, 0x1e, 0x27},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x1e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x1e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x71, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x12, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x12, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x60, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x20, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x2e, 0x17},
+            {0x20, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x2e, 0x17},
+            {0x20, 0x19, 0x12, 0x6b, 0x5c, 0x25, 0x2e, 0x17},
+            {0x20, 0x19, 0x12, 0x6b, 0x5c, 0x25, 0x2e, 0x17},
+            {0x20, 0x19, 0x32, 0x6b, 0x1c, 0x25, 0x2e, 0x17},
+            {0x20, 0x19, 0x32, 0x6b, 0x1c, 0x25, 0x2e, 0x17},
+            {0x20, 0x19, 0x32, 0x7b, 0x1c, 0x25, 0x2e, 0x37},
+            {0x20, 0x19, 0x32, 0x7b, 0x1c, 0x25, 0x2e, 0x37},
+            {0x28, 0x19, 0x32, 0x7b, 0x1c, 0x25, 0x3e, 0x37},
+            {0x28, 0x19, 0x32, 0x7b, 0x1c, 0x25, 0x3e, 0x37},
+            {0x28, 0x11, 0x32, 0x7b, 0x1c, 0x2d, 0x3e, 0x37},
+            {0x28, 0x11, 0x32, 0x7b, 0x1c, 0x2d, 0x3e, 0x37},
+            {0x28, 0x11, 0x22, 0x7b, 0x14, 0x2d, 0x3e, 0x37},
+            {0x28, 0x11, 0x22, 0x7b, 0x14, 0x2d, 0x3e, 0x37},
+            {0x28, 0x11, 0x22, 0x5b, 0x14, 0x2d, 0x3e, 0x27},
+            {0x28, 0x11, 0x22, 0x5b, 0x14, 0x2d, 0x3e, 0x27},
+            {0x68, 0x11, 0x22, 0x5b, 0x14, 0x2d, 0x1e, 0x27},
+            {0x68, 0x11, 0x22, 0x5b, 0x14, 0x2d, 0x1e, 0x27},
+            {0x68, 0x51, 0x22, 0x5b, 0x14, 0x6d, 0x1e, 0x27},
+            {0x68, 0x51, 0x22, 0x5b, 0x14, 0x6d, 0x1e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x1e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x1e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x1e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x1e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x12, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x60, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x20, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x2e, 0x17},
+            {0x20, 0x59, 0x12, 0x6b, 0x5c, 0x65, 0x2e, 0x17},
+            {0x20, 0x19, 0x12, 0x6b, 0x5c, 0x25, 0x2e, 0x17},
+            {0x20, 0x19, 0x12, 0x6b, 0x5c, 0x25, 0x2e, 0x17},
+            {0x20, 0x19, 0x32, 0x6b, 0x1c, 0x25, 0x2e, 0x17},
+            {0x20, 0x19, 0x32, 0x6b, 0x1c, 0x25, 0x2e, 0x17},
+            {0x20, 0x19, 0x32, 0x7b, 0x1c, 0x25, 0x2e, 0x37},
+            {0x20, 0x19, 0x32, 0x7b, 0x1c, 0x25, 0x2e, 0x37},
+            {0x28, 0x19, 0x32, 0x7b, 0x1c, 0x25, 0x3e, 0x37},
+            {0x28, 0x19, 0x32, 0x7b, 0x1c, 0x25, 0x3e, 0x37},
+            {0x28, 0x11, 0x32, 0x7b, 0x1c, 0x2d, 0x3e, 0x37},
+            {0x28, 0x11, 0x32, 0x7b, 0x1c, 0x2d, 0x3e, 0x37},
+            {0x28, 0x11, 0x22, 0x7b, 0x14, 0x2d, 0x3e, 0x37},
+            {0x28, 0x11, 0x22, 0x7b, 0x14, 0x2d, 0x3e, 0x37},
+            {0x28, 0x11, 0x22, 0x5b, 0x14, 0x2d, 0x3e, 0x27},
+            {0x28, 0x11, 0x22, 0x5b, 0x14, 0x2d, 0x3e, 0x27},
+            {0x68, 0x11, 0x22, 0x5b, 0x14, 0x2d, 0x1e, 0x27},
+            {0x68, 0x11, 0x22, 0x5b, 0x14, 0x2d, 0x1e, 0x27},
+            {0x68, 0x51, 0x22, 0x5b, 0x14, 0x6d, 0x1e, 0x27},
+            {0x68, 0x51, 0x22, 0x5b, 0x14, 0x6d, 0x1e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x1e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x1e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x1e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x1e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x20, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x17},
+            {0x20, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x17},
+            {0x20, 0x19, 0x52, 0x6b, 0x5c, 0x25, 0x6e, 0x17},
+            {0x20, 0x19, 0x52, 0x6b, 0x5c, 0x25, 0x6e, 0x17},
+            {0x20, 0x19, 0x72, 0x6b, 0x1c, 0x25, 0x6e, 0x17},
+            {0x20, 0x19, 0x72, 0x6b, 0x1c, 0x25, 0x6e, 0x17},
+            {0x20, 0x19, 0x72, 0x7b, 0x1c, 0x25, 0x6e, 0x37},
+            {0x20, 0x19, 0x72, 0x7b, 0x1c, 0x25, 0x6e, 0x37},
+            {0x28, 0x19, 0x72, 0x7b, 0x1c, 0x25, 0x7e, 0x37},
+            {0x28, 0x19, 0x72, 0x7b, 0x1c, 0x25, 0x7e, 0x37},
+            {0x28, 0x11, 0x72, 0x7b, 0x1c, 0x2d, 0x7e, 0x37},
+            {0x28, 0x11, 0x72, 0x7b, 0x1c, 0x2d, 0x7e, 0x37},
+            {0x28, 0x11, 0x62, 0x7b, 0x14, 0x2d, 0x7e, 0x37},
+            {0x28, 0x11, 0x62, 0x7b, 0x14, 0x2d, 0x7e, 0x37},
+            {0x28, 0x11, 0x62, 0x5b, 0x14, 0x2d, 0x7e, 0x27},
+            {0x28, 0x11, 0x62, 0x5b, 0x14, 0x2d, 0x7e, 0x27},
+            {0x68, 0x11, 0x62, 0x5b, 0x14, 0x2d, 0x5e, 0x27},
+            {0x68, 0x11, 0x62, 0x5b, 0x14, 0x2d, 0x5e, 0x27},
+            {0x68, 0x51, 0x62, 0x5b, 0x14, 0x6d, 0x5e, 0x27},
+            {0x68, 0x51, 0x62, 0x5b, 0x14, 0x6d, 0x5e, 0x27},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x17},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x17},
+            {0x20, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x17},
+            {0x20, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x17},
+            {0x20, 0x19, 0x52, 0x6b, 0x5c, 0x25, 0x6e, 0x17},
+            {0x20, 0x19, 0x52, 0x6b, 0x5c, 0x25, 0x6e, 0x17},
+            {0x20, 0x19, 0x72, 0x6b, 0x1c, 0x25, 0x6e, 0x17},
+            {0x20, 0x19, 0x72, 0x6b, 0x1c, 0x25, 0x6e, 0x17},
+            {0x20, 0x19, 0x72, 0x7b, 0x1c, 0x25, 0x6e, 0x37},
+            {0x20, 0x19, 0x72, 0x7b, 0x1c, 0x25, 0x6e, 0x37},
+            {0x28, 0x19, 0x72, 0x7b, 0x1c, 0x25, 0x7e, 0x37},
+            {0x28, 0x19, 0x72, 0x7b, 0x1c, 0x25, 0x7e, 0x37},
+            {0x28, 0x11, 0x72, 0x7b, 0x1c, 0x2d, 0x7e, 0x37},
+            {0x28, 0x11, 0x72, 0x7b, 0x1c, 0x2d, 0x7e, 0x37},
+            {0x28, 0x11, 0x62, 0x7b, 0x14, 0x2d, 0x7e, 0x37},
+            {0x28, 0x11, 0x62, 0x7b, 0x14, 0x2d, 0x7e, 0x37},
+            {0x28, 0x11, 0x62, 0x5b, 0x14, 0x2d, 0x7e, 0x27},
+            {0x28, 0x11, 0x62, 0x5b, 0x14, 0x2d, 0x7e, 0x27},
+            {0x68, 0x11, 0x62, 0x5b, 0x14, 0x2d, 0x5e, 0x27},
+            {0x68, 0x11, 0x62, 0x5b, 0x14, 0x2d, 0x5e, 0x27},
+            {0x68, 0x51, 0x62, 0x5b, 0x14, 0x6d, 0x5e, 0x27},
+            {0x68, 0x51, 0x62, 0x5b, 0x14, 0x6d, 0x5e, 0x27},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x27},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x27},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x20, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x20, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x20, 0x19, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x72, 0x6b, 0x1c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x72, 0x6b, 0x1c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x72, 0x7b, 0x1c, 0x45, 0x6e, 0x77},
+            {0x20, 0x19, 0x72, 0x7b, 0x1c, 0x45, 0x6e, 0x77},
+            {0x28, 0x19, 0x72, 0x7b, 0x1c, 0x45, 0x7e, 0x77},
+            {0x28, 0x19, 0x72, 0x7b, 0x1c, 0x45, 0x7e, 0x77},
+            {0x28, 0x11, 0x72, 0x7b, 0x1c, 0x4d, 0x7e, 0x77},
+            {0x28, 0x11, 0x72, 0x7b, 0x1c, 0x4d, 0x7e, 0x77},
+            {0x28, 0x11, 0x62, 0x7b, 0x14, 0x4d, 0x7e, 0x77},
+            {0x28, 0x11, 0x62, 0x7b, 0x14, 0x4d, 0x7e, 0x77},
+            {0x28, 0x11, 0x62, 0x5b, 0x14, 0x4d, 0x7e, 0x67},
+            {0x28, 0x11, 0x62, 0x5b, 0x14, 0x4d, 0x7e, 0x67},
+            {0x68, 0x11, 0x62, 0x5b, 0x14, 0x4d, 0x5e, 0x67},
+            {0x68, 0x11, 0x62, 0x5b, 0x14, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x14, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x14, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x02, 0x4b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x20, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x20, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x72, 0x6b, 0x1c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x72, 0x6b, 0x1c, 0x45, 0x6e, 0x57},
+            {0x20, 0x19, 0x72, 0x7b, 0x1c, 0x45, 0x6e, 0x77},
+            {0x20, 0x19, 0x72, 0x7b, 0x1c, 0x45, 0x6e, 0x77},
+            {0x28, 0x19, 0x72, 0x7b, 0x1c, 0x45, 0x7e, 0x77},
+            {0x28, 0x19, 0x72, 0x7b, 0x1c, 0x45, 0x7e, 0x77},
+            {0x28, 0x11, 0x72, 0x7b, 0x1c, 0x4d, 0x7e, 0x77},
+            {0x28, 0x11, 0x72, 0x7b, 0x1c, 0x4d, 0x7e, 0x77},
+            {0x28, 0x11, 0x62, 0x7b, 0x14, 0x4d, 0x7e, 0x77},
+            {0x28, 0x11, 0x62, 0x7b, 0x14, 0x4d, 0x7e, 0x77},
+            {0x28, 0x11, 0x62, 0x5b, 0x14, 0x4d, 0x7e, 0x67},
+            {0x28, 0x11, 0x62, 0x5b, 0x14, 0x4d, 0x7e, 0x67},
+            {0x68, 0x11, 0x62, 0x5b, 0x14, 0x4d, 0x5e, 0x67},
+            {0x68, 0x11, 0x62, 0x5b, 0x14, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x14, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x14, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x0b, 0x54, 0x6d, 0x0e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x40, 0x19, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x48, 0x19, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x19, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x11, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x11, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x11, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x11, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x11, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x11, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x68, 0x11, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x11, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x19, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x40, 0x19, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x48, 0x19, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x19, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x11, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x11, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x11, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x11, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x11, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x11, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x11, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x11, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x40, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x48, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x01, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x4e, 0x07},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x40, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x48, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x01, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x42, 0x5b, 0x54, 0x6d, 0x5e, 0x47}
+        },
+        {
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x40, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x48, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x01, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67}
+        },
+        {
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x60, 0x59, 0x52, 0x6b, 0x5c, 0x65, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x59, 0x52, 0x6b, 0x5c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x52, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x6b, 0x0c, 0x45, 0x6e, 0x57},
+            {0x40, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x40, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x6e, 0x77},
+            {0x48, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x09, 0x72, 0x7b, 0x0c, 0x45, 0x7e, 0x77},
+            {0x48, 0x01, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x72, 0x7b, 0x0c, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x7b, 0x04, 0x4d, 0x7e, 0x77},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x7e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x48, 0x01, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x04, 0x4d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67},
+            {0x68, 0x51, 0x62, 0x5b, 0x54, 0x6d, 0x5e, 0x67}
+        }
+    },
+    {   /* 12,000bps map */
+        {
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27}
+        },
+        {
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27}
+        },
+        {
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27}
+        },
+        {
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27}
+        },
+        {
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x1e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x13, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x3d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x1b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x14, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x0e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x32, 0x0b, 0x24, 0x3d, 0x16, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x0e, 0x27},
+            {0x38, 0x01, 0x22, 0x1b, 0x04, 0x2d, 0x0e, 0x27},
+            {0x28, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x22, 0x3b, 0x0c, 0x35, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x30, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x13, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x18, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x16, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x0e, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x0e, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x3d, 0x0e, 0x37},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x22, 0x0b, 0x04, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x0b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x0b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x01, 0x22, 0x1b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x30, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x1e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x3e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x14, 0x35, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x0e, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x0e, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x0e, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x0e, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x0b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x0b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x0b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x0b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x3e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x3e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x3e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x3e, 0x27},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x0e, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x0e, 0x37},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x0e, 0x2f},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x0e, 0x2f},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x2d, 0x0e, 0x2f},
+            {0x38, 0x01, 0x2a, 0x0b, 0x24, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x2a, 0x0b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x2a, 0x0b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x0b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x22, 0x0b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x22, 0x2b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x22, 0x2b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x09, 0x22, 0x3b, 0x0c, 0x2d, 0x0e, 0x27},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x2e, 0x27},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x2e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x3e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x3e, 0x27},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x06, 0x2f},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x0e, 0x2f},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x0e, 0x2f},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x21, 0x2a, 0x0b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x2a, 0x0b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x2a, 0x0b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x2a, 0x0b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x22, 0x2b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x22, 0x2b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x22, 0x2b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x2e, 0x27},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x2e, 0x27},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x2e, 0x27},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x2e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x32, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x1d, 0x06, 0x37},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x06, 0x2f},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x06, 0x2f},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x06, 0x2f},
+            {0x38, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x21, 0x2a, 0x0b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x01, 0x2a, 0x0b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x22, 0x2b, 0x0c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x2d, 0x2e, 0x27},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x2e, 0x07},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x2e, 0x07},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x2e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x3e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x30, 0x11, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x06, 0x2f},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x06, 0x2f},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x06, 0x2f},
+            {0x08, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x28, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x2e, 0x07},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x2e, 0x07},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x2e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x0b, 0x24, 0x0d, 0x06, 0x2f},
+            {0x08, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x28, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x2a, 0x2b, 0x2c, 0x2d, 0x0e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x02, 0x3b, 0x0c, 0x25, 0x2e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x03, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x2b, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x1d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x2a, 0x03, 0x24, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x03, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x03, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x03, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x0b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x0e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x2e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x2e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x02, 0x2b, 0x0c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x2b, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x2b, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x2b, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07},
+            {0x20, 0x19, 0x02, 0x3b, 0x1c, 0x25, 0x3e, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x03, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x03, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x03, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x23, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x2e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x2e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x2e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x2e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x2b, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x2b, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x2b, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x2a, 0x03, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x23, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x23, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x23, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x2b, 0x2c, 0x0d, 0x06, 0x2f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x26, 0x2f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x26, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x2e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x2e, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x2e, 0x0f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x2e, 0x0f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x28, 0x09, 0x0a, 0x2b, 0x2c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x02, 0x2b, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x3a, 0x23, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x23, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x23, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x23, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x26, 0x2f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x26, 0x2f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x26, 0x2f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x26, 0x2f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x2e, 0x0f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x2e, 0x0f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x2e, 0x0f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07}
+        },
+        {
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x18, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x21, 0x3a, 0x03, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x3a, 0x23, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x3a, 0x23, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x3a, 0x23, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x2a, 0x23, 0x2c, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x26, 0x2f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x0d, 0x26, 0x2f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x26, 0x0f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x26, 0x0f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x2e, 0x0f},
+            {0x28, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x09, 0x0a, 0x2b, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07},
+            {0x20, 0x19, 0x02, 0x33, 0x1c, 0x25, 0x36, 0x07}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x29, 0x3a, 0x23, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x3a, 0x23, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x3a, 0x23, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x26, 0x0f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x26, 0x0f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x26, 0x0f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x26, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x29, 0x3a, 0x23, 0x34, 0x0d, 0x06, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x26, 0x0f},
+            {0x08, 0x29, 0x0a, 0x2b, 0x2c, 0x05, 0x26, 0x0f},
+            {0x00, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x26, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x0a, 0x33, 0x3c, 0x25, 0x2e, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x26, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x0d, 0x26, 0x3f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x0a, 0x23, 0x2c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x29, 0x0a, 0x2b, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x2e, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x0f},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x08, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x0f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x03, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x08, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x29, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x0a, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x0f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x1c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17},
+            {0x20, 0x19, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17}
+        },
+        {
+            {0x10, 0x31, 0x3a, 0x23, 0x34, 0x15, 0x06, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x3f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x10, 0x31, 0x1a, 0x23, 0x34, 0x15, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x31, 0x1a, 0x23, 0x34, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x1a, 0x23, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x26, 0x1f},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x00, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x05, 0x36, 0x17},
+            {0x20, 0x39, 0x12, 0x33, 0x3c, 0x25, 0x36, 0x17}
+        }
+    },
+    {   /* 9,600bps map */
+        {
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x0e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x01, 0x12, 0x13, 0x1c, 0x1d, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x12, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x1c, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x00, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x01, 0x12, 0x13, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x12, 0x13, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x09, 0x02, 0x13, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x09, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x1b, 0x0c, 0x1d, 0x0e, 0x07},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x10, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x0e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x11, 0x12, 0x0b, 0x0c, 0x1d, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x12, 0x0b, 0x0c, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x0b, 0x14, 0x15, 0x1e, 0x0f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f},
+            {0x08, 0x19, 0x02, 0x03, 0x14, 0x15, 0x1e, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x1d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x06, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x1d, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x15, 0x16, 0x0f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x15, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x06, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x11, 0x1a, 0x0b, 0x0c, 0x0d, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x1a, 0x0b, 0x0c, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x08, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x07},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x1f}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17}
+        },
+        {
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x10, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x1b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x06, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x11, 0x1a, 0x0b, 0x04, 0x0d, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x1a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x0b, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x04, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17},
+            {0x18, 0x19, 0x0a, 0x03, 0x14, 0x05, 0x16, 0x17}
+        }
+    },
+    {   /* 7,200bps map */
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f}
+        },
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f}
+        },
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f}
+        },
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f}
+        },
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f}
+        },
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f}
+        },
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f}
+        },
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f}
+        },
+        {
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x03, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x04, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x0a, 0x0b, 0x0c, 0x0d, 0x06, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x03, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x04, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07},
+            {0x08, 0x01, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07}
+        },
+        {
+            {0x00, 0x09, 0x0a, 0x0b, 0x0c, 0x05, 0x06, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x0f},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x00, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x05, 0x0e, 0x07},
+            {0x08, 0x09, 0x02, 0x0b, 0x0c, 0x0d, 0x0e, 0x07}
+        }
+    }
+};
+
+/*- End of file ------------------------------------------------------------*/

Added: freeswitch/trunk/libs/spandsp/src/v17_v32bis_tx_constellation_maps.h
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/spandsp/src/v17_v32bis_tx_constellation_maps.h	Thu Jun 18 01:13:59 2009
@@ -0,0 +1,314 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
+ *
+ * v17_v32bis_tx_constellation_maps.h - ITU V.17 and V.32bis modems
+ *                                      transmit part.
+ *                                      Constellation mapping.
+ *
+ * Written by Steve Underwood 
+ *
+ * Copyright (C) 2004 Steve Underwood
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * $Id: v17_v32bis_tx_constellation_maps.h,v 1.1 2009/06/02 11:51:57 steveu Exp $
+ */
+
+#if defined(SPANDSP_USE_FIXED_POINTx)
+static const complexi16_t v17_v32bis_14400_constellation[128] =
+#else
+static const complexf_t v17_v32bis_14400_constellation[128] =
+#endif
+{
+    {-8, -3},       /* 0x00 */
+    { 9,  2},       /* 0x01 */
+    { 2, -9},       /* 0x02 */
+    {-3,  8},       /* 0x03 */
+    { 8,  3},       /* 0x04 */
+    {-9, -2},       /* 0x05 */
+    {-2,  9},       /* 0x06 */
+    { 3, -8},       /* 0x07 */
+    {-8,  1},       /* 0x08 */
+    { 9, -2},       /* 0x09 */
+    {-2, -9},       /* 0x0A */
+    { 1,  8},       /* 0x0B */
+    { 8, -1},       /* 0x0C */
+    {-9,  2},       /* 0x0D */
+    { 2,  9},       /* 0x0E */
+    {-1, -8},       /* 0x0F */
+    {-4, -3},       /* 0x10 */
+    { 5,  2},       /* 0x11 */
+    { 2, -5},       /* 0x12 */
+    {-3,  4},       /* 0x13 */
+    { 4,  3},       /* 0x14 */
+    {-5, -2},       /* 0x15 */
+    {-2,  5},       /* 0x16 */
+    { 3, -4},       /* 0x17 */
+    {-4,  1},       /* 0x18 */
+    { 5, -2},       /* 0x19 */
+    {-2, -5},       /* 0x1A */
+    { 1,  4},       /* 0x1B */
+    { 4, -1},       /* 0x1C */
+    {-5,  2},       /* 0x1D */
+    { 2,  5},       /* 0x1E */
+    {-1, -4},       /* 0x1F */
+    { 4, -3},       /* 0x20 */
+    {-3,  2},       /* 0x21 */
+    { 2,  3},       /* 0x22 */
+    {-3, -4},       /* 0x23 */
+    {-4,  3},       /* 0x24 */
+    { 3, -2},       /* 0x25 */
+    {-2, -3},       /* 0x26 */
+    { 3,  4},       /* 0x27 */
+    { 4,  1},       /* 0x28 */
+    {-3, -2},       /* 0x29 */
+    {-2,  3},       /* 0x2A */
+    { 1, -4},       /* 0x2B */
+    {-4, -1},       /* 0x2C */
+    { 3,  2},       /* 0x2D */
+    { 2, -3},       /* 0x2E */
+    {-1,  4},       /* 0x2F */
+    { 0, -3},       /* 0x30 */
+    { 1,  2},       /* 0x31 */
+    { 2, -1},       /* 0x32 */
+    {-3,  0},       /* 0x33 */
+    { 0,  3},       /* 0x34 */
+    {-1, -2},       /* 0x35 */
+    {-2,  1},       /* 0x36 */
+    { 3,  0},       /* 0x37 */
+    { 0,  1},       /* 0x38 */
+    { 1, -2},       /* 0x39 */
+    {-2, -1},       /* 0x3A */
+    { 1,  0},       /* 0x3B */
+    { 0, -1},       /* 0x3C */
+    {-1,  2},       /* 0x3D */
+    { 2,  1},       /* 0x3E */
+    {-1,  0},       /* 0x3F */
+    { 8, -3},       /* 0x40 */
+    {-7,  2},       /* 0x41 */
+    { 2,  7},       /* 0x42 */
+    {-3, -8},       /* 0x43 */
+    {-8,  3},       /* 0x44 */
+    { 7, -2},       /* 0x45 */
+    {-2, -7},       /* 0x46 */
+    { 3,  8},       /* 0x47 */
+    { 8,  1},       /* 0x48 */
+    {-7, -2},       /* 0x49 */
+    {-2,  7},       /* 0x4A */
+    { 1, -8},       /* 0x4B */
+    {-8, -1},       /* 0x4C */
+    { 7,  2},       /* 0x4D */
+    { 2, -7},       /* 0x4E */
+    {-1,  8},       /* 0x4F */
+    {-4, -7},       /* 0x50 */
+    { 5,  6},       /* 0x51 */
+    { 6, -5},       /* 0x52 */
+    {-7,  4},       /* 0x53 */
+    { 4,  7},       /* 0x54 */
+    {-5, -6},       /* 0x55 */
+    {-6,  5},       /* 0x56 */
+    { 7, -4},       /* 0x57 */
+    {-4,  5},       /* 0x58 */
+    { 5, -6},       /* 0x59 */
+    {-6, -5},       /* 0x5A */
+    { 5,  4},       /* 0x5B */
+    { 4, -5},       /* 0x5C */
+    {-5,  6},       /* 0x5D */
+    { 6,  5},       /* 0x5E */
+    {-5, -4},       /* 0x5F */
+    { 4, -7},       /* 0x60 */
+    {-3,  6},       /* 0x61 */
+    { 6,  3},       /* 0x62 */
+    {-7, -4},       /* 0x63 */
+    {-4,  7},       /* 0x64 */
+    { 3, -6},       /* 0x65 */
+    {-6, -3},       /* 0x66 */
+    { 7,  4},       /* 0x67 */
+    { 4,  5},       /* 0x68 */
+    {-3, -6},       /* 0x69 */
+    {-6,  3},       /* 0x6A */
+    { 5, -4},       /* 0x6B */
+    {-4, -5},       /* 0x6C */
+    { 3,  6},       /* 0x6D */
+    { 6, -3},       /* 0x6E */
+    {-5,  4},       /* 0x6F */
+    { 0, -7},       /* 0x70 */
+    { 1,  6},       /* 0x71 */
+    { 6, -1},       /* 0x72 */
+    {-7,  0},       /* 0x73 */
+    { 0,  7},       /* 0x74 */
+    {-1, -6},       /* 0x75 */
+    {-6,  1},       /* 0x76 */
+    { 7,  0},       /* 0x77 */
+    { 0,  5},       /* 0x78 */
+    { 1, -6},       /* 0x79 */
+    {-6, -1},       /* 0x7A */
+    { 5,  0},       /* 0x7B */
+    { 0, -5},       /* 0x7C */
+    {-1,  6},       /* 0x7D */
+    { 6,  1},       /* 0x7E */
+    {-5,  0}        /* 0x7F */
+};
+
+#if defined(SPANDSP_USE_FIXED_POINTx)
+static const complexi16_t v17_v32bis_12000_constellation[64] =
+#else
+static const complexf_t v17_v32bis_12000_constellation[64] =
+#endif
+{
+    { 7,  1},       /* 0x00 */
+    {-5, -1},       /* 0x01 */
+    {-1,  5},       /* 0x02 */
+    { 1, -7},       /* 0x03 */
+    {-7, -1},       /* 0x04 */
+    { 5,  1},       /* 0x05 */
+    { 1, -5},       /* 0x06 */
+    {-1,  7},       /* 0x07 */
+    { 3, -3},       /* 0x08 */
+    {-1,  3},       /* 0x09 */
+    { 3,  1},       /* 0x0A */
+    {-3, -3},       /* 0x0B */
+    {-3,  3},       /* 0x0C */
+    { 1, -3},       /* 0x0D */
+    {-3, -1},       /* 0x0E */
+    { 3,  3},       /* 0x0F */
+    { 7, -7},       /* 0x10 */
+    {-5,  7},       /* 0x11 */
+    { 7,  5},       /* 0x12 */
+    {-7, -7},       /* 0x13 */
+    {-7,  7},       /* 0x14 */
+    { 5, -7},       /* 0x15 */
+    {-7, -5},       /* 0x16 */
+    { 7,  7},       /* 0x17 */
+    {-1, -7},       /* 0x18 */
+    { 3,  7},       /* 0x19 */
+    { 7, -3},       /* 0x1A */
+    {-7,  1},       /* 0x1B */
+    { 1,  7},       /* 0x1C */
+    {-3, -7},       /* 0x1D */
+    {-7,  3},       /* 0x1E */
+    { 7, -1},       /* 0x1F */
+    { 3,  5},       /* 0x20 */
+    {-1, -5},       /* 0x21 */
+    {-5,  1},       /* 0x22 */
+    { 5, -3},       /* 0x23 */
+    {-3, -5},       /* 0x24 */
+    { 1,  5},       /* 0x25 */
+    { 5, -1},       /* 0x26 */
+    {-5,  3},       /* 0x27 */
+    {-1,  1},       /* 0x28 */
+    { 3, -1},       /* 0x29 */
+    {-1, -3},       /* 0x2A */
+    { 1,  1},       /* 0x2B */
+    { 1, -1},       /* 0x2C */
+    {-3,  1},       /* 0x2D */
+    { 1,  3},       /* 0x2E */
+    {-1, -1},       /* 0x2F */
+    {-5,  5},       /* 0x30 */
+    { 7, -5},       /* 0x31 */
+    {-5, -7},       /* 0x32 */
+    { 5,  5},       /* 0x33 */
+    { 5, -5},       /* 0x34 */
+    {-7,  5},       /* 0x35 */
+    { 5,  7},       /* 0x36 */
+    {-5, -5},       /* 0x37 */
+    {-5, -3},       /* 0x38 */
+    { 7,  3},       /* 0x39 */
+    { 3, -7},       /* 0x3A */
+    {-3,  5},       /* 0x3B */
+    { 5,  3},       /* 0x3C */
+    {-7, -3},       /* 0x3D */
+    {-3,  7},       /* 0x3E */
+    { 3, -5}        /* 0x3F */
+};
+
+#if defined(SPANDSP_USE_FIXED_POINTx)
+static const complexi16_t v17_v32bis_9600_constellation[32] =
+#else
+static const complexf_t v17_v32bis_9600_constellation[32] =
+#endif
+{
+    {-8,  2},       /* 0x00 */
+    {-6, -4},       /* 0x01 */
+    {-4,  6},       /* 0x02 */
+    { 2,  8},       /* 0x03 */
+    { 8, -2},       /* 0x04 */
+    { 6,  4},       /* 0x05 */
+    { 4, -6},       /* 0x06 */
+    {-2, -8},       /* 0x07 */
+    { 0,  2},       /* 0x08 */
+    {-6,  4},       /* 0x09 */
+    { 4,  6},       /* 0x0A */
+    { 2,  0},       /* 0x0B */
+    { 0, -2},       /* 0x0C */
+    { 6, -4},       /* 0x0D */
+    {-4, -6},       /* 0x0E */
+    {-2,  0},       /* 0x0F */
+    { 0, -6},       /* 0x10 */
+    { 2, -4},       /* 0x11 */
+    {-4, -2},       /* 0x12 */
+    {-6,  0},       /* 0x13 */
+    { 0,  6},       /* 0x14 */
+    {-2,  4},       /* 0x15 */
+    { 4,  2},       /* 0x16 */
+    { 6,  0},       /* 0x17 */
+    { 8,  2},       /* 0x18 */
+    { 2,  4},       /* 0x19 */
+    { 4, -2},       /* 0x1A */
+    { 2, -8},       /* 0x1B */
+    {-8, -2},       /* 0x1C */
+    {-2, -4},       /* 0x1D */
+    {-4,  2},       /* 0x1E */
+    {-2,  8}        /* 0x1F */
+};
+
+#if defined(SPANDSP_USE_FIXED_POINTx)
+static const complexi16_t v17_v32bis_7200_constellation[16] =
+#else
+static const complexf_t v17_v32bis_7200_constellation[16] =
+#endif
+{
+    { 6, -6},       /* 0x00 */
+    {-2,  6},       /* 0x01 */
+    { 6,  2},       /* 0x02 */
+    {-6, -6},       /* 0x03 */
+    {-6,  6},       /* 0x04 */
+    { 2, -6},       /* 0x05 */
+    {-6, -2},       /* 0x06 */
+    { 6,  6},       /* 0x07 */
+    {-2,  2},       /* 0x08 */
+    { 6, -2},       /* 0x09 */
+    {-2, -6},       /* 0x0A */
+    { 2,  2},       /* 0x0B */
+    { 2, -2},       /* 0x0C */
+    {-6,  2},       /* 0x0D */
+    { 2,  6},       /* 0x0E */
+    {-2, -2}        /* 0x0F */
+};
+
+#if defined(SPANDSP_USE_FIXED_POINTx)
+static const complexi16_t v17_v32bis_4800_constellation[4] =
+#else
+static const complexf_t v17_v32bis_4800_constellation[4] =
+#endif
+{
+    {-6, -2},
+    { 2, -6},
+    { 6,  2},
+    {-2,  6}
+};
+
+/*- End of file ------------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/src/v17rx.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v17rx.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v17rx.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v17rx.c,v 1.146 2009/04/21 13:59:07 steveu Exp $
+ * $Id: v17rx.c,v 1.149 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -64,12 +64,12 @@
 #include "spandsp/private/logging.h"
 #include "spandsp/private/v17rx.h"
 
-#include "v17tx_constellation_maps.h"
-#include "v17rx_constellation_maps.h"
+#include "v17_v32bis_tx_constellation_maps.h"
+#include "v17_v32bis_rx_constellation_maps.h"
 #if defined(SPANDSP_USE_FIXED_POINT)
-#include "v17rx_fixed_rrc.h"
+#include "v17_v32bis_rx_fixed_rrc.h"
 #else
-#include "v17rx_floating_rrc.h"
+#include "v17_v32bis_rx_floating_rrc.h"
 #endif
 
 /*! The nominal frequency of the carrier, in Hertz */
@@ -295,18 +295,6 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-static __inline__ int find_quadrant(complexf_t *z)
-{
-    int b1;
-    int b2;
-
-    /* Split the space along the two diagonals. */
-    b1 = (z->im > z->re);
-    b2 = (z->im < -z->re);
-    return (b2 << 1) | (b1 ^ b2);
-}
-/*- End of function --------------------------------------------------------*/
-
 static void track_carrier(v17_rx_state_t *s, const complexf_t *z, const complexf_t *target)
 {
     float error;
@@ -1008,12 +996,81 @@
 }
 /*- End of function --------------------------------------------------------*/
 
+static __inline__ int signal_detect(v17_rx_state_t *s, int16_t amp)
+{
+    int16_t diff;
+    int16_t x;
+    int32_t power;
+
+    /* There should be no DC in the signal, but sometimes there is.
+       We need to measure the power with the DC blocked, but not using
+       a slow to respond DC blocker. Use the most elementary HPF. */
+    x = amp >> 1;
+    /* There could be overflow here, but it isn't a problem in practice */
+    diff = x - s->last_sample;
+    s->last_sample = x;
+    power = power_meter_update(&(s->power), diff);
+#if defined(IAXMODEM_STUFF)
+    /* Quick power drop fudge */
+    diff = abs(diff);
+    if (10*diff < s->high_sample)
+    {
+        if (++s->low_samples > 120)
+        {
+            power_meter_init(&(s->power), 4);
+            s->high_sample = 0;
+            s->low_samples = 0;
+        }
+    }
+    else
+    { 
+        s->low_samples = 0;
+        if (diff > s->high_sample)
+            s->high_sample = diff;
+    }
+#endif
+    if (s->signal_present > 0)
+    {
+        /* Look for power below turn-off threshold to turn the carrier off */
+#if defined(IAXMODEM_STUFF)
+        if (s->carrier_drop_pending  ||  power < s->carrier_off_power)
+#else
+        if (power < s->carrier_off_power)
+#endif
+        {
+            if (--s->signal_present <= 0)
+            {
+                /* Count down a short delay, to ensure we push the last
+                   few bits through the filters before stopping. */
+                v17_rx_restart(s, s->bit_rate, s->short_train);
+                report_status_change(s, SIG_STATUS_CARRIER_DOWN);
+                return 0;
+            }
+#if defined(IAXMODEM_STUFF)
+            /* Carrier has dropped, but the put_bit is pending the signal_present delay. */
+            s->carrier_drop_pending = TRUE;
+#endif
+        }
+    }
+    else
+    {
+        /* Look for power exceeding turn-on threshold to turn the carrier on */
+        if (power < s->carrier_on_power)
+            return 0;
+        s->signal_present = 1;
+#if defined(IAXMODEM_STUFF)
+        s->carrier_drop_pending = FALSE;
+#endif
+        report_status_change(s, SIG_STATUS_CARRIER_UP);
+    }
+    return power;
+}
+/*- End of function --------------------------------------------------------*/
+
 SPAN_DECLARE_NONSTD(int) v17_rx(v17_rx_state_t *s, const int16_t amp[], int len)
 {
     int i;
     int step;
-    int16_t x;
-    int16_t diff;
     complexf_t z;
     complexf_t zz;
     complexf_t sample;
@@ -1033,68 +1090,8 @@
         if (++s->rrc_filter_step >= V17_RX_FILTER_STEPS)
             s->rrc_filter_step = 0;
 
-        /* There should be no DC in the signal, but sometimes there is.
-           We need to measure the power with the DC blocked, but not using
-           a slow to respond DC blocker. Use the most elementary HPF. */
-        x = amp[i] >> 1;
-        /* There could be overflow here, but it isn't a problem in practice */
-        diff = x - s->last_sample;
-        power = power_meter_update(&(s->power), diff);
-#if defined(IAXMODEM_STUFF)
-        /* Quick power drop fudge */
-        diff = abs(diff);
-        if (10*diff < s->high_sample)
-        {
-            if (++s->low_samples > 120)
-            {
-                power_meter_init(&(s->power), 4);
-                s->high_sample = 0;
-                s->low_samples = 0;
-            }
-        }
-        else
-        { 
-            s->low_samples = 0;
-            if (diff > s->high_sample)
-               s->high_sample = diff;
-        }
-#endif
-        s->last_sample = x;
-        if (s->signal_present)
-        {
-            /* Look for power below turnoff threshold to turn the carrier off */
-#if defined(IAXMODEM_STUFF)
-            if (s->carrier_drop_pending  ||  power < s->carrier_off_power)
-#else
-            if (power < s->carrier_off_power)
-#endif
-            {
-                if (--s->signal_present <= 0)
-                {
-                    /* Count down a short delay, to ensure we push the last
-                       few bits through the filters before stopping. */
-                    v17_rx_restart(s, s->bit_rate, s->short_train);
-                    report_status_change(s, SIG_STATUS_CARRIER_DOWN);
-                    continue;
-                }
-#if defined(IAXMODEM_STUFF)
-                /* Carrier has dropped, but the put_bit is
-                   pending the signal_present delay. */
-                s->carrier_drop_pending = TRUE;
-#endif
-            }
-        }
-        else
-        {
-            /* Look for power exceeding turnon threshold to turn the carrier on */
-            if (power < s->carrier_on_power)
-                continue;
-            s->signal_present = 1;
-#if defined(IAXMODEM_STUFF)
-            s->carrier_drop_pending = FALSE;
-#endif
-            report_status_change(s, SIG_STATUS_CARRIER_UP);
-        }
+        if ((power = signal_detect(s, amp[i])) == 0)
+            continue;
         if (s->training_stage == TRAINING_STAGE_PARKED)
             continue;
         /* Only spend effort processing this data if the modem is not
@@ -1171,7 +1168,7 @@
     /* We want to sustain the current state (i.e carrier on<->carrier off), and
        try to sustain the carrier phase. We should probably push the filters, as well */
     span_log(&s->logging, SPAN_LOG_FLOW, "Fill-in %d samples\n", len);
-    if (!s->signal_present)
+    if (s->signal_present <= 0)
         return 0;
     if (s->training_stage == TRAINING_STAGE_PARKED)
         return 0;
@@ -1220,22 +1217,22 @@
     switch (bit_rate)
     {
     case 14400:
-        s->constellation = v17_14400_constellation;
+        s->constellation = v17_v32bis_14400_constellation;
         s->space_map = 0;
         s->bits_per_symbol = 6;
         break;
     case 12000:
-        s->constellation = v17_12000_constellation;
+        s->constellation = v17_v32bis_12000_constellation;
         s->space_map = 1;
         s->bits_per_symbol = 5;
         break;
     case 9600:
-        s->constellation = v17_9600_constellation;
+        s->constellation = v17_v32bis_9600_constellation;
         s->space_map = 2;
         s->bits_per_symbol = 4;
         break;
     case 7200:
-        s->constellation = v17_7200_constellation;
+        s->constellation = v17_v32bis_7200_constellation;
         s->space_map = 3;
         s->bits_per_symbol = 3;
         break;

Modified: freeswitch/trunk/libs/spandsp/src/v17tx.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v17tx.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v17tx.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v17tx.c,v 1.73 2009/04/21 13:59:07 steveu Exp $
+ * $Id: v17tx.c,v 1.75 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -62,11 +62,11 @@
 #define SPANDSP_USE_FIXED_POINTx
 #endif
 
-#include "v17tx_constellation_maps.h"
+#include "v17_v32bis_tx_constellation_maps.h"
 #if defined(SPANDSP_USE_FIXED_POINT)
-#include "v17tx_fixed_rrc.h"
+#include "v17_v32bis_tx_fixed_rrc.h"
 #else
-#include "v17tx_floating_rrc.h"
+#include "v17_v32bis_tx_floating_rrc.h"
 #endif
 
 /*! The nominal frequency of the carrier, in Hertz */
@@ -135,7 +135,7 @@
             if (s->training_step <= V17_TRAINING_SEG_TEP_B)
             {
                 /* Optional segment: Unmodulated carrier (talker echo protection) */
-                return v17_abcd_constellation[0];
+                return v17_v32bis_4800_constellation[0];
             }
             if (s->training_step <= V17_TRAINING_SEG_1)
             {
@@ -143,7 +143,7 @@
                 return zero;
             }
             /* Segment 1: ABAB... */
-            return v17_abcd_constellation[(s->training_step & 1) ^ 1];
+            return v17_v32bis_4800_constellation[(s->training_step & 1) ^ 1];
         }
         /* Segment 2: CDBA... */
         /* Apply the scrambler */
@@ -155,7 +155,7 @@
             /* Go straight to the ones test. */
             s->training_step = V17_TRAINING_SEG_4;
         }
-        return v17_abcd_constellation[s->constellation_state];
+        return v17_v32bis_4800_constellation[s->constellation_state];
     }
     /* Segment 3: Bridge... */
     shift = ((s->training_step - V17_TRAINING_SEG_3 - 1) & 0x7) << 1;
@@ -163,7 +163,7 @@
     bits = scramble(s, V17_BRIDGE_WORD >> shift);
     bits = (bits << 1) | scramble(s, V17_BRIDGE_WORD >> (shift + 1));
     s->constellation_state = (s->constellation_state + dibit_to_step[bits]) & 3;
-    return v17_abcd_constellation[s->constellation_state];
+    return v17_v32bis_4800_constellation[s->constellation_state];
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -359,19 +359,19 @@
     {
     case 14400:
         s->bits_per_symbol = 6;
-        s->constellation = v17_14400_constellation;
+        s->constellation = v17_v32bis_14400_constellation;
         break;
     case 12000:
         s->bits_per_symbol = 5;
-        s->constellation = v17_12000_constellation;
+        s->constellation = v17_v32bis_12000_constellation;
         break;
     case 9600:
         s->bits_per_symbol = 4;
-        s->constellation = v17_9600_constellation;
+        s->constellation = v17_v32bis_9600_constellation;
         break;
     case 7200:
         s->bits_per_symbol = 3;
-        s->constellation = v17_7200_constellation;
+        s->constellation = v17_v32bis_7200_constellation;
         break;
     default:
         return -1;

Modified: freeswitch/trunk/libs/spandsp/src/v18.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v18.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v18.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v18.c,v 1.7 2009/04/26 07:00:38 steveu Exp $
+ * $Id: v18.c,v 1.10 2009/06/02 16:03:56 steveu Exp $
  */
  
 /*! \file */
@@ -379,50 +379,50 @@
 {
     static const uint8_t conv[128] =
     {
-        0x00, /* NUL */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
+        0xFF, /* NUL */
+        0xFF, /* SOH */
+        0xFF, /* STX */
+        0xFF, /* ETX */
+        0xFF, /* EOT */
+        0xFF, /* ENQ */
+        0xFF, /* ACK */
+        0xFF, /* BEL */
+        0x00, /* BS */
+        0x44, /* HT >> SPACE */
         0x42, /* LF */
-        0xFF, /*   */
-        0xFF, /*   */
+        0x42, /* VT >> LF */
+        0x42, /* FF >> LF */
         0x48, /* CR */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
-        0xFF, /*   */
+        0xFF, /* SO */
+        0xFF, /* SI */
+        0xFF, /* DLE */
+        0xFF, /* DC1 */
+        0xFF, /* DC2 */
+        0xFF, /* DC3 */
+        0xFF, /* DC4 */
+        0xFF, /* NAK */
+        0xFF, /* SYN */
+        0xFF, /* ETB */
+        0xFF, /* CAN */
+        0xFF, /* EM */
+        0x99, /* SUB >> ? */
+        0xFF, /* ESC */
+        0x42, /* IS4 >> LF */
+        0x42, /* IS3 >> LF */
+        0x42, /* IS2 >> LF */
+        0x44, /* IS1 >> SPACE */
         0x44, /*   */
-        0xFF, /* ! */
-        0xFF, /* " */
-        0x94, /* # */
+        0x8D, /* ! */
+        0x91, /* " */
+        0x89, /* # >> $ */
         0x89, /* $ */
-        0xFF, /* % */
-        0xFF, /* & */
-        0x85, /* ' */
+        0x9D, /* % >> / */
+        0x9A, /* & >> + */
+        0x8B, /* ' */
         0x8F, /* ( */
         0x92, /* ) */
-        0x8B, /* * */
-        0x91, /* + */
+        0x9C, /* * >> . */
+        0x9A, /* + */
         0x8C, /* , */
         0x83, /* - */
         0x9C, /* . */
@@ -438,12 +438,12 @@
         0x86, /* 8 */
         0x98, /* 9 */
         0x8E, /* : */
-        0xFF, /* ; */
-        0xFF, /* < */
-        0x9E, /* = */
-        0xFF, /* > */
+        0x9E, /* ; */
+        0x8F, /* < >> )*/
+        0x94, /* = */
+        0x92, /* > >> ( */
         0x99, /* ? */
-        0xFF, /* @ */
+        0x1D, /* @ >> X */
         0x03, /* A */
         0x19, /* B */
         0x0E, /* C */
@@ -470,12 +470,12 @@
         0x1D, /* X */
         0x15, /* Y */
         0x11, /* Z */
-        0xFF, /* [ */
-        0xFF, /* \ */
-        0xFF, /* ] */
-        0x9B, /* ^ */
-        0xFF, /* _ */
-        0xFF, /* ` */
+        0x8F, /* [ >> (*/
+        0x9D, /* \ >> / */
+        0x92, /* ] >> ) */
+        0x8B, /* ^ >> ' */
+        0x44, /* _ >> Space */
+        0x8B, /* ` >> ' */
         0x03, /* a */
         0x19, /* b */
         0x0E, /* c */
@@ -502,19 +502,29 @@
         0x1D, /* x */
         0x15, /* y */
         0x11, /* z */
-        0xFF, /* { */
-        0xFF, /* | */
-        0xFF, /* } */
-        0xFF, /* ~ */
+        0x8F, /* { >> ( */
+        0x8D, /* | >> ! */
+        0x92, /* } >> ) */
+        0x44, /* ~ >> Space */
         0xFF, /* DEL */
     };
     uint16_t shift;
 
+    if (ch == 0x7F)
+    {
+        /* DLE is a special character meaning "force a
+           change to the letter character set */
+        shift = BAUDOT_LETTER_SHIFT;
+        return 0;
+    }
     ch = conv[ch];
+    /* Is it a non-existant code? */
     if (ch == 0xFF)
         return 0;
+    /* Is it a code present in both character sets? */
     if ((ch & 0x40))
-        return ch & 0x1F;
+        return 0x8000 | (ch & 0x1F);
+    /* Need to allow for a possible character set change. */
     if ((ch & 0x80))
     {
         if (s->baudot_tx_shift == 1)
@@ -529,7 +539,7 @@
         s->baudot_tx_shift = 0;
         shift = BAUDOT_LETTER_SHIFT;
     }
-    return (shift << 5) | (ch & 0x1F);
+    return 0x8000 | (shift << 5) | (ch & 0x1F);
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -537,8 +547,8 @@
 {
     static const uint8_t conv[2][32] =
     {
-        {"\000E\nA SIU\rDRJNFCKTZLWHYPQOBG^MXV^"},
-        {"\0003\n- '87\r$4*,*:(5+)2#6019?*^./=^"}
+        {"\bE\nA SIU\rDRJNFCKTZLWHYPQOBG^MXV^"},
+        {"\b3\n- -87\r$4',!:(5\")2=6019?+^./;^"}
     };
 
     switch (ch)
@@ -633,7 +643,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) v18_tx(v18_state_t *s, int16_t *amp, int max_len)
+SPAN_DECLARE_NONSTD(int) v18_tx(v18_state_t *s, int16_t *amp, int max_len)
 {
     int len;
     int lenx;
@@ -661,7 +671,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) v18_rx(v18_state_t *s, const int16_t amp[], int len)
+SPAN_DECLARE_NONSTD(int) v18_rx(v18_state_t *s, const int16_t amp[], int len)
 {
     switch (s->mode)
     {
@@ -709,11 +719,11 @@
                 buf[n++] = (uint8_t) (x & 0x1F);
                 /* TODO: Deal with out of space condition */
                 if (queue_write(&s->queue.queue, (const uint8_t *) buf, n) < 0)
-                    return 0;
+                    return i;
                 s->tx_signal_on = TRUE;
             }
         }
-        break;
+        return len;
     case V18_MODE_DTMF:
         break;
     }

Modified: freeswitch/trunk/libs/spandsp/src/v22bis_rx.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v22bis_rx.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v22bis_rx.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v22bis_rx.c,v 1.67 2009/04/29 12:37:45 steveu Exp $
+ * $Id: v22bis_rx.c,v 1.68 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -691,7 +691,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) v22bis_rx(v22bis_state_t *s, const int16_t amp[], int len)
+SPAN_DECLARE_NONSTD(int) v22bis_rx(v22bis_state_t *s, const int16_t amp[], int len)
 {
     int i;
     int j;

Modified: freeswitch/trunk/libs/spandsp/src/v22bis_tx.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v22bis_tx.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v22bis_tx.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v22bis_tx.c,v 1.62 2009/04/29 12:37:45 steveu Exp $
+ * $Id: v22bis_tx.c,v 1.63 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -448,7 +448,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) v22bis_tx(v22bis_state_t *s, int16_t amp[], int len)
+SPAN_DECLARE_NONSTD(int) v22bis_tx(v22bis_state_t *s, int16_t amp[], int len)
 {
     complexf_t x;
     complexf_t z;

Modified: freeswitch/trunk/libs/spandsp/src/v27ter_rx.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v27ter_rx.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v27ter_rx.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v27ter_rx.c,v 1.126 2009/04/21 13:59:07 steveu Exp $
+ * $Id: v27ter_rx.c,v 1.130 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -522,13 +522,23 @@
     {
         0, 4
     };
-    complexf_t z;
     complexf_t zz;
+#if defined(SPANDSP_USE_FIXED_POINTx)
+    complexf_t z1;
+    complexi16_t z;
+    const complexi16_t *target;
+    static const complexi16_t zero = {0, 0};
+#else
+    complexf_t z;
+    const complexf_t *target;
+    static const complexf_t zero = {0.0f, 0.0f};
+#endif
     float p;
     int i;
     int j;
     int32_t angle;
     int32_t ang;
+    int constellation_state;
 
     /* Add a sample to the equalizer's circular buffer, but don't calculate anything
        at this time. */
@@ -550,16 +560,20 @@
     z = equalizer_get(s);
 
     //span_log(&s->logging, SPAN_LOG_FLOW, "Equalized symbol - %15.5f %15.5f\n", z.re, z.im);
+    constellation_state = s->constellation_state;
     switch (s->training_stage)
     {
     case TRAINING_STAGE_NORMAL_OPERATION:
         decode_baud(s, &z);
+        constellation_state = (s->bit_rate == 4800)  ?  s->constellation_state  :  (s->constellation_state << 1);
+        target = &v27ter_constellation[constellation_state];
         break;
     case TRAINING_STAGE_SYMBOL_ACQUISITION:
         /* Allow time for the Gardner algorithm to settle the baud timing */
         /* Don't start narrowing the bandwidth of the Gardner algorithm too early.
            Some modems are a bit wobbly when they start sending the signal. Also, we start
            this analysis before our filter buffers have completely filled. */
+        target = &zero;
         if (++s->training_count >= 30)
         {
             s->gardner_step = 32;
@@ -570,6 +584,7 @@
         break;
     case TRAINING_STAGE_LOG_PHASE:
         /* Record the current alternate phase angle */
+        target = &zero;
         angle = arctan2(z.im, z.re);
         s->angles[1] =
         s->start_angles[1] = angle;
@@ -577,6 +592,7 @@
         s->training_stage = TRAINING_STAGE_WAIT_FOR_HOP;
         break;
     case TRAINING_STAGE_WAIT_FOR_HOP:
+        target = &zero;
         angle = arctan2(z.im, z.re);
         /* Look for the initial ABAB sequence to display a phase reversal, which will
            signal the start of the scrambled ABAB segment */
@@ -634,14 +650,15 @@
                 s->eq_buf[i] = complex_mulf(&s->eq_buf[i], &zz);
 #endif
             s->carrier_phase += angle;
-
             s->gardner_step = 2;
             /* We have just seen the first element of the scrambled sequence so skip it. */
             s->training_bc = 1;
             s->training_bc ^= descramble(s, 1);
             descramble(s, 1);
             descramble(s, 1);
+            constellation_state =
             s->constellation_state = abab_pos[s->training_bc];
+            target = &v27ter_constellation[constellation_state];
             s->training_count = 1;
             s->training_stage = TRAINING_STAGE_TRAIN_ON_ABAB;
             report_status_change(s, SIG_STATUS_TRAINING_IN_PROGRESS);
@@ -661,41 +678,40 @@
         s->training_bc ^= descramble(s, 1);
         descramble(s, 1);
         descramble(s, 1);
+        constellation_state =
         s->constellation_state = abab_pos[s->training_bc];
-        track_carrier(s, &z, &v27ter_constellation[s->constellation_state]);
-        tune_equalizer(s, &z, &v27ter_constellation[s->constellation_state]);
+        target = &v27ter_constellation[constellation_state];
+        track_carrier(s, &z, target);
+        tune_equalizer(s, &z, target);
 
+#if defined(SPANDSP_USE_FIXED_POINTx)
+        s->carrier_track_i = 400 + (200000 - 400)*(float) (V27TER_TRAINING_SEG_5_LEN - s->training_count)/(float) V27TER_TRAINING_SEG_5_LEN;
+        s->carrier_track_p = 1000000 + (10000000 - 1000000)*(float) (V27TER_TRAINING_SEG_5_LEN - s->training_count)/(float) V27TER_TRAINING_SEG_5_LEN;
+#else
+        s->carrier_track_i = 400.0f + (200000.0f - 400.0f)*(float) (V27TER_TRAINING_SEG_5_LEN - s->training_count)/(float) V27TER_TRAINING_SEG_5_LEN;
+        s->carrier_track_p = 1000000.0f + (10000000.0f - 1000000.0f)*(float) (V27TER_TRAINING_SEG_5_LEN - s->training_count)/(float) V27TER_TRAINING_SEG_5_LEN;
+#endif
         if (++s->training_count >= V27TER_TRAINING_SEG_5_LEN)
         {
+            constellation_state = 4;
             s->constellation_state = (s->bit_rate == 4800)  ?  4  :  2;
             s->training_count = 0;
             s->training_stage = TRAINING_STAGE_TEST_ONES;
-#if defined(SPANDSP_USE_FIXED_POINTx)
-            s->carrier_track_i = 400;
-            s->carrier_track_p = 1000000;
-#else
-            s->carrier_track_i = 400.0f;
-            s->carrier_track_p = 1000000.0f;
-#endif
         }
         break;
     case TRAINING_STAGE_TEST_ONES:
         decode_baud(s, &z);
+        constellation_state = (s->bit_rate == 4800)  ?  s->constellation_state  :  (s->constellation_state << 1);
+        target = &v27ter_constellation[constellation_state];
         /* Measure the training error */
 #if defined(SPANDSP_USE_FIXED_POINTx)
         z1.re = z.re/(float) FP_FACTOR;
         z1.im = z.im/(float) FP_FACTOR;
-        if (s->bit_rate == 4800)
-            zz = complex_subf(&z, &v27ter_constellation[s->constellation_state]);
-        else
-            zz = complex_subf(&z, &v27ter_constellation[s->constellation_state << 1]);
+        zz = complex_subf(&z, target);
         zz = complex_subf(&z1, &zz);
         s->training_error += powerf(&zz);
 #else
-        if (s->bit_rate == 4800)
-            zz = complex_subf(&z, &v27ter_constellation[s->constellation_state]);
-        else
-            zz = complex_subf(&z, &v27ter_constellation[s->constellation_state << 1]);
+        zz = complex_subf(&z, target);
         s->training_error += powerf(&zz);
 #endif
         if (++s->training_count >= V27TER_TRAINING_SEG_6_LEN)
@@ -728,8 +744,10 @@
         }
         break;
     case TRAINING_STAGE_PARKED:
+    default:
         /* We failed to train! */
         /* Park here until the carrier drops. */
+        target = &zero;
         break;
     }
     if (s->qam_report)
@@ -737,28 +755,92 @@
 #if defined(SPANDSP_USE_FIXED_POINTx)
         z1.re = z.re/(float) FP_FACTOR;
         z1.im = z.im/(float) FP_FACTOR;
-        zz.re = v27ter_constellation[s->constellation_state].re;
-        zz.im = v27ter_constellation[s->constellation_state].im;
-        s->qam_report(s->qam_user_data,
-                      &z1,
-                      &zz,
-                      s->constellation_state);
-#else
-        s->qam_report(s->qam_user_data,
-                      &z,
-                      &v27ter_constellation[s->constellation_state],
-                      s->constellation_state);
+        zz.re = target->re;
+        zz.im = target->im;
+        s->qam_report(s->qam_user_data, &z1, &zz, s->constellation_state);
+#else
+        s->qam_report(s->qam_user_data, &z, target, s->constellation_state);
 #endif
     }
 }
 /*- End of function --------------------------------------------------------*/
 
+static __inline__ int signal_detect(v27ter_rx_state_t *s, int16_t amp)
+{
+    int16_t diff;
+    int16_t x;
+    int32_t power;
+
+    /* There should be no DC in the signal, but sometimes there is.
+       We need to measure the power with the DC blocked, but not using
+       a slow to respond DC blocker. Use the most elementary HPF. */
+    x = amp >> 1;
+    /* There could be overflow here, but it isn't a problem in practice */
+    diff = x - s->last_sample;
+    s->last_sample = x;
+    power = power_meter_update(&(s->power), diff);
+#if defined(IAXMODEM_STUFF)
+    /* Quick power drop fudge */
+    diff = abs(diff);
+    if (10*diff < s->high_sample)
+    {
+        if (++s->low_samples > 120)
+        {
+            power_meter_init(&(s->power), 4);
+            s->high_sample = 0;
+            s->low_samples = 0;
+        }
+    }
+    else
+    { 
+        s->low_samples = 0;
+        if (diff > s->high_sample)
+            s->high_sample = diff;
+    }
+#endif
+    //span_log(&s->logging, SPAN_LOG_FLOW, "Power = %f\n", power_meter_current_dbm0(&(s->power)));
+    if (s->signal_present > 0)
+    {
+        /* Look for power below turn-off threshold to turn the carrier off */
+#if defined(IAXMODEM_STUFF)
+        if (s->carrier_drop_pending  ||  power < s->carrier_off_power)
+#else
+        if (power < s->carrier_off_power)
+#endif
+        {
+            if (--s->signal_present <= 0)
+            {
+                /* Count down a short delay, to ensure we push the last
+                   few bits through the filters before stopping. */
+                v27ter_rx_restart(s, s->bit_rate, FALSE);
+                report_status_change(s, SIG_STATUS_CARRIER_DOWN);
+                return 0;
+            }
+#if defined(IAXMODEM_STUFF)
+            /* Carrier has dropped, but the put_bit is pending the signal_present delay. */
+            s->carrier_drop_pending = TRUE;
+#endif
+        }
+    }
+    else
+    {
+        /* Look for power exceeding turn-on threshold to turn the carrier on */
+        if (power < s->carrier_on_power)
+            return 0;
+        s->signal_present = 1;
+#if defined(IAXMODEM_STUFF)
+        s->carrier_drop_pending = FALSE;
+#endif
+        report_status_change(s, SIG_STATUS_CARRIER_UP);
+    }
+    return power;
+}
+/*- End of function --------------------------------------------------------*/
+
 SPAN_DECLARE_NONSTD(int) v27ter_rx(v27ter_rx_state_t *s, const int16_t amp[], int len)
 {
     int i;
     int step;
-    int16_t x;
-    int16_t diff;
 #if defined(SPANDSP_USE_FIXED_POINT)
     complexi16_t z;
     complexi16_t zz;
@@ -780,68 +862,8 @@
             if (++s->rrc_filter_step >= V27TER_RX_4800_FILTER_STEPS)
                 s->rrc_filter_step = 0;
 
-            /* There should be no DC in the signal, but sometimes there is.
-               We need to measure the power with the DC blocked, but not using
-               a slow to respond DC blocker. Use the most elementary HPF. */
-            x = amp[i] >> 1;
-            /* There could be overflow here, but it isn't a problem in practice */
-            diff = x - s->last_sample;
-            power = power_meter_update(&(s->power), diff);
-#if defined(IAXMODEM_STUFF)
-            /* Quick power drop fudge */
-            diff = abs(diff);
-            if (10*diff < s->high_sample)
-            {
-                if (++s->low_samples > 120)
-                {
-                    power_meter_init(&(s->power), 4);
-                    s->high_sample = 0;
-                    s->low_samples = 0;
-                }
-            }
-            else
-            { 
-                s->low_samples = 0;
-                if (diff > s->high_sample)
-                   s->high_sample = diff;
-            }
-#endif
-            s->last_sample = x;
-            //span_log(&s->logging, SPAN_LOG_FLOW, "Power = %f\n", power_meter_current_dbm0(&(s->power)));
-            if (s->signal_present)
-            {
-                /* Look for power below turnoff threshold to turn the carrier off */
-#if defined(IAXMODEM_STUFF)
-                if (s->carrier_drop_pending  ||  power < s->carrier_off_power)
-#else
-                if (power < s->carrier_off_power)
-#endif
-                {
-                    if (--s->signal_present <= 0)
-                    {
-                        /* Count down a short delay, to ensure we push the last
-                           few bits through the filters before stopping. */
-                        v27ter_rx_restart(s, s->bit_rate, FALSE);
-                        report_status_change(s, SIG_STATUS_CARRIER_DOWN);
-                        continue;
-                    }
-#if defined(IAXMODEM_STUFF)
-                    /* Carrier has dropped, but the put_bit is pending the signal_present delay. */
-                    s->carrier_drop_pending = TRUE;
-#endif
-                }
-            }
-            else
-            {
-                /* Look for power exceeding turnon threshold to turn the carrier on */
-                if (power < s->carrier_on_power)
-                    continue;
-                s->signal_present = 1;
-#if defined(IAXMODEM_STUFF)
-                s->carrier_drop_pending = FALSE;
-#endif
-                report_status_change(s, SIG_STATUS_CARRIER_UP);
-            }
+            if ((power = signal_detect(s, amp[i])) == 0)
+                continue;
             /* Only spend effort processing this data if the modem is not
                parked, after training failure. */
             if (s->training_stage == TRAINING_STAGE_PARKED)
@@ -902,69 +924,8 @@
             if (++s->rrc_filter_step >= V27TER_RX_2400_FILTER_STEPS)
                 s->rrc_filter_step = 0;
 
-            /* There should be no DC in the signal, but sometimes there is.
-               We need to measure the power with the DC blocked, but not using
-               a slow to respond DC blocker. Use the most elementary HPF. */
-            x = amp[i] >> 1;
-            /* There could be overflow here, but it isn't a problem in practice */
-            diff = x - s->last_sample;
-            power = power_meter_update(&(s->power), diff);
-#if defined(IAXMODEM_STUFF)
-            /* Quick power drop fudge */
-            diff = abs(diff);
-            if (10*diff < s->high_sample)
-            {
-                if (++s->low_samples > 120)
-                {
-                    power_meter_init(&(s->power), 4);
-                    s->high_sample = 0;
-                    s->low_samples = 0;
-                }
-            }
-            else
-            { 
-                s->low_samples = 0;
-                if (diff > s->high_sample)
-                   s->high_sample = diff;
-            }
-#endif
-            s->last_sample = x;
-            //span_log(&s->logging, SPAN_LOG_FLOW, "Power = %f\n", power_meter_current_dbm0(&(s->power)));
-            if (s->signal_present)
-            {
-                /* Look for power below turnoff threshold to turn the carrier off */
-#if defined(IAXMODEM_STUFF)
-                if (s->carrier_drop_pending  ||  power < s->carrier_off_power)
-#else
-                if (power < s->carrier_off_power)
-#endif
-                {
-                    if (--s->signal_present <= 0)
-                    {
-                        /* Count down a short delay, to ensure we push the last
-                           few bits through the filters before stopping. */
-                        v27ter_rx_restart(s, s->bit_rate, FALSE);
-                        report_status_change(s, SIG_STATUS_CARRIER_DOWN);
-                        continue;
-                    }
-#if defined(IAXMODEM_STUFF)
-                    /* Carrier has dropped, but the put_bit is
-                       pending the signal_present delay. */
-                    s->carrier_drop_pending = TRUE;
-#endif
-                }
-            }
-            else
-            {
-                /* Look for power exceeding turnon threshold to turn the carrier on */
-                if (power < s->carrier_on_power)
-                    continue;
-                s->signal_present = 1;
-#if defined(IAXMODEM_STUFF)
-                s->carrier_drop_pending = FALSE;
-#endif
-                report_status_change(s, SIG_STATUS_CARRIER_UP);
-            }
+            if ((power = signal_detect(s, amp[i])) == 0)
+                continue;
             /* Only spend effort processing this data if the modem is not
                parked, after training failure. */
             if (s->training_stage == TRAINING_STAGE_PARKED)
@@ -1028,7 +989,7 @@
     /* We want to sustain the current state (i.e carrier on<->carrier off), and
        try to sustain the carrier phase. We should probably push the filters, as well */
     span_log(&s->logging, SPAN_LOG_FLOW, "Fill-in %d samples\n", len);
-    if (!s->signal_present)
+    if (s->signal_present <= 0)
         return 0;
     if (s->training_stage == TRAINING_STAGE_PARKED)
         return 0;

Modified: freeswitch/trunk/libs/spandsp/src/v27ter_tx.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v27ter_tx.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v27ter_tx.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v27ter_tx.c,v 1.75 2009/04/21 13:59:07 steveu Exp $
+ * $Id: v27ter_tx.c,v 1.76 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/v29rx.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v29rx.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v29rx.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v29rx.c,v 1.164 2009/04/21 13:59:07 steveu Exp $
+ * $Id: v29rx.c,v 1.166 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */
@@ -841,12 +841,82 @@
 }
 /*- End of function --------------------------------------------------------*/
 
+static __inline__ int signal_detect(v29_rx_state_t *s, int16_t amp)
+{
+    int16_t diff;
+    int16_t x;
+    int32_t power;
+
+    /* There should be no DC in the signal, but sometimes there is.
+       We need to measure the power with the DC blocked, but not using
+       a slow to respond DC blocker. Use the most elementary HPF. */
+    x = amp >> 1;
+    /* There could be overflow here, but it isn't a problem in practice */
+    diff = x - s->last_sample;
+    s->last_sample = x;
+    power = power_meter_update(&(s->power), diff);
+#if defined(IAXMODEM_STUFF)
+    /* Quick power drop fudge */
+    diff = abs(diff);
+    if (10*diff < s->high_sample)
+    {
+        if (++s->low_samples > 120)
+        {
+            power_meter_init(&(s->power), 4);
+            s->high_sample = 0;
+            s->low_samples = 0;
+        }
+    }
+    else
+    { 
+        s->low_samples = 0;
+        if (diff > s->high_sample)
+            s->high_sample = diff;
+    }
+#endif
+    if (s->signal_present > 0)
+    {
+        /* Look for power below turn-off threshold to turn the carrier off */
+#if defined(IAXMODEM_STUFF)
+        if (s->carrier_drop_pending  ||  power < s->carrier_off_power)
+#else
+        if (power < s->carrier_off_power)
+#endif
+        {
+            if (--s->signal_present <= 0)
+            {
+                /* Count down a short delay, to ensure we push the last
+                   few bits through the filters before stopping. */
+                v29_rx_restart(s, s->bit_rate, FALSE);
+                report_status_change(s, SIG_STATUS_CARRIER_DOWN);
+                return 0;
+            }
+#if defined(IAXMODEM_STUFF)
+            /* Carrier has dropped, but the put_bit is
+               pending the signal_present delay. */
+            s->carrier_drop_pending = TRUE;
+#endif
+        }
+    }
+    else
+    {
+        /* Look for power exceeding turn-on threshold to turn the carrier on */
+        if (power < s->carrier_on_power)
+            return 0;
+        s->signal_present = 1;
+#if defined(IAXMODEM_STUFF)
+        s->carrier_drop_pending = FALSE;
+#endif
+        report_status_change(s, SIG_STATUS_CARRIER_UP);
+    }
+    return power;
+}
+/*- End of function --------------------------------------------------------*/
+
 SPAN_DECLARE_NONSTD(int) v29_rx(v29_rx_state_t *s, const int16_t amp[], int len)
 {
     int i;
     int step;
-    int16_t x;
-    int16_t diff;
 #if defined(SPANDSP_USE_FIXED_POINT)
     complexi16_t z;
     complexi16_t zz;
@@ -866,68 +936,8 @@
         if (++s->rrc_filter_step >= V29_RX_FILTER_STEPS)
             s->rrc_filter_step = 0;
 
-        /* There should be no DC in the signal, but sometimes there is.
-           We need to measure the power with the DC blocked, but not using
-           a slow to respond DC blocker. Use the most elementary HPF. */
-        x = amp[i] >> 1;
-        /* There could be overflow here, but it isn't a problem in practice */
-        diff = x - s->last_sample;
-        power = power_meter_update(&(s->power), diff);
-#if defined(IAXMODEM_STUFF)
-        /* Quick power drop fudge */
-        diff = abs(diff);
-        if (10*diff < s->high_sample)
-        {
-            if (++s->low_samples > 120)
-            {
-                power_meter_init(&(s->power), 4);
-                s->high_sample = 0;
-                s->low_samples = 0;
-            }
-        }
-        else
-        { 
-            s->low_samples = 0;
-            if (diff > s->high_sample)
-               s->high_sample = diff;
-        }
-#endif
-        s->last_sample = x;
-        if (s->signal_present)
-        {
-            /* Look for power below turn-off threshold to turn the carrier off */
-#if defined(IAXMODEM_STUFF)
-            if (s->carrier_drop_pending  ||  power < s->carrier_off_power)
-#else
-            if (power < s->carrier_off_power)
-#endif
-            {
-                if (--s->signal_present <= 0)
-                {
-                    /* Count down a short delay, to ensure we push the last
-                       few bits through the filters before stopping. */
-                    v29_rx_restart(s, s->bit_rate, FALSE);
-                    report_status_change(s, SIG_STATUS_CARRIER_DOWN);
-                    continue;
-                }
-#if defined(IAXMODEM_STUFF)
-                /* Carrier has dropped, but the put_bit is
-                   pending the signal_present delay. */
-                s->carrier_drop_pending = TRUE;
-#endif
-            }
-        }
-        else
-        {
-            /* Look for power exceeding turn-on threshold to turn the carrier on */
-            if (power < s->carrier_on_power)
-                continue;
-            s->signal_present = 1;
-#if defined(IAXMODEM_STUFF)
-            s->carrier_drop_pending = FALSE;
-#endif
-            report_status_change(s, SIG_STATUS_CARRIER_UP);
-        }
+        if ((power = signal_detect(s, amp[i])) == 0)
+            continue;
         if (s->training_stage == TRAINING_STAGE_PARKED)
             continue;
         /* Only spend effort processing this data if the modem is not
@@ -1018,7 +1028,7 @@
     /* We want to sustain the current state (i.e carrier on<->carrier off), and
        try to sustain the carrier phase. We should probably push the filters, as well */
     span_log(&s->logging, SPAN_LOG_FLOW, "Fill-in %d samples\n", len);
-    if (!s->signal_present)
+    if (s->signal_present <= 0)
         return 0;
     if (s->training_stage == TRAINING_STAGE_PARKED)
         return 0;

Modified: freeswitch/trunk/libs/spandsp/src/v29tx.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v29tx.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v29tx.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v29tx.c,v 1.88 2009/04/21 13:59:07 steveu Exp $
+ * $Id: v29tx.c,v 1.89 2009/06/02 16:03:56 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/src/v8.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/v8.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/v8.c	Thu Jun 18 01:13:59 2009
@@ -609,7 +609,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) v8_tx(v8_state_t *s, int16_t *amp, int max_len)
+SPAN_DECLARE_NONSTD(int) v8_tx(v8_state_t *s, int16_t *amp, int max_len)
 {
     int len;
 
@@ -632,7 +632,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) v8_rx(v8_state_t *s, const int16_t *amp, int len)
+SPAN_DECLARE_NONSTD(int) v8_rx(v8_state_t *s, const int16_t *amp, int len)
 {
     int i;
     int residual_samples;

Modified: freeswitch/trunk/libs/spandsp/tests/Makefile.am
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/Makefile.am	(original)
+++ freeswitch/trunk/libs/spandsp/tests/Makefile.am	Thu Jun 18 01:13:59 2009
@@ -16,7 +16,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
-## $Id: Makefile.am,v 1.114 2009/04/26 08:25:37 steveu Exp $
+## $Id: Makefile.am,v 1.116 2009/05/30 15:23:13 steveu Exp $
 
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
@@ -172,7 +172,7 @@
 dc_restore_tests_LDADD = $(LIBDIR) -lspandsp
 
 dds_tests_SOURCES = dds_tests.c
-dds_tests_LDADD = $(LIBDIR) -lspandsp
+dds_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
 
 dtmf_rx_tests_SOURCES = dtmf_rx_tests.c
 dtmf_rx_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
@@ -196,7 +196,7 @@
 g1050_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
 
 g168_tests_SOURCES = g168_tests.c
-g168_tests_LDADD = $(LIBDIR) -lspandsp
+g168_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
 
 g711_tests_SOURCES = g711_tests.c
 g711_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
@@ -244,10 +244,10 @@
 playout_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
 
 plc_tests_SOURCES = plc_tests.c
-plc_tests_LDADD = $(LIBDIR) -lspandsp
+plc_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
 
 power_meter_tests_SOURCES = power_meter_tests.c
-power_meter_tests_LDADD = $(LIBDIR) -lspandsp
+power_meter_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
 
 queue_tests_SOURCES = queue_tests.c
 queue_tests_LDADD = $(LIBDIR) -lspandsp
@@ -268,7 +268,7 @@
 sig_tone_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp 
 
 super_tone_rx_tests_SOURCES = super_tone_rx_tests.c
-super_tone_rx_tests_LDADD = $(LIBDIR) -lspandsp
+super_tone_rx_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp
 
 super_tone_tx_tests_SOURCES = super_tone_tx_tests.c
 super_tone_tx_tests_LDADD = -L$(top_builddir)/spandsp-sim -lspandsp-sim $(LIBDIR) -lspandsp

Modified: freeswitch/trunk/libs/spandsp/tests/adsi_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/adsi_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/adsi_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: adsi_tests.c,v 1.56 2009/04/26 07:24:35 steveu Exp $
+ * $Id: adsi_tests.c,v 1.57 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \page adsi_tests_page ADSI tests
@@ -48,7 +48,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -87,7 +87,7 @@
 int current_standard = 0;
 int good_message_received;
 int log_audio = FALSE;
-AFfilehandle outhandle = NULL;
+SNDFILE *outhandle = NULL;
 int short_preamble = FALSE;
 
 static int adsi_create_message(adsi_tx_state_t *s, uint8_t *msg)
@@ -674,13 +674,12 @@
         }
         if (log_audio)
         {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      len);
+            outframes = sf_writef_short(outhandle,
+                                        amp,
+                                        len);
             if (outframes != len)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
         }
@@ -696,27 +695,27 @@
 {
     int j;
     int16_t amp[BLOCK_LEN];
-    AFfilehandle inhandle;
+    SNDFILE *inhandle;
     int frames;
 
     /* The remainder of the Mitel tape is the talk-off test */
     /* Here we use the Bellcore test tapes (much tougher), in six
-       wave files - 1 from each side of the original 3 cassette tapes */
+      files - 1 from each side of the original 3 cassette tapes */
     printf("Talk-off tests for %s\n", adsi_standard_to_str(standard));
     rx_adsi = adsi_rx_init(NULL, standard, put_adsi_msg, NULL);
     for (j = 0;  bellcore_files[j][0];  j++)
     {
         printf("Testing with %s\n", bellcore_files[j]);
-        if ((inhandle = afOpenFile_telephony_read(bellcore_files[j], 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(bellcore_files[j], 1)) == NULL)
         {
             printf("    Cannot open speech file '%s'\n", bellcore_files[j]);
             exit(2);
         }
-        while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, BLOCK_LEN)))
+        while ((frames = sf_readf_short(inhandle, amp, BLOCK_LEN)))
         {
             adsi_rx(rx_adsi, amp, frames);
         }
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
             printf("    Cannot close speech file '%s'\n", bellcore_files[j]);
             exit(2);
@@ -735,7 +734,7 @@
 int main(int argc, char *argv[])
 {
     int16_t amp[BLOCK_LEN];
-    AFfilehandle inhandle;
+    SNDFILE *inhandle;
     int len;
     int test_standard;
     int first_standard;
@@ -793,16 +792,16 @@
             break;
         }
     }
-    outhandle = AF_NULL_FILEHANDLE;
+    outhandle = NULL;
     
     tdd_character_set_tests();
 
     if (decode_test_file)
     {
-        /* We will decode the audio from a wave file. */
-        if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        /* We will decode the audio from a file. */
+        if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", decode_test_file);
             exit(2);
         }
         if (test_standard < 0)
@@ -817,17 +816,14 @@
 #endif
         for (;;)
         {
-            len = afReadFrames(inhandle,
-                               AF_DEFAULT_TRACK,
-                               amp,
-                               BLOCK_LEN);
+            len = sf_readf_short(inhandle, amp, BLOCK_LEN);
             if (len == 0)
                 break;
             adsi_rx(rx_adsi, amp, len);
         }
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", decode_test_file);
             exit(2);
         }
         adsi_rx_free(rx_adsi);
@@ -836,9 +832,9 @@
     {
         if (log_audio)
         {
-            if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+            if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
             {
-                fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME);
+                fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME);
                 exit(2);
             }
         }
@@ -863,9 +859,9 @@
         }
         if (log_audio)
         {
-            if (afCloseFile(outhandle) != 0)
+            if (sf_close(outhandle) != 0)
             {
-                fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+                fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
                 exit(2);
             }
         }

Modified: freeswitch/trunk/libs/spandsp/tests/async_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/async_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/async_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: async_tests.c,v 1.18 2008/11/30 10:17:31 steveu Exp $
+ * $Id: async_tests.c,v 1.19 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \file */
@@ -38,7 +38,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES

Modified: freeswitch/trunk/libs/spandsp/tests/at_interpreter_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/at_interpreter_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/at_interpreter_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: at_interpreter_tests.c,v 1.22 2009/04/24 22:35:25 steveu Exp $
+ * $Id: at_interpreter_tests.c,v 1.23 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \file */
@@ -42,7 +42,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
 #include "spandsp.h"

Modified: freeswitch/trunk/libs/spandsp/tests/bell_mf_rx_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/bell_mf_rx_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/bell_mf_rx_tests.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: bell_mf_rx_tests.c,v 1.15 2009/04/11 18:11:19 steveu Exp $
+ * $Id: bell_mf_rx_tests.c,v 1.16 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \file */
@@ -48,7 +48,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES

Modified: freeswitch/trunk/libs/spandsp/tests/bell_mf_tx_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/bell_mf_tx_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/bell_mf_tx_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: bell_mf_tx_tests.c,v 1.14 2008/11/30 10:17:31 steveu Exp $
+ * $Id: bell_mf_tx_tests.c,v 1.15 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \file */
@@ -44,7 +44,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -60,55 +60,40 @@
     bell_mf_tx_state_t *gen;
     int16_t amp[16384];
     int len;
-    AFfilehandle outhandle;
+    SNDFILE *outhandle;
     int outframes;
     int add_digits;
 
-    if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
 
     gen = bell_mf_tx_init(NULL);
     len = bell_mf_tx(gen, amp, 16384);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "123", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 16384);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "456", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "789", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "*#", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     add_digits = 1;
     do
     {
@@ -116,10 +101,7 @@
         printf("Generated %d samples\n", len);
         if (len > 0)
         {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      len);
+            outframes = sf_writef_short(outhandle, amp, len);
         }
         if (add_digits)
         {
@@ -135,50 +117,32 @@
     bell_mf_tx_init(gen);
     len = bell_mf_tx(gen, amp, 16384);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "123", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 16384);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "456", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "789", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "0*#", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (bell_mf_tx_put(gen, "ABC", -1))
         printf("Ooops\n");
     len = bell_mf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              amp,
-                              len);
+    outframes = sf_writef_short(outhandle, amp, len);
     add_digits = 1;
     do
     {
@@ -186,10 +150,7 @@
         printf("Generated %d samples\n", len);
         if (len > 0)
         {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      len);
+            outframes = sf_writef_short(outhandle, amp, len);
         }
         if (add_digits)
         {
@@ -202,9 +163,9 @@
     }
     while (len > 0);
 
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
         exit (2);
     }
 

Modified: freeswitch/trunk/libs/spandsp/tests/bert_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/bert_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/bert_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: bert_tests.c,v 1.27 2009/04/14 16:04:54 steveu Exp $
+ * $Id: bert_tests.c,v 1.28 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \file */
@@ -40,7 +40,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES

Modified: freeswitch/trunk/libs/spandsp/tests/dds_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/dds_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/dds_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: dds_tests.c,v 1.24 2008/05/13 13:17:25 steveu Exp $
+ * $Id: dds_tests.c,v 1.26 2009/06/02 14:55:36 steveu Exp $
  */
 
 /*! \file */
@@ -43,9 +43,10 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include "spandsp.h"
+#include "spandsp-sim.h"
 
 #define OUTPUT_FILE_NAME            "dds.wav"
 #define OUTPUT_FILE_NAME_COMPLEX    "complex_dds.wav"
@@ -60,8 +61,7 @@
     int outframes;
     complexf_t camp;
     int16_t buf[2*SAMPLES_PER_CHUNK];
-    AFfilehandle outhandle;
-    AFfilesetup filesetup;
+    SNDFILE *outhandle;
     power_meter_t meter;
     power_meter_t meter_i;
     power_meter_t meter_q;
@@ -70,19 +70,9 @@
     power_meter_init(&meter, 10);
 
     printf("Non-complex DDS tests.\n");
-    if ((filesetup = afNewFileSetup()) == AF_NULL_FILESETUP)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
-
-    if ((outhandle = afOpenFile(OUTPUT_FILE_NAME, "w", filesetup)) == AF_NULL_FILEHANDLE)
-    {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
 
@@ -96,13 +86,10 @@
         buf[i] = alaw_to_linear(linear_to_alaw((dds(&phase, phase_inc)*scale) >> 15));
         power_meter_update(&meter, buf[i]);
     }
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              buf,
-                              SAMPLES_PER_CHUNK);
+    outframes = sf_writef_short(outhandle, buf, SAMPLES_PER_CHUNK);
     if (outframes != SAMPLES_PER_CHUNK)
     {
-        fprintf(stderr, "    Error writing wave file\n");
+        fprintf(stderr, "    Error writing audio file\n");
         exit(2);
     }
     printf("Level is %fdBOv/%fdBm0\n", power_meter_current_dbov(&meter), power_meter_current_dbm0(&meter));
@@ -119,13 +106,10 @@
         buf[i] = alaw_to_linear(linear_to_alaw(dds(&phase, phase_inc)));
         power_meter_update(&meter, buf[i]);
     }
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              buf,
-                              SAMPLES_PER_CHUNK);
+    outframes = sf_writef_short(outhandle, buf, SAMPLES_PER_CHUNK);
     if (outframes != SAMPLES_PER_CHUNK)
     {
-        fprintf(stderr, "    Error writing wave file\n");
+        fprintf(stderr, "    Error writing audio file\n");
         exit(2);
     }
     printf("Level is %fdBOv/%fdBm0\n", power_meter_current_dbov(&meter), power_meter_current_dbm0(&meter));
@@ -144,13 +128,10 @@
         buf[i] = alaw_to_linear(linear_to_alaw((dds(&phase, phase_inc)*scale) >> 15));
         power_meter_update(&meter, buf[i]);
     }
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              buf,
-                              SAMPLES_PER_CHUNK);
+    outframes = sf_writef_short(outhandle, buf, SAMPLES_PER_CHUNK);
     if (outframes != SAMPLES_PER_CHUNK)
     {
-        fprintf(stderr, "    Error writing wave file\n");
+        fprintf(stderr, "    Error writing audio file\n");
         exit(2);
     }
     printf("Level is %fdBOv/%fdBm0\n", power_meter_current_dbov(&meter), power_meter_current_dbm0(&meter));
@@ -167,13 +148,10 @@
         buf[i] = alaw_to_linear(linear_to_alaw(dds(&phase, phase_inc)));
         power_meter_update(&meter, buf[i]);
     }
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              buf,
-                              SAMPLES_PER_CHUNK);
+    outframes = sf_writef_short(outhandle, buf, SAMPLES_PER_CHUNK);
     if (outframes != SAMPLES_PER_CHUNK)
     {
-        fprintf(stderr, "    Error writing wave file\n");
+        fprintf(stderr, "    Error writing audio file\n");
         exit(2);
     }
     printf("Level is %fdBOv/%fdBm0\n", power_meter_current_dbov(&meter), power_meter_current_dbm0(&meter));
@@ -183,27 +161,16 @@
         exit(2);
     }
 
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
-    afFreeFileSetup(filesetup);
 
     printf("Complex DDS tests,\n");
-    if ((filesetup = afNewFileSetup()) == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 2);
-
-    if ((outhandle = afOpenFile(OUTPUT_FILE_NAME_COMPLEX, "w", filesetup)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME_COMPLEX, 2)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME_COMPLEX);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME_COMPLEX);
         exit(2);
     }
 
@@ -220,13 +187,10 @@
         power_meter_update(&meter_i, buf[2*i]);
         power_meter_update(&meter_q, buf[2*i]);
     }
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              buf,
-                              SAMPLES_PER_CHUNK);
+    outframes = sf_writef_short(outhandle, buf, SAMPLES_PER_CHUNK);
     if (outframes != SAMPLES_PER_CHUNK)
     {
-        fprintf(stderr, "    Error writing wave file\n");
+        fprintf(stderr, "    Error writing audio file\n");
         exit(2);
     }
     printf("Level is %fdBOv/%fdBm0, %fdBOv/%fdBm0\n",
@@ -242,12 +206,11 @@
         exit(2);
     }
 
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME_COMPLEX);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME_COMPLEX);
         exit(2);
     }
-    afFreeFileSetup(filesetup);
 
     printf("Tests passed.\n");
     return  0;

Modified: freeswitch/trunk/libs/spandsp/tests/dtmf_rx_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/dtmf_rx_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/dtmf_rx_tests.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: dtmf_rx_tests.c,v 1.44 2008/11/30 10:17:31 steveu Exp $
+ * $Id: dtmf_rx_tests.c,v 1.45 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*
@@ -94,7 +94,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -623,7 +623,7 @@
     int hits;
     int hit_types[256];
     char buf[128 + 1];
-    AFfilehandle inhandle;
+    SNDFILE *inhandle;
     int frames;
     dtmf_rx_state_t *dtmf_state;
 
@@ -633,7 +633,7 @@
 
     /* The remainder of the Mitel tape is the talk-off test */
     /* Here we use the Bellcore test tapes (much tougher), in six
-       wave files - 1 from each side of the original 3 cassette tapes */
+      files - 1 from each side of the original 3 cassette tapes */
     /* Bellcore say you should get no more than 470 false detections with
        a good receiver. Dialogic claim 20. Of course, we can do better than
        that, eh? */
@@ -641,13 +641,13 @@
     memset(hit_types, '\0', sizeof(hit_types));
     for (j = 0;  bellcore_files[j][0];  j++)
     {
-        if ((inhandle = afOpenFile_telephony_read(bellcore_files[j], 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(bellcore_files[j], 1)) == NULL)
         {
             printf("    Cannot open speech file '%s'\n", bellcore_files[j]);
             exit(2);
         }
         hits = 0;
-        while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, SAMPLE_RATE)))
+        while ((frames = sf_readf_short(inhandle, amp, SAMPLE_RATE)))
         {
             dtmf_rx(dtmf_state, amp, frames);
             len = dtmf_rx_get(dtmf_state, buf, 128);
@@ -658,7 +658,7 @@
                 hits += len;
             }
         }
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
             printf("    Cannot close speech file '%s'\n", bellcore_files[j]);
             exit(2);
@@ -804,7 +804,7 @@
 static void decode_test(const char *test_file)
 {
     int16_t amp[SAMPLES_PER_CHUNK];
-    AFfilehandle inhandle;
+    SNDFILE *inhandle;
     dtmf_rx_state_t *dtmf_state;
     char buf[128 + 1];
     int actual;
@@ -815,16 +815,16 @@
     if (use_dialtone_filter)
         dtmf_rx_parms(dtmf_state, TRUE, -1, -1, -99);
 
-    /* We will decode the audio from a wave file. */
+    /* We will decode the audio from a file. */
     
-    if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+    if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", decode_test_file);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", decode_test_file);
         exit(2);
     }
     
     total = 0;
-    while ((samples = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, SAMPLES_PER_CHUNK)) > 0)
+    while ((samples = sf_readf_short(inhandle, amp, SAMPLES_PER_CHUNK)) > 0)
     {
         codec_munge(munge, amp, samples);
         dtmf_rx(dtmf_state, amp, samples);

Modified: freeswitch/trunk/libs/spandsp/tests/dtmf_tx_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/dtmf_tx_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/dtmf_tx_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: dtmf_tx_tests.c,v 1.22 2008/11/30 10:17:31 steveu Exp $
+ * $Id: dtmf_tx_tests.c,v 1.23 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \file */
@@ -44,7 +44,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -60,40 +60,52 @@
     dtmf_tx_state_t *gen;
     int16_t amp[16384];
     int len;
-    AFfilehandle outhandle;
+    SNDFILE *outhandle;
     int outframes;
     int add_digits;
 
-    if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
 
     gen = dtmf_tx_init(NULL);
     len = dtmf_tx(gen, amp, 16384);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "123", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 16384);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "456", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "789", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "*#", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     add_digits = 1;
     do
     {
@@ -101,7 +113,7 @@
         printf("Generated %d samples\n", len);
         if (len > 0)
         {
-            outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+            outframes = sf_writef_short(outhandle, amp, len);
         }
         if (add_digits)
         {
@@ -117,52 +129,73 @@
     dtmf_tx_init(gen);
     len = dtmf_tx(gen, amp, 16384);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "123", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 16384);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "456", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "789", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "0*#", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
     if (dtmf_tx_put(gen, "ABCD", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     len = dtmf_tx(gen, amp, 160);
     printf("Generated %d samples\n", len);
-    outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+    outframes = sf_writef_short(outhandle, amp, len);
 
     /* Try modifying the level and length of the digits */
     printf("Try different levels and timing\n");
     dtmf_tx_set_level(gen, -20, 5);
     dtmf_tx_set_timing(gen, 100, 200);
     if (dtmf_tx_put(gen, "123", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
     do
     {
         len = dtmf_tx(gen, amp, 160);
         printf("Generated %d samples\n", len);
         if (len > 0)
-            outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+            outframes = sf_writef_short(outhandle, amp, len);
     }
     while (len > 0);
     printf("Restore normal levels and timing\n");
     dtmf_tx_set_level(gen, -10, 0);
     dtmf_tx_set_timing(gen, 50, 55);
     if (dtmf_tx_put(gen, "A", -1))
+    {
         printf("Ooops\n");
+        exit(2);
+    }
 
     add_digits = TRUE;
     do
@@ -171,7 +204,7 @@
         printf("Generated %d samples\n", len);
         if (len > 0)
         {
-            outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, len);
+            outframes = sf_writef_short(outhandle, amp, len);
         }
         if (add_digits)
         {
@@ -184,10 +217,10 @@
     }
     while (len > 0);
 
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
-        exit (2);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
+        exit(2);
     }
 
     return  0;

Modified: freeswitch/trunk/libs/spandsp/tests/echo_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/echo_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/echo_tests.c	Thu Jun 18 01:13:59 2009
@@ -25,7 +25,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: echo_tests.c,v 1.38 2009/02/10 13:06:47 steveu Exp $
+ * $Id: echo_tests.c,v 1.39 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \page echo_can_tests_page Line echo cancellation for voice tests
@@ -54,7 +54,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #define GEN_CONST
 #include 
@@ -107,7 +107,7 @@
     int max;
     int cur;
     float gain;
-    AFfilehandle handle;
+    SNDFILE *handle;
     int16_t signal[SAMPLE_RATE];
 } signal_source_t;
 
@@ -139,7 +139,7 @@
 awgn_state_t local_noise_source;
 awgn_state_t far_noise_source;
 
-AFfilehandle residue_handle;
+SNDFILE *residue_handle;
 int16_t residue_sound[SAMPLE_RATE];
 int residue_cur = 0;
 
@@ -157,7 +157,7 @@
 level_measurement_device_t *sgen_power_meter;
 
 #define RESULT_CHANNELS 7
-AFfilehandle result_handle;
+SNDFILE *result_handle;
 int16_t result_sound[SAMPLE_RATE*RESULT_CHANNELS];
 int result_cur;
 
@@ -188,10 +188,7 @@
     residue_sound[residue_cur++] = amp;
     if (residue_cur >= SAMPLE_RATE)
     {
-        outframes = afWriteFrames(residue_handle,
-                                  AF_DEFAULT_TRACK,
-                                  residue_sound,
-                                  residue_cur);
+        outframes = sf_writef_short(residue_handle, residue_sound, residue_cur);
         if (outframes != residue_cur)
         {
             fprintf(stderr, "    Error writing residue sound\n");
@@ -204,9 +201,9 @@
 
 static void signal_load(signal_source_t *sig, const char *name)
 {
-    sig->handle = afOpenFile_telephony_read(name, 1);
+    sig->handle = sf_open_telephony_read(name, 1);
     sig->name = name;
-    sig->max = afReadFrames(sig->handle, AF_DEFAULT_TRACK, sig->signal, SAMPLE_RATE);
+    sig->max = sf_readf_short(sig->handle, sig->signal, SAMPLE_RATE);
     if (sig->max < 0)
     {
         fprintf(stderr, "    Error reading sound file '%s'\n", sig->name);
@@ -217,7 +214,7 @@
 
 static void signal_free(signal_source_t *sig)
 {
-    if (afCloseFile(sig->handle) != 0)
+    if (sf_close(sig->handle) != 0)
     {
         fprintf(stderr, "    Cannot close sound file '%s'\n", sig->name);
         exit(2);
@@ -597,10 +594,7 @@
         result_sound[result_cur++] = 0; // TODO: insert the EC's internal status here
         if (result_cur >= RESULT_CHANNELS*SAMPLE_RATE)
         {
-            outframes = afWriteFrames(result_handle,
-                                      AF_DEFAULT_TRACK,
-                                      result_sound,
-                                      result_cur/RESULT_CHANNELS);
+            outframes = sf_writef_short(result_handle, result_sound, result_cur/RESULT_CHANNELS);
             if (outframes != result_cur/RESULT_CHANNELS)
             {
                 fprintf(stderr, "    Error writing result sound\n");
@@ -615,10 +609,7 @@
 #endif
     if (result_cur >= 0)
     {
-        outframes = afWriteFrames(result_handle,
-                                  AF_DEFAULT_TRACK,
-                                  result_sound,
-                                  result_cur/RESULT_CHANNELS);
+        outframes = sf_writef_short(result_handle, result_sound, result_cur/RESULT_CHANNELS);
         if (outframes != result_cur/RESULT_CHANNELS)
         {
             fprintf(stderr, "    Error writing result sound\n");
@@ -678,7 +669,7 @@
             /* Inject a burst of far sound */
             if (far_cur >= far_max)
             {
-                far_max = afReadFrames(farhandle, AF_DEFAULT_TRACK, far_sound, SAMPLE_RATE);
+                far_max = sf_readf_short(farhandle, far_sound, SAMPLE_RATE);
                 if (far_max < 0)
                 {
                     fprintf(stderr, "    Error reading far sound\n");
@@ -734,10 +725,7 @@
         put_residue(clean - far_tx);
         if (result_cur >= RESULT_CHANNELS*SAMPLE_RATE)
         {
-            outframes = afWriteFrames(result_handle,
-                                      AF_DEFAULT_TRACK,
-                                      result_sound,
-                                      result_cur/RESULT_CHANNELS);
+            outframes = sf_writef_short(result_handle, result_sound, result_cur/RESULT_CHANNELS);
             if (outframes != result_cur/RESULT_CHANNELS)
             {
                 fprintf(stderr, "    Error writing result sound\n");
@@ -748,10 +736,7 @@
     }
     if (result_cur > 0)
     {
-        outframes = afWriteFrames(result_handle,
-                                  AF_DEFAULT_TRACK,
-                                  result_sound,
-                                  result_cur/RESULT_CHANNELS);
+        outframes = sf_writef_short(result_handle, result_sound, result_cur/RESULT_CHANNELS);
         if (outframes != result_cur/RESULT_CHANNELS)
         {
             fprintf(stderr, "    Error writing result sound\n");
@@ -1494,10 +1479,10 @@
 static void simulate_ec(char *argv[], int two_channel_file, int mode)
 {
     echo_can_state_t *ctx;
-    AFfilehandle txfile;
-    AFfilehandle rxfile;
-    AFfilehandle rxtxfile;
-    AFfilehandle ecfile;
+    SNDFILE *txfile;
+    SNDFILE *rxfile;
+    SNDFILE *rxtxfile;
+    SNDFILE *ecfile;
     int ntx;
     int nrx;
     int nec;
@@ -1515,14 +1500,14 @@
     ecfile = NULL;
     if (two_channel_file)
     {
-        txfile = afOpenFile_telephony_read(argv[0], 1);
-        rxfile = afOpenFile_telephony_read(argv[1], 1);      
-        ecfile = afOpenFile_telephony_write(argv[2], 1);
+        txfile = sf_open_telephony_read(argv[0], 1);
+        rxfile = sf_open_telephony_read(argv[1], 1);      
+        ecfile = sf_open_telephony_write(argv[2], 1);
     }
     else
     {
-        rxtxfile = afOpenFile_telephony_read(argv[0], 2);
-        ecfile = afOpenFile_telephony_write(argv[1], 1);
+        rxtxfile = sf_open_telephony_read(argv[0], 2);
+        ecfile = sf_open_telephony_write(argv[1], 1);
     }
 
     ctx = echo_can_init(TEST_EC_TAPS, 0);
@@ -1532,7 +1517,7 @@
     {
         if (two_channel_file)
         {
-            if ((ntx = afReadFrames(rxtxfile, AF_DEFAULT_TRACK, buf, 1)) < 0)
+            if ((ntx = sf_readf_short(rxtxfile, buf, 1)) < 0)
             {
                 fprintf(stderr, "    Error reading tx sound file\n");
                 exit(2);
@@ -1543,12 +1528,12 @@
         }
         else
         {
-            if ((ntx = afReadFrames(txfile, AF_DEFAULT_TRACK, &rin, 1)) < 0)
+            if ((ntx = sf_readf_short(txfile, &rin, 1)) < 0)
             {
                 fprintf(stderr, "    Error reading tx sound file\n");
                 exit(2);
             }
-            if ((nrx = afReadFrames(rxfile, AF_DEFAULT_TRACK, &sin, 1)) < 0)
+            if ((nrx = sf_readf_short(rxfile, &sin, 1)) < 0)
             {           
                 fprintf(stderr, "    Error reading rx sound file\n");
                 exit(2);
@@ -1557,7 +1542,7 @@
         rout = echo_can_hpf_tx(ctx, rin);
         sout = echo_can_update(ctx, rout, sin);
 
-        if ((nec = afWriteFrames(ecfile, AF_DEFAULT_TRACK, &sout, 1)) != 1)
+        if ((nec = sf_writef_short(ecfile, &sout, 1)) != 1)
         {
             fprintf(stderr, "    Error writing ec sound file\n");
             exit(2);
@@ -1576,14 +1561,14 @@
 
     if (two_channel_file)
     {
-        afCloseFile(rxtxfile);
+        sf_close(rxtxfile);
     }
     else
     {
-        afCloseFile(txfile);
-        afCloseFile(rxfile);
+        sf_close(txfile);
+        sf_close(rxfile);
     }
-    afCloseFile(ecfile);
+    sf_close(ecfile);
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -1666,8 +1651,8 @@
 #endif
     if (simulate)
     {
-        /* Process a pair of transmitted and received wave files, and produce
-           an echo cancelled wave file. */
+        /* Process a pair of transmitted and received audio files, and produce
+           an echo cancelled audio file. */
         if (argc < ((two_channel_file)  ?  2  :  3))
         {
             printf("not enough arguments for a simulation\n");
@@ -1692,7 +1677,7 @@
         signal_load(&local_css, "sound_c1_8k.wav");
         signal_load(&far_css, "sound_c3_8k.wav");
 
-        if ((residue_handle = afOpenFile_telephony_write(RESIDUE_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((residue_handle = sf_open_telephony_write(RESIDUE_FILE_NAME, 1)) == NULL)
         {
             fprintf(stderr, "    Failed to open '%s'\n", RESIDUE_FILE_NAME);
             exit(2);
@@ -1704,7 +1689,7 @@
         else
         {
             time(&now);
-            if ((result_handle = afOpenFile_telephony_write("echo_tests_result.wav", RESULT_CHANNELS)) == AF_NULL_FILEHANDLE)
+            if ((result_handle = sf_open_telephony_write("echo_tests_result.wav", RESULT_CHANNELS)) == NULL)
             {
                 fprintf(stderr, "    Failed to open result file\n");
                 exit(2);
@@ -1720,7 +1705,7 @@
                 }
                 match_test_name(argv[i]);
             }
-            if (afCloseFile(result_handle) != 0)
+            if (sf_close(result_handle) != 0)
             {
                 fprintf(stderr, "    Cannot close speech file '%s'\n", "result_sound.wav");
                 exit(2);
@@ -1729,7 +1714,7 @@
         }
         signal_free(&local_css);
         signal_free(&far_css);
-        if (afCloseFile(residue_handle) != 0)
+        if (sf_close(residue_handle) != 0)
         {
             fprintf(stderr, "    Cannot close speech file '%s'\n", RESIDUE_FILE_NAME);
             exit(2);

Modified: freeswitch/trunk/libs/spandsp/tests/fax_decode.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/fax_decode.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/fax_decode.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fax_decode.c,v 1.55 2009/04/29 12:37:45 steveu Exp $
+ * $Id: fax_decode.c,v 1.56 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \page fax_decode_page FAX decoder
@@ -41,7 +41,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -446,10 +446,10 @@
     v29_rx_state_t *v29;
     v27ter_rx_state_t *v27ter;
     int16_t amp[SAMPLES_PER_CHUNK];
-    AFfilehandle inhandle;
+    SNDFILE *inhandle;
+    SF_INFO info;
     int len;
     const char *filename;
-    float x;
     logging_state_t *logging;
 
     filename = "fax_samp.wav";
@@ -457,26 +457,23 @@
     if (argc > 1)
         filename = argv[1];
 
-    if ((inhandle = afOpenFile(filename, "r", NULL)) == AF_NULL_FILEHANDLE)
+    memset(&info, 0, sizeof(info));
+    if ((inhandle = sf_open(filename, SFM_READ, &info)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", filename);
+        fprintf(stderr, "    Cannot open audio file '%s' for reading\n", filename);
         exit(2);
     }
-    if ((x = afGetFrameSize(inhandle, AF_DEFAULT_TRACK, 1)) != 2.0)
+    if (info.samplerate != SAMPLE_RATE)
     {
-        printf("    Unexpected frame size in speech file '%s' (%f)\n", filename, x);
+        printf("    Unexpected sample rate in audio file '%s'\n", filename);
         exit(2);
     }
-    if ((x = afGetRate(inhandle, AF_DEFAULT_TRACK)) != (float) SAMPLE_RATE)
+    if (info.channels != 1)
     {
-        printf("    Unexpected sample rate in speech file '%s' (%f)\n", filename, x);
-        exit(2);
-    }
-    if ((x = afGetChannels(inhandle, AF_DEFAULT_TRACK)) != 1.0)
-    {
-        printf("    Unexpected number of channels in speech file '%s' (%f)\n", filename, x);
+        printf("    Unexpected number of channels in audio file '%s'\n", filename);
         exit(2);
     }
+
     memset(&t30_dummy, 0, sizeof(t30_dummy));
     span_log_init(&t30_dummy.logging, SPAN_LOG_FLOW, NULL);
     span_log_set_protocol(&t30_dummy.logging, "T.30");
@@ -517,7 +514,7 @@
         
     for (;;)
     {
-        len = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, SAMPLES_PER_CHUNK);
+        len = sf_readf_short(inhandle, amp, SAMPLES_PER_CHUNK);
         if (len < SAMPLES_PER_CHUNK)
             break;
         fsk_rx(fsk, amp, len);
@@ -527,9 +524,9 @@
     }
     t4_rx_release(&t4_state);
 
-    if (afCloseFile(inhandle) != 0)
+    if (sf_close(inhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", filename);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", filename);
         exit(2);
     }
     return  0;

Modified: freeswitch/trunk/libs/spandsp/tests/fax_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/fax_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/fax_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fax_tests.c,v 1.101 2009/02/20 12:34:20 steveu Exp $
+ * $Id: fax_tests.c,v 1.102 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \page fax_tests_page FAX tests
@@ -39,7 +39,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -179,8 +179,8 @@
 
 int main(int argc, char *argv[])
 {
-    AFfilehandle wave_handle;
-    AFfilehandle input_wave_handle;
+    SNDFILE *wave_handle;
+    SNDFILE *input_wave_handle;
     int i;
     int j;
     int k;
@@ -282,22 +282,22 @@
         }
     }
 
-    input_wave_handle = AF_NULL_FILEHANDLE;
+    input_wave_handle = NULL;
     if (input_audio_file_name)
     {
-        if ((input_wave_handle = afOpenFile_telephony_read(input_audio_file_name, 1)) == AF_NULL_FILEHANDLE)
+        if ((input_wave_handle = sf_open_telephony_read(input_audio_file_name, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", input_audio_file_name);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", input_audio_file_name);
             exit(2);
         }
     }
 
-    wave_handle = AF_NULL_FILEHANDLE;
+    wave_handle = NULL;
     if (log_audio)
     {
-        if ((wave_handle = afOpenFile_telephony_write(OUTPUT_FILE_NAME_WAVE, 2)) == AF_NULL_FILEHANDLE)
+        if ((wave_handle = sf_open_telephony_write(OUTPUT_FILE_NAME_WAVE, 2)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
             exit(2);
         }
     }
@@ -427,7 +427,7 @@
 
             if ((j & 1) == 0  &&  input_audio_file_name)
             {
-                mc->len = afReadFrames(input_wave_handle, AF_DEFAULT_TRACK, mc->amp, SAMPLES_PER_CHUNK);
+                mc->len = sf_readf_short(input_wave_handle, mc->amp, SAMPLES_PER_CHUNK);
                 if (mc->len == 0)
                     break;
             }
@@ -492,7 +492,7 @@
 
         if (log_audio)
         {
-            outframes = afWriteFrames(wave_handle, AF_DEFAULT_TRACK, out_amp, SAMPLES_PER_CHUNK);
+            outframes = sf_writef_short(wave_handle, out_amp, SAMPLES_PER_CHUNK);
             if (outframes != SAMPLES_PER_CHUNK)
                 break;
         }
@@ -508,17 +508,17 @@
     }
     if (log_audio)
     {
-        if (afCloseFile(wave_handle))
+        if (sf_close(wave_handle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
             exit(2);
         }
     }
     if (input_audio_file_name)
     {
-        if (afCloseFile(input_wave_handle))
+        if (sf_close(input_wave_handle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", input_audio_file_name);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", input_audio_file_name);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/fax_utils.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/fax_utils.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/fax_utils.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fax_utils.c,v 1.2 2009/04/25 14:17:47 steveu Exp $
+ * $Id: fax_utils.c,v 1.3 2009/05/16 03:34:45 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -93,7 +93,7 @@
     t30_get_transfer_statistics(s, &t);
     printf("%s: bit rate %d\n", tag, t.bit_rate);
     printf("%s: ECM %s\n", tag, (t.error_correcting_mode)  ?  "on"  :  "off");
-    printf("%s: pages tx %d, pages rx %d\n", tag, t.pages_tx, t.pages_rx);
+    printf("%s: tx pages %d, rx pages %d\n", tag, t.pages_tx, t.pages_rx);
     printf("%s: pages in the file %d\n", tag, t.pages_in_file);
     printf("%s: image size %d x %d\n", tag, t.width, t.length);
     printf("%s: image resolution %d x %d\n", tag, t.x_resolution, t.y_resolution);

Modified: freeswitch/trunk/libs/spandsp/tests/fsk_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/fsk_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/fsk_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fsk_tests.c,v 1.56 2009/04/14 16:04:54 steveu Exp $
+ * $Id: fsk_tests.c,v 1.57 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \page fsk_tests_page FSK modem tests
@@ -35,7 +35,7 @@
    the basic performance of the receive modem. It is also the only test mode
    provided for evaluating the transmit modem.
 
- - An FSK receive modem is used to decode FSK audio, stored in a wave file.
+ - An FSK receive modem is used to decode FSK audio, stored in a file.
    This is good way to evaluate performance with audio recorded from other
    models of modem, and with real world problematic telephone lines.
 
@@ -51,7 +51,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -178,8 +178,8 @@
     int16_t caller_model_amp[BLOCK_LEN];
     int16_t answerer_model_amp[BLOCK_LEN];
     int16_t out_amp[2*BLOCK_LEN];
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int outframes;    
     int i;
     int j;
@@ -255,13 +255,13 @@
     if (modem_under_test_2 >= 0)
         printf("Modem channel 2 is '%s'\n", preset_fsk_specs[modem_under_test_2].name);
 
-    outhandle = AF_NULL_FILEHANDLE;
+    outhandle = NULL;
 
     if (log_audio)
     {
-        if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 2)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 2)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME);
             exit(2);
         }
     }
@@ -278,9 +278,9 @@
 
     if (decode_test_file)
     {
-        if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", decode_test_file);
             exit(2);
         }
         caller_rx = fsk_rx_init(NULL, &preset_fsk_specs[modem_under_test_1], TRUE, put_bit, NULL);
@@ -289,10 +289,7 @@
 
         for (;;)
         {
-            samples = afReadFrames(inhandle,
-                                   AF_DEFAULT_TRACK,
-                                   caller_model_amp,
-                                   BLOCK_LEN);
+            samples = sf_readf_short(inhandle, caller_model_amp, BLOCK_LEN);
             if (samples < BLOCK_LEN)
                 break;
             for (i = 0;  i < samples;  i++)
@@ -300,9 +297,9 @@
             fsk_rx(caller_rx, caller_model_amp, samples);
         }
 
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
@@ -429,13 +426,10 @@
         
             if (log_audio)
             {
-                outframes = afWriteFrames(outhandle,
-                                          AF_DEFAULT_TRACK,
-                                          out_amp,
-                                          BLOCK_LEN);
+                outframes = sf_writef_short(outhandle, out_amp, BLOCK_LEN);
                 if (outframes != BLOCK_LEN)
                 {
-                    fprintf(stderr, "    Error writing wave file\n");
+                    fprintf(stderr, "    Error writing audio file\n");
                     exit(2);
                 }
             }
@@ -477,12 +471,7 @@
                 if (log_audio)
                 {
                     for (i = 0;  i < 200;  i++)
-                    {
-                        outframes = afWriteFrames(outhandle,
-                                                  AF_DEFAULT_TRACK,
-                                                  out_amp,
-                                                  BLOCK_LEN);
-                    }
+                        outframes = sf_writef_short(outhandle, out_amp, BLOCK_LEN);
                 }
                 if (modem_under_test_1 >= 0)
                 {
@@ -514,9 +503,9 @@
     }
     if (log_audio)
     {
-        if (afCloseFile(outhandle) != 0)
+        if (sf_close(outhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/g1050_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/g1050_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/g1050_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: g1050_tests.c,v 1.17 2008/11/30 10:17:31 steveu Exp $
+ * $Id: g1050_tests.c,v 1.18 2009/05/30 15:23:13 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -39,7 +39,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #if defined(HAVE_MATH_H)
 #define GEN_CONST
 #endif

Modified: freeswitch/trunk/libs/spandsp/tests/g168_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/g168_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/g168_tests.c	Thu Jun 18 01:13:59 2009
@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: g168_tests.c,v 1.19 2008/11/30 10:17:31 steveu Exp $
+ * $Id: g168_tests.c,v 1.20 2009/05/30 15:23:13 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -34,7 +34,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -42,6 +42,7 @@
 
 #include "spandsp.h"
 #include "spandsp/g168models.h"
+#include "spandsp-sim.h"
 
 #define FALSE 0
 #define TRUE (!FALSE)
@@ -52,76 +53,18 @@
     int max;
     int cur;
     float gain;
-    AFfilehandle handle;
+    SNDFILE *handle;
     int16_t signal[SAMPLE_RATE];
 } signal_source_t;
 
 signal_source_t local_css;
 signal_source_t far_css;
 
-static AFfilehandle afOpenFile_telephony_read(const char *name, int channels)
-{
-    float x;
-    AFfilehandle handle;
-
-    if ((handle = afOpenFile(name, "r", 0)) == AF_NULL_FILEHANDLE)
-    {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", name);
-        exit(2);
-    }
-    if ((x = afGetFrameSize(handle, AF_DEFAULT_TRACK, 1)) != 2.0)
-    {
-        fprintf(stderr, "    Unexpected frame size in wave file '%s'\n", name);
-        exit(2);
-    }
-    if ((x = afGetRate(handle, AF_DEFAULT_TRACK)) != (float) SAMPLE_RATE)
-    {
-        printf("    Unexpected sample rate in wave file '%s'\n", name);
-        exit(2);
-    }
-    if ((x = afGetChannels(handle, AF_DEFAULT_TRACK)) != (float) channels)
-    {
-        printf("    Unexpected number of channels in wave file '%s'\n", name);
-        exit(2);
-    }
-
-    return handle;
-}
-/*- End of function --------------------------------------------------------*/
-
-#if 0
-static AFfilehandle afOpenFile_telephony_write(const char *name, int channels)
-{
-    AFfilesetup setup;
-    AFfilehandle handle;
-
-    if ((setup = afNewFileSetup()) == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    %s: Failed to create file setup\n", name);
-        exit(2);
-    }
-    afInitSampleFormat(setup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(setup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(setup, AF_FILE_WAVE);
-    afInitChannels(setup, AF_DEFAULT_TRACK, channels);
-
-    if ((handle = afOpenFile(name, "w", setup)) == AF_NULL_FILEHANDLE)
-    {
-        fprintf(stderr, "    Failed to open result file\n");
-        exit(2);
-    }
-    afFreeFileSetup(setup);
-
-    return handle;
-}
-/*- End of function --------------------------------------------------------*/
-#endif
-
 static void signal_load(signal_source_t *sig, const char *name)
 {
-    sig->handle = afOpenFile_telephony_read(name, 1);
+    sig->handle = sf_open_telephony_read(name, 1);
     sig->name = name;
-    sig->max = afReadFrames(sig->handle, AF_DEFAULT_TRACK, sig->signal, SAMPLE_RATE);
+    sig->max = sf_readf_short(sig->handle, sig->signal, SAMPLE_RATE);
     if (sig->max < 0)
     {
         fprintf(stderr, "    Error reading sound file '%s'\n", sig->name);
@@ -132,7 +75,7 @@
 
 static void signal_free(signal_source_t *sig)
 {
-    if (afCloseFile(sig->handle) != 0)
+    if (sf_close(sig->handle) != 0)
     {
         fprintf(stderr, "    Cannot close sound file '%s'\n", sig->name);
         exit(2);

Modified: freeswitch/trunk/libs/spandsp/tests/g711_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/g711_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/g711_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: g711_tests.c,v 1.16 2009/04/22 12:57:40 steveu Exp $
+ * $Id: g711_tests.c,v 1.17 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \page g711_tests_page A-law and u-law conversion tests
@@ -40,7 +40,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -64,7 +64,7 @@
 
 static void compliance_tests(int log_audio)
 {
-    AFfilehandle outhandle;
+    SNDFILE *outhandle;
     power_meter_t power_meter;
     int outframes;
     int i;
@@ -82,12 +82,12 @@
     g711_state_t *transcode;
     g711_state_t *dec_state;
 
-    outhandle = AF_NULL_FILEHANDLE;
+    outhandle = NULL;
     if (log_audio)
     {
-        if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }
@@ -127,13 +127,10 @@
         }
         if (log_audio)
         {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      65536);
+            outframes = sf_writef_short(outhandle, amp, 65536);
             if (outframes != 65536)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
         }
@@ -165,13 +162,10 @@
         }
         if (log_audio)
         {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      65536);
+            outframes = sf_writef_short(outhandle, amp, 65536);
             if (outframes != 65536)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
         }
@@ -224,13 +218,10 @@
     printf("Reference u-law 1kHz tone is %fdBm0\n", power_meter_current_dbm0(&power_meter));
     if (log_audio)
     {
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  8000);
+        outframes = sf_writef_short(outhandle, amp, 8000);
         if (outframes != 8000)
         {
-            fprintf(stderr, "    Error writing wave file\n");
+            fprintf(stderr, "    Error writing audio file\n");
             exit(2);
         }
     }
@@ -248,13 +239,10 @@
     printf("Reference A-law 1kHz tone is %fdBm0\n", power_meter_current_dbm0(&power_meter));
     if (log_audio)
     {
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  8000);
+        outframes = sf_writef_short(outhandle, amp, 8000);
         if (outframes != 8000)
         {
-            fprintf(stderr, "    Error writing wave file\n");
+            fprintf(stderr, "    Error writing audio file\n");
             exit(2);
         }
     }
@@ -338,9 +326,9 @@
 
     if (log_audio)
     {
-        if (afCloseFile(outhandle))
+        if (sf_close(outhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }
@@ -351,8 +339,8 @@
 
 int main(int argc, char *argv[])
 {
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int outframes;
     int opt;
     int samples;
@@ -427,16 +415,16 @@
         {
             out_file = (decode)  ?  OUT_FILE_NAME  :  ENCODED_FILE_NAME;
         }
-        inhandle = AF_NULL_FILEHANDLE;
-        outhandle = AF_NULL_FILEHANDLE;
+        inhandle = NULL;
+        outhandle = NULL;
         file = -1;
         enc_state = NULL;
         dec_state = NULL;
         if (encode)
         {
-            if ((inhandle = afOpenFile_telephony_read(in_file, 1)) == AF_NULL_FILEHANDLE)
+            if ((inhandle = sf_open_telephony_read(in_file, 1)) == NULL)
             {
-                fprintf(stderr, "    Cannot open wave file '%s'\n", in_file);
+                fprintf(stderr, "    Cannot open audio file '%s'\n", in_file);
                 exit(2);
             }
             enc_state = g711_init(NULL, law);
@@ -451,9 +439,9 @@
         }
         if (decode)
         {
-            if ((outhandle = afOpenFile_telephony_write(out_file, 1)) == AF_NULL_FILEHANDLE)
+            if ((outhandle = sf_open_telephony_write(out_file, 1)) == NULL)
             {
-                fprintf(stderr, "    Cannot create wave file '%s'\n", out_file);
+                fprintf(stderr, "    Cannot create audio file '%s'\n", out_file);
                 exit(2);
             }
             dec_state = g711_init(NULL, law);
@@ -470,10 +458,7 @@
         {
             if (encode)
             {
-                samples = afReadFrames(inhandle,
-                                       AF_DEFAULT_TRACK,
-                                       indata,
-                                       BLOCK_LEN);
+                samples = sf_readf_short(inhandle, indata, BLOCK_LEN);
                 if (samples <= 0)
                     break;
                 len2 = g711_encode(enc_state, g711data, indata, samples);
@@ -487,13 +472,10 @@
             if (decode)
             {
                 len3 = g711_decode(dec_state, outdata, g711data, len2);
-                outframes = afWriteFrames(outhandle,
-                                          AF_DEFAULT_TRACK,
-                                          outdata,
-                                          len3);
+                outframes = sf_writef_short(outhandle, outdata, len3);
                 if (outframes != len3)
                 {
-                    fprintf(stderr, "    Error writing wave file\n");
+                    fprintf(stderr, "    Error writing audio file\n");
                     exit(2);
                 }
             }
@@ -506,9 +488,9 @@
         }
         if (encode)
         {
-            if (afCloseFile(inhandle))
+            if (sf_close(inhandle))
             {
-                fprintf(stderr, "    Cannot close wave file '%s'\n", IN_FILE_NAME);
+                fprintf(stderr, "    Cannot close audio file '%s'\n", IN_FILE_NAME);
                 exit(2);
             }
         }
@@ -518,9 +500,9 @@
         }
         if (decode)
         {
-            if (afCloseFile(outhandle))
+            if (sf_close(outhandle))
             {
-                fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+                fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
                 exit(2);
             }
         }

Modified: freeswitch/trunk/libs/spandsp/tests/g722_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/g722_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/g722_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: g722_tests.c,v 1.30 2009/04/22 12:57:40 steveu Exp $
+ * $Id: g722_tests.c,v 1.32 2009/06/02 14:55:36 steveu Exp $
  */
 
 /*! \file */
@@ -69,7 +69,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include "spandsp.h"
 
@@ -357,9 +357,9 @@
     int len3;
     int i;
     int file;
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
-    AFfilesetup filesetup;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
+    SF_INFO info;
     int outframes;
     int samples;
     int opt;
@@ -370,7 +370,6 @@
     int encode;
     int decode;
     int tone_test;
-    float x;
     const char *in_file;
     const char *out_file;
     int16_t indata[BLOCK_LEN];
@@ -477,54 +476,44 @@
         {
             out_file = (decode)  ?  OUT_FILE_NAME  :  ENCODED_FILE_NAME;
         }
-        inhandle = AF_NULL_FILEHANDLE;
-        outhandle = AF_NULL_FILEHANDLE;
+        inhandle = NULL;
+        outhandle = NULL;
         file = -1;
         if (encode)
         {
             if (eight_k_in)
             {
-                if ((inhandle = afOpenFile(in_file, "r", NULL)) == AF_NULL_FILEHANDLE)
+                if ((inhandle = sf_open(in_file, SFM_READ, &info)) == NULL)
                 {
-                    fprintf(stderr, "    Cannot open wave file '%s'\n", in_file);
+                    fprintf(stderr, "    Cannot open audio file '%s'\n", in_file);
                     exit(2);
                 }
-                if ((x = afGetFrameSize(inhandle, AF_DEFAULT_TRACK, 1)) != 2.0)
+                if (info.samplerate != SAMPLE_RATE)
                 {
-                    fprintf(stderr, "    Unexpected frame size in wave file '%s'\n", in_file);
+                    fprintf(stderr, "    Unexpected sample rate %d in audio file '%s'\n", info.samplerate, in_file);
                     exit(2);
                 }
-                if ((x = afGetRate(inhandle, AF_DEFAULT_TRACK)) != (float) SAMPLE_RATE)
+                if (info.channels != 1)
                 {
-                    fprintf(stderr, "    Unexpected sample rate %f in wave file '%s'\n", x, in_file);
-                    exit(2);
-                }
-                if ((x = afGetChannels(inhandle, AF_DEFAULT_TRACK)) != 1.0)
-                {
-                    fprintf(stderr, "    Unexpected number of channels in wave file '%s'\n", in_file);
+                    fprintf(stderr, "    Unexpected number of channels in audio file '%s'\n", in_file);
                     exit(2);
                 }
             }
             else
             {
-                if ((inhandle = afOpenFile(in_file, "r", NULL)) == AF_NULL_FILEHANDLE)
+                if ((inhandle = sf_open(in_file, SFM_READ, &info)) == NULL)
                 {
-                    fprintf(stderr, "    Cannot open wave file '%s'\n", in_file);
+                    fprintf(stderr, "    Cannot open audio file '%s'\n", in_file);
                     exit(2);
                 }
-                if ((x = afGetFrameSize(inhandle, AF_DEFAULT_TRACK, 1)) != 2.0)
-                {
-                    fprintf(stderr, "    Unexpected frame size in wave file '%s'\n", in_file);
-                    exit(2);
-                }   
-                if ((x = afGetRate(inhandle, AF_DEFAULT_TRACK)) != (float) G722_SAMPLE_RATE)
+                if (info.samplerate != G722_SAMPLE_RATE)
                 {
-                    fprintf(stderr, "    Unexpected sample rate %f in wave file '%s'\n", x, in_file);
+                    fprintf(stderr, "    Unexpected sample rate %d in audio file '%s'\n", info.samplerate, in_file);
                     exit(2);
                 }
-                if ((x = afGetChannels(inhandle, AF_DEFAULT_TRACK)) != 1.0)
+                if (info.channels != 1)
                 {
-                    fprintf(stderr, "    Unexpected number of channels in wave file '%s'\n", in_file);
+                    fprintf(stderr, "    Unexpected number of channels in audio file '%s'\n", in_file);
                     exit(2);
                 }
             }
@@ -543,24 +532,18 @@
         }
         if (decode)
         {
-            if ((filesetup = afNewFileSetup()) == AF_NULL_FILESETUP)
-            {
-                fprintf(stderr, "    Failed to create file setup\n");
-                exit(2);
-            }
-            afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-            if (eight_k_out)
-                afInitRate(filesetup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-            else
-                afInitRate(filesetup, AF_DEFAULT_TRACK, (float) G722_SAMPLE_RATE);
-            afInitFileFormat(filesetup, AF_FILE_WAVE);
-            afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
-            if ((outhandle = afOpenFile(out_file, "w", filesetup)) == AF_NULL_FILEHANDLE)
+            memset(&info, 0, sizeof(info));
+            info.frames = 0;
+            info.samplerate = (eight_k_out)  ?  SAMPLE_RATE  :  G722_SAMPLE_RATE;
+            info.channels = 1;
+            info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+            info.sections = 1;
+            info.seekable = 1;
+            if ((outhandle = sf_open(out_file, SFM_WRITE, &info)) == NULL)
             {
-                fprintf(stderr, "    Cannot create wave file '%s'\n", out_file);
+                fprintf(stderr, "    Cannot create audio file '%s'\n", out_file);
                 exit(2);
             }
-            afFreeFileSetup(filesetup);
             if (eight_k_out)
                 g722_decode_init(&dec_state, bit_rate, G722_PACKED | G722_SAMPLE_RATE_8000);
             else
@@ -578,10 +561,7 @@
         {
             if (encode)
             {
-                samples = afReadFrames(inhandle,
-                                       AF_DEFAULT_TRACK,
-                                       indata,
-                                       BLOCK_LEN);
+                samples = sf_readf_short(inhandle, indata, BLOCK_LEN);
                 if (samples <= 0)
                     break;
                 if (tone_test)
@@ -600,13 +580,10 @@
             if (decode)
             {
                 len3 = g722_decode(&dec_state, outdata, adpcmdata, len2);
-                outframes = afWriteFrames(outhandle,
-                                          AF_DEFAULT_TRACK,
-                                          outdata,
-                                          len3);
+                outframes = sf_writef_short(outhandle, outdata, len3);
                 if (outframes != len3)
                 {
-                    fprintf(stderr, "    Error writing wave file\n");
+                    fprintf(stderr, "    Error writing audio file\n");
                     exit(2);
                 }
             }
@@ -619,9 +596,9 @@
         }
         if (encode)
         {
-            if (afCloseFile(inhandle))
+            if (sf_close(inhandle))
             {
-                fprintf(stderr, "    Cannot close wave file '%s'\n", IN_FILE_NAME);
+                fprintf(stderr, "    Cannot close audio file '%s'\n", IN_FILE_NAME);
                 exit(2);
             }
         }
@@ -631,9 +608,9 @@
         }
         if (decode)
         {
-            if (afCloseFile(outhandle))
+            if (sf_close(outhandle))
             {
-                fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+                fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
                 exit(2);
             }
         }

Modified: freeswitch/trunk/libs/spandsp/tests/g726_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/g726_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/g726_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: g726_tests.c,v 1.32 2009/04/22 12:57:40 steveu Exp $
+ * $Id: g726_tests.c,v 1.33 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \file */
@@ -73,7 +73,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -1224,8 +1224,8 @@
     int opt;
     int itutests;
     int bit_rate;
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int16_t amp[1024];
     int frames;
     int outframes;
@@ -1266,14 +1266,14 @@
     }
     else
     {
-        if ((inhandle = afOpenFile_telephony_read(IN_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(IN_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", IN_FILE_NAME);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", IN_FILE_NAME);
             exit(2);
         }
-        if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
 
@@ -1281,20 +1281,20 @@
         g726_init(&enc_state, bit_rate, G726_ENCODING_LINEAR, packing);
         g726_init(&dec_state, bit_rate, G726_ENCODING_LINEAR, packing);
             
-        while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, 159)))
+        while ((frames = sf_readf_short(inhandle, amp, 159)))
         {
             adpcm = g726_encode(&enc_state, adpcmdata, amp, frames);
             frames = g726_decode(&dec_state, amp, adpcmdata, adpcm);
-            outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, amp, frames);
+            outframes = sf_writef_short(outhandle, amp, frames);
         }
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
-            printf("    Cannot close wave file '%s'\n", IN_FILE_NAME);
+            printf("    Cannot close audio file '%s'\n", IN_FILE_NAME);
             exit(2);
         }
-        if (afCloseFile(outhandle) != 0)
+        if (sf_close(outhandle) != 0)
         {
-            printf("    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+            printf("    Cannot close audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
         printf("'%s' transcoded to '%s' at %dbps.\n", IN_FILE_NAME, OUT_FILE_NAME, bit_rate);

Modified: freeswitch/trunk/libs/spandsp/tests/gsm0610_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/gsm0610_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/gsm0610_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: gsm0610_tests.c,v 1.24 2009/04/22 12:57:40 steveu Exp $
+ * $Id: gsm0610_tests.c,v 1.25 2009/05/30 15:23:13 steveu Exp $
  */
 
 /*! \file */
@@ -123,7 +123,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -542,8 +542,8 @@
 
 int main(int argc, char *argv[])
 {
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int frames;
     int outframes;
     int bytes;
@@ -580,14 +580,14 @@
     }
     else
     {
-        if ((inhandle = afOpenFile_telephony_read(IN_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(IN_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", IN_FILE_NAME);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", IN_FILE_NAME);
             exit(2);
         }
-        if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     
@@ -603,21 +603,21 @@
             exit(2);
         }
 
-        while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, pre_amp, 2*BLOCK_LEN)))
+        while ((frames = sf_readf_short(inhandle, pre_amp, 2*BLOCK_LEN)))
         {
             bytes = gsm0610_encode(gsm0610_enc_state, gsm0610_data, pre_amp, frames);
             gsm0610_decode(gsm0610_dec_state, post_amp, gsm0610_data, bytes);
-            outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, post_amp, frames);
+            outframes = sf_writef_short(outhandle, post_amp, frames);
         }
     
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", IN_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", IN_FILE_NAME);
             exit(2);
         }
-        if (afCloseFile(outhandle) != 0)
+        if (sf_close(outhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
         gsm0610_release(gsm0610_enc_state);

Modified: freeswitch/trunk/libs/spandsp/tests/ima_adpcm_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/ima_adpcm_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/ima_adpcm_tests.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: ima_adpcm_tests.c,v 1.35 2008/11/30 10:17:31 steveu Exp $
+ * $Id: ima_adpcm_tests.c,v 1.36 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -49,7 +49,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -66,8 +66,8 @@
 int main(int argc, char *argv[])
 {
     int i;
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int frames;
     int dec_frames;
     int outframes;
@@ -126,15 +126,15 @@
         }
     }
 
-    if ((inhandle = afOpenFile_telephony_read(in_file_name, 1)) == AF_NULL_FILEHANDLE)
+    if ((inhandle = sf_open_telephony_read(in_file_name, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", in_file_name);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", in_file_name);
         exit(2);
     }
 
-    if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
 
@@ -158,7 +158,7 @@
     total_pre_samples = 0;
     total_compressed_bytes = 0;
     total_post_samples = 0;
-    while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, pre_amp, chunk_size)))
+    while ((frames = sf_readf_short(inhandle, pre_amp, chunk_size)))
     {
         total_pre_samples += frames;
         ima_bytes = ima_adpcm_encode(ima_enc_state, ima_data, pre_amp, frames);
@@ -182,16 +182,16 @@
                 hist_out = 0;
             diff_energy += (double) xx * (double) xx;
         }
-        outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, post_amp, dec_frames);
+        outframes = sf_writef_short(outhandle, post_amp, dec_frames);
     }
-    if (afCloseFile(inhandle) != 0)
+    if (sf_close(inhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", in_file_name);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", in_file_name);
         exit(2);
     }
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
     ima_adpcm_release(ima_enc_state);

Modified: freeswitch/trunk/libs/spandsp/tests/line_model_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/line_model_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/line_model_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: line_model_tests.c,v 1.26 2009/01/12 17:20:59 steveu Exp $
+ * $Id: line_model_tests.c,v 1.27 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page line_model_tests_page Telephony line model tests
@@ -43,7 +43,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -73,25 +73,14 @@
     complexf_t cc;
     int16_t amp;
     int i;
-    AFfilehandle outhandle;
-    AFfilesetup filesetup;
+    SNDFILE *outhandle;
     int outframes;
     int16_t out[40000];
     awgn_state_t noise1;
-    
-    if ((filesetup = afNewFileSetup()) == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 2);
 
-    if ((outhandle = afOpenFile(OUT_FILE_COMPLEXIFY, "w", filesetup)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_COMPLEXIFY, 2)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_COMPLEXIFY);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_COMPLEXIFY);
         exit(2);
     }
     awgn_init_dbm0(&noise1, 1234567, -10.0f);
@@ -103,21 +92,17 @@
         out[2*i] = cc.re;
         out[2*i + 1] = cc.im;
     }
-    outframes = afWriteFrames(outhandle,
-                              AF_DEFAULT_TRACK,
-                              out,
-                              20000);
+    outframes = sf_writef_short(outhandle, out, 20000);
     if (outframes != 20000)
     {
-        fprintf(stderr, "    Error writing wave file\n");
+        fprintf(stderr, "    Error writing audio file\n");
         exit(2);
     }
-    if (afCloseFile(outhandle))
+    if (sf_close(outhandle))
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_COMPLEXIFY);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_COMPLEXIFY);
         exit(2);
     }
-    afFreeFileSetup(filesetup);
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -127,9 +112,8 @@
     int16_t input1[BLOCK_LEN];
     int16_t output1[BLOCK_LEN];
     int16_t amp[2*BLOCK_LEN];
-    AFfilehandle inhandle1;
-    AFfilehandle outhandle;
-    AFfilesetup filesetup;
+    SNDFILE *inhandle1;
+    SNDFILE *outhandle;
     int outframes;
     int samples;
     int i;
@@ -144,34 +128,21 @@
     
     awgn_init_dbm0(&noise1, 1234567, -10.0f);
 
-    if ((filesetup = afNewFileSetup()) == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
-
-    if ((inhandle1 = afOpenFile(IN_FILE_NAME1, "r", NULL)) == AF_NULL_FILEHANDLE)
+    if ((inhandle1 = sf_open_telephony_read(IN_FILE_NAME1, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", IN_FILE_NAME1);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", IN_FILE_NAME1);
         exit(2);
     }
-    if ((outhandle = afOpenFile(OUT_FILE_NAME1, "w", filesetup)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME1, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME1);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME1);
         exit(2);
     }
     for (i = 0;  i < 10000;  i++)
     {
         if (speech_test)
         {
-            samples = afReadFrames(inhandle1,
-                                   AF_DEFAULT_TRACK,
-                                   input1,
-                                   BLOCK_LEN);
+            samples = sf_readf_short(inhandle1, input1, BLOCK_LEN);
             if (samples == 0)
                 break;
         }
@@ -189,27 +160,23 @@
                                1);
             amp[j] = output1[j];
         }
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  samples);
+        outframes = sf_writef_short(outhandle, amp, samples);
         if (outframes != samples)
         {
-            fprintf(stderr, "    Error writing wave file\n");
+            fprintf(stderr, "    Error writing audio file\n");
             exit(2);
         }
     }
-    if (afCloseFile(inhandle1))
+    if (sf_close(inhandle1))
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", IN_FILE_NAME1);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", IN_FILE_NAME1);
         exit(2);
     }
-    if (afCloseFile(outhandle))
+    if (sf_close(outhandle))
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME1);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME1);
         exit(2);
     }
-    afFreeFileSetup(filesetup);
     one_way_line_model_release(model);
 }
 /*- End of function --------------------------------------------------------*/
@@ -222,10 +189,9 @@
     int16_t output1[BLOCK_LEN];
     int16_t output2[BLOCK_LEN];
     int16_t amp[2*BLOCK_LEN];
-    AFfilehandle inhandle1;
-    AFfilehandle inhandle2;
-    AFfilehandle outhandle;
-    AFfilesetup filesetup;
+    SNDFILE *inhandle1;
+    SNDFILE *inhandle2;
+    SNDFILE *outhandle;
     int outframes;
     int samples;
     int i;
@@ -242,49 +208,29 @@
     awgn_init_dbm0(&noise1, 1234567, -10.0f);
     awgn_init_dbm0(&noise2, 1234567, -10.0f);
 
-    filesetup = afNewFileSetup();
-    if (filesetup == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 2);
-
-    inhandle1 = afOpenFile(IN_FILE_NAME1, "r", NULL);
-    if (inhandle1 == AF_NULL_FILEHANDLE)
+    if ((inhandle1 = sf_open_telephony_read(IN_FILE_NAME1, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", IN_FILE_NAME1);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", IN_FILE_NAME1);
         exit(2);
     }
-    inhandle2 = afOpenFile(IN_FILE_NAME2, "r", NULL);
-    if (inhandle2 == AF_NULL_FILEHANDLE)
+    if ((inhandle2 = sf_open_telephony_read(IN_FILE_NAME2, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", IN_FILE_NAME2);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", IN_FILE_NAME2);
         exit(2);
     }
-    outhandle = afOpenFile(OUT_FILE_NAME, "w", filesetup);
-    if (outhandle == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 2)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
     for (i = 0;  i < 10000;  i++)
     {
         if (speech_test)
         {
-            samples = afReadFrames(inhandle1,
-                                   AF_DEFAULT_TRACK,
-                                   input1,
-                                   BLOCK_LEN);
+            samples = sf_readf_short(inhandle1, input1, BLOCK_LEN);
             if (samples == 0)
                 break;
-            samples = afReadFrames(inhandle2,
-                                   AF_DEFAULT_TRACK,
-                                   input2,
-                                   samples);
+            samples = sf_readf_short(inhandle2, input2, samples);
             if (samples == 0)
                 break;
         }
@@ -308,32 +254,28 @@
             amp[2*j] = output1[j];
             amp[2*j + 1] = output2[j];
         }
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  samples);
+        outframes = sf_writef_short(outhandle, amp, samples);
         if (outframes != samples)
         {
-            fprintf(stderr, "    Error writing wave file\n");
+            fprintf(stderr, "    Error writing audio file\n");
             exit(2);
         }
     }
-    if (afCloseFile(inhandle1))
+    if (sf_close(inhandle1))
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", IN_FILE_NAME1);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", IN_FILE_NAME1);
         exit(2);
     }
-    if (afCloseFile(inhandle2))
+    if (sf_close(inhandle2))
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", IN_FILE_NAME2);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", IN_FILE_NAME2);
         exit(2);
     }
-    if (afCloseFile(outhandle))
+    if (sf_close(outhandle))
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
-    afFreeFileSetup(filesetup);
     both_ways_line_model_release(model);
 }
 /*- End of function --------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/tests/lpc10_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/lpc10_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/lpc10_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: lpc10_tests.c,v 1.23 2009/01/12 17:20:59 steveu Exp $
+ * $Id: lpc10_tests.c,v 1.24 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -46,7 +46,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -67,9 +67,9 @@
 
 int main(int argc, char *argv[])
 {
-    AFfilehandle inhandle;
-    AFfilehandle refhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *refhandle;
+    SNDFILE *outhandle;
     int frames;
     int outframes;
     double pre_energy;
@@ -125,20 +125,20 @@
 
     compress_file = -1;
     decompress_file = -1;
-    inhandle = AF_NULL_FILEHANDLE;
-    refhandle = AF_NULL_FILEHANDLE;
-    outhandle = AF_NULL_FILEHANDLE;
+    inhandle = NULL;
+    refhandle = NULL;
+    outhandle = NULL;
     if (!decompress)
     {
-        if ((inhandle = afOpenFile_telephony_read(in_file_name, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(in_file_name, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", in_file_name);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", in_file_name);
             exit(2);
         }
 
-        if ((refhandle = afOpenFile_telephony_read(REF_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((refhandle = sf_open_telephony_read(REF_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", REF_FILE_NAME);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", REF_FILE_NAME);
             exit(2);
         }
     }
@@ -151,9 +151,9 @@
         }
     }
 
-    if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
     
@@ -188,15 +188,15 @@
         while ((len = read(decompress_file, lpc10_data, BLOCKS_PER_READ*7)) > 0)
         {
             lpc10_decode(lpc10_dec_state, post_amp, lpc10_data, len/7);
-            outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, post_amp, BLOCK_LEN*len/7);
+            outframes = sf_writef_short(outhandle, post_amp, BLOCK_LEN*len/7);
         }
     }
     else
     {
         block_no = 0;
-        while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, pre_amp, BLOCKS_PER_READ*BLOCK_LEN)) == BLOCKS_PER_READ*BLOCK_LEN
+        while ((frames = sf_readf_short(inhandle, pre_amp, BLOCKS_PER_READ*BLOCK_LEN)) == BLOCKS_PER_READ*BLOCK_LEN
                 &&
-                (frames = afReadFrames(refhandle, AF_DEFAULT_TRACK, ref_amp, BLOCKS_PER_READ*BLOCK_LEN)) == BLOCKS_PER_READ*BLOCK_LEN)
+                (frames = sf_readf_short(refhandle, ref_amp, BLOCKS_PER_READ*BLOCK_LEN)) == BLOCKS_PER_READ*BLOCK_LEN)
         {
             enc_len = lpc10_encode(lpc10_enc_state, lpc10_data, pre_amp, BLOCKS_PER_READ*BLOCK_LEN);
             if (compress)
@@ -218,25 +218,25 @@
             }
             block_no++;
             if (log_error)
-                outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, log_amp, dec_len);
+                outframes = sf_writef_short(outhandle, log_amp, dec_len);
             else
-                outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, post_amp, dec_len);
+                outframes = sf_writef_short(outhandle, post_amp, dec_len);
         }
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", in_file_name);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", in_file_name);
             exit(2);
         }
-        if (afCloseFile(refhandle) != 0)
+        if (sf_close(refhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", REF_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", REF_FILE_NAME);
             exit(2);
         }
     }
     
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
     if (compress)

Modified: freeswitch/trunk/libs/spandsp/tests/make_g168_css.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/make_g168_css.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/make_g168_css.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: make_g168_css.c,v 1.17 2009/02/10 17:49:20 steveu Exp $
+ * $Id: make_g168_css.c,v 1.18 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page makecss_page CSS construction for G.168 testing
@@ -43,7 +43,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #if defined(HAVE_FFTW3_H)
 #include 
 #else
@@ -139,20 +139,18 @@
     double pk;
     double ms;
     double scale;
-    AFfilehandle filehandle;
-    AFfilesetup filesetup;
+    SNDFILE *filehandle;
+    SF_INFO info;
     awgn_state_t noise_source;
 
-    if ((filesetup = afNewFileSetup()) == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, FAST_SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
-    if ((filehandle = afOpenFile("sound_c1.wav", "w", filesetup)) == AF_NULL_FILEHANDLE)
+    memset(&info, 0, sizeof(info));
+    info.frames = 0;
+    info.samplerate = FAST_SAMPLE_RATE;
+    info.channels = 1;
+    info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+    info.sections = 1;
+    info.seekable = 1;
+    if ((filehandle = sf_open("sound_c1.wav", SFM_WRITE, &info)) == NULL)
     {
         fprintf(stderr, "    Failed to open result file\n");
         exit(2);
@@ -243,26 +241,12 @@
         silence_sound[i] = 0.0;
 
     for (i = 0;  i < 16;  i++)
-    {
-        outframes = afWriteFrames(filehandle,
-                                  AF_DEFAULT_TRACK,
-                                  voiced_sound,
-                                  voiced_length);
-    }
+        outframes = sf_writef_short(filehandle, voiced_sound, voiced_length);
     printf("%d samples of voice\n", 16*voiced_length);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              noise_sound,
-                              8192);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              noise_sound,
-                              C1_NOISE_SAMPLES - 8192);
+    outframes = sf_writef_short(filehandle, noise_sound, 8192);
+    outframes = sf_writef_short(filehandle, noise_sound, C1_NOISE_SAMPLES - 8192);
     printf("%d samples of noise\n", C1_NOISE_SAMPLES);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              silence_sound,
-                              C1_SILENCE_SAMPLES);
+    outframes = sf_writef_short(filehandle, silence_sound, C1_SILENCE_SAMPLES);
     printf("%d samples of silence\n", C1_SILENCE_SAMPLES);
 
     /* Now phase invert the C1 set of voice samples. */
@@ -277,40 +261,28 @@
         noise_sound[i] = -noise_sound[i];
 
     for (i = 0;  i < 16;  i++)
-    {
-        outframes = afWriteFrames(filehandle,
-                                  AF_DEFAULT_TRACK,
-                                  voiced_sound,
-                                  voiced_length);
-    }
+        outframes = sf_writef_short(filehandle, voiced_sound, voiced_length);
     printf("%d samples of voice\n", 16*voiced_length);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              noise_sound,
-                              8192);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              noise_sound,
-                              C1_NOISE_SAMPLES - 8192);
+    outframes = sf_writef_short(filehandle, noise_sound, 8192);
+    outframes = sf_writef_short(filehandle, noise_sound, C1_NOISE_SAMPLES - 8192);
     printf("%d samples of noise\n", C1_NOISE_SAMPLES);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              silence_sound,
-                              C1_SILENCE_SAMPLES);
+    outframes = sf_writef_short(filehandle, silence_sound, C1_SILENCE_SAMPLES);
     printf("%d samples of silence\n", C1_SILENCE_SAMPLES);
 
-    if (afCloseFile(filehandle) != 0)
+    if (sf_close(filehandle) != 0)
     {
         fprintf(stderr, "    Cannot close speech file '%s'\n", "sound_c1.wav");
         exit(2);
     }
 
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, FAST_SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
-    filehandle = afOpenFile("sound_c3.wav", "w", filesetup);
-    if (filehandle == AF_NULL_FILEHANDLE)
+    memset(&info, 0, sizeof(info));
+    info.frames = 0;
+    info.samplerate = FAST_SAMPLE_RATE;
+    info.channels = 1;
+    info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+    info.sections = 1;
+    info.seekable = 1;
+    if ((filehandle = sf_open("sound_c3.wav", SFM_WRITE, &info)) == NULL)
     {
         fprintf(stderr, "    Failed to open result file\n");
         exit(2);
@@ -333,27 +305,13 @@
     printf("Noise level = %.2fdB, crest factor = %.2fdB\n", rms_to_dbm0(ms), rms_to_db(pk/ms));
 
     for (i = 0;  i < 14;  i++)
-    {
-        outframes = afWriteFrames(filehandle,
-                                  AF_DEFAULT_TRACK,
-                                  voiced_sound,
-                                  voiced_length);
-    }
+        outframes = sf_writef_short(filehandle, voiced_sound, voiced_length);
     printf("%d samples of voice\n", 14*voiced_length);
 
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              noise_sound,
-                              8192);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              noise_sound,
-                              C3_NOISE_SAMPLES - 8192);
+    outframes = sf_writef_short(filehandle, noise_sound, 8192);
+    outframes = sf_writef_short(filehandle, noise_sound, C3_NOISE_SAMPLES - 8192);
     printf("%d samples of noise\n", C3_NOISE_SAMPLES);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              silence_sound,
-                              C3_SILENCE_SAMPLES);
+    outframes = sf_writef_short(filehandle, silence_sound, C3_SILENCE_SAMPLES);
     printf("%d samples of silence\n", C3_SILENCE_SAMPLES);
 
     /* Now phase invert the set of voice samples. */
@@ -369,34 +327,19 @@
         noise_sound[i] = -noise_sound[i];
 
     for (i = 0;  i < 14;  i++)
-    {
-        outframes = afWriteFrames(filehandle,
-                                  AF_DEFAULT_TRACK,
-                                  voiced_sound,
-                                  voiced_length);
-    }
+        outframes = sf_writef_short(filehandle, voiced_sound, voiced_length);
     printf("%d samples of voice\n", 14*i);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              noise_sound,
-                              8192);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              noise_sound,
-                              C3_NOISE_SAMPLES - 8192);
+    outframes = sf_writef_short(filehandle, noise_sound, 8192);
+    outframes = sf_writef_short(filehandle, noise_sound, C3_NOISE_SAMPLES - 8192);
     printf("%d samples of noise\n", C3_NOISE_SAMPLES);
-    outframes = afWriteFrames(filehandle,
-                              AF_DEFAULT_TRACK,
-                              silence_sound,
-                              C3_SILENCE_SAMPLES);
+    outframes = sf_writef_short(filehandle, silence_sound, C3_SILENCE_SAMPLES);
     printf("%d samples of silence\n", C3_SILENCE_SAMPLES);
 
-    if (afCloseFile(filehandle) != 0)
+    if (sf_close(filehandle) != 0)
     {
         fprintf(stderr, "    Cannot close speech file '%s'\n", "sound_c3.wav");
         exit(2);
     }
-    afFreeFileSetup(filesetup);
 
     fftw_destroy_plan(p);
     return  0;

Modified: freeswitch/trunk/libs/spandsp/tests/modem_connect_tones_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/modem_connect_tones_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/modem_connect_tones_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: modem_connect_tones_tests.c,v 1.29 2008/11/30 10:17:31 steveu Exp $
+ * $Id: modem_connect_tones_tests.c,v 1.30 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page modem_connect_tones_tests_page Modem connect tones tests
@@ -42,7 +42,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -186,8 +186,8 @@
     modem_connect_tones_rx_state_t ans_pr_rx;
     modem_connect_tones_tx_state_t modem_tone_tx;
     awgn_state_t chan_noise_source;
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int outframes;
     int frames;
     int samples;
@@ -264,9 +264,9 @@
     if (decode_test_file == NULL  &&  test_list == 0)
         test_list = 0xFFFFFFFF;
 
-    if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
 
@@ -277,13 +277,10 @@
         for (i = 0;  i < 20*SAMPLE_RATE;  i += SAMPLES_PER_CHUNK)
         {
             samples = modem_connect_tones_tx(&modem_tone_tx, amp, SAMPLES_PER_CHUNK);
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      samples);
+            outframes = sf_writef_short(outhandle, amp, samples);
             if (outframes != samples)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
             /*endif*/
@@ -299,13 +296,10 @@
         for (i = 0;  i < 20*SAMPLE_RATE;  i += SAMPLES_PER_CHUNK)
         {
             samples = modem_connect_tones_tx(&modem_tone_tx, amp, SAMPLES_PER_CHUNK);
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      samples);
+            outframes = sf_writef_short(outhandle, amp, samples);
             if (outframes != samples)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
             /*endif*/
@@ -322,13 +316,10 @@
         for (i = 0;  i < 20*SAMPLE_RATE;  i += SAMPLES_PER_CHUNK)
         {
             samples = modem_connect_tones_tx(&modem_tone_tx, amp, SAMPLES_PER_CHUNK);
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      samples);
+            outframes = sf_writef_short(outhandle, amp, samples);
             if (outframes != samples)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
             /*endif*/
@@ -345,13 +336,10 @@
         for (i = 0;  i < 20*SAMPLE_RATE;  i += SAMPLES_PER_CHUNK)
         {
             samples = modem_connect_tones_tx(&modem_tone_tx, amp, SAMPLES_PER_CHUNK);
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      samples);
+            outframes = sf_writef_short(outhandle, amp, samples);
             if (outframes != samples)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
             /*endif*/
@@ -368,13 +356,10 @@
         for (i = 0;  i < 20*SAMPLE_RATE;  i += SAMPLES_PER_CHUNK)
         {
             samples = modem_connect_tones_tx(&modem_tone_tx, amp, SAMPLES_PER_CHUNK);
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      samples);
+            outframes = sf_writef_short(outhandle, amp, samples);
             if (outframes != samples)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
             /*endif*/
@@ -383,9 +368,9 @@
     }
     /*endif*/
 
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        printf("    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+        printf("    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
     /*endif*/
@@ -926,7 +911,7 @@
         hits = 0;
         for (j = 0;  bellcore_files[j][0];  j++)
         {
-            if ((inhandle = afOpenFile_telephony_read(bellcore_files[j], 1)) == AF_NULL_FILEHANDLE)
+            if ((inhandle = sf_open_telephony_read(bellcore_files[j], 1)) == NULL)
             {
                 fprintf(stderr, "    Cannot open speech file '%s'\n", bellcore_files[j]);
                 exit (2);
@@ -935,7 +920,7 @@
 
             when = 0;
             hits = 0;
-            while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, 8000)))
+            while ((frames = sf_readf_short(inhandle, amp, 8000)))
             {
                 when++;
                 modem_connect_tones_rx(&cng_rx, amp, frames);
@@ -967,7 +952,7 @@
                 /*endif*/
             }
             /*endwhile*/
-            if (afCloseFile(inhandle) != 0)
+            if (sf_close(inhandle) != 0)
             {
                 fprintf(stderr, "    Cannot close speech file '%s'\n", bellcore_files[j]);
                 exit(2);
@@ -993,7 +978,7 @@
         modem_connect_tones_rx_init(&ced_rx, MODEM_CONNECT_TONES_FAX_CED_OR_PREAMBLE, ced_detected, NULL);
         modem_connect_tones_rx_init(&ans_pr_rx, MODEM_CONNECT_TONES_ANS_PR, ec_dis_detected, NULL);
         hits = 0;
-        if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
             fprintf(stderr, "    Cannot open speech file '%s'\n", decode_test_file);
             exit (2);
@@ -1002,7 +987,7 @@
 
         when = 0;
         hits = 0;
-        while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, 8000)))
+        while ((frames = sf_readf_short(inhandle, amp, 8000)))
         {
             when++;
             modem_connect_tones_rx(&cng_rx, amp, frames);
@@ -1010,7 +995,7 @@
             modem_connect_tones_rx(&ans_pr_rx, amp, frames);
         }
         /*endwhile*/
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
             fprintf(stderr, "    Cannot close speech file '%s'\n", decode_test_file);
             exit(2);

Modified: freeswitch/trunk/libs/spandsp/tests/modem_echo_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/modem_echo_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/modem_echo_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: modem_echo_tests.c,v 1.31 2008/11/30 10:17:31 steveu Exp $
+ * $Id: modem_echo_tests.c,v 1.32 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page modem_echo_can_tests_page Line echo cancellation for modems tests
@@ -37,9 +37,9 @@
 models in g168tests.c. 
 
 \section modem_echo_can_tests_page_sec_2 How does it work?
-The current test consists of feeding a wave file of real speech to the echo
+The current test consists of feeding an audio file of real speech to the echo
 cancellor as the transmit signal. A very simple model of a telephone line is
-used to simulate a simple echo from the transmit signal. A second wave file of
+used to simulate a simple echo from the transmit signal. A second audio file of
 real speech is also used to simulate a signal received form the far end of the
 line. This is gated so it is only placed for one second every 10 seconds,
 simulating the double talk condition. The resulting echo cancelled signal can
@@ -62,7 +62,7 @@
 Build the tests with the command "./build". Currently there is no proper make
 setup, or way to build individual tests. "./build" will built all the tests
 which currently exist for the DSP functions. The echo cancellation test assumes
-there are two wave files containing mono, 16 bit signed PCM speech data, sampled
+there are two audio files containing mono, 16 bit signed PCM speech data, sampled
 at 8kHz. These should be called local_sound.wav and far_sound.wav. A third wave
 file will be produced. This very crudely starts with the first 256 bytes from
 the local_sound.wav file, followed by the results of the echo cancellation. The
@@ -87,7 +87,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #if defined(HAVE_MATH_H)
 #define GEN_CONST
 #endif
@@ -113,7 +113,7 @@
     const char *name;
     int max;
     int cur;
-    AFfilehandle handle;
+    SNDFILE *handle;
     int16_t signal[8000];
 } signal_source_t;
 
@@ -121,7 +121,7 @@
 
 fir32_state_t line_model;
 
-AFfilehandle resulthandle;
+SNDFILE *resulthandle;
 int16_t residue_sound[8000];
 int residue_cur = 0;
 int do_codec_munge = TRUE;
@@ -138,10 +138,7 @@
     if (residue_cur >= 8000)
     {
         residue_cur >>= 1;
-        outframes = afWriteFrames(resulthandle,
-                                  AF_DEFAULT_TRACK,
-                                  residue_sound,
-                                  residue_cur);
+        outframes = sf_writef_short(resulthandle, residue_sound, residue_cur);
         if (outframes != residue_cur)
         {
             fprintf(stderr, "    Error writing residue sound\n");
@@ -155,12 +152,12 @@
 static void signal_load(signal_source_t *sig, const char *name)
 {
     sig->name = name;
-    if ((sig->handle = afOpenFile_telephony_read(sig->name, 1)) == AF_NULL_FILEHANDLE)
+    if ((sig->handle = sf_open_telephony_read(sig->name, 1)) == NULL)
     {
         fprintf(stderr, "    Cannot open sound file '%s'\n", sig->name);
         exit(2);
     }
-    sig->max = afReadFrames(sig->handle, AF_DEFAULT_TRACK, sig->signal, 8000);
+    sig->max = sf_readf_short(sig->handle, sig->signal, 8000);
     if (sig->max < 0)
     {
         fprintf(stderr, "    Error reading sound file '%s'\n", sig->name);
@@ -171,7 +168,7 @@
 
 static void signal_free(signal_source_t *sig)
 {
-    if (afCloseFile(sig->handle) != 0)
+    if (sf_close(sig->handle) != 0)
     {
         fprintf(stderr, "    Cannot close sound file '%s'\n", sig->name);
         exit(2);
@@ -296,7 +293,7 @@
 
     signal_load(&local_css, "sound_c1_8k.wav");
 
-    if ((resulthandle = afOpenFile_telephony_write("modem_echo.wav", 2)) == AF_NULL_FILEHANDLE)
+    if ((resulthandle = sf_open_telephony_write("modem_echo.wav", 2)) == NULL)
     {
         fprintf(stderr, "    Failed to open result file\n");
         exit(2);
@@ -391,7 +388,7 @@
     modem_echo_can_free(ctx);
     signal_free(&local_css);
 
-    if (afCloseFile(resulthandle) != 0)
+    if (sf_close(resulthandle) != 0)
     {
         fprintf(stderr, "    Cannot close speech file '%s'\n", "result_sound.wav");
         exit(2);

Modified: freeswitch/trunk/libs/spandsp/tests/noise_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/noise_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/noise_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: noise_tests.c,v 1.17 2008/11/30 10:17:31 steveu Exp $
+ * $Id: noise_tests.c,v 1.18 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page noise_tests_page Noise generator tests
@@ -36,7 +36,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -72,11 +72,11 @@
     int bins[65536];
     int16_t amp[1024];
     noise_state_t noise_source;
-    AFfilehandle outhandle;
+    SNDFILE *outhandle;
 
-    if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
 
@@ -164,13 +164,10 @@
     {
         for (i = 0;  i < 1024;  i++)
             amp[i] = noise(&noise_source);
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  1024);
+        outframes = sf_writef_short(outhandle, amp, 1024);
         if (outframes != 1024)
         {
-            fprintf(stderr, "    Error writing wave file\n");
+            fprintf(stderr, "    Error writing audio file\n");
             exit(2);
         }
     }
@@ -220,20 +217,17 @@
     {
         for (i = 0;  i < 1024;  i++)
             amp[i] = noise(&noise_source);
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  1024);
+        outframes = sf_writef_short(outhandle, amp, 1024);
         if (outframes != 1024)
         {
-            fprintf(stderr, "    Error writing wave file\n");
+            fprintf(stderr, "    Error writing audio file\n");
             exit(2);
         }
     }
 
-    if (afCloseFile(outhandle))
+    if (sf_close(outhandle))
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
     

Modified: freeswitch/trunk/libs/spandsp/tests/oki_adpcm_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/oki_adpcm_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/oki_adpcm_tests.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: oki_adpcm_tests.c,v 1.36 2008/11/30 10:17:31 steveu Exp $
+ * $Id: oki_adpcm_tests.c,v 1.37 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -50,7 +50,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -67,8 +67,8 @@
 int main(int argc, char *argv[])
 {
     int i;
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int frames;
     int dec_frames;
     int outframes;
@@ -116,14 +116,14 @@
         }
     }
 
-    if ((inhandle = afOpenFile_telephony_read(in_file_name, 1)) == AF_NULL_FILEHANDLE)
+    if ((inhandle = sf_open_telephony_read(in_file_name, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", in_file_name);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", in_file_name);
         exit(2);
     }
-    if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
 
@@ -151,7 +151,7 @@
     total_pre_samples = 0;
     total_compressed_bytes = 0;
     total_post_samples = 0;
-    while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, pre_amp, 159)))
+    while ((frames = sf_readf_short(inhandle, pre_amp, 159)))
     {
         total_pre_samples += frames;
         oki_bytes = oki_adpcm_encode(oki_enc_state, oki_data, pre_amp, frames);
@@ -176,16 +176,16 @@
             diff_energy += (double) xx * (double) xx;
             //post_amp[i] = xx;
         }
-        outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, post_amp, dec_frames);
+        outframes = sf_writef_short(outhandle, post_amp, dec_frames);
     }
-    if (afCloseFile(inhandle) != 0)
+    if (sf_close(inhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", in_file_name);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", in_file_name);
         exit(2);
     }
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
     oki_adpcm_release(oki_enc_state);

Modified: freeswitch/trunk/libs/spandsp/tests/playout_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/playout_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/playout_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: playout_tests.c,v 1.28 2009/02/10 13:06:47 steveu Exp $
+ * $Id: playout_tests.c,v 1.29 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page playout_tests_page Playout (jitter buffering) tests
@@ -38,11 +38,11 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include "spandsp.h"
-
 #include "spandsp/private/time_scale.h"
+#include "spandsp-sim.h"
 
 #define INPUT_FILE_NAME     "playout_in.wav"
 #define OUTPUT_FILE_NAME    "playout_out.wav"
@@ -71,31 +71,17 @@
     int len;
     int inframes;
     int outframes;
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
-    AFfilesetup filesetup;
-
-    filesetup = afNewFileSetup();
-    if (filesetup == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 2);
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
 
-    inhandle = afOpenFile(INPUT_FILE_NAME, "r", NULL);
-    if (inhandle == AF_NULL_FILEHANDLE)
+    if ((inhandle = sf_open_telephony_read(INPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Failed to open wave file '%s'\n", INPUT_FILE_NAME);
+        fprintf(stderr, "    Failed to open audio file '%s'\n", INPUT_FILE_NAME);
         exit(2);
     }
-    outhandle = afOpenFile(OUTPUT_FILE_NAME, "w", filesetup);
-    if (outhandle == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Failed to create wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Failed to create audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
 
@@ -115,10 +101,7 @@
         if (i >= next_actual_receive)
         {
             amp = malloc(BLOCK_LEN*sizeof(int16_t));
-            inframes = afReadFrames(inhandle,
-                                    AF_DEFAULT_TRACK,
-                                    amp,
-                                    BLOCK_LEN);
+            inframes = sf_readf_short(inhandle, amp, BLOCK_LEN);
             if (inframes < BLOCK_LEN)
                 break;
             ret = playout_put(s,
@@ -174,7 +157,7 @@
                     buf[2*j] = out[j];
                     buf[2*j + 1] = 10*playout_current_length(s);
                 }
-                outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, buf, len);
+                outframes = sf_writef_short(outhandle, buf, len);
                 if (outframes != len)
                 {
                     fprintf(stderr, "    Error writing out sound\n");
@@ -195,7 +178,7 @@
                     buf[2*j] = out[j];
                     buf[2*j + 1] = 10*playout_current_length(s);
                 }
-                outframes = afWriteFrames(outhandle, AF_DEFAULT_TRACK, buf, len);
+                outframes = sf_writef_short(outhandle, buf, len);
                 if (outframes != len)
                 {
                     fprintf(stderr, "    Error writing out sound\n");
@@ -224,17 +207,16 @@
             }
         }
     }
-    if (afCloseFile(inhandle) != 0)
+    if (sf_close(inhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", INPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", INPUT_FILE_NAME);
         exit(2);
     }
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
-    afFreeFileSetup(filesetup);
 
     printf("%10" PRId32 " %10" PRId32 " %10d\n", s->state_just_in_time, s->state_late, playout_current_length(s));
 

Modified: freeswitch/trunk/libs/spandsp/tests/plc_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/plc_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/plc_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: plc_tests.c,v 1.25 2008/05/13 13:17:26 steveu Exp $
+ * $Id: plc_tests.c,v 1.26 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page plc_tests_page Packet loss concealment tests
@@ -51,18 +51,18 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "spandsp.h"
+#include "spandsp-sim.h"
 
 #define INPUT_FILE_NAME     "../test-data/local/short_nb_voice.wav"
 #define OUTPUT_FILE_NAME    "post_plc.wav"
 
 int main(int argc, char *argv[])
 {
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
-    AFfilesetup filesetup;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     plc_state_t plc;
     int inframes;
     int outframes;
@@ -106,23 +106,13 @@
             break;
         }
     }
-    if ((filesetup = afNewFileSetup()) == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, (float) SAMPLE_RATE);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
-
     phase_rate = 0;
     inhandle = NULL;
     if (tone < 0)
     {
-        if ((inhandle = afOpenFile(INPUT_FILE_NAME, "r", NULL)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(INPUT_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Failed to open wave file '%s'\n", INPUT_FILE_NAME);
+            fprintf(stderr, "    Failed to open audio file '%s'\n", INPUT_FILE_NAME);
             exit(2);
         }
     }
@@ -130,9 +120,9 @@
     {
         phase_rate = dds_phase_ratef((float) tone);
     }
-    if ((outhandle = afOpenFile(OUTPUT_FILE_NAME, "w", filesetup)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Failed to open wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Failed to open audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
     plc_init(&plc);
@@ -141,10 +131,7 @@
     {
         if (tone < 0)
         {
-            inframes = afReadFrames(inhandle,
-                                    AF_DEFAULT_TRACK,
-                                    amp,
-                                    block_len);
+            inframes = sf_readf_short(inhandle, amp, block_len);
             if (inframes != block_len)
                 break;
         }
@@ -170,10 +157,7 @@
             if (block_synthetic)
                 memset(amp, 0, sizeof(int16_t)*inframes);
         }
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  inframes);
+        outframes = sf_writef_short(outhandle, amp, inframes);
         if (outframes != inframes)
         {
             fprintf(stderr, "    Error writing out sound\n");
@@ -183,18 +167,17 @@
     printf("Dropped %d of %d blocks\n", lost_blocks, block_no);
     if (tone < 0)
     {
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", INPUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", INPUT_FILE_NAME);
             exit(2);
         }
     }
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
-    afFreeFileSetup(filesetup);
     return 0;
 }
 /*- End of function --------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/tests/power_meter_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/power_meter_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/power_meter_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: power_meter_tests.c,v 1.22 2008/11/30 10:17:31 steveu Exp $
+ * $Id: power_meter_tests.c,v 1.24 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page power_meter_tests_page Power meter tests
@@ -40,16 +40,177 @@
 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
 //#endif
 
 #include "spandsp.h"
+#include "spandsp-sim.h"
 
-int main(int argc, char *argv[])
+#define IN_FILE_NAME        "../test-data/local/short_nb_voice.wav"
+#define OUT_FILE_NAME       "power_meter_tests.wav"
+
+static int power_surge_detector_tests(void)
+{
+    SNDFILE *outhandle;
+    power_surge_detector_state_t *sig;
+    int i;
+    int sample;
+    int16_t amp[8000];
+    int16_t amp_out[2*8000];
+    awgn_state_t *awgnx;
+    int32_t phase_rate;
+    uint32_t phase_acc;
+    int16_t phase_scale;
+    float signal_power;
+    int32_t signal_level;
+    int signal_present;
+    int prev_signal_present;
+    int ok;
+    int extremes[4];
+
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 2)) == NULL)
+    {
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
+        exit(2);
+    }
+    sig = power_surge_detector_init(NULL, -50.0f, 5.0f);
+    prev_signal_present = FALSE;
+
+    phase_rate = dds_phase_rate(450.0f);
+    phase_acc = 0;
+
+    phase_scale = dds_scaling_dbm0(-33.0f);
+    awgnx = awgn_init_dbm0(NULL, 1234567, -45.0f);
+
+    extremes[0] = 8001;
+    extremes[1] = -1;
+    extremes[2] = 8001;
+    extremes[3] = -1;
+    for (sample = 0;  sample < 800000;  sample += 8000)
+    {
+        ok = 0;
+        for (i = 0;  i < 8000;  i++)
+        {
+            amp[i] = awgn(awgnx);
+            if (i < 4000)
+                amp[i] += dds_mod(&phase_acc, phase_rate, phase_scale, 0);
+
+            signal_level = power_surge_detector(sig, amp[i]);
+            signal_present = (signal_level != 0);
+            if (prev_signal_present != signal_present)
+            {
+                signal_power = power_surge_detector_current_dbm0(sig);
+                if (signal_present) 
+                {
+                    if (ok == 0  &&  i >= 0  &&  i < 25)
+                        ok = 1;
+                    if (extremes[0] > i)
+                        extremes[0] = i;
+                    if (extremes[1] < i)
+                        extremes[1] = i;
+                    printf("On at %f (%fdBm0)\n", (sample + i)/8000.0, signal_power);
+                }
+                else
+                {
+                    if (ok == 1  &&  i >= 4000 + 0  &&  i < 4000 + 35)
+                        ok = 2;
+                    if (extremes[2] > i)
+                        extremes[2] = i;
+                    if (extremes[3] < i)
+                        extremes[3] = i;
+                    printf("Off at %f (%fdBm0)\n", (sample + i)/8000.0, signal_power);
+                }                    
+                prev_signal_present = signal_present;
+            }
+            amp_out[2*i] = amp[i];
+            amp_out[2*i + 1] = signal_present*5000;
+        }
+        sf_writef_short(outhandle, amp_out, 8000);
+        if (ok != 2
+            ||
+            extremes[0] < 1
+            ||
+            extremes[1] > 30
+            ||
+            extremes[2] < 4001
+            ||
+            extremes[3] > 4030)
+        {
+            printf("    Surge not detected correctly (%d)\n", ok);
+            exit(2);
+        }
+    }
+    sf_close(outhandle);
+    printf("Min on %d, max on %d, min off %d, max off %d\n", extremes[0], extremes[1], extremes[2], extremes[3]);
+    return 0;
+}
+/*- End of function --------------------------------------------------------*/
+
+static int power_surge_detector_file_test(const char *file)
+{
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
+    int inframes;
+    power_surge_detector_state_t *sig;
+    int i;
+    int16_t amp[8000];
+    int16_t amp_out[2*8000];
+    int sample;
+    float signal_power;
+    int32_t signal_level;
+    int signal_present;
+    int prev_signal_present;
+
+    if ((inhandle = sf_open_telephony_read(file, 1)) == NULL)
+    {
+        printf("    Cannot open speech file '%s'\n", file);
+        exit(2);
+    }
+
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
+    {
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
+        exit(2);
+    }
+    sig = power_surge_detector_init(NULL, -50.0f, 6.0f);
+    prev_signal_present = FALSE;
+
+    sample = 0;
+    while ((inframes = sf_readf_short(inhandle, amp, 8000)))
+    {
+        for (i = 0;  i < inframes;  i++)
+        {
+            signal_level = power_surge_detector(sig, amp[i]);
+            signal_present = (signal_level != 0);
+            if (prev_signal_present != signal_present)
+            {
+                signal_power = power_surge_detector_current_dbm0(sig);
+                if (signal_present)
+                    printf("On at %f (%fdBm0)\n", (sample + i)/8000.0, signal_power);
+                else
+                    printf("Off at %f (%fdBm0)\n", (sample + i)/8000.0, signal_power);
+                prev_signal_present = signal_present;
+            }
+            amp_out[2*i] = amp[i];
+            amp_out[2*i + 1] = signal_present*5000;
+        }
+        sf_writef_short(outhandle, amp_out, inframes);
+        sample += inframes;
+    }
+    sf_close(inhandle);
+    sf_close(outhandle);
+    return 0;
+}
+/*- End of function --------------------------------------------------------*/
+
+static int power_meter_tests(void)
 {
     awgn_state_t noise_source;
     power_meter_t meter;
@@ -62,6 +223,9 @@
     int32_t level;
 
     power_meter_init(&meter, 7);
+    printf("Testing with zero in the power register\n");
+    printf("Power: expected %fdBm0, got %fdBm0\n", -90.169f, power_meter_current_dbm0(&meter));
+    printf("Power: expected %fdBOv, got %fdBOv\n", -96.329f, power_meter_current_dbov(&meter));
 
     printf("Testing with a square wave 10dB from maximum\n");
     for (i = 0;  i < 1000;  i++)
@@ -159,8 +323,46 @@
         printf("Test failed (dBOv)\n");
         exit(2);
     }
+    return 0;
+}
+/*- End of function --------------------------------------------------------*/
+
+int main(int argc, char *argv[])
+{
+    int basic_tests;
+    int decode;
+    int opt;
+    const char *in_file;
+
+    basic_tests = TRUE;
+    decode = FALSE;
+    in_file = IN_FILE_NAME;
+    while ((opt = getopt(argc, argv, "d:")) != -1)
+    {
+        switch (opt)
+        {
+        case 'd':
+            in_file = optarg;
+            basic_tests = FALSE;
+            decode = TRUE;
+            break;
+        default:
+            //usage();
+            exit(2);
+        }
+    }
+
+    if (basic_tests)
+    {
+        power_meter_tests();
+        power_surge_detector_tests();
+    }
+    if (decode)
+    {
+        power_surge_detector_file_test(in_file);
+    }
     printf("Tests passed\n");
-    return  0;
+    return 0;
 }
 /*- End of function --------------------------------------------------------*/
 /*- End of file ------------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/tests/r2_mf_rx_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/r2_mf_rx_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/r2_mf_rx_tests.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: r2_mf_rx_tests.c,v 1.13 2009/04/11 18:11:19 steveu Exp $
+ * $Id: r2_mf_rx_tests.c,v 1.14 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -51,7 +51,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES

Modified: freeswitch/trunk/libs/spandsp/tests/r2_mf_tx_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/r2_mf_tx_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/r2_mf_tx_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: r2_mf_tx_tests.c,v 1.15 2008/11/30 10:17:31 steveu Exp $
+ * $Id: r2_mf_tx_tests.c,v 1.16 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -47,7 +47,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -63,14 +63,14 @@
     r2_mf_tx_state_t gen;
     int16_t amp[1000];
     int len;
-    AFfilehandle outhandle;
+    SNDFILE *outhandle;
     int outframes;
     int digit;
     const char *digits = "0123456789BCDEF";
 
-    if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
 
@@ -81,22 +81,12 @@
         len = r2_mf_tx(&gen, amp, 1000);
         printf("Generated %d samples of %c\n", len, digits[digit]);
         if (len > 0)
-        {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      len);
-        }
+            outframes = sf_writef_short(outhandle, amp, len);
         r2_mf_tx_put(&gen, 0);
         len = r2_mf_tx(&gen, amp, 1000);
         printf("Generated %d samples\n", len);
         if (len > 0)
-        {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      len);
-        }
+            outframes = sf_writef_short(outhandle, amp, len);
     }
 
     r2_mf_tx_init(&gen, TRUE);
@@ -106,27 +96,17 @@
         len = r2_mf_tx(&gen, amp, 1000);
         printf("Generated %d samples of %c\n", len, digits[digit]);
         if (len > 0)
-        {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      len);
-        }
+            outframes = sf_writef_short(outhandle, amp, len);
         r2_mf_tx_put(&gen, 0);
         len = r2_mf_tx(&gen, amp, 1000);
         printf("Generated %d samples\n", len);
         if (len > 0)
-        {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      len);
-        }
+            outframes = sf_writef_short(outhandle, amp, len);
     }
 
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
         exit (2);
     }
 

Modified: freeswitch/trunk/libs/spandsp/tests/regression_tests.sh
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/regression_tests.sh	(original)
+++ freeswitch/trunk/libs/spandsp/tests/regression_tests.sh	Thu Jun 18 01:13:59 2009
@@ -17,7 +17,7 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $Id: regression_tests.sh,v 1.56 2009/04/02 13:43:49 steveu Exp $
+# $Id: regression_tests.sh,v 1.58 2009/05/19 14:47:02 steveu Exp $
 #
 
 ITUTESTS_TIF=../test-data/itu/fax/itutests.tif
@@ -686,28 +686,28 @@
 #echo tone_generate_tests completed OK
 echo tone_generate_tests not enabled
 
-./v17_tests -b 14400 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v17_tests -b 14400 -s -42 -n -66 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then
     echo v17_tests failed!
     exit $RETVAL
 fi
-./v17_tests -b 12000 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v17_tests -b 12000 -s -42 -n -61 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then
     echo v17_tests failed!
     exit $RETVAL
 fi
-./v17_tests -b 9600 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v17_tests -b 9600 -s -42 -n -59 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then
     echo v17_tests failed!
     exit $RETVAL
 fi
-./v17_tests -b 7200 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v17_tests -b 7200 -s -42 -n -56 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then
@@ -733,14 +733,14 @@
 #echo v22bis_tests completed OK
 echo v22bis_tests not enabled
 
-./v27ter_tests -b 4800 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v27ter_tests -b 4800 -s -42 -n -57 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then
     echo v27ter_tests failed!
     exit $RETVAL
 fi
-./v27ter_tests -b 2400 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v27ter_tests -b 2400 -s -42 -n -51 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then
@@ -749,21 +749,21 @@
 fi
 echo v27ter_tests completed OK
 
-./v29_tests -b 9600 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v29_tests -b 9600 -s -42 -n -62 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then
     echo v29_tests failed!
     exit $RETVAL
 fi
-./v29_tests -b 7200 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v29_tests -b 7200 -s -42 -n -58 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then
     echo v29_tests failed!
     exit $RETVAL
 fi
-./v29_tests -b 4800 -s -42 >$STDOUT_DEST 2>$STDERR_DEST
+./v29_tests -b 4800 -s -42 -n -54 >$STDOUT_DEST 2>$STDERR_DEST
 RETVAL=$?
 if [ $RETVAL != 0 ]
 then

Modified: freeswitch/trunk/libs/spandsp/tests/rfc2198_sim_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/rfc2198_sim_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/rfc2198_sim_tests.c	Thu Jun 18 01:13:59 2009
@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: rfc2198_sim_tests.c,v 1.6 2008/11/30 10:17:31 steveu Exp $
+ * $Id: rfc2198_sim_tests.c,v 1.7 2009/05/30 15:23:14 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -41,7 +41,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #if defined(HAVE_MATH_H)
 #define GEN_CONST
 #endif

Modified: freeswitch/trunk/libs/spandsp/tests/sig_tone_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/sig_tone_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/sig_tone_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: sig_tone_tests.c,v 1.24 2008/11/30 10:17:31 steveu Exp $
+ * $Id: sig_tone_tests.c,v 1.25 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -42,7 +42,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -171,7 +171,7 @@
 {
     int16_t amp[SAMPLES_PER_CHUNK];
     int16_t out_amp[2*SAMPLES_PER_CHUNK];
-    AFfilehandle outhandle;
+    SNDFILE *outhandle;
     int outframes;
     int i;
     int type;
@@ -182,9 +182,9 @@
     awgn_state_t noise_source;
     codec_munge_state_t *munge;
 
-    if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 2)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 2)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
     /*endif*/
@@ -240,13 +240,10 @@
             for (i = 0;  i < rx_samples;  i++)
                 out_amp[2*i + 1] = amp[i];
             /*endfor*/
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      out_amp,
-                                      rx_samples);
+            outframes = sf_writef_short(outhandle, out_amp, rx_samples);
             if (outframes != rx_samples)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
             /*endif*/
@@ -254,9 +251,9 @@
         /*endfor*/
     }
     /*endfor*/
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
     /*endif*/

Modified: freeswitch/trunk/libs/spandsp/tests/super_tone_rx_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/super_tone_rx_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/super_tone_rx_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: super_tone_rx_tests.c,v 1.30 2008/11/30 10:17:31 steveu Exp $
+ * $Id: super_tone_rx_tests.c,v 1.33 2009/06/02 14:55:36 steveu Exp $
  */
 
 /*! \file */
@@ -42,8 +42,7 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
 
 #if defined(HAVE_LIBXML_XMLMEMORY_H)
 #include 
@@ -60,6 +59,7 @@
 //#endif
 
 #include "spandsp.h"
+#include "spandsp-sim.h"
 
 #define IN_FILE_NAME    "super_tone.wav"
 
@@ -80,7 +80,7 @@
 
 const char *tone_names[20] = {NULL};
 
-AFfilehandle inhandle;
+SNDFILE *inhandle;
 
 super_tone_rx_segment_t tone_segments[20][10];
 
@@ -378,24 +378,9 @@
     super_tone_rx_state_t *super;
     super_tone_rx_descriptor_t desc;
 
-    if ((inhandle = afOpenFile(IN_FILE_NAME, "r", 0)) == AF_NULL_FILEHANDLE)
+    if ((inhandle = sf_open_telephony_read(IN_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", IN_FILE_NAME);
-        exit(2);
-    }
-    if ((x = afGetFrameSize(inhandle, AF_DEFAULT_TRACK, 1)) != 2.0)
-    {
-        printf("    Unexpected frame size in wave file '%s'\n", IN_FILE_NAME);
-        exit(2);
-    }
-    if ((x = afGetRate(inhandle, AF_DEFAULT_TRACK)) != (float) SAMPLE_RATE)
-    {
-        printf("    Unexpected sample rate in wave file '%s'\n", IN_FILE_NAME);
-        exit(2);
-    }
-    if ((x = afGetChannels(inhandle, AF_DEFAULT_TRACK)) != 1.0)
-    {
-        printf("    Unexpected number of channels in wave file '%s'\n", IN_FILE_NAME);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", IN_FILE_NAME);
         exit(2);
     }
     super_tone_rx_make_descriptor(&desc);
@@ -411,7 +396,7 @@
     super_tone_rx_segment_callback(super, tone_segment);
     awgn_init_dbm0(&noise_source, 1234567, -30.0f);
     printf("Processing file\n");
-    while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, 8000)))
+    while ((frames = sf_readf_short(inhandle, amp, 8000)))
     {
         /* Add some noise to the signal for a more meaningful test. */
         //for (sample = 0;  sample < frames;  sample++)
@@ -422,7 +407,7 @@
             sample += x;
         }
     }
-    if (afCloseFile(inhandle))
+    if (sf_close(inhandle))
     {
         fprintf(stderr, "    Cannot close audio file '%s'\n", IN_FILE_NAME);
         exit(2);
@@ -431,27 +416,12 @@
     /* Test for voice immunity */
     for (j = 0;  bellcore_files[j][0];  j++)
     {
-        if ((inhandle = afOpenFile(bellcore_files[j], "r", 0)) == AF_NULL_FILEHANDLE)
-        {
-            printf("    Cannot open wave file '%s'\n", bellcore_files[j]);
-            exit(2);
-        }
-        if ((x = afGetFrameSize(inhandle, AF_DEFAULT_TRACK, 1)) != 2.0)
-        {
-            printf("    Unexpected frame size in wave file '%s'\n", bellcore_files[j]);
-            exit(2);
-        }
-        if ((x = afGetRate(inhandle, AF_DEFAULT_TRACK)) != (float) SAMPLE_RATE)
-        {
-            printf("    Unexpected sample rate in wave file '%s'\n", bellcore_files[j]);
-            exit(2);
-        }
-        if ((x = afGetChannels(inhandle, AF_DEFAULT_TRACK)) != 1.0)
+        if ((inhandle = sf_open_telephony_read(bellcore_files[j], 1)) == NULL)
         {
-            printf("    Unexpected number of channels in wave file '%s'\n", bellcore_files[j]);
+            printf("    Cannot open audio file '%s'\n", bellcore_files[j]);
             exit(2);
         }
-        while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, 8000)))
+        while ((frames = sf_readf_short(inhandle, amp, 8000)))
         {
             for (sample = 0;  sample < frames;  )
             {
@@ -459,7 +429,7 @@
                 sample += x;
             }
     	}
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
     	{
     	    printf("    Cannot close speech file '%s'\n", bellcore_files[j]);
             exit(2);

Modified: freeswitch/trunk/libs/spandsp/tests/super_tone_tx_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/super_tone_tx_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/super_tone_tx_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: super_tone_tx_tests.c,v 1.25 2009/02/10 17:44:18 steveu Exp $
+ * $Id: super_tone_tx_tests.c,v 1.26 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -44,7 +44,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #if defined(HAVE_LIBXML_XMLMEMORY_H)
 #include 
@@ -65,7 +65,7 @@
 
 #define OUT_FILE_NAME   "super_tone.wav"
 
-AFfilehandle outhandle;
+SNDFILE *outhandle;
 
 super_tone_tx_step_t *tone_tree = NULL;
 
@@ -82,13 +82,10 @@
     do
     {
         len = super_tone_tx(tone, amp, 160);
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
         if (outframes != len)
         {
-            fprintf(stderr, "    Error writing wave file\n");
+            fprintf(stderr, "    Error writing audio file\n");
             exit(2);
         }
         total_length += len;
@@ -286,7 +283,7 @@
 
 int main(int argc, char *argv[])
 {
-    if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
     {
         fprintf(stderr, "    Cannot open audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
@@ -294,7 +291,7 @@
 #if defined(HAVE_LIBXML2)
     get_tone_set("../spandsp/global-tones.xml", (argc > 1)  ?  argv[1]  :  "hk");
 #endif
-    if (afCloseFile (outhandle) != 0)
+    if (sf_close (outhandle) != 0)
     {
         fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
         exit(2);

Modified: freeswitch/trunk/libs/spandsp/tests/t31_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/t31_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/t31_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t31_tests.c,v 1.71 2009/02/20 12:38:37 steveu Exp $
+ * $Id: t31_tests.c,v 1.72 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -48,7 +48,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -661,8 +661,8 @@
     int16_t out_amp[2*SAMPLES_PER_CHUNK];
     int t30_len;
     int t31_len;
-    AFfilehandle wave_handle;
-    AFfilehandle in_handle;
+    SNDFILE *wave_handle;
+    SNDFILE *in_handle;
     int fast_send;
     int fast_send_tcf;
     int fast_blocks;
@@ -671,12 +671,12 @@
     logging_state_t *logging;
     int i;
 
-    wave_handle = AF_NULL_FILEHANDLE;
+    wave_handle = NULL;
     if (log_audio)
     {
-        if ((wave_handle = afOpenFile_telephony_write(OUTPUT_WAVE_FILE_NAME, 2)) == AF_NULL_FILEHANDLE)
+        if ((wave_handle = sf_open_telephony_write(OUTPUT_WAVE_FILE_NAME, 2)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_WAVE_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_WAVE_FILE_NAME);
             exit(2);
         }
     }
@@ -686,9 +686,9 @@
     in_handle = NULL;
     if (decode_test_file)
     {
-        if ((in_handle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        if ((in_handle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
@@ -864,24 +864,24 @@
 
         if (log_audio)
         {
-            outframes = afWriteFrames(wave_handle, AF_DEFAULT_TRACK, out_amp, SAMPLES_PER_CHUNK);
+            outframes = sf_writef_short(wave_handle, out_amp, SAMPLES_PER_CHUNK);
             if (outframes != SAMPLES_PER_CHUNK)
                 break;
         }
     }
     if (decode_test_file)
     {
-        if (afCloseFile(in_handle) != 0)
+        if (sf_close(in_handle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
     if (log_audio)
     {
-        if (afCloseFile(wave_handle) != 0)
+        if (sf_close(wave_handle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_WAVE_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_WAVE_FILE_NAME);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/t38_gateway_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/t38_gateway_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/t38_gateway_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t38_gateway_tests.c,v 1.81 2009/04/25 14:27:18 steveu Exp $
+ * $Id: t38_gateway_tests.c,v 1.82 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -51,7 +51,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #if !defined(_WIN32)
 #include 
 #endif
@@ -234,7 +234,7 @@
     int msg_len;
     uint8_t msg[1024];
     int outframes;
-    AFfilehandle wave_handle;
+    SNDFILE *wave_handle;
     int use_ecm;
     int use_tep;
     int feedback_audio;
@@ -327,12 +327,12 @@
     if (use_ecm)
         printf("Using ECM\n");
 
-    wave_handle = AF_NULL_FILEHANDLE;
+    wave_handle = NULL;
     if (log_audio)
     {
-        if ((wave_handle = afOpenFile_telephony_write(OUTPUT_FILE_NAME_WAVE, 4)) == AF_NULL_FILEHANDLE)
+        if ((wave_handle = sf_open_telephony_write(OUTPUT_FILE_NAME_WAVE, 4)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
             exit(2);
         }
     }
@@ -599,7 +599,7 @@
         }
         if (log_audio)
         {
-            outframes = afWriteFrames(wave_handle, AF_DEFAULT_TRACK, out_amp, SAMPLES_PER_CHUNK);
+            outframes = sf_writef_short(wave_handle, out_amp, SAMPLES_PER_CHUNK);
             if (outframes != SAMPLES_PER_CHUNK)
                 break;
         }
@@ -627,9 +627,9 @@
     fax_release(fax_state_b);
     if (log_audio)
     {
-        if (afCloseFile(wave_handle) != 0)
+        if (sf_close(wave_handle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/t38_gateway_to_terminal_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/t38_gateway_to_terminal_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/t38_gateway_to_terminal_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t38_gateway_to_terminal_tests.c,v 1.65 2009/04/25 14:27:18 steveu Exp $
+ * $Id: t38_gateway_to_terminal_tests.c,v 1.66 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -51,7 +51,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #if !defined(_WIN32)
 #include 
 #endif
@@ -208,7 +208,7 @@
     int use_tep;
     int feedback_audio;
     int use_transmit_on_idle;
-    AFfilehandle wave_handle;
+    SNDFILE *wave_handle;
     const char *input_file_name;
     int i;
     int seq_no;
@@ -288,12 +288,12 @@
     if (use_ecm)
         printf("Using ECM\n");
 
-    wave_handle = AF_NULL_FILEHANDLE;
+    wave_handle = NULL;
     if (log_audio)
     {
-        if ((wave_handle = afOpenFile_telephony_write(OUTPUT_FILE_NAME_WAVE, 2)) == AF_NULL_FILEHANDLE)
+        if ((wave_handle = sf_open_telephony_write(OUTPUT_FILE_NAME_WAVE, 2)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
             exit(2);
         }
     }
@@ -482,7 +482,7 @@
         }
         if (log_audio)
         {
-            outframes = afWriteFrames(wave_handle, AF_DEFAULT_TRACK, out_amp, SAMPLES_PER_CHUNK);
+            outframes = sf_writef_short(wave_handle, out_amp, SAMPLES_PER_CHUNK);
             if (outframes != SAMPLES_PER_CHUNK)
                 break;
         }
@@ -498,9 +498,9 @@
     t38_terminal_release(t38_state_b);
     if (log_audio)
     {
-        if (afCloseFile(wave_handle) != 0)
+        if (sf_close(wave_handle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/t38_terminal_to_gateway_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/t38_terminal_to_gateway_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/t38_terminal_to_gateway_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t38_terminal_to_gateway_tests.c,v 1.64 2009/04/25 14:27:19 steveu Exp $
+ * $Id: t38_terminal_to_gateway_tests.c,v 1.65 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -51,7 +51,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #if !defined(_WIN32)
 #include 
 #endif
@@ -203,7 +203,7 @@
     uint8_t msg[1024];
     int log_audio;
     int outframes;
-    AFfilehandle wave_handle;
+    SNDFILE *wave_handle;
     int t38_version;
     int use_ecm;
     int use_tep;
@@ -288,12 +288,12 @@
     if (use_ecm)
         printf("Using ECM\n");
 
-    wave_handle = AF_NULL_FILEHANDLE;
+    wave_handle = NULL;
     if (log_audio)
     {
-        if ((wave_handle = afOpenFile_telephony_write(OUTPUT_FILE_NAME_WAVE, 2)) == AF_NULL_FILEHANDLE)
+        if ((wave_handle = sf_open_telephony_write(OUTPUT_FILE_NAME_WAVE, 2)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
             exit(2);
         }
     }
@@ -482,7 +482,7 @@
         }
         if (log_audio)
         {
-            outframes = afWriteFrames(wave_handle, AF_DEFAULT_TRACK, out_amp, SAMPLES_PER_CHUNK);
+            outframes = sf_writef_short(wave_handle, out_amp, SAMPLES_PER_CHUNK);
             if (outframes != SAMPLES_PER_CHUNK)
                 break;
         }
@@ -498,9 +498,9 @@
     fax_release(fax_state_b);
     if (log_audio)
     {
-        if (afCloseFile(wave_handle) != 0)
+        if (sf_close(wave_handle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/t4_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/t4_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/t4_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t4_tests.c,v 1.68 2009/03/01 12:39:02 steveu Exp $
+ * $Id: t4_tests.c,v 1.69 2009/05/16 03:34:45 steveu Exp $
  */
 
 /*! \file */

Modified: freeswitch/trunk/libs/spandsp/tests/testadsi.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/testadsi.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/testadsi.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: testadsi.c,v 1.22 2008/05/13 13:17:26 steveu Exp $
+ * $Id: testadsi.c,v 1.23 2009/05/30 15:23:14 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -46,7 +46,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include "unicall.h"
@@ -59,8 +59,8 @@
 #define TRUE (!FALSE)
 
 int caller_mode = FALSE;
-static AFfilehandle rxhandle;
-static AFfilehandle txhandle;
+static SNDFILE *rxhandle;
+static SNDFILE *txhandle;
 
 #if 0
 int adsi_create_message(adsi_tx_state_t *s, uint8_t *msg)
@@ -196,7 +196,7 @@
     for (i = 0;  i < len;  i++)
         pcm_buf[i] = alaw_to_linear(buf[i]);
     /*endfor*/
-    outframes = afWriteFrames(rxhandle,
+    outframes = sf_writef_short(rxhandle,
                               AF_DEFAULT_TRACK,
                               pcm_buf,
                               len);
@@ -254,7 +254,7 @@
             printf("Message put - %d bytes\n", len);
     }
     len = adsi_tx(&(chan_stuff[chan].adsi_tx), pcm_buf, max_len);
-    afWriteFrames(txhandle,
+    sf_writef_short(txhandle,
                   AF_DEFAULT_TRACK,
                   pcm_buf,
                   len);
@@ -563,13 +563,13 @@
     afInitFileFormat(filesetup, AF_FILE_WAVE);
     afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
     rxhandle = afOpenFile("rxadsi.wav", "w", filesetup);
-    if (rxhandle == AF_NULL_FILEHANDLE)
+    if (rxhandle == NULL)
     {
         fprintf(stderr, "    Failed to open adsi audio file\n");
         exit(2);
     }
     txhandle = afOpenFile("txadsi.wav", "w", filesetup);
-    if (txhandle == AF_NULL_FILEHANDLE)
+    if (txhandle == NULL)
     {
         fprintf(stderr, "    Failed to open adsi audio file\n");
         exit(2);

Modified: freeswitch/trunk/libs/spandsp/tests/testfax.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/testfax.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/testfax.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: testfax.c,v 1.32 2008/05/13 13:17:26 steveu Exp $
+ * $Id: testfax.c,v 1.33 2009/05/30 15:23:14 steveu Exp $
  */
 
 #if defined(HAVE_CONFIG_H)
@@ -46,7 +46,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include "unicall.h"
@@ -57,8 +57,8 @@
 #include "spandsp.h"
 
 int caller_mode = FALSE;
-static AFfilehandle rxhandle;
-static AFfilehandle txhandle;
+static SNDFILE *rxhandle;
+static SNDFILE *txhandle;
 
 typedef struct
 {
@@ -104,7 +104,7 @@
     int outframes;
 
 #if 0
-    outframes = afWriteFrames(rxhandle,
+    outframes = sf_writef_short(rxhandle,
                               AF_DEFAULT_TRACK,
                               buf,
                               len >> 1);
@@ -149,7 +149,7 @@
     int len;
 
     len = t30_tx(&(chan_stuff[chan].fax), (int16_t *) buf, max_len >> 1);
-    afWriteFrames(txhandle, AF_DEFAULT_TRACK, buf, len);
+    sf_writef_short(txhandle, AF_DEFAULT_TRACK, buf, len);
     if (len > 0)
         len <<= 1;
     return len;
@@ -532,13 +532,13 @@
     afInitFileFormat(filesetup, AF_FILE_WAVE);
     afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
     rxhandle = afOpenFile("rxfax.wav", "w", filesetup);
-    if (rxhandle == AF_NULL_FILEHANDLE)
+    if (rxhandle == NULL)
     {
         fprintf(stderr, "    Failed to open fax audio file\n");
         exit(2);
     }
     txhandle = afOpenFile("txfax.wav", "w", filesetup);
-    if (txhandle == AF_NULL_FILEHANDLE)
+    if (txhandle == NULL)
     {
         fprintf(stderr, "    Failed to open fax audio file\n");
         exit(2);

Modified: freeswitch/trunk/libs/spandsp/tests/time_scale_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/time_scale_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/time_scale_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: time_scale_tests.c,v 1.23 2008/11/15 14:27:29 steveu Exp $
+ * $Id: time_scale_tests.c,v 1.24 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page time_scale_tests_page Time scaling tests
@@ -44,7 +44,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include "spandsp.h"
 
@@ -57,9 +57,9 @@
 
 int main(int argc, char *argv[])
 {
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
-    AFfilesetup filesetup;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
+    SF_INFO info;
     int16_t in[BLOCK_LEN];
     int16_t out[5*(BLOCK_LEN + TIME_SCALE_MAX_SAMPLE_RATE/TIME_SCALE_MIN_PITCH)];
     int frames;
@@ -68,7 +68,6 @@
     int count;
     int max;
     time_scale_state_t state;
-    float x;
     float rate;
     float sample_rate;
     const char *in_file_name;
@@ -97,35 +96,29 @@
             break;
         }
     }
-    if ((inhandle = afOpenFile(in_file_name, "r", 0)) == AF_NULL_FILEHANDLE)
+    if ((inhandle = sf_open(in_file_name, SFM_READ, &info)) == NULL)
     {
-        printf("    Cannot open wave file '%s'\n", in_file_name);
+        printf("    Cannot open audio file '%s'\n", in_file_name);
         exit(2);
     }
-    if ((x = afGetFrameSize(inhandle, AF_DEFAULT_TRACK, 1)) != 2.0)
+    if (info.channels != 1)
     {
-        printf("    Unexpected frame size in wave file '%s'\n", in_file_name);
+        printf("    Unexpected number of channels in audio file '%s'\n", in_file_name);
         exit(2);
     }
-    if ((x = afGetChannels(inhandle, AF_DEFAULT_TRACK)) != 1.0)
-    {
-        printf("    Unexpected number of channels in wave file '%s'\n", in_file_name);
-        exit(2);
-    }
-    sample_rate = afGetRate(inhandle, AF_DEFAULT_TRACK);
+    sample_rate = info.samplerate;
 
-    if ((filesetup = afNewFileSetup()) == AF_NULL_FILESETUP)
-    {
-        fprintf(stderr, "    Failed to create file setup\n");
-        exit(2);
-    }
-    afInitSampleFormat(filesetup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
-    afInitRate(filesetup, AF_DEFAULT_TRACK, sample_rate);
-    afInitFileFormat(filesetup, AF_FILE_WAVE);
-    afInitChannels(filesetup, AF_DEFAULT_TRACK, 1);
-    if ((outhandle = afOpenFile(OUT_FILE_NAME, "w", filesetup)) == AF_NULL_FILEHANDLE)
+    memset(&info, 0, sizeof(info));
+    info.frames = 0;
+    info.samplerate = sample_rate;
+    info.channels = 1;
+    info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+    info.sections = 1;
+    info.seekable = 1;
+
+    if ((outhandle = sf_open(OUT_FILE_NAME, SFM_WRITE, &info)) == NULL)
     {
-        fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+        fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
 
@@ -137,13 +130,13 @@
     max = time_scale_max_output_len(&state, BLOCK_LEN);
     printf("Rate is %f, longest output block is %d\n", rate, max);
     count = 0;
-    while ((frames = afReadFrames(inhandle, AF_DEFAULT_TRACK, in, BLOCK_LEN)))
+    while ((frames = sf_readf_short(inhandle, in, BLOCK_LEN)))
     {
         new_frames = time_scale(&state, out, in, frames);
-        out_frames = afWriteFrames(outhandle, AF_DEFAULT_TRACK, out, new_frames);
+        out_frames = sf_writef_short(outhandle, out, new_frames);
         if (out_frames != new_frames)
         {
-            fprintf(stderr, "    Error writing wave file\n");
+            fprintf(stderr, "    Error writing audio file\n");
             exit(2);
         }
         if (sweep_rate  &&  ++count > 100)
@@ -160,17 +153,16 @@
             count = 0;
         }
     }
-    if (afCloseFile(inhandle) != 0)
+    if (sf_close(inhandle) != 0)
     {
-        printf("    Cannot close wave file '%s'\n", in_file_name);
+        printf("    Cannot close audio file '%s'\n", in_file_name);
         exit(2);
     }
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        printf("    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+        printf("    Cannot close audio file '%s'\n", OUT_FILE_NAME);
         exit(2);
     }
-    afFreeFileSetup(filesetup);
     return 0;
 }
 /*- End of function --------------------------------------------------------*/

Modified: freeswitch/trunk/libs/spandsp/tests/tone_detect_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/tone_detect_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/tone_detect_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: tone_detect_tests.c,v 1.11 2008/11/30 12:38:27 steveu Exp $
+ * $Id: tone_detect_tests.c,v 1.12 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page tone_detect_tests_page Tone detection tests
@@ -38,7 +38,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES

Modified: freeswitch/trunk/libs/spandsp/tests/tone_generate_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/tone_generate_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/tone_generate_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: tone_generate_tests.c,v 1.21 2008/11/30 10:17:31 steveu Exp $
+ * $Id: tone_generate_tests.c,v 1.22 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page tone_generate_tests_page Tone generation tests
@@ -38,7 +38,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -56,12 +56,12 @@
     int i;
     int16_t amp[16384];
     int len;
-    AFfilehandle outhandle;
+    SNDFILE *outhandle;
     int outframes;
 
-    if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+    if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", OUTPUT_FILE_NAME);
         exit(2);
     }
 
@@ -84,10 +84,7 @@
         printf("Generated %d samples\n", len);
         if (len <= 0)
             break;
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
     }
     
     /* Try a different tone pair */
@@ -109,10 +106,7 @@
         printf("Generated %d samples\n", len);
         if (len <= 0)
             break;
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
     }
 
     /* Try a different tone pair */
@@ -134,10 +128,7 @@
         printf("Generated %d samples\n", len);
         if (len <= 0)
             break;
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
     }
 
     /* Try a single tone */
@@ -159,10 +150,7 @@
         printf("Generated %d samples\n", len);
         if (len <= 0)
             break;
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
     }
 
     /* Try a single non-repeating tone */
@@ -184,10 +172,7 @@
         printf("Generated %d samples\n", len);
         if (len <= 0)
             break;
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
     }
 
     /* Try a single non-repeating tone at 0dBm0 */
@@ -209,10 +194,7 @@
         printf("Generated %d samples\n", len);
         if (len <= 0)
             break;
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
     }
 
     /* Try an AM modulated tone at a modest modulation level (25%) */
@@ -234,10 +216,7 @@
         printf("Generated %d samples\n", len);
         if (len <= 0)
             break;
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
     }
     
     /* Try an AM modulated tone at maximum modulation level (100%) */
@@ -259,15 +238,12 @@
         printf("Generated %d samples\n", len);
         if (len <= 0)
             break;
-        outframes = afWriteFrames(outhandle,
-                                  AF_DEFAULT_TRACK,
-                                  amp,
-                                  len);
+        outframes = sf_writef_short(outhandle, amp, len);
     }
     
-    if (afCloseFile(outhandle) != 0)
+    if (sf_close(outhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
         exit (2);
     }
 

Modified: freeswitch/trunk/libs/spandsp/tests/tsb85_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/tsb85_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/tsb85_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: tsb85_tests.c,v 1.30 2009/02/20 12:34:20 steveu Exp $
+ * $Id: tsb85_tests.c,v 1.32 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \file */
@@ -47,7 +47,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #if defined(HAVE_LIBXML_XMLMEMORY_H)
 #include 
@@ -75,7 +75,7 @@
 
 #define SAMPLES_PER_CHUNK       160
 
-AFfilehandle out_handle;
+SNDFILE *out_handle;
 
 int use_receiver_not_ready = FALSE;
 int test_local_interrupt = FALSE;
@@ -335,6 +335,7 @@
             {
                 span_log_buf(&s->logging, SPAN_LOG_FLOW, "Expected", awaited, abs(awaited_len));
                 span_log_buf(&s->logging, SPAN_LOG_FLOW, "Received", msg, len);
+                printf("Test failed\n");
                 exit(2);
             }
         }
@@ -359,6 +360,7 @@
 static void faxtester_front_end_step_timeout_handler(faxtester_state_t *s, void *user_data)
 {
     span_log(&s->logging, SPAN_LOG_FLOW, "FAX tester step timed out\n");
+    printf("Test failed\n");
     exit(2);
 }
 /*- End of function --------------------------------------------------------*/
@@ -644,6 +646,7 @@
             return 1;
         }
         /* Finished */
+        printf("Test passed\n");
         exit(0);
     }
     while (s->cur  &&  xmlStrcmp(s->cur->name, (const xmlChar *) "step") != 0)
@@ -651,6 +654,7 @@
     if (s->cur == NULL)
     {
         /* Finished */
+        printf("Test passed\n");
         exit(0);
     }
 
@@ -965,6 +969,7 @@
             if (t4_tx_init(&t4_state, path, -1, -1) == NULL)
             {
                 span_log(&s->logging, SPAN_LOG_FLOW, "Failed to init T.4 send\n");
+                printf("Test failed\n");
                 exit(2);
             }
             t4_tx_set_min_row_bits(&t4_state, min_row_bits);
@@ -981,6 +986,7 @@
             if (t4_tx_start_page(&t4_state))
             {
                 span_log(&s->logging, SPAN_LOG_FLOW, "Failed to start T.4 send\n");
+                printf("Test failed\n");
                 exit(2);
             }
             len = t4_tx_get_chunk(&t4_state, image, sizeof(image));
@@ -1003,6 +1009,7 @@
             if (t4_tx_init(&t4_state, path, -1, -1) == NULL)
             {
                 span_log(&s->logging, SPAN_LOG_FLOW, "Failed to init T.4 send\n");
+                printf("Test failed\n");
                 exit(2);
             }
             t4_tx_set_min_row_bits(&t4_state, min_row_bits);
@@ -1019,6 +1026,7 @@
             if (t4_tx_start_page(&t4_state))
             {
                 span_log(&s->logging, SPAN_LOG_FLOW, "Failed to start T.4 send\n");
+                printf("Test failed\n");
                 exit(2);
             }
             /*endif*/
@@ -1060,9 +1068,10 @@
 
     if (log_audio)
     {
-        if ((out_handle = afOpenFile_telephony_write(OUTPUT_FILE_NAME_WAVE, 2)) == AF_NULL_FILEHANDLE)
+        if ((out_handle = sf_open_telephony_write(OUTPUT_FILE_NAME_WAVE, 2)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            printf("Test failed\n");
             exit(2);
         }
         /*endif*/
@@ -1118,7 +1127,7 @@
             for (i = 0;  i < len;  i++)
                 out_amp[2*i + 1] = amp[i];
             /*endfor*/
-            if (afWriteFrames(out_handle, AF_DEFAULT_TRACK, out_amp, SAMPLES_PER_CHUNK) != SAMPLES_PER_CHUNK)
+            if (sf_writef_short(out_handle, out_amp, SAMPLES_PER_CHUNK) != SAMPLES_PER_CHUNK)
                 break;
             /*endif*/
         }
@@ -1127,9 +1136,10 @@
     /*endfor*/
     if (log_audio)
     {
-        if (afCloseFile(out_handle))
+        if (sf_close(out_handle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME_WAVE);
+            printf("Test failed\n");
             exit(2);
         }
         /*endif*/
@@ -1209,6 +1219,7 @@
     if ((doc = xmlParseFile(test_file)) == NULL)
     {
         fprintf(stderr, "No document\n");
+        printf("Test failed\n");
         exit(2);
     }
     /*endif*/
@@ -1216,6 +1227,7 @@
     if (!xmlValidateDocument(&valid, doc))
     {
         fprintf(stderr, "Invalid document\n");
+        printf("Test failed\n");
         exit(2);
     }
     /*endif*/
@@ -1223,15 +1235,17 @@
     /* Check the document is of the right kind */
     if ((cur = xmlDocGetRootElement(doc)) == NULL)
     {
-        fprintf(stderr, "Empty document\n");
         xmlFreeDoc(doc);
+        fprintf(stderr, "Empty document\n");
+        printf("Test failed\n");
         exit(2);
     }
     /*endif*/
     if (xmlStrcmp(cur->name, (const xmlChar *) "fax-tests"))
     {
-        fprintf(stderr, "Document of the wrong type, root node != fax-tests");
         xmlFreeDoc(doc);
+        fprintf(stderr, "Document of the wrong type, root node != fax-tests");
+        printf("Test failed\n");
         exit(2);
     }
     /*endif*/
@@ -1240,7 +1254,10 @@
         cur = cur->next;
     /*endwhile*/
     if (cur == NULL)
+    {
+        printf("Test failed\n");
         exit(2);
+    }
     /*endif*/
     while (cur)
     {

Modified: freeswitch/trunk/libs/spandsp/tests/tsb85_tests.sh
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/tsb85_tests.sh	(original)
+++ freeswitch/trunk/libs/spandsp/tests/tsb85_tests.sh	Thu Jun 18 01:13:59 2009
@@ -15,7 +15,7 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $Id: tsb85_tests.sh,v 1.7 2009/04/30 15:04:20 steveu Exp $
+# $Id: tsb85_tests.sh,v 1.8 2009/05/24 07:18:36 steveu Exp $
 #
 
 run_tsb85_test()
@@ -35,14 +35,13 @@
     run_tsb85_test
 done
 
-#MRGN14 fails because ???
+#MRGN14 fails because we don't adequately distinguish between receiving a
+#bad image signal and receiving none at all.
 #MRGN16 fails because we don't adequately distinguish between receiving a
 #bad image signal and receiving none at all.
-#MRGN17 fails because we don't adequately distinguish between receiving a
-#bad HDLC message and receiving none at all.
 
 #for TEST in MRGN09 MRGN10 MRGN11 MRGN12 MRGN13 MRGN14 MRGN15 MRGN16 MRGN17 ; do
-for TEST in MRGN09 MRGN10 MRGN11 MRGN12 MRGN13 MRGN15 ; do
+for TEST in MRGN09 MRGN10 MRGN11 MRGN12 MRGN13 MRGN15 MRGN17 ; do
     run_tsb85_test
 done
 
@@ -54,7 +53,7 @@
     run_tsb85_test
 done
 
-# MRGX03 is failing because the V.27ter modemsays it trained on HDLC
+# MRGX03 is failing because the V.27ter modem says it trained on HDLC
 # MRGX05 is failing because we don't distinguish MPS immediately after MCF from MPS after
 # a corrupt image signal.
 
@@ -95,6 +94,8 @@
     run_tsb85_test
 done
 
+#OTEN02 fails because ?????
+
 #for TEST in OTEN01 OTEN02 OTEN03 OTEN04 OTEN05 OTEN06 ; do
 for TEST in OTEN01 OTEN03 OTEN04 OTEN05 OTEN06 ; do
     run_tsb85_test

Modified: freeswitch/trunk/libs/spandsp/tests/v17_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/v17_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/v17_tests.c	Thu Jun 18 01:13:59 2009
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v17_tests.c,v 1.102 2009/04/25 16:30:52 steveu Exp $
+ * $Id: v17_tests.c,v 1.103 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page v17_tests_page V.17 modem tests
@@ -36,7 +36,7 @@
    receive modem. It is also the only test mode provided for evaluating the
    transmit modem.
 
- - A V.17 receive modem is used to decode V.17 audio, stored in a wave file.
+ - A V.17 receive modem is used to decode V.17 audio, stored in a audio file.
    This is good way to evaluate performance with audio recorded from other
    models of modem, and with real world problematic telephone lines.
 
@@ -62,7 +62,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -226,8 +226,8 @@
     bert_results_t bert_results;
     int16_t gen_amp[BLOCK_LEN];
     int16_t amp[BLOCK_LEN];
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int outframes;
     int samples;
     int tep;
@@ -311,20 +311,20 @@
 
     if (log_audio)
     {
-        if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }
 
     if (decode_test_file)
     {
-        /* We will decode the audio from a wave file. */
+        /* We will decode the audio from a file. */
         tx = NULL;
-        if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
@@ -381,10 +381,7 @@
     {
         if (decode_test_file)
         {
-            samples = afReadFrames(inhandle,
-                                   AF_DEFAULT_TRACK,
-                                   amp,
-                                   BLOCK_LEN);
+            samples = sf_readf_short(inhandle, amp, BLOCK_LEN);
 #if defined(ENABLE_GUI)
             if (use_gui)
                 qam_monitor_update_audio_level(qam_monitor, amp, samples);
@@ -445,13 +442,10 @@
             }
             if (log_audio)
             {
-                outframes = afWriteFrames(outhandle,
-                                          AF_DEFAULT_TRACK,
-                                          gen_amp,
-                                          samples);
+                outframes = sf_writef_short(outhandle, gen_amp, samples);
                 if (outframes != samples)
                 {
-                    fprintf(stderr, "    Error writing wave file\n");
+                    fprintf(stderr, "    Error writing audio file\n");
                     exit(2);
                 }
             }
@@ -485,17 +479,17 @@
 #endif
     if (decode_test_file)
     {
-        if (afCloseFile(inhandle))
+        if (sf_close(inhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
     if (log_audio)
     {
-        if (afCloseFile(outhandle))
+        if (sf_close(outhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/v18_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/v18_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/v18_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v18_tests.c,v 1.5 2009/04/11 18:11:19 steveu Exp $
+ * $Id: v18_tests.c,v 1.8 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page v18_tests_page V.18 tests
@@ -41,7 +41,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -58,19 +58,32 @@
 #define SAMPLES_PER_CHUNK   160
 
 int log_audio = FALSE;
-AFfilehandle outhandle = NULL;
+SNDFILE *outhandle = NULL;
 
 char *decode_test_file = NULL;
 
 int good_message_received;
 
+const char *qbf_tx = "The quick Brown Fox Jumps Over The Lazy dog 0123456789!@#$%^&*()'";
+const char *qbf_rx = "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG 0123456789!X$$/'+.()'";
+const char *full_baudot_rx =
+    "\b \n\n\n\r?\n\n\n  !\"$$/+'().+,-./"
+    "0123456789:;(=)?"
+    "XABCDEFGHIJKLMNOPQRSTUVWXYZ(/)' "
+    "'ABCDEFGHIJKLMNOPQRSTUVWXYZ(!) ";
+
 #if 1
 static void put_text_msg(void *user_data, const uint8_t *msg, int len)
 {
-    if (strcmp((const char *) msg, "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG 0123456789#$*()"))
-        printf("%s\n", msg);
+    if (strcmp((const char *) msg, qbf_rx))
+    {
+        printf("Result:\n%s\n", msg);
+        printf("Reference result:\n%s\n", qbf_rx);
+    }
     else
+    {
         good_message_received = TRUE;
+    }
 }
 /*- End of function --------------------------------------------------------*/
 
@@ -91,7 +104,11 @@
     /* Fake an OK condition for the first message test */
     good_message_received = TRUE;
     push = 0;
-    v18_put(v18_a, "The quick Brown Fox Jumps Over The Lazy dog 0123456789!@#$%^&*()", -1);
+    if (v18_put(v18_a, qbf_tx, -1) != strlen(qbf_tx))
+    {
+        printf("V.18 put failed\n");
+        exit(2);
+    }
     for (i = 0;  i < 100000;  i++)
     {
         if (push == 0)
@@ -111,7 +128,11 @@
                     exit(2);
                 }
                 good_message_received = FALSE;
-                v18_put(v18_a, "The quick Brown Fox Jumps Over The Lazy dog 0123456789!@#$%^&*()", -1);
+                if (v18_put(v18_a, qbf_tx, -1) != strlen(qbf_tx))
+                {
+                    printf("V.18 put failed\n");
+                    exit(2);
+                }
             }
         }
         if (len < SAMPLES_PER_CHUNK)
@@ -121,13 +142,10 @@
         }
         if (log_audio)
         {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      amp,
-                                      len);
+            outframes = sf_writef_short(outhandle, amp, len);
             if (outframes != len)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
         }
@@ -165,39 +183,42 @@
 
 static int test_x_04(void)
 {
-    const char *s;
-    const char *ref;
     char result[1024];
     char *t;
     int ch;
     int xx;
     int yy;
+    int i;
     v18_state_t *v18_state;
 
     /* III.5.4.5.4 5 Bit to T.50 character conversion */
     v18_state = v18_init(NULL, TRUE, V18_MODE_5BIT_45, NULL, NULL);
-    s = "The quick Brown Fox Jumps Over The Lazy dog 0123456789!@#$%^&*()";
-    printf("Original:\n%s\n", s);
+    printf("Original:\n");
     t = result;
-    while ((ch = *s++))
+    for (i = 0;  i < 127;  i++)
     {
+        ch = i;
+        printf("%c", ch);
         xx = v18_encode_baudot(v18_state, ch);
-        if ((xx & 0x3E0))
+        if (xx)
         {
-            yy = v18_decode_baudot(v18_state, (xx >> 5) & 0x1F);
+            if ((xx & 0x3E0))
+            {
+                yy = v18_decode_baudot(v18_state, (xx >> 5) & 0x1F);
+                if (yy)
+                    *t++ = yy;
+            }
+            yy = v18_decode_baudot(v18_state, xx & 0x1F);
             if (yy)
                 *t++ = yy;
         }
-        yy = v18_decode_baudot(v18_state, xx & 0x1F);
-        if (yy)
-            *t++ = yy;
     }
+    printf("\n");
     *t = '\0';
     v18_free(v18_state);
-    ref = "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG 0123456789#$*()";
     printf("Result:\n%s\n", result);
-    printf("Reference result:\n%s\n", ref);
-    if (strcmp(result, ref) != 0)
+    printf("Reference result:\n%s\n", full_baudot_rx);
+    if (strcmp(result, full_baudot_rx) != 0)
         return -1;
     return 0;
 }
@@ -256,30 +277,27 @@
 {
     v18_state_t *v18_state;
     int16_t amp[SAMPLES_PER_CHUNK];
-    AFfilehandle inhandle;
+    SNDFILE *inhandle;
     int len;
 
     printf("Decoding as '%s'\n", v18_mode_to_str(mode));
-    /* We will decode the audio from a wave file. */
-    if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+    /* We will decode the audio from a file. */
+    if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
     {
-        fprintf(stderr, "    Cannot open wave file '%s'\n", decode_test_file);
+        fprintf(stderr, "    Cannot open audio file '%s'\n", decode_test_file);
         exit(2);
     }
     v18_state = v18_init(NULL, FALSE, mode, put_v18_msg, NULL);
     for (;;)
     {
-        len = afReadFrames(inhandle,
-                           AF_DEFAULT_TRACK,
-                           amp,
-                           SAMPLES_PER_CHUNK);
+        len = sf_readf_short(inhandle, amp, SAMPLES_PER_CHUNK);
         if (len == 0)
             break;
         v18_rx(v18_state, amp, len);
     }
-    if (afCloseFile(inhandle) != 0)
+    if (sf_close(inhandle) != 0)
     {
-        fprintf(stderr, "    Cannot close wave file '%s'\n", decode_test_file);
+        fprintf(stderr, "    Cannot close audio file '%s'\n", decode_test_file);
         exit(2);
     }
     v18_free(v18_state);
@@ -429,12 +447,12 @@
     if (argc > 0)
         match = argv[0];
 
-    outhandle = AF_NULL_FILEHANDLE;
+    outhandle = NULL;
     if (log_audio)
     {
-        if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME);
             exit(2);
         }
     }
@@ -477,9 +495,9 @@
     basic_tests(V18_MODE_5BIT_45);
     if (log_audio)
     {
-        if (afCloseFile(outhandle) != 0)
+        if (sf_close(outhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/v22bis_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/v22bis_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/v22bis_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v22bis_tests.c,v 1.61 2009/04/25 16:30:52 steveu Exp $
+ * $Id: v22bis_tests.c,v 1.62 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page v22bis_tests_page V.22bis modem tests
@@ -50,7 +50,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
 #include "spandsp.h"
@@ -210,8 +210,8 @@
     int16_t amp[2][BLOCK_LEN];
     int16_t model_amp[2][BLOCK_LEN];
     int16_t out_amp[2*BLOCK_LEN];
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int outframes;
     int samples;
     int samples2;
@@ -281,23 +281,23 @@
             break;
         }
     }
-    inhandle = AF_NULL_FILEHANDLE;
+    inhandle = NULL;
     if (decode_test_file)
     {
-        /* We will decode the audio from a wave file. */
-        if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        /* We will decode the audio from a file. */
+        if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
 
-    outhandle = AF_NULL_FILEHANDLE;
+    outhandle = NULL;
     if (log_audio)
     {
-        if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 2)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 2)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }
@@ -369,10 +369,7 @@
 #endif
         if (decode_test_file)
         {
-            samples2 = afReadFrames(inhandle,
-                                    AF_DEFAULT_TRACK,
-                                    model_amp[0],
-                                    samples);
+            samples2 = sf_readf_short(inhandle, model_amp[0], samples);
             if (samples2 != samples)
                 break;
         }
@@ -388,13 +385,10 @@
 
         if (log_audio)
         {
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      out_amp,
-                                      BLOCK_LEN);
+            outframes = sf_writef_short(outhandle, out_amp, BLOCK_LEN);
             if (outframes != BLOCK_LEN)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
         }
@@ -405,17 +399,17 @@
 #endif
     if (decode_test_file)
     {
-        if (afCloseFile(inhandle))
+        if (sf_close(inhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
     if (log_audio)
     {
-        if (afCloseFile(outhandle) != 0)
+        if (sf_close(outhandle) != 0)
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/v27ter_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/v27ter_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/v27ter_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v27ter_tests.c,v 1.104 2009/04/25 16:30:52 steveu Exp $
+ * $Id: v27ter_tests.c,v 1.105 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page v27ter_tests_page V.27ter modem tests
@@ -35,7 +35,7 @@
    receive modem. It is also the only test mode provided for evaluating the
    transmit modem.
 
- - A V.27ter receive modem is used to decode V.27ter audio, stored in a wave file.
+ - A V.27ter receive modem is used to decode V.27ter audio, stored in an audio file.
    This is good way to evaluate performance with audio recorded from other
    models of modem, and with real world problematic telephone lines.
 
@@ -61,7 +61,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -225,8 +225,8 @@
     bert_results_t bert_results;
     int16_t gen_amp[BLOCK_LEN];
     int16_t amp[BLOCK_LEN];
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int outframes;
     int samples;
     int tep;
@@ -311,20 +311,20 @@
 
     if (log_audio)
     {
-        if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }
 
     if (decode_test_file)
     {
-        /* We will decode the audio from a wave file. */
+        /* We will decode the audio from a file. */
         tx = NULL;
-        if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
@@ -372,10 +372,7 @@
     {
         if (decode_test_file)
         {
-            samples = afReadFrames(inhandle,
-                                   AF_DEFAULT_TRACK,
-                                   amp,
-                                   BLOCK_LEN);
+            samples = sf_readf_short(inhandle, amp, BLOCK_LEN);
 #if defined(ENABLE_GUI)
             if (use_gui)
                 qam_monitor_update_audio_level(qam_monitor, amp, samples);
@@ -434,13 +431,10 @@
 
             if (log_audio)
             {
-                outframes = afWriteFrames(outhandle,
-                                          AF_DEFAULT_TRACK,
-                                          gen_amp,
-                                          samples);
+                outframes = sf_writef_short(outhandle, gen_amp, samples);
                 if (outframes != samples)
                 {
-                    fprintf(stderr, "    Error writing wave file\n");
+                    fprintf(stderr, "    Error writing audio file\n");
                     exit(2);
                 }
             }
@@ -473,17 +467,17 @@
 #endif
     if (decode_test_file)
     {
-        if (afCloseFile(inhandle))
+        if (sf_close(inhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
     if (log_audio)
     {
-        if (afCloseFile(outhandle))
+        if (sf_close(outhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/v29_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/v29_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/v29_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v29_tests.c,v 1.118 2009/04/25 16:30:52 steveu Exp $
+ * $Id: v29_tests.c,v 1.119 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page v29_tests_page V.29 modem tests
@@ -35,7 +35,7 @@
    receive modem. It is also the only test mode provided for evaluating the
    transmit modem.
 
- - A V.29 receive modem is used to decode V.29 audio, stored in a wave file.
+ - A V.29 receive modem is used to decode V.29 audio, stored in an audio file.
    This is good way to evaluate performance with audio recorded from other
    models of modem, and with real world problematic telephone lines.
 
@@ -61,7 +61,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -248,8 +248,8 @@
     bert_results_t bert_results;
     int16_t gen_amp[BLOCK_LEN];
     int16_t amp[BLOCK_LEN];
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int outframes;
     int samples;
     int tep;
@@ -334,20 +334,20 @@
 
     if (log_audio)
     {
-        if ((outhandle = afOpenFile_telephony_write(OUT_FILE_NAME, 1)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUT_FILE_NAME, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }
 
     if (decode_test_file)
     {
-        /* We will decode the audio from a wave file. */
+        /* We will decode the audio from a file. */
         tx = NULL;
-        if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
-            fprintf(stderr, "    Cannot open wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot open audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
@@ -402,10 +402,7 @@
     {
         if (decode_test_file)
         {
-            samples = afReadFrames(inhandle,
-                                   AF_DEFAULT_TRACK,
-                                   amp,
-                                   BLOCK_LEN);
+            samples = sf_readf_short(inhandle, amp, BLOCK_LEN);
 #if defined(ENABLE_GUI)
             if (use_gui)
                 qam_monitor_update_audio_level(qam_monitor, amp, samples);
@@ -462,13 +459,10 @@
             }
             if (log_audio)
             {
-                outframes = afWriteFrames(outhandle,
-                                          AF_DEFAULT_TRACK,
-                                          gen_amp,
-                                          samples);
+                outframes = sf_writef_short(outhandle, gen_amp, samples);
                 if (outframes != samples)
                 {
-                    fprintf(stderr, "    Error writing wave file\n");
+                    fprintf(stderr, "    Error writing audio file\n");
                     exit(2);
                 }
             }
@@ -502,17 +496,17 @@
 #endif
     if (decode_test_file)
     {
-        if (afCloseFile(inhandle))
+        if (sf_close(inhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", decode_test_file);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", decode_test_file);
             exit(2);
         }
     }
     if (log_audio)
     {
-        if (afCloseFile(outhandle))
+        if (sf_close(outhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUT_FILE_NAME);
             exit(2);
         }
     }

Modified: freeswitch/trunk/libs/spandsp/tests/v8_tests.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/tests/v8_tests.c	(original)
+++ freeswitch/trunk/libs/spandsp/tests/v8_tests.c	Thu Jun 18 01:13:59 2009
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v8_tests.c,v 1.32 2009/04/24 22:35:25 steveu Exp $
+ * $Id: v8_tests.c,v 1.33 2009/05/30 15:23:14 steveu Exp $
  */
 
 /*! \page v8_tests_page V.8 tests
@@ -41,7 +41,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 //#if defined(WITH_SPANDSP_INTERNALS)
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
@@ -98,8 +98,8 @@
     int remnant;
     int caller_available_modulations;
     int answerer_available_modulations;
-    AFfilehandle inhandle;
-    AFfilehandle outhandle;
+    SNDFILE *inhandle;
+    SNDFILE *outhandle;
     int opt;
     char *decode_test_file;
     logging_state_t *logging;
@@ -150,9 +150,9 @@
     
     if (decode_test_file == NULL)
     {
-        if ((outhandle = afOpenFile_telephony_write(OUTPUT_FILE_NAME, 2)) == AF_NULL_FILEHANDLE)
+        if ((outhandle = sf_open_telephony_write(OUTPUT_FILE_NAME, 2)) == NULL)
         {
-            fprintf(stderr, "    Cannot create wave file '%s'\n", OUTPUT_FILE_NAME);
+            fprintf(stderr, "    Cannot create audio file '%s'\n", OUTPUT_FILE_NAME);
             exit(2);
         }
     
@@ -187,19 +187,16 @@
             for (i = 0;  i < samples;  i++)
                 out_amp[2*i + 1] = amp[i];
     
-            outframes = afWriteFrames(outhandle,
-                                      AF_DEFAULT_TRACK,
-                                      out_amp,
-                                      samples);
+            outframes = sf_writef_short(outhandle, out_amp, samples);
             if (outframes != samples)
             {
-                fprintf(stderr, "    Error writing wave file\n");
+                fprintf(stderr, "    Error writing audio file\n");
                 exit(2);
             }
         }
-        if (afCloseFile(outhandle))
+        if (sf_close(outhandle))
         {
-            fprintf(stderr, "    Cannot close wave file '%s'\n", OUTPUT_FILE_NAME);
+            fprintf(stderr, "    Cannot close audio file '%s'\n", OUTPUT_FILE_NAME);
             exit(2);
         }
         
@@ -220,21 +217,21 @@
         logging = v8_get_logging_state(v8_answerer);
         span_log_set_level(logging, SPAN_LOG_FLOW | SPAN_LOG_SHOW_TAG);
         span_log_set_tag(logging, "decoder");
-        if ((inhandle = afOpenFile_telephony_read(decode_test_file, 1)) == AF_NULL_FILEHANDLE)
+        if ((inhandle = sf_open_telephony_read(decode_test_file, 1)) == NULL)
         {
             fprintf(stderr, "    Cannot open speech file '%s'\n", decode_test_file);
             exit (2);
         }
         /*endif*/
 
-        while ((samples = afReadFrames(inhandle, AF_DEFAULT_TRACK, amp, SAMPLES_PER_CHUNK)))
+        while ((samples = sf_readf_short(inhandle, amp, SAMPLES_PER_CHUNK)))
         {
             remnant = v8_rx(v8_answerer, amp, samples);
         }
         /*endwhile*/
 
         v8_free(v8_answerer);
-        if (afCloseFile(inhandle) != 0)
+        if (sf_close(inhandle) != 0)
         {
             fprintf(stderr, "    Cannot close speech file '%s'\n", decode_test_file);
             exit(2);


From mikej at freeswitch.org  Wed Jun 17 23:38:39 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 01:38:39 -0500
Subject: [Freeswitch-svn] [commit] r13832 - in
	freeswitch/trunk/libs/unimrcp: . build/tools libs/apr-toolkit
	libs/mpf libs/mrcp libs/mrcp-client libs/mrcp-engine
	libs/mrcp-server libs/mrcp-signaling libs/mrcpv2-transport
	libs/uni-rtsp modules/mrcp-sofiasip modules/mrcp-unirtsp
	platforms/libunimrcp-client platforms/libunimrcp-server
	platforms/unimrcp-client platforms/unimrcp-server
	plugins/demo-recog plugins/demo-synth plugins/mrcp-cepstral
	tests/apttest tests/mpftest tests/mrcptest tests/rtsptest
	tests/strtablegen
Message-ID: 

Author: mikej
Date: Thu Jun 18 01:38:39 2009
New Revision: 13832

Log:
upgrade to msvc 2008

Modified:
   freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
   freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
   freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj
   freeswitch/trunk/libs/unimrcp/unimrcp.sln

Modified: freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,69 +1,68 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-	
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,159 +1,158 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,277 +1,278 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,11 +1,12 @@
 
 
 	
 		
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,153 +1,154 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,161 +1,162 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,165 +1,166 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,300 +1,301 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-				
-				
-				
-				
-				
-				
-			
-			
-				
-				
-				
-				
-				
-				
-			
-		
-		
-			
-				
-				
-				
-				
-				
-				
-				
-				
-			
-			
-				
-				
-				
-				
-			
-		
-		
-			
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-			
-			
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,177 +1,178 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,195 +1,196 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,167 +1,168 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,167 +1,168 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,155 +1,156 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,155 +1,156 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,201 +1,200 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,175 +1,174 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,11 +1,12 @@
 
 
 	
 		
 			
 			
 			
-			
 		
@@ -114,6 +114,8 @@
 			/>
 			
 			
 			
-			
 		

Modified: freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,165 +1,164 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,165 +1,164 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,10 +1,11 @@
 
 
 	
 		
 			
 			
-			
 		
@@ -111,6 +111,8 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="aprtoolkit.lib libaprutil-1.lib libapr-1.lib"
 				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			
 			
-			
 		

Modified: freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,167 +1,166 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,171 +1,170 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,167 +1,166 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj	Thu Jun 18 01:38:39 2009
@@ -1,163 +1,162 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/unimrcp.sln
==============================================================================
--- freeswitch/trunk/libs/unimrcp/unimrcp.sln	(original)
+++ freeswitch/trunk/libs/unimrcp/unimrcp.sln	Thu Jun 18 01:38:39 2009
@@ -1,272 +1,272 @@
-?
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{5377DC3A-DB96-4819-8AAF-2A75F3A69119}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "platforms", "platforms", "{8E282AE2-038C-49FE-AC67-BC9615AFD800}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{09BABD45-8F30-4F99-B8B8-8DD78F6804DB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpserver", "platforms\unimrcp-server\unimrcpserver.vcproj", "{592CF22D-3F8F-4A77-A174-130D77B7623B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {C98AF157-352E-4737-BD30-A24E2647F5AE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\apr-toolkit\aprtoolkit.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\mpf\mpf.vcproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\mrcp\mrcp.vcproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\mrcp-signaling\mrcpsignaling.vcproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpserver", "libs\mrcp-server\mrcpserver.vcproj", "{18B1F35A-10F8-4287-9B37-2D10501B0B38}"
-	ProjectSection(ProjectDependencies) = postProject
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpserver", "platforms\libunimrcp-server\libunimrcpserver.vcproj", "{C98AF157-352E-4737-BD30-A24E2647F5AE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {18B1F35A-10F8-4287-9B37-2D10501B0B38}
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "modules\mrcp-sofiasip\mrcpsofiasip.vcproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\mrcp-client\mrcpclient.vcproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"
-	ProjectSection(ProjectDependencies) = postProject
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpclient", "platforms\libunimrcp-client\libunimrcpclient.vcproj", "{EE157390-1E85-416C-946E-620E32C9AD33}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {72782932-37CC-46AE-8C7F-9A7B1A6EE108}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpclient", "platforms\unimrcp-client\unimrcpclient.vcproj", "{57FAF32E-49FD-491F-895D-132D0D5EFE0A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EE157390-1E85-416C-946E-620E32C9AD33} = {EE157390-1E85-416C-946E-620E32C9AD33}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\mrcpv2-transport\mrcpv2transport.vcproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpengine", "libs\mrcp-engine\mrcpengine.vcproj", "{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demosynth", "plugins\demo-synth\demosynth.vcproj", "{92BFA534-C419-4EB2-AAA3-510653F38F08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demorecog", "plugins\demo-recog\demorecog.vcproj", "{B495B6D9-AF84-479D-B30A-313C16EF8BFD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strtablegen", "tests\strtablegen\strtablegen.vcproj", "{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apttest", "tests\apttest\apttest.vcproj", "{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpftest", "tests\mpftest\mpftest.vcproj", "{DCF01B1C-5268-44F3-9130-D647FABFB663}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcptest", "tests\mrcptest\mrcptest.vcproj", "{3CA97077-6210-4362-998A-D15A35EEAA08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcepstral", "plugins\mrcp-cepstral\mrcpcepstral.vcproj", "{729EF28E-38C9-40DE-A138-87785F021411}"
-	ProjectSection(ProjectDependencies) = postProject
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{62083CC3-13BF-49EA-BFE8-4C9337C0D82C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\uni-rtsp\unirtsp.vcproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtsptest", "tests\rtsptest\rtsptest.vcproj", "{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}"
-	ProjectSection(ProjectDependencies) = postProject
-		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "modules\mrcp-unirtsp\mrcpunirtsp.vcproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
-		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prepare", "build\tools\prepare.vcproj", "{01D63BF5-7798-4746-852A-4B45229BB735}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpservice", "build\tools\unimrcpservice.vcproj", "{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.Build.0 = Debug|Win32
-		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.ActiveCfg = Release|Win32
-		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.Build.0 = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.Build.0 = Debug|Win32
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.ActiveCfg = Release|Win32
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.Build.0 = Release|Win32
-		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.Build.0 = Debug|Win32
-		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.ActiveCfg = Release|Win32
-		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.Build.0 = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
-		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.Build.0 = Debug|Win32
-		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.ActiveCfg = Release|Win32
-		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.Build.0 = Release|Win32
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.Build.0 = Debug|Win32
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.ActiveCfg = Release|Win32
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.Build.0 = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.Build.0 = Debug|Win32
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.ActiveCfg = Release|Win32
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.Build.0 = Release|Win32
-		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.ActiveCfg = Debug|Win32
-		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.Build.0 = Debug|Win32
-		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.ActiveCfg = Release|Win32
-		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.Build.0 = Release|Win32
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.Build.0 = Debug|Win32
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.ActiveCfg = Release|Win32
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.Build.0 = Release|Win32
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.ActiveCfg = Debug|Win32
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.Build.0 = Debug|Win32
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.ActiveCfg = Release|Win32
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.Build.0 = Release|Win32
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.Build.0 = Debug|Win32
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.ActiveCfg = Release|Win32
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.Build.0 = Release|Win32
-		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.Build.0 = Debug|Win32
-		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.ActiveCfg = Release|Win32
-		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.Build.0 = Release|Win32
-		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.Build.0 = Debug|Win32
-		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.ActiveCfg = Release|Win32
-		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.Build.0 = Release|Win32
-		{729EF28E-38C9-40DE-A138-87785F021411}.Debug|Win32.ActiveCfg = Debug|Win32
-		{729EF28E-38C9-40DE-A138-87785F021411}.Release|Win32.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.ActiveCfg = Debug|Win32
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.Build.0 = Debug|Win32
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.ActiveCfg = Release|Win32
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.Build.0 = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
-		{01D63BF5-7798-4746-852A-4B45229BB735}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01D63BF5-7798-4746-852A-4B45229BB735}.Release|Win32.ActiveCfg = Release|Win32
-		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Release|Win32.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{504B3154-7A4F-459D-9877-B951021C3F1F} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
-		{592CF22D-3F8F-4A77-A174-130D77B7623B} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
-		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
-		{EE157390-1E85-416C-946E-620E32C9AD33} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
-		{92BFA534-C419-4EB2-AAA3-510653F38F08} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
-		{729EF28E-38C9-40DE-A138-87785F021411} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{DCF01B1C-5268-44F3-9130-D647FABFB663} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{3CA97077-6210-4362-998A-D15A35EEAA08} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{01D63BF5-7798-4746-852A-4B45229BB735} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
-		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
-	EndGlobalSection
-EndGlobal
+?
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{5377DC3A-DB96-4819-8AAF-2A75F3A69119}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "platforms", "platforms", "{8E282AE2-038C-49FE-AC67-BC9615AFD800}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{09BABD45-8F30-4F99-B8B8-8DD78F6804DB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{62083CC3-13BF-49EA-BFE8-4C9337C0D82C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpserver", "platforms\unimrcp-server\unimrcpserver.vcproj", "{592CF22D-3F8F-4A77-A174-130D77B7623B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {C98AF157-352E-4737-BD30-A24E2647F5AE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\apr-toolkit\aprtoolkit.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\mpf\mpf.vcproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\mrcp\mrcp.vcproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\mrcp-signaling\mrcpsignaling.vcproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpserver", "libs\mrcp-server\mrcpserver.vcproj", "{18B1F35A-10F8-4287-9B37-2D10501B0B38}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpserver", "platforms\libunimrcp-server\libunimrcpserver.vcproj", "{C98AF157-352E-4737-BD30-A24E2647F5AE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {18B1F35A-10F8-4287-9B37-2D10501B0B38}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "modules\mrcp-sofiasip\mrcpsofiasip.vcproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\mrcp-client\mrcpclient.vcproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpclient", "platforms\libunimrcp-client\libunimrcpclient.vcproj", "{EE157390-1E85-416C-946E-620E32C9AD33}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {72782932-37CC-46AE-8C7F-9A7B1A6EE108}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpclient", "platforms\unimrcp-client\unimrcpclient.vcproj", "{57FAF32E-49FD-491F-895D-132D0D5EFE0A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EE157390-1E85-416C-946E-620E32C9AD33} = {EE157390-1E85-416C-946E-620E32C9AD33}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\mrcpv2-transport\mrcpv2transport.vcproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpengine", "libs\mrcp-engine\mrcpengine.vcproj", "{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demosynth", "plugins\demo-synth\demosynth.vcproj", "{92BFA534-C419-4EB2-AAA3-510653F38F08}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demorecog", "plugins\demo-recog\demorecog.vcproj", "{B495B6D9-AF84-479D-B30A-313C16EF8BFD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strtablegen", "tests\strtablegen\strtablegen.vcproj", "{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apttest", "tests\apttest\apttest.vcproj", "{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpftest", "tests\mpftest\mpftest.vcproj", "{DCF01B1C-5268-44F3-9130-D647FABFB663}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcptest", "tests\mrcptest\mrcptest.vcproj", "{3CA97077-6210-4362-998A-D15A35EEAA08}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcepstral", "plugins\mrcp-cepstral\mrcpcepstral.vcproj", "{729EF28E-38C9-40DE-A138-87785F021411}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\uni-rtsp\unirtsp.vcproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtsptest", "tests\rtsptest\rtsptest.vcproj", "{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}"
+	ProjectSection(ProjectDependencies) = postProject
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "modules\mrcp-unirtsp\mrcpunirtsp.vcproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prepare", "build\tools\prepare.vcproj", "{01D63BF5-7798-4746-852A-4B45229BB735}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpservice", "build\tools\unimrcpservice.vcproj", "{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.Build.0 = Debug|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.ActiveCfg = Release|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.Build.0 = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.ActiveCfg = Debug|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.Build.0 = Debug|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.ActiveCfg = Release|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.Build.0 = Release|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.Build.0 = Debug|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.ActiveCfg = Release|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.Build.0 = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.Build.0 = Debug|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.ActiveCfg = Release|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.Build.0 = Release|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.Build.0 = Debug|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.ActiveCfg = Release|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.Build.0 = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.Build.0 = Debug|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.ActiveCfg = Release|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.Build.0 = Release|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.ActiveCfg = Debug|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.Build.0 = Debug|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.ActiveCfg = Release|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.Build.0 = Release|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.Build.0 = Debug|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.ActiveCfg = Release|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.Build.0 = Release|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.ActiveCfg = Debug|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.Build.0 = Debug|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.ActiveCfg = Release|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.Build.0 = Release|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.ActiveCfg = Debug|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.Build.0 = Debug|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.ActiveCfg = Release|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.Build.0 = Release|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.Build.0 = Debug|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.ActiveCfg = Release|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.Build.0 = Release|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.Build.0 = Debug|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.ActiveCfg = Release|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.Build.0 = Release|Win32
+		{729EF28E-38C9-40DE-A138-87785F021411}.Debug|Win32.ActiveCfg = Debug|Win32
+		{729EF28E-38C9-40DE-A138-87785F021411}.Release|Win32.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.Build.0 = Debug|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.ActiveCfg = Release|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.Build.0 = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
+		{01D63BF5-7798-4746-852A-4B45229BB735}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01D63BF5-7798-4746-852A-4B45229BB735}.Release|Win32.ActiveCfg = Release|Win32
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Release|Win32.ActiveCfg = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
+		{592CF22D-3F8F-4A77-A174-130D77B7623B} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{EE157390-1E85-416C-946E-620E32C9AD33} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{92BFA534-C419-4EB2-AAA3-510653F38F08} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{729EF28E-38C9-40DE-A138-87785F021411} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{DCF01B1C-5268-44F3-9130-D647FABFB663} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{3CA97077-6210-4362-998A-D15A35EEAA08} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{01D63BF5-7798-4746-852A-4B45229BB735} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
+	EndGlobalSection
+EndGlobal


From crienzo at freeswitch.org  Thu Jun 18 06:19:32 2009
From: crienzo at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 08:19:32 -0500
Subject: [Freeswitch-svn] [commit] r13833 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: crienzo
Date: Thu Jun 18 08:19:31 2009
New Revision: 13833

Log:
MODUNIMRCP-1 thanks raul

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Thu Jun 18 08:19:31 2009
@@ -3422,15 +3422,13 @@
 	
 	/* apr_vsnprintf supports format extensions required by UniMRCP */ 
 	apr_vsnprintf(log_message, sizeof(log_message), format, arg_ptr);
-	if (!switch_strlen_zero(log_message)) {
-		size_t msglen = strlen(log_message);
-		if (msglen >= 2 && log_message[msglen - 2] == '\\' && log_message[msglen - 1] == 'n') {
-			/* log_message already ends in \n */
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, id, level, "%s", log_message);
-		} else {
-			/* log message needs \n appended */
-			switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, id, level, "%s\n", log_message);
-		}
+	size_t msglen = strlen(log_message);
+	if (msglen >= 2 && log_message[msglen - 2] == '\\' && log_message[msglen - 1] == 'n') {
+		/* log_message already ends in \n */
+		switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, id, level, "%s", log_message);
+	} else if (msglen > 0) {
+		/* log message needs \n appended */
+		switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, id, level, "%s\n", log_message);
 	}
 	
 	return TRUE;


From brian at freeswitch.org  Thu Jun 18 07:43:59 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 09:43:59 -0500
Subject: [Freeswitch-svn] [commit] r13835 -
	freeswitch/trunk/conf/mrcp_profiles
Message-ID: 

Author: brian
Date: Thu Jun 18 09:43:59 2009
New Revision: 13835

Log:
 MODASRTTS-18 

Added:
   freeswitch/trunk/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml

Added: freeswitch/trunk/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml	Thu Jun 18 09:43:59 2009
@@ -0,0 +1,18 @@
+
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+


From brian at freeswitch.org  Thu Jun 18 08:25:27 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 10:25:27 -0500
Subject: [Freeswitch-svn] [commit] r13839 - freeswitch/trunk/build
Message-ID: 

Author: brian
Date: Thu Jun 18 10:25:26 2009
New Revision: 13839

Log:
 update your sounds peeps 

Modified:
   freeswitch/trunk/build/sounds_version.txt

Modified: freeswitch/trunk/build/sounds_version.txt
==============================================================================
--- freeswitch/trunk/build/sounds_version.txt	(original)
+++ freeswitch/trunk/build/sounds_version.txt	Thu Jun 18 10:25:26 2009
@@ -1 +1 @@
-1.0.9
+1.0.10


From mikej at freeswitch.org  Thu Jun 18 08:56:25 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 10:56:25 -0500
Subject: [Freeswitch-svn] [commit] r13840 - in
	freeswitch/trunk/libs/unimrcp: build/tools build/vsprops
	libs/apr-toolkit libs/mpf libs/mrcp libs/mrcp-client
	libs/mrcp-engine libs/mrcp-server libs/mrcp-signaling
	libs/mrcpv2-transport libs/uni-rtsp modules/mrcp-sofiasip
	modules/mrcp-unirtsp platforms/libunimrcp-client
	platforms/libunimrcp-server platforms/unimrcp-client
	platforms/unimrcp-server plugins/demo-recog
	plugins/demo-synth plugins/mrcp-cepstral tests/apttest
	tests/mpftest tests/mrcptest tests/rtsptest tests/strtablegen
Message-ID: 

Author: mikej
Date: Thu Jun 18 10:56:25 2009
New Revision: 13840

Log:
use paths referenced to the project file dir so we can insert these in other sln files without much headache

Modified:
   freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
   freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
   freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unidebug.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unirelease.vsprops
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
   freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj

Modified: freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	Thu Jun 18 10:56:25 2009
@@ -21,7 +21,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="10"
-			InheritedPropertySheets="$(SolutionDir)build\vsprops\apr.vsprops;$(SolutionDir)build\vsprops\sofiasip.vsprops"
+			InheritedPropertySheets="$(ProjectDir)..\..\build\vsprops\apr.vsprops;$(ProjectDir)..\..\build\vsprops\sofiasip.vsprops"
 			CharacterSet="1"
 			>
 			

Modified: freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	Thu Jun 18 10:56:25 2009
@@ -18,7 +18,7 @@
 		
 			
 			
 	
 	
 	
 	
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	Thu Jun 18 10:56:25 2009
@@ -18,7 +18,7 @@
 		
 			
 			
 			
 			
 			

Modified: freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	Thu Jun 18 10:56:25 2009
@@ -19,7 +19,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	Thu Jun 18 10:56:25 2009
@@ -18,7 +18,7 @@
 		
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			

Author: anthm
Date: Thu Jun 18 10:59:28 2009
New Revision: 13841

Log:
dont put params in chan names on sofia urls

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Thu Jun 18 10:59:28 2009
@@ -474,6 +474,7 @@
 {
 	char name[256];
 	unsigned int x;
+	char *p;
 
 	switch_assert(session != NULL);
 	switch_assert(profile != NULL);
@@ -515,6 +516,9 @@
 	switch_core_session_set_private(session, tech_pvt);
 
 	switch_snprintf(name, sizeof(name), "sofia/%s/%s", profile->name, channame);
+	if ((p = strchr(name, ';'))) {
+		*p = '\0';
+	}
 	switch_channel_set_name(tech_pvt->channel, name);
 }
 


From anthm at freeswitch.org  Thu Jun 18 09:35:41 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 11:35:41 -0500
Subject: [Freeswitch-svn] [commit] r13842 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Thu Jun 18 11:35:41 2009
New Revision: 13842

Log:
add local_var_clobber variable for {} to set if [] vars should clobber {} vars (default false)

Modified:
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Thu Jun 18 11:35:41 2009
@@ -916,10 +916,11 @@
 	char *fail_on_single_reject_var = NULL;
 	char *loop_data = NULL;
 	uint32_t progress_timelimit_sec = 0;
-	const char *cid_tmp;
+	const char *cid_tmp, *lc;
 	originate_global_t oglobals = { 0 };
 	int cdr_total = 0;
-
+	int local_clobber = 0;
+	
 	oglobals.idx = IDX_NADA;
 	oglobals.early_ok = 1;
 	oglobals.session = session;
@@ -1511,6 +1512,25 @@
 				originate_status[i].peer_channel = switch_core_session_get_channel(new_session);
 				switch_channel_set_flag(originate_status[i].peer_channel, CF_ORIGINATING);
 
+				if ((lc = switch_event_get_header(var_event, "local_var_clobber"))) {
+					local_clobber = switch_true(lc);
+				}
+
+				if (!local_clobber) {
+					if (var_event) {
+						switch_event_t *event;
+						switch_event_header_t *header;
+						/* install the vars from the {} params */
+						for (header = var_event->headers; header; header = header->next) {
+							switch_channel_set_variable(originate_status[i].peer_channel, header->name, header->value);
+						}
+						switch_event_create(&event, SWITCH_EVENT_CHANNEL_ORIGINATE);
+						switch_assert(event);
+						switch_channel_event_set_data(originate_status[i].peer_channel, event);
+						switch_event_fire(&event);
+					}
+				}
+
 				if (vdata) {
 					char *var_array[1024] = { 0 };
 					int var_count = 0;
@@ -1529,17 +1549,19 @@
 					}
 				}
 
-				if (var_event) {
-					switch_event_t *event;
-					switch_event_header_t *header;
-					/* install the vars from the {} params */
-					for (header = var_event->headers; header; header = header->next) {
-						switch_channel_set_variable(originate_status[i].peer_channel, header->name, header->value);
-					}
-					switch_event_create(&event, SWITCH_EVENT_CHANNEL_ORIGINATE);
-					switch_assert(event);
-					switch_channel_event_set_data(originate_status[i].peer_channel, event);
-					switch_event_fire(&event);
+				if (local_clobber) {
+					if (var_event) {
+						switch_event_t *event;
+						switch_event_header_t *header;
+						/* install the vars from the {} params */
+						for (header = var_event->headers; header; header = header->next) {
+							switch_channel_set_variable(originate_status[i].peer_channel, header->name, header->value);
+						}
+						switch_event_create(&event, SWITCH_EVENT_CHANNEL_ORIGINATE);
+						switch_assert(event);
+						switch_channel_event_set_data(originate_status[i].peer_channel, event);
+						switch_event_fire(&event);
+					}
 				}
 
 				if (originate_status[i].peer_channel) {


From brian at freeswitch.org  Thu Jun 18 11:03:12 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 13:03:12 -0500
Subject: [Freeswitch-svn] [commit] r13843 - freeswitch/trunk/scripts/lua
Message-ID: 

Author: brian
Date: Thu Jun 18 13:03:10 2009
New Revision: 13843

Log:
 adding zrtp enrollment script, we do auto enrollment and verification 

Added:
   freeswitch/trunk/scripts/lua/zrtp_agent.lua

Added: freeswitch/trunk/scripts/lua/zrtp_agent.lua
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/lua/zrtp_agent.lua	Thu Jun 18 13:03:10 2009
@@ -0,0 +1,38 @@
+-- ZRTP Enrollment Agent
+session:setVariable("zrtp_secure_media", "true");
+session:setVariable("zrtp_enrollment", "true");
+session:sleep(100);
+session:answer();
+session:streamFile("zrtp/zrtp-status_securing.wav");
+session:sleep(3000);
+-- Give the agent time to bring up ZRTP.
+
+local zrtp_secure_media_confirmed = session:getVariable("zrtp_secure_media_confirmed");
+local zrtp_new_user_enrolled = session:getVariable("zrtp_new_user_enrolled");
+local zrtp_already_enrolled = session:getVariable("zrtp_already_enrolled");
+
+if zrtp_secure_media_confirmed == "true" then
+   session:streamFile("zrtp/zrtp-status_secure.wav");
+else
+   session:streamFile("zrtp/zrtp-status_notsecure.wav");
+end
+
+session:streamFile("zrtp/zrtp-enroll_welcome.wav");
+session:sleep(1000);
+
+if zrtp_secure_media_confirmed == "true" then
+   if zrtp_new_user_enrolled == "true" then 
+      session:streamFile("zrtp/zrtp-enroll_confirmed.wav");
+      session:sleep(3000);
+   else
+      if zrtp_already_enrolled == "true" then 
+	 session:streamFile("zrtp/zrtp-enroll_already_enrolled.wav");
+      end 
+   end
+else 
+   session:streamFile("zrtp/zrtp-enroll_notzrtp.wav");
+end
+
+session:sleep(1000);
+session:streamFile("zrtp/zrtp-thankyou_goodbye.wav");
+session:sleep(1000);


From intralanman at freeswitch.org  Thu Jun 18 11:19:20 2009
From: intralanman at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 13:19:20 -0500
Subject: [Freeswitch-svn] [commit] r13844 -
	freeswitch/trunk/scripts/contrib/ledr
Message-ID: 

Author: intralanman
Date: Thu Jun 18 13:19:20 2009
New Revision: 13844

Log:
adding contrib dir for ledr

Added:
   freeswitch/trunk/scripts/contrib/ledr/


From mrene at freeswitch.org  Thu Jun 18 11:26:50 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 13:26:50 -0500
Subject: [Freeswitch-svn] [commit] r13845 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mrene
Date: Thu Jun 18 13:26:50 2009
New Revision: 13845

Log:
Fix bad ptr in mrcp profile

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Thu Jun 18 13:26:50 2009
@@ -3171,7 +3171,7 @@
 			mpf_rtp_config_t *rtp_config = NULL;
 			
 			/* get profile attributes */
-			const char *name = switch_xml_attr(profile, "name");
+			const char *name = apr_pstrdup(pool, switch_xml_attr(profile, "name"));
 			const char *version = switch_xml_attr(profile, "version");
 			if (switch_strlen_zero(name) || switch_strlen_zero(version)) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, " missing name or version attribute\n");


From ledr at freeswitch.org  Thu Jun 18 11:34:10 2009
From: ledr at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 13:34:10 -0500
Subject: [Freeswitch-svn] [commit] r13846 -
	freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc
Message-ID: 

Author: ledr
Date: Thu Jun 18 13:34:09 2009
New Revision: 13846

Log:
Initial commit



Added:
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/Makefile
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.sql
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml

Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/Makefile
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/Makefile	Thu Jun 18 13:34:09 2009
@@ -0,0 +1,3 @@
+BASE=../../../..
+include $(BASE)/build/modmake.rules
+LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;`

Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c	Thu Jun 18 13:34:09 2009
@@ -0,0 +1,468 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II 
+ *
+ * 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
+ * Anthony Minessale II 
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Anthony Minessale II 
+ * Other FreeSWITCH module contributors that I borrowed code from
+ * Leon de Rooij 
+ *
+ *
+ * mod_xml_odbc.c -- use fs odbc to realtime create xml directory 
+ * perhaps later also config, dialplan, etc ?
+ *
+ */
+#include 
+#ifdef SWITCH_HAVE_ODBC
+#include 
+#endif
+
+typedef enum {
+	XML_ODBC_DIRECTORY
+} xml_odbc_query_type_t;
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown);
+SWITCH_MODULE_DEFINITION(mod_xml_odbc, mod_xml_odbc_load, mod_xml_odbc_shutdown, NULL);
+
+typedef struct xml_binding {
+	char *bindings;
+} xml_binding_t;
+
+static struct {
+	char *dbname;
+	char *odbc_dsn;
+	char *query_domain_key_user;
+	char *query_domain_params;
+	char *query_domain_variables;
+	char *query_user_attrs;
+	char *query_user_params;
+	char *query_user_variables;
+	char *query_groups;
+	switch_mutex_t *mutex;
+	switch_memory_pool_t *pool;
+#ifdef SWITCH_HAVE_ODBC
+	switch_odbc_handle_t *master_odbc;
+#else
+	void *filler1;
+#endif
+} globals;
+
+typedef struct did_uid_helper {
+	char *domain_id;
+	char *user_id;
+} did_uid_helper_t;
+
+static int did_uid_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+	did_uid_helper_t *h = (did_uid_helper_t *) pArg;
+
+	h->domain_id = strdup(argv[0]);
+	h->user_id = strdup(argv[1]);
+
+	return 0;
+}
+
+static int set_xml_attr_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+	switch_xml_t *xml = (switch_xml_t *) pArg;
+	switch_xml_set_attr_d(*xml, argv[0], argv[1]);
+	return 0;
+}
+
+typedef struct xml_helper {
+	switch_xml_t xml;
+	char *str;
+	int off;
+} xml_helper_t;
+
+static int add_xml_child_with_nvpair_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+	xml_helper_t *h = (xml_helper_t *) pArg;
+	switch_xml_t xml = NULL;
+
+	if ((xml = switch_xml_add_child_d(h->xml, h->str, h->off++))) {
+		switch_xml_set_attr_d(xml, "name", argv[0]);
+		switch_xml_set_attr_d(xml, "value", argv[1]);
+	}
+
+	return 0;
+}
+
+static int add_xml_group_and_user_callback(void *pArg, int argc, char **argv, char **columnName)
+{
+	xml_helper_t *h = (xml_helper_t *) pArg;
+	switch_xml_t xml = NULL;
+
+	if ((xml = switch_xml_add_child_d(h->xml, "group", h->off++))) {
+		switch_xml_set_attr_d(xml, "name", argv[0]);
+		if ((xml = switch_xml_add_child_d(xml, "users", h->off++))) {
+			if ((xml = switch_xml_add_child_d(xml, "user", h->off++))) {
+				switch_xml_set_attr_d(xml, "id", h->str);
+				switch_xml_set_attr_d(xml, "type", "pointer");
+			}
+		}
+	}
+
+	return 0;
+}
+
+static int xml_odbc_result_not_found(switch_xml_t xml, int *off)
+{
+	switch_xml_t sub = NULL;
+
+	if ((sub = switch_xml_add_child_d(xml, "section", *off++))) {
+		switch_xml_set_attr_d(sub, "name", "result");
+		if ((sub = switch_xml_add_child_d(sub, "result", *off++))) {
+			switch_xml_set_attr_d(sub, "status", "not found");
+		}
+	}
+
+	return 0;
+}
+
+static switch_xml_t xml_odbc_search(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data)
+{
+	xml_binding_t *binding = (xml_binding_t *) user_data;
+	switch_event_header_t *hi;
+
+	switch_xml_t xml = NULL, sub = NULL, sub2 = NULL, sub3 = NULL;
+
+	char *dir_user = NULL, *dir_domain = NULL, *dir_key = NULL;
+	char *sql;
+
+	int off = 0, ret = 1;
+
+	xml_odbc_query_type_t query_type;
+
+	did_uid_helper_t pdata;
+	xml_helper_t pdata2;
+
+	if (!binding) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No bindings... sorry bud returning now\n");
+		return NULL;
+	}
+
+	if (!strcmp(section, "directory")) {
+		query_type = XML_ODBC_DIRECTORY;
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid section\n");
+		return NULL;
+	}
+
+	if (params) {
+		if ((hi = params->headers)) {
+			for (; hi; hi = hi->next) {
+				switch (query_type) {
+				case XML_ODBC_DIRECTORY:
+
+//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG in xml_odbc_search with header name=[%s], value=[%s]\n", hi->name, hi->value);
+
+					if (!strcmp(hi->name, "user")) {
+						dir_user = strdup(hi->value);
+					} else if (!strcmp(hi->name, "domain")) {
+						dir_domain = strdup(hi->value);
+					} else if (!strcmp(hi->name, "key")) {
+						dir_key = strdup(hi->value);
+					}
+					break;
+				}
+			}
+			switch (query_type) {
+			case XML_ODBC_DIRECTORY: 
+				//if (dir_user && dir_domain) {
+				if (dir_domain) {
+					if ((xml = switch_xml_new("document"))) {
+						switch_xml_set_attr_d(xml, "type", "freeswitch/xml");
+
+						if (!dir_user) {
+//						  sql = switch_mprintf("SELECT count(*) FROM dir_domains WHERE name = '%q';", dir_domain);
+//						  if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, count_callback, &pdata10741) == SWITCH_ODBC_SUCCESS) {
+// TODO: Factor out the domain search thing (with params and variables) from below, and call it from here as well..
+//							xml_odbc_result_not_found(xml, &off);
+//						  } else {
+							xml_odbc_result_not_found(xml, &off);
+//						  }
+
+						} else {
+							sql = switch_mprintf(globals.query_domain_key_user, dir_domain, dir_key, dir_user);
+							if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, did_uid_callback, &pdata) == SWITCH_ODBC_SUCCESS) {
+								if (!pdata.domain_id || !pdata.user_id) {
+									xml_odbc_result_not_found(xml, &off);
+
+								} else {
+									if ((sub = switch_xml_add_child_d(xml, "section", off++))) {
+										switch_xml_set_attr_d(sub, "name", "directory");
+
+										if ((sub = switch_xml_add_child_d(sub, "domain", off++))) {
+											switch_xml_set_attr_d(sub, "name", dir_domain);
+
+											if ((sub2 = switch_xml_add_child_d(sub, "params", off++))) {
+												sql = switch_mprintf(globals.query_domain_params, pdata.domain_id);
+												pdata2.xml = sub2;
+												pdata2.off = off;
+												pdata2.str = "param";
+												if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_child_with_nvpair_callback, &pdata2) == SWITCH_ODBC_SUCCESS) {
+												}
+											}
+
+											if ((sub2 = switch_xml_add_child_d(sub, "variables", off++))) {
+												sql = switch_mprintf(globals.query_domain_variables, pdata.domain_id);
+												pdata2.xml = sub2;
+												pdata2.off = off;
+												pdata2.str = "variable";
+												if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_child_with_nvpair_callback, &pdata2) == SWITCH_ODBC_SUCCESS) {
+												}
+											}
+
+											if ((sub = switch_xml_add_child_d(sub, "groups", off++))) {
+
+												if ((sub2 = switch_xml_add_child_d(sub, "group", off++))) {
+													switch_xml_set_attr_d(sub2, "name", "default");
+
+													if ((sub2 = switch_xml_add_child_d(sub2, "users", off++))) {
+
+														if ((sub2 = switch_xml_add_child_d(sub2, "user", off++))) {
+
+															sql = switch_mprintf(globals.query_user_attrs, pdata.user_id);
+															if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, set_xml_attr_callback, &sub2)) {
+															}
+
+															if ((sub3 = switch_xml_add_child_d(sub2, "params", off++))) {
+																sql = switch_mprintf(globals.query_user_params, pdata.user_id);
+																pdata2.xml = sub3;
+																pdata2.off = off;
+																pdata2.str = "param";
+																if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_child_with_nvpair_callback, &pdata2) == SWITCH_ODBC_SUCCESS) {
+																}
+															}
+
+															if ((sub3 = switch_xml_add_child_d(sub2, "variables", off++))) {
+																sql = switch_mprintf(globals.query_user_variables, pdata.user_id);
+																pdata2.xml = sub3;
+																pdata2.off = off;
+																pdata2.str = "variable";
+																if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_child_with_nvpair_callback, &pdata2) == SWITCH_ODBC_SUCCESS) {
+																}
+															}
+
+														}
+
+													}
+
+												}
+
+												sql = switch_mprintf(globals.query_groups, pdata.user_id);
+												pdata2.xml = sub;
+												pdata2.off = off;
+												pdata2.str = dir_user;
+												if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, add_xml_group_and_user_callback, &pdata2) == SWITCH_ODBC_SUCCESS) {
+												}
+
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+
+//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG DUMP OF XML GENERATED:\n\n%s\n\n", switch_xml_toxml(xml, SWITCH_FALSE));
+
+					free(dir_user);
+					dir_user = NULL;
+
+					free(dir_key);
+					dir_key = NULL;
+
+					free(dir_domain);
+					dir_domain = NULL;
+
+				} else {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
+						"Something bad happened during the query construction phase likely exten(%s) or domain(%s) is null\n", dir_user, dir_domain);
+					goto cleanup;
+
+				}
+				break;
+			}
+
+		} else {
+			goto cleanup;
+
+		}
+	}
+
+	ret = 0;
+
+  cleanup:
+
+	if (ret) {
+		switch_xml_free(xml);
+		return NULL;
+	}
+	
+	return xml;
+}
+
+static switch_status_t do_config()
+{
+	char *cf = "xml_odbc.conf";
+	switch_xml_t cfg, xml, bindings_tag, binding_tag, param;
+	xml_binding_t *binding = NULL;
+
+	//switch_core_db_t *db;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+
+	char *odbc_user = NULL;
+	char *odbc_pass = NULL;
+	char *sql = NULL;
+
+	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
+		return SWITCH_STATUS_TERM;
+	}
+
+	if (!(bindings_tag = switch_xml_child(cfg, "bindings"))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing  tag!\n");
+		goto done;
+	}
+
+	for (binding_tag = switch_xml_child(bindings_tag, "binding"); binding_tag; binding_tag = binding_tag->next) {
+		char *bname = (char*) switch_xml_attr_soft(binding_tag, "name");
+
+		for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) {
+			char *var = NULL;
+			char *val = NULL;
+
+			var = (char *) switch_xml_attr_soft(param, "name");
+			val = (char *) switch_xml_attr_soft(param, "value");
+
+			if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) {
+				globals.odbc_dsn = switch_core_strdup(globals.pool, val);
+				if ((odbc_user = strchr(globals.odbc_dsn, ':'))) {
+					*odbc_user++ = '\0';
+					if ((odbc_pass = strchr(odbc_user, ':'))) {
+						*odbc_pass++ = '\0';
+					}
+				}
+			} else if (!strcasecmp(var, "query-domain-key-user") && !switch_strlen_zero(val)) {
+				globals.query_domain_key_user = strdup(val);
+			} else if (!strcasecmp(var, "query-domain-params") && !switch_strlen_zero(val)) {
+				globals.query_domain_params = strdup(val);
+			} else if (!strcasecmp(var, "query-domain-variables") && !switch_strlen_zero(val)) {
+				globals.query_domain_variables = strdup(val);
+			} else if (!strcasecmp(var, "query-user-attrs") && !switch_strlen_zero(val)) {
+				globals.query_user_attrs = strdup(val);
+			} else if (!strcasecmp(var, "query-user-params") && !switch_strlen_zero(val)) {
+				globals.query_user_params = strdup(val);
+			} else if (!strcasecmp(var, "query-user-variables") && !switch_strlen_zero(val)) {
+				globals.query_user_variables = strdup(val);
+			} else if (!strcasecmp(var, "query-groups") && !switch_strlen_zero(val)) {
+				globals.query_groups = strdup(val);
+			}
+		}
+
+		if (switch_strlen_zero(globals.odbc_dsn) || switch_strlen_zero(odbc_user) || switch_strlen_zero(odbc_pass)) {
+			globals.dbname = "xml_odbc";
+		}
+
+		if (!(binding = malloc(sizeof(*binding)))) {
+			goto done;
+		}
+		memset(binding, 0, sizeof(*binding));
+
+		binding->bindings = strdup(bname);
+
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML ODBC Fetch Function [%s]\n",
+			switch_strlen_zero(bname) ? "N/A" : bname, binding->bindings ? binding->bindings : "all");
+		switch_xml_bind_search_function(xml_odbc_search, switch_xml_parse_section_string(bname), binding);
+		binding = NULL;
+	}
+
+#ifdef SWITCH_HAVE_ODBC
+	if (globals.odbc_dsn) {
+
+		if (!(globals.master_odbc = switch_odbc_handle_new(globals.odbc_dsn, odbc_user, odbc_pass))) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n");
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+
+		if (switch_odbc_handle_connect(globals.master_odbc) != SWITCH_ODBC_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n");
+			status = SWITCH_STATUS_FALSE;
+			goto done;
+		}
+
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.odbc_dsn);
+	}
+#endif
+
+  done:
+
+	switch_safe_free(sql);
+
+	return status;
+}
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load)
+{
+
+	switch_core_new_memory_pool(&globals.pool);
+	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool);
+
+	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+
+#ifndef SWITCH_HAVE_ODBC
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must have ODBC support in FreeSWITCH to use this module\n");
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "\t./configure --enable-core-odbc-support\n");
+	return SWITCH_STATUS_FALSE;
+#endif
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "XML ODBC module loading...\n");
+
+	if (do_config() != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load xml_odbc config file\n");
+		return SWITCH_STATUS_FALSE;
+	}
+
+	/* indicate that the module should continue to be loaded */
+	return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown)
+{
+	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:
+ */

Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.sql
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.sql	Thu Jun 18 13:34:09 2009
@@ -0,0 +1,73 @@
+CREATE TABLE `dir_domains` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `dir_domains_name` (`name`)
+);
+
+CREATE TABLE `dir_domain_params` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `dir_domain_id` INT NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` VARCHAR(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`dir_domain_id`) REFERENCES `dir_domains` (`id`)
+);
+
+CREATE TABLE `dir_domain_variables` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `dir_domain_id` INT NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` VARCHAR(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`dir_domain_id`) REFERENCES `dir_domains` (`id`)
+);
+
+CREATE TABLE `dir_groups` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(255) NOT NULL,
+  PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `dir_groups_users` (
+  `dir_group_id` INT NOT NULL,
+  `dir_user_id` INT NOT NULL,
+  FOREIGN KEY (`dir_group_id`) REFERENCES `dir_groups` (`id`),
+  FOREIGN KEY (`dir_user_id`) REFERENCES `dir_users` (`id`)
+);
+
+CREATE TABLE `dir_users` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `dir_domain_id` INT NOT NULL,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`dir_domain_id`) REFERENCES `dir_domains` (`id`)
+);
+
+CREATE TABLE `dir_user_attrs` (
+  `id` INT  NOT NULL AUTO_INCREMENT,
+  `dir_user_id` INT NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` VARCHAR(255) NOT NULL,
+  PRIMARY KEY  (`id`),
+  FOREIGN KEY (`dir_user_id`) REFERENCES `dir_users` (`id`),
+  KEY `dir_user_attrs_name` (`name`),
+  KEY `dir_user_attrs_value` (`value`)
+);
+
+CREATE TABLE `dir_user_params` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `dir_user_id` INT NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` VARCHAR(255) NOT NULL,
+  PRIMARY KEY  (`id`),
+  FOREIGN KEY (`dir_user_id`) REFERENCES `dir_users` (`id`)
+);
+
+CREATE TABLE `dir_user_variables` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `dir_user_id` INT NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` VARCHAR(255) NOT NULL,
+  PRIMARY KEY  (`id`),
+  FOREIGN KEY (`dir_user_id`) REFERENCES `dir_users` (`id`)
+);

Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql	Thu Jun 18 13:34:09 2009
@@ -0,0 +1,9 @@
+INSERT INTO `dir_domains` (`id`, `name`) VALUES (1, '172.31.0.76');
+INSERT INTO `dir_domain_params` (`id`, `dir_domain_id`, `name`, `value`) VALUES (1, 1, 'dom_param_name', 'dom_param_value');
+INSERT INTO `dir_domain_variables` (`id`, `dir_domain_id`, `name`, `value`) VALUES (1, 1, 'dom_variable_name', 'dom_variable_value');
+INSERT INTO `dir_groups` (`id`, `name`) VALUES (1, 'prepay'), (2, 'annoying_customers');
+INSERT INTO `dir_groups_users` (`dir_group_id`, `dir_user_id`) VALUES (1, 1), (2, 1);
+INSERT INTO `dir_users` (`id`, `dir_domain_id`) VALUES (1, 1);
+INSERT INTO `dir_user_attrs` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'id', 'someuser'), (2, 1, 'mailbox', '1234');
+INSERT INTO `dir_user_params` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'password', 'topsecret'), (2, 1, 'vm-password', '0000');
+INSERT INTO `dir_user_variables` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'accountcode', '1234'), (2, 1, 'user_context', 'default'), (3, 1, 'vm_extension', '1234');

Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml	Thu Jun 18 13:34:09 2009
@@ -0,0 +1,35 @@
+
+  
+    
+      
+
+      
+
+      
+
+      
+
+      
+
+      
+
+      
+
+      
+
+    
+  
+


From anthm at freeswitch.org  Thu Jun 18 12:47:29 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 14:47:29 -0500
Subject: [Freeswitch-svn] [commit] r13847 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Thu Jun 18 14:47:29 2009
New Revision: 13847

Log:
doh

Modified:
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Thu Jun 18 14:47:29 2009
@@ -1002,7 +1002,7 @@
 	if (ovars) {
 		var_event = ovars;
 	} else {
-		if (switch_event_create(&var_event, SWITCH_EVENT_GENERAL) != SWITCH_STATUS_SUCCESS) {
+		if (switch_event_create_plain(&var_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) {
 			abort();
 		}
 	}
@@ -1516,7 +1516,7 @@
 					local_clobber = switch_true(lc);
 				}
 
-				if (!local_clobber) {
+				if (local_clobber) {
 					if (var_event) {
 						switch_event_t *event;
 						switch_event_header_t *header;
@@ -1549,7 +1549,7 @@
 					}
 				}
 
-				if (local_clobber) {
+				if (!local_clobber) {
 					if (var_event) {
 						switch_event_t *event;
 						switch_event_header_t *header;


From brian at freeswitch.org  Thu Jun 18 13:38:58 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 15:38:58 -0500
Subject: [Freeswitch-svn] [commit] r13848 - freeswitch/trunk/docs
Message-ID: 

Author: brian
Date: Thu Jun 18 15:38:57 2009
New Revision: 13848

Log:
adding agl3.0 for zrtp 

Added:
   freeswitch/trunk/docs/zrtp_agpl-3.0.txt

Added: freeswitch/trunk/docs/zrtp_agpl-3.0.txt
==============================================================================
--- (empty file)
+++ freeswitch/trunk/docs/zrtp_agpl-3.0.txt	Thu Jun 18 15:38:57 2009
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    
+    Copyright (C)   
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+.


From brian at freeswitch.org  Thu Jun 18 14:42:35 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 16:42:35 -0500
Subject: [Freeswitch-svn] [commit] r13849 -
	freeswitch/trunk/conf/autoload_configs
Message-ID: 

Author: brian
Date: Thu Jun 18 16:42:34 2009
New Revision: 13849

Log:
 w00t 

Modified:
   freeswitch/trunk/conf/autoload_configs/modules.conf.xml

Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/modules.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml	Thu Jun 18 16:42:34 2009
@@ -99,5 +99,9 @@
     
     
     
+
+    
+    
+
   
 


From brian at freeswitch.org  Thu Jun 18 14:45:58 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 16:45:58 -0500
Subject: [Freeswitch-svn] [commit] r13850 -
	freeswitch/trunk/conf/autoload_configs
Message-ID: 

Author: brian
Date: Thu Jun 18 16:45:57 2009
New Revision: 13850

Log:
 cp fail 

Modified:
   freeswitch/trunk/conf/autoload_configs/modules.conf.xml

Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/modules.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml	Thu Jun 18 16:45:57 2009
@@ -101,7 +101,7 @@
     
 
     
-    
+    
 
   
 


From anthm at freeswitch.org  Thu Jun 18 15:36:51 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 17:36:51 -0500
Subject: [Freeswitch-svn] [commit] r13851 -
	freeswitch/trunk/src/mod/formats/mod_shell_stream
Message-ID: 

Author: anthm
Date: Thu Jun 18 17:36:51 2009
New Revision: 13851

Log:
add mod_shell_stream

Added:
   freeswitch/trunk/src/mod/formats/mod_shell_stream/
   freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c

Added: freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c
==============================================================================
--- (empty file)
+++ freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c	Thu Jun 18 17:36:51 2009
@@ -0,0 +1,224 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II 
+ *
+ * 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
+ * Anthony Minessale II 
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Anthony Minessale II 
+ *
+ * mod_shell_stream.c -- Local Streaming Audio
+ *
+ */
+#include 
+
+#define MY_BUF_LEN 1024 * 32
+#define MY_BLOCK_SIZE MY_BUF_LEN
+
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_shell_stream_load);
+
+SWITCH_MODULE_DEFINITION(mod_shell_stream, mod_shell_stream_load, NULL, NULL);
+
+struct shell_stream_context {
+	int fds[2];
+	int pid;
+	char *command;
+	switch_buffer_t *audio_buffer;
+	switch_mutex_t *mutex;	
+	switch_thread_rwlock_t *rwlock;
+	int running;
+};
+
+typedef struct shell_stream_context shell_stream_context_t;
+
+
+static void *SWITCH_THREAD_FUNC buffer_thread_run(switch_thread_t *thread, void *obj)
+{
+	shell_stream_context_t *context = (shell_stream_context_t *) obj;
+	switch_byte_t data[MY_BUF_LEN];
+	ssize_t rlen;
+
+	context->running = 1;
+
+	if (switch_thread_rwlock_tryrdlock(context->rwlock) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
+		goto end;
+	}
+	
+	while(context->running) {
+		
+		rlen = read(context->fds[0], data, MY_BUF_LEN);
+
+		if (rlen <= 3) {
+			break;
+		}
+		
+		switch_mutex_lock(context->mutex);
+		switch_buffer_write(context->audio_buffer, data, rlen);
+		switch_mutex_unlock(context->mutex);
+	}
+
+	switch_thread_rwlock_unlock(context->rwlock);
+
+ end:
+
+	context->running = 0;
+
+	return NULL;
+}
+
+static switch_status_t shell_stream_file_open(switch_file_handle_t *handle, const char *path)
+{
+	shell_stream_context_t *context;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_thread_t *thread;
+	switch_threadattr_t *thd_attr = NULL;
+	
+	if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This format does not support writing!\n");
+		return SWITCH_STATUS_FALSE;
+	}
+	
+	context = switch_core_alloc(handle->memory_pool, sizeof(*context));
+	
+	context->fds[0] = -1;
+	context->fds[1] = -1;
+	context->command = switch_core_strdup(handle->memory_pool, path);
+
+	if (pipe(context->fds)) {
+		goto error;
+	} else { /* good to go*/
+		context->pid = fork();
+		
+		if (context->pid < 0) { /* ok maybe not */
+			goto error;
+		} else if (context->pid) { /* parent */
+			handle->private_info = context;
+			status = SWITCH_STATUS_SUCCESS;
+			close(context->fds[1]);
+			context->fds[1] = -1;
+
+			if (switch_buffer_create_dynamic(&context->audio_buffer, MY_BLOCK_SIZE, MY_BUF_LEN, 0) != SWITCH_STATUS_SUCCESS) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write Buffer Failed!\n");
+				goto error;
+			}
+
+			switch_thread_rwlock_create(&context->rwlock, handle->memory_pool);
+			switch_mutex_init(&context->mutex, SWITCH_MUTEX_NESTED, handle->memory_pool);
+			
+			switch_threadattr_create(&thd_attr, handle->memory_pool);
+			switch_threadattr_detach_set(thd_attr, 1);
+			switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+			switch_thread_create(&thread, thd_attr, buffer_thread_run, context, handle->memory_pool);
+			context->running = 2;
+
+			while(context->running == 2) {
+				switch_cond_next();
+			}
+
+			goto end;
+		} else { /*  child */
+			close(context->fds[0]);
+			dup2(context->fds[1], STDOUT_FILENO);
+			switch_system(context->command, SWITCH_TRUE);
+			printf("EOF");
+			close(context->fds[1]);
+			exit(0);
+		}
+	}
+
+ error:
+
+	close(context->fds[0]);
+	close(context->fds[1]);
+	status = SWITCH_STATUS_FALSE;
+		
+
+ end:
+		
+	return status;
+}
+
+static switch_status_t shell_stream_file_close(switch_file_handle_t *handle)
+{
+	shell_stream_context_t *context = handle->private_info;
+	
+	context->running = 0;
+
+	if (context->fds[0] > -1) {
+		close(context->fds[0]);
+	}
+
+	switch_thread_rwlock_wrlock(context->rwlock);
+	switch_thread_rwlock_unlock(context->rwlock);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t shell_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len)
+{
+	shell_stream_context_t *context = handle->private_info;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
+	switch_size_t rlen = *len * 2;
+
+	while(context->running && switch_buffer_inuse(context->audio_buffer) < rlen) {
+		switch_cond_next();
+	}
+	
+	switch_mutex_lock(context->mutex);
+	*len = switch_buffer_read(context->audio_buffer, data, rlen) / 2;
+	switch_mutex_unlock(context->mutex);
+
+	return status;
+}
+
+/* Registration */
+
+static char *supported_formats[SWITCH_MAX_CODECS] = { 0 };
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_shell_stream_load)
+{
+	switch_file_interface_t *file_interface;
+	supported_formats[0] = "shell_stream";
+
+	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+	file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
+	file_interface->interface_name = modname;
+	file_interface->extens = supported_formats;
+	file_interface->file_open = shell_stream_file_open;
+	file_interface->file_close = shell_stream_file_close;
+	file_interface->file_read = shell_stream_file_read;
+
+	/* indicate that the module should continue to be loaded */
+	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:
+ */


From anthm at freeswitch.org  Thu Jun 18 15:52:21 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 17:52:21 -0500
Subject: [Freeswitch-svn] [commit] r13852 -
	freeswitch/trunk/src/mod/formats/mod_shell_stream
Message-ID: 

Author: anthm
Date: Thu Jun 18 17:52:20 2009
New Revision: 13852

Log:
add rate and channel count params to executed command

Modified:
   freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c

Modified: freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c	(original)
+++ freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c	Thu Jun 18 17:52:20 2009
@@ -102,7 +102,7 @@
 	
 	context->fds[0] = -1;
 	context->fds[1] = -1;
-	context->command = switch_core_strdup(handle->memory_pool, path);
+	context->command = switch_core_sprintf(handle->memory_pool, "%s -r %d -c %d", path, handle->samplerate, handle->channels);
 
 	if (pipe(context->fds)) {
 		goto error;


From anthm at freeswitch.org  Thu Jun 18 16:03:54 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 18:03:54 -0500
Subject: [Freeswitch-svn] [commit] r13853 -
	freeswitch/trunk/src/mod/formats/mod_shell_stream
Message-ID: 

Author: anthm
Date: Thu Jun 18 18:03:54 2009
New Revision: 13853

Log:
del buffer

Modified:
   freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c

Modified: freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c	(original)
+++ freeswitch/trunk/src/mod/formats/mod_shell_stream/mod_shell_stream.c	Thu Jun 18 18:03:54 2009
@@ -168,6 +168,10 @@
 		close(context->fds[0]);
 	}
 
+	if (context->audio_buffer) {
+		switch_buffer_destroy(&context->audio_buffer);
+	}
+
 	switch_thread_rwlock_wrlock(context->rwlock);
 	switch_thread_rwlock_unlock(context->rwlock);
 


From mikej at freeswitch.org  Thu Jun 18 16:15:59 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 18:15:59 -0500
Subject: [Freeswitch-svn] [commit] r13854 -
	freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src
Message-ID: 

Author: mikej
Date: Thu Jun 18 18:15:59 2009
New Revision: 13854

Log:
fix sofia and apr includes stomping on each other on older apr versions

Modified:
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_client_agent.c	Thu Jun 18 18:15:59 2009
@@ -20,12 +20,14 @@
 typedef struct mrcp_sofia_session_t mrcp_sofia_session_t;
 #define NUA_HMAGIC_T mrcp_sofia_session_t
 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#undef strcasecmp
+#undef strncasecmp
+#include 
 
 #include "mrcp_sofiasip_client_agent.h"
 #include "mrcp_session.h"

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/src/mrcp_sofiasip_server_agent.c	Thu Jun 18 18:15:59 2009
@@ -20,12 +20,14 @@
 typedef struct mrcp_sofia_session_t mrcp_sofia_session_t;
 #define NUA_HMAGIC_T mrcp_sofia_session_t
 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#undef strcasecmp
+#undef strncasecmp
+#include 
 
 #include "mrcp_sofiasip_server_agent.h"
 #include "mrcp_session.h"


From mikej at freeswitch.org  Thu Jun 18 16:23:10 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 18:23:10 -0500
Subject: [Freeswitch-svn] [commit] r13855 - in freeswitch/trunk:
	libs/unimrcp libs/unimrcp/build/tools
	libs/unimrcp/libs/apr-toolkit libs/unimrcp/libs/mpf
	libs/unimrcp/libs/mrcp libs/unimrcp/libs/mrcp-client
	libs/unimrcp/libs/mrcp-engine libs/unimrcp/libs/mrcp-server
	libs/unimrcp/libs/mrcp-signaling
	libs/unimrcp/libs/mrcpv2-transport libs/unimrcp/libs/uni-rtsp
	libs/unimrcp/modules/mrcp-sofiasip libs/unimrcp/modules/mrcp-unirtsp
	libs/unimrcp/platforms/libunimrcp-client
	libs/unimrcp/platforms/libunimrcp-server
	libs/unimrcp/platforms/unimrcp-client
	libs/unimrcp/platforms/unimrcp-server
	libs/unimrcp/plugins/demo-recog libs/unimrcp/plugins/demo-synth
	libs/unimrcp/plugins/mrcp-cepstral libs/unimrcp/tests/apttest
	libs/unimrcp/tests/mpftest libs/unimrcp/tests/mrcptest
	libs/unimrcp/tests/rtsptest libs/unimrcp/tests/strtablegen
	src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mikej
Date: Thu Jun 18 18:23:10 2009
New Revision: 13855

Log:
svn:ignore


Modified:
   freeswitch/trunk/libs/unimrcp/   (props changed)
   freeswitch/trunk/libs/unimrcp/build/tools/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mpf/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/   (props changed)
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/   (props changed)
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/   (props changed)
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/   (props changed)
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/   (props changed)
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/   (props changed)
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/   (props changed)
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/apttest/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/mpftest/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/   (props changed)
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/   (props changed)
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/   (props changed)


From andrew at freeswitch.org  Thu Jun 18 17:51:53 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 19:51:53 -0500
Subject: [Freeswitch-svn] [commit] r13856 -
	freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
Message-ID: 

Author: andrew
Date: Thu Jun 18 19:51:53 2009
New Revision: 13856

Log:
Taking a stab at MODEVENT-47


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c	Thu Jun 18 19:51:53 2009
@@ -914,8 +914,9 @@
 				case ERL_REFERENCE_EXT :
 				case ERL_NEW_REFERENCE_EXT :
 					ret = handle_ref_tuple(listener, msg, buf, rbuf);
+					break;
 				default :
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type);
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d %d\n", type, type2);
 					/* some other kind of erlang term */
 					ei_x_encode_tuple_header(rbuf, 2);
 					ei_x_encode_atom(rbuf, "error");

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	Thu Jun 18 19:51:53 2009
@@ -476,8 +476,10 @@
 		return SWITCH_STATUS_MEMERR;
 	}
 
-	if (!(session = switch_core_session_locate(session_element->uuid_str)))
+	if (!(session = switch_core_session_locate(session_element->uuid_str))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't locate session %s\n", session_element->uuid_str);
 		return SWITCH_STATUS_FALSE;
+	}
 
 	channel = switch_core_session_get_channel(session);
 
@@ -507,10 +509,9 @@
 
 static switch_status_t check_attached_sessions(listener_t *listener)
 {
-	session_elem_t *last,*sp;
+	session_elem_t *last,*sp, *removed;
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	void *pop;
-	int removed = 0;
 	/* check up on all the attached sessions -
 	   if they have not yet sent an initial call event to the associated erlang process then do so
 	   if they have pending events in their queues then send them
@@ -520,15 +521,17 @@
 	sp = listener->session_list;
 	last = NULL;
 	while(sp) {
-		removed = 0;
+		removed = NULL;
 		if (switch_test_flag(sp, LFLAG_WAITING_FOR_PID)) {
 			break;
 		}
 
 		if (!switch_test_flag(sp, LFLAG_OUTBOUND_INIT)) {
 			status = notify_new_session(listener, sp);
-			if (status != SWITCH_STATUS_SUCCESS)
+			if (status != SWITCH_STATUS_SUCCESS) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Notifying new session failed\n");
 				break;
+			}
 			switch_set_flag(sp, LFLAG_OUTBOUND_INIT);
 		}
 		/* check event queue for this session */
@@ -562,7 +565,7 @@
 
 				/* this allows the application threads to exit */
 				switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE);
-				removed = 1;
+				removed = sp;
 
 				ei_x_new_with_version(&ebuf);
 				ei_x_encode_atom(&ebuf, "call_hangup");
@@ -578,9 +581,12 @@
 			}
 			switch_event_destroy(&pevent);
 		}
-		if (!removed)
-			last = sp;
 		sp = sp->next;
+		if (removed) {
+			switch_safe_free(removed)
+		} else {
+			last = sp;
+		}
 	}
 	switch_mutex_unlock(listener->session_mutex);
 	return status;
@@ -741,6 +747,7 @@
 #endif
 
 						if (handle_msg(listener, &msg, &buf, &rbuf)) {
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "handle_msg requested exit\n");
 							return;
 						}
 						break;
@@ -755,6 +762,7 @@
 #endif
 
 						if (handle_msg(listener, &msg, &buf, &rbuf)) {
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "handle_msg requested exit\n");
 						    return;
 						}
 						break;
@@ -789,6 +797,7 @@
 		check_log_queue(listener);
 		check_event_queue(listener);
 		if (check_attached_sessions(listener) != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "check_attached_sessions requested exit\n");
 			return;
 		}
 	}
@@ -1067,18 +1076,20 @@
 session_elem_t *session_elem_create(listener_t* listener, switch_core_session_t *session) 
 {
 	/* create a session list element */
-	session_elem_t* session_element = switch_core_session_alloc(session, sizeof(*session_element));
-	switch_channel_t *channel = switch_core_session_get_channel(session);
+	session_elem_t* session_element = malloc(sizeof(*session_element));
+	/*switch_channel_t *channel = switch_core_session_get_channel(session);*/
+
+	bzero(session_element, sizeof(*session_element));
 
 	memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH);
 	
 	switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session));
 	switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
 	
-	switch_channel_set_private(channel, "_erlang_session_", session_element);
-	switch_channel_set_private(channel, "_erlang_listener_", listener);
+	/*switch_channel_set_private(channel, "_erlang_session_", session_element);*/
+	/*switch_channel_set_private(channel, "_erlang_listener_", listener);*/
 	
-	switch_core_event_hook_add_state_change(session, state_handler);
+	/*switch_core_event_hook_add_state_change(session, state_handler);*/
 	
 	return session_element;
 }


From andrew at freeswitch.org  Thu Jun 18 18:49:00 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 20:49:00 -0500
Subject: [Freeswitch-svn] [commit] r13857 -
	freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
Message-ID: 

Author: andrew
Date: Thu Jun 18 20:48:59 2009
New Revision: 13857

Log:
Only complain about unexpected exits if the call isn't already hungup


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
   freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c	Thu Jun 18 20:48:59 2009
@@ -677,9 +677,11 @@
 
 	remove_binding(NULL, pid); /* TODO - why don't we pass the listener as the first argument? */
 	if ((s = find_session_elem_by_pid(listener, pid))) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Outbound session for %s exited unexpectedly!\n",
-				s->uuid_str);
-		/* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */
+		if (s->channel_state < CS_HANGUP) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Outbound session for %s exited unexpectedly!\n",
+					s->uuid_str);
+			/* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */
+		}
 		remove_session_elem_from_listener(listener, s);
 	}
 
@@ -1058,17 +1060,10 @@
 {
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	switch_channel_state_t state = switch_channel_get_state(channel);
+	session_elem_t *session_element = switch_channel_get_private(channel, "_erlang_session_");
+	/*listener_t* listener = switch_channel_get_private(channel, "_erlang_listener_");*/
 	
-	if (state >= CS_HANGUP)  {
-		session_elem_t *session_element = switch_channel_get_private(channel, "_erlang_session_");
-		listener_t* listener = switch_channel_get_private(channel, "_erlang_listener_");
-		
-		if (session_element && listener) {
-			remove_session_elem_from_listener(listener, session_element);
-		}
-
-		switch_core_event_hook_remove_state_change(session, state_handler);
-	}
+	session_element->channel_state = state;
 
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -1077,7 +1072,7 @@
 {
 	/* create a session list element */
 	session_elem_t* session_element = malloc(sizeof(*session_element));
-	/*switch_channel_t *channel = switch_core_session_get_channel(session);*/
+	switch_channel_t *channel = switch_core_session_get_channel(session);
 
 	bzero(session_element, sizeof(*session_element));
 
@@ -1086,10 +1081,10 @@
 	switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session));
 	switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
 	
-	/*switch_channel_set_private(channel, "_erlang_session_", session_element);*/
-	/*switch_channel_set_private(channel, "_erlang_listener_", listener);*/
+	switch_channel_set_private(channel, "_erlang_session_", session_element);
+	switch_channel_set_private(channel, "_erlang_listener_", listener);
 	
-	/*switch_core_event_hook_add_state_change(session, state_handler);*/
+	switch_core_event_hook_add_state_change(session, state_handler);
 	
 	return session_element;
 }
@@ -1407,7 +1402,7 @@
 	globals.reference2 = 0;
 
 	if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind to all events!\n");
 		close_socket(&listen_list.sockfd);
 		return SWITCH_STATUS_GENERR;
 	}
@@ -1417,7 +1412,7 @@
 	memset(&bindings, 0, sizeof(bindings));
 
 	if (switch_xml_bind_search_function_ret(erlang_fetch, SWITCH_XML_SECTION_MAX, NULL, &bindings.search_binding) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't set up xml search bindings!\n");
 		close_socket(&listen_list.sockfd);
 		return SWITCH_STATUS_GENERR;
 	}

Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h	Thu Jun 18 20:48:59 2009
@@ -60,6 +60,7 @@
 	uint32_t flags;
 	struct erlang_process process;
 	switch_queue_t *event_queue;
+	switch_channel_state_t channel_state;
 	struct session_elem *next;
 };
 


From brian at freeswitch.org  Thu Jun 18 20:51:51 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 22:51:51 -0500
Subject: [Freeswitch-svn] [commit] r13858 - in
	freeswitch/trunk/libs/unimrcp: . build/tools build/vsprops
	libs/apr-toolkit libs/mpf libs/mrcp libs/mrcp-client
	libs/mrcp-engine libs/mrcp-server libs/mrcp-signaling
	libs/mrcpv2-transport libs/uni-rtsp modules/mrcp-sofiasip
	modules/mrcp-unirtsp platforms/libunimrcp-client
	platforms/libunimrcp-server platforms/unimrcp-client
	platforms/unimrcp-server plugins/demo-recog
	plugins/demo-synth plugins/mrcp-cepstral tests/apttest
	tests/mpftest tests/mrcptest tests/rtsptest tests/strtablegen
Message-ID: 

Author: brian
Date: Thu Jun 18 22:51:50 2009
New Revision: 13858

Log:
revert r13832/13840 so they can be merged properly upstream

Modified:
   freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
   freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
   freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unidebug.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unirelease.vsprops
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
   freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj
   freeswitch/trunk/libs/unimrcp/unimrcp.sln

Modified: freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,68 +1,69 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+	
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,158 +1,159 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops	(original)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops	Thu Jun 18 22:51:50 2009
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="apr"
-	InheritedPropertySheets="$(ProjectDir)..\..\build\vsprops\unibase.vsprops"
+	InheritedPropertySheets="$(SolutionDir)build\vsprops\unibase.vsprops"
 	>
 	
 	
 	
 	
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,12 +1,11 @@
 
 
 	
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,166 +1,165 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,154 +1,153 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,162 +1,161 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,166 +1,165 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,301 +1,300 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-				
-				
-				
-				
-				
-				
-			
-			
-				
-				
-				
-				
-				
-				
-			
-		
-		
-			
-				
-				
-				
-				
-				
-				
-				
-				
-			
-			
-				
-				
-				
-				
-			
-		
-		
-			
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-			
-			
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+			
+		
+		
+			
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,178 +1,177 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,196 +1,195 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,168 +1,167 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,168 +1,167 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,156 +1,155 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,156 +1,155 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,200 +1,201 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,174 +1,175 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,12 +1,11 @@
 
 
 	
 		
 			
 			
 			
 			
+			
 		
 		
@@ -114,8 +114,6 @@
 			/>
 			
 			
 			
+			
 		

Modified: freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,164 +1,165 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,164 +1,165 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-		
-		
-			
-			
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+		
+		
+			
+			
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,11 +1,10 @@
 
 
 	
 		
 			
 			
 			
+			
 		
 		
 			
 			
 			
+			
 		

Modified: freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,166 +1,167 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,170 +1,171 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,166 +1,167 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj	Thu Jun 18 22:51:50 2009
@@ -1,162 +1,163 @@
-
-
-	
-		
-	
-	
-	
-	
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-	
-	
-	
-	
-		
-			
-			
-		
-		
-		
-	
-	
-	
-
+
+
+	
+		
+	
+	
+	
+	
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		
+	
+	
+	
+	
+		
+			
+			
+		
+		
+		
+	
+	
+	
+

Modified: freeswitch/trunk/libs/unimrcp/unimrcp.sln
==============================================================================
--- freeswitch/trunk/libs/unimrcp/unimrcp.sln	(original)
+++ freeswitch/trunk/libs/unimrcp/unimrcp.sln	Thu Jun 18 22:51:50 2009
@@ -1,272 +1,272 @@
-?
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{5377DC3A-DB96-4819-8AAF-2A75F3A69119}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "platforms", "platforms", "{8E282AE2-038C-49FE-AC67-BC9615AFD800}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{09BABD45-8F30-4F99-B8B8-8DD78F6804DB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{62083CC3-13BF-49EA-BFE8-4C9337C0D82C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpserver", "platforms\unimrcp-server\unimrcpserver.vcproj", "{592CF22D-3F8F-4A77-A174-130D77B7623B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {C98AF157-352E-4737-BD30-A24E2647F5AE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\apr-toolkit\aprtoolkit.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\mpf\mpf.vcproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\mrcp\mrcp.vcproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\mrcp-signaling\mrcpsignaling.vcproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpserver", "libs\mrcp-server\mrcpserver.vcproj", "{18B1F35A-10F8-4287-9B37-2D10501B0B38}"
-	ProjectSection(ProjectDependencies) = postProject
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpserver", "platforms\libunimrcp-server\libunimrcpserver.vcproj", "{C98AF157-352E-4737-BD30-A24E2647F5AE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {18B1F35A-10F8-4287-9B37-2D10501B0B38}
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "modules\mrcp-sofiasip\mrcpsofiasip.vcproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\mrcp-client\mrcpclient.vcproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"
-	ProjectSection(ProjectDependencies) = postProject
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpclient", "platforms\libunimrcp-client\libunimrcpclient.vcproj", "{EE157390-1E85-416C-946E-620E32C9AD33}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {72782932-37CC-46AE-8C7F-9A7B1A6EE108}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpclient", "platforms\unimrcp-client\unimrcpclient.vcproj", "{57FAF32E-49FD-491F-895D-132D0D5EFE0A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EE157390-1E85-416C-946E-620E32C9AD33} = {EE157390-1E85-416C-946E-620E32C9AD33}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\mrcpv2-transport\mrcpv2transport.vcproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpengine", "libs\mrcp-engine\mrcpengine.vcproj", "{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demosynth", "plugins\demo-synth\demosynth.vcproj", "{92BFA534-C419-4EB2-AAA3-510653F38F08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demorecog", "plugins\demo-recog\demorecog.vcproj", "{B495B6D9-AF84-479D-B30A-313C16EF8BFD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strtablegen", "tests\strtablegen\strtablegen.vcproj", "{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apttest", "tests\apttest\apttest.vcproj", "{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpftest", "tests\mpftest\mpftest.vcproj", "{DCF01B1C-5268-44F3-9130-D647FABFB663}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcptest", "tests\mrcptest\mrcptest.vcproj", "{3CA97077-6210-4362-998A-D15A35EEAA08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcepstral", "plugins\mrcp-cepstral\mrcpcepstral.vcproj", "{729EF28E-38C9-40DE-A138-87785F021411}"
-	ProjectSection(ProjectDependencies) = postProject
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\uni-rtsp\unirtsp.vcproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtsptest", "tests\rtsptest\rtsptest.vcproj", "{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}"
-	ProjectSection(ProjectDependencies) = postProject
-		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "modules\mrcp-unirtsp\mrcpunirtsp.vcproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
-		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prepare", "build\tools\prepare.vcproj", "{01D63BF5-7798-4746-852A-4B45229BB735}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpservice", "build\tools\unimrcpservice.vcproj", "{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.Build.0 = Debug|Win32
-		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.ActiveCfg = Release|Win32
-		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.Build.0 = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.Build.0 = Debug|Win32
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.ActiveCfg = Release|Win32
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.Build.0 = Release|Win32
-		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.Build.0 = Debug|Win32
-		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.ActiveCfg = Release|Win32
-		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.Build.0 = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
-		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.Build.0 = Debug|Win32
-		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.ActiveCfg = Release|Win32
-		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.Build.0 = Release|Win32
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.Build.0 = Debug|Win32
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.ActiveCfg = Release|Win32
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.Build.0 = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.Build.0 = Debug|Win32
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.ActiveCfg = Release|Win32
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.Build.0 = Release|Win32
-		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.ActiveCfg = Debug|Win32
-		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.Build.0 = Debug|Win32
-		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.ActiveCfg = Release|Win32
-		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.Build.0 = Release|Win32
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.Build.0 = Debug|Win32
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.ActiveCfg = Release|Win32
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.Build.0 = Release|Win32
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.ActiveCfg = Debug|Win32
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.Build.0 = Debug|Win32
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.ActiveCfg = Release|Win32
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.Build.0 = Release|Win32
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.Build.0 = Debug|Win32
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.ActiveCfg = Release|Win32
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.Build.0 = Release|Win32
-		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.Build.0 = Debug|Win32
-		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.ActiveCfg = Release|Win32
-		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.Build.0 = Release|Win32
-		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.Build.0 = Debug|Win32
-		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.ActiveCfg = Release|Win32
-		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.Build.0 = Release|Win32
-		{729EF28E-38C9-40DE-A138-87785F021411}.Debug|Win32.ActiveCfg = Debug|Win32
-		{729EF28E-38C9-40DE-A138-87785F021411}.Release|Win32.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.ActiveCfg = Debug|Win32
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.Build.0 = Debug|Win32
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.ActiveCfg = Release|Win32
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.Build.0 = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
-		{01D63BF5-7798-4746-852A-4B45229BB735}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01D63BF5-7798-4746-852A-4B45229BB735}.Release|Win32.ActiveCfg = Release|Win32
-		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Release|Win32.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{504B3154-7A4F-459D-9877-B951021C3F1F} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
-		{592CF22D-3F8F-4A77-A174-130D77B7623B} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
-		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
-		{EE157390-1E85-416C-946E-620E32C9AD33} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
-		{57FAF32E-49FD-491F-895D-132D0D5EFE0A} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
-		{92BFA534-C419-4EB2-AAA3-510653F38F08} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
-		{B495B6D9-AF84-479D-B30A-313C16EF8BFD} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
-		{729EF28E-38C9-40DE-A138-87785F021411} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
-		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{DCF01B1C-5268-44F3-9130-D647FABFB663} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{3CA97077-6210-4362-998A-D15A35EEAA08} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
-		{01D63BF5-7798-4746-852A-4B45229BB735} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
-		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
-	EndGlobalSection
-EndGlobal
+?
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{5377DC3A-DB96-4819-8AAF-2A75F3A69119}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "platforms", "platforms", "{8E282AE2-038C-49FE-AC67-BC9615AFD800}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{09BABD45-8F30-4F99-B8B8-8DD78F6804DB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpserver", "platforms\unimrcp-server\unimrcpserver.vcproj", "{592CF22D-3F8F-4A77-A174-130D77B7623B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {C98AF157-352E-4737-BD30-A24E2647F5AE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\apr-toolkit\aprtoolkit.vcproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\mpf\mpf.vcproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\mrcp\mrcp.vcproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\mrcp-signaling\mrcpsignaling.vcproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpserver", "libs\mrcp-server\mrcpserver.vcproj", "{18B1F35A-10F8-4287-9B37-2D10501B0B38}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpserver", "platforms\libunimrcp-server\libunimrcpserver.vcproj", "{C98AF157-352E-4737-BD30-A24E2647F5AE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {18B1F35A-10F8-4287-9B37-2D10501B0B38}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "modules\mrcp-sofiasip\mrcpsofiasip.vcproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\mrcp-client\mrcpclient.vcproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunimrcpclient", "platforms\libunimrcp-client\libunimrcpclient.vcproj", "{EE157390-1E85-416C-946E-620E32C9AD33}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {DEB01ACB-D65F-4A62-AED9-58C1054499E9}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {746F3632-5BB2-4570-9453-31D6D58A7D8E}
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {72782932-37CC-46AE-8C7F-9A7B1A6EE108}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpclient", "platforms\unimrcp-client\unimrcpclient.vcproj", "{57FAF32E-49FD-491F-895D-132D0D5EFE0A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EE157390-1E85-416C-946E-620E32C9AD33} = {EE157390-1E85-416C-946E-620E32C9AD33}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\mrcpv2-transport\mrcpv2transport.vcproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpengine", "libs\mrcp-engine\mrcpengine.vcproj", "{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demosynth", "plugins\demo-synth\demosynth.vcproj", "{92BFA534-C419-4EB2-AAA3-510653F38F08}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demorecog", "plugins\demo-recog\demorecog.vcproj", "{B495B6D9-AF84-479D-B30A-313C16EF8BFD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strtablegen", "tests\strtablegen\strtablegen.vcproj", "{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "apttest", "tests\apttest\apttest.vcproj", "{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpftest", "tests\mpftest\mpftest.vcproj", "{DCF01B1C-5268-44F3-9130-D647FABFB663}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {B5A00BFA-6083-4FAE-A097-71642D6473B5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcptest", "tests\mrcptest\mrcptest.vcproj", "{3CA97077-6210-4362-998A-D15A35EEAA08}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {1C320193-46A6-4B34-9C56-8AB584FC1B56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcepstral", "plugins\mrcp-cepstral\mrcpcepstral.vcproj", "{729EF28E-38C9-40DE-A138-87785F021411}"
+	ProjectSection(ProjectDependencies) = postProject
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{62083CC3-13BF-49EA-BFE8-4C9337C0D82C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\uni-rtsp\unirtsp.vcproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtsptest", "tests\rtsptest\rtsptest.vcproj", "{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}"
+	ProjectSection(ProjectDependencies) = postProject
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "modules\mrcp-unirtsp\mrcpunirtsp.vcproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {12A49562-BAB9-43A3-A21D-15B60BBB4C31}
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {504B3154-7A4F-459D-9877-B951021C3F1F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prepare", "build\tools\prepare.vcproj", "{01D63BF5-7798-4746-852A-4B45229BB735}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unimrcpservice", "build\tools\unimrcpservice.vcproj", "{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}"
+	ProjectSection(ProjectDependencies) = postProject
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Debug|Win32.Build.0 = Debug|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.ActiveCfg = Release|Win32
+		{592CF22D-3F8F-4A77-A174-130D77B7623B}.Release|Win32.Build.0 = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.ActiveCfg = Debug|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Debug|Win32.Build.0 = Debug|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.ActiveCfg = Release|Win32
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38}.Release|Win32.Build.0 = Release|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Debug|Win32.Build.0 = Debug|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.ActiveCfg = Release|Win32
+		{C98AF157-352E-4737-BD30-A24E2647F5AE}.Release|Win32.Build.0 = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Debug|Win32.Build.0 = Debug|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.ActiveCfg = Release|Win32
+		{EE157390-1E85-416C-946E-620E32C9AD33}.Release|Win32.Build.0 = Release|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Debug|Win32.Build.0 = Debug|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.ActiveCfg = Release|Win32
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A}.Release|Win32.Build.0 = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Debug|Win32.Build.0 = Debug|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.ActiveCfg = Release|Win32
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}.Release|Win32.Build.0 = Release|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.ActiveCfg = Debug|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Debug|Win32.Build.0 = Debug|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.ActiveCfg = Release|Win32
+		{92BFA534-C419-4EB2-AAA3-510653F38F08}.Release|Win32.Build.0 = Release|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Debug|Win32.Build.0 = Debug|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.ActiveCfg = Release|Win32
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD}.Release|Win32.Build.0 = Release|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.ActiveCfg = Debug|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Debug|Win32.Build.0 = Debug|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.ActiveCfg = Release|Win32
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872}.Release|Win32.Build.0 = Release|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.ActiveCfg = Debug|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Debug|Win32.Build.0 = Debug|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.ActiveCfg = Release|Win32
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15}.Release|Win32.Build.0 = Release|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Debug|Win32.Build.0 = Debug|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.ActiveCfg = Release|Win32
+		{DCF01B1C-5268-44F3-9130-D647FABFB663}.Release|Win32.Build.0 = Release|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Debug|Win32.Build.0 = Debug|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.ActiveCfg = Release|Win32
+		{3CA97077-6210-4362-998A-D15A35EEAA08}.Release|Win32.Build.0 = Release|Win32
+		{729EF28E-38C9-40DE-A138-87785F021411}.Debug|Win32.ActiveCfg = Debug|Win32
+		{729EF28E-38C9-40DE-A138-87785F021411}.Release|Win32.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
+		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Debug|Win32.Build.0 = Debug|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.ActiveCfg = Release|Win32
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335}.Release|Win32.Build.0 = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
+		{01D63BF5-7798-4746-852A-4B45229BB735}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01D63BF5-7798-4746-852A-4B45229BB735}.Release|Win32.ActiveCfg = Release|Win32
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25}.Release|Win32.ActiveCfg = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{18B1F35A-10F8-4287-9B37-2D10501B0B38} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{504B3154-7A4F-459D-9877-B951021C3F1F} = {5377DC3A-DB96-4819-8AAF-2A75F3A69119}
+		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
+		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {493A1DB9-6E7C-48C7-93B5-F75C3C25B9DF}
+		{592CF22D-3F8F-4A77-A174-130D77B7623B} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{C98AF157-352E-4737-BD30-A24E2647F5AE} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{EE157390-1E85-416C-946E-620E32C9AD33} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{57FAF32E-49FD-491F-895D-132D0D5EFE0A} = {8E282AE2-038C-49FE-AC67-BC9615AFD800}
+		{92BFA534-C419-4EB2-AAA3-510653F38F08} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{B495B6D9-AF84-479D-B30A-313C16EF8BFD} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{729EF28E-38C9-40DE-A138-87785F021411} = {09BABD45-8F30-4F99-B8B8-8DD78F6804DB}
+		{79EF9F1D-E211-4ED1-91D2-FC935AB3A872} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{429C907B-97D1-4B2D-9B0E-A14A5BFDAD15} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{DCF01B1C-5268-44F3-9130-D647FABFB663} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{3CA97077-6210-4362-998A-D15A35EEAA08} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{17A33F3F-BAF5-403F-8EF4-FECDA7D9A335} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
+		{01D63BF5-7798-4746-852A-4B45229BB735} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
+		{4714EF49-BFD5-4B22-95F7-95A07F1EAC25} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
+	EndGlobalSection
+EndGlobal


From mikej at freeswitch.org  Thu Jun 18 20:57:04 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 22:57:04 -0500
Subject: [Freeswitch-svn] [commit] r13859 - in
	freeswitch/trunk/libs/unimrcp: build/vsprops libs/mpf/include
	libs/mpf/src plugins/mrcp-cepstral/src tests/mpftest/src
Message-ID: 

Author: mikej
Date: Thu Jun 18 22:57:04 2009
New Revision: 13859

Log:
Added LPCM (16-bit linear PCM) codec, which is used internally in host order;
while L16 is RFC3551 defined 16-bit linear PCM codec in network order.

Using LPCM to specify linear PCM codec in host byte order

Merged upstream revisions through r991



Modified:
   freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpplugin.vsprops
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_manager.h
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_linear.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_manager.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_engine.c
   freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_termination.c
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/src/mrcp_swift.c
   freeswitch/trunk/libs/unimrcp/tests/mpftest/src/mpf_suite.c

Modified: freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpplugin.vsprops
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpplugin.vsprops	(original)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unimrcpplugin.vsprops	Thu Jun 18 22:57:04 2009
@@ -12,6 +12,6 @@
 	
 

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec.h
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec.h	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec.h	Thu Jun 18 22:57:04 2009
@@ -82,7 +82,7 @@
 }
 
 /**
- * Close codec.
+ * Clone codec.
  * @param src_codec the source (original) codec to clone
  * @param pool the pool to allocate memory from
  */

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_manager.h
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_manager.h	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/include/mpf_codec_manager.h	Thu Jun 18 22:57:04 2009
@@ -39,6 +39,9 @@
 /** Get (allocate) codec by codec descriptor */
 MPF_DECLARE(mpf_codec_t*) mpf_codec_manager_codec_get(const mpf_codec_manager_t *codec_manager, mpf_codec_descriptor_t *descriptor, apr_pool_t *pool);
 
+/** Get (allocate) default codec */
+MPF_DECLARE(mpf_codec_t*) mpf_codec_manager_default_codec_get(const mpf_codec_manager_t *codec_manager, apr_pool_t *pool);
+
 /** Get (allocate) list of available codecs */
 MPF_DECLARE(apt_bool_t) mpf_codec_manager_codec_list_get(const mpf_codec_manager_t *codec_manager, mpf_codec_list_t *codec_list, apr_pool_t *pool);
 

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_linear.c
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_linear.c	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_linear.c	Thu Jun 18 22:57:04 2009
@@ -16,20 +16,75 @@
 
 #include "mpf_codec.h"
 
+/* linear 16-bit PCM (host horder) */
+#define LPCM_CODEC_NAME        "LPCM"
+#define LPCM_CODEC_NAME_LENGTH (sizeof(LPCM_CODEC_NAME)-1)
+
+/* linear 16-bit PCM (RFC3551) */
 #define L16_CODEC_NAME        "L16"
 #define L16_CODEC_NAME_LENGTH (sizeof(L16_CODEC_NAME)-1)
 
+
+static apt_bool_t l16_open(mpf_codec_t *codec)
+{
+	return TRUE;
+}
+
+static apt_bool_t l16_close(mpf_codec_t *codec)
+{
+	return TRUE;
+}
+
+static apt_bool_t l16_encode(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out)
+{
+	apr_uint32_t i;
+	const short *buf_in = frame_in->buffer;
+	short *buf_out = frame_out->buffer;
+
+	frame_out->size = frame_in->size;
+
+	for(i=0; isize; ) {
+		buf_out[i] = htons(buf_in[i]);
+		i += sizeof(short);
+	}
+
+	return TRUE;
+}
+
+static apt_bool_t l16_decode(mpf_codec_t *codec, const mpf_codec_frame_t *frame_in, mpf_codec_frame_t *frame_out)
+{
+	apr_uint32_t i;
+	const short *buf_in = frame_in->buffer;
+	short *buf_out = frame_out->buffer;
+
+	frame_out->size = frame_in->size;
+
+	for(i=0; isize; ) {
+		buf_out[i] = ntohs(buf_in[i]);
+		i += sizeof(short);
+	}
+
+	return TRUE;
+}
+
+
+
+static const mpf_codec_vtable_t lpcm_vtable = {
+	NULL
+};
+
 static const mpf_codec_vtable_t l16_vtable = {
+	l16_open,
+	l16_close,
+	l16_encode,
+	l16_decode,
 	NULL
 };
 
-static const mpf_codec_descriptor_t l16_descriptor = {
-	96, /* not specified */
-	{L16_CODEC_NAME, L16_CODEC_NAME_LENGTH},
-	8000,
-	1,
-	NULL,
-	TRUE
+static const mpf_codec_attribs_t lpcm_attribs = {
+	{LPCM_CODEC_NAME, LPCM_CODEC_NAME_LENGTH},   /* codec name */
+	16,                                          /* bits per sample */
+	MPF_SAMPLE_RATE_8000 | MPF_SAMPLE_RATE_16000 /* sampling rates */
 };
 
 static const mpf_codec_attribs_t l16_attribs = {
@@ -38,12 +93,24 @@
 	MPF_SAMPLE_RATE_8000 | MPF_SAMPLE_RATE_16000 /* sampling rates */
 };
 
-mpf_codec_t* mpf_codec_l16_create(apr_pool_t *pool)
+mpf_codec_descriptor_t* mpf_codec_lpcm_descriptor_create(apr_uint16_t sampling_rate, apr_byte_t channel_count, apr_pool_t *pool)
 {
-	return mpf_codec_create(&l16_vtable,&l16_attribs,NULL,pool);
+	mpf_codec_descriptor_t *descriptor = apr_palloc(pool,sizeof(mpf_codec_descriptor_t));
+	mpf_codec_descriptor_init(descriptor);
+	descriptor->payload_type = 96;
+	descriptor->name.buf = LPCM_CODEC_NAME;
+	descriptor->name.length = LPCM_CODEC_NAME_LENGTH;
+	descriptor->sampling_rate = sampling_rate;
+	descriptor->channel_count = channel_count;
+	return descriptor;
 }
 
-const mpf_codec_descriptor_t* l16_descriptor_get()
+mpf_codec_t* mpf_codec_lpcm_create(apr_pool_t *pool)
 {
-	return &l16_descriptor;
+	return mpf_codec_create(&lpcm_vtable,&lpcm_attribs,NULL,pool);
+}
+
+mpf_codec_t* mpf_codec_l16_create(apr_pool_t *pool)
+{
+	return mpf_codec_create(&l16_vtable,&l16_attribs,NULL,pool);
 }

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_manager.c
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_manager.c	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_codec_manager.c	Thu Jun 18 22:57:04 2009
@@ -28,6 +28,8 @@
 };
 
 
+mpf_codec_descriptor_t* mpf_codec_lpcm_descriptor_create(apr_uint16_t sampling_rate, apr_byte_t channel_count, apr_pool_t *pool);
+
 MPF_DECLARE(mpf_codec_manager_t*) mpf_codec_manager_create(apr_size_t codec_count, apr_pool_t *pool)
 {
 	mpf_codec_manager_t *codec_manager = apr_palloc(pool,sizeof(mpf_codec_manager_t));
@@ -93,6 +95,14 @@
 	return ret_codec;
 }
 
+MPF_DECLARE(mpf_codec_t*) mpf_codec_manager_default_codec_get(const mpf_codec_manager_t *codec_manager, apr_pool_t *pool)
+{
+	mpf_codec_t *codec;
+	mpf_codec_descriptor_t *descriptor = mpf_codec_lpcm_descriptor_create(8000,1,pool);
+	codec = mpf_codec_manager_codec_get(codec_manager,descriptor,pool);
+	return codec;
+}
+
 MPF_DECLARE(apt_bool_t) mpf_codec_manager_codec_list_get(const mpf_codec_manager_t *codec_manager, mpf_codec_list_t *codec_list, apr_pool_t *pool)
 {
 	const mpf_codec_descriptor_t *static_descriptor;

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_engine.c
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_engine.c	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_engine.c	Thu Jun 18 22:57:04 2009
@@ -48,6 +48,7 @@
 
 static apt_bool_t mpf_engine_contexts_destroy(mpf_engine_t *engine);
 
+mpf_codec_t* mpf_codec_lpcm_create(apr_pool_t *pool);
 mpf_codec_t* mpf_codec_l16_create(apr_pool_t *pool);
 mpf_codec_t* mpf_codec_g711u_create(apr_pool_t *pool);
 mpf_codec_t* mpf_codec_g711a_create(apr_pool_t *pool);
@@ -287,6 +288,9 @@
 	mpf_codec_manager_t *codec_manager = mpf_codec_manager_create(3,pool);
 	if(codec_manager) {
 		mpf_codec_t *codec;
+		codec = mpf_codec_lpcm_create(pool);
+		mpf_codec_manager_codec_register(codec_manager,codec);
+
 		codec = mpf_codec_g711u_create(pool);
 		mpf_codec_manager_codec_register(codec_manager,codec);
 

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_termination.c
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_termination.c	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_termination.c	Thu Jun 18 22:57:04 2009
@@ -18,8 +18,6 @@
 #include "mpf_stream.h"
 #include "mpf_codec_manager.h"
 
-const mpf_codec_descriptor_t* l16_descriptor_get();
-
 MPF_DECLARE(mpf_termination_t*) mpf_termination_base_create(
 										mpf_termination_factory_t *termination_factory,
 										void *obj,
@@ -69,20 +67,6 @@
 	return TRUE;
 }
 
-static mpf_codec_t* mpf_termination_default_codec_create(mpf_termination_t *termination)
-{
-	mpf_codec_t *codec;
-	const mpf_codec_descriptor_t *default_descriptor = l16_descriptor_get();
-	mpf_codec_descriptor_t *descriptor = apr_palloc(termination->pool,sizeof(mpf_codec_descriptor_t));
-	mpf_codec_descriptor_init(descriptor);
-	*descriptor = *default_descriptor;
-	codec = mpf_codec_manager_codec_get(
-		termination->codec_manager,
-		descriptor,
-		termination->pool);
-	return codec;
-}
-
 MPF_DECLARE(apt_bool_t) mpf_termination_validate(mpf_termination_t *termination)
 {
 	mpf_audio_stream_t *audio_stream;
@@ -96,12 +80,16 @@
 		}
 		if((audio_stream->mode & STREAM_MODE_RECEIVE) == STREAM_MODE_RECEIVE) {
 			if(!audio_stream->rx_codec) {
-				audio_stream->rx_codec = mpf_termination_default_codec_create(termination);
+				audio_stream->rx_codec = mpf_codec_manager_default_codec_get(
+											termination->codec_manager,
+											termination->pool);
 			}
 		}
 		if((audio_stream->mode & STREAM_MODE_SEND) == STREAM_MODE_SEND) {
 			if(!audio_stream->tx_codec) {
-				audio_stream->tx_codec = mpf_termination_default_codec_create(termination);
+				audio_stream->tx_codec = mpf_codec_manager_default_codec_get(
+											termination->codec_manager,
+											termination->pool);
 			}
 		}
 	}

Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/src/mrcp_swift.c
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/src/mrcp_swift.c	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/src/mrcp_swift.c	Thu Jun 18 22:57:04 2009
@@ -195,7 +195,7 @@
 	mpf_codec_descriptor_init(codec_descriptor);
 	codec_descriptor->channel_count = 1;
 	codec_descriptor->payload_type = 96;
-	apt_string_set(&codec_descriptor->name,"L16");
+	apt_string_set(&codec_descriptor->name,"LPCM");
 	codec_descriptor->sampling_rate = 8000;
 
 	params = swift_params_new(NULL);

Modified: freeswitch/trunk/libs/unimrcp/tests/mpftest/src/mpf_suite.c
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/mpftest/src/mpf_suite.c	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/mpftest/src/mpf_suite.c	Thu Jun 18 22:57:04 2009
@@ -348,8 +348,8 @@
 	descriptor->write_handle = NULL;
 
 	codec_descriptor = &descriptor->codec_descriptor;
-	codec_descriptor->payload_type = 11;
-	apt_string_set(&codec_descriptor->name,"L16");
+	codec_descriptor->payload_type = 96;
+	apt_string_set(&codec_descriptor->name,"LPCM");
 	codec_descriptor->sampling_rate = 8000;
 	codec_descriptor->channel_count = 1;
 	return descriptor;
@@ -366,8 +366,8 @@
 	descriptor->read_handle = NULL;
 
 	codec_descriptor = &descriptor->codec_descriptor;
-	codec_descriptor->payload_type = 11;
-	apt_string_set(&codec_descriptor->name,"L16");
+	codec_descriptor->payload_type = 96;
+	apt_string_set(&codec_descriptor->name,"LPCM");
 	codec_descriptor->sampling_rate = 8000;
 	codec_descriptor->channel_count = 1;
 	return descriptor;


From mikej at freeswitch.org  Thu Jun 18 21:42:39 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 23:42:39 -0500
Subject: [Freeswitch-svn] [commit] r13860 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: mikej
Date: Thu Jun 18 23:42:39 2009
New Revision: 13860

Log:
msvc build fixes


Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Thu Jun 18 23:42:39 2009
@@ -192,9 +192,9 @@
 	/** signaling for blocked readers/writers */
 	switch_thread_cond_t *cond;
 	/** total bytes written */
-	unsigned int write_bytes;
+	switch_size_t write_bytes;
 	/** total bytes read */
-	unsigned int read_bytes;
+	switch_size_t read_bytes;
 	/** number of bytes reader is waiting for */
 	switch_size_t waiting;
 	/** name of this queue (for logging) */
@@ -3388,6 +3388,7 @@
 {
 	switch_log_level_t level;
 	char log_message[4096] = { 0 }; /* same size as MAX_LOG_ENTRY_SIZE in UniMRCP apt_log.c */
+	size_t msglen;
 
 	if (switch_strlen_zero(format)) {
 		return TRUE;
@@ -3422,7 +3423,7 @@
 	
 	/* apr_vsnprintf supports format extensions required by UniMRCP */ 
 	apr_vsnprintf(log_message, sizeof(log_message), format, arg_ptr);
-	size_t msglen = strlen(log_message);
+	msglen = strlen(log_message);
 	if (msglen >= 2 && log_message[msglen - 2] == '\\' && log_message[msglen - 1] == 'n') {
 		/* log_message already ends in \n */
 		switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, id, level, "%s", log_message);


From brian at freeswitch.org  Thu Jun 18 21:52:45 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Thu, 18 Jun 2009 23:52:45 -0500
Subject: [Freeswitch-svn] [commit] r13861 -
	freeswitch/trunk/libs/unimrcp/build/vsprops
Message-ID: 

Author: brian
Date: Thu Jun 18 23:52:45 2009
New Revision: 13861

Log:
use correct paths when embedding unimrcp projects in another solution file

Modified:
   freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unibase.vsprops

Modified: freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops	(original)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops	Thu Jun 18 23:52:45 2009
@@ -15,14 +15,14 @@
 	/>
 	
 	
 	
 

Modified: freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops	(original)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops	Thu Jun 18 23:52:45 2009
@@ -15,6 +15,6 @@
 	/>
 	
 

Modified: freeswitch/trunk/libs/unimrcp/build/vsprops/unibase.vsprops
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/vsprops/unibase.vsprops	(original)
+++ freeswitch/trunk/libs/unimrcp/build/vsprops/unibase.vsprops	Thu Jun 18 23:52:45 2009
@@ -19,6 +19,10 @@
 	/>
 	
+	
 


From mikej at freeswitch.org  Thu Jun 18 22:18:17 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 00:18:17 -0500
Subject: [Freeswitch-svn] [commit] r13862 - in
	freeswitch/trunk/libs/unimrcp: build/tools build/vsprops
	libs/apr-toolkit libs/mpf libs/mrcp libs/mrcp-client
	libs/mrcp-engine libs/mrcp-server libs/mrcp-signaling
	libs/mrcpv2-transport libs/uni-rtsp modules/mrcp-sofiasip
	modules/mrcp-unirtsp platforms/libunimrcp-client
	platforms/libunimrcp-server platforms/unimrcp-client
	platforms/unimrcp-server plugins/demo-recog
	plugins/demo-synth plugins/mrcp-cepstral tests/apttest
	tests/mpftest tests/mrcptest tests/rtsptest tests/strtablegen
Message-ID: 

Author: mikej
Date: Fri Jun 19 00:18:17 2009
New Revision: 13862

Log:
use correct paths when embedding unimrcp projects in another solution file

Modified:
   freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
   freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
   freeswitch/trunk/libs/unimrcp/build/vsprops/apr.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/sofiasip.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unidebug.vsprops
   freeswitch/trunk/libs/unimrcp/build/vsprops/unirelease.vsprops
   freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
   freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
   freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
   freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
   freeswitch/trunk/libs/unimrcp/platforms/unimrcp-server/unimrcpserver.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-recog/demorecog.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
   freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
   freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mpftest/mpftest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/mrcptest/mrcptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/rtsptest/rtsptest.vcproj
   freeswitch/trunk/libs/unimrcp/tests/strtablegen/strtablegen.vcproj

Modified: freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/build/tools/prepare.vcproj	Fri Jun 19 00:18:17 2009
@@ -20,7 +20,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="10"
-			InheritedPropertySheets="$(SolutionDir)build\vsprops\apr.vsprops;$(SolutionDir)build\vsprops\sofiasip.vsprops"
+			InheritedPropertySheets="$(ProjectDir)..\..\build\vsprops\apr.vsprops;$(ProjectDir)..\..\build\vsprops\sofiasip.vsprops"
 			CharacterSet="1"
 			>
 			

Modified: freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/build/tools/unimrcpservice.vcproj	Fri Jun 19 00:18:17 2009
@@ -17,7 +17,7 @@
 		
 			
 			
 	
 	
 	
 	
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-engine/mrcpengine.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-server/mrcpserver.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/platforms/unimrcp-client/unimrcpclient.vcproj	Fri Jun 19 00:18:17 2009
@@ -17,7 +17,7 @@
 		
 			
 			
 			
 			
 			

Modified: freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/demo-synth/demosynth.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-cepstral/mrcpcepstral.vcproj	Fri Jun 19 00:18:17 2009
@@ -18,7 +18,7 @@
 		
 			

Modified: freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj
==============================================================================
--- freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	(original)
+++ freeswitch/trunk/libs/unimrcp/tests/apttest/apttest.vcproj	Fri Jun 19 00:18:17 2009
@@ -17,7 +17,7 @@
 		
 			
 			
 			
 			
 			
 			
 			
 			
 			
 			

Author: intralanman
Date: Fri Jun 19 09:46:51 2009
New Revision: 13863

Log:
adding support for routing by intrastate rates... still need work on the api command

Modified:
   freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c

Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	Fri Jun 19 09:46:51 2009
@@ -128,6 +128,7 @@
 	char *custom_sql;
 	switch_bool_t custom_sql_has_percent;
 	switch_bool_t custom_sql_has_vars;
+	switch_bool_t profile_has_intra;
 	
 	switch_bool_t reorder_by_rate;
 	switch_bool_t quote_in_list;
@@ -142,6 +143,7 @@
 	switch_memory_pool_t *pool;
 	char *lookup_number;
 	char *cid;
+	switch_bool_t intrastate;
 	profile_t *profile;
 	switch_core_session_t *session;
 	switch_event_t *event;
@@ -637,7 +639,9 @@
 	switch_bool_t lookup_status;
 	switch_channel_t *channel;
 	char *id_str;
-	char *safe_sql;
+	char *safe_sql = NULL;
+	const char *intra = NULL;
+	char *rate_field = NULL;
 	
 	switch_assert(cb_struct->lookup_number != NULL);
 
@@ -656,7 +660,16 @@
 	
 	/* set some channel vars if we have a session */
 	if (cb_struct->session) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have a session\n");
 		if ((channel = switch_core_session_get_channel(cb_struct->session))) {
+			intra = switch_channel_get_variable(channel, "intrastate");
+			if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true") || profile->profile_has_intra == SWITCH_FALSE) {
+				rate_field = switch_core_strdup(cb_struct->pool, "rate");
+			} else {
+				rate_field = switch_core_strdup(cb_struct->pool, "intra");
+			}
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate routing [%s] so rate field is [%s]\n", intra, rate_field);
+			switch_channel_set_variable_var_check(channel, "lcr_rate_field", rate_field, SWITCH_FALSE);
 			switch_channel_set_variable_var_check(channel, "lcr_query_digits", digits_copy, SWITCH_FALSE);
 			id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id);
 			switch_channel_set_variable_var_check(channel, "lcr_query_profile", id_str, SWITCH_FALSE);
@@ -664,12 +677,24 @@
 		}
 	}
 	if (cb_struct->event) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have an event");
+		intra = switch_event_get_header(cb_struct->event, "intrastate");
+		if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true") || profile->profile_has_intra == SWITCH_FALSE) {
+			rate_field = switch_core_strdup(cb_struct->pool, "rate");
+		} else {
+			rate_field = switch_core_strdup(cb_struct->pool, "intra");
+		}
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate routing [%s] so rate field is [%s]\n", intra, rate_field);
+		switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_rate_field", rate_field);
 		switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_digits", digits_copy);
 		id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id);
 		switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_profile", id_str);
 		switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_expanded_digits", digits_expanded);
 	}
 
+	if (!cb_struct->session && !cb_struct->session) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "We have no session and no event, we need to set rate_field somewhere now\n");
+	}
 	/* set up the query to be executed */
 
 	/* format the custom_sql */
@@ -815,6 +840,8 @@
 									thisorder->write_function(thisorder, "%s quality DESC", comma);
 								} else if (!strcasecmp(argv[x], "reliability")) {
 									thisorder->write_function(thisorder, "%s reliability DESC", comma);
+								} else if (!strcasecmp(argv[x], "rate")) {
+									thisorder->write_function(thisorder, "%s ${lcr_rate_field}", comma);
 								} else {
 									thisorder->write_function(thisorder, "%s %s", comma, argv[x]);
 								}
@@ -855,7 +882,7 @@
 					profile->order_by = switch_core_strdup(globals.pool, (char *)order_by.data);
 				} else {
 					/* default to rate */
-					profile->order_by = ", rate";
+					profile->order_by = ", ${lcr_rate_field}";
 				}
 
 				if (!switch_strlen_zero(id_s)) {
@@ -867,7 +894,7 @@
 				if (switch_strlen_zero(custom_sql)) {
 					/* use default sql */
 					sql_stream.write_function(&sql_stream, 
-											  "SELECT l.digits, c.carrier_name, l.rate, cg.prefix AS gw_prefix, cg.suffix AS gw_suffix, l.lead_strip, l.trail_strip, l.prefix, l.suffix "
+											  "SELECT l.digits, c.carrier_name, l.${lcr_rate_field}, cg.prefix AS gw_prefix, cg.suffix AS gw_suffix, l.lead_strip, l.trail_strip, l.prefix, l.suffix "
 											  );
 					if (db_check("SELECT codec from carrier_gateway limit 1") == SWITCH_TRUE) {
 						sql_stream.write_function(&sql_stream, ", cg.codec ");
@@ -897,6 +924,14 @@
 					custom_sql = sql_stream.data;
 				}
 				
+				
+				profile->profile_has_intra = db_check("SELECT intra FROM lcr LIMIT 1");
+				if (profile->profile_has_intra != SWITCH_TRUE) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 
+									  "no \"intra\" field found in the \"lcr\" table, routing by intrastate rates will be disabled until the field is added and mod_lcr is reloaded\n"
+									  );
+				}
+
 				if (switch_string_var_check_const(custom_sql) || switch_string_has_escaped_data(custom_sql)) {
 					profile->custom_sql_has_vars = SWITCH_TRUE;
 				}
@@ -926,7 +961,7 @@
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Setting user defined default profile: %s.\n", profile->name);
 					}
 				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Removing INAVLID Profile %s.\n", profile->name);
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Removing INVALID Profile %s.\n", profile->name);
 					switch_core_hash_delete(globals.profile_hash, profile->name);
 				}
 				
@@ -1129,6 +1164,10 @@
 		goto usage;
 	}
 
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG
+					  , "data passed to lcr is [%s]\n", cmd
+					  );
+
 	if (session) {
 		pool = switch_core_session_get_pool(session);
 		cb_struct.session = session;
@@ -1148,26 +1187,33 @@
 			lcr_profile = argv[1];
 		}
 		if (argc > 2) {
-			cb_struct.cid = switch_core_strdup(pool, argv[2]);
-		} else {
+			int i;
+			for (i=2; iwrite_function(stream, "-ERR Unknown profile: %s\n", lcr_profile);
 			goto end;
 		}
 
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO
-						  , "data passed to lcr is [%s]\n", cmd
-						  );
 		lookup_status = lcr_do_lookup(&cb_struct);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO
-						  , "lcr lookup returned [%d]\n"
-						  , lookup_status
-						  );
+
 		if (cb_struct.head != NULL) {
 			size_t len;
 


From brian at freeswitch.org  Fri Jun 19 08:35:27 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 10:35:27 -0500
Subject: [Freeswitch-svn] [commit] r13864 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: brian
Date: Fri Jun 19 10:35:26 2009
New Revision: 13864

Log:
 refactor fs_path path from Math. 

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	Fri Jun 19 10:35:26 2009
@@ -643,6 +643,12 @@
 	AUTH_STALE,
 } auth_res_t;
 
+typedef struct {
+        char *to;
+        char *contact;
+        char *route;
+        char *route_uri;
+} sofia_destination_t;
 
 #define sofia_test_pflag(obj, flag) ((obj)->pflags[flag] ? 1 : 0)
 #define sofia_set_pflag(obj, flag) (obj)->pflags[flag] = 1
@@ -891,3 +897,5 @@
 void sofia_glue_tech_set_local_sdp(private_object_t *tech_pvt, const char *sdp_str, switch_bool_t dup);
 void sofia_glue_set_rtp_stats(private_object_t *tech_pvt);
 void sofia_glue_get_addr(msg_t *msg, char *buf, size_t buflen, int *port);
+sofia_destination_t* sofia_glue_get_destination(char *data);
+void sofia_glue_free_destination(sofia_destination_t *dst);

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Fri Jun 19 10:35:26 2009
@@ -1319,6 +1319,7 @@
 	char *route = NULL;
 	char *route_uri = NULL;
 	char *sendto = NULL;
+	sofia_destination_t *dst = NULL;
 	sofia_cid_type_t cid_type = tech_pvt->profile->cid_type;
 
 	rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER);
@@ -1666,32 +1667,14 @@
 		sofia_glue_tech_patch_sdp(tech_pvt);
 	}
 
-	if (tech_pvt->dest && (route = strstr(tech_pvt->dest, ";fs_path=")) && (*(route + 9))) {
-		char *p;
+	dst = sofia_glue_get_destination(tech_pvt->dest);
 
-		route = switch_core_session_strdup(tech_pvt->session, route + 9);
-		switch_assert(route);
-
-		for (p = route; p && *p ; p++) {
-			if (*p == '>' || *p == ';') {
-				*p = '\0';
-				break;
-			}
-		}
-		switch_url_decode(route);
-		route_uri = switch_core_session_strdup(tech_pvt->session, route);
-		if ((p = strchr(route_uri, ','))) {
-			while (*(p-1) == ' ') {
-				p--;
-			}
-			if (*p) {
-				*p = '\0';
-			}
-		}
-		
-		route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL);
-	} else {
-		route = NULL;
+	if (dst->route_uri) {
+		route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, dst->route_uri, 0, SWITCH_TRUE, NULL);
+	}
+	
+	if (dst->route) {
+		route = dst->route;
 	}
 
 	if ((val = switch_channel_get_variable(channel, "sip_route_uri"))) {
@@ -1720,9 +1703,8 @@
 			   TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)),
 			   TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
 			   TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)),
-			   TAG_IF(tech_pvt->route_uri, NUTAG_PROXY(tech_pvt->route_uri)),
+			   TAG_IF(!switch_strlen_zero(route_uri), NUTAG_PROXY(route_uri)),
 			   TAG_IF(!switch_strlen_zero(route), SIPTAG_ROUTE_STR(route)),
-			   TAG_IF(!switch_strlen_zero(sendto), NUTAG_PROXY(sendto)),
 			   SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip),
 			   SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
 			   SOATAG_REUSE_REJECTED(1),
@@ -1731,6 +1713,7 @@
 			   SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), SOATAG_HOLD(holdstr), TAG_END());
 
 	switch_safe_free(stream.data);
+	sofia_glue_free_destination(dst);
 	tech_pvt->redirected = NULL;
 
 	return SWITCH_STATUS_SUCCESS;
@@ -4159,6 +4142,101 @@
 	
 }
 
+/* all the values of the structure are initialized to NULL  */
+/* in case of failure the function returns NULL */
+/* sofia_destination->route can be NULL */
+sofia_destination_t* sofia_glue_get_destination(char *data)
+{
+	sofia_destination_t *dst = NULL;
+	char *to = NULL;
+	char *contact = NULL;
+    char *route = NULL;
+    char *route_uri = NULL;
+	char *eoc = NULL;
+	char *p = NULL;
+
+	if (switch_strlen_zero(data)) {
+		return NULL;
+	}
+
+	if (!(dst = (sofia_destination_t *)malloc(sizeof(sofia_destination_t)))) {
+		return NULL;
+	}
+
+	/* return a copy of what is in the buffer between the first < and > */
+	if (!(contact = sofia_glue_get_url_from_contact(data, 1))) {
+		goto mem_fail;
+	}
+
+	if((eoc = strstr(contact, ";fs_path="))) {
+		*eoc = '\0';
+
+		if(!(route = strdup(eoc + 9))) {
+			goto mem_fail;
+		}
+
+		for (p = route; p && *p ; p++) {
+			if (*p == '>' || *p == ';') {
+				*p = '\0';
+				break;
+			}
+		}
+
+		switch_url_decode(route);
+
+ 		if (!(route_uri = strdup(route))) {
+			goto mem_fail;
+		}
+		if ((p = strchr(route_uri, ','))) {
+			do {
+				*p = '\0';
+			} while ((--p > route_uri) && *p == ' ');
+		}
+	}
+	else {
+                if(!(route_uri = strdup(contact))) {
+			goto mem_fail;
+		}
+        }
+
+	if (!(to = strdup(data))) {
+		goto mem_fail;
+	}
+
+	if((eoc = strstr(to, ";fs_path="))) {
+		*eoc++ = '>';	
+		*eoc = '\0';	
+	}
+	
+	if ((p = strstr(contact, ";fs_"))) {
+		*p = '\0';
+	}
+	
+	dst->contact = contact;
+	dst->to = to;
+	dst->route = route;
+	dst->route_uri = route_uri;
+	return dst;
+
+mem_fail:
+	switch_safe_free(contact);
+	switch_safe_free(to);
+	switch_safe_free(route);
+	switch_safe_free(route_uri);
+	switch_safe_free(dst);
+	return NULL;
+}
+
+void sofia_glue_free_destination(sofia_destination_t *dst)
+{
+	if (dst) {
+		switch_safe_free(dst->contact);
+		switch_safe_free(dst->route);
+		switch_safe_free(dst->route_uri);
+		switch_safe_free(dst->to);
+		switch_safe_free(dst);
+	}
+}
 
 /* For Emacs:
  * Local Variables:

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c	Fri Jun 19 10:35:26 2009
@@ -61,10 +61,7 @@
 	char *dup = NULL;
 	switch_status_t status = SWITCH_STATUS_FALSE;
 	const char *ct = "text/html";
-	char *clean_to = NULL;
-	char *route = NULL;
-	char *route_uri = NULL;
-	char *ptr = NULL;
+	sofia_destination_t *dst = NULL;
 
 	if (!to) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To: header.\n");
@@ -138,57 +135,29 @@
 		from = ffrom;
 		switch_safe_free(fp);
 	}
-
-	contact = sofia_glue_get_url_from_contact(buf, 1);
-
-	if (contact && (ptr = strstr(contact, ";fs_path=")) && (route = strdup(ptr + 9))) {
-		char *p;
-		for (p = route; p && *p ; p++) {
-			if (*p == '>' || *p == ';') {
-				*p = '\0';
-				break;
-			}
-		}
-		switch_url_decode(route);
-		route_uri = strdup(route);
-		if ((p = strchr(route_uri, ','))) {
-			while ((p > route_uri) && *(p-1) == ' ') {
-				p--;
-			}
-			if (*p) {
-				*p = '\0';
-			}
-		}
-		*ptr++ = '>';	
-		*ptr++ = '\0';	
-	}
-
-	clean_to = strdup(buf);
-	if ((ptr = strstr(clean_to, ";fs_path="))) {
-		*ptr++ = '>';	
-		*ptr++ = '\0';	
+	
+	if (!(dst = sofia_glue_get_destination(buf))) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+		goto end;
 	}
 
 	/* sofia_glue is running sofia_overcome_sip_uri_weakness we do not, not sure if it matters */
 
 	status = SWITCH_STATUS_SUCCESS;
 	/* if this cries, add contact here too, change the 1 to 0 and omit the safe_free */
-	msg_nh = nua_handle(profile->nua, NULL, TAG_IF(route, NUTAG_PROXY(route_uri)), TAG_IF(route, SIPTAG_ROUTE_STR(route)),
+	msg_nh = nua_handle(profile->nua, NULL, TAG_IF(dst->route_uri, NUTAG_PROXY(dst->route_uri)), TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
 						SIPTAG_FROM_STR(from), NUTAG_URL(contact),
-						SIPTAG_TO_STR(clean_to), SIPTAG_CONTACT_STR(profile->url),
+						SIPTAG_TO_STR(dst->to), SIPTAG_CONTACT_STR(profile->url),
 						TAG_END());
 	nua_handle_bind(msg_nh, &mod_sofia_globals.destroy_private);
 	nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(body), TAG_END());
-
+	
+	
  end:
-
+	sofia_glue_free_destination(dst);
 	switch_safe_free(contact);
-	switch_safe_free(route);
-	switch_safe_free(route_uri);
 	switch_safe_free(ffrom);
 	switch_safe_free(dup);
-	switch_safe_free(clean_to);
-
 	if (profile) {
 		switch_thread_rwlock_unlock(profile->rwlock);
 	}
@@ -1399,7 +1368,7 @@
 	char *sub_to_user = argv[0];
 	char *sub_to_host = argv[1];
 	char *event = "message-summary";
-	char *contact, *o_contact = argv[2];
+	char *o_contact = argv[2];
 	char *profile_name = argv[3];
 	char *network_ip = argv[4];
 	char *body = argv[5];
@@ -1407,8 +1376,8 @@
 	nua_handle_t *nh;
 	struct mwi_helper *h = (struct mwi_helper *) pArg;
 	sofia_profile_t *ext_profile = NULL, *profile = h->profile;
-	char *route = NULL, *route_uri = NULL, *user_via = NULL;
-	char *p, *contact_str;
+	sofia_destination_t *dst = NULL;
+	char *contact_str, *contact, *user_via = NULL;
 
 	if (profile_name && strcasecmp(profile_name, h->profile->name)) {
 		if ((ext_profile = sofia_glue_find_profile(profile_name))) {
@@ -1421,7 +1390,9 @@
 		char *ptr = NULL;
 		const char *transport_str = NULL;
 
+
 		id = switch_mprintf("sip:%s@%s", sub_to_user, profile->extsipip);
+		switch_assert(id);
 
 		if ((ptr = sofia_glue_find_parameter(o_contact, "transport="))) {
 			sofia_transport_t transport = sofia_glue_str2transport(ptr);
@@ -1449,43 +1420,9 @@
 		id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host);
 	}
 
-	if ((route = strstr(contact, ";fs_path=")) && (route = strdup(route + 9))) {
-		
-		for (p = route; p && *p ; p++) {
-			if (*p == '>' || *p == ';') {
-				*p = '\0';
-				break;
-			}
-		}
-		switch_url_decode(route);
-		route_uri = route;
-		if ((p = strchr(route_uri, ','))) {
-			while (*(p-1) == ' ') {
-				p--;
-			}
-			if (*p) {
-				*p = '\0';
-			}
-		}
-	}
-
-	if (!route_uri && strstr(contact, ";fs_nat")) {
-		route_uri = contact;
-	}
-
-	if ((p = strstr(contact, ";fs_"))) {
-		*p = '\0';
-	}
+	dst = sofia_glue_get_destination(o_contact);
+	switch_assert(dst);
 
-	if (route_uri) {
-		while (route_uri && *route_uri && (*route_uri == '<' || *route_uri == ' ')) {
-			route_uri++;
-		}
-		if ((p = strchr(route_uri, '>'))) {
-			*p++ = '\0';
-		}
-	}
-	
 	nh = nua_handle(profile->nua, NULL, NUTAG_URL(contact),
 					SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id),
 					SIPTAG_CONTACT_STR(contact_str), TAG_END());
@@ -1493,15 +1430,15 @@
 
 	nua_notify(nh,
 			   NUTAG_NEWSUB(1),
-			   TAG_IF(route_uri, NUTAG_PROXY(route_uri)),
+			   TAG_IF(dst->route_uri, NUTAG_PROXY(dst->route_uri)), TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
 			   TAG_IF(user_via, SIPTAG_VIA_STR(user_via)),
 			   SIPTAG_EVENT_STR(event),
 			   SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"),
 			   SIPTAG_PAYLOAD_STR(body), TAG_END());
-
+	
 	switch_safe_free(contact);
 	switch_safe_free(id);
-	switch_safe_free(route);
+	sofia_glue_free_destination(dst);
 	switch_safe_free(user_via);
 
 	if (ext_profile) {


From mrene at freeswitch.org  Fri Jun 19 08:48:23 2009
From: mrene at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 10:48:23 -0500
Subject: [Freeswitch-svn] [commit] r13865 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: mrene
Date: Fri Jun 19 10:48:23 2009
New Revision: 13865

Log:
MODENDP-221

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	Fri Jun 19 10:48:23 2009
@@ -388,17 +388,21 @@
 {
 	sofia_profile_t *profile = (sofia_profile_t *) pArg;
 	nua_handle_t *nh;
-	char *contact = NULL;
 	char to[128] = "";
+	sofia_destination_t *dst = NULL;
 
 	switch_snprintf(to, sizeof(to), "sip:%s@%s", argv[1], argv[2]);
-	contact = sofia_glue_get_url_from_contact(argv[3], 1);
+	dst = sofia_glue_get_destination(argv[3]);
+	switch_assert(dst);
 
-	nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END());
+	nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(dst->contact), SIPTAG_CONTACT_STR(profile->url), TAG_END());
 	nua_handle_bind(nh, &mod_sofia_globals.destroy_private);
-	nua_options(nh, TAG_END());
+	nua_options(nh, 
+				TAG_IF(dst->route_uri, NUTAG_PROXY(dst->route_uri)),
+				TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
+				TAG_END());
 
-	switch_safe_free(contact);
+	sofia_glue_free_destination(dst);
 
 	return 0;
 }


From anthm at freeswitch.org  Fri Jun 19 10:23:57 2009
From: anthm at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 12:23:57 -0500
Subject: [Freeswitch-svn] [commit] r13866 - freeswitch/trunk/src
Message-ID: 

Author: anthm
Date: Fri Jun 19 12:23:57 2009
New Revision: 13866

Log:
FSCORE-384

Modified:
   freeswitch/trunk/src/switch_odbc.c

Modified: freeswitch/trunk/src/switch_odbc.c
==============================================================================
--- freeswitch/trunk/src/switch_odbc.c	(original)
+++ freeswitch/trunk/src/switch_odbc.c	Fri Jun 19 12:23:57 2009
@@ -388,12 +388,16 @@
 		switch_assert(names && vals);
 
 		for (x = 1; x <= c; x++) {
-			SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable;
-			SQLULEN ColumnSize;
+			SQLSMALLINT NameLength = 0, DataType = 0, DecimalDigits = 0, Nullable = 0;
+			SQLULEN ColumnSize = 0;
 			names[y] = malloc(name_len);
 			memset(names[y], 0, name_len);
 
 			SQLDescribeCol(stmt, x, (SQLCHAR *) names[y], (SQLSMALLINT) name_len, &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable);
+
+			if (!ColumnSize) {
+				ColumnSize = 255;
+			}
 			ColumnSize++;
 
 			vals[y] = malloc(ColumnSize);


From ledr at freeswitch.org  Fri Jun 19 10:33:31 2009
From: ledr at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 12:33:31 -0500
Subject: [Freeswitch-svn] [commit] r13867 -
	freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc
Message-ID: 

Author: ledr
Date: Fri Jun 19 12:33:31 2009
New Revision: 13867

Log:
Debug from cli toggles dumping of generated xml


Modified:
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c

Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c
==============================================================================
--- freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c	(original)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c	Fri Jun 19 12:33:31 2009
@@ -45,6 +45,37 @@
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown);
 SWITCH_MODULE_DEFINITION(mod_xml_odbc, mod_xml_odbc_load, mod_xml_odbc_shutdown, NULL);
 
+static switch_bool_t debug = SWITCH_FALSE;
+
+#define XML_ODBC_SYNTAX "[debug_on|debug_off]"
+
+SWITCH_STANDARD_API(xml_odbc_function)
+{
+	if (session) {
+		return SWITCH_STATUS_FALSE;
+	}
+
+	if (switch_strlen_zero(cmd)) {
+		goto usage;
+	}
+
+	if (!strcasecmp(cmd, "debug_on")) {
+		debug = SWITCH_TRUE;
+	} else if (!strcasecmp(cmd, "debug_off")) {
+		debug = SWITCH_FALSE;
+	} else {
+		goto usage;
+	}
+
+	stream->write_function(stream, "OK\n");
+	return SWITCH_STATUS_SUCCESS;
+
+  usage:
+	stream->write_function(stream, "USAGE: %s\n", XML_ODBC_SYNTAX);
+	return SWITCH_STATUS_SUCCESS;
+}
+
+
 typedef struct xml_binding {
 	char *bindings;
 } xml_binding_t;
@@ -287,7 +318,9 @@
 						}
 					}
 
-//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG DUMP OF XML GENERATED:\n\n%s\n\n", switch_xml_toxml(xml, SWITCH_FALSE));
+					if (debug == SWITCH_TRUE) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Debug dump of XML generated:\n%s", switch_xml_toxml(xml, SWITCH_FALSE));
+					}
 
 					free(dir_user);
 					dir_user = NULL;
@@ -432,7 +465,7 @@
 	switch_core_new_memory_pool(&globals.pool);
 	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool);
 
-	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+	switch_api_interface_t *xml_odbc_api_interface;
 
 #ifndef SWITCH_HAVE_ODBC
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must have ODBC support in FreeSWITCH to use this module\n");
@@ -442,6 +475,12 @@
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "XML ODBC module loading...\n");
 
+	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
+
+	SWITCH_ADD_API(xml_odbc_api_interface, "xml_odbc", "XML ODBC", xml_odbc_function, XML_ODBC_SYNTAX);
+	switch_console_set_complete("add xml_odbc debug_on");
+	switch_console_set_complete("add xml_odbc debug_off");
+
 	if (do_config() != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load xml_odbc config file\n");
 		return SWITCH_STATUS_FALSE;


From andrew at freeswitch.org  Fri Jun 19 10:47:09 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 12:47:09 -0500
Subject: [Freeswitch-svn] [commit] r13868 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Fri Jun 19 12:47:09 2009
New Revision: 13868

Log:
Switch to cipher-block-chaining, add a magic byte sequence to check for sucessful decryption and fix some null termination issues


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile	Fri Jun 19 12:47:09 2009
@@ -1,5 +1,6 @@
 
-LOCAL_CFLAGS= $(OPENSSL_CFLAGS)
+LOCAL_CFLAGS= $(OPENSSL_CFLAGS) -DHAVE_OPENSSL
 LOCAL_LDLAGS= $(OPENSSL_LIBS)
+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
 
 include ../../../../build/modmake.rules

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	Fri Jun 19 12:47:09 2009
@@ -36,6 +36,8 @@
 
 #define MULTICAST_BUFFSIZE 65536
 
+/* magic byte sequence */
+static unsigned char MAGIC[] = {226, 132, 177, 197, 152, 198, 142, 211, 172, 197, 158, 208, 169, 208, 135, 197, 166, 207, 154, 196, 166};
 static char *MARKER = "1";
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load);
@@ -205,11 +207,12 @@
 
 				switch_uuid_get(&uuid);
 				switch_uuid_format(uuid_str, &uuid);
-				len = strlen(packet) + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + EVP_MAX_IV_LENGTH;
+				len = strlen(packet) + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + EVP_MAX_IV_LENGTH + strlen((char*)MAGIC);
 #else
-				len = strlen(packet) + sizeof(globals.host_hash);
+				len = strlen(packet) + sizeof(globals.host_hash) + strlen((char*) MAGIC);
 #endif
 				buf = malloc(len + 1);
+				bzero(buf, len + 1);
 				switch_assert(buf);
 				memcpy(buf, &globals.host_hash, sizeof(globals.host_hash));
 
@@ -218,17 +221,22 @@
 					switch_copy_string(buf + sizeof(globals.host_hash), uuid_str, SWITCH_UUID_FORMATTED_LENGTH);
 
 					EVP_CIPHER_CTX_init(&ctx);
-					EVP_EncryptInit(&ctx, EVP_bf_cfb(), NULL, NULL);
+					EVP_EncryptInit(&ctx, EVP_bf_cbc(), NULL, NULL);
 					EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk));
 					EVP_EncryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str);
 					EVP_EncryptUpdate(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH,
 							&outlen, (unsigned char*) packet, (int) strlen(packet));
+					EVP_EncryptUpdate(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen,
+							&tmplen, (unsigned char*) MAGIC, (int) strlen((char *) MAGIC));
+					outlen += tmplen;
 					EVP_EncryptFinal(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen);
 					outlen += tmplen;
 					len = (size_t) outlen + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH;
+					*(buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen) = '\0';
 				} else {
 #endif
 					switch_copy_string(buf + sizeof(globals.host_hash), packet, len - sizeof(globals.host_hash));
+					switch_copy_string(buf + sizeof(globals.host_hash) + strlen(packet), (char *) MAGIC, strlen((char*) MAGIC)+1);
 #ifdef HAVE_OPENSSL
 				}
 #endif
@@ -246,7 +254,6 @@
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load)
 {
-
 	memset(&globals, 0, sizeof(globals));
 
 	module_pool = pool;
@@ -340,7 +347,7 @@
 SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_multicast_runtime)
 {
 	switch_event_t *local_event;
-	char *buf;
+	char *buf, *m;
 	switch_sockaddr_t *addr;
 
 	buf = (char *) malloc(MULTICAST_BUFFSIZE);
@@ -384,26 +391,41 @@
 
 			tmp = malloc(len);
 
-			memset(tmp, 0, len);
+			bzero(tmp, len);
 
 			switch_copy_string(uuid_str, packet, SWITCH_UUID_FORMATTED_LENGTH);
 			packet += SWITCH_UUID_FORMATTED_LENGTH;
 
 			EVP_CIPHER_CTX_init(&ctx);
-			EVP_DecryptInit(&ctx, EVP_bf_cfb(), NULL, NULL);
+			EVP_DecryptInit(&ctx, EVP_bf_cbc(), NULL, NULL);
 			EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk));
 			EVP_DecryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str);
 			EVP_DecryptUpdate(&ctx, (unsigned char*) tmp,
 					&outl, (unsigned char*) packet, (int) len);
 			EVP_DecryptFinal(&ctx, (unsigned char*) tmp + outl, &tmplen);
 
+			*(tmp + outl + tmplen) = '\0';
+
 			/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "decrypted event as %s\n----------\n of actual length %d (%d) %d\n", tmp, outl + tmplen, (int) len, (int) strlen(tmp));*/
-			/*continue;*/
 			packet = tmp;
 
 		}
 #endif
-		//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet);
+		if ((m = strchr(packet, (int) MAGIC[0])) != 0) {
+			/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found start of magic string\n");*/
+			if (!strncmp((char*) MAGIC, m, strlen((char*) MAGIC))) {
+				/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found entire magic string\n");*/
+				*m = '\0';
+			} else {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Failed to find entire magic string\n");
+				continue;
+			}
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to find start of magic string\n");
+			continue;
+		}
+
+		/*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet);*/
 		if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT) == SWITCH_STATUS_SUCCESS) {
 			char *var, *val, *term = NULL, tmpname[128];
 			switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Multicast", "yes");


From intralanman at freeswitch.org  Fri Jun 19 10:48:50 2009
From: intralanman at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 12:48:50 -0500
Subject: [Freeswitch-svn] [commit] r13869 -
	freeswitch/trunk/src/mod/applications/mod_lcr
Message-ID: 

Author: intralanman
Date: Fri Jun 19 12:48:49 2009
New Revision: 13869

Log:
this should handle all cases now

Modified:
   freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c

Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c	Fri Jun 19 12:48:49 2009
@@ -34,7 +34,7 @@
 #include 
 
 
-#define LCR_SYNTAX "lcr  [] [caller_id]"
+#define LCR_SYNTAX "lcr  [] [caller_id] [intrastate]"
 #define LCR_ADMIN_SYNTAX "lcr_admin show profiles"
 
 /* SQL Query places */
@@ -640,7 +640,6 @@
 	switch_channel_t *channel;
 	char *id_str;
 	char *safe_sql = NULL;
-	const char *intra = NULL;
 	char *rate_field = NULL;
 	
 	switch_assert(cb_struct->lookup_number != NULL);
@@ -658,17 +657,19 @@
 	
 	digits_expanded = expand_digits(cb_struct->pool, digits_copy, cb_struct->profile->quote_in_list);
 	
+	/* set our rate field based on env and profile */
+	if (cb_struct->intrastate == SWITCH_TRUE && profile->profile_has_intra == SWITCH_TRUE) {
+		rate_field = switch_core_strdup(cb_struct->pool, "intra");
+	} else {
+		rate_field = switch_core_strdup(cb_struct->pool, "rate");
+	}
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate routing [%d] so rate field is [%s]\n",
+					  cb_struct->intrastate, rate_field);
+	
 	/* set some channel vars if we have a session */
 	if (cb_struct->session) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have a session\n");
 		if ((channel = switch_core_session_get_channel(cb_struct->session))) {
-			intra = switch_channel_get_variable(channel, "intrastate");
-			if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true") || profile->profile_has_intra == SWITCH_FALSE) {
-				rate_field = switch_core_strdup(cb_struct->pool, "rate");
-			} else {
-				rate_field = switch_core_strdup(cb_struct->pool, "intra");
-			}
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate routing [%s] so rate field is [%s]\n", intra, rate_field);
 			switch_channel_set_variable_var_check(channel, "lcr_rate_field", rate_field, SWITCH_FALSE);
 			switch_channel_set_variable_var_check(channel, "lcr_query_digits", digits_copy, SWITCH_FALSE);
 			id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id);
@@ -677,14 +678,7 @@
 		}
 	}
 	if (cb_struct->event) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have an event");
-		intra = switch_event_get_header(cb_struct->event, "intrastate");
-		if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true") || profile->profile_has_intra == SWITCH_FALSE) {
-			rate_field = switch_core_strdup(cb_struct->pool, "rate");
-		} else {
-			rate_field = switch_core_strdup(cb_struct->pool, "intra");
-		}
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate routing [%s] so rate field is [%s]\n", intra, rate_field);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have an event\n");
 		switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_rate_field", rate_field);
 		switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_digits", digits_copy);
 		id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id);
@@ -692,11 +686,7 @@
 		switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_expanded_digits", digits_expanded);
 	}
 
-	if (!cb_struct->session && !cb_struct->session) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "We have no session and no event, we need to set rate_field somewhere now\n");
-	}
 	/* set up the query to be executed */
-
 	/* format the custom_sql */
 	safe_sql = format_custom_sql(profile->custom_sql, cb_struct, digits_copy);
 	if (!safe_sql) {
@@ -997,6 +987,7 @@
 	char *lcr_profile = NULL;
 	switch_memory_pool_t *pool = NULL;
 	switch_event_t *event = NULL;
+	const char *intra = NULL;
 
 	if (session) {
 		pool = switch_core_session_get_pool(session);
@@ -1011,6 +1002,16 @@
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile);
 		goto end;
 	}
+
+	intra = switch_channel_get_variable(channel, "intrastate");
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intra);
+	if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true")) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on interstate rates\n");
+		routes.intrastate = SWITCH_FALSE;
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
+		routes.intrastate = SWITCH_TRUE;
+	}
 	
 	if (!caller_profile) {
 		caller_profile = switch_channel_get_caller_profile(channel);
@@ -1073,6 +1074,7 @@
 	lcr_route cur_route = { 0 };
 	switch_memory_pool_t *pool;
 	switch_event_t *event;
+	const char *intra = NULL;
 
 	if (!(mydata = switch_core_session_strdup(session, data))) {
 		return;
@@ -1088,6 +1090,16 @@
 	}
 	routes.pool = pool;
 
+	intra = switch_channel_get_variable(channel, "intrastate");
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intra);
+	if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true")) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on interstate rates\n");
+		routes.intrastate = SWITCH_FALSE;
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
+		routes.intrastate = SWITCH_TRUE;
+	}
+
 	if (!caller_profile) {
 		if (!(caller_profile = switch_channel_get_caller_profile(channel))) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unable to locate caller_profile\n");


From andrew at freeswitch.org  Fri Jun 19 10:51:18 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 12:51:18 -0500
Subject: [Freeswitch-svn] [commit] r13870 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Fri Jun 19 12:51:18 2009
New Revision: 13870

Log:
Whoops


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile	Fri Jun 19 12:51:18 2009
@@ -1,6 +1,5 @@
 
-LOCAL_CFLAGS= $(OPENSSL_CFLAGS) -DHAVE_OPENSSL
+LOCAL_CFLAGS= $(OPENSSL_CFLAGS)
 LOCAL_LDLAGS= $(OPENSSL_LIBS)
-CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
 
 include ../../../../build/modmake.rules


From crienzo at freeswitch.org  Fri Jun 19 11:51:01 2009
From: crienzo at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 13:51:01 -0500
Subject: [Freeswitch-svn] [commit] r13871 -
	freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
Message-ID: 

Author: crienzo
Date: Fri Jun 19 13:51:01 2009
New Revision: 13871

Log:
Add support for host byte ordered L16 from UniMRCP.  We need UniMRCP r995 now

Modified:
   freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	(original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c	Fri Jun 19 13:51:01 2009
@@ -790,15 +790,18 @@
 	codec->channel_count = 1;
 	codec->payload_type = 96;
 	codec->sampling_rate = schannel->rate;
-	apt_string_set(&codec->name, schannel->codec);
+	if (!strcmp(schannel->codec, "L16")) {
+		/* "LPCM" is UniMRCP's name for L16 host byte ordered */
+		apt_string_set(&codec->name, "LPCM");
+	} else {
+		apt_string_set(&codec->name, schannel->codec);
+	}
 	/* see RFC 1890 for payload types */
 	if (!strcmp(schannel->codec, "PCMU") && schannel->rate == 8000) {
 		codec->payload_type = 0;
 	} else if (!strcmp(schannel->codec, "PCMA") && schannel->rate == 8000) {
 		codec->payload_type = 8;
-	} else if (!strcmp(schannel->codec, "L16") && schannel->rate == 44100) {
-		codec->payload_type = 11;
-	}
+	} 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) requesting codec %s/%d/%d\n", schannel->name, schannel->codec, codec->payload_type, codec->sampling_rate);
 	if(schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
 		termination = mrcp_application_sink_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);


From andrew at freeswitch.org  Fri Jun 19 12:24:24 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 14:24:24 -0500
Subject: [Freeswitch-svn] [commit] r13872 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Fri Jun 19 14:24:23 2009
New Revision: 13872

Log:
Make mod_event_multicast re-read its config on RELOADXML (partially)


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	Fri Jun 19 14:24:23 2009
@@ -39,6 +39,7 @@
 /* magic byte sequence */
 static unsigned char MAGIC[] = {226, 132, 177, 197, 152, 198, 142, 211, 172, 197, 158, 208, 169, 208, 135, 197, 166, 207, 154, 196, 166};
 static char *MARKER = "1";
+static switch_mutex_t *MUTEX = NULL;
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown);
@@ -78,24 +79,17 @@
 	char *next, *cur;
 	uint32_t count = 0;
 	uint8_t custom = 0;
-	switch_ssize_t hlen = -1;
-
-	gethostname(globals.hostname, sizeof(globals.hostname));
-	globals.host_hash = switch_hashfunc_default(globals.hostname, &hlen);
-	globals.key_count = 0;
 
+	
 	globals.ttl = 1;
 	globals.psk = NULL;
+	globals.key_count = 0;
 
 	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
 		return SWITCH_STATUS_TERM;
 	}
 
-	if (switch_event_reserve_subclass(MULTICAST_EVENT) != SWITCH_STATUS_SUCCESS) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
-		return SWITCH_STATUS_GENERR;
-	}
 
 	if ((settings = switch_xml_child(cfg, "settings"))) {
 		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
@@ -180,6 +174,21 @@
 		return;
 	}
 
+	if (event->event_id == SWITCH_EVENT_RELOADXML) {
+		switch_mutex_lock(MUTEX);
+		switch_core_hash_destroy(&globals.event_hash);
+		globals.event_hash = NULL;
+		switch_core_hash_init(&globals.event_hash, module_pool);
+		bzero(globals.event_list, SWITCH_EVENT_ALL);
+		if (load_config() != SWITCH_STATUS_SUCCESS) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to reload config file\n");
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Event Multicast Reloaded\n");
+		}
+		switch_mutex_unlock(MUTEX);
+	}
+
+	switch_mutex_lock(MUTEX);
 	if (globals.event_list[(uint8_t) SWITCH_EVENT_ALL]) {
 		send = 1;
 	} else if ((globals.event_list[(uint8_t) event->event_id])) {
@@ -187,6 +196,7 @@
 			send = 1;
 		}
 	}
+	switch_mutex_unlock(MUTEX);
 
 	if (send) {
 		char *packet;
@@ -254,12 +264,19 @@
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load)
 {
+	switch_ssize_t hlen = -1;
+
 	memset(&globals, 0, sizeof(globals));
 
+	switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool);
 	module_pool = pool;
 
 	switch_core_hash_init(&globals.event_hash, module_pool);
 
+	gethostname(globals.hostname, sizeof(globals.hostname));
+	globals.host_hash = switch_hashfunc_default(globals.hostname, &hlen);
+	globals.key_count = 0;
+
 	if (load_config() != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Configure\n");
 		return SWITCH_STATUS_TERM;
@@ -302,6 +319,10 @@
 	/* connect my internal structure to the blank pointer passed to me */
 	*module_interface = switch_loadable_module_create_module_interface(pool, modname);
 
+	if (switch_event_reserve_subclass(MULTICAST_EVENT) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n");
+		return SWITCH_STATUS_GENERR;
+	}
 
 	if (switch_event_bind(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");


From andrew at freeswitch.org  Fri Jun 19 12:35:02 2009
From: andrew at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 14:35:02 -0500
Subject: [Freeswitch-svn] [commit] r13873 -
	freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
Message-ID: 

Author: andrew
Date: Fri Jun 19 14:35:02 2009
New Revision: 13873

Log:
Move mutex into the global struct, don't leak on config reload (thanks Math)


Modified:
   freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	(original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c	Fri Jun 19 14:35:02 2009
@@ -39,7 +39,6 @@
 /* magic byte sequence */
 static unsigned char MAGIC[] = {226, 132, 177, 197, 152, 198, 142, 211, 172, 197, 158, 208, 169, 208, 135, 197, 166, 207, 154, 196, 166};
 static char *MARKER = "1";
-static switch_mutex_t *MUTEX = NULL;
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown);
@@ -63,6 +62,7 @@
 	switch_event_node_t *node;
 	uint8_t ttl;
 	char *psk;
+	switch_mutex_t *mutex;
 } globals;
 
 SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address);
@@ -82,7 +82,6 @@
 
 	
 	globals.ttl = 1;
-	globals.psk = NULL;
 	globals.key_count = 0;
 
 	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
@@ -175,7 +174,7 @@
 	}
 
 	if (event->event_id == SWITCH_EVENT_RELOADXML) {
-		switch_mutex_lock(MUTEX);
+		switch_mutex_lock(globals.mutex);
 		switch_core_hash_destroy(&globals.event_hash);
 		globals.event_hash = NULL;
 		switch_core_hash_init(&globals.event_hash, module_pool);
@@ -185,10 +184,10 @@
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Event Multicast Reloaded\n");
 		}
-		switch_mutex_unlock(MUTEX);
+		switch_mutex_unlock(globals.mutex);
 	}
 
-	switch_mutex_lock(MUTEX);
+	switch_mutex_lock(globals.mutex);
 	if (globals.event_list[(uint8_t) SWITCH_EVENT_ALL]) {
 		send = 1;
 	} else if ((globals.event_list[(uint8_t) event->event_id])) {
@@ -196,7 +195,7 @@
 			send = 1;
 		}
 	}
-	switch_mutex_unlock(MUTEX);
+	switch_mutex_unlock(globals.mutex);
 
 	if (send) {
 		char *packet;
@@ -268,7 +267,7 @@
 
 	memset(&globals, 0, sizeof(globals));
 
-	switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool);
+	switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, pool);
 	module_pool = pool;
 
 	switch_core_hash_init(&globals.event_hash, module_pool);


From mcollins at freeswitch.org  Fri Jun 19 13:02:06 2009
From: mcollins at freeswitch.org (FreeSWITCH SVN)
Date: Fri, 19 Jun 2009 15:02:06 -0500
Subject: [Freeswitch-svn] [commit] r13874 - in freeswitch/trunk/conf: .
	dialplan
Message-ID: 

Author: mcollins
Date: Fri Jun 19 15:02:05 2009
New Revision: 13874

Log:
config:Remove use_profile from default dialplan, move to vars.xml, default value is 'internal'

Modified:
   freeswitch/trunk/conf/dialplan/default.xml
   freeswitch/trunk/conf/vars.xml

Modified: freeswitch/trunk/conf/dialplan/default.xml
==============================================================================
--- freeswitch/trunk/conf/dialplan/default.xml	(original)
+++ freeswitch/trunk/conf/dialplan/default.xml	Fri Jun 19 15:02:05 2009
@@ -60,10 +60,6 @@
     
 
     
-      
-	
-	
-      
       
 	
       

Modified: freeswitch/trunk/conf/vars.xml
==============================================================================
--- freeswitch/trunk/conf/vars.xml	(original)
+++ freeswitch/trunk/conf/vars.xml	Fri Jun 19 15:02:05 2009
@@ -26,6 +26,7 @@
   
   
   
+  
 
   
     
       
+      
+      
+      
+    
+
+  
 
-      
+  
 
-      
+    
+
+    
+  
+    
+
+    
+  
+    
 
-      
+  
 
-    
-  
 

Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/console.conf.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/console.conf.xml	Sun Jun 21 09:21:22 2009
@@ -0,0 +1,31 @@
+
+  
+

Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/dialplan.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/dialplan.xml	Sun Jun 21 09:21:22 2009
@@ -0,0 +1,17 @@
+ 
+  
+

Added: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml
==============================================================================
--- (empty file)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml	Sun Jun 21 09:21:22 2009
@@ -0,0 +1,91 @@
+
+  
+


From ledr at freeswitch.org  Sun Jun 21 09:23:10 2009
From: ledr at freeswitch.org (FreeSWITCH SVN)
Date: Sun, 21 Jun 2009 11:23:10 -0500
Subject: [Freeswitch-svn] [commit] r13886 -
	freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc
Message-ID: 

Author: ledr
Date: Sun Jun 21 11:23:10 2009
New Revision: 13886

Log:
Modified test_data.sql to reflect change in structure


Modified:
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql

Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql
==============================================================================
--- freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql	(original)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql	Sun Jun 21 11:23:10 2009
@@ -3,7 +3,6 @@
 INSERT INTO `dir_domain_variables` (`id`, `dir_domain_id`, `name`, `value`) VALUES (1, 1, 'dom_variable_name', 'dom_variable_value');
 INSERT INTO `dir_groups` (`id`, `name`) VALUES (1, 'prepay'), (2, 'annoying_customers');
 INSERT INTO `dir_groups_users` (`dir_group_id`, `dir_user_id`) VALUES (1, 1), (2, 1);
-INSERT INTO `dir_users` (`id`, `dir_domain_id`) VALUES (1, 1);
-INSERT INTO `dir_user_attrs` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'id', 'someuser'), (2, 1, 'mailbox', '1234');
+INSERT INTO `dir_users` (`id`, `dir_domain_id`, `username`, `cidr`, `mailbox`, `number-alias`) VALUES (1, 1, 'someuser', NULL, 'leon at toyos.nl', '0031320227470');
 INSERT INTO `dir_user_params` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'password', 'topsecret'), (2, 1, 'vm-password', '0000');
 INSERT INTO `dir_user_variables` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'accountcode', '1234'), (2, 1, 'user_context', 'default'), (3, 1, 'vm_extension', '1234');


From brian at freeswitch.org  Sun Jun 21 19:52:32 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Sun, 21 Jun 2009 21:52:32 -0500
Subject: [Freeswitch-svn] [commit] r13887 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: brian
Date: Sun Jun 21 21:52:31 2009
New Revision: 13887

Log:
 move this to debug and profile->debug so that its not on unless you enable the profile debug also. 

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	Sun Jun 21 21:52:31 2009
@@ -1985,7 +1985,9 @@
 
 						if (!switch_strlen_zero(var) && !switch_strlen_zero(val) && (xparams_type[j] == 1 || !strncasecmp(var, "sip-",4) || !strcasecmp(var, "register-gateway")) ) {
 							if (!switch_event_get_header(*v_event, var)) {
-								switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "event_add_header -> '%s' = '%s'\n",var, val);
+								if (profile->debug) {
+									switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "event_add_header -> '%s' = '%s'\n",var, val);
+								}
 								switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, var, val);
 							} else {
 								continue;


From ledr at freeswitch.org  Mon Jun 22 01:31:05 2009
From: ledr at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 22 Jun 2009 03:31:05 -0500
Subject: [Freeswitch-svn] [commit] r13888 -
	freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates
Message-ID: 

Author: ledr
Date: Mon Jun 22 03:31:05 2009
New Revision: 13888

Log:
Fixed some bugs


Modified:
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml

Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml
==============================================================================
--- freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml	(original)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml	Mon Jun 22 03:31:05 2009
@@ -13,12 +13,12 @@
           dir_domains,
           dir_users
         WHERE
-          dir_users.${key} = '${value}' AND
-          dir_domains.name = '${domain_name}' AND
+          dir_users.${key} = '${user}' AND
+          dir_domains.name = '${domain}' AND
           dir_users.domain_id = dir_domains.id AND
-          dir_users.enabled = 1;"/>
+          dir_users.enabled = 1;"/> 
       
-        
+        
           
             
               
-                
+                
                   
                     
+                        dir_user_id = '${user_id}';">
                       
                     
                   
@@ -61,9 +61,9 @@
                       SELECT
                         name, value
                       FROM
-                        dir_domain_params
+                        dir_user_variables
                       WHERE
-                        dir_domain_id = '${domain_id}';">
+                        dir_user_id = '${user_id}';">
                       
                     
                   


From mikej at freeswitch.org  Mon Jun 22 07:12:35 2009
From: mikej at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 22 Jun 2009 09:12:35 -0500
Subject: [Freeswitch-svn] [commit] r13889 -
	freeswitch/trunk/src/mod/endpoints/mod_sofia
Message-ID: 

Author: mikej
Date: Mon Jun 22 09:12:35 2009
New Revision: 13889

Log:
mod_sofia: fix segfault on refer with no content-type or body (SFSIP-153)

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Mon Jun 22 09:12:35 2009
@@ -126,7 +126,11 @@
 	}
 
 	/* For additional NOTIFY event packages see http://www.iana.org/assignments/sip-events. */
-	if (!strcasecmp(sip->sip_event->o_type, "refer")) {
+	if (sip->sip_content_type &&
+		sip->sip_content_type->c_type &&
+		sip->sip_payload &&
+		sip->sip_payload->pl_data &&
+		!strcasecmp(sip->sip_event->o_type, "refer")) {
 		if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_NOTIFY_REFER) == SWITCH_STATUS_SUCCESS) {
 			switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "content-type", sip->sip_content_type->c_type);
 			switch_event_add_body(s_event, "%s", sip->sip_payload->pl_data);


From brian at freeswitch.org  Mon Jun 22 07:35:10 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 22 Jun 2009 09:35:10 -0500
Subject: [Freeswitch-svn] [commit] r13890 -
	freeswitch/trunk/src/mod/formats/mod_sndfile
Message-ID: 

Author: brian
Date: Mon Jun 22 09:35:09 2009
New Revision: 13890

Log:
mod_sndfile: fix off by one error (MODFORM-29)

Modified:
   freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c

Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c	(original)
+++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c	Mon Jun 22 09:35:09 2009
@@ -179,7 +179,7 @@
 			/* Try to find the file at the highest rate possible if we can't find one that matches the exact rate.
 			   If we don't find any, we will default back to the original file name.
 			*/
-			for (i = 3; i > 0; i--) {
+			for (i = 3; i >= 0; i--) {
 				switch_snprintf(last, alt_len - (last - alt_path), "%d%s%s", rates[i], SWITCH_PATH_SEPARATOR, ldup);
 				if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) {
 					path = alt_path;


From brian at freeswitch.org  Mon Jun 22 08:08:20 2009
From: brian at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 22 Jun 2009 10:08:20 -0500
Subject: [Freeswitch-svn] [commit] r13891 - freeswitch/trunk/conf/dialplan
Message-ID: 

Author: brian
Date: Mon Jun 22 10:08:19 2009
New Revision: 13891

Log:
 adding some stuff to defaults for zrtp 

Modified:
   freeswitch/trunk/conf/dialplan/default.xml
   freeswitch/trunk/conf/dialplan/features.xml

Modified: freeswitch/trunk/conf/dialplan/default.xml
==============================================================================
--- freeswitch/trunk/conf/dialplan/default.xml	(original)
+++ freeswitch/trunk/conf/dialplan/default.xml	Mon Jun 22 10:08:19 2009
@@ -588,6 +588,14 @@
       
     
 
+    
+    
+      
+	
+	
+      
+    
+
     
-	
+	
 	
+	
+	
 	
       
     

Modified: freeswitch/trunk/conf/dialplan/features.xml
==============================================================================
--- freeswitch/trunk/conf/dialplan/features.xml	(original)
+++ freeswitch/trunk/conf/dialplan/features.xml	Mon Jun 22 10:08:19 2009
@@ -37,6 +37,14 @@
       
     
 
+    
+      
+	
+	
+	
+      
+    
+
     
        
       


From intralanman at freeswitch.org  Mon Jun 22 09:56:33 2009
From: intralanman at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 22 Jun 2009 11:56:33 -0500
Subject: [Freeswitch-svn] [commit] r13892 - in freeswitch/trunk: build
	support-d
Message-ID: 

Author: intralanman
Date: Mon Jun 22 11:56:33 2009
New Revision: 13892

Log:
fixing (hopefully) the buildopal.sh script to actually build properly

Modified:
   freeswitch/trunk/build/buildopal.sh
   freeswitch/trunk/support-d/.bashrc

Modified: freeswitch/trunk/build/buildopal.sh
==============================================================================
--- freeswitch/trunk/build/buildopal.sh	(original)
+++ freeswitch/trunk/build/buildopal.sh	Mon Jun 22 11:56:33 2009
@@ -1,4 +1,5 @@
 #!/bin/sh
+FS_DIR=`pwd`
 cd /root
 svn co https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk ptlib
 cd ptlib
@@ -6,8 +7,11 @@
 make
 make install
 cd ..
-svn co https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk opal
+svn co https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/branches/v3_6 opal 
 cd opal
-PKG_CONFIG_PATH=/usr/lib/pkgconfig ./configure --prefix=/usr
+export PKG_CONFIG_PATH=/usr/lib/pkgconfig 
+./configure --prefix=/usr
 make
 make install
+cd ${FS_DIR}
+make mod_opal-install

Modified: freeswitch/trunk/support-d/.bashrc
==============================================================================
--- freeswitch/trunk/support-d/.bashrc	(original)
+++ freeswitch/trunk/support-d/.bashrc	Mon Jun 22 11:56:33 2009
@@ -25,6 +25,7 @@
 alias tcommit='svn commit --no-auth-cache --username=anthm'
 alias mcommit='svn commit --no-auth-cache --username=mikej'
 alias bcommit='svn commit --no-auth-cache --username=brian'
+alias icommit='svn commit --no-auth-cache --username=intralanman'
 alias dp='emacs /usr/local/freeswitch/conf/dialplan/default.xml'
 alias fstop='top -p `cat /usr/local/freeswitch/log/freeswitch.pid`'
 alias fsgdb='gdb /usr/local/freeswitch/bin/freeswitch `cat /usr/local/freeswitch/log/freeswitch.pid`'


From ledr at freeswitch.org  Mon Jun 22 10:59:15 2009
From: ledr at freeswitch.org (FreeSWITCH SVN)
Date: Mon, 22 Jun 2009 12:59:15 -0500
Subject: [Freeswitch-svn] [commit] r13893 - in
	freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc: .
	xml_odbc_templates
Message-ID: 

Author: ledr
Date: Mon Jun 22 12:59:15 2009
New Revision: 13893

Log:
Variable expansion and queries work. Should implement some query validation as fs cores when it's wrong. Didn't figure out the (on..-)break-to yet.



Added:
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.mysql.sql   (props changed)
      - copied unchanged from r13891, /freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.sql
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/testdata.mysql.sql   (contents, props changed)
      - copied, changed from r13891, /freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql
Removed:
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/structure.sql
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql
Modified:
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml
   freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml

Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c
==============================================================================
--- freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c	(original)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c	Mon Jun 22 12:59:15 2009
@@ -50,8 +50,8 @@
 
 static switch_bool_t debug = SWITCH_FALSE;
 
-static switch_status_t xml_odbc_render_template(char *template, switch_hash_t *hash, switch_xml_t xml_out, int *off);
-static switch_status_t xml_odbc_render_tag(switch_xml_t xml_in, switch_hash_t *hash, switch_xml_t xml_out, int *off);
+static switch_status_t xml_odbc_render_template(char *template, switch_event_t *params, switch_xml_t xml_out, int *off);
+static switch_status_t xml_odbc_render_tag(switch_xml_t xml_in, switch_event_t *params, switch_xml_t xml_out, int *off);
 
 #define XML_ODBC_SYNTAX "[debug_on|debug_off|render_template]"
 
@@ -92,14 +92,15 @@
 		debug = SWITCH_FALSE;
 	} else if (!strcasecmp(cmd, "render_template")) {
 // TODO make it configurable what themplate is rendered instead of static "not_found"
-		int off = 0;
-		switch_xml_t xml_out = NULL;
-		switch_hash_t *hash;
-		if (switch_core_hash_init(&hash, globals.pool) != SWITCH_STATUS_SUCCESS) {
-//		    need_vars_map = -1; // does it need to be freed ? :)
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't init params hash!\n");
-		}
-		xml_odbc_render_template("not_found", hash, xml_out, &off);
+	//	int off = 0;
+	//	switch_xml_t xml_out = NULL;
+//		switch_hash_t *hash;
+	//	switch_event_t *params;
+//		if (switch_core_hash_init(&hash, globals.pool) != SWITCH_STATUS_SUCCESS) {
+////		    need_vars_map = -1; // does it need to be freed ? :)
+//			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't init params hash!\n");
+//		}
+	//	xml_odbc_render_template("not_found", params, xml_out, &off);
 	} else {
 		goto usage;
 	}
@@ -122,7 +123,7 @@
 	switch_xml_t xml_in;
 	switch_xml_t xml_out;
 	int *off;
-	switch_hash_t *hash;
+	switch_event_t *params;
 } xml_odbc_query_helper_t;
 
 
@@ -132,21 +133,21 @@
 	switch_xml_t xml_in_tmp;
 	int i;
 
-	/* set all columnName/argv key/value pairs in qh->hash */
 	for (i = 0; i < argc; i++) {
-		switch_core_hash_insert(qh->hash, columnName[i], argv[i]); // does a hash insert overwrite old entries ?
+		switch_event_del_header(qh->params, columnName[i]);
+		switch_event_add_header_string(qh->params, SWITCH_STACK_BOTTOM, columnName[i], argv[i]);
 	}
 
 	/* render all xml children */
 	for (xml_in_tmp = qh->xml_in->child; xml_in_tmp; xml_in_tmp = xml_in_tmp->ordered) {
-		xml_odbc_render_tag(xml_in_tmp, qh->hash, qh->xml_out, qh->off);
+		xml_odbc_render_tag(xml_in_tmp, qh->params, qh->xml_out, qh->off);
 	}
 
 	return 0;
 }
 
 
-static switch_status_t xml_odbc_render_tag(switch_xml_t xml_in, switch_hash_t *hash, switch_xml_t xml_out, int *off)
+static switch_status_t xml_odbc_render_tag(switch_xml_t xml_in, switch_event_t *params, switch_xml_t xml_out, int *off)
 {
 	switch_xml_t xml_in_tmp = NULL;
 	int i;
@@ -155,35 +156,38 @@
 
     if (!strcasecmp(xml_in->name, "xml-odbc-do")) {
 		char *name = NULL;
-		char *value = NULL;
-		char *zero_rows_break_to = NULL;
+		char *value = NULL, *new_value = NULL;
+		char *empty_result_break_to = NULL;
 		char *no_template_break_to = NULL;
 
 		name = (char *) switch_xml_attr_soft(xml_in, "name");
 		value = (char *) switch_xml_attr_soft(xml_in, "value");
-		zero_rows_break_to = (char *) switch_xml_attr_soft(xml_in, "on-zero-rows-break-to");
+		empty_result_break_to = (char *) switch_xml_attr_soft(xml_in, "on-empty-result-break-to");
 		no_template_break_to = (char *) switch_xml_attr_soft(xml_in, "on-no-template-break-to");
 
-		if (!strcasecmp(name, "break-to") && !switch_strlen_zero(value)) { // WHAT TO DO WITH FURTHER RENDERING LOWER ON THE STACK ?!?!?!
-			xml_out = NULL;
-			off = 0; // <- ?
-			if (xml_odbc_render_template(value, hash, xml_out, off) == SWITCH_STATUS_FALSE) {
-				if (!switch_strlen_zero(no_template_break_to)) {
-					xml_odbc_render_template(no_template_break_to, hash, xml_out, off);
-				}
-			}
-		} else if (!strcasecmp(name, "query") && !switch_strlen_zero(value)) {
-			// do an auto expasion on value to replace all ${foo} parts based on switch_hash_t hash
-			query_helper.xml_in = xml_in;
-			query_helper.xml_out = xml_out;
-			query_helper.off = off;
-			query_helper.hash = hash;
-			if (switch_odbc_handle_callback_exec(globals.master_odbc, value, xml_odbc_query_callback, &query_helper) == SWITCH_ODBC_SUCCESS) {
-				// nothing
-			} else if (!switch_strlen_zero(zero_rows_break_to)) { // if zero rows returned then switch_odbc_handle_callback_exec != SWITCH_ODBC_SUCCESS ??? 
+		if (!switch_strlen_zero(value)) {
+			new_value = switch_event_expand_headers(params, value);
+			if (!strcasecmp(name, "break-to")) { // WHAT TO DO WITH FURTHER RENDERING LOWER ON THE STACK ?!?!?!
 				xml_out = NULL;
 				off = 0; // <- ?
-				xml_odbc_render_template(zero_rows_break_to, hash, xml_out, off);
+				if (xml_odbc_render_template(new_value, params, xml_out, off) == SWITCH_STATUS_FALSE) {
+					if (!switch_strlen_zero(no_template_break_to)) {
+						xml_odbc_render_template(no_template_break_to, params, xml_out, off);
+					}
+				}
+			} else if (!strcasecmp(name, "query")) {
+				query_helper.xml_in = xml_in;
+				query_helper.xml_out = xml_out;
+				query_helper.off = off;
+				query_helper.params = params;
+
+				if (switch_odbc_handle_callback_exec(globals.master_odbc, new_value, xml_odbc_query_callback, &query_helper) == SWITCH_ODBC_SUCCESS) {
+					// nothing
+				} else if (!switch_strlen_zero(empty_result_break_to)) { // if zero rows returned then switch_odbc_handle_callback_exec != SWITCH_ODBC_SUCCESS ??? 
+					xml_out = NULL;
+					off = 0; // <- ?
+					xml_odbc_render_template(empty_result_break_to, params, xml_out, off);
+				}
 			}
 		}
 
@@ -198,18 +202,16 @@
 			return SWITCH_STATUS_FALSE;
 		}
 
-//SWITCH_DECLARE(void *) switch_core_hash_find(_In_ switch_hash_t *hash, _In_z_ const char *key);
-logger((char *)switch_core_hash_find(hash, "domain"));
-
 		/* copy all attrs */
 		for (i = 0; xml_in->attr[i]; i+=2) {
-			// do an auto expasion on attr[i+1] to replace all ${foo} parts based on switch_hash_t hash
-			switch_xml_set_attr(xml_out, xml_in->attr[i], xml_in->attr[i+1]);
+			char *tmp_attr;
+			tmp_attr = switch_event_expand_headers(params, xml_in->attr[i+1]);
+			switch_xml_set_attr(xml_out, xml_in->attr[i], tmp_attr);
 		}
 
 		/* copy all children and render them */
 		for (xml_in_tmp = xml_in->child; xml_in_tmp; xml_in_tmp = xml_in_tmp->ordered) {
-			xml_odbc_render_tag(xml_in_tmp, hash, xml_out, off);
+			xml_odbc_render_tag(xml_in_tmp, params, xml_out, off);
 		}
 
 	}
@@ -218,7 +220,7 @@
 }
 
 
-static switch_status_t xml_odbc_render_template(char *template_name, switch_hash_t *hash, switch_xml_t xml_out, int *off)
+static switch_status_t xml_odbc_render_template(char *template_name, switch_event_t *params, switch_xml_t xml_out, int *off)
 {
 	switch_xml_t template_tag = NULL, sub_tag = NULL;
 
@@ -226,7 +228,7 @@
 		char *template_tag_name = (char*) switch_xml_attr_soft(template_tag, "name");
 		if (!strcmp(template_tag_name, template_name)) {
 			for (sub_tag = template_tag->child; sub_tag; sub_tag = sub_tag->ordered) {
-				xml_odbc_render_tag(sub_tag, hash, xml_out, off);
+				xml_odbc_render_tag(sub_tag, params, xml_out, off);
 				return SWITCH_STATUS_SUCCESS;
 			}
 		}
@@ -247,7 +249,6 @@
 
 	xml_odbc_query_type_t query_type;
 
-	switch_hash_t *hash;
 
 	int off = 0, ret = 1;
 
@@ -270,22 +271,12 @@
 
 	if (params) {
 		if ((hi = params->headers)) {
-
-			/* initialize hash */
-			if (switch_core_hash_init(&hash, globals.pool) != SWITCH_STATUS_SUCCESS) {
-//			    need_vars_map = -1; // does it need to be freed ? :)
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't init params hash!\n");
-			}
-
 			for (; hi; hi = hi->next) {
 				if (debug == SWITCH_TRUE) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG in xml_odbc_search, header [%s]=[%s]\n", hi->name, hi->value);
 				}
-				switch_core_hash_insert(hash, hi->name, hi->value); // prefix with 'h_' to avoid collision with keys returned by SELECT's ?
 			}
-
-			xml_odbc_render_template(globals.template, hash, xml_out, &off); // TODO globals.template should be replace with something specific for this section
-
+			xml_odbc_render_template(globals.template, params, xml_out, &off); // TODO globals.template should be replace with something specific for this section
 		}
 	} else {
 		goto cleanup;

Copied: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/testdata.mysql.sql (from r13891, /freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql)
==============================================================================
--- /freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/test_data.sql	(original)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/testdata.mysql.sql	Mon Jun 22 12:59:15 2009
@@ -3,6 +3,6 @@
 INSERT INTO `dir_domain_variables` (`id`, `dir_domain_id`, `name`, `value`) VALUES (1, 1, 'dom_variable_name', 'dom_variable_value');
 INSERT INTO `dir_groups` (`id`, `name`) VALUES (1, 'prepay'), (2, 'annoying_customers');
 INSERT INTO `dir_groups_users` (`dir_group_id`, `dir_user_id`) VALUES (1, 1), (2, 1);
-INSERT INTO `dir_users` (`id`, `dir_domain_id`, `username`, `cidr`, `mailbox`, `number-alias`) VALUES (1, 1, 'someuser', NULL, 'leon at toyos.nl', '0031320227470');
+INSERT INTO `dir_users` (`id`, `dir_domain_id`, `username`, `enabled`, `cidr`, `mailbox`, `number-alias`) VALUES (1, 1, 'someuser', 1, NULL, 'test at test.com', '1234');
 INSERT INTO `dir_user_params` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'password', 'topsecret'), (2, 1, 'vm-password', '0000');
 INSERT INTO `dir_user_variables` (`id`, `dir_user_id`, `name`, `value`) VALUES (1, 1, 'accountcode', '1234'), (2, 1, 'user_context', 'default'), (3, 1, 'vm_extension', '1234');

Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml
==============================================================================
--- freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml	(original)
+++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml	Mon Jun 22 12:59:15 2009
@@ -9,9 +9,10 @@
 -->
     
       
-      
+      
       
-      
+      
+      
     
 
+      
+        
+          
+        
+      
+    
+
+    

pcre	Introductory page
pcre-config	Information about the installation configuration
pcreapi	PCRE's native API
pcrebuild	Options for building PCRE
pcrecallout	The callout facility
pcrecompat	Compability with Perl
pcrecpp	The C++ wrapper for the PCRE library
pcregrep	The pcregrep command
pcrematching	Discussion of the two matching algorithms
pcrepartial	Using PCRE for partial matching
pcrepattern	Specification of the regular expressions supported by PCRE
pcreperform	Some comments on performance
pcreposix	The POSIX API to the PCRE library
pcreprecompile	How to save and re-use compiled patterns
pcresample	Description of the sample program
pcrestack	Discussion of PCRE's stack usage
pcresyntax	Syntax quick-reference summary
pcretest	The pcretest command for testing PCRE

pcre_compile	Compile a regular expression
pcre_compile2	Compile a regular expression (alternate interface)
pcre_config	Show build-time configuration options
pcre_copy_named_substring	Extract named substring into given buffer
pcre_copy_substring	Extract numbered substring into given buffer
pcre_dfa_exec	Match a compiled pattern to a subject string + (DFA algorithm; not Perl compatible)
pcre_exec	Match a compiled pattern to a subject string + (Perl compatible)
pcre_free_substring	Free extracted substring
pcre_free_substring_list	Free list of extracted substrings
pcre_fullinfo	Extract information about a pattern
pcre_get_named_substring	Extract named substring into new memory
pcre_get_stringnumber	Convert captured string name to number
pcre_get_substring	Extract numbered substring into new memory
pcre_get_substring_list	Extract all substrings into new memory
pcre_info	Obsolete information extraction function
pcre_maketables	Build character tables in current locale
pcre_refcount	Maintain reference count in compiled pattern
pcre_study	Study a compiled pattern
pcre_version	Return PCRE version and release date

$ARGV[0] man page

pcre-config man page

pcresyntax man page

Perl-compatible Regular Expressions (PCRE)