Clean up packet error handling

Author: Sarah King

bind.go

@@ -61,14 +61,14 @@ func (l *Conn) SimpleBind(simpleBindRequest *SimpleBindRequest) (*SimpleBindResu
 	defer l.finishMessage(messageID)
 
 	packetResponse, ok := <-channel
+	if !ok {
+		return nil, NewError(ErrorNetwork, errors.New("ldap: channel closed"))
+	}
 	packet, err = packetResponse.ReadPacket()
 	l.Debug.Printf("%d: got response %p", messageID, packet)
 	if err != nil {
 		return nil, err
 	}
-	if !ok {
-		return nil, NewError(ErrorNetwork, errors.New("ldap: channel closed"))
-	}
 
 	if l.Debug {
 		if err := addLDAPDescriptions(packet); err != nil {
@@ -120,13 +120,14 @@ func (l *Conn) Bind(username, password string) error {
 	defer l.finishMessage(messageID)
 
 	packetResponse, ok := <-channel
+	if !ok {
+		return NewError(ErrorNetwork, errors.New("ldap: channel closed"))
+	}
 	packet, err = packetResponse.ReadPacket()
+	l.Debug.Printf("%d: got response %p", messageID, packet)
 	if err != nil {
 		return err
 	}
-	if !ok {
-		return NewError(ErrorNetwork, errors.New("ldap: channel closed"))
-	}
 
 	if l.Debug {
 		if err := addLDAPDescriptions(packet); err != nil {

compare.go

@@ -59,14 +59,14 @@ func (l *Conn) Compare(dn, attribute, value string) (bool, error) {
 
 	l.Debug.Printf("%d: waiting for response", messageID)
 	packetResponse, ok := <-channel
+	if !ok {
+		return false, NewError(ErrorNetwork, errors.New("ldap: channel closed"))
+	}
 	packet, err = packetResponse.ReadPacket()
 	l.Debug.Printf("%d: got response %p", messageID, packet)
 	if err != nil {
 		return false, err
 	}
-	if !ok {
-		return false, NewError(ErrorNetwork, errors.New("ldap: channel closed"))
-	}
 
 	if l.Debug {
 		if err := addLDAPDescriptions(packet); err != nil {

conn.go

@@ -191,14 +191,14 @@ func (l *Conn) StartTLS(config *tls.Config) error {
 	l.Debug.Printf("%d: waiting for response", messageID)
 	defer l.finishMessage(messageID)
 	packetResponse, ok := <-channel
+	if !ok {
+		return NewError(ErrorNetwork, errors.New("ldap: channel closed"))
+	}
 	packet, err = packetResponse.ReadPacket()
 	l.Debug.Printf("%d: got response %p", messageID, packet)
 	if err != nil {
 		return err
 	}
-	if !ok {
-		return NewError(ErrorNetwork, errors.New("ldap: channel closed"))
-	}
 
 	if l.Debug {
 		if err := addLDAPDescriptions(packet); err != nil {

del.go

@@ -53,14 +53,14 @@ func (l *Conn) Del(delRequest *DelRequest) error {
 
 	l.Debug.Printf("%d: waiting for response", messageID)
 	packetResponse, ok := <-channel
+	if !ok {
+		return NewError(ErrorNetwork, errors.New("ldap: channel closed"))
+	}
 	packet, err = packetResponse.ReadPacket()
 	l.Debug.Printf("%d: got response %p", messageID, packet)
 	if err != nil {
 		return err
 	}
-	if !ok {
-		return NewError(ErrorNetwork, errors.New("ldap: channel closed"))
-	}
 
 	if l.Debug {
 		if err := addLDAPDescriptions(packet); err != nil {

modify.go

@@ -130,14 +130,14 @@ func (l *Conn) Modify(modifyRequest *ModifyRequest) error {
 
 	l.Debug.Printf("%d: waiting for response", messageID)
 	packetResponse, ok := <-channel
+	if !ok {
+		return NewError(ErrorNetwork, errors.New("ldap: channel closed"))
+	}
 	packet, err = packetResponse.ReadPacket()
 	l.Debug.Printf("%d: got response %p", messageID, packet)
 	if err != nil {
 		return err
 	}
-	if !ok {
-		return NewError(ErrorNetwork, errors.New("ldap: channel closed"))
-	}
 
 	if l.Debug {
 		if err := addLDAPDescriptions(packet); err != nil {

passwdmodify.go

@@ -99,14 +99,14 @@ func (l *Conn) PasswordModify(passwordModifyRequest *PasswordModifyRequest) (*Pa
 
 	l.Debug.Printf("%d: waiting for response", messageID)
 	packetResponse, ok := <-channel
+	if !ok {
+		return nil, NewError(ErrorNetwork, errors.New("ldap: channel closed"))
+	}
 	packet, err = packetResponse.ReadPacket()
 	l.Debug.Printf("%d: got response %p", messageID, packet)
 	if err != nil {
 		return nil, err
 	}
-	if !ok {
-		return nil, NewError(ErrorNetwork, errors.New("ldap: channel closed"))
-	}
 
 	if packet == nil {
 		return nil, NewError(ErrorNetwork, errors.New("ldap: could not retrieve message"))

search.go

@@ -376,14 +376,14 @@ func (l *Conn) Search(searchRequest *SearchRequest) (*SearchResult, error) {
 	for !foundSearchResultDone {
 		l.Debug.Printf("%d: waiting for response", messageID)
 		packetResponse, ok := <-channel
+		if !ok {
+			return nil, NewError(ErrorNetwork, errors.New("ldap: channel closed"))
+		}
 		packet, err = packetResponse.ReadPacket()
 		l.Debug.Printf("%d: got response %p", messageID, packet)
 		if err != nil {
 			return nil, err
 		}
-		if !ok {
-			return nil, NewError(ErrorNetwork, errors.New("ldap: channel closed"))
-		}
 
 		if l.Debug {
 			if err := addLDAPDescriptions(packet); err != nil {