Fix printing packets references (#250)

hahmadia · johnweldon · commit 34eb223cebec · 2019-11-29T16:35:29.000-07:00
diff --git a/conn.go b/conn.go
@@ -278,7 +278,7 @@ func (l *Conn) StartTLS(config *tls.Config) error {
 			l.Close()
 			return err
 		}
-		ber.PrintPacket(packet)
+		l.Debug.PrintPacket(packet)
 	}
 
 	if err := GetLDAPError(packet); err == nil {
@@ -451,7 +451,7 @@ func (l *Conn) processMessages() {
 					msgCtx.sendResponse(&PacketResponse{message.Packet, nil})
 				} else {
 					log.Printf("Received unexpected message %d, %v", message.MessageID, l.IsClosing())
-					ber.PrintPacket(message.Packet)
+					l.Debug.PrintPacket(message.Packet)
 				}
 			case MessageTimeout:
 				// Handle the timeout by closing the channel
diff --git a/request.go b/request.go
@@ -29,7 +29,7 @@ func (l *Conn) doRequest(req request) (*messageContext, error) {
 	}
 
 	if l.Debug {
-		ber.PrintPacket(packet)
+		l.Debug.PrintPacket(packet)
 	}
 
 	msgCtx, err := l.sendMessage(packet)
@@ -60,7 +60,7 @@ func (l *Conn) readPacket(msgCtx *messageContext) (*ber.Packet, error) {
 		if err = addLDAPDescriptions(packet); err != nil {
 			return nil, err
 		}
-		ber.PrintPacket(packet)
+		l.Debug.PrintPacket(packet)
 	}
 	return packet, nil
 }
diff --git a/v3/conn.go b/v3/conn.go
@@ -278,7 +278,7 @@ func (l *Conn) StartTLS(config *tls.Config) error {
 			l.Close()
 			return err
 		}
-		ber.PrintPacket(packet)
+		l.Debug.PrintPacket(packet)
 	}
 
 	if err := GetLDAPError(packet); err == nil {
@@ -451,7 +451,7 @@ func (l *Conn) processMessages() {
 					msgCtx.sendResponse(&PacketResponse{message.Packet, nil})
 				} else {
 					log.Printf("Received unexpected message %d, %v", message.MessageID, l.IsClosing())
-					ber.PrintPacket(message.Packet)
+					l.Debug.PrintPacket(message.Packet)
 				}
 			case MessageTimeout:
 				// Handle the timeout by closing the channel
diff --git a/v3/request.go b/v3/request.go
@@ -29,7 +29,7 @@ func (l *Conn) doRequest(req request) (*messageContext, error) {
 	}
 
 	if l.Debug {
-		ber.PrintPacket(packet)
+		l.Debug.PrintPacket(packet)
 	}
 
 	msgCtx, err := l.sendMessage(packet)
@@ -60,7 +60,7 @@ func (l *Conn) readPacket(msgCtx *messageContext) (*ber.Packet, error) {
 		if err = addLDAPDescriptions(packet); err != nil {
 			return nil, err
 		}
-		ber.PrintPacket(packet)
+		l.Debug.PrintPacket(packet)
 	}
 	return packet, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ func (l Conn) StartTLS(config tls.Config) error {`
`278`	`278`	`l.Close()`
`279`	`279`	`return err`
`280`	`280`	`}`
`281`		`- ber.PrintPacket(packet)`
	`281`	`+ l.Debug.PrintPacket(packet)`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`if err := GetLDAPError(packet); err == nil {`
`@@ -451,7 +451,7 @@ func (l *Conn) processMessages() {`
`451`	`451`	`msgCtx.sendResponse(&PacketResponse{message.Packet, nil})`
`452`	`452`	`} else {`
`453`	`453`	`log.Printf("Received unexpected message %d, %v", message.MessageID, l.IsClosing())`
`454`		`- ber.PrintPacket(message.Packet)`
	`454`	`+ l.Debug.PrintPacket(message.Packet)`
`455`	`455`	`}`
`456`	`456`	`case MessageTimeout:`
`457`	`457`	`// Handle the timeout by closing the channel`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (l Conn) doRequest(req request) (messageContext, error) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if l.Debug {`
`32`		`- ber.PrintPacket(packet)`
	`32`	`+ l.Debug.PrintPacket(packet)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`msgCtx, err := l.sendMessage(packet)`
`@@ -60,7 +60,7 @@ func (l Conn) readPacket(msgCtx messageContext) (*ber.Packet, error) {`
`60`	`60`	`if err = addLDAPDescriptions(packet); err != nil {`
`61`	`61`	`return nil, err`
`62`	`62`	`}`
`63`		`- ber.PrintPacket(packet)`
	`63`	`+ l.Debug.PrintPacket(packet)`
`64`	`64`	`}`
`65`	`65`	`return packet, nil`
`66`	`66`	`}`