[asterisk-commits] dlee: branch dlee/ASTERISK-22296 r397591 - in /team/dlee/ASTERISK-22296: chan...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Aug 23 15:45:10 CDT 2013
Author: dlee
Date: Fri Aug 23 15:45:08 2013
New Revision: 397591
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397591
Log:
hack, hack, hack
Modified:
team/dlee/ASTERISK-22296/channels/chan_sip.c
team/dlee/ASTERISK-22296/channels/sip/include/sip.h
team/dlee/ASTERISK-22296/include/asterisk/ari.h
team/dlee/ASTERISK-22296/include/asterisk/optional_api.h
team/dlee/ASTERISK-22296/main/loader.c
team/dlee/ASTERISK-22296/res/ari/ari_websockets.c
team/dlee/ASTERISK-22296/res/ari/internal.h
team/dlee/ASTERISK-22296/res/res_ari.c
team/dlee/ASTERISK-22296/res/res_ari_asterisk.c
team/dlee/ASTERISK-22296/res/res_ari_bridges.c
team/dlee/ASTERISK-22296/res/res_ari_channels.c
team/dlee/ASTERISK-22296/res/res_ari_endpoints.c
team/dlee/ASTERISK-22296/res/res_ari_events.c
team/dlee/ASTERISK-22296/res/res_ari_playback.c
team/dlee/ASTERISK-22296/res/res_ari_recordings.c
team/dlee/ASTERISK-22296/res/res_ari_sounds.c
team/dlee/ASTERISK-22296/rest-api-templates/res_ari_resource.c.mustache
Modified: team/dlee/ASTERISK-22296/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/channels/chan_sip.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/channels/chan_sip.c (original)
+++ team/dlee/ASTERISK-22296/channels/chan_sip.c Fri Aug 23 15:45:08 2013
@@ -298,6 +298,7 @@
#include "asterisk/stasis_system.h"
#include "asterisk/stasis_channels.h"
#include "asterisk/features_config.h"
+#include "asterisk/http_websocket.h"
/*** DOCUMENTATION
<application name="SIPDtmfMode" language="en_US">
Modified: team/dlee/ASTERISK-22296/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/channels/sip/include/sip.h?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/channels/sip/include/sip.h (original)
+++ team/dlee/ASTERISK-22296/channels/sip/include/sip.h Fri Aug 23 15:45:08 2013
@@ -35,7 +35,6 @@
#include "asterisk/indications.h"
#include "asterisk/security_events.h"
#include "asterisk/features.h"
-#include "asterisk/http_websocket.h"
#include "asterisk/rtp_engine.h"
#include "asterisk/netsock2.h"
#include "asterisk/features_config.h"
@@ -768,6 +767,8 @@
int tcp_enabled;
int default_max_forwards; /*!< Default max forwards (SIP Anti-loop) */
};
+
+struct ast_websocket;
/*! \brief The SIP socket definition */
struct sip_socket {
Modified: team/dlee/ASTERISK-22296/include/asterisk/ari.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/include/asterisk/ari.h?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/include/asterisk/ari.h (original)
+++ team/dlee/ASTERISK-22296/include/asterisk/ari.h Fri Aug 23 15:45:08 2013
@@ -31,7 +31,6 @@
#include "asterisk/http.h"
#include "asterisk/json.h"
-#include "asterisk/http_websocket.h"
/*!
* \brief Configured encoding format for JSON output.
@@ -52,6 +51,8 @@
struct ast_variable *path_vars,
struct ast_variable *headers,
struct ast_ari_response *response);
+
+struct ast_websocket_server;
/*!
* \brief Handler for a single RESTful path segment.
@@ -144,6 +145,8 @@
/*! \brief Abstraction for reading/writing JSON to a WebSocket */
struct ast_ari_websocket_session;
+struct ast_websocket;
+
/*!
* \brief Create an ARI WebSocket session.
*
Modified: team/dlee/ASTERISK-22296/include/asterisk/optional_api.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/include/asterisk/optional_api.h?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/include/asterisk/optional_api.h (original)
+++ team/dlee/ASTERISK-22296/include/asterisk/optional_api.h Fri Aug 23 15:45:08 2013
@@ -30,19 +30,6 @@
* have only a part of their functionality dependent on the APIs, and can
* provide the remainder even if the APIs are not available.
*
- * To accomodate this situation, the AST_OPTIONAL_API macro allows an API
- * function to be declared in a special way, if Asterisk being built on a
- * platform that supports special compiler and dynamic linker attributes.
- * If so the API function will actually be a weak symbol, which means if the
- * provider of the API is not loaded, the symbol can still be referenced (unlike a
- * strong symbol, which would cause an immediate fault if not defined when
- * referenced), but it will return NULL signifying the linker/loader was
- * not able to resolve the symbol. In addition, the macro defines a hidden
- * 'stub' version of the API call, using a provided function body, and uses
- * various methods to make the API function symbol actually resolve to
- * that hidden stub, but only when the *real* provider of the symbol has
- * not been found.
- *
* An example can be found in agi.h:
*
* \code
@@ -74,19 +61,6 @@
* apply special aliases to the function prototype; this can be done
* by defining AST_API_MODULE just before including the header file
* containing the AST_OPTIONAL_API macro calls.
- *
- * \note If the platform does not provide adequate resources,
- * then the AST_OPTIONAL_API macro will result in a non-optional function
- * definition; this means that any consumers of the API functions so
- * defined will require that the provider of the API functions be
- * loaded before they can reference the symbols.
- *
- * WARNING WARNING WARNING WARNING WARNING
- *
- * You MUST add the AST_MODFLAG_GLOBAL_SYMBOLS to the module for which you
- * are enabling optional_api functionality, or it will fail to work.
- *
- * WARNING WARNING WARNING WARNING WARNING
*/
/*!
@@ -99,137 +73,13 @@
*/
#define AST_OPTIONAL_API_UNAVAILABLE INT_MIN
-
-#if defined(HAVE_ATTRIBUTE_weak_import) || defined(HAVE_ATTRIBUTE_weak)
-
-/*
- * This is the Darwin (Mac OS/X) implementation, that only provides the 'weak'
- * or 'weak_import' compiler attribute for weak symbols. On this platform,
- *
- * - The module providing the API will only provide a '__' prefixed version
- * of the API function to other modules (this will be hidden from the other
- * modules by the macros), so any modules compiled against older versions
- * of the module that provided a non-prefixed version of the API function
- * will fail to link at runtime.
- * - In the API module itself, access to the API function without using a
- * prefixed name is provided by a static pointer variable that holds the
- * function address.
- * - 'Consumer' modules of the API will use a combination of a weak_import or
- * weak symbol, a local stub function, a pointer variable and a constructor
- * function (which initializes that pointer variable as the module is being
- * loaded) to provide safe, optional access to the API function without any
- * special code being required.
+/*!
+ * \def AST_OPTIONAL_API_NAME(name)
+ * \brief Expands to the name of the implementation function.
*/
-#if defined(HAVE_ATTRIBUTE_weak_import)
-#define __default_attribute weak_import /* pre-Lion */
-#else
-#define __default_attribute weak /* Lion-onwards */
-#endif
-
-#define AST_OPTIONAL_API_NAME(name) __##name
-
-#if defined(AST_API_MODULE)
-
-#define AST_OPTIONAL_API(result, name, proto, stub) \
- result AST_OPTIONAL_API_NAME(name) proto; \
- static attribute_unused typeof(AST_OPTIONAL_API_NAME(name)) * const name = AST_OPTIONAL_API_NAME(name);
-
-#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) \
- result __attribute__((attr)) AST_OPTIONAL_API_NAME(name) proto; \
- static attribute_unused typeof(AST_OPTIONAL_API_NAME(name)) * const name = AST_OPTIONAL_API_NAME(name);
-
-#else
-
-#define AST_OPTIONAL_API(result, name, proto, stub) \
- static result __stub__##name proto stub; \
- __attribute__((__default_attribute)) typeof(__stub__##name) AST_OPTIONAL_API_NAME(name); \
- static attribute_unused typeof(__stub__##name) * name; \
- static void __attribute__((constructor)) __init__##name(void) { name = AST_OPTIONAL_API_NAME(name) ? : __stub__##name; }
-
-#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) \
- static __attribute__((attr)) result __stub__##name proto stub; \
- __attribute__((attr, __default_attribute)) typeof(__stub__##name) AST_OPTIONAL_API_NAME(name); \
- static attribute_unused __attribute__((attr)) typeof(__stub__##name) * name; \
- static void __attribute__((constructor)) __init__##name(void) { name = AST_OPTIONAL_API_NAME(name) ? : __stub__##name; }
-
-#endif
-
-/* End of Darwin (Mac OS/X) implementation */
-
-#elif defined(HAVE_ATTRIBUTE_weakref)
-
-/*
- * This is the generic GCC implementation, used when the 'weakref'
- * compiler attribute is available. On these platforms:
- *
- * - The module providing the API will provide a '__' prefixed version
- * of the API function to other modules (this will be hidden from the other
- * modules by the macros), and also a non-prefixed alias so that modules
- * compiled against older versions of the module that provided a non-prefixed
- * version of the API function will continue to link properly.
- * - In the API module itself, access to the API function without using a
- * prefixed name is provided by the non-prefixed alias described above.
- * - 'Consumer' modules of the API will use a combination of a weakref
- * symbol, a local stub function, a pointer variable and a constructor function
- * (which initializes that pointer variable as the module is being loaded)
- * to provide safe, optional access to the API function without any special
- * code being required.
- */
-
-#define AST_OPTIONAL_API_NAME(name) __##name
-
-#if defined(AST_API_MODULE)
-
-#define AST_OPTIONAL_API(result, name, proto, stub) \
- result AST_OPTIONAL_API_NAME(name) proto; \
- static __attribute__((alias(__stringify(AST_OPTIONAL_API_NAME(name))))) typeof(AST_OPTIONAL_API_NAME(name)) name;
-
-#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) \
- result __attribute__((attr)) AST_OPTIONAL_API_NAME(name) proto; \
- static __attribute__((alias(__stringify(AST_OPTIONAL_API_NAME(name))))) typeof(AST_OPTIONAL_API_NAME(name)) name;
-
-#else
-
-#define AST_OPTIONAL_API(result, name, proto, stub) \
- static result __stub__##name proto stub; \
- static __attribute__((weakref(__stringify(AST_OPTIONAL_API_NAME(name))))) typeof(__stub__##name) __ref__##name; \
- static attribute_unused typeof(__stub__##name) * name; \
- static void __attribute__((constructor)) __init__##name(void) { \
- if (__ref__##name) { \
- ast_verb(3, "Binding " #name "\n"); \
- name = __ref__##name; \
- } else { \
- ast_verb(3, "Stubbing " #name "\n" ); \
- name = __stub__##name; \
- } \
- }
-
-#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) \
- static __attribute__((attr)) result __stub__##name proto stub; \
- static __attribute__((attr, weakref(__stringify(AST_OPTIONAL_API_NAME(name))))) typeof(__stub__##name) __ref__##name; \
- static attribute_unused __attribute__((attr)) typeof(__stub__##name) * name; \
- static void __attribute__((constructor)) __init__##name(void) { \
- if (__ref__##name) { \
- ast_verb(3, "Binding " #name "\n"); \
- name = __ref__##name; \
- } else { \
- ast_verb(3, "Stubbing " #name "\n"); \
- name = __stub__##name; \
- } \
- }
-
-#endif
-
-/* End of GCC implementation */
-
-#else
-
-/* This is the non-optional implementation. */
-
-#define AST_OPTIONAL_API_NAME(name) name
-
/*!
+ * \def AST_OPTIONAL_API(result, name, proto, stub)
* \brief Define an optional API function
*
* \param result The type of result the function returns
@@ -241,11 +91,11 @@
* \code
* AST_OPTIONAL_API(int, ast_agi_register, (struct ast_module *mod, agi_command *cmd),
* { return AST_OPTIONAL_API_UNAVAILABLE; });
- * \endcode
+ * \endcode
*/
-#define AST_OPTIONAL_API(result, name, proto, stub) result AST_OPTIONAL_API_NAME(name) proto
/*!
+ * \def AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub)
* \brief Define an optional API function with compiler attributes
*
* \param result The type of result the function returns
@@ -254,9 +104,71 @@
* \param proto The prototype (arguments) of the function
* \param stub The code block that will be used by the hidden stub when needed
*/
-#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) result __attribute__((attr)) AST_OPTIONAL_API_NAME(name) proto
-/* End of non-optional implementation */
+#if !defined(AST_NO_OPTIONAL_API)
+
+typedef void (*ast_optional_fn)(void);
+
+void ast_optional_api_register(ast_optional_fn *function, ast_optional_fn stub,
+ const char *symname, const char *module);
+void ast_optional_api_unregister(ast_optional_fn *function);
+
+void optional_api_onload(void);
+void optional_api_onunload(void);
+
+#define AST_OPTIONAL_API_NAME(name) __##name
+
+#if defined(AST_API_MODULE)
+/* Module defining the API */
+
+#define AST_OPTIONAL_API(result, name, proto, stub) \
+ result AST_OPTIONAL_API_NAME(name) proto; \
+ static attribute_unused typeof(AST_OPTIONAL_API_NAME(name)) * const name = AST_OPTIONAL_API_NAME(name)
+
+#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) \
+ result __attribute__((attr)) AST_OPTIONAL_API_NAME(name) proto; \
+ static attribute_unused typeof(AST_OPTIONAL_API_NAME(name)) * const name = AST_OPTIONAL_API_NAME(name)
+
+#else
+/* Module using the API */
+
+#define AST_OPTIONAL_API_INIT(name) \
+ static void __attribute__((constructor)) __init__##name(void) { \
+ ast_verb(3, "%s: %d - init\n", __FILE__, __LINE__); \
+ ast_optional_api_register((ast_optional_fn *)&name, \
+ (ast_optional_fn)__stub__##name, "__" #name, \
+ AST_MODULE); \
+ } \
+ static void __attribute__((destructor)) __dtor__##name(void) { \
+ ast_verb(3, "%s: %d - dtor\n", __FILE__, __LINE__); \
+ ast_optional_api_unregister((ast_optional_fn *)&name); \
+ }
+
+#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) \
+ static __attribute__((attr)) result __stub__##name proto stub; \
+ static attribute_unused __attribute__((attr)) \
+ typeof(__stub__##name) * name; \
+ AST_OPTIONAL_API_INIT(name)
+
+#define AST_OPTIONAL_API(result, name, proto, stub) \
+ static result __stub__##name proto stub; \
+ static attribute_unused \
+ typeof(__stub__##name) * name; \
+ AST_OPTIONAL_API_INIT(name)
+
+#endif /* defined(AST_API_MODULE) */
+
+#else /* !define(AST_NO_OPTIONAL_API) */
+
+/* Non-optional API */
+
+#define AST_OPTIONAL_API_NAME(name) name
+
+#define AST_OPTIONAL_API(result, name, proto, stub) \
+ result AST_OPTIONAL_API_NAME(name) proto
+
+#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub) \
+ result __attribute__((attr)) AST_OPTIONAL_API_NAME(name) proto
#endif
Modified: team/dlee/ASTERISK-22296/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/main/loader.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/main/loader.c (original)
+++ team/dlee/ASTERISK-22296/main/loader.c Fri Aug 23 15:45:08 2013
@@ -57,6 +57,7 @@
#include "asterisk/app.h"
#include "asterisk/test.h"
#include "asterisk/sounds_index.h"
+#include "asterisk/optional_api.h"
#include <dlfcn.h>
@@ -413,6 +414,9 @@
if (lib)
while (!dlclose(lib));
+
+ /* If mod offered an optional API, it's not there any more! */
+ optional_api_onunload();
}
static enum ast_module_load_result load_resource(const char *resource_name, unsigned int global_symbols_only, struct ast_heap *resource_heap, int required);
@@ -524,6 +528,9 @@
AST_LIST_LAST(&module_list)->lib = lib;
resource_being_loaded = NULL;
+
+ /* The module may offer up an optional API another module wants. */
+ optional_api_onload();
return AST_LIST_LAST(&module_list);
}
Modified: team/dlee/ASTERISK-22296/res/ari/ari_websockets.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/ari/ari_websockets.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/ari/ari_websockets.c (original)
+++ team/dlee/ASTERISK-22296/res/ari/ari_websockets.c Fri Aug 23 15:45:08 2013
@@ -20,8 +20,9 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk/ari.h"
#include "asterisk/astobj2.h"
-#include "asterisk/ari.h"
+#include "asterisk/http_websocket.h"
/*! \file
*
Modified: team/dlee/ASTERISK-22296/res/ari/internal.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/ari/internal.h?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/ari/internal.h (original)
+++ team/dlee/ASTERISK-22296/res/ari/internal.h Fri Aug 23 15:45:08 2013
@@ -26,6 +26,7 @@
*/
#include "asterisk/json.h"
+#include "asterisk/stringfields.h"
/*! @{ */
Modified: team/dlee/ASTERISK-22296/res/res_ari.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari.c Fri Aug 23 15:45:08 2013
@@ -124,11 +124,12 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/internal.h"
+#include "asterisk/ari.h"
#include "asterisk/astobj2.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/paths.h"
-#include "asterisk/ari.h"
-#include "ari/internal.h"
#include <string.h>
#include <sys/stat.h>
Modified: team/dlee/ASTERISK-22296/res/res_ari_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari_asterisk.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari_asterisk.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari_asterisk.c Fri Aug 23 15:45:08 2013
@@ -41,10 +41,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_asterisk.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_asterisk.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
Modified: team/dlee/ASTERISK-22296/res/res_ari_bridges.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari_bridges.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari_bridges.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari_bridges.c Fri Aug 23 15:45:08 2013
@@ -41,10 +41,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_bridges.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_bridges.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
Modified: team/dlee/ASTERISK-22296/res/res_ari_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari_channels.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari_channels.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari_channels.c Fri Aug 23 15:45:08 2013
@@ -41,10 +41,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_channels.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_channels.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
Modified: team/dlee/ASTERISK-22296/res/res_ari_endpoints.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari_endpoints.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari_endpoints.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari_endpoints.c Fri Aug 23 15:45:08 2013
@@ -41,10 +41,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_endpoints.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_endpoints.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
Modified: team/dlee/ASTERISK-22296/res/res_ari_events.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari_events.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari_events.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari_events.c Fri Aug 23 15:45:08 2013
@@ -41,10 +41,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_events.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_events.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
Modified: team/dlee/ASTERISK-22296/res/res_ari_playback.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari_playback.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari_playback.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari_playback.c Fri Aug 23 15:45:08 2013
@@ -41,10 +41,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_playback.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_playback.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
Modified: team/dlee/ASTERISK-22296/res/res_ari_recordings.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari_recordings.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari_recordings.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari_recordings.c Fri Aug 23 15:45:08 2013
@@ -41,10 +41,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_recordings.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_recordings.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
Modified: team/dlee/ASTERISK-22296/res/res_ari_sounds.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/res/res_ari_sounds.c?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/res/res_ari_sounds.c (original)
+++ team/dlee/ASTERISK-22296/res/res_ari_sounds.c Fri Aug 23 15:45:08 2013
@@ -41,10 +41,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_sounds.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_sounds.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
Modified: team/dlee/ASTERISK-22296/rest-api-templates/res_ari_resource.c.mustache
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/rest-api-templates/res_ari_resource.c.mustache?view=diff&rev=397591&r1=397590&r2=397591
==============================================================================
--- team/dlee/ASTERISK-22296/rest-api-templates/res_ari_resource.c.mustache (original)
+++ team/dlee/ASTERISK-22296/rest-api-templates/res_ari_resource.c.mustache Fri Aug 23 15:45:08 2013
@@ -46,10 +46,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "ari/resource_{{name}}.h"
#include "asterisk/app.h"
+#include "asterisk/http_websocket.h"
#include "asterisk/module.h"
#include "asterisk/stasis_app.h"
-#include "ari/resource_{{name}}.h"
#if defined(AST_DEVMODE)
#include "ari/ari_model_validators.h"
#endif
More information about the asterisk-commits
mailing list