diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2009-11-20 19:55:04 -0500 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.co.uk> | 2010-09-07 17:09:38 +0300 |
| commit | d2bd51bbcda4b51f93df8c5b8cf76eee198c793a (patch) | |
| tree | 34aca37e3400ab0a0f37f4aedc2caa6e3aaa8e3e /transmitters/shm | |
| parent | 3d3f7d093c4450923ca429367bee39bd822d1ee7 (diff) | |
| download | farstream-d2bd51bbcda4b51f93df8c5b8cf76eee198c793a.tar.gz | |
shmstream: Also ignore usernames that are empty
Diffstat (limited to 'transmitters/shm')
| -rw-r--r-- | transmitters/shm/fs-shm-stream-transmitter.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c index cc350a19..ce1dcbc5 100644 --- a/transmitters/shm/fs-shm-stream-transmitter.c +++ b/transmitters/shm/fs-shm-stream-transmitter.c @@ -335,7 +335,7 @@ static gboolean fs_shm_stream_transmitter_add_sink (FsShmStreamTransmitter *self, FsCandidate *candidate, GError **error) { - if (!candidate->ip) + if (!candidate->ip || !candidate->ip[0]) return TRUE; if (self->priv->shm_sink[candidate->component_id]) @@ -368,13 +368,14 @@ fs_shm_stream_transmitter_add_remote_candidate ( if (!fs_shm_stream_transmitter_add_sink (self, candidate, error)) return FALSE; - if (candidate->username) + if (candidate->username && candidate->username[0]) { if (self->priv->shm_src[candidate->component_id]) { if (fs_shm_transmitter_check_shm_src (self->priv->transmitter, - self->priv->shm_src[candidate->component_id], candidate->username)) + self->priv->shm_src[candidate->component_id], + candidate->username)) return TRUE; self->priv->shm_src[candidate->component_id] = NULL; } @@ -416,7 +417,8 @@ fs_shm_stream_transmitter_set_remote_candidates ( return FALSE; } - if (!candidate->ip && !candidate->username) + if ((!candidate->ip || !candidate->ip[0]) && + (!candidate->username || !candidate->username[0])) { g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS, "The candidate does not have a SINK shm segment in its ip" @@ -476,7 +478,7 @@ fs_shm_stream_transmitter_gather_local_candidates ( { FsCandidate *candidate = item->data; - if (candidate->ip) + if (candidate->ip && candidate->ip[0]) if (!fs_shm_stream_transmitter_add_sink (self, candidate, error)) return FALSE; } |