From b908366544614373dd13c6b724ce59a4aaa4b45e Mon Sep 17 00:00:00 2001
From: Matt Goodall <matt.goodall@gmail.com>
Date: Wed, 27 Jun 2012 13:16:11 +0100
Subject: [PATCH] Extract startClient function.

---
 src/xmpp/client.go | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/xmpp/client.go b/src/xmpp/client.go
index fda67a9..0d63a04 100644
--- a/src/xmpp/client.go
+++ b/src/xmpp/client.go
@@ -26,17 +26,8 @@ func NewClient(jid JID, password string, config *ClientConfig) (*client, error)
 	}
 
 	for {
-		// Send stream start.
-		s := fmt.Sprintf(
-			"<stream:stream from='%s' to='%s' version='1.0' xml:lang='en' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>",
-			jid,
-			jid.Domain)
-		if err := stream.Send(fmt.Sprintf(s)); err != nil {
-			return nil, err
-		}
 
-		// Receive stream start.
-		if _, err := stream.Next(&xml.Name{nsStream, "stream"}); err != nil {
+		if err := startClient(stream, jid); err != nil {
 			return nil, err
 		}
 
@@ -70,6 +61,23 @@ func NewClient(jid JID, password string, config *ClientConfig) (*client, error)
 	return &client{jid, stream}, nil
 }
 
+func startClient(stream *Stream, jid JID) error {
+
+	s := fmt.Sprintf(
+		"<stream:stream from='%s' to='%s' version='1.0' xml:lang='en' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>",
+		jid,
+		jid.Domain)
+	if err := stream.Send(s); err != nil {
+		return err
+	}
+
+	if _, err := stream.Next(&xml.Name{nsStream, "stream"}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func authenticate(stream *Stream, mechanisms []string, user, password string) error {
 
 	log.Println("authenticate, mechanisms=", mechanisms)