go-xmpp2: comparison xmpp.go

equal deleted inserted replaced

-:5c6d6d51d3ba
+:fb9bb98a8d70
 	"sync"
 )
 const (
 	// Version of RFC 3920 that we implement.
-	Version = "1.0"
+	XMPPVersion = "1.0"
 	// Various XML namespaces.
 	NsClient  = "jabber:client"
 	NsStreams = "urn:ietf:params:xml:ns:xmpp-streams"
 	NsStream  = "http://etherx.jabber.org/streams"
 	// DNS SRV names
 	serverSrv = "xmpp-server"
 	clientSrv = "xmpp-client"
 )
-// This channel may be used as a convenient way to generate a unique
-// id for an iq, message, or presence stanza.
-var Id <-chan string
-func init() {
-	// Start the unique id generator.
-	idCh := make(chan string)
-	Id = idCh
-	go func(ch chan<- string) {
-		id := int64(1)
-		for {
-			str := fmt.Sprintf("id_%d", id)
-			ch <- str
-			id++
-		}
-	}(idCh)
-}
 // Extensions can add stanza filters and/or new XML element types.
 type Extension struct {
 	StanzaHandlers map[string]func(*xml.Name) interface{}
 	Start          func(*Client)
 	if tcp == nil {
 		return nil, err
 	}
 	cl := new(Client)
-	cl.Uid = <-Id
+	cl.Uid = NextId()
 	cl.password = password
 	cl.Jid = *jid
 	cl.socket = tcp
 	cl.handlers = make(chan *stanzaHandler, 100)
 	cl.inputControl = make(chan int)
 	for _, ext := range exts {
 		ext.Start(cl)
 	}
 	// Initial handshake.
-	hsOut := &stream{To: jid.Domain, Version: Version}
+	hsOut := &stream{To: jid.Domain, Version: XMPPVersion}
 	cl.xmlOut <- hsOut
 	return cl, nil
 }
 // immediately after creating the Client in order to start the
 // session, retrieve the roster, and broadcast an initial
 // presence. The presence can be as simple as a newly-initialized
 // Presence struct.  See RFC 3921, Section 3.
 func (cl *Client) StartSession(getRoster bool, pr *Presence) error {
-	id := <-Id
+	id := NextId()
 	iq := &Iq{Header: Header{To: cl.Jid.Domain, Id: id, Type: "set",
 		Nested: []interface{}{Generic{XMLName: xml.Name{Space: NsSession, Local: "session"}}}}}
 	ch := make(chan error)
 	f := func(st Stanza) bool {
 		iq, ok := st.(*Iq)

changeset 118	fb9bb98a8d70
parent 116	5c6d6d51d3ba
child 119	712aa5780660