diff --git a/src/d_net.c b/src/d_net.c index d6b0e2f80..f05cc407f 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -64,6 +64,9 @@ static doomdata_t reboundstore[MAXREBOUND]; static INT16 reboundsize[MAXREBOUND]; static INT32 rebound_head, rebound_tail; +/// \brief bandwith of netgame +INT32 net_bandwidth; + /// \brief max length per packet INT16 hardware_MAXPACKETLENGTH; @@ -1264,7 +1267,10 @@ void D_SetDoomcom(void) { if (doomcom) return; doomcom = Z_Calloc(sizeof (doomcom_t), PU_STATIC, NULL); + doomcom->id = DOOMCOM_ID; doomcom->numslots = doomcom->numnodes = 1; + doomcom->gametype = 0; + doomcom->consoleplayer = 0; doomcom->extratics = 0; } @@ -1288,6 +1294,7 @@ boolean D_CheckNetGame(void) I_NetMakeNodewPort = NULL; hardware_MAXPACKETLENGTH = MAXPACKETLENGTH; + net_bandwidth = 30000; // I_InitNetwork sets doomcom and netgame // check and initialize the network driver multiplayer = false; @@ -1307,6 +1314,7 @@ boolean D_CheckNetGame(void) server = true; // WTF? server always true??? // no! The deault mode is server. Client is set elsewhere // when the client executes connect command. + doomcom->ticdup = 1; if (M_CheckParm("-extratic")) { @@ -1317,6 +1325,21 @@ boolean D_CheckNetGame(void) CONS_Printf(M_GetText("Set extratics to %d\n"), doomcom->extratics); } + if (M_CheckParm("-bandwidth")) + { + if (M_IsNextParm()) + { + net_bandwidth = atoi(M_GetNextParm()); + if (net_bandwidth < 1000) + net_bandwidth = 1000; + if (net_bandwidth > 100000) + hardware_MAXPACKETLENGTH = MAXPACKETLENGTH; + CONS_Printf(M_GetText("Network bandwidth set to %d\n"), net_bandwidth); + } + else + I_Error("usage: -bandwidth "); + } + software_MAXPACKETLENGTH = hardware_MAXPACKETLENGTH; if (M_CheckParm("-packetsize")) { @@ -1336,6 +1359,8 @@ boolean D_CheckNetGame(void) if (netgame) multiplayer = true; + if (doomcom->id != DOOMCOM_ID) + I_Error("Doomcom buffer invalid!"); if (doomcom->numnodes > MAXNETNODES) I_Error("Too many nodes (%d), max:%d", doomcom->numnodes, MAXNETNODES); @@ -1348,7 +1373,7 @@ boolean D_CheckNetGame(void) if (M_CheckParm("-debugfile")) { char filename[21]; - INT32 k = consoleplayer - 1; + INT32 k = doomcom->consoleplayer - 1; if (M_IsNextParm()) k = atoi(M_GetNextParm()) - 1; while (!debugfile && k < MAXPLAYERS) diff --git a/src/d_netfil.c b/src/d_netfil.c index e488e083e..223a74066 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -837,6 +837,7 @@ void SV_FileSendTicker(void) netbuffer->packettype = PT_FILEFRAGMENT; + // (((sendbytes-nowsentbyte)*TICRATE)/(I_GetTime()-starttime)<(UINT32)net_bandwidth) while (packetsent-- && filestosend != 0) { for (i = currentnode, j = 0; j < MAXNETNODES; diff --git a/src/i_net.h b/src/i_net.h index 504936a3b..931392580 100644 --- a/src/i_net.h +++ b/src/i_net.h @@ -34,6 +34,7 @@ #define NO_BAN_TIME (time_t)(-1) extern INT16 hardware_MAXPACKETLENGTH; +extern INT32 net_bandwidth; // in byte/s #if defined(_MSC_VER) #pragma pack(1) @@ -41,17 +42,36 @@ extern INT16 hardware_MAXPACKETLENGTH; typedef struct { + /// Supposed to be DOOMCOM_ID + INT32 id; + + /// SRB2 executes an INT32 to execute commands. + INT16 intnum; + /// Communication between SRB2 and the driver. + /// Is CMD_SEND or CMD_GET. + INT16 command; /// Is dest for send, set by get (-1 = no packet). INT16 remotenode; + /// Number of bytes in doomdata to be sent INT16 datalength; /// Info common to all nodes. /// Console is always node 0. INT16 numnodes; + /// Flag: 1 = no duplication, 2-5 = dup for slow nets. + INT16 ticdup; /// Flag: 1 = send a backup tic in every packet. INT16 extratics; + /// kind of game + INT16 gametype; + /// Flag: -1 = new game, 0-5 = load savegame + INT16 savegame; + /// currect map + INT16 map; + /// Info specific to this node. + INT16 consoleplayer; /// Number of "slots": the highest player number in use plus one. INT16 numslots; diff --git a/src/i_tcp.c b/src/i_tcp.c index 54c446258..add396730 100644 --- a/src/i_tcp.c +++ b/src/i_tcp.c @@ -1642,6 +1642,8 @@ boolean I_InitTcpNetwork(void) // FIXME: for dedicated server, numnodes needs to be set to 0 upon start if (dedicated) doomcom->numnodes = 0; +/* else if (M_IsNextParm()) + doomcom->numnodes = (INT16)atoi(M_GetNextParm());*/ else doomcom->numnodes = 1; @@ -1655,6 +1657,7 @@ boolean I_InitTcpNetwork(void) // FIXME: // ??? and now ? // server on a big modem ??? 4*isdn + net_bandwidth = 16000; hardware_MAXPACKETLENGTH = INETPACKETLENGTH; ret = true; @@ -1681,6 +1684,7 @@ boolean I_InitTcpNetwork(void) // so we're on a LAN COM_BufAddText("connect any\n"); + net_bandwidth = 800000; hardware_MAXPACKETLENGTH = MAXPACKETLENGTH; } } @@ -1705,6 +1709,8 @@ boolean I_InitTcpNetwork(void) { // so we're on a LAN COM_BufAddText("connect any\n"); + + net_bandwidth = 800000; hardware_MAXPACKETLENGTH = MAXPACKETLENGTH; } }