Reader access: Add some methods to get at the inner TimedFdReader

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/mgmtchannel.rs b/src/mgmtchannel.rs
index e245408a879551c39055bf2e1b52ceecbc10d0aa..bd14e7e45503ce43e1611d04f41375c68333a145 100644 (file)
--- a/src/mgmtchannel.rs
+++ b/src/mgmtchannel.rs
@@ -122,6 +122,10 @@ impl MgmtChannel {
     self.cmd_withbulk(cmd, &mut io::empty(), &mut io::sink(), &mut |_|Ok(()))?
   }
 
+  pub fn read_inner_mut(&mut self) -> &mut TimedFdReader {
+    self.read.inner_mut()
+  }
+
   pub fn for_game(self, game: InstanceName, how: MgmtGameUpdateMode)
                   -> MgmtChannelForGame {
     MgmtChannelForGame {

diff --git a/src/packetframe.rs b/src/packetframe.rs
index 1bc227c896a595b46b0ec4138c91d8c28053ffe1..5effbfd7ace2e1ecc023c60a65184d6dbb9b8a95 100644 (file)
--- a/src/packetframe.rs
+++ b/src/packetframe.rs
@@ -151,9 +151,12 @@ impl<RW> Fuse<RW> {
     r?
   }
 
-  pub fn get_even_broken(&self) -> &RW {
+  pub fn inner_even_broken(&self) -> &RW {
     self.inner.as_ref().unwrap_or_else(|e| e.inner.as_ref().unwrap())
   }
+  pub fn inner_even_broken_mut(&mut self) -> &mut RW {
+    self.inner.as_mut().unwrap_or_else(|e| e.inner.as_mut().unwrap())
+  }
 }
 
 impl<R:Read> Read for Fuse<R> {
@@ -303,6 +306,14 @@ impl<R:Read> FrameReader<R> {
   {
     self.read_withbulk()?.0
   }
+
+pub fn inner    (&    self)->&    R{ self.inner.get_ref().inner_even_broken() }
+pub fn inner_mut(&mut self)->&mut R{ self.inner.get_mut().inner_even_broken_mut() }
+}
+
+impl<'r,R:Read> ReadFrame<'r,R> {
+  pub fn inner    (&    self) -> &    R { self.fr.inner()     }
+  pub fn inner_mut(&mut self) -> &mut R { self.fr.inner_mut() }
 }
 
 #[ext(pub, name=ReadExt)]