[telepathy-gabble/master] Don't assert on unknown candidate types/protocols

Will Thompson will.thompson at collabora.co.uk
Sun Jun 28 08:36:21 PDT 2009


---
 src/jingle-transport-iceudp.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/jingle-transport-iceudp.c b/src/jingle-transport-iceudp.c
index e3f4150..0dd52cb 100644
--- a/src/jingle-transport-iceudp.c
+++ b/src/jingle-transport-iceudp.c
@@ -399,15 +399,20 @@ inject_candidates (GabbleJingleTransportIface *obj,
           type_str = "relay";
           break;
         default:
-          g_assert_not_reached ();
+          DEBUG ("skipping candidate with unknown type %u", c->type);
+          continue;
       }
 
       switch (c->protocol) {
         case JINGLE_TRANSPORT_PROTOCOL_UDP:
           proto_str = "udp";
           break;
+        case JINGLE_TRANSPORT_PROTOCOL_TCP:
+          DEBUG ("ignoring TCP candidate");
+          continue;
         default:
-          g_assert_not_reached ();
+          DEBUG ("skipping candidate with unknown protocol %u", c->protocol);
+          continue;
       }
 
       lm_message_node_set_attributes (transport_node,
-- 
1.5.6.5




More information about the telepathy-commits mailing list