eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Try to be a bit more verbose about why webrtc might be failing.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6340 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2023-01-09 05:15:12 +00:00
parent 7df2df5cd5
commit e257a9e231
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
engine/common/net_ice.c
View file

@ -759,9 +759,9 @@ static struct icestate_s *QDECL ICE_Create(void *module, const char *conname, co
{ {
if (addr[i].type == NA_IP || addr[i].type == NA_IPV6) if (addr[i].type == NA_IP || addr[i].type == NA_IPV6)
{ {
// if (flags[i] & ADDR_REFLEX) if (flags[i] & ADDR_REFLEX)
// ICE_AddLCandidateInfo(con, &addr[i], i, ICE_SRFLX); //FIXME: needs reladdr relport info ICE_AddLCandidateInfo(con, &addr[i], i, ICE_SRFLX); //FIXME: needs reladdr relport info
// else else
ICE_AddLCandidateInfo(con, &addr[i], i, ICE_HOST); ICE_AddLCandidateInfo(con, &addr[i], i, ICE_HOST);
} }
} }
@ -2129,10 +2129,10 @@ static qboolean QDECL ICE_Set(struct icestate_s *con, const char *prop, const ch
else if (net_enable_dtls.ival >= 3) else if (net_enable_dtls.ival >= 3)
{ //peer doesn't seem to support dtls. { //peer doesn't seem to support dtls.
con->state = ICE_FAILED; con->state = ICE_FAILED;
Con_Printf(CON_WARNING"WARNING: peer does not support dtls. Set net_enable_dtls to 0 to make optional.\n"); Con_Printf(CON_WARNING"WARNING: [%s]: peer does not support dtls. Set net_enable_dtls to 0 to make optional.\n", con->friendlyname);
} }
else if (con->state == ICE_CONNECTING && net_enable_dtls.ival>=2) else if (con->state == ICE_CONNECTING && net_enable_dtls.ival>=2)
Con_Printf(CON_WARNING"WARNING: peer does not support dtls.\n"); Con_Printf(CON_WARNING"WARNING: [%s]: peer does not support dtls.\n", con->friendlyname);
} }
if (!con->sctp && (!con->sctpoptional || !con->peersctpoptional) && con->mysctpport && con->peersctpport) if (!con->sctp && (!con->sctpoptional || !con->peersctpoptional) && con->mysctpport && con->peersctpport)
{ {
@ -2144,6 +2144,11 @@ static qboolean QDECL ICE_Set(struct icestate_s *con, const char *prop, const ch
Sys_RandomBytes((void*)&con->sctp->i.verifycode, sizeof(con->sctp->i.verifycode)); Sys_RandomBytes((void*)&con->sctp->i.verifycode, sizeof(con->sctp->i.verifycode));
} }
} }
else if (!con->dtlsstate && con->cred.peer.hash)
{
if (!con->peersctpoptional)
Con_Printf(CON_WARNING"WARNING: [%s]: peer is trying to use dtls.\n", con->friendlyname);
}
#endif #endif
} }
@ -3736,8 +3741,8 @@ static void SCTP_Decode(sctp_t *sctp, struct icestate_s *peer, ftenet_connection
break; break;
// case SCTP_TYPE_PONG: //we don't send pings // case SCTP_TYPE_PONG: //we don't send pings
case SCTP_TYPE_ABORT: case SCTP_TYPE_ABORT:
ICE_Set(peer, "state", STRINGIFY(ICE_FAILED));
SCTP_ErrorChunk(peer, "Abort", (struct sctp_errorcause_s*)(c+1), clen-sizeof(*c)); SCTP_ErrorChunk(peer, "Abort", (struct sctp_errorcause_s*)(c+1), clen-sizeof(*c));
ICE_Set(peer, "state", STRINGIFY(ICE_FAILED));
break; break;
case SCTP_TYPE_SHUTDOWN: //FIXME. we should send an ack... case SCTP_TYPE_SHUTDOWN: //FIXME. we should send an ack...
ICE_Set(peer, "state", STRINGIFY(ICE_FAILED)); ICE_Set(peer, "state", STRINGIFY(ICE_FAILED));