go-xmpp2: comparison stream.go

equal deleted inserted replaced

-:16513974d273
+:6e2eea62ccca
 	"crypto/rand"
 	"crypto/tls"
 	"encoding/base64"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"os"
 	"regexp"
 	"strings"
+	"syslog"
 	"time"
 	"xml"
 )
 // Callback to handle a stanza with a particular id.
 			if errno, ok := err.(*net.OpError) ; ok {
 				if errno.Timeout() {
 					continue
 				}
 			}
-			log.Printf("read: %s", err.String())
+			if Log != nil {
+				Log.Err("read: " + err.String())
+			}
 			break
 		}
 		nw, err := w.Write(p[:nr])
 		if nw < nr {
-			log.Println("read: %s", err.String())
+			if Log != nil {
+				Log.Err("read: " + err.String())
+			}
 			break
 		}
 	}
 }
 	defer tryClose(r, cl.socket)
 	p := make([]byte, 1024)
 	for {
 		nr, err := r.Read(p)
 		if nr == 0 {
-			log.Printf("write: %s", err.String())
+			if Log != nil {
+				Log.Err("write: " + err.String())
+			}
 			break
 		}
 		nw, err := cl.socket.Write(p[:nr])
 		if nw < nr {
-			log.Println("write: %s", err.String())
+			if Log != nil {
+				Log.Err("write: " + err.String())
+			}
 			break
 		}
 	}
 }
 func readXml(r io.Reader, ch chan<- interface{},
 	extStanza map[string] func(*xml.Name) interface{}) {
-	if debug {
+	if Loglevel >= syslog.LOG_DEBUG {
 		pr, pw := io.Pipe()
 		go tee(r, pw, "S: ")
 		r = pr
 	}
 	defer tryClose(r, ch)
 	for {
 		// Sniff the next token on the stream.
 		t, err := p.Token()
 		if t == nil {
 			if err != os.EOF {
-				log.Printf("read: %v", err)
+				if Log != nil {
+					Log.Err("read: " + err.String())
+				}
 			}
 			break
 		}
 		var se xml.StartElement
 		var ok bool
 		var obj interface{}
 		switch se.Name.Space + " " + se.Name.Local {
 		case NsStream + " stream":
 			st, err := parseStream(se)
 			if err != nil {
-				log.Printf("unmarshal stream: %v",
+				if Log != nil {
-					err)
+					Log.Err("unmarshal stream: " +
+						err.String())
+				}
 				break
 			}
 			ch <- st
 			continue
 		case "stream error", NsStream + " error":
 			obj = &Message{}
 		case "jabber:client presence":
 			obj = &Presence{}
 		default:
 			obj = &Generic{}
-			log.Printf("Ignoring unrecognized: %s %s\n",
+			if Log != nil {
-				se.Name.Space, se.Name.Local)
+				Log.Notice("Ignoring unrecognized: " +
+					se.Name.Space + " " + se.Name.Local)
+			}
 		}
 		// Read the complete XML stanza.
 		err = p.Unmarshal(obj, &se)
 		if err != nil {
-			log.Printf("unmarshal: %v", err)
+			if Log != nil {
+				Log.Err("unmarshal: " + err.String())
+			}
 			break
 		}
 		// If it's a Stanza, we try to unmarshal its innerxml
 		// into objects of the appropriate respective
 		// types. This is specified by our extensions.
 		if st, ok := obj.(Stanza) ; ok {
 			err = parseExtended(st, extStanza)
 			if err != nil {
-				log.Printf("ext unmarshal: %v",
+				if Log != nil {
-					err)
+					Log.Err("ext unmarshal: " +
+						err.String())
+				}
 				break
 			}
 		}
 		// Put it on the channel.
 	return nil
 }
 func writeXml(w io.Writer, ch <-chan interface{}) {
-	if debug {
+	if Loglevel >= syslog.LOG_DEBUG {
 		pr, pw := io.Pipe()
 		go tee(pr, w, "C: ")
 		w = pw
 	}
 	defer tryClose(w, ch)
 	for obj := range ch {
 		err := xml.Marshal(w, obj)
 		if err != nil {
-			log.Printf("write: %v", err)
+			if Log != nil {
+				Log.Err("write: " + err.String())
+			}
 			break
 		}
 	}
 }
 			if !send {
 				continue
 			}
 			st, ok := x.(Stanza)
 			if !ok {
-				log.Printf("Unhandled non-stanza: %v",
+				if Log != nil {
-					x)
+					Log.Warning(fmt.Sprintf(
+						"Unhandled non-stanza: %v", x))
+				}
 				continue
 			}
 			if handlers[st.GetId()] != nil {
 				f := handlers[st.GetId()]
 				handlers[st.GetId()] = nil
 			case -1:
 				break
 			}
 		case x := <- input:
 			if x == nil {
-				log.Println("Refusing to send nil stanza")
+				if Log != nil {
+					Log.Notice("Refusing to send" +
+						" nil stanza")
+				}
 				continue
 			}
 			srvOut <- x
 		}
 	}
 	defer close(app)
 	for {
 		select {
 		case newFilterOut := <- filterOut:
 			if newFilterOut == nil {
-				log.Println("Received nil filter")
+				if Log != nil {
+					Log.Warning("Received nil filter")
+				}
 				filterIn <- nil
 				continue
 			}
 			filterIn <- topFilter
 			topFilter = newFilterOut
 func handleStream(ss *stream) {
 }
 func (cl *Client) handleStreamError(se *streamError) {
-	log.Printf("Received stream error: %v", se)
+	if Log != nil {
+		Log.Notice(fmt.Sprintf("Received stream error: %v", se))
+	}
 	cl.Close()
 }
 func (cl *Client) handleFeatures(fe *Features) {
 	cl.Features = fe
 	// Reset the read timeout on the (underlying) socket so the
 	// reader doesn't get woken up unnecessarily.
 	tcp.SetReadTimeout(0)
-	log.Println("TLS negotiation succeeded.")
+	if Log != nil {
+		Log.Info("TLS negotiation succeeded.")
+	}
 	cl.Features = nil
 	// Now re-send the initial handshake message to start the new
 	// session.
 	hsOut := &stream{To: cl.Jid.Domain, Version: Version}
 	switch strings.ToLower(srv.XMLName.Local) {
 	case "challenge":
 		b64 := base64.StdEncoding
 		str, err := b64.DecodeString(srv.Chardata)
 		if err != nil {
-			log.Printf("SASL challenge decode: %s",
+			if Log != nil {
-				err.String())
+				Log.Err("SASL challenge decode: " +
+					err.String())
+			}
 			return;
 		}
 		srvMap := parseSasl(string(str))
 		if cl.saslExpected == "" {
 			cl.saslDigest1(srvMap)
 		} else {
 			cl.saslDigest2(srvMap)
 		}
 	case "failure":
-		log.Println("SASL authentication failed")
+		if Log != nil {
+			Log.Notice("SASL authentication failed")
+		}
 	case "success":
-		log.Println("SASL authentication succeeded")
+		if Log != nil {
+			Log.Info("Sasl authentication succeeded")
+		}
 		cl.Features = nil
 		ss := &stream{To: cl.Jid.Domain, Version: Version}
 		cl.xmlOut <- ss
 	}
 }
 		if qop == "auth" {
 			hasAuth = true
 		}
 	}
 	if !hasAuth {
-		log.Println("Server doesn't support SASL auth")
+		if Log != nil {
+			Log.Err("Server doesn't support SASL auth")
+		}
 		return;
 	}
 	// Pick a realm.
 	var realm string
 	// Generate our own nonce from random data.
 	randSize := big.NewInt(0)
 	randSize.Lsh(big.NewInt(1), 64)
 	cnonce, err := rand.Int(rand.Reader, randSize)
 	if err != nil {
-		log.Println("SASL rand: %s", err.String())
+		if Log != nil {
+			Log.Err("SASL rand: " + err.String())
+		}
 		return
 	}
 	cnonceStr := fmt.Sprintf("%016x", cnonce)
 	/* Now encode the actual password response, as well as the
 		bindReq.Resource = &res
 	}
 	msg := &Iq{Type: "set", Id: <- Id, Nested: []interface{}{bindReq}}
 	f := func(st Stanza) bool {
 		if st.GetType() == "error" {
-			log.Println("Resource binding failed")
+			if Log != nil {
+				Log.Err("Resource binding failed")
+			}
 			return false
 		}
 		var bindRepl *bindIq
 		for _, ele := range(st.GetNested()) {
 			if b, ok := ele.(*bindIq) ; ok {
 				bindRepl = b
 				break
 			}
 		}
 		if bindRepl == nil {
-			log.Printf("bad bind reply: %v", st)
+			if Log != nil {
+				Log.Err(fmt.Sprintf("Bad bind reply: %v",
+					st))
+			}
 			return false
 		}
 		jidStr := bindRepl.Jid
 		if jidStr == nil || *jidStr == "" {
-			log.Println("empty resource")
+			if Log != nil {
+				Log.Err("Can't bind empty resource")
+			}
 			return false
 		}
 		jid := new(JID)
 		if !jid.Set(*jidStr) {
-			log.Println("Can't parse JID %s", jidStr)
+			if Log != nil {
+				Log.Err("Can't parse JID " + *jidStr)
+			}
 			return false
 		}
 		cl.Jid = *jid
-		log.Printf("Bound resource: %s", cl.Jid.String())
+		if Log != nil {
+			Log.Info("Bound resource: " + cl.Jid.String())
+		}
 		cl.bindDone()
 		return false
 	}
 	cl.HandleStanza(msg.Id, f)
 	cl.xmlOut <- msg

changeset 62	6e2eea62ccca
parent 61	16513974d273
child 63	c7f2edd25f4a