diff options
| -rwxr-xr-x | examples/gui/fs2-gui.py | 8 | ||||
| -rw-r--r-- | transmitters/nice/fs-nice-agent.c | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/examples/gui/fs2-gui.py b/examples/gui/fs2-gui.py index 89905520..ce969a8d 100755 --- a/examples/gui/fs2-gui.py +++ b/examples/gui/fs2-gui.py @@ -65,7 +65,7 @@ VIDEO=True CLIENT=1 SERVER=2 -TRANSMITTER="rawudp" +TRANSMITTER="nice" mycname = "".join((pwd.getpwuid(os.getuid())[0], "-" , @@ -485,6 +485,12 @@ class FsUIStream: self.connect.send_candidates_done(self.participant.id, self.id) def new_local_candidate(self, candidate): "Callback from FsStream" + if "." in candidate.ip: + print "IPv4 Candidate: " +candidate.ip + elif ":" in candidate.ip: + print "IPv6 Candidate: " +candidate.ip + else: + print "STRANGE Candidate: " +candidate.ip self.connect.send_candidate(self.participant.id, self.id, candidate) def __src_pad_added(self, stream, pad, codec): "Callback from FsStream" diff --git a/transmitters/nice/fs-nice-agent.c b/transmitters/nice/fs-nice-agent.c index 42fb4b1b..8b2e877d 100644 --- a/transmitters/nice/fs-nice-agent.c +++ b/transmitters/nice/fs-nice-agent.c @@ -336,7 +336,7 @@ fs_nice_agent_init_agent (FsNiceAgent *self, GError **error) if (!nice_agent_add_local_address (self->agent, addr)) { g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS, - "Unable to set preferred local candidate"); + "Unable to set preferred local candidate: %s", cand->ip); return FALSE; } set = TRUE; @@ -344,7 +344,7 @@ fs_nice_agent_init_agent (FsNiceAgent *self, GError **error) else { g_set_error (error, FS_ERROR, FS_ERROR_INVALID_ARGUMENTS, - "Invalid local address passed"); + "Invalid local address passed: %s", cand->ip); nice_address_free (addr); return FALSE; } @@ -352,7 +352,8 @@ fs_nice_agent_init_agent (FsNiceAgent *self, GError **error) } if (!set) - { GList *addresses = fs_interfaces_get_local_ips (FALSE); + { + GList *addresses = nice_interfaces_get_local_ips (FALSE); for (item = addresses; item; |