[asterisk-commits] jrose: branch jrose/bridge_projects r386715 - in /team/jrose/bridge_projects:...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Apr 26 17:24:56 CDT 2013
Author: jrose
Date: Fri Apr 26 17:24:52 2013
New Revision: 386715
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386715
Log:
update automerge stuff
Added:
team/jrose/bridge_projects/configs/statsd.conf.sample
- copied unchanged from r386689, team/group/bridge_construction/configs/statsd.conf.sample
team/jrose/bridge_projects/include/asterisk/statsd.h
- copied unchanged from r386689, team/group/bridge_construction/include/asterisk/statsd.h
team/jrose/bridge_projects/res/res_chan_stats.c
- copied unchanged from r386689, team/group/bridge_construction/res/res_chan_stats.c
team/jrose/bridge_projects/res/res_statsd.c
- copied unchanged from r386689, team/group/bridge_construction/res/res_statsd.c
team/jrose/bridge_projects/res/res_statsd.exports.in
- copied unchanged from r386689, team/group/bridge_construction/res/res_statsd.exports.in
Modified:
team/jrose/bridge_projects/ (props changed)
team/jrose/bridge_projects/include/asterisk/utils.h
team/jrose/bridge_projects/main/config.c
team/jrose/bridge_projects/main/features.c
team/jrose/bridge_projects/main/loader.c
team/jrose/bridge_projects/main/uuid.c
team/jrose/bridge_projects/res/res_sip/ (props changed)
team/jrose/bridge_projects/res/res_sip_acl.c
team/jrose/bridge_projects/res/res_sip_dtmf_info.c
team/jrose/bridge_projects/res/res_sip_endpoint_identifier_constant.c
team/jrose/bridge_projects/res/res_sip_endpoint_identifier_ip.c
team/jrose/bridge_projects/res/res_sip_endpoint_identifier_user.c
team/jrose/bridge_projects/res/res_sip_logger.c
team/jrose/bridge_projects/res/res_sip_mwi.c
team/jrose/bridge_projects/res/res_sip_nat.c
team/jrose/bridge_projects/res/res_sip_outbound_authenticator_digest.c
team/jrose/bridge_projects/res/res_sip_outbound_registration.c
team/jrose/bridge_projects/res/res_sip_pubsub.c
team/jrose/bridge_projects/res/res_sip_registrar.c
team/jrose/bridge_projects/res/res_sip_rfc3326.c
Propchange: team/jrose/bridge_projects/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.
Propchange: team/jrose/bridge_projects/
------------------------------------------------------------------------------
--- bridge_construction-integrated (original)
+++ bridge_construction-integrated Fri Apr 26 17:24:52 2013
@@ -1,1 +1,1 @@
-/trunk:1-386590
+/trunk:1-386688
Propchange: team/jrose/bridge_projects/
------------------------------------------------------------------------------
--- bridge_projects-integrated (original)
+++ bridge_projects-integrated Fri Apr 26 17:24:52 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-386625
+/team/group/bridge_construction:1-386694
Modified: team/jrose/bridge_projects/include/asterisk/utils.h
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/include/asterisk/utils.h?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/include/asterisk/utils.h (original)
+++ team/jrose/bridge_projects/include/asterisk/utils.h Fri Apr 26 17:24:52 2013
@@ -458,6 +458,11 @@
long int ast_random(void);
+/*!
+ * \brief Returns a random number between 0.0 and 1.0, inclusive.
+ * \since 12
+ */
+#define ast_random_double() (((double)ast_random()) / RAND_MAX)
/*!
* \brief free() wrapper
Modified: team/jrose/bridge_projects/main/config.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/main/config.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/main/config.c (original)
+++ team/jrose/bridge_projects/main/config.c Fri Apr 26 17:24:52 2013
@@ -1617,6 +1617,9 @@
AST_LIST_UNLOCK(&cfmtime_head);
ast_free(comment_buffer);
ast_free(lline_buffer);
+#ifdef AST_INCLUDE_GLOB
+ globfree(&globbuf);
+#endif
return CONFIG_STATUS_FILEUNCHANGED;
}
}
@@ -1627,6 +1630,9 @@
if (cfg == NULL) {
ast_free(comment_buffer);
ast_free(lline_buffer);
+#ifdef AST_INCLUDE_GLOB
+ globfree(&globbuf);
+#endif
return NULL;
}
Modified: team/jrose/bridge_projects/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/main/features.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/main/features.c (original)
+++ team/jrose/bridge_projects/main/features.c Fri Apr 26 17:24:52 2013
@@ -8163,6 +8163,7 @@
/*! \internal \brief Clean up resources on Asterisk shutdown */
static void features_shutdown(void)
{
+ ast_cli_unregister_multiple(cli_features, ARRAY_LEN(cli_features));
ast_devstate_prov_del("Park");
ast_custom_function_unregister(&featuremap_function);
ast_custom_function_unregister(&feature_function);
@@ -8172,6 +8173,9 @@
ast_unregister_application(app_bridge);
pthread_cancel(parking_thread);
+ pthread_kill(parking_thread, SIGURG);
+ pthread_join(parking_thread, NULL);
+ ast_context_destroy(NULL, registrar);
ao2_ref(parkinglots, -1);
}
Modified: team/jrose/bridge_projects/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/main/loader.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/main/loader.c (original)
+++ team/jrose/bridge_projects/main/loader.c Fri Apr 26 17:24:52 2013
@@ -842,7 +842,9 @@
return AST_MODULE_LOAD_FAILURE;
}
- printf ("!!! Going to load %s\n", mod->resource);
+ if (!ast_fully_booted) {
+ ast_verb(1, "Loading %s.\n", mod->resource);
+ }
res = mod->info->load();
switch (res) {
Modified: team/jrose/bridge_projects/main/uuid.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/main/uuid.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/main/uuid.c (original)
+++ team/jrose/bridge_projects/main/uuid.c Fri Apr 26 17:24:52 2013
@@ -18,6 +18,8 @@
/*! \file
* \brief Universally unique identifier support
+ *
+ * \extref Depends on libuuid, a component of the e2fsprogs package - http://e2fsprogs.sourceforge.net/
*/
#include "asterisk.h"
Propchange: team/jrose/bridge_projects/res/res_sip/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 26 17:24:52 2013
@@ -1,0 +1,2 @@
+*.o
+*.i
Modified: team/jrose/bridge_projects/res/res_sip_acl.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_acl.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_acl.c (original)
+++ team/jrose/bridge_projects/res/res_sip_acl.c Fri Apr 26 17:24:52 2013
@@ -18,6 +18,7 @@
/*** MODULEINFO
<depend>pjproject</depend>
+ <depend>res_sip</depend>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_dtmf_info.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_dtmf_info.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_dtmf_info.c (original)
+++ team/jrose/bridge_projects/res/res_sip_dtmf_info.c Fri Apr 26 17:24:52 2013
@@ -18,6 +18,8 @@
/*** MODULEINFO
<depend>pjproject</depend>
+ <depend>res_sip</depend>
+ <depend>res_sip_session</depend>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_endpoint_identifier_constant.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_endpoint_identifier_constant.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_endpoint_identifier_constant.c (original)
+++ team/jrose/bridge_projects/res/res_sip_endpoint_identifier_constant.c Fri Apr 26 17:24:52 2013
@@ -20,6 +20,7 @@
/*** MODULEINFO
<depend>pjproject</depend>
+ <depend>res_sip</depend>
<defaultenabled>no</defaultenabled>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_endpoint_identifier_ip.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_endpoint_identifier_ip.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_endpoint_identifier_ip.c (original)
+++ team/jrose/bridge_projects/res/res_sip_endpoint_identifier_ip.c Fri Apr 26 17:24:52 2013
@@ -18,6 +18,7 @@
/*** MODULEINFO
<depend>pjproject</depend>
+ <depend>res_sip</depend>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_endpoint_identifier_user.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_endpoint_identifier_user.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_endpoint_identifier_user.c (original)
+++ team/jrose/bridge_projects/res/res_sip_endpoint_identifier_user.c Fri Apr 26 17:24:52 2013
@@ -18,6 +18,7 @@
/*** MODULEINFO
<depend>pjproject</depend>
+ <depend>res_sip</depend>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_logger.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_logger.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_logger.c (original)
+++ team/jrose/bridge_projects/res/res_sip_logger.c Fri Apr 26 17:24:52 2013
@@ -18,6 +18,7 @@
/*** MODULEINFO
<depend>pjproject</depend>
+ <depend>res_sip</depend>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_mwi.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_mwi.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_mwi.c (original)
+++ team/jrose/bridge_projects/res/res_sip_mwi.c Fri Apr 26 17:24:52 2013
@@ -15,6 +15,12 @@
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
*/
+
+/*** MODULEINFO
+ <depend>pjproject</depend>
+ <depend>res_sip</depend>
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/jrose/bridge_projects/res/res_sip_nat.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_nat.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_nat.c (original)
+++ team/jrose/bridge_projects/res/res_sip_nat.c Fri Apr 26 17:24:52 2013
@@ -17,6 +17,8 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
+ <depend>res_sip</depend>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_outbound_authenticator_digest.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_outbound_authenticator_digest.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_outbound_authenticator_digest.c (original)
+++ team/jrose/bridge_projects/res/res_sip_outbound_authenticator_digest.c Fri Apr 26 17:24:52 2013
@@ -15,6 +15,12 @@
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
*/
+
+/*** MODULEINFO
+ <depend>pjproject</depend>
+ <depend>res_sip</depend>
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/jrose/bridge_projects/res/res_sip_outbound_registration.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_outbound_registration.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_outbound_registration.c (original)
+++ team/jrose/bridge_projects/res/res_sip_outbound_registration.c Fri Apr 26 17:24:52 2013
@@ -17,6 +17,8 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
+ <depend>res_sip</depend>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_pubsub.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_pubsub.c (original)
+++ team/jrose/bridge_projects/res/res_sip_pubsub.c Fri Apr 26 17:24:52 2013
@@ -19,6 +19,12 @@
* \brief Opaque structure representing an RFC 3265 SIP subscription
*/
+/*** MODULEINFO
+ <depend>pjproject</depend>
+ <depend>res_sip</depend>
+ <support_level>core</support_level>
+ ***/
+
#include "asterisk.h"
#include <pjsip.h>
Modified: team/jrose/bridge_projects/res/res_sip_registrar.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_registrar.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_registrar.c (original)
+++ team/jrose/bridge_projects/res/res_sip_registrar.c Fri Apr 26 17:24:52 2013
@@ -17,6 +17,8 @@
*/
/*** MODULEINFO
+ <depend>pjproject</depend>
+ <depend>res_sip</depend>
<support_level>core</support_level>
***/
Modified: team/jrose/bridge_projects/res/res_sip_rfc3326.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/res_sip_rfc3326.c?view=diff&rev=386715&r1=386714&r2=386715
==============================================================================
--- team/jrose/bridge_projects/res/res_sip_rfc3326.c (original)
+++ team/jrose/bridge_projects/res/res_sip_rfc3326.c Fri Apr 26 17:24:52 2013
@@ -18,6 +18,8 @@
/*** MODULEINFO
<depend>pjproject</depend>
+ <depend>res_sip</depend>
+ <depend>res_sip_session</depend>
<support_level>core</support_level>
***/
More information about the asterisk-commits
mailing list