diff options
author | Jakub Adam <jakub.adam@ktknet.cz> | 2014-04-22 14:26:49 +0200 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2014-10-09 17:57:33 -0400 |
commit | 3cd69d66c849df4541cf0974c8429623dc103cbb (patch) | |
tree | 957aab1472c1ec9c90d443309fcb82ff51c742cd /transmitters | |
parent | 2cb3e163f153434b6e386d1fe80efcc6e70eb738 (diff) | |
download | farstream-3cd69d66c849df4541cf0974c8429623dc103cbb.tar.gz |
Add ICE-TCP candidates
Also to the nice transmitter
Diffstat (limited to 'transmitters')
-rw-r--r-- | transmitters/nice/fs-nice-stream-transmitter.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c index 4d3dd832..82bba32b 100644 --- a/transmitters/nice/fs-nice-stream-transmitter.c +++ b/transmitters/nice/fs-nice-stream-transmitter.c @@ -614,6 +614,12 @@ fs_network_protocol_to_nice_candidate_protocol (FsNetworkProtocol proto) { case FS_NETWORK_PROTOCOL_UDP: return NICE_CANDIDATE_TRANSPORT_UDP; + case FS_NETWORK_PROTOCOL_TCP_ACTIVE: + return NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE; + case FS_NETWORK_PROTOCOL_TCP_PASSIVE: + return NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE; + case FS_NETWORK_PROTOCOL_TCP_SO: + return NICE_CANDIDATE_TRANSPORT_TCP_SO; default: GST_WARNING ("Invalid Fs network protocol type %u", proto); return NICE_CANDIDATE_TRANSPORT_UDP; @@ -926,14 +932,6 @@ fs_nice_stream_transmitter_force_remote_candidates ( goto out; } - if (candidate->proto != FS_NETWORK_PROTOCOL_UDP) - { - g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS, - "Only UDP candidates can be set"); - res = FALSE; - goto out; - } - if (done[candidate->component_id-1]) { g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS, @@ -995,9 +993,15 @@ nice_candidate_transport_to_fs_network_protocol (NiceCandidateTransport trans) { case NICE_CANDIDATE_TRANSPORT_UDP: return FS_NETWORK_PROTOCOL_UDP; + case NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE: + return FS_NETWORK_PROTOCOL_TCP_PASSIVE; + case NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE: + return FS_NETWORK_PROTOCOL_TCP_ACTIVE; + case NICE_CANDIDATE_TRANSPORT_TCP_SO: + return FS_NETWORK_PROTOCOL_TCP_SO; default: GST_WARNING ("Invalid Nice network transport type %u", trans); - return FS_NETWORK_PROTOCOL_TCP; + return FS_NETWORK_PROTOCOL_UDP; } } @@ -1180,13 +1184,6 @@ fs_nice_stream_transmitter_build (FsNiceStreamTransmitter *self, "You can only set preferred candidates of type host"); return FALSE; } - - if (cand->proto != FS_NETWORK_PROTOCOL_UDP) - { - g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS, - "Only UDP preferred candidates can be set"); - return FALSE; - } } /* Now if we have a relayinfo, lets verify that its ok */ @@ -1655,9 +1652,6 @@ agent_new_candidate (NiceAgent *agent, { NiceCandidate *candidate = item->data; - if (candidate->transport != NICE_CANDIDATE_TRANSPORT_UDP) - continue; - if (!strcmp (candidate->foundation, foundation)) { fscandidate = nice_candidate_to_fs_candidate (agent, candidate, TRUE); |