Fix passing Component to StreamManager

0a4acd12c3, which fixes #160, introduced
a regression as it assumed only Client may implement StreamClient, and
passing a component triggers an unconditional "client is not
disconnected" error.

stanza/iq_disco.go

@@ -21,7 +21,6 @@ type DiscoInfo struct {
 	Identity  []Identity `xml:"identity"`
 	Features  []Feature  `xml:"feature"`
 	ResultSet *ResultSet `xml:"set,omitempty"`
-	Form      *Form      `xml:"x,omitempty"`
 }
 
 // Namespace lets DiscoInfo implement the IQPayload interface

stanza/iq_disco_test.go

@@ -16,7 +16,6 @@ func TestDiscoInfo_Builder(t *testing.T) {
 	disco := iq.DiscoInfo()
 	disco.AddIdentity("Test Component", "gateway", "service")
 	disco.AddFeatures(stanza.NSDiscoInfo, stanza.NSDiscoItems, "jabber:iq:version", "urn:xmpp:delegation:1")
-	disco.Form = stanza.NewForm([]*stanza.Field{}, "result")
 
 	parsedIQ, err := checkMarshalling(t, iq)
 	if err != nil {
@@ -49,15 +48,6 @@ func TestDiscoInfo_Builder(t *testing.T) {
 			t.Errorf("Incorrect identity name: %#v", pp.Identity[0].Name)
 		}
 	}
-
-	// Check form
-	if pp.Form == nil {
-		t.Errorf("Form is nil")
-	} else {
-		if len(pp.Form.Fields) != 0 {
-			t.Errorf("Form fields length mismatch: %#v", pp.Form.Fields)
-		}
-	}
 }
 
 // Implements XEP-0030 example 17

stream_manager.go

@@ -114,18 +114,23 @@ func (sm *StreamManager) Stop() {
 
 func (sm *StreamManager) connect() error {
 	if sm.client != nil {
-		if c, ok := sm.client.(*Client); ok {
+		var scs *SyncConnState
-			if c.CurrentState.getState() == StateDisconnected {
+		if client, ok := sm.client.(*Client); ok {
-				sm.Metrics = initMetrics()
+			scs = &client.CurrentState
-				err := c.Connect()
+		}
-				if err != nil {
+		if component, ok := sm.client.(*Component); ok {
-					return err
+			scs = &component.CurrentState
-				}
+		}
-				if sm.PostConnect != nil {
+		if scs != nil && scs.getState() == StateDisconnected {
-					sm.PostConnect(sm.client)
+			sm.Metrics = initMetrics()
-				}
+			err := sm.client.Connect()
-				return nil
+			if err != nil {
+				return err
 			}
+			if sm.PostConnect != nil {
+				sm.PostConnect(sm.client)
+			}
+			return nil
 		}
 	}
 	return errors.New("client is not disconnected")