X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.c;h=721b9a0299b594806837bda83e807786af8d139a;hp=df9e8b6a3c8666147c0022e4a18bf3e88b7e31cc;hb=93301e7f1c63b5183b3b1c6b242ed2bb566f647b;hpb=8abf1b158a01589db8bc74a7d1ecd501ae3845a0 diff --git a/netconn.c b/netconn.c index df9e8b6a..721b9a02 100755 --- a/netconn.c +++ b/netconn.c @@ -35,6 +35,7 @@ static cvar_t sv_masters [] = {CVAR_SAVE, "sv_master3", ""}, {CVAR_SAVE, "sv_master4", ""}, {0, "sv_masterextra1", "69.59.212.88"}, + {0, "sv_masterextra2", "66.28.32.64"}, {0, NULL, NULL} }; @@ -77,8 +78,8 @@ int serverreplycount = 0; int hostCacheCount = 0; hostcache_t hostcache[HOSTCACHESIZE]; -static qbyte sendbuffer[NET_MAXMESSAGE]; -static qbyte readbuffer[NET_MAXMESSAGE]; +static qbyte sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; +static qbyte readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; int cl_numsockets; lhnetsocket_t *cl_sockets[16]; @@ -89,12 +90,9 @@ netconn_t *netconn_list = NULL; mempool_t *netconn_mempool = NULL; cvar_t cl_netport = {0, "cl_port", "0"}; -cvar_t cl_netaddress = {0, "cl_netaddress", "0.0.0.0"}; -cvar_t cl_netaddress_ipv6 = {0, "cl_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:0"}; - cvar_t sv_netport = {0, "port", "26000"}; -cvar_t sv_netaddress = {0, "sv_netaddress", "0.0.0.0"}; -cvar_t sv_netaddress_ipv6 = {0, "sv_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:26000"}; +cvar_t net_address = {0, "net_address", "0.0.0.0"}; +//cvar_t net_netaddress_ipv6 = {0, "net_address_ipv6", "[0:0:0:0:0:0:0:0]"}; int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddress_t *peeraddress) { @@ -165,8 +163,8 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data) if (data->cursize == 0) Sys_Error("Datagram_SendMessage: zero length message\n"); - if (data->cursize > NET_MAXMESSAGE) - Sys_Error("Datagram_SendMessage: message too big %u\n", data->cursize); + if (data->cursize > (int)sizeof(conn->sendMessage)) + Sys_Error("Datagram_SendMessage: message too big (%u > %u)\n", data->cursize, sizeof(conn->sendMessage)); if (conn->canSend == false) Sys_Error("SendMessage: called with canSend == false\n"); @@ -191,7 +189,7 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data) header = (void *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence); - memcpy(sendbuffer + 8, conn->sendMessage, dataLen); + memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); conn->sendSequence++; conn->canSend = false; @@ -230,7 +228,7 @@ static void NetConn_SendMessageNext(netconn_t *conn) header = (void *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence); - memcpy(sendbuffer + 8, conn->sendMessage, dataLen); + memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); conn->sendSequence++; conn->sendNext = false; @@ -268,7 +266,7 @@ static void NetConn_ReSendMessage(netconn_t *conn) header = (void *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence - 1); - memcpy(sendbuffer + 8, conn->sendMessage, dataLen); + memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); conn->sendNext = false; @@ -290,20 +288,20 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data) int packetLen; int *header; -#ifdef DEBUG + packetLen = NET_HEADERSIZE + data->cursize; + +//#ifdef DEBUG if (data->cursize == 0) Sys_Error("Datagram_SendUnreliableMessage: zero length message\n"); - if (data->cursize > MAX_DATAGRAM) + if (packetLen > (int)sizeof(sendbuffer)) Sys_Error("Datagram_SendUnreliableMessage: message too big %u\n", data->cursize); -#endif - - packetLen = NET_HEADERSIZE + data->cursize; +//#endif header = (void *)sendbuffer; header[0] = BigLong(packetLen | NETFLAG_UNRELIABLE); header[1] = BigLong(conn->unreliableSendSequence); - memcpy(sendbuffer + 8, data->data, data->cursize); + memcpy(sendbuffer + NET_HEADERSIZE, data->data, data->cursize); conn->unreliableSendSequence++; @@ -353,9 +351,9 @@ void NetConn_OpenClientPorts(void) if (cl_netport.integer != port) Cvar_SetValueQuick(&cl_netport, port); Con_Printf("Client using port %i\n", port); - NetConn_OpenClientPort("local", port); - NetConn_OpenClientPort(cl_netaddress.string, port); - NetConn_OpenClientPort(cl_netaddress_ipv6.string, port); + NetConn_OpenClientPort("local:2", 0); + NetConn_OpenClientPort(net_address.string, port); + //NetConn_OpenClientPort(net_address_ipv6.string, port); } void NetConn_CloseServerPorts(void) @@ -399,11 +397,11 @@ void NetConn_OpenServerPorts(int opennetports) if (sv_netport.integer != port) Cvar_SetValueQuick(&sv_netport, port); if (cls.state != ca_dedicated) - NetConn_OpenServerPort("local", port); + NetConn_OpenServerPort("local:1", 0); if (opennetports) { - NetConn_OpenServerPort(sv_netaddress.string, port); - NetConn_OpenServerPort(sv_netaddress_ipv6.string, port); + NetConn_OpenServerPort(net_address.string, port); + //NetConn_OpenServerPort(net_address_ipv6.string, port); } if (sv_numsockets == 0) Host_Error("NetConn_OpenServerPorts: unable to open any ports!\n"); @@ -433,6 +431,11 @@ netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) conn = Mem_Alloc(netconn_mempool, sizeof(*conn)); conn->mysocket = mysocket; conn->peeraddress = *peeraddress; + // updated by receiving "rate" command from client + conn->rate = NET_MINRATE; + // no limits for local player + if (LHNETADDRESS_GetAddressType(peeraddress) == LHNETADDRESSTYPE_LOOP) + conn->rate = 1000000000; conn->canSend = true; conn->connecttime = realtime; conn->lastMessageTime = realtime; @@ -480,7 +483,7 @@ static void NetConn_UpdateServerStuff(void) { clientport2 = cl_netport.integer; if (cls.state == ca_connected) - Con_Printf("Changing \"cl_port\" will not take effect until you reconnect.\n"); + Con_Print("Changing \"cl_port\" will not take effect until you reconnect.\n"); } if (cls.state == ca_disconnected && clientport != clientport2) { @@ -495,7 +498,7 @@ static void NetConn_UpdateServerStuff(void) { hostport = sv_netport.integer; if (sv.active) - Con_Printf("Changing \"port\" will not take effect until \"map\" command is executed.\n"); + Con_Print("Changing \"port\" will not take effect until \"map\" command is executed.\n"); } } @@ -540,7 +543,7 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) } } else - Con_DPrintf("Got a stale datagram\n"); + Con_DPrint("Got a stale datagram\n"); return 1; } else if (flags & NETFLAG_ACK) @@ -551,7 +554,7 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) { conn->ackSequence++; if (conn->ackSequence != conn->sendSequence) - Con_DPrintf("ack sequencing error\n"); + Con_DPrint("ack sequencing error\n"); conn->lastMessageTime = realtime; conn->timeout = realtime + net_messagetimeout.value; conn->sendMessageLength -= MAX_PACKETFRAGMENT; @@ -568,10 +571,10 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) } } else - Con_DPrintf("Duplicate ACK received\n"); + Con_DPrint("Duplicate ACK received\n"); } else - Con_DPrintf("Stale ACK received\n"); + Con_DPrint("Stale ACK received\n"); return 1; } else if (flags & NETFLAG_DATA) @@ -762,7 +765,7 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, length -= 18; masterreplycount++; if (m_state != m_slist) - Con_Printf("received server list...\n"); + Con_Print("received server list...\n"); while (length >= 7 && data[0] == '\\' && (data[1] != 0xFF || data[2] != 0xFF || data[3] != 0xFF || data[4] != 0xFF) && data[5] * 256 + data[6] != 0) { snprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[1], data[2], data[3], data[4], (data[5] << 8) | data[6]); @@ -797,8 +800,8 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, hostcache[n].ping = 100000; hostcache[n].querytime = realtime; // build description strings for the things users care about - snprintf(hostcache[n].line1, sizeof(hostcache[n].line1), "?"); - snprintf(hostcache[n].line2, sizeof(hostcache[n].line2), "%s", ipstring); + strncpy(hostcache[n].line1, "?", sizeof(hostcache[n].line1)); + strncpy(hostcache[n].line2, ipstring, sizeof(hostcache[n].line2)); // if not in the slist menu we should print the server to console if (m_state != m_slist) Con_Printf("querying %s\n", ipstring); @@ -944,7 +947,7 @@ void NetConn_ClientFrame(void) if (m_state == m_slist) strcpy (m_return_reason, "Connect: Failed"); else - Con_Printf("Connect failed\n"); + Con_Print("Connect failed\n"); return; } if (cls.connect_nextsendtime) @@ -952,14 +955,14 @@ void NetConn_ClientFrame(void) if (m_state == m_slist) strcpy (m_return_reason, "Connect: Still trying"); else - Con_Printf("Still trying...\n"); + Con_Print("Still trying...\n"); } else { if (m_state == m_slist) strcpy (m_return_reason, "Connect: Trying"); else - Con_Printf("Trying...\n"); + Con_Print("Trying...\n"); } cls.connect_nextsendtime = realtime + 1; cls.connect_remainingtries--; @@ -981,7 +984,7 @@ void NetConn_ClientFrame(void) NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress); if (cls.netcon && realtime > cls.netcon->timeout) { - Con_Printf("Connection timed out\n"); + Con_Print("Connection timed out\n"); CL_Disconnect(); } for (conn = netconn_list;conn;conn = conn->next) @@ -1466,7 +1469,7 @@ void NetConn_QueryMasters(void) } if (!masterquerycount) { - Con_Printf("Unable to query master servers, no suitable network sockets active.\n"); + Con_Print("Unable to query master servers, no suitable network sockets active.\n"); strcpy(m_return_reason, "No network"); } } @@ -1544,7 +1547,7 @@ static void Net_Heartbeat_f(void) if (sv.active) NetConn_Heartbeat(2); else - Con_Printf("No server running, can not heartbeat to master server.\n"); + Con_Print("No server running, can not heartbeat to master server.\n"); } void PrintStats(netconn_t *conn) @@ -1564,7 +1567,7 @@ void Net_Stats_f(void) Con_Printf("packetsReceived = %i\n", packetsReceived); Con_Printf("receivedDuplicateCount = %i\n", receivedDuplicateCount); Con_Printf("droppedDatagrams = %i\n", droppedDatagrams); - Con_Printf("connections =\n"); + Con_Print("connections =\n"); for (conn = netconn_list;conn;conn = conn->next) PrintStats(conn); } @@ -1579,10 +1582,10 @@ void Net_Slist_f(void) hostCacheCount = 0; memset(&pingcache, 0, sizeof(pingcache)); if (m_state != m_slist) - Con_Printf("Sending requests to master servers\n"); + Con_Print("Sending requests to master servers\n"); NetConn_QueryMasters(); if (m_state != m_slist) - Con_Printf("Listening for replies...\n"); + Con_Print("Listening for replies...\n"); } void NetConn_Init(void) @@ -1605,11 +1608,9 @@ void NetConn_Init(void) Cvar_RegisterVariable(&hostname); Cvar_RegisterVariable(&developer_networking); Cvar_RegisterVariable(&cl_netport); - Cvar_RegisterVariable(&cl_netaddress); - Cvar_RegisterVariable(&cl_netaddress_ipv6); Cvar_RegisterVariable(&sv_netport); - Cvar_RegisterVariable(&sv_netaddress); - Cvar_RegisterVariable(&sv_netaddress_ipv6); + Cvar_RegisterVariable(&net_address); + //Cvar_RegisterVariable(&net_address_ipv6); Cvar_RegisterVariable(&sv_public); Cvar_RegisterVariable(&sv_heartbeatperiod); for (i = 0;sv_masters[i].name;i++) @@ -1618,9 +1619,8 @@ void NetConn_Init(void) { if (LHNETADDRESS_FromString(&tempaddress, com_argv[i + 1], 0) == 1) { - Con_Printf("-ip option used, setting cl_netaddress and sv_netaddress to address \"%s\"\n"); - Cvar_SetQuick(&cl_netaddress, com_argv[i + 1]); - Cvar_SetQuick(&sv_netaddress, com_argv[i + 1]); + Con_Printf("-ip option used, setting net_address to \"%s\"\n"); + Cvar_SetQuick(&net_address, com_argv[i + 1]); } else Con_Printf("-ip option used, but unable to parse the address \"%s\"\n", com_argv[i + 1]);