[asterisk-commits] kmoore: branch kmoore/microfilm r397417 - in /team/kmoore/microfilm: main/ te...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Aug 22 08:06:01 CDT 2013
Author: kmoore
Date: Thu Aug 22 08:05:59 2013
New Revision: 397417
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397417
Log:
Fix naming of macros
Modified:
team/kmoore/microfilm/main/cel.c
team/kmoore/microfilm/tests/test_cel.c
Modified: team/kmoore/microfilm/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/microfilm/main/cel.c?view=diff&rev=397417&r1=397416&r2=397417
==============================================================================
--- team/kmoore/microfilm/main/cel.c (original)
+++ team/kmoore/microfilm/main/cel.c Thu Aug 22 08:05:59 2013
@@ -1038,20 +1038,6 @@
for (i = 0; i < ARRAY_LEN(cel_channel_monitors); ++i) {
cel_channel_monitors[i](old_snapshot, new_snapshot);
}
- } else if (ast_bridge_snapshot_type() == update->type) {
- struct ast_bridge_snapshot *old_snapshot;
- struct ast_bridge_snapshot *new_snapshot;
-
- old_snapshot = stasis_message_data(update->old_snapshot);
- new_snapshot = stasis_message_data(update->new_snapshot);
-
- if (!old_snapshot) {
- return;
- }
-
- if (!new_snapshot) {
- return;
- }
}
}
Modified: team/kmoore/microfilm/tests/test_cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/microfilm/tests/test_cel.c?view=diff&rev=397417&r1=397416&r2=397417
==============================================================================
--- team/kmoore/microfilm/tests/test_cel.c (original)
+++ team/kmoore/microfilm/tests/test_cel.c Thu Aug 22 08:05:59 2013
@@ -108,34 +108,34 @@
} \
} while (0)
-#define CONF_EXIT(channel, bridge) do { \
+#define BRIDGE_EXIT(channel, bridge) do { \
ast_test_validate(test, 0 == ast_bridge_depart(channel)); \
- CONF_EXIT_EVENT(channel, bridge); \
+ BRIDGE_EXIT_EVENT(channel, bridge); \
mid_test_sync(); \
} while (0)
-#define CONF_EXIT_EVENT(channel, bridge) do { \
+#define BRIDGE_EXIT_EVENT(channel, bridge) do { \
RAII_VAR(struct ast_json *, extra, NULL, ast_json_unref); \
extra = ast_json_pack("{s: s}", "bridge_id", bridge->uniqueid); \
ast_test_validate(test, extra != NULL); \
APPEND_EVENT(channel, AST_CEL_BRIDGE_EXIT, NULL, extra); \
} while (0)
-#define CONF_EXIT_SNAPSHOT(channel, bridge) do { \
+#define BRIDGE_EXIT_SNAPSHOT(channel, bridge) do { \
RAII_VAR(struct ast_json *, extra, NULL, ast_json_unref); \
extra = ast_json_pack("{s: s}", "bridge_id", bridge->uniqueid); \
ast_test_validate(test, extra != NULL); \
APPEND_EVENT_SNAPSHOT(channel, AST_CEL_BRIDGE_EXIT, NULL, extra); \
} while (0)
-#define CONF_ENTER(channel, bridge) do { \
+#define BRIDGE_ENTER(channel, bridge) do { \
ast_test_validate(test, 0 == ast_bridge_impart(bridge, channel, NULL, NULL, 0)); \
do_sleep(); \
- CONF_ENTER_EVENT(channel, bridge); \
+ BRIDGE_ENTER_EVENT(channel, bridge); \
mid_test_sync(); \
} while (0)
-#define CONF_ENTER_EVENT(channel, bridge) do { \
+#define BRIDGE_ENTER_EVENT(channel, bridge) do { \
RAII_VAR(struct ast_json *, extra, NULL, ast_json_unref); \
extra = ast_json_pack("{s: s}", "bridge_id", bridge->uniqueid); \
ast_test_validate(test, extra != NULL); \
@@ -406,11 +406,11 @@
EMULATE_APP_DATA(chan, 2, "Bridge", "");
do_sleep();
- CONF_ENTER(chan, bridge);
-
- do_sleep();
-
- CONF_EXIT(chan, bridge);
+ BRIDGE_ENTER(chan, bridge);
+
+ do_sleep();
+
+ BRIDGE_EXIT(chan, bridge);
HANGUP_CHANNEL(chan, AST_CAUSE_NORMAL, "");
@@ -444,11 +444,11 @@
EMULATE_APP_DATA(chan, 2, "Bridge", "");
do_sleep();
- CONF_ENTER(chan, bridge);
-
- do_sleep();
-
- CONF_EXIT(chan, bridge);
+ BRIDGE_ENTER(chan, bridge);
+
+ do_sleep();
+
+ BRIDGE_EXIT(chan, bridge);
EMULATE_APP_DATA(chan, 3, "Wait", "");
@@ -489,16 +489,16 @@
ANSWER_CHANNEL(chan_alice);
EMULATE_APP_DATA(chan_alice, 2, "Bridge", "");
- CONF_ENTER(chan_alice, bridge);
+ BRIDGE_ENTER(chan_alice, bridge);
do_sleep();
ANSWER_CHANNEL(chan_bob);
EMULATE_APP_DATA(chan_bob, 2, "Bridge", "");
- CONF_ENTER(chan_bob, bridge);
-
- CONF_EXIT(chan_alice, bridge);
- CONF_EXIT(chan_bob, bridge);
+ BRIDGE_ENTER(chan_bob, bridge);
+
+ BRIDGE_EXIT(chan_alice, bridge);
+ BRIDGE_EXIT(chan_bob, bridge);
HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, "");
HANGUP_CHANNEL(chan_bob, AST_CAUSE_NORMAL, "");
@@ -541,12 +541,12 @@
EMULATE_APP_DATA(chan_bob, 2, "Bridge", "");
do_sleep();
- CONF_ENTER(chan_bob, bridge);
-
- CONF_ENTER(chan_alice, bridge);
-
- CONF_EXIT(chan_alice, bridge);
- CONF_EXIT(chan_bob, bridge);
+ BRIDGE_ENTER(chan_bob, bridge);
+
+ BRIDGE_ENTER(chan_alice, bridge);
+
+ BRIDGE_EXIT(chan_alice, bridge);
+ BRIDGE_EXIT(chan_bob, bridge);
HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, "");
HANGUP_CHANNEL(chan_bob, AST_CAUSE_NORMAL, "");
@@ -593,22 +593,22 @@
do_sleep();
- CONF_ENTER(chan_alice, bridge);
+ BRIDGE_ENTER(chan_alice, bridge);
ANSWER_CHANNEL(chan_bob);
EMULATE_APP_DATA(chan_bob, 2, "Bridge", "");
do_sleep();
- CONF_ENTER(chan_bob, bridge);
+ BRIDGE_ENTER(chan_bob, bridge);
ANSWER_CHANNEL(chan_charlie);
EMULATE_APP_DATA(chan_charlie, 2, "Bridge", "");
do_sleep();
- CONF_ENTER(chan_charlie, bridge);
-
- CONF_EXIT(chan_alice, bridge);
- CONF_EXIT(chan_bob, bridge);
- CONF_EXIT(chan_charlie, bridge);
+ BRIDGE_ENTER(chan_charlie, bridge);
+
+ BRIDGE_EXIT(chan_alice, bridge);
+ BRIDGE_EXIT(chan_bob, bridge);
+ BRIDGE_EXIT(chan_charlie, bridge);
HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, "");
HANGUP_CHANNEL(chan_bob, AST_CAUSE_NORMAL, "");
@@ -942,11 +942,11 @@
do_sleep();
- CONF_ENTER(chan_caller, bridge);
- CONF_ENTER(chan_callee, bridge);
-
- CONF_EXIT(chan_caller, bridge);
- CONF_EXIT(chan_callee, bridge);
+ BRIDGE_ENTER(chan_caller, bridge);
+ BRIDGE_ENTER(chan_callee, bridge);
+
+ BRIDGE_EXIT(chan_caller, bridge);
+ BRIDGE_EXIT(chan_callee, bridge);
HANGUP_CHANNEL(chan_caller, AST_CAUSE_NORMAL, "ANSWER");
HANGUP_CHANNEL(chan_callee, AST_CAUSE_NORMAL, "");
@@ -988,11 +988,11 @@
ANSWER_NO_APP(chan_callee);
do_sleep();
- CONF_ENTER(chan_callee, bridge);
- CONF_ENTER(chan_caller, bridge);
-
- CONF_EXIT(chan_caller, bridge);
- CONF_EXIT(chan_callee, bridge);
+ BRIDGE_ENTER(chan_callee, bridge);
+ BRIDGE_ENTER(chan_caller, bridge);
+
+ BRIDGE_EXIT(chan_caller, bridge);
+ BRIDGE_EXIT(chan_callee, bridge);
HANGUP_CHANNEL(chan_caller, AST_CAUSE_NORMAL, "ANSWER");
HANGUP_CHANNEL(chan_callee, AST_CAUSE_NORMAL, "");
@@ -1058,15 +1058,15 @@
do_sleep();
do_sleep();
- CONF_ENTER(chan_charlie, bridge);
- CONF_ENTER(chan_david, bridge);
- CONF_ENTER(chan_bob, bridge);
- CONF_ENTER(chan_alice, bridge);
-
- CONF_EXIT(chan_alice, bridge);
- CONF_EXIT(chan_bob, bridge);
- CONF_EXIT(chan_charlie, bridge);
- CONF_EXIT(chan_david, bridge);
+ BRIDGE_ENTER(chan_charlie, bridge);
+ BRIDGE_ENTER(chan_david, bridge);
+ BRIDGE_ENTER(chan_bob, bridge);
+ BRIDGE_ENTER(chan_alice, bridge);
+
+ BRIDGE_EXIT(chan_alice, bridge);
+ BRIDGE_EXIT(chan_bob, bridge);
+ BRIDGE_EXIT(chan_charlie, bridge);
+ BRIDGE_EXIT(chan_david, bridge);
HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, "ANSWER");
HANGUP_CHANNEL(chan_bob, AST_CAUSE_NORMAL, "");
@@ -1107,8 +1107,8 @@
ANSWER_NO_APP(chan_alice);
ANSWER_NO_APP(chan_bob);
- CONF_ENTER(chan_bob, bridge);
- CONF_ENTER(chan_alice, bridge);
+ BRIDGE_ENTER(chan_bob, bridge);
+ BRIDGE_ENTER(chan_alice, bridge);
pair.bridge = bridge;
pair.channel = chan_alice;
@@ -1116,8 +1116,8 @@
&pair, "transfer_context", "transfer_extension");
BLINDTRANSFER_EVENT(chan_alice, bridge, "transfer_extension", "transfer_context");
- CONF_EXIT(chan_alice, bridge);
- CONF_EXIT(chan_bob, bridge);
+ BRIDGE_EXIT(chan_alice, bridge);
+ BRIDGE_EXIT(chan_bob, bridge);
HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, "");
do_sleep();
@@ -1161,8 +1161,8 @@
ANSWER_NO_APP(chan_alice);
ANSWER_NO_APP(chan_bob);
- CONF_ENTER(chan_bob, bridge1);
- CONF_ENTER(chan_alice, bridge1);
+ BRIDGE_ENTER(chan_bob, bridge1);
+ BRIDGE_ENTER(chan_alice, bridge1);
/* Create second set of bridged parties */
bridge2 = ast_bridge_basic_new();
@@ -1173,24 +1173,24 @@
ANSWER_NO_APP(chan_david);
ANSWER_NO_APP(chan_charlie);
- CONF_ENTER(chan_charlie, bridge2);
-
- CONF_ENTER(chan_david, bridge2);
- CONF_EXIT_EVENT(chan_bob, bridge1);
+ BRIDGE_ENTER(chan_charlie, bridge2);
+
+ BRIDGE_ENTER(chan_david, bridge2);
+ BRIDGE_EXIT_EVENT(chan_bob, bridge1);
do_sleep();
/* Perform attended transfer */
ast_bridge_transfer_attended(chan_alice, chan_david);
do_sleep();
- CONF_ENTER_EVENT(chan_bob, bridge2);
-
- CONF_EXIT_EVENT(chan_david, bridge2);
+ BRIDGE_ENTER_EVENT(chan_bob, bridge2);
+
+ BRIDGE_EXIT_EVENT(chan_david, bridge2);
ATTENDEDTRANSFER_BRIDGE(chan_alice, bridge1, chan_david, bridge2);
- CONF_EXIT_EVENT(chan_alice, bridge1);
-
- do_sleep();
- CONF_EXIT(chan_bob, bridge2);
- CONF_EXIT(chan_charlie, bridge2);
+ BRIDGE_EXIT_EVENT(chan_alice, bridge1);
+
+ do_sleep();
+ BRIDGE_EXIT(chan_bob, bridge2);
+ BRIDGE_EXIT(chan_charlie, bridge2);
HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, "");
do_sleep();
@@ -1240,8 +1240,8 @@
ANSWER_NO_APP(chan_alice);
ANSWER_NO_APP(chan_bob);
- CONF_ENTER(chan_bob, bridge1);
- CONF_ENTER(chan_alice, bridge1);
+ BRIDGE_ENTER(chan_bob, bridge1);
+ BRIDGE_ENTER(chan_alice, bridge1);
/* Create second set of bridged parties */
bridge2 = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE | AST_BRIDGE_CAPABILITY_MULTIMIX,
@@ -1253,23 +1253,23 @@
ANSWER_NO_APP(chan_david);
ANSWER_NO_APP(chan_charlie);
- CONF_ENTER(chan_charlie, bridge2);
-
- CONF_ENTER(chan_david, bridge2);
+ BRIDGE_ENTER(chan_charlie, bridge2);
+
+ BRIDGE_ENTER(chan_david, bridge2);
/* Perform attended transfer */
ast_bridge_transfer_attended(chan_alice, chan_david);
do_sleep();
- CONF_EXIT_EVENT(chan_charlie, bridge2);
- CONF_ENTER_EVENT(chan_charlie, bridge1);
- CONF_EXIT_EVENT(chan_david, bridge2);
- CONF_EXIT_EVENT(chan_alice, bridge1);
+ BRIDGE_EXIT_EVENT(chan_charlie, bridge2);
+ BRIDGE_ENTER_EVENT(chan_charlie, bridge1);
+ BRIDGE_EXIT_EVENT(chan_david, bridge2);
+ BRIDGE_EXIT_EVENT(chan_alice, bridge1);
ATTENDEDTRANSFER_BRIDGE(chan_alice, bridge1, chan_david, bridge2);
do_sleep();
- CONF_EXIT(chan_bob, bridge1);
- CONF_EXIT(chan_charlie, bridge1);
+ BRIDGE_EXIT(chan_bob, bridge1);
+ BRIDGE_EXIT(chan_charlie, bridge1);
HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, "");
do_sleep();
@@ -1321,8 +1321,8 @@
ANSWER_NO_APP(chan_alice);
ANSWER_NO_APP(chan_bob);
- CONF_ENTER(chan_bob, bridge1);
- CONF_ENTER(chan_alice, bridge1);
+ BRIDGE_ENTER(chan_bob, bridge1);
+ BRIDGE_ENTER(chan_alice, bridge1);
/* Create second set of bridged parties */
bridge2 = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_1TO1MIX | AST_BRIDGE_CAPABILITY_NATIVE | AST_BRIDGE_CAPABILITY_MULTIMIX,
@@ -1336,8 +1336,8 @@
ANSWER_NO_APP(chan_david);
ANSWER_NO_APP(chan_charlie);
- CONF_ENTER(chan_charlie, bridge2);
- CONF_ENTER(chan_david, bridge2);
+ BRIDGE_ENTER(chan_charlie, bridge2);
+ BRIDGE_ENTER(chan_david, bridge2);
/* Perform attended transfer */
@@ -1358,13 +1358,13 @@
APPEND_DUMMY_EVENT();
APPEND_DUMMY_EVENT();
- /* CONF_EXIT alice and david */
+ /* BRIDGE_EXIT alice and david */
APPEND_DUMMY_EVENT();
APPEND_DUMMY_EVENT();
do_sleep();
- CONF_EXIT(chan_bob, bridge1);
- CONF_EXIT(chan_charlie, bridge2);
+ BRIDGE_EXIT(chan_bob, bridge1);
+ BRIDGE_EXIT(chan_charlie, bridge2);
HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, "");
do_sleep();
More information about the asterisk-commits
mailing list