aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiaxh <git@mx.ax.lt>2017-06-21 11:55:43 +0200
committerfiaxh <git@mx.ax.lt>2017-06-21 11:55:43 +0200
commit97e1c795addc2413352c008c54b3f99b3185211e (patch)
tree18fdfad4bf5694c80be4db10272c9db9e35483bb
parent3f0089db86e2057293a33453361678989919147f (diff)
downloaddino-97e1c795addc2413352c008c54b3f99b3185211e.tar.gz
dino-97e1c795addc2413352c008c54b3f99b3185211e.zip
Make session negotiation optional
-rw-r--r--xmpp-vala/src/module/session.vala10
1 files changed, 5 insertions, 5 deletions
diff --git a/xmpp-vala/src/module/session.vala b/xmpp-vala/src/module/session.vala
index f37e585f..82d8cfc2 100644
--- a/xmpp-vala/src/module/session.vala
+++ b/xmpp-vala/src/module/session.vala
@@ -1,5 +1,6 @@
using Xmpp.Core;
+/* Legacy. RFC 3921 3*/
namespace Xmpp.Session {
private const string NS_URI = "urn:ietf:params:xml:ns:xmpp-session";
@@ -19,10 +20,7 @@ public class Module : XmppStreamNegotiationModule {
if (stream.get_module(IDENTITY) == null) stream.add_module(new Module());
}
- /* the client MUST establish a session if it desires to engage in instant messaging and presence functionality (RFC 3921 3) */
- public override bool mandatory_outstanding(XmppStream stream) {
- return !stream.has_flag(Flag.IDENTITY) || !stream.get_flag(Flag.IDENTITY).finished;
- }
+ public override bool mandatory_outstanding(XmppStream stream) { return false; }
public override bool negotiation_active(XmppStream stream) {
return stream.has_flag(Flag.IDENTITY) && !stream.get_flag(Flag.IDENTITY).finished;
@@ -32,7 +30,8 @@ public class Module : XmppStreamNegotiationModule {
public override string get_id() { return IDENTITY.id; }
private void on_bound_resource(XmppStream stream, string my_jid) {
- if (stream.features.get_subnode("session", NS_URI) != null) {
+ StanzaNode? session_node = stream.features.get_subnode("session", NS_URI);
+ if (session_node != null && session_node.get_subnode("optional", NS_URI) == null) {
stream.add_flag(new Flag());
Iq.Stanza iq = new Iq.Stanza.set(new StanzaNode.build("session", NS_URI).add_self_xmlns()) { to=stream.remote_name };
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq, (stream, iq) => {
@@ -51,4 +50,5 @@ public class Flag : XmppStreamFlag {
public override string get_ns() { return NS_URI; }
public override string get_id() { return IDENTITY.id; }
}
+
}