{CVAR_SAVE, "sv_master2", ""},
{CVAR_SAVE, "sv_master3", ""},
{CVAR_SAVE, "sv_master4", ""},
- {0, "sv_masterextra1", "69.59.212.88"},
- {0, "sv_masterextra2", "66.28.32.64"},
+ {0, "sv_masterextra1", "ghdigital.com"},
+ {0, "sv_masterextra2", "dpmaster.deathmask.net"},
{0, NULL, NULL}
};
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 */
{
int length = LHNET_Read(mysocket, data, maxlength, peeraddress);
int i;
- if (cl_fakepacketloss_receive.integer)
+ if (cl_netpacketloss.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)
- 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)
{
{
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)
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)
{
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))
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:
if (cls.connect_remainingtries == 0)
{
cls.connect_trying = false;
- if (m_state == m_slist)
- strcpy (m_return_reason, "Connect: Failed");
- else
- Con_Print("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_Print("Still trying...\n");
- }
- else
- {
- if (m_state == m_slist)
- strcpy (m_return_reason, "Connect: Trying");
- else
- Con_Print("Trying...\n");
- }
cls.connect_nextsendtime = realtime + 1;
cls.connect_remainingtries--;
// try challenge first (newer server)
{
Con_Print("Connection timed out\n");
CL_Disconnect();
+ Host_ShutdownServer (false);
}
for (conn = netconn_list;conn;conn = conn->next)
NetConn_ReSendMessage(conn);
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
if (!masterquerycount)
{
Con_Print("Unable to query master servers, no suitable network sockets active.\n");
- strcpy(m_return_reason, "No network");
+ M_Update_Return_Reason("No network");
}
}
{
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(&sv_heartbeatperiod);
for (i = 0;sv_masters[i].name;i++)
Cvar_RegisterVariable(&sv_masters[i]);
+// COMMANDLINEOPTION: Server: -ip <ipaddress> 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)
else
Con_Printf("-ip option used, but unable to parse the address \"%s\"\n", com_argv[i + 1]);
}
+// COMMANDLINEOPTION: Server: -port <portnumber> 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]);
projects / xonotic / darkplaces.git / blobdiff