Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/jingle/jingle.c @ 31534:a8cc50c2279f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove trailing whitespace
author Richard Laager <rlaager@wiktel.com>
date Tue, 04 Jan 2011 06:55:30 +0000
parents ba69a8d1cd9a
children 4b101cad58e7
comparison
equal deleted inserted replaced
31533:44f53d3fc54f 31534:a8cc50c2279f
168 xmlnode *content = xmlnode_get_child(jingle, "content"); 168 xmlnode *content = xmlnode_get_child(jingle, "content");
169 169
170 jabber_iq_send(jingle_session_create_ack(session, jingle)); 170 jabber_iq_send(jingle_session_create_ack(session, jingle));
171 171
172 jingle_session_accept_session(session); 172 jingle_session_accept_session(session);
173 173
174 for (; content; content = xmlnode_get_next_twin(content)) { 174 for (; content; content = xmlnode_get_next_twin(content)) {
175 const gchar *name = xmlnode_get_attrib(content, "name"); 175 const gchar *name = xmlnode_get_attrib(content, "name");
176 const gchar *creator = xmlnode_get_attrib(content, "creator"); 176 const gchar *creator = xmlnode_get_attrib(content, "creator");
177 JingleContent *parsed_content = 177 JingleContent *parsed_content =
178 jingle_session_find_content(session, name, creator); 178 jingle_session_find_content(session, name, creator);
199 xmlnode *content = xmlnode_get_child(jingle, "content"); 199 xmlnode *content = xmlnode_get_child(jingle, "content");
200 200
201 jabber_iq_send(jingle_session_create_ack(session, jingle)); 201 jabber_iq_send(jingle_session_create_ack(session, jingle));
202 202
203 jingle_session_accept_session(session); 203 jingle_session_accept_session(session);
204 204
205 for (; content; content = xmlnode_get_next_twin(content)) { 205 for (; content; content = xmlnode_get_next_twin(content)) {
206 const gchar *name = xmlnode_get_attrib(content, "name"); 206 const gchar *name = xmlnode_get_attrib(content, "name");
207 const gchar *creator = xmlnode_get_attrib(content, "creator"); 207 const gchar *creator = xmlnode_get_attrib(content, "creator");
208 JingleContent *parsed_content = 208 JingleContent *parsed_content =
209 jingle_session_find_content(session, name, creator); 209 jingle_session_find_content(session, name, creator);
261 jingle_handle_transport_accept(JingleSession *session, xmlnode *jingle) 261 jingle_handle_transport_accept(JingleSession *session, xmlnode *jingle)
262 { 262 {
263 xmlnode *content = xmlnode_get_child(jingle, "content"); 263 xmlnode *content = xmlnode_get_child(jingle, "content");
264 264
265 jabber_iq_send(jingle_session_create_ack(session, jingle)); 265 jabber_iq_send(jingle_session_create_ack(session, jingle));
266 266
267 for (; content; content = xmlnode_get_next_twin(content)) { 267 for (; content; content = xmlnode_get_next_twin(content)) {
268 const gchar *name = xmlnode_get_attrib(content, "name"); 268 const gchar *name = xmlnode_get_attrib(content, "name");
269 const gchar *creator = xmlnode_get_attrib(content, "creator"); 269 const gchar *creator = xmlnode_get_attrib(content, "creator");
270 JingleContent *content = jingle_session_find_content(session, name, creator); 270 JingleContent *content = jingle_session_find_content(session, name, creator);
271 jingle_content_accept_transport(content); 271 jingle_content_accept_transport(content);
280 jabber_iq_send(jingle_session_create_ack(session, jingle)); 280 jabber_iq_send(jingle_session_create_ack(session, jingle));
281 281
282 for (; content; content = xmlnode_get_next_twin(content)) { 282 for (; content; content = xmlnode_get_next_twin(content)) {
283 const gchar *name = xmlnode_get_attrib(content, "name"); 283 const gchar *name = xmlnode_get_attrib(content, "name");
284 const gchar *creator = xmlnode_get_attrib(content, "creator"); 284 const gchar *creator = xmlnode_get_attrib(content, "creator");
285 JingleContent *parsed_content = 285 JingleContent *parsed_content =
286 jingle_session_find_content(session, name, creator); 286 jingle_session_find_content(session, name, creator);
287 if (parsed_content == NULL) { 287 if (parsed_content == NULL) {
288 purple_debug_error("jingle", "Error parsing content\n"); 288 purple_debug_error("jingle", "Error parsing content\n");
289 jabber_iq_send(jingle_session_terminate_packet(session, 289 jabber_iq_send(jingle_session_terminate_packet(session,
290 "unsupported-applications")); 290 "unsupported-applications"));
299 jingle_handle_transport_reject(JingleSession *session, xmlnode *jingle) 299 jingle_handle_transport_reject(JingleSession *session, xmlnode *jingle)
300 { 300 {
301 xmlnode *content = xmlnode_get_child(jingle, "content"); 301 xmlnode *content = xmlnode_get_child(jingle, "content");
302 302
303 jabber_iq_send(jingle_session_create_ack(session, jingle)); 303 jabber_iq_send(jingle_session_create_ack(session, jingle));
304 304
305 for (; content; content = xmlnode_get_next_twin(content)) { 305 for (; content; content = xmlnode_get_next_twin(content)) {
306 const gchar *name = xmlnode_get_attrib(content, "name"); 306 const gchar *name = xmlnode_get_attrib(content, "name");
307 const gchar *creator = xmlnode_get_attrib(content, "creator"); 307 const gchar *creator = xmlnode_get_attrib(content, "creator");
308 JingleContent *content = jingle_session_find_content(session, name, creator); 308 JingleContent *content = jingle_session_find_content(session, name, creator);
309 jingle_content_remove_pending_transport(content); 309 jingle_content_remove_pending_transport(content);
445 jingle_create_relay_info(const gchar *ip, guint port, const gchar *username, 445 jingle_create_relay_info(const gchar *ip, guint port, const gchar *username,
446 const gchar *password, const gchar *relay_type, GValueArray *relay_info) 446 const gchar *password, const gchar *relay_type, GValueArray *relay_info)
447 { 447 {
448 GValue value; 448 GValue value;
449 GstStructure *turn_setup = gst_structure_new("relay-info", 449 GstStructure *turn_setup = gst_structure_new("relay-info",
450 "ip", G_TYPE_STRING, ip, 450 "ip", G_TYPE_STRING, ip,
451 "port", G_TYPE_UINT, port, 451 "port", G_TYPE_UINT, port,
452 "username", G_TYPE_STRING, username, 452 "username", G_TYPE_STRING, username,
453 "password", G_TYPE_STRING, password, 453 "password", G_TYPE_STRING, password,
454 "relay-type", G_TYPE_STRING, relay_type, 454 "relay-type", G_TYPE_STRING, relay_type,
455 NULL); 455 NULL);
456 purple_debug_info("jabber", "created gst_structure %" GST_PTR_FORMAT "\n", 456 purple_debug_info("jabber", "created gst_structure %" GST_PTR_FORMAT "\n",
457 turn_setup); 457 turn_setup);
458 if (turn_setup) { 458 if (turn_setup) {
459 memset(&value, 0, sizeof(GValue)); 459 memset(&value, 0, sizeof(GValue));
460 g_value_init(&value, GST_TYPE_STRUCTURE); 460 g_value_init(&value, GST_TYPE_STRUCTURE);
461 gst_value_set_structure(&value, turn_setup); 461 gst_value_set_structure(&value, turn_setup);
475 gboolean has_account_stun = js->stun_ip && !purple_network_get_stun_ip(); 475 gboolean has_account_stun = js->stun_ip && !purple_network_get_stun_ip();
476 guint num_params = has_account_stun ? 476 guint num_params = has_account_stun ?
477 (relay_ip ? 3 : 2) : (relay_ip ? 1 : 0); 477 (relay_ip ? 3 : 2) : (relay_ip ? 1 : 0);
478 GParameter *params = NULL; 478 GParameter *params = NULL;
479 int next_index = 0; 479 int next_index = 0;
480 480
481 if (num_params > 0) { 481 if (num_params > 0) {
482 params = g_new0(GParameter, num_params); 482 params = g_new0(GParameter, num_params);
483 483
484 if (has_account_stun) { 484 if (has_account_stun) {
485 purple_debug_info("jabber", 485 purple_debug_info("jabber",
486 "setting param stun-ip for stream using Google auto-config: %s\n", 486 "setting param stun-ip for stream using Google auto-config: %s\n",
487 js->stun_ip); 487 js->stun_ip);
488 params[next_index].name = "stun-ip"; 488 params[next_index].name = "stun-ip";
489 g_value_init(&params[next_index].value, G_TYPE_STRING); 489 g_value_init(&params[next_index].value, G_TYPE_STRING);
490 g_value_set_string(&params[next_index].value, js->stun_ip); 490 g_value_set_string(&params[next_index].value, js->stun_ip);
491 purple_debug_info("jabber", 491 purple_debug_info("jabber",
492 "setting param stun-port for stream using Google auto-config: %d\n", 492 "setting param stun-port for stream using Google auto-config: %d\n",
493 js->stun_port); 493 js->stun_port);
494 next_index++; 494 next_index++;
495 params[next_index].name = "stun-port"; 495 params[next_index].name = "stun-port";
496 g_value_init(&params[next_index].value, G_TYPE_UINT); 496 g_value_init(&params[next_index].value, G_TYPE_UINT);
497 g_value_set_uint(&params[next_index].value, js->stun_port); 497 g_value_set_uint(&params[next_index].value, js->stun_port);
498 next_index++; 498 next_index++;
499 } 499 }
500 500
501 if (relay_ip) { 501 if (relay_ip) {
502 GValueArray *relay_info = g_value_array_new(0); 502 GValueArray *relay_info = g_value_array_new(0);
503 503
504 if (relay_udp) { 504 if (relay_udp) {
505 relay_info = 505 relay_info =
506 jingle_create_relay_info(relay_ip, relay_udp, relay_username, 506 jingle_create_relay_info(relay_ip, relay_udp, relay_username,
507 relay_password, "udp", relay_info); 507 relay_password, "udp", relay_info);
508 } 508 }
509 if (relay_tcp) { 509 if (relay_tcp) {
510 relay_info = 510 relay_info =
511 jingle_create_relay_info(relay_ip, relay_tcp, relay_username, 511 jingle_create_relay_info(relay_ip, relay_tcp, relay_username,
512 relay_password, "tcp", relay_info); 512 relay_password, "tcp", relay_info);
513 } 513 }
514 if (relay_ssltcp) { 514 if (relay_ssltcp) {
515 relay_info = 515 relay_info =
516 jingle_create_relay_info(relay_ip, relay_ssltcp, relay_username, 516 jingle_create_relay_info(relay_ip, relay_ssltcp, relay_username,
517 relay_password, "tls", relay_info); 517 relay_password, "tls", relay_info);
518 } 518 }
519 params[next_index].name = "relay-info"; 519 params[next_index].name = "relay-info";
520 g_value_init(&params[next_index].value, G_TYPE_VALUE_ARRAY); 520 g_value_init(&params[next_index].value, G_TYPE_VALUE_ARRAY);