upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-24 00:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix streamtcp to print packet data to stdout. This makes the

Browse source 
stdout and stderr not mix together lines, when parsing its output.
This commit is contained in:
W.C.A. Wijngaards 2020-07-20 10:34:40 +02:00
parent b7b5952c3a
commit 53ecdfc0b5
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
20 July 2020: Wouter
- Fix streamtcp to print packet data to stdout. This makes the
stdout and stderr not mix together lines, when parsing its output.
17 July 2020: Wouter 17 July 2020: Wouter
- Fix libnettle compile for session ticket key callback function - Fix libnettle compile for session ticket key callback function
changes. changes.

9
testcode/streamtcp.c
View file

@ -200,6 +200,7 @@ write_q(int fd, int udp, SSL* ssl, sldns_buffer* buf, uint16_t id,
static void static void
recv_one(int fd, int udp, SSL* ssl, sldns_buffer* buf) recv_one(int fd, int udp, SSL* ssl, sldns_buffer* buf)
{ {
size_t i;
char* pktstr; char* pktstr;
uint16_t len; uint16_t len;
if(!udp) { if(!udp) {
@ -270,7 +271,13 @@ recv_one(int fd, int udp, SSL* ssl, sldns_buffer* buf)
len = (size_t)l; len = (size_t)l;
} }
printf("\nnext received packet\n"); printf("\nnext received packet\n");
log_buf(0, "data", buf); printf("data[%d] ", (int)sldns_buffer_limit(buf));
for(i=0; i<sldns_buffer_limit(buf); i++) {
const char* hex = "0123456789ABCDEF";
printf("%c%c", hex[(sldns_buffer_read_u8_at(buf, i)&0xf0)>>4],
hex[sldns_buffer_read_u8_at(buf, i)&0x0f]);
}
printf("\n");
pktstr = sldns_wire2str_pkt(sldns_buffer_begin(buf), len); pktstr = sldns_wire2str_pkt(sldns_buffer_begin(buf), len);
printf("%s", pktstr); printf("%s", pktstr);