fix accepted_naks iterator being consumed after applying it to the first requested option

The RCN event now behaves properly if multiple options are nak'd.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/proto.rs b/src/proto.rs
index e8813c2..0953ad9 100644
--- a/src/proto.rs
+++ b/src/proto.rs
@@ -1181,19 +1181,19 @@ impl<O: ProtocolOption> NegotiationProtocol<O> {
         });
 
         match packet.ty {
-                    PacketType::ConfigureNak => {
-                        for option in self.request.iter_mut() {
-                            if let Some(nak) = accepted_naks.find(|nak| nak.has_same_type(option)) {
-                                *option = nak.clone();
-                            }
-                        }
+            PacketType::ConfigureNak => {
+                for option in self.request.iter_mut() {
+                    if let Some(nak) = accepted_naks.clone().find(|nak| nak.has_same_type(option)) {
+                        *option = nak.clone();
                     }
-                    PacketType::ConfigureReject => self.request.retain(|option| {
-                        !accepted_naks
-                            .any(|nak| nak.has_same_type(option))
-                    }),
-                    _ => panic!("NegotiationProtocol::rcn called on packet type other than Configure-Nak or Configure-Reject"),
                 }
+            }
+            PacketType::ConfigureReject => self.request.retain(|option| {
+                !accepted_naks
+                    .any(|nak| nak.has_same_type(option))
+            }),
+            _ => panic!("NegotiationProtocol::rcn called on packet type other than Configure-Nak or Configure-Reject"),
+        }
     }
 }