[asterisk-commits] dlee: branch dlee/playback r388226 - in /team/dlee/playback: ./ apps/ res/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu May 9 16:44:27 CDT 2013
Author: dlee
Date: Thu May 9 16:44:25 2013
New Revision: 388226
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388226
Log:
Merged revisions 388075-388175 from http://svn.asterisk.org/svn/asterisk/trunk
Modified:
team/dlee/playback/ (props changed)
team/dlee/playback/apps/app_queue.c
team/dlee/playback/apps/app_userevent.c
team/dlee/playback/res/res_rtp_asterisk.c
team/dlee/playback/res/res_stasis_websocket.c
Propchange: team/dlee/playback/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.
Propchange: team/dlee/playback/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 9 16:44:25 2013
@@ -1,1 +1,1 @@
-/trunk:1-388049
+/trunk:1-388223
Modified: team/dlee/playback/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/apps/app_queue.c?view=diff&rev=388226&r1=388225&r2=388226
==============================================================================
--- team/dlee/playback/apps/app_queue.c (original)
+++ team/dlee/playback/apps/app_queue.c Thu May 9 16:44:25 2013
@@ -9906,6 +9906,31 @@
if (reload_handler(0, &mask, NULL))
return AST_MODULE_LOAD_DECLINE;
+ ast_realtime_require_field("queue_members", "paused", RQ_INTEGER1, 1, "uniqueid", RQ_UINTEGER2, 5, SENTINEL);
+
+ /*
+ * This section is used to determine which name for 'ringinuse' to use in realtime members
+ * Necessary for supporting older setups.
+ */
+ member_config = ast_load_realtime_multientry("queue_members", "interface LIKE", "%", "queue_name LIKE", "%", SENTINEL);
+ if (!member_config) {
+ realtime_ringinuse_field = "ringinuse";
+ } else {
+ const char *config_val;
+ if ((config_val = ast_variable_retrieve(member_config, NULL, "ringinuse"))) {
+ ast_log(LOG_NOTICE, "ringinuse field entries found in queue_members table. Using 'ringinuse'\n");
+ realtime_ringinuse_field = "ringinuse";
+ } else if ((config_val = ast_variable_retrieve(member_config, NULL, "ignorebusy"))) {
+ ast_log(LOG_NOTICE, "ignorebusy field found in queue_members table with no ringinuse field. Using 'ignorebusy'\n");
+ realtime_ringinuse_field = "ignorebusy";
+ } else {
+ ast_log(LOG_NOTICE, "No entries were found for ringinuse/ignorebusy in queue_members table. Using 'ringinuse'\n");
+ realtime_ringinuse_field = "ringinuse";
+ }
+ }
+
+ ast_config_destroy(member_config);
+
if (queue_persistent_members)
reload_queue_members();
@@ -9945,31 +9970,6 @@
ast_extension_state_add(NULL, NULL, extension_state_cb, NULL);
- ast_realtime_require_field("queue_members", "paused", RQ_INTEGER1, 1, "uniqueid", RQ_UINTEGER2, 5, SENTINEL);
-
- /*
- * This section is used to determine which name for 'ringinuse' to use in realtime members
- * Necessary for supporting older setups.
- */
- member_config = ast_load_realtime_multientry("queue_members", "interface LIKE", "%", "queue_name LIKE", "%", SENTINEL);
- if (!member_config) {
- realtime_ringinuse_field = "ringinuse";
- } else {
- const char *config_val;
- if ((config_val = ast_variable_retrieve(member_config, NULL, "ringinuse"))) {
- ast_log(LOG_NOTICE, "ringinuse field entries found in queue_members table. Using 'ringinuse'\n");
- realtime_ringinuse_field = "ringinuse";
- } else if ((config_val = ast_variable_retrieve(member_config, NULL, "ignorebusy"))) {
- ast_log(LOG_NOTICE, "ignorebusy field found in queue_members table with no ringinuse field. Using 'ignorebusy'\n");
- realtime_ringinuse_field = "ignorebusy";
- } else {
- ast_log(LOG_NOTICE, "No entries were found for ringinuse/ignorebusy in queue_members table. Using 'ringinuse'\n");
- realtime_ringinuse_field = "ringinuse";
- }
- }
-
- ast_config_destroy(member_config);
-
return res ? AST_MODULE_LOAD_DECLINE : 0;
}
Modified: team/dlee/playback/apps/app_userevent.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/apps/app_userevent.c?view=diff&rev=388226&r1=388225&r2=388226
==============================================================================
--- team/dlee/playback/apps/app_userevent.c (original)
+++ team/dlee/playback/apps/app_userevent.c Thu May 9 16:44:25 2013
@@ -92,7 +92,7 @@
ast_str_append(&body, 0, "%s\r\n", args.extra[x]);
}
- blob = ast_json_pack("{s: s, s: s, s: s}",
+ blob = ast_json_pack("{s: s, s: s}",
"eventname", args.eventname,
"body", ast_str_buffer(body));
if (!blob) {
Modified: team/dlee/playback/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/res/res_rtp_asterisk.c?view=diff&rev=388226&r1=388225&r2=388226
==============================================================================
--- team/dlee/playback/res/res_rtp_asterisk.c (original)
+++ team/dlee/playback/res/res_rtp_asterisk.c Thu May 9 16:44:25 2013
@@ -4184,8 +4184,7 @@
{
unsigned int *rtpheader;
int hdrlen = 12;
- int res;
- int payload;
+ int res, payload = 0;
char data[256];
struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
struct ast_sockaddr remote_address = { {0,} };
@@ -4205,7 +4204,7 @@
/* Get a pointer to the header */
rtpheader = (unsigned int *)data;
- rtpheader[0] = htonl((2 << 30) | (1 << 23) | (payload << 16) | (rtp->seqno++));
+ rtpheader[0] = htonl((2 << 30) | (payload << 16) | (rtp->seqno));
rtpheader[1] = htonl(rtp->lastts);
rtpheader[2] = htonl(rtp->ssrc);
data[12] = level;
@@ -4225,6 +4224,8 @@
ice ? " (via ICE)" : "",
AST_RTP_CN, rtp->seqno, rtp->lastdigitts, res - hdrlen);
}
+
+ rtp->seqno++;
return res;
}
Modified: team/dlee/playback/res/res_stasis_websocket.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/res/res_stasis_websocket.c?view=diff&rev=388226&r1=388225&r2=388226
==============================================================================
--- team/dlee/playback/res/res_stasis_websocket.c (original)
+++ team/dlee/playback/res/res_stasis_websocket.c Thu May 9 16:44:25 2013
@@ -321,9 +321,10 @@
return r;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis HTTP bindings",
- .load = load_module,
- .unload = unload_module,
- .nonoptreq = "res_stasis,res_http_websocket",
- .load_pri = AST_MODPRI_APP_DEPEND,
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER,
+ "Stasis HTTP bindings",
+ .load = load_module,
+ .unload = unload_module,
+ .nonoptreq = "res_stasis,res_http_websocket",
+ .load_pri = AST_MODPRI_APP_DEPEND,
);
More information about the asterisk-commits
mailing list