[asterisk-commits] file: branch file/chan_jingle2 r366350 - /team/file/chan_jingle2/channels/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun May 13 12:12:17 CDT 2012
Author: file
Date: Sun May 13 12:12:11 2012
New Revision: 366350
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=366350
Log:
Whitespace cleanup.
Modified:
team/file/chan_jingle2/channels/chan_jingle2.c
Modified: team/file/chan_jingle2/channels/chan_jingle2.c
URL: http://svnview.digium.com/svn/asterisk/team/file/chan_jingle2/channels/chan_jingle2.c?view=diff&rev=366350&r1=366349&r2=366350
==============================================================================
--- team/file/chan_jingle2/channels/chan_jingle2.c (original)
+++ team/file/chan_jingle2/channels/chan_jingle2.c Sun May 13 12:12:11 2012
@@ -23,7 +23,7 @@
* \brief Jingle Channel Driver
*
* \extref Iksemel http://iksemel.jabberstudio.org/
- *
+ *
* \ingroup channel_drivers
*/
@@ -409,7 +409,7 @@
if (!(session->vrtp = ast_rtp_instance_new("asterisk", sched, &tmp, NULL))) {
return;
}
-
+
ast_rtp_instance_set_prop(session->vrtp, AST_RTP_PROPERTY_RTCP, 1);
ast_channel_set_fd(session->owner, 2, ast_rtp_instance_fd(session->vrtp, 0));
@@ -504,7 +504,7 @@
session->owner = chan;
ast_format_cap_copy(ast_channel_nativeformats(chan), session->cap);
- ast_codec_choose(&session->prefs, session->cap, 1, &tmpfmt);
+ ast_codec_choose(&session->prefs, session->cap, 1, &tmpfmt);
if (session->rtp) {
struct ast_rtp_engine_ice *ice;
@@ -1136,7 +1136,7 @@
ao2_unlock(session);
- jingle_send_transport_info(session, iks_find_attrib(pak->x, "from"));
+ jingle_send_transport_info(session, iks_find_attrib(pak->x, "from"));
return IKS_FILTER_EAT;
}
@@ -1162,7 +1162,7 @@
IKS_RULE_ID, session->connection->mid, IKS_RULE_DONE);
jingle_send_session_initiate(session);
-
+
session->gone = 0;
} else {
jingle_queue_hangup_with_cause(session, AST_CAUSE_PROTOCOL_ERROR);
@@ -1193,12 +1193,12 @@
/* Re-send the message to the *original* target and not a redirected one */
ast_copy_string(session->remote, session->remote_original, sizeof(session->remote));
- session->rule = iks_filter_add_rule(session->connection->f, jingle_outgoing_hook, session,
- IKS_RULE_ID, session->connection->mid, IKS_RULE_DONE);
-
- jingle_send_session_initiate(session);
-
- session->gone = 0;
+ session->rule = iks_filter_add_rule(session->connection->f, jingle_outgoing_hook, session,
+ IKS_RULE_ID, session->connection->mid, IKS_RULE_DONE);
+
+ jingle_send_session_initiate(session);
+
+ session->gone = 0;
} else {
/* Otherwise we have exhausted all transports */
jingle_queue_hangup_with_cause(session, AST_CAUSE_FACILITY_NOT_IMPLEMENTED);
@@ -1317,7 +1317,7 @@
frame->frametype);
return 0;
}
-
+
return res;
}
@@ -1609,7 +1609,7 @@
iks *content;
unsigned int changed = 0;
- /* Look at the content in the session initiation */
+ /* Look at the content in the session initiation */
for (content = iks_child(iks_child(pak->x)); content; content = iks_next(content)) {
char *name = iks_find_attrib(content, "name");
struct ast_rtp_instance *rtp = NULL;
@@ -2005,7 +2005,7 @@
jingle_get_owner_lock(session);
- if (session->owner) {
+ if (session->owner) {
if (iks_find_with_attrib(pak->query, "ringing", "xmlns", JINGLE_RTP_INFO_NS)) {
ast_queue_control(session->owner, AST_CONTROL_RINGING);
if (ast_channel_state(session->owner) != AST_STATE_UP) {
@@ -2017,7 +2017,7 @@
ast_queue_control(session->owner, AST_CONTROL_UNHOLD);
}
ast_channel_unlock(session->owner);
- }
+ }
ao2_unlock(session);
@@ -2087,7 +2087,7 @@
/* If a Google-V1 session identifier is present use it */
ast_copy_string(tmp.sid, iks_find_attrib(pak->query, "id"), sizeof(tmp.sid));
}
-
+
/* If a session identifier was present in the message attempt to find the session, it is up to the action handler whether
* this is required or not */
if (!ast_strlen_zero(tmp.sid)) {
More information about the asterisk-commits
mailing list