X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_play.c;h=21ab8c8cc434101964bfcd0c5ff575c4e117c406;hb=c61904671e969a32a7f9d38a523f7abaa2b371fd;hp=622885a873b19f34a62cd024e950c28175942cb5;hpb=63771e0c2740834e4496fb6793d058b9b369ad07;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_play.c b/src/pazpar2_play.c index 622885a..21ab8c8 100644 --- a/src/pazpar2_play.c +++ b/src/pazpar2_play.c @@ -1,5 +1,5 @@ /* 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 @@ -54,6 +54,7 @@ static int run(FILE *inf, struct addrinfo *res) long long id; int sz, r, c; char req[100]; + char request_type[100]; size_t i; struct con **conp; c = fgetc(inf); @@ -66,8 +67,9 @@ static int run(FILE *inf, struct addrinfo *res) c = fgetc(inf); } req[i] = 0; - r = sscanf(req, "%lld %lld %lld %d", &tv_sec1, &tv_usec1, &id, &sz); - if (r != 4) + r = sscanf(req, "%s %lld %lld %lld %d", request_type, + &tv_sec1, &tv_usec1, &id, &sz); + if (r != 5) { fprintf(stderr, "bad line %s\n", req); return -1; @@ -84,7 +86,7 @@ static int run(FILE *inf, struct addrinfo *res) } else spec.tv_usec = tv_usec1 - tv_usec0; - + select(0, 0, 0, 0, &spec); } tv_sec0 = tv_sec1; @@ -145,11 +147,14 @@ static int run(FILE *inf, struct addrinfo *res) (long long) toread, (long long) r); return -1; } - w = write((*conp)->fd, buf, toread); - if (w != toread) - { - fprintf(stderr, "write truncated\n"); - return -1; + if (*request_type == 'r') + { /* Only deal with things tha Pazpar2 received */ + w = write((*conp)->fd, buf, toread); + if (w != toread) + { + fprintf(stderr, "write truncated\n"); + return -1; + } } cnt += toread; } @@ -208,7 +213,7 @@ int main(int argc, char **argv) hints.ai_addr = NULL; hints.ai_canonname = NULL; hints.ai_next = NULL; - + cp = strchr(host, ':'); if (*cp) {