Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/iq.c @ 26014:bd598b606ca4
Restructure Jingle code to more easily support multiple application types.
Actually negotiate a rawudp transport rather than pretending to use iceudp.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sun, 19 Oct 2008 04:37:23 +0000 |
parents | 517062503b48 |
children | 8bfa1f01f035 |
comparison
equal
deleted
inserted
replaced
26013:5a774d0817d8 | 26014:bd598b606ca4 |
---|---|
26 | 26 |
27 #include "buddy.h" | 27 #include "buddy.h" |
28 #include "disco.h" | 28 #include "disco.h" |
29 #include "google.h" | 29 #include "google.h" |
30 #include "iq.h" | 30 #include "iq.h" |
31 #include "jingle.h" | 31 #include "jingle/jingle.h" |
32 #include "oob.h" | 32 #include "oob.h" |
33 #include "roster.h" | 33 #include "roster.h" |
34 #include "si.h" | 34 #include "si.h" |
35 #include "ping.h" | 35 #include "ping.h" |
36 #include "adhoccommands.h" | 36 #include "adhoccommands.h" |
358 jabber_ping_parse(js, packet); | 358 jabber_ping_parse(js, packet); |
359 return; | 359 return; |
360 } | 360 } |
361 | 361 |
362 #ifdef USE_VV | 362 #ifdef USE_VV |
363 if (xmlnode_get_child_with_namespace(packet, "jingle", "urn:xmpp:tmp:jingle")) { | 363 if (xmlnode_get_child_with_namespace(packet, "jingle", JINGLE)) { |
364 jabber_jingle_session_parse(js, packet); | 364 jingle_parse(js, packet); |
365 return; | 365 return; |
366 } | 366 } |
367 #endif | 367 #endif |
368 | 368 |
369 /* If we get here, send the default error reply mandated by XMPP-CORE */ | 369 /* If we get here, send the default error reply mandated by XMPP-CORE */ |
404 jabber_iq_register_handler("http://jabber.org/protocol/disco#info", jabber_disco_info_parse); | 404 jabber_iq_register_handler("http://jabber.org/protocol/disco#info", jabber_disco_info_parse); |
405 jabber_iq_register_handler("http://jabber.org/protocol/disco#items", jabber_disco_items_parse); | 405 jabber_iq_register_handler("http://jabber.org/protocol/disco#items", jabber_disco_items_parse); |
406 jabber_iq_register_handler("jabber:iq:register", jabber_register_parse); | 406 jabber_iq_register_handler("jabber:iq:register", jabber_register_parse); |
407 jabber_iq_register_handler("urn:xmpp:ping", urn_xmpp_ping_parse); | 407 jabber_iq_register_handler("urn:xmpp:ping", urn_xmpp_ping_parse); |
408 #ifdef USE_VV | 408 #ifdef USE_VV |
409 jabber_iq_register_handler("urn:xmpp:tmp:jingle", jabber_jingle_session_parse); | 409 jabber_iq_register_handler(JINGLE, jingle_parse); |
410 #endif | 410 #endif |
411 } | 411 } |
412 | 412 |
413 void jabber_iq_uninit(void) | 413 void jabber_iq_uninit(void) |
414 { | 414 { |