mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

net: fix compilation with -d trace_tcp_data_write and -d trace_tcp_data_read; add .hex() dumping too for easier diagnosing of binary protocol level problems

Browse Source
This commit is contained in:
Delyan Angelov 2023-01-15 13:25:20 +02:00
parent 28cbaf66b8
commit d4320863fe
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/net/tcp.v
View File

@ -108,7 +108,8 @@ pub fn (c TcpConn) read_ptr(buf_ptr &u8, len int) !int {
} }
if res > 0 { if res > 0 {
$if trace_tcp_data_read ? { $if trace_tcp_data_read ? {
eprintln('<<< TcpConn.read_ptr | 1 data.len: ${res:6} | data: ' + eprintln(
'<<< TcpConn.read_ptr | 1 data.len: ${res:6} | hex: ${unsafe { buf_ptr.vbytes(res) }.hex()} | data: ' +
unsafe { buf_ptr.vstring_with_len(res) }) unsafe { buf_ptr.vstring_with_len(res) })
} }
return res return res
@ -122,7 +123,8 @@ pub fn (c TcpConn) read_ptr(buf_ptr &u8, len int) !int {
} }
$if trace_tcp_data_read ? { $if trace_tcp_data_read ? {
if res > 0 { if res > 0 {
eprintln('<<< TcpConn.read_ptr | 2 data.len: ${res:6} | data: ' + eprintln(
'<<< TcpConn.read_ptr | 2 data.len: ${res:6} | hex: ${unsafe { buf_ptr.vbytes(res) }.hex()} | data: ' +
unsafe { buf_ptr.vstring_with_len(res) }) unsafe { buf_ptr.vstring_with_len(res) })
} }
} }
@ -160,7 +162,8 @@ pub fn (mut c TcpConn) write_ptr(b &u8, len int) !int {
unsafe { b.vstring_with_len(len) }) unsafe { b.vstring_with_len(len) })
} }
$if trace_tcp_data_write ? { $if trace_tcp_data_write ? {
eprintln('>>> TcpConn.write_ptr | data.len: ${len:6} | data: ' + eprintln(
'>>> TcpConn.write_ptr | data.len: ${len:6} | hex: ${unsafe { b.vbytes(len) }.hex()} | data: ' +
unsafe { b.vstring_with_len(len) }) unsafe { b.vstring_with_len(len) })
} }
unsafe { unsafe {
@ -171,7 +174,7 @@ pub fn (mut c TcpConn) write_ptr(b &u8, len int) !int {
remaining := len - total_sent remaining := len - total_sent
mut sent := C.send(c.sock.handle, ptr, remaining, msg_nosignal) mut sent := C.send(c.sock.handle, ptr, remaining, msg_nosignal)
$if trace_tcp_data_write ? { $if trace_tcp_data_write ? {
eprintln('>>> TcpConn.write_ptr | data chunk, total_sent: ${total_sent:6}, chunk_size: ${chunk_size:6}, sent: ${sent:6}, ptr: ${ptr_str(ptr)}') eprintln('>>> TcpConn.write_ptr | data chunk, total_sent: ${total_sent:6}, remaining: ${remaining:6}, ptr: ${voidptr(ptr):x} => sent: ${sent:6}')
} }
if sent < 0 { if sent < 0 {
code := error_code() code := error_code()