X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=netconn.c;h=e3fe3123a17369ce93d596ff566e8c3e24db504d;hb=5bdc0879026939f551a3ff217064732d59731be2;hp=32e2f89a5c6aac24b026478b5a437a2b1da893f2;hpb=94ef24d15ac9ce33c556634aae290fe921b1b4ef;p=xonotic%2Fdarkplaces.git diff --git a/netconn.c b/netconn.c index 32e2f89a..e3fe3123 100755 --- a/netconn.c +++ b/netconn.c @@ -28,13 +28,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. cvar_t sv_public = {0, "sv_public", "0"}; static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "180"}; +// FIXME: resolve DNS on masters whenever their value changes and cache it (to avoid major delays in active servers when they heartbeat) static cvar_t sv_masters [] = { {CVAR_SAVE, "sv_master1", ""}, {CVAR_SAVE, "sv_master2", ""}, {CVAR_SAVE, "sv_master3", ""}, {CVAR_SAVE, "sv_master4", ""}, - {0, "sv_masterextra1", "198.88.152.4"}, + {0, "sv_masterextra1", "69.59.212.88"}, // ghdigital.com + {0, "sv_masterextra2", "66.169.205.13"}, // dpmaster.deathmask.net {0, NULL, NULL} }; @@ -48,12 +50,8 @@ cvar_t net_connecttimeout = {0, "net_connecttimeout","10"}; cvar_t hostname = {CVAR_SAVE, "hostname", "UNNAMED"}; cvar_t developer_networking = {0, "developer_networking", "0"}; -cvar_t cl_fakelocalping_min = {0, "cl_fakelocalping_min","0"}; -cvar_t cl_fakelocalping_max = {0, "cl_fakelocalping_max","0"}; -static cvar_t cl_fakepacketloss_receive = {0, "cl_fakepacketloss_receive","0"}; -static cvar_t cl_fakepacketloss_send = {0, "cl_fakepacketloss_send","0"}; -static cvar_t sv_fakepacketloss_receive = {0, "sv_fakepacketloss_receive","0"}; -static cvar_t sv_fakepacketloss_send = {0, "sv_fakepacketloss_send","0"}; +cvar_t cl_netlocalping = {0, "cl_netlocalping","0"}; +static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0"}; /* statistic counters */ @@ -77,8 +75,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,24 +87,17 @@ 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) { int length = LHNET_Read(mysocket, data, maxlength, peeraddress); int i; - if (cl_fakepacketloss_receive.integer) - for (i = 0;i < cl_numsockets;i++) - if (cl_sockets[i] == mysocket && (rand() % 100) < cl_fakepacketloss_receive.integer) - return 0; - if (sv_fakepacketloss_receive.integer) + if (cl_netpacketloss.integer) for (i = 0;i < cl_numsockets;i++) - if (sv_sockets[i] == mysocket && (rand() % 100) < sv_fakepacketloss_receive.integer) + if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer) return 0; if (developer_networking.integer && length != 0) { @@ -128,13 +119,9 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l { int ret; int i; - if (cl_fakepacketloss_send.integer) - for (i = 0;i < cl_numsockets;i++) - if (cl_sockets[i] == mysocket && (rand() % 100) < cl_fakepacketloss_send.integer) - return length; - if (sv_fakepacketloss_send.integer) + if (cl_netpacketloss.integer) for (i = 0;i < cl_numsockets;i++) - if (sv_sockets[i] == mysocket && (rand() % 100) < sv_fakepacketloss_send.integer) + if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer) return length; ret = LHNET_Write(mysocket, data, length, peeraddress); if (developer_networking.integer) @@ -165,8 +152,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 +178,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 +217,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 +255,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 +277,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 +340,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 +386,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"); @@ -434,7 +421,6 @@ netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) conn->mysocket = mysocket; conn->peeraddress = *peeraddress; conn->canSend = true; - conn->connecttime = realtime; conn->lastMessageTime = realtime; // LordHavoc: (inspired by ProQuake) use a short connect timeout to // reduce effectiveness of connection request floods @@ -480,7 +466,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 +481,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 +526,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 +537,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 +554,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) @@ -612,16 +598,19 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) { + cls.connect_trying = false; + M_Update_Return_Reason(""); + // the connection request succeeded, stop current connection and set up a new connection + CL_Disconnect(); cls.netcon = NetConn_Open(mysocket, peeraddress); Con_Printf("Connection accepted to %s\n", cls.netcon->address); key_dest = key_game; m_state = m_none; - cls.connect_trying = false; cls.demonum = -1; // not in the demo loop now cls.state = ca_connected; cls.signon = 0; // need all the signon messages before playing CL_ClearState(); - Host_Reconnect_f(); + SCR_BeginLoadingPlaque(); } int NetConn_IsLocalGame(void) @@ -668,22 +657,25 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true); Con_Printf("\"%s\" received, sending connect request back to %s\n", string, addressstring2); + M_Update_Return_Reason("Got challenge response"); NetConn_WriteString(mysocket, va("\377\377\377\377connect\\protocol\\darkplaces 3\\challenge\\%s", string + 10), peeraddress); return true; } if (length == 6 && !memcmp(string, "accept", 6) && cls.connect_trying) { + M_Update_Return_Reason("Accepted"); NetConn_ConnectionEstablished(mysocket, peeraddress); return true; } if (length > 7 && !memcmp(string, "reject ", 7) && cls.connect_trying) { + char rejectreason[32]; cls.connect_trying = false; string += 7; - length = max(length - 7, (int)sizeof(m_return_reason) - 1); - memcpy(m_return_reason, string, length); - m_return_reason[length] = 0; - Con_Printf("%s\n", m_return_reason); + length = max(length - 7, (int)sizeof(rejectreason) - 1); + memcpy(rejectreason, string, length); + rejectreason[length] = 0; + M_Update_Return_Reason(rejectreason); return true; } if (length >= 13 && !memcmp(string, "infoResponse\x0A", 13)) @@ -762,7 +754,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 +789,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); + strlcpy (hostcache[n].line1, "?", sizeof (hostcache[n].line1)); + strlcpy (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); @@ -862,14 +854,15 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, length -= 4; LHNETADDRESS_SetPort(&clientportaddress, port); } + M_Update_Return_Reason("Accepted"); NetConn_ConnectionEstablished(mysocket, &clientportaddress); } break; case CCREP_REJECT: if (developer.integer) Con_Printf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2); - Con_Printf("%s\n", data); - strlcpy (m_return_reason, data, sizeof (m_return_reason)); + cls.connect_trying = false; + M_Update_Return_Reason(data); break; #if 0 case CCREP_SERVER_INFO: @@ -941,26 +934,9 @@ void NetConn_ClientFrame(void) if (cls.connect_remainingtries == 0) { cls.connect_trying = false; - if (m_state == m_slist) - strcpy (m_return_reason, "Connect: Failed"); - else - Con_Printf("Connect failed\n"); + M_Update_Return_Reason("Connect: Failed"); return; } - if (cls.connect_nextsendtime) - { - if (m_state == m_slist) - strcpy (m_return_reason, "Connect: Still trying"); - else - Con_Printf("Still trying...\n"); - } - else - { - if (m_state == m_slist) - strcpy (m_return_reason, "Connect: Trying"); - else - Con_Printf("Trying...\n"); - } cls.connect_nextsendtime = realtime + 1; cls.connect_remainingtries--; // try challenge first (newer server) @@ -981,8 +957,9 @@ 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(); + Host_ShutdownServer (false); } for (conn = netconn_list;conn;conn = conn->next) NetConn_ReSendMessage(conn); @@ -1012,7 +989,6 @@ static void NetConn_BuildChallengeString(char *buffer, int bufferlength) buffer[i] = 0; } -extern void SV_ConnectClient(int clientnum, netconn_t *netconnection); int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress) { int i, n, ret, clientnum, responselength, best; @@ -1091,7 +1067,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (clientnum < svs.maxclients) { // duplicate connection request - if (realtime - client->netconnection->connecttime < 2.0) + if (realtime - client->connecttime < 2.0) { // client is still trying to connect, // so we send a duplicate reply @@ -1115,21 +1091,16 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (clientnum < svs.maxclients) { // prepare the client struct - if ((client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool))) + if ((conn = NetConn_Open(mysocket, peeraddress))) { - if ((conn = NetConn_Open(mysocket, peeraddress))) - { - // allocated connection - LHNETADDRESS_ToString(peeraddress, conn->address, sizeof(conn->address), true); - if (developer.integer) - Con_Printf("Datagram_ParseConnectionless: sending \"accept\" to %s.\n", conn->address); - NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress); - // now set up the client - SV_ConnectClient(clientnum, conn); - NetConn_Heartbeat(1); - } - else - EntityFrame4_FreeDatabase(client->entitydatabase4); + // allocated connection + LHNETADDRESS_ToString(peeraddress, conn->address, sizeof(conn->address), true); + if (developer.integer) + Con_Printf("Datagram_ParseConnectionless: sending \"accept\" to %s.\n", conn->address); + NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress); + // now set up the client + SV_ConnectClient(clientnum, conn); + NetConn_Heartbeat(1); } } else @@ -1223,7 +1194,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (clientnum < svs.maxclients) { // duplicate connection request - if (realtime - client->netconnection->connecttime < 2.0) + if (realtime - client->connecttime < 2.0) { // client is still trying to connect, // so we send a duplicate reply @@ -1337,8 +1308,8 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, MSG_WriteString(&net_message, client->name); MSG_WriteLong(&net_message, client->colors); MSG_WriteLong(&net_message, (int)client->edict->v->frags); - MSG_WriteLong(&net_message, (int)(realtime - client->netconnection->connecttime)); - MSG_WriteString(&net_message, client->netconnection->address); + MSG_WriteLong(&net_message, (int)(realtime - client->connecttime)); + MSG_WriteString(&net_message, client->netconnection ? client->netconnection->address : "botclient"); *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK)); NetConn_Write(mysocket, net_message.data, net_message.cursize, peeraddress); SZ_Clear(&net_message); @@ -1386,7 +1357,6 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { if (host_client->netconnection && host_client->netconnection->mysocket == mysocket && !LHNETADDRESS_Compare(&host_client->netconnection->peeraddress, peeraddress)) { - sv_player = host_client->edict; if ((ret = NetConn_ReceivedMessage(host_client->netconnection, data, length)) == 2) SV_ReadClientMessage(); return ret; @@ -1408,10 +1378,9 @@ void NetConn_ServerFrame(void) for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { // never timeout loopback connections - if (host_client->netconnection && realtime > host_client->netconnection->timeout && LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(host_client->netconnection->mysocket)) != LHNETADDRESSTYPE_LOOP) + if (host_client->netconnection && realtime > host_client->netconnection->timeout && LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP) { Con_Printf("Client \"%s\" connection timed out\n", host_client->name); - sv_player = host_client->edict; SV_DropClient(false); } } @@ -1466,8 +1435,8 @@ void NetConn_QueryMasters(void) } if (!masterquerycount) { - Con_Printf("Unable to query master servers, no suitable network sockets active.\n"); - strcpy(m_return_reason, "No network"); + Con_Print("Unable to query master servers, no suitable network sockets active.\n"); + M_Update_Return_Reason("No network"); } } @@ -1544,7 +1513,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 +1533,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,52 +1548,47 @@ 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) { int i; lhnetaddress_t tempaddress; - netconn_mempool = Mem_AllocPool("Networking"); + netconn_mempool = Mem_AllocPool("Networking", 0, NULL); Cmd_AddCommand("net_stats", Net_Stats_f); Cmd_AddCommand("net_slist", Net_Slist_f); Cmd_AddCommand("heartbeat", Net_Heartbeat_f); Cvar_RegisterVariable(&net_messagetimeout); Cvar_RegisterVariable(&net_messagerejointimeout); Cvar_RegisterVariable(&net_connecttimeout); - Cvar_RegisterVariable(&cl_fakelocalping_min); - Cvar_RegisterVariable(&cl_fakelocalping_max); - Cvar_RegisterVariable(&cl_fakepacketloss_receive); - Cvar_RegisterVariable(&cl_fakepacketloss_send); - Cvar_RegisterVariable(&sv_fakepacketloss_receive); - Cvar_RegisterVariable(&sv_fakepacketloss_send); + Cvar_RegisterVariable(&cl_netlocalping); + Cvar_RegisterVariable(&cl_netpacketloss); 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++) Cvar_RegisterVariable(&sv_masters[i]); +// COMMANDLINEOPTION: Server: -ip sets the ip address of this machine for purposes of networking (default 0.0.0.0 also known as INADDR_ANY), use only if you have multiple network adapters and need to choose one specifically. if ((i = COM_CheckParm("-ip")) && i + 1 < com_argc) { 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]); } +// COMMANDLINEOPTION: Server: -port sets the port to use for a server (default 26000, the same port as QUAKE itself), useful if you host multiple servers on your machine if (((i = COM_CheckParm("-port")) || (i = COM_CheckParm("-ipport")) || (i = COM_CheckParm("-udpport"))) && i + 1 < com_argc) { i = atoi(com_argv[i + 1]);