walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttp: Align NULL separated header fields

This commit is contained in:
Tatsuhiro Tsujikawa 2014-04-30 09:56:33 +09:00
parent 3b4aedd566
commit 4caddec9ba
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/app_helper.cc
View File

@ -175,17 +175,22 @@ const char* ansi_escend()
} // namespace } // namespace
namespace { namespace {
void print_nv(nghttp2_nv *nva, size_t nvlen, bool indent = true) void print_nv(nghttp2_nv *nv)
{
fprintf(outfile, "%s", ansi_esc("\033[1;34m"));
fwrite(nv->name, nv->namelen, 1, outfile);
fprintf(outfile, "%s: ", ansi_escend());
fwrite(nv->value, nv->valuelen, 1, outfile);
fprintf(outfile, "\n");
}
} // namespace
namespace {
void print_nv(nghttp2_nv *nva, size_t nvlen)
{ {
for(auto& nv : http2::sort_nva(nva, nvlen)) { for(auto& nv : http2::sort_nva(nva, nvlen)) {
if(indent) {
print_frame_attr_indent(); print_frame_attr_indent();
}
fprintf(outfile, "%s", ansi_esc("\033[1;34m")); print_nv(&nv);
fwrite(nv.name, nv.namelen, 1, outfile);
fprintf(outfile, "%s: ", ansi_escend());
fwrite(nv.value, nv.valuelen, 1, outfile);
fprintf(outfile, "\n");
} }
} }
} // namelen } // namelen
@ -477,14 +482,19 @@ int verbose_on_header_callback(nghttp2_session *session,
uint8_t flags, uint8_t flags,
void *user_data) void *user_data)
{ {
nghttp2_nv nv = { nghttp2_nv nva = {
const_cast<uint8_t*>(name), const_cast<uint8_t*>(value), const_cast<uint8_t*>(name), const_cast<uint8_t*>(value),
static_cast<uint16_t>(namelen), static_cast<uint16_t>(valuelen) static_cast<uint16_t>(namelen), static_cast<uint16_t>(valuelen)
}; };
for(auto& nv : http2::sort_nva(&nva, 1)) {
print_timer(); print_timer();
fprintf(outfile, " (stream_id=%d, noind=%d) ", frame->hd.stream_id, fprintf(outfile, " (stream_id=%d, noind=%d) ", frame->hd.stream_id,
(flags & NGHTTP2_NV_FLAG_NO_INDEX) != 0); (flags & NGHTTP2_NV_FLAG_NO_INDEX) != 0);
print_nv(&nv, 1, false /* no indent */);
print_nv(&nv);
}
return 0; return 0;
} }