Commit 2818d34f authored by Federico G. Schwindt's avatar Federico G. Schwindt

Tidy up

parent cd4b0df9
...@@ -1228,7 +1228,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf) ...@@ -1228,7 +1228,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
#include "tbl/h2_error.h" #include "tbl/h2_error.h"
else else
return (spec); return (spec);
return(NULL); return (NULL);
} }
/* SECTION: stream.spec.frame_sendhex sendhex /* SECTION: stream.spec.frame_sendhex sendhex
...@@ -1726,7 +1726,7 @@ cmd_txrst(CMD_ARGS) ...@@ -1726,7 +1726,7 @@ cmd_txrst(CMD_ARGS)
while (*++av) { while (*++av) {
if (!strcmp(*av, "-err")) { if (!strcmp(*av, "-err")) {
++av; ++av;
for (err=0; h2_errs[err]; err++) { for (err = 0; h2_errs[err]; err++) {
if (!strcmp(h2_errs[err], *av)) if (!strcmp(h2_errs[err], *av))
break; break;
} }
...@@ -1944,12 +1944,12 @@ cmd_txping(CMD_ARGS) ...@@ -1944,12 +1944,12 @@ cmd_txping(CMD_ARGS)
} }
/* /*
* SECTION: stream.spec.goaway_txgoaway rxgoaway * SECTION: stream.spec.goaway_txgoaway txgoaway
* *
* Possible options include: * Possible options include:
* *
* \-err STRING|INT * \-err STRING|INT
* set the error code to eplain the termination. The second argument * set the error code to explain the termination. The second argument
* can be a integer or the string version of the error code as found * can be a integer or the string version of the error code as found
* in rfc7540#7. * in rfc7540#7.
* *
...@@ -1969,18 +1969,16 @@ cmd_txgoaway(CMD_ARGS) ...@@ -1969,18 +1969,16 @@ cmd_txgoaway(CMD_ARGS)
uint32_t err = 0; uint32_t err = 0;
uint32_t ls = 0; uint32_t ls = 0;
struct frame f; struct frame f;
char buf[8];
(void)cmd; (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC); CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
memset(buf, 0, 8);
INIT_FRAME(f, GOAWAY, 8, s->id, 0); INIT_FRAME(f, GOAWAY, 8, s->id, 0);
while (*++av) { while (*++av) {
if (!strcmp(*av, "-err")) { if (!strcmp(*av, "-err")) {
++av; ++av;
for (err=0; h2_errs[err]; err++) for (err = 0; h2_errs[err]; err++)
if (!strcmp(h2_errs[err], *av)) if (!strcmp(h2_errs[err], *av))
break; break;
...@@ -1996,6 +1994,7 @@ cmd_txgoaway(CMD_ARGS) ...@@ -1996,6 +1994,7 @@ cmd_txgoaway(CMD_ARGS)
vtc_fatal(vl, "this frame already has debug data"); vtc_fatal(vl, "this frame already has debug data");
f.size = 8 + strlen(*av); f.size = 8 + strlen(*av);
f.data = malloc(f.size); f.data = malloc(f.size);
AN(f.data);
memcpy(f.data + 8, *av, f.size - 8); memcpy(f.data + 8, *av, f.size - 8);
} else } else
break; break;
...@@ -2003,8 +2002,10 @@ cmd_txgoaway(CMD_ARGS) ...@@ -2003,8 +2002,10 @@ cmd_txgoaway(CMD_ARGS)
if (*av != NULL) if (*av != NULL)
vtc_fatal(vl, "Unknown txgoaway spec: %s\n", *av); vtc_fatal(vl, "Unknown txgoaway spec: %s\n", *av);
if (!f.data) if (!f.data) {
f.data = malloc(8); f.data = malloc(8);
AN(f.data);
}
vbe32enc(f.data, ls); vbe32enc(f.data, ls);
vbe32enc(f.data + 4, err); vbe32enc(f.data + 4, err);
write_frame(s->hp, &f, 1); write_frame(s->hp, &f, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment