mirror of
https://github.com/FluuxIO/go-xmpp.git
synced 2026-05-23 20:33:46 -07:00
Recv: handle clientIQ
When sending a successful Client-To-Server Ping, one gets a Pong that looks like this: <iq from='capulet.lit' to='juliet@capulet.lit/balcony' id='c2s1' type='result'/> (http://xmpp.org/extensions/xep-0199.html#c2s)
This commit is contained in:
@@ -173,6 +173,7 @@ func (o Options) NewClient() (*Client, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if strings.LastIndex(o.Host, ":") > 0 {
|
if strings.LastIndex(o.Host, ":") > 0 {
|
||||||
host = host[:strings.LastIndex(o.Host, ":")]
|
host = host[:strings.LastIndex(o.Host, ":")]
|
||||||
}
|
}
|
||||||
@@ -555,6 +556,13 @@ type Presence struct {
|
|||||||
Status string
|
Status string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type IQ struct {
|
||||||
|
ID string
|
||||||
|
From string
|
||||||
|
To string
|
||||||
|
Type string
|
||||||
|
}
|
||||||
|
|
||||||
// Recv waits to receive the next XMPP stanza.
|
// Recv waits to receive the next XMPP stanza.
|
||||||
// Return type is either a presence notification or a chat message.
|
// Return type is either a presence notification or a chat message.
|
||||||
func (c *Client) Recv() (stanza interface{}, err error) {
|
func (c *Client) Recv() (stanza interface{}, err error) {
|
||||||
@@ -585,6 +593,14 @@ func (c *Client) Recv() (stanza interface{}, err error) {
|
|||||||
return Chat{Type: "roster", Roster: r}, nil
|
return Chat{Type: "roster", Roster: r}, nil
|
||||||
case *clientPresence:
|
case *clientPresence:
|
||||||
return Presence{v.From, v.To, v.Type, v.Show, v.Status}, nil
|
return Presence{v.From, v.To, v.Type, v.Show, v.Status}, nil
|
||||||
|
case *clientIQ:
|
||||||
|
result := IQ{
|
||||||
|
ID: v.ID,
|
||||||
|
From: v.From,
|
||||||
|
To: v.To,
|
||||||
|
Type: v.Type,
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -724,10 +740,10 @@ type clientPresence struct {
|
|||||||
|
|
||||||
type clientIQ struct { // info/query
|
type clientIQ struct { // info/query
|
||||||
XMLName xml.Name `xml:"jabber:client iq"`
|
XMLName xml.Name `xml:"jabber:client iq"`
|
||||||
From string `xml:",attr"`
|
From string `xml:"from,attr"`
|
||||||
ID string `xml:",attr"`
|
ID string `xml:"id,attr"`
|
||||||
To string `xml:",attr"`
|
To string `xml:"to,attr"`
|
||||||
Type string `xml:",attr"` // error, get, result, set
|
Type string `xml:"type,attr"` // error, get, result, set
|
||||||
Error clientError
|
Error clientError
|
||||||
Bind bindBind
|
Bind bindBind
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user