Commit 7715ef44 authored by Dafydd Harries's avatar Dafydd Harries

pass stream to _handle_stun

darcs-hash:20070205124744-c9803-98f1dc826646eff707be8f06157405d1b631133a.gz
parent c0f689a4
...@@ -371,6 +371,7 @@ _stream_lookup (NiceAgent *agent, guint stream_id) ...@@ -371,6 +371,7 @@ _stream_lookup (NiceAgent *agent, guint stream_id)
static void static void
_handle_stun ( _handle_stun (
NiceAgent *agent, NiceAgent *agent,
Stream *stream,
NiceCandidate *local, NiceCandidate *local,
struct sockaddr_in from, struct sockaddr_in from,
StunMessage *msg) StunMessage *msg)
...@@ -548,16 +549,17 @@ _nice_agent_recv ( ...@@ -548,16 +549,17 @@ _nice_agent_recv (
* version number is 2. The top two bits of a STUN message are always 0. * version number is 2. The top two bits of a STUN message are always 0.
*/ */
Stream *stream;
stream = _stream_lookup (agent, candidate->stream_id);
if (stream == NULL)
/* odd: a candidate that doesn't belong to a stream */
return;
if ((buf[0] & 0xc0) == 0x80) if ((buf[0] & 0xc0) == 0x80)
{ {
/* looks like RTP */ /* looks like RTP */
Stream *stream;
stream = _stream_lookup (agent, candidate->stream_id);
if (stream == NULL)
/* odd: a candidate that doesn't belong to a stream */
return;
/* XXX: should a NULL data handler be permitted? */ /* XXX: should a NULL data handler be permitted? */
g_assert (stream->handle_recv != NULL); g_assert (stream->handle_recv != NULL);
...@@ -578,7 +580,7 @@ _nice_agent_recv ( ...@@ -578,7 +580,7 @@ _nice_agent_recv (
/* XXX: handle the case where the incoming packet is a response for a /* XXX: handle the case where the incoming packet is a response for a
* binding request we sent */ * binding request we sent */
_handle_stun (agent, candidate, from, msg); _handle_stun (agent, stream, candidate, from, msg);
stun_message_free (msg); stun_message_free (msg);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment