- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13730 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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]);

1 0

[commit] r13729 - in freeswitch/trunk/libs: pcre win32/pcre
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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 <bits/type_traits.h> header file. */ +/* #undef HAVE_BITS_TYPE_TRAITS_H */ -/* #define PCRE_DATA_SCOPE */ +/* Define to 1 if you have the <bzlib.h> 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 <dirent.h> header file. */ +#ifndef HAVE_DIRENT_H +#define HAVE_DIRENT_H 1 +#endif -/* #undef const */ +/* Define to 1 if you have the <dlfcn.h> header file. */ +#ifndef HAVE_DLFCN_H +#define HAVE_DLFCN_H 1 +#endif -/* Define the following macro to "unsigned" if <stddef.h> does not define -size_t. */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#ifndef HAVE_INTTYPES_H +#define HAVE_INTTYPES_H 1 +#endif -/* #undef size_t */ +/* Define to 1 if you have the <limits.h> 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 <memory.h> header file. */ +#ifndef HAVE_MEMORY_H +#define HAVE_MEMORY_H 1 +#endif -#define HAVE_BCOPY 1 +/* Define to 1 if you have the <readline/history.h> 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 <readline/readline.h> 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 <stdint.h> 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 <stdlib.h> 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 <string> 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 <strings.h> 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 <string.h> 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 <sys/stat.h> header file. */ +#ifndef HAVE_SYS_STAT_H +#define HAVE_SYS_STAT_H 1 +#endif + +/* Define to 1 if you have the <sys/types.h> header file. */ +#ifndef HAVE_SYS_TYPES_H +#define HAVE_SYS_TYPES_H 1 +#endif +/* Define to 1 if you have the <type_traits.h> header file. */ +/* #undef HAVE_TYPE_TRAITS_H */ + +/* Define to 1 if you have the <unistd.h> 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 <windows.h> header file. */ +#define HAVE_WINDOWS_H 1 + +/* Define to 1 if you have the <zlib.h> 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 <sys/types.h> 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 <ctype.h> #include <stdio.h> #include <string.h> +#include <locale.h> #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 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;PCRE_STATIC" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\pcre"" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;PCRE_STATIC;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -104,9 +104,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -130,35 +130,35 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="1" - TypeLibraryName=".\Release/libpcre.tlb" + TargetEnvironment="3" + TypeLibraryName=".\Debug/libpcre.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;PCRE_STATIC" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\pcre"" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;PCRE_STATIC;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" PrecompiledHeaderFile="$(OutDir)\libpcre.pch" AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -189,10 +189,10 @@ /> </Configuration> <Configuration - Name="Debug DLL|Win32" - OutputDirectory="$(SolutionDir)Debug" + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -215,61 +215,49 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\Debug/libpcre.tlb" + TypeLibraryName=".\Release/libpcre.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;DLL_EXPORT" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + Optimization="2" + InlineFunctionExpansion="1" + 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" PrecompiledHeaderFile="$(OutDir)\libpcre.pch" AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" + Name="VCLibrarianTool" + LinkLibraryDependencies="true" AdditionalDependencies="odbc32.lib odbccp32.lib" - OutputFile="$(OutDir)\$(ProjectName).dll" - LinkIncremental="1" - SuppressStartupBanner="true" - ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - ImportLibrary="$(IntDir)\$(ProjectName).lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -281,18 +269,15 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" CommandLine="" /> </Configuration> <Configuration - Name="Release DLL|Win32" - OutputDirectory="$(SolutionDir)Release" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -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" /> <Tool - Name="VCLinkerTool" + Name="VCLibrarianTool" + LinkLibraryDependencies="true" AdditionalDependencies="odbc32.lib odbccp32.lib" - OutputFile="$(OutDir)\$(ProjectName).dll" - LinkIncremental="1" - SuppressStartupBanner="true" - ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" - ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - ImportLibrary="$(IntDir)\$(ProjectName).lib" - TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -380,18 +354,15 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" CommandLine="" /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="4" + Name="Debug DLL|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -417,15 +388,15 @@ PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" + TargetEnvironment="1" TypeLibraryName=".\Debug/libpcre.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;PCRE_STATIC" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\pcre"" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;DLL_EXPORT;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -449,14 +420,26 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" - LinkLibraryDependencies="true" + Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(IntDir)\$(ProjectName).lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool + Name="VCManifestTool" + /> + <Tool Name="VCXDCMakeTool" /> <Tool @@ -468,15 +451,18 @@ Name="VCFxCopTool" /> <Tool + Name="VCAppVerifierTool" + /> + <Tool Name="VCPostBuildEventTool" CommandLine="" /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Debug DLL|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" - ConfigurationType="4" + ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > @@ -499,49 +485,61 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="3" - TypeLibraryName=".\Release/libpcre.tlb" + TypeLibraryName=".\Debug/libpcre.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;PCRE_STATIC" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\pcre"" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;DLL_EXPORT;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" PrecompiledHeaderFile="$(OutDir)\libpcre.pch" AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="3" SuppressStartupBanner="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" - LinkLibraryDependencies="true" + Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(IntDir)\$(ProjectName).lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" /> <Tool + Name="VCManifestTool" + /> + <Tool Name="VCXDCMakeTool" /> <Tool @@ -553,14 +551,17 @@ Name="VCFxCopTool" /> <Tool + Name="VCAppVerifierTool" + /> + <Tool Name="VCPostBuildEventTool" CommandLine="" /> </Configuration> <Configuration - Name="Debug DLL|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release DLL|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -584,35 +585,35 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" - TargetEnvironment="3" - TypeLibraryName=".\Debug/libpcre.tlb" + TargetEnvironment="1" + TypeLibraryName=".\Release/libpcre.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;DLL_EXPORT" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\pcre"" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;DLL_EXPORT;HAVE_CONFIG_H" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" PrecompiledHeaderFile="$(OutDir)\libpcre.pch" AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool @@ -625,12 +626,11 @@ LinkIncremental="1" SuppressStartupBanner="true" ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" - GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" RandomizedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(IntDir)\$(ProjectName).lib" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -695,8 +695,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;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;DLL_EXPORT;HAVE_CONFIG_H" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -775,990 +775,54 @@ <File RelativePath="..\..\pcre\pcre_config.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_dfa_exec.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_exec.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_fullinfo.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_get.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_globals.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_info.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_maketables.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_ord2utf8.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_refcount.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_study.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_tables.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_try_flipped.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_ucp_searchfuncs.c" @@ -1767,306 +831,14 @@ <File RelativePath="..\..\pcre\pcre_valid_utf8.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_version.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_xclass.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\pcre\pcreposix.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|x64" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> </Filter> <Filter 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:35:48 2009 @@ -51,8 +51,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;PCRE_STATIC" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\pcre"" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;PCRE_STATIC;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -137,8 +137,8 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;PCRE_STATIC" + 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" @@ -221,8 +221,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="./" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;DLL_EXPORT" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\pcre"" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;DLL_EXPORT;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -323,8 +323,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;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;DLL_EXPORT;HAVE_CONFIG_H" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -404,522 +404,54 @@ <File RelativePath="..\..\pcre\pcre_config.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_dfa_exec.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_exec.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_fullinfo.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_get.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_globals.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_info.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_maketables.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_ord2utf8.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_refcount.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_study.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_tables.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_try_flipped.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_ucp_searchfuncs.c" @@ -928,162 +460,18 @@ <File RelativePath="..\..\pcre\pcre_valid_utf8.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_version.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcre_xclass.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="..\..\pcre\pcreposix.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" - /> - </FileConfiguration> </File> </Filter> <Filter Modified: freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj Tue Jun 9 12:35:48 2009 @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\pcre\" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="2" @@ -97,12 +97,11 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -119,11 +118,15 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories="..\..\pcre\" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" @@ -141,14 +144,12 @@ <Tool Name="VCLinkerTool" OutputFile="$(OutDir)\dftables.exe" - LinkIncremental="1" + LinkIncremental="2" GenerateDebugInformation="true" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - RandomizedBaseAddress="2" + RandomizedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -174,11 +175,12 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -195,15 +197,11 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" AdditionalIncludeDirectories="..\..\pcre\" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" - BasicRuntimeChecks="3" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" @@ -221,12 +219,14 @@ <Tool Name="VCLinkerTool" OutputFile="$(OutDir)\dftables.exe" - LinkIncremental="2" + LinkIncremental="1" GenerateDebugInformation="true" SubSystem="1" - RandomizedBaseAddress="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="2" DataExecutionPrevention="0" - TargetMachine="17" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -279,7 +279,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\pcre\" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" Modified: freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj (original) +++ freeswitch/trunk/libs/win32/pcre/pcre_chartables.c.vcproj Tue Jun 9 12:35:48 2009 @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\pcre\" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -121,7 +121,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="..\..\pcre\" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3"

1 0

[commit] r13728 - freeswitch/trunk/docs
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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)

1 0

[commit] r13727 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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);

1 0

[commit] r13726 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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; } }

1 0

[commit] r13725 - in freeswitch/trunk/src/mod: applications/mod_vmd say/mod_say_ru say/mod_say_zh
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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)

1 0

[commit] r13724 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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;

1 0

[commit] r13723 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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.

1 0

[commit] r13722 - in freeswitch/trunk/scripts/contrib/jmesquita/mod_khomp: . include
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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 <anthm(a)freeswitch.org> + * + * 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 <anthm(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Joao Mesquita <mesquita(a)khomp.com.br> + * + * + * mod_khomp.c -- Khomp board Endpoint Module + * + */ + +/* Our includes */ +#include "k3l.h" + +extern "C" +{ + #include <switch.h> +} + +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<private_t *>(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<private_t*>(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<private_t*>(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<private_t*>(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<private_t*>(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<private_t*>(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<private_t*>(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<private_t*>(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<private_t*>(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_endpoint_interface_t*>(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: + */

1 0

[commit] r13721 - freeswitch/trunk/src/mod/languages/mod_python
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

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;

1 0