chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regress: playback: Fold other Tensure calls into Tensuresetup
[adns.git]
/
regress
/
hplayback.c.m4
diff --git
a/regress/hplayback.c.m4
b/regress/hplayback.c.m4
index 695b9a23ad48cba92177154fcfaf5d8152460d00..4fb12044e73b130d2bda88ce7819b707b0f8ca11 100644
(file)
--- a/
regress/hplayback.c.m4
+++ b/
regress/hplayback.c.m4
@@
-45,7
+45,7
@@
m4_include(hmacros.i4)
static FILE *Tinputfile, *Tfuzzrawfile, *Treportfile;
static vbuf vb2;
static FILE *Tinputfile, *Tfuzzrawfile, *Treportfile;
static vbuf vb2;
-static void Tensurereportfile(void) {
+static void Tensure
_
reportfile(void) {
const char *fdstr;
int fd;
const char *fdstr;
int fd;
@@
-56,7
+56,7
@@
static void Tensurereportfile(void) {
Treportfile= fdopen(fd,"a"); if (!Treportfile) Tfailed("fdopen ADNS_TEST_REPORT_FD");
}
Treportfile= fdopen(fd,"a"); if (!Treportfile) Tfailed("fdopen ADNS_TEST_REPORT_FD");
}
-static void Tensurefuzzrawfile(void) {
+static void Tensure
_
fuzzrawfile(void) {
static int done;
if (done) return;
static int done;
if (done) return;
@@
-105,11
+105,14
@@
void T_gettimeofday_hook(void) {
FR_WRITE(delta);
}
FR_WRITE(delta);
}
-void Tensure
recordfile
(void) {
+void Tensure
setup
(void) {
int fd;
int chars;
unsigned long sec, usec;
int fd;
int chars;
unsigned long sec, usec;
+ Tensure_reportfile();
+ Tensure_fuzzrawfile();
+
if (Tinputfile) return;
Tinputfile= stdin;
fd = Ttestinputfd();
if (Tinputfile) return;
Tinputfile= stdin;
fd = Ttestinputfd();
@@
-291,6
+294,14
@@
static void Paddr(struct sockaddr *addr, int *lenr) {
if (*ep && *ep != ' ') Psyntax("invalid port (bad syntax)");
if (ul >= 65536) Psyntax("port too large");
if (*ep && *ep != ' ') Psyntax("invalid port (bad syntax)");
if (ul >= 65536) Psyntax("port too large");
+ if (Tfuzzrawfile) {
+ int tl = strlen(p);
+ FR_WRITE(tl);
+ FR_write(p,tl);
+ uint16_t port16 = ul;
+ FR_WRITE(port16);
+ }
+
a.len= sizeof(a.addr);
err= adns_text2addr(p, (int)ul, 0, &a.addr.sa,&a.len);
if (err) Psyntax("invalid address");
a.len= sizeof(a.addr);
err= adns_text2addr(p, (int)ul, 0, &a.addr.sa,&a.len);
if (err) Psyntax("invalid address");
@@
-330,7
+341,7
@@
static int Pbytes(byte *buf, int maxlen) {
void Q_vb(void) {
const char *nl;
void Q_vb(void) {
const char *nl;
- Tensure
recordfile
();
+ Tensure
setup
();
if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();
fread(vb2.buf,1,vb.used+2,Tinputfile);
if (feof(Tinputfile)) {
if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();
fread(vb2.buf,1,vb.used+2,Tinputfile);
if (feof(Tinputfile)) {
@@
-348,7
+359,6
@@
void Q_vb(void) {
vb.used,vb.buf, vb.used,vb2.buf+1);
exit(1);
}
vb.used,vb.buf, vb.used,vb2.buf+1);
exit(1);
}
- Tensurereportfile();
nl= memchr(vb.buf,'\n',vb.used);
fprintf(Treportfile," %.*s\n", (int)(nl ? nl - (const char*)vb.buf : vb.used), vb.buf);
}
nl= memchr(vb.buf,'\n',vb.used);
fprintf(Treportfile," %.*s\n", (int)(nl ? nl - (const char*)vb.buf : vb.used), vb.buf);
}
@@
-375,8
+385,7
@@
int H$1(hm_args_massage($3,void)) {
if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();
fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();
fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
- Tensurereportfile();
- Tensurefuzzrawfile();
+ Tensuresetup();
fprintf(Treportfile,"%s",vb2.buf);
amtread= strlen(vb2.buf);
if (amtread<=0 || vb2.buf[--amtread]!=hm_squote\nhm_squote)
fprintf(Treportfile,"%s",vb2.buf);
amtread= strlen(vb2.buf);
if (amtread<=0 || vb2.buf[--amtread]!=hm_squote\nhm_squote)