|
|
@ -2,6 +2,7 @@ package xmpp
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
"encoding/xml"
|
|
|
|
"encoding/xml"
|
|
|
|
|
|
|
|
"fmt"
|
|
|
|
"strconv"
|
|
|
|
"strconv"
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
@ -195,7 +196,6 @@ func (iq *IQ) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// decode inner elements
|
|
|
|
// decode inner elements
|
|
|
|
level := 0
|
|
|
|
|
|
|
|
for {
|
|
|
|
for {
|
|
|
|
t, err := d.Token()
|
|
|
|
t, err := d.Token()
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
@ -203,25 +203,28 @@ func (iq *IQ) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
switch tt := t.(type) {
|
|
|
|
switch tt := t.(type) {
|
|
|
|
|
|
|
|
|
|
|
|
case xml.StartElement:
|
|
|
|
case xml.StartElement:
|
|
|
|
level++
|
|
|
|
if tt.Name.Local == "error" {
|
|
|
|
if level <= 1 {
|
|
|
|
var xmppError Err
|
|
|
|
if iqExt := TypeRegistry.GetIQExtension(tt.Name); iqExt != nil {
|
|
|
|
err = d.DecodeElement(&xmppError, &tt)
|
|
|
|
// Decode payload extension
|
|
|
|
if err != nil {
|
|
|
|
err = d.DecodeElement(iqExt, &tt)
|
|
|
|
fmt.Println(err)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
iq.Payload = iqExt
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
// TODO: Fix me. We do nothing of that element here.
|
|
|
|
|
|
|
|
// elt = new(Node)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
iq.Error = xmppError
|
|
|
|
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if iqExt := TypeRegistry.GetIQExtension(tt.Name); iqExt != nil {
|
|
|
|
|
|
|
|
// Decode payload extension
|
|
|
|
|
|
|
|
err = d.DecodeElement(iqExt, &tt)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
iq.Payload = iqExt
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return fmt.Errorf("unexpected element in iq: %s %s", tt.Name.Space, tt.Name.Local)
|
|
|
|
case xml.EndElement:
|
|
|
|
case xml.EndElement:
|
|
|
|
level--
|
|
|
|
|
|
|
|
if tt == start.End() {
|
|
|
|
if tt == start.End() {
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|