From 16af1f9b8b2f3a24be895c075f0689587e8dd285 Mon Sep 17 00:00:00 2001 From: OAI Date: Mon, 1 Jun 2026 12:51:01 +0000 Subject: [PATCH] log: normalize burst negotiation messages --- src/nwconn.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/nwconn.c b/src/nwconn.c index f8af1e7..8e704a2 100644 --- a/src/nwconn.c +++ b/src/nwconn.c @@ -5326,16 +5326,20 @@ static int handle_ncp_serv(void) U16_TO_BE16(wantsize, xdata->getsize); U16_TO_BE16(sock_echo, xdata->socket); data_len = sizeof(*xdata); - XDPRINTF((2,0, "Packet Burst negotiate buffer: want=0x%04x reply=0x%04x rw_buffer=0x%04x echo_socket=0x%04x flags=0x%x", + XDPRINTF((2,0, "INFO BURST NEGOTIATE want=%d reply=%d rw_buffer=%d echo_socket=%d flags=0x%x want_hex=0x%04x reply_hex=0x%04x rw_buffer_hex=0x%04x echo_socket_hex=0x%04x", (int) GET_BE16((uint8*)requestdata), (int) wantsize, (int) rw_buffer_size, (int) sock_echo, - flags)); + flags, + (int) GET_BE16((uint8*)requestdata), + (int) wantsize, + (int) rw_buffer_size, + (int) sock_echo)); } else #endif { - XDPRINTF((2,0, "Function '0x61' (Burst) not enabled")); + XDPRINTF((2,0, "INFO BURST UNKNOWN reason=disabled function=97 fn=0x61 result=0xfb")); completition = 0xfb; /* unknown request */ nw_debug=0; } @@ -5429,23 +5433,24 @@ static int handle_ncp_serv(void) burst_w->ud.addr.maxlen = sizeof(ipxAddr_t); burst_w->ud.addr.buf = (char*)&(burst_w->to_addr); data_len = sizeof(*xdata); - XDPRINTF((2,0, "Packet Burst connection accepted: client_socket=0x%04x max_packet=%u max_data=%u send=%u recv=%u", + XDPRINTF((2,0, "INFO BURST CONNECT client_socket=%d max_packet=%u max_data=%u send=%u recv=%u client_socket_hex=0x%04x", client_socket, (unsigned)(max_packet_size + 30), (unsigned)burst_w->max_burst_data_size, (unsigned)burst_w->max_send_size, - (unsigned)burst_w->max_recv_size)); + (unsigned)burst_w->max_recv_size, + client_socket)); } else #endif { - XDPRINTF((2,0, "Packet Burst Connection Request not enabled")); + XDPRINTF((2,0, "INFO BURST UNKNOWN reason=connect_disabled function=101 fn=0x65 result=0xfb")); nw_debug=0; completition = 0xfb; /* unknown request */ } break; case 0x68 : /* NDS NCP, NDS Fragger Protokoll ?? */ - XDPRINTF((2,0, "NDS Fragger Protokoll not supportet")); + XDPRINTF((2,0, "INFO NDS UNKNOWN reason=fragger_unsupported function=104 fn=0x68 result=0xfb")); nw_debug=0; completition = 0xfb; /* unknown request */ break; @@ -6066,7 +6071,7 @@ int main(int argc, char **argv) handle_after_bind(); } else { /* OK for direct sending */ - XDPRINTF((6,0, "NWCONN:direct sending:type 0x3333, completition=0x%x, len=%d", + XDPRINTF((6,0, "DBUG NCP DIRECT_RESPONSE type=0x3333 completion=0x%x len=%d", (int)(ncprequest->function), data_len)); if (data_len) memcpy(responsedata, readbuff+sizeof(NCPRESPONSE), data_len); @@ -6088,7 +6093,7 @@ int main(int argc, char **argv) #if ENABLE_BURSTMODE if (ncp_type == 0x7777) { /* BURST-MODE */ - XDPRINTF((2, 0, "Packet Burst data packet received: len=%d", data_len)); + XDPRINTF((2, 0, "DBUG BURST PACKET len=%d", data_len)); handle_burst((BURSTPACKET*)readbuff, data_len); } else #endif