From 58be2a1de5339cae1240076267f0c50663e80843 Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 12 Jun 2006 20:24:27 +0000 Subject: [PATCH] check if master server address string is empty when sending heartbeats and master queries git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6472 d7cf8633-e32d-0410-b094-e92efae38249 --- netconn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netconn.c b/netconn.c index 22f4e749..a37505ca 100755 --- a/netconn.c +++ b/netconn.c @@ -2209,7 +2209,7 @@ void NetConn_QueryMasters(qboolean querydp, qboolean queryqw) // search internet for (masternum = 0;sv_masters[masternum].name;masternum++) { - if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]))) + if (sv_masters[masternum].string && sv_masters[masternum].string[0] && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]))) { masterquerycount++; NetConn_WriteString(cl_sockets[i], request, &masteraddress); @@ -2284,7 +2284,7 @@ void NetConn_Heartbeat(int priority) { nextheartbeattime = realtime + sv_heartbeatperiod.value; for (masternum = 0;sv_masters[masternum].name;masternum++) - if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && (mysocket = NetConn_ChooseServerSocketForAddress(&masteraddress))) + if (sv_masters[masternum].string && sv_masters[masternum].string[0] && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && (mysocket = NetConn_ChooseServerSocketForAddress(&masteraddress))) NetConn_WriteString(mysocket, "\377\377\377\377heartbeat DarkPlaces\x0A", &masteraddress); } } -- 2.39.2