aboutsummaryrefslogtreecommitdiff
path: root/xmpp-vala/src/module/iq
diff options
context:
space:
mode:
Diffstat (limited to 'xmpp-vala/src/module/iq')
-rw-r--r--xmpp-vala/src/module/iq/module.vala12
-rw-r--r--xmpp-vala/src/module/iq/stanza.vala9
2 files changed, 12 insertions, 9 deletions
diff --git a/xmpp-vala/src/module/iq/module.vala b/xmpp-vala/src/module/iq/module.vala
index 47f6e764..f73f5459 100644
--- a/xmpp-vala/src/module/iq/module.vala
+++ b/xmpp-vala/src/module/iq/module.vala
@@ -67,7 +67,7 @@ namespace Xmpp.Iq {
}
}
} else {
- Iq.Stanza unavailable_error = new Iq.Stanza.error(iq, new StanzaNode.build("service-unavailable", "urn:ietf:params:xml:ns:xmpp-stanzas").add_self_xmlns());
+ Iq.Stanza unavailable_error = new Iq.Stanza.error(iq, new ErrorStanza.service_unavailable());
send_iq(stream, unavailable_error);
}
}
@@ -83,8 +83,14 @@ namespace Xmpp.Iq {
}
public interface Handler : Object {
- public abstract void on_iq_get(XmppStream stream, Iq.Stanza iq);
- public abstract void on_iq_set(XmppStream stream, Iq.Stanza iq);
+ public virtual void on_iq_get(XmppStream stream, Iq.Stanza iq) {
+ Iq.Stanza bad_request = new Iq.Stanza.error(iq, new ErrorStanza.bad_request("unexpected IQ get for this namespace"));
+ stream.get_module(Module.IDENTITY).send_iq(stream, bad_request);
+ }
+ public virtual void on_iq_set(XmppStream stream, Iq.Stanza iq) {
+ Iq.Stanza bad_request = new Iq.Stanza.error(iq, new ErrorStanza.bad_request("unexpected IQ set for this namespace"));
+ stream.get_module(Module.IDENTITY).send_iq(stream, bad_request);
+ }
}
}
diff --git a/xmpp-vala/src/module/iq/stanza.vala b/xmpp-vala/src/module/iq/stanza.vala
index 3c938883..825d6a5d 100644
--- a/xmpp-vala/src/module/iq/stanza.vala
+++ b/xmpp-vala/src/module/iq/stanza.vala
@@ -30,17 +30,14 @@ public class Stanza : Xmpp.Stanza {
public Stanza.set(StanzaNode stanza_node, string? id = null) {
this(id);
- type_ = TYPE_SET;
+ this.type_ = TYPE_SET;
stanza.put_node(stanza_node);
}
- public Stanza.error(Stanza request, StanzaNode error_stanza, StanzaNode? associated_child = null) {
+ public Stanza.error(Stanza request, ErrorStanza error_stanza) {
this(request.id);
this.type_ = TYPE_ERROR;
- stanza.put_node(error_stanza);
- if (associated_child != null) {
- stanza.put_node(associated_child);
- }
+ stanza.put_node(error_stanza.error_node);
}
public Stanza.from_stanza(StanzaNode stanza_node, Jid? my_jid) {
base.incoming(stanza_node, my_jid);