feat(server): add builder option to set remotefx (#569)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Author: elmarco

crates/ironrdp-server/src/builder.rs

@@ -25,6 +25,7 @@ pub struct WantsDisplay {
 pub struct BuilderDone {
     addr: SocketAddr,
     security: RdpServerSecurity,
+    with_remote_fx: bool,
     handler: Box<dyn RdpServerInputHandler>,
     display: Box<dyn RdpServerDisplay>,
     cliprdr_factory: Option<Box<dyn CliprdrServerFactory>>,
@@ -123,6 +124,7 @@ impl RdpServerBuilder<WantsDisplay> {
                 display: Box::new(display),
                 sound_factory: None,
                 cliprdr_factory: None,
+                with_remote_fx: true,
             },
         }
     }
@@ -136,6 +138,7 @@ impl RdpServerBuilder<WantsDisplay> {
                 display: Box::new(NoopDisplay),
                 sound_factory: None,
                 cliprdr_factory: None,
+                with_remote_fx: true,
             },
         }
     }
@@ -152,11 +155,17 @@ impl RdpServerBuilder<BuilderDone> {
         self
     }
 
+    pub fn with_remote_fx(mut self, enabled: bool) -> Self {
+        self.state.with_remote_fx = enabled;
+        self
+    }
+
     pub fn build(self) -> RdpServer {
         RdpServer::new(
             RdpServerOptions {
                 addr: self.state.addr,
                 security: self.state.security,
+                with_remote_fx: self.state.with_remote_fx,
             },
             self.state.handler,
             self.state.display,

crates/ironrdp-server/src/capabilities.rs

@@ -2,7 +2,7 @@ use ironrdp_pdu::rdp::capability_sets::{self, GeneralExtraFlags};
 
 use crate::{DesktopSize, RdpServerOptions};
 
-pub(crate) fn capabilities(_opts: &RdpServerOptions, size: DesktopSize) -> Vec<capability_sets::CapabilitySet> {
+pub(crate) fn capabilities(opts: &RdpServerOptions, size: DesktopSize) -> Vec<capability_sets::CapabilitySet> {
     vec![
         capability_sets::CapabilitySet::General(general_capabilities()),
         capability_sets::CapabilitySet::Bitmap(bitmap_capabilities(&size)),
@@ -12,7 +12,7 @@ pub(crate) fn capabilities(_opts: &RdpServerOptions, size: DesktopSize) -> Vec<c
         capability_sets::CapabilitySet::Input(input_capabilities()),
         capability_sets::CapabilitySet::VirtualChannel(virtual_channel_capabilities()),
         capability_sets::CapabilitySet::MultiFragmentUpdate(multifragment_update()),
-        capability_sets::CapabilitySet::BitmapCodecs(bitmap_codecs()),
+        capability_sets::CapabilitySet::BitmapCodecs(bitmap_codecs(opts.with_remote_fx)),
     ]
 }
 
@@ -86,17 +86,19 @@ fn multifragment_update() -> capability_sets::MultifragmentUpdate {
     }
 }
 
-fn bitmap_codecs() -> capability_sets::BitmapCodecs {
-    capability_sets::BitmapCodecs(vec![
-        capability_sets::Codec {
+fn bitmap_codecs(with_remote_fx: bool) -> capability_sets::BitmapCodecs {
+    let mut codecs = Vec::new();
+    if with_remote_fx {
+        codecs.push(capability_sets::Codec {
             id: 0,
             property: capability_sets::CodecProperty::RemoteFx(capability_sets::RemoteFxContainer::ServerContainer(1)),
-        },
-        capability_sets::Codec {
+        });
+        codecs.push(capability_sets::Codec {
             id: 0,
             property: capability_sets::CodecProperty::ImageRemoteFx(
                 capability_sets::RemoteFxContainer::ServerContainer(1),
             ),
-        },
-    ])
+        });
+    }
+    capability_sets::BitmapCodecs(codecs)
 }

crates/ironrdp-server/src/server.rs

@@ -38,6 +38,7 @@ use crate::{builder, capabilities, SoundServerFactory};
 pub struct RdpServerOptions {
     pub addr: SocketAddr,
     pub security: RdpServerSecurity,
+    pub with_remote_fx: bool,
 }
 
 #[derive(Clone)]
@@ -694,14 +695,14 @@ impl RdpServer {
                             // the last parsed here.
                             rdp::capability_sets::CodecProperty::RemoteFx(
                                 rdp::capability_sets::RemoteFxContainer::ClientContainer(c),
-                            ) => {
+                            ) if self.opts.with_remote_fx => {
                                 for caps in c.caps_data.0 .0 {
                                     rfxcodec = Some((caps.entropy_bits, codec.id));
                                 }
                             }
                             rdp::capability_sets::CodecProperty::ImageRemoteFx(
                                 rdp::capability_sets::RemoteFxContainer::ClientContainer(c),
-                            ) => {
+                            ) if self.opts.with_remote_fx => {
                                 for caps in c.caps_data.0 .0 {
                                     rfxcodec = Some((caps.entropy_bits, codec.id));
                                 }