equal
deleted
inserted
replaced
53 Lang string `xml:"http://www.w3.org/XML/1998/namespace lang,attr"` |
53 Lang string `xml:"http://www.w3.org/XML/1998/namespace lang,attr"` |
54 Text string `xml:",chardata"` |
54 Text string `xml:",chardata"` |
55 } |
55 } |
56 |
56 |
57 type Features struct { |
57 type Features struct { |
58 Starttls *starttls |
58 Starttls *starttls `xml:"urn:ietf:params:xml:ns:xmpp-tls starttls"` |
59 Mechanisms mechs |
59 Mechanisms mechs `xml:"urn:ietf:params:xml:ns:xmpp-sasl mechanisms"` |
60 Bind *bindIq |
60 Bind *bindIq |
61 Session *Generic |
61 Session *Generic |
62 Any *Generic |
62 Any *Generic |
63 } |
63 } |
64 |
64 |
272 } |
272 } |
273 |
273 |
274 func (er *Error) Error() string { |
274 func (er *Error) Error() string { |
275 buf, err := xml.Marshal(er) |
275 buf, err := xml.Marshal(er) |
276 if err != nil { |
276 if err != nil { |
277 Warnf("double bad error: couldn't marshal error") |
277 Warn.Logf("double bad error: couldn't marshal error") |
278 return "unreadable error" |
278 return "unreadable error" |
279 } |
279 } |
280 return string(buf) |
280 return string(buf) |
281 } |
281 } |
282 |
282 |