projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates to pz:authentication documentation
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_play.c
diff --git
a/src/pazpar2_play.c
b/src/pazpar2_play.c
index
5339f2d
..
4ecbbbe
100644
(file)
--- a/
src/pazpar2_play.c
+++ b/
src/pazpar2_play.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 Index Data
+ Copyright (C) Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-41,7
+41,7
@@
struct con {
};
};
-static int run(FILE *inf, struct addrinfo *res)
+static int run(int verbose, FILE *inf, struct addrinfo *res)
{
long long tv_sec0 = 0;
long long tv_usec0 = 0;
{
long long tv_sec0 = 0;
long long tv_usec0 = 0;
@@
-74,6
+74,8
@@
static int run(FILE *inf, struct addrinfo *res)
fprintf(stderr, "bad line %s\n", req);
return -1;
}
fprintf(stderr, "bad line %s\n", req);
return -1;
}
+ if (verbose)
+ fprintf(stderr, "read line: %s\n", req);
if (tv_sec0)
{
struct timeval spec;
if (tv_sec0)
{
struct timeval spec;
@@
-86,7
+88,7
@@
static int run(FILE *inf, struct addrinfo *res)
}
else
spec.tv_usec = tv_usec1 - tv_usec0;
}
else
spec.tv_usec = tv_usec1 - tv_usec0;
-
+
select(0, 0, 0, 0, &spec);
}
tv_sec0 = tv_sec1;
select(0, 0, 0, 0, &spec);
}
tv_sec0 = tv_sec1;
@@
-147,8
+149,14
@@
static int run(FILE *inf, struct addrinfo *res)
(long long) toread, (long long) r);
return -1;
}
(long long) toread, (long long) r);
return -1;
}
+ if (verbose)
+ {
+ fprintf(stderr, "read %ld bytes\n---\n", (long) r);
+ fwrite(buf, 1, r, stderr);
+ fprintf(stderr, "\n----\n");
+ }
if (*request_type == 'r')
if (*request_type == 'r')
- { /* Only deal with things tha Pazpar2 received */
+ { /* Only deal with things that Pazpar2 received */
w = write((*conp)->fd, buf, toread);
if (w != toread)
{
w = write((*conp)->fd, buf, toread);
if (w != toread)
{
@@
-175,6
+183,7
@@
int main(int argc, char **argv)
int ret;
char *arg;
char *host = 0;
int ret;
char *arg;
char *host = 0;
+ int verbose = 0;
const char *file = 0;
while ((ret = options("v:", argv, argc, &arg)) != -2)
{
const char *file = 0;
while ((ret = options("v:", argv, argc, &arg)) != -2)
{
@@
-213,7
+222,7
@@
int main(int argc, char **argv)
hints.ai_addr = NULL;
hints.ai_canonname = NULL;
hints.ai_next = NULL;
hints.ai_addr = NULL;
hints.ai_canonname = NULL;
hints.ai_next = NULL;
-
+
cp = strchr(host, ':');
if (*cp)
{
cp = strchr(host, ':');
if (*cp)
{
@@
-236,7
+245,7
@@
int main(int argc, char **argv)
fprintf(stderr, "cannot open %s\n", file);
exit(1);
}
fprintf(stderr, "cannot open %s\n", file);
exit(1);
}
- run(inf, res);
+ run(verbose, inf, res);
fclose(inf);
}
else
fclose(inf);
}
else