X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=netconn.c;h=1ec19fcdb7d5cc372117b67c83c1673888a6c6ac;hb=8507719df58bf767983c92ecfa32a70090bf501e;hp=f3c64322e42a5a527aa6383e1b59438ca0214d1e;hpb=f13419f00e3f8335e9a25498560a433597f28f50;p=xonotic%2Fdarkplaces.git

diff --git a/netconn.c b/netconn.c
index f3c64322..1ec19fcd 100755
--- a/netconn.c
+++ b/netconn.c
@@ -1146,36 +1146,51 @@ void NetConn_Close(netconn_t *conn)
 static int clientport = -1;
 static int clientport2 = -1;
 static int hostport = -1;
-void NetConn_UpdateSockets(void)
-{
-	int i, j;
 
-	// TODO add logic to automatically close sockets if needed
-	LHNET_DefaultDSCP(net_tos_dscp.integer);
+// Call on disconnect, during startup, or if cl_netport is changed
+void NetConn_UpdateSockets_Client(void)
+{
+	if (cls.state == ca_disconnected && clientport != clientport2)
+	{
+		clientport = clientport2;
+		NetConn_CloseClientPorts();
+	}
+	if (cl_numsockets == 0)
+		NetConn_OpenClientPorts();
+}
 
-	if (cls.state != ca_dedicated)
+// Call when cl_port is changed
+static void NetConn_cl_netport_Callback(cvar_t *var)
+{
+	if(cls.state != ca_dedicated)
 	{
-		if (clientport2 != cl_netport.integer)
+		if (clientport2 != var->integer)
 		{
-			clientport2 = cl_netport.integer;
+			clientport2 = var->integer;
 			if (cls.state == ca_connected)
 				Con_Print("Changing \"cl_port\" will not take effect until you reconnect.\n");
 		}
-		if (cls.state == ca_disconnected && clientport != clientport2)
-		{
-			clientport = clientport2;
-			NetConn_CloseClientPorts();
-		}
-		if (cl_numsockets == 0)
-			NetConn_OpenClientPorts();
+		NetConn_UpdateSockets_Client();
 	}
+}
 
-	if (hostport != sv_netport.integer)
+// Call when port is changed
+static void NetConn_sv_netport_Callback(cvar_t *var)
+{
+	if (hostport != var->integer)
 	{
-		hostport = sv_netport.integer;
+		hostport = var->integer;
 		if (sv.active)
 			Con_Print("Changing \"port\" will not take effect until \"map\" command is executed.\n");
 	}
+}
+
+void NetConn_UpdateSockets(void)
+{
+	int i, j;
+
+	// TODO add logic to automatically close sockets if needed
+	LHNET_DefaultDSCP(net_tos_dscp.integer);
 
 	for (j = 0;j < MAX_RCONS;j++)
 	{
@@ -1512,13 +1527,9 @@ static void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_
 #ifdef CONFIG_MENU
 	M_Update_Return_Reason("");
 #endif
-	// if we're connecting to a remote server, shut down any local server
-	if (LHNETADDRESS_GetAddressType(peeraddress) != LHNETADDRESSTYPE_LOOP && sv.active)
-	{
-		SV_LockThreadMutex();
-		SV_Shutdown ();
-		SV_UnlockThreadMutex();
-	}
+	// Disconnect from the current server or stop demo playback
+	if(cls.state == ca_connected || cls.demoplayback)
+		CL_Disconnect();
 	// allocate a net connection to keep track of things
 	cls.netcon = NetConn_Open(mysocket, peeraddress);
 	crypto = &cls.netcon->crypto;
@@ -2480,9 +2491,6 @@ void NetConn_ClientFrame(void)
 	{
 		Con_Print("Connection timed out\n");
 		CL_Disconnect();
-		SV_LockThreadMutex();
-		SV_Shutdown ();
-		SV_UnlockThreadMutex();
 	}
 }
 
@@ -2921,7 +2929,7 @@ static void RCon_Execute(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress, c
 			if(l)
 			{
 				client_t *host_client_save = host_client;
-				Cmd_ExecuteString(&cmd_server, s, src_local, true);
+				Cmd_ExecuteString(cmd_local, s, src_local, true);
 				host_client = host_client_save;
 				// in case it is a command that changes host_client (like restart)
 			}
@@ -3608,15 +3616,6 @@ void NetConn_ServerFrame(void)
 	for (i = 0;i < sv_numsockets;i++)
 		while (sv_sockets[i] && (length = NetConn_Read(sv_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0)
 			NetConn_ServerParsePacket(sv_sockets[i], readbuffer, length, &peeraddress);
-	for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
-	{
-		// never timeout loopback connections
-		if (host_client->netconnection && host.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_DropClient(false);
-		}
-	}
 }
 
 void NetConn_SleepMicroseconds(int microseconds)
@@ -3892,8 +3891,9 @@ void NetConn_Init(void)
 	Cvar_RegisterCallback(&net_slist_favorites, NetConn_UpdateFavorites_c);
 #endif
 	Cvar_RegisterVariable(&net_slist_pause);
-	if(LHNET_DefaultDSCP(-1) >= 0) // register cvar only if supported
-		Cvar_RegisterVariable(&net_tos_dscp);
+#ifdef IP_TOS // register cvar only if supported
+	Cvar_RegisterVariable(&net_tos_dscp);
+#endif
 	Cvar_RegisterVariable(&net_messagetimeout);
 	Cvar_RegisterVariable(&net_connecttimeout);
 	Cvar_RegisterVariable(&net_connectfloodblockingtimeout);
@@ -3903,13 +3903,15 @@ void NetConn_Init(void)
 	Cvar_RegisterVariable(&net_fakelag);
 	Cvar_RegisterVariable(&net_fakeloss_send);
 	Cvar_RegisterVariable(&net_fakeloss_receive);
-	Cvar_RegisterAlias(&net_fakelag, "cl_netlocalping");
-	Cvar_RegisterAlias(&net_fakeloss_send, "cl_netpacketloss_send");
-	Cvar_RegisterAlias(&net_fakeloss_receive, "cl_netpacketloss_receive");
+	Cvar_RegisterVirtual(&net_fakelag, "cl_netlocalping");
+	Cvar_RegisterVirtual(&net_fakeloss_send, "cl_netpacketloss_send");
+	Cvar_RegisterVirtual(&net_fakeloss_receive, "cl_netpacketloss_receive");
 	Cvar_RegisterVariable(&hostname);
 	Cvar_RegisterVariable(&developer_networking);
 	Cvar_RegisterVariable(&cl_netport);
+	Cvar_RegisterCallback(&cl_netport, NetConn_cl_netport_Callback);
 	Cvar_RegisterVariable(&sv_netport);
+	Cvar_RegisterCallback(&sv_netport, NetConn_sv_netport_Callback);
 	Cvar_RegisterVariable(&net_address);
 	Cvar_RegisterVariable(&net_address_ipv6);
 	Cvar_RegisterVariable(&sv_public);