pyrite-dev/assaultfish
13
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better log

Browse source
This commit is contained in:
Nishi 2026-01-29 20:42:31 +09:00
commit 70465356d0
Signed by: nishi
GPG key ID: 27EF69B208EB9343
6 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
data/mdl/crate.gsm
View file

Binary file not shown.

BIN
data/mdl/fish.gsm
View file

Binary file not shown.

1
engine/include/GearSrc/TypeDefs.h
View file

@ -144,6 +144,7 @@ struct _GSBinary {
struct _GSNetState { struct _GSNetState {
GSEngine engine; GSEngine engine;
char name[16];
unsigned int rxseq; unsigned int rxseq;
unsigned int rxindex; unsigned int rxindex;

1
engine/src/net/net_client.c
View file

@ -19,6 +19,7 @@ GSNetClient GSNetClientOpen(GSClient client, const char* hostname, int port) {
return NULL; return NULL;
} }
strcpy(net->state.name, "Client");
net->state.engine = net->engine; net->state.engine = net->engine;
int i; int i;

1
engine/src/net/net_server.c
View file

@ -36,6 +36,7 @@ void GSNetServerStep(GSNetServer net) {
memset(&v, 0, sizeof(v)); memset(&v, 0, sizeof(v));
v.engine = net->engine; v.engine = net->engine;
strcpy(v.name, "Server");
hmput(net->client, addr, v); hmput(net->client, addr, v);

8
engine/src/net/net_state.c
View file

@ -13,7 +13,7 @@ enum states {
void GSNetStateRead(GSNetState* state, GSNetSocket sock, GSNetPacket* packet, GSNetAddress* address) { void GSNetStateRead(GSNetState* state, GSNetSocket sock, GSNetPacket* packet, GSNetAddress* address) {
if(packet->header.flag & GSNetPacketFlagAcknowledge) { if(packet->header.flag & GSNetPacketFlagAcknowledge) {
if(arrlen(state->tx) > 0 && state->txstate == WaitingAcknowledge && state->txindex == packet->header.index && state->txseq == packet->header.seq) { if(arrlen(state->tx) > 0 && state->txstate == WaitingAcknowledge && state->txindex == packet->header.index && state->txseq == packet->header.seq) {
GSLog(state->engine, GSLogDebug, "Received Acknowledge packet %d:%d", state->txindex, state->txseq); GSLog(state->engine, GSLogDebug, "%s: Received acknowledge packet %d:%d", state->name, state->txindex, state->txseq);
state->txstate = Acknowledged; state->txstate = Acknowledged;
state->txseq++; state->txseq++;
@ -27,7 +27,7 @@ void GSNetStateRead(GSNetState* state, GSNetSocket sock, GSNetPacket* packet, GS
} else { } else {
GSNetPacket pkt; GSNetPacket pkt;
if(state->rxindex == packet->header.index && state->rxseq == packet->header.seq) { if(state->rxindex == packet->header.index && state->rxseq == packet->header.seq) {
GSLog(state->engine, GSLogDebug, "Received packet %d:%d", state->rxindex, state->rxseq); GSLog(state->engine, GSLogDebug, "%s: Received packet %d:%d", state->name, state->rxindex, state->rxseq);
if(state->rxseq == 0) { if(state->rxseq == 0) {
state->rxtotal = GSEndianSwapU32BE(*(GSU32*)packet->data); state->rxtotal = GSEndianSwapU32BE(*(GSU32*)packet->data);
@ -88,10 +88,10 @@ void GSNetStateWrite(GSNetState* state, GSNetSocket sock, GSNetAddress* address)
state->txstate = WaitingAcknowledge; state->txstate = WaitingAcknowledge;
if(state->engine->param->get_tick != NULL) state->txtick = state->engine->param->get_tick(); if(state->engine->param->get_tick != NULL) state->txtick = state->engine->param->get_tick();
GSLog(state->engine, GSLogDebug, "Sent packet %d:%d", state->txindex, state->txseq); GSLog(state->engine, GSLogDebug, "%s: Sent packet %d:%d", state->name, state->txindex, state->txseq);
} else if(state->engine->param->get_tick == NULL) { } else if(state->engine->param->get_tick == NULL) {
} else if((state->engine->param->get_tick() - state->txtick) >= 500) { } else if((state->engine->param->get_tick() - state->txtick) >= 500) {
GSLog(state->engine, GSLogDebug, "Lost packet %d:%d", state->txindex, state->txseq); GSLog(state->engine, GSLogDebug, "%s: Lost packet %d:%d", state->name, state->txindex, state->txseq);
state->txstate = Acknowledged; state->txstate = Acknowledged;
} }