From ccac8addc99261df94ef0e572e3bc31902f60dea Mon Sep 17 00:00:00 2001
From: Vladimir <VladVladow@yandex.ru>
Date: Thu, 8 Sep 2016 20:56:40 +0500
Subject: [PATCH 1/2] Auto reply on server ping-request

---
 xmpp.go      | 36 ++++++++++++++++++++++++++++++++++++
 xmpp_ping.go |  6 ++++++
 2 files changed, 42 insertions(+)

diff --git a/xmpp.go b/xmpp.go
index a792e5a..f773bf4 100644
--- a/xmpp.go
+++ b/xmpp.go
@@ -40,6 +40,7 @@ const (
 	nsBind    = "urn:ietf:params:xml:ns:xmpp-bind"
 	nsClient  = "jabber:client"
 	nsSession = "urn:ietf:params:xml:ns:xmpp-session"
+	nsPing    = "urn:xmpp:ping"
 )
 
 // Default TLS configuration options
@@ -600,6 +601,17 @@ func (c *Client) Recv() (stanza interface{}, err error) {
 		case *clientPresence:
 			return Presence{v.From, v.To, v.Type, v.Show, v.Status}, nil
 		case *clientIQ:
+			//fmt.Printf("$+v", val)
+			_, vali, err := UnmarshalIqQuery(v.Query)
+			if err == nil {
+				switch vali.(type) {
+				case *serverPingRequest:
+					err := c.SendResultPing(v.ID, v.From)
+					if err != nil {
+						return Chat{}, err
+					}
+				}
+			}
 			return IQ{ID: v.ID, From: v.From, To: v.To, Type: v.Type, Query: v.Query}, nil
 		}
 	}
@@ -773,6 +785,10 @@ type rosterItem struct {
 	Group        []string
 }
 
+type serverPingRequest struct {
+	XMLName xml.Name `xml:"urn:xmpp:ping ping"`
+}
+
 // Scan XML token stream to find next StartElement.
 func nextStart(p *xml.Decoder) (xml.StartElement, error) {
 	for {
@@ -879,3 +895,23 @@ func (t tee) Read(p []byte) (n int, err error) {
 	}
 	return
 }
+
+func UnmarshalIqQuery(Query []byte) (xml.Name, interface{}, error) {
+	dec := xml.NewDecoder(bytes.NewBuffer(Query))
+
+	se, err := nextStart(dec)
+	if err != nil {
+		return xml.Name{}, nil, err
+	}
+
+	var nv interface{}
+	switch se.Name.Space + " " + se.Name.Local {
+	case nsPing + " ping":
+		nv = &serverPingRequest{}
+	}
+
+	if err = dec.DecodeElement(nv, &se); err != nil {
+		return xml.Name{}, nil, err
+	}
+	return se.Name, nv, err
+}
diff --git a/xmpp_ping.go b/xmpp_ping.go
index 26d056e..39269d8 100644
--- a/xmpp_ping.go
+++ b/xmpp_ping.go
@@ -25,3 +25,9 @@ func (c *Client) PingS2S(fromServer, toServer string) error {
 		xmlEscape(fromServer), xmlEscape(toServer))
 	return err
 }
+
+func (c *Client) SendResultPing(id, toServer string) error {
+	_, err := fmt.Fprintf(c.conn, "<iq type='result' to='%s' id='%s'/>",
+		xmlEscape(toServer), xmlEscape(id))
+	return err
+}

From 6265286138bf2bd971bff2b6411f5130f70a4911 Mon Sep 17 00:00:00 2001
From: Vladimir <VladVladow@yandex.ru>
Date: Fri, 9 Sep 2016 09:56:30 +0500
Subject: [PATCH 2/2] Removed debug comment and extra action with an IQ query

---
 xmpp.go | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/xmpp.go b/xmpp.go
index f773bf4..c12dd52 100644
--- a/xmpp.go
+++ b/xmpp.go
@@ -40,7 +40,6 @@ const (
 	nsBind    = "urn:ietf:params:xml:ns:xmpp-bind"
 	nsClient  = "jabber:client"
 	nsSession = "urn:ietf:params:xml:ns:xmpp-session"
-	nsPing    = "urn:xmpp:ping"
 )
 
 // Default TLS configuration options
@@ -601,15 +600,10 @@ func (c *Client) Recv() (stanza interface{}, err error) {
 		case *clientPresence:
 			return Presence{v.From, v.To, v.Type, v.Show, v.Status}, nil
 		case *clientIQ:
-			//fmt.Printf("$+v", val)
-			_, vali, err := UnmarshalIqQuery(v.Query)
-			if err == nil {
-				switch vali.(type) {
-				case *serverPingRequest:
-					err := c.SendResultPing(v.ID, v.From)
-					if err != nil {
-						return Chat{}, err
-					}
+			if bytes.Equal(v.Query, []byte(`<ping xmlns='urn:xmpp:ping'/>`)) {
+				err := c.SendResultPing(v.ID, v.From)
+				if err != nil {
+					return Chat{}, err
 				}
 			}
 			return IQ{ID: v.ID, From: v.From, To: v.To, Type: v.Type, Query: v.Query}, nil
@@ -785,10 +779,6 @@ type rosterItem struct {
 	Group        []string
 }
 
-type serverPingRequest struct {
-	XMLName xml.Name `xml:"urn:xmpp:ping ping"`
-}
-
 // Scan XML token stream to find next StartElement.
 func nextStart(p *xml.Decoder) (xml.StartElement, error) {
 	for {
@@ -895,23 +885,3 @@ func (t tee) Read(p []byte) (n int, err error) {
 	}
 	return
 }
-
-func UnmarshalIqQuery(Query []byte) (xml.Name, interface{}, error) {
-	dec := xml.NewDecoder(bytes.NewBuffer(Query))
-
-	se, err := nextStart(dec)
-	if err != nil {
-		return xml.Name{}, nil, err
-	}
-
-	var nv interface{}
-	switch se.Name.Space + " " + se.Name.Local {
-	case nsPing + " ping":
-		nv = &serverPingRequest{}
-	}
-
-	if err = dec.DecodeElement(nv, &se); err != nil {
-		return xml.Name{}, nil, err
-	}
-	return se.Name, nv, err
-}