Swap tcptype hack with proper rust implementation

The mozilla sdp lib supports tcptype now.

Author: tmolitor-stud-tu

Monal/Classes/MLCall.m

@@ -1217,19 +1217,7 @@ -(void) webRTCClient:(WebRTCClient*) webRTCClient didDiscoverLocalCandidate:(RTC
             DDLogError(@"Failed to convert raw sdp candidate to jingle, ignoring this candidate: %@", candidate);
             return;
         }
-#ifdef IS_ALPHA
-        if([contentNode check:@"{urn:xmpp:jingle:transports:ice-udp:1}transport/candidate<protocol=tcp>"])
-        {
-            //add tcptype because that attribute is apparently not supported by our mozilla sdp lib
-            MLXMLNode* candidateNode = [contentNode findFirst:@"{urn:xmpp:jingle:transports:ice-udp:1}transport/candidate"];
-            if([candidate.sdp containsString:@"typ host tcptype active"])
-                candidateNode.attributes[@"tcptype"] = @"active";
-            else if([candidate.sdp containsString:@"typ host tcptype passive"])
-                candidateNode.attributes[@"tcptype"] = @"passive";
-            else
-                DDLogWarn(@"Unknown type-tcptype combination!");
-        }
-#else
+#ifndef IS_ALPHA
         if([contentNode check:@"{urn:xmpp:jingle:transports:ice-udp:1}transport/candidate<protocol=tcp>"])
         {
             DDLogError(@"Ignoring raw sdp candidate, because it's using tcp instead of udp: %@", candidate);
@@ -1395,15 +1383,7 @@ -(void) processRemoteICECandidate:(XMPPIQ*) iqNode
 {
     RTCIceCandidate* incomingCandidate = nil;
     NSString* rawSdp = [HelperTools xml2candidate:[iqNode findFirst:@"{urn:xmpp:jingle:1}jingle"] withInitiator:self.direction==MLCallDirectionIncoming];
-#ifdef IS_ALPHA
-    if([iqNode check:@"{urn:xmpp:jingle:1}jingle/content/{urn:xmpp:jingle:transports:ice-udp:1}transport/candidate<protocol=tcp>"])
-    {
-        NSString* type = [iqNode findFirst:@"{urn:xmpp:jingle:1}jingle/content/{urn:xmpp:jingle:transports:ice-udp:1}transport/candidate@type"];
-        NSString* tcptype = [iqNode findFirst:@"{urn:xmpp:jingle:1}jingle/content/{urn:xmpp:jingle:transports:ice-udp:1}transport/candidate@tcptype"];
-        DDLogDebug(@"Patching raw sdp type=%@ to contain tcptype: %@", type, tcptype);
-        rawSdp = [rawSdp stringByReplacingOccurrencesOfString:[NSString stringWithFormat:@"typ %@", type] withString:[NSString stringWithFormat:@"typ %@ tcptype %@", type, tcptype]];
-    }
-#else
+#ifndef IS_ALPHA
     if([iqNode check:@"{urn:xmpp:jingle:1}jingle/content/{urn:xmpp:jingle:transports:ice-udp:1}transport/candidate<protocol=tcp>"])
     {
         DDLogWarn(@"Got tcp candidate, ignoring: %@", [iqNode findFirst:@"{urn:xmpp:jingle:1}jingle/content/{urn:xmpp:jingle:transports:ice-udp:1}transport/candidate"]);

rust/sdp-to-jingle/src/xep_0176.rs

@@ -4,7 +4,7 @@ use serde_derive::{Deserialize, Serialize};
 use webrtc_sdp::{
     address::Address,
     attribute_type::{
-        SdpAttributeCandidate, SdpAttributeCandidateTransport, SdpAttributeCandidateType,
+        SdpAttributeCandidate, SdpAttributeCandidateTransport, SdpAttributeCandidateType, SdpAttributeCandidateTcpType
     },
     error::SdpParserInternalError,
 };
@@ -147,6 +147,8 @@ pub struct JingleTransportCandidate {
     rport: Option<u32>,
     #[serde(rename = "@type")]
     c_type: JingleTransportCandidateType,
+    #[serde(rename = "@tcp-type", skip_serializing_if = "Option::is_none")]
+    tcp_type: Option<JingleTransportCandidateTcpType>,
 }
 
 impl JingleTransportCandidate {
@@ -178,6 +180,7 @@ impl JingleTransportCandidate {
             raddr: candidate.raddr.as_ref().map(|addr| format!("{}", addr)),
             rport: candidate.rport,
             c_type: JingleTransportCandidateType::new_from_sdp(&candidate.c_type),
+            tcp_type: candidate.tcp_type.as_ref().map(|v| JingleTransportCandidateTcpType::new_from_sdp(&v)),
         })
     }
 
@@ -211,7 +214,7 @@ impl JingleTransportCandidate {
                 },
             },
             rport: self.rport,
-            tcp_type: None, //tcp transport is not specced in any xep
+            tcp_type: self.tcp_type.as_ref().map(|v| v.to_sdp()), //tcp transport is not specced in any xep
             generation: Some(self.generation),
             ufrag,
             networkcost: None,              //not specced in xep-0176
@@ -249,3 +252,31 @@ impl JingleTransportCandidateType {
         }
     }
 }
+
+// *** xep-0176
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(rename_all = "lowercase")]
+pub enum JingleTransportCandidateTcpType {
+    Active,
+    Passive,
+    #[serde(rename = "so")]
+    Simultaneous,
+}
+
+impl JingleTransportCandidateTcpType {
+    pub fn new_from_sdp(tcp_type: &SdpAttributeCandidateTcpType) -> Self {
+        match tcp_type {
+            SdpAttributeCandidateTcpType::Active => Self::Active,
+            SdpAttributeCandidateTcpType::Passive => Self::Passive,
+            SdpAttributeCandidateTcpType::Simultaneous => Self::Simultaneous,
+        }
+    }
+
+    pub fn to_sdp(&self) -> SdpAttributeCandidateTcpType {
+        match self {
+            Self::Active => SdpAttributeCandidateTcpType::Active,
+            Self::Passive => SdpAttributeCandidateTcpType::Passive,
+            Self::Simultaneous => SdpAttributeCandidateTcpType::Simultaneous,
+        }
+    }
+}