psyc-mirrors/libpsyc
1
0
Fork 0
mirror of git://git.psyc.eu/libpsyc synced 2024-08-15 03:19:02 +00:00
Code Issues Releases Wiki Activity

parser: renamed flags, testServer: added routing only option

Browse source
This commit is contained in:
tg(x) 2011-04-30 17:07:01 +02:00
parent 3670395c97
commit 4f61f07ff2
5 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/Makefile
View file

@ -27,9 +27,15 @@ test: ${TARGETS}
netstart:
./testServer ${PORT}
netstartr:
./testServer ${PORT} -r
netstartv:
./testServer ${PORT} -v
netstartrv:
./testServer ${PORT} -r -v
nettest:
for f in packets/full-*; do echo ">> $$f"; cat $$f | nc localhost ${PORT} | diff -u $$f -; done

6
test/testParser.c
View file

@ -7,7 +7,7 @@
int main(int argc, char **argv)
{
int idx, ret, header_only = argc > 2, verbose = argc > 3;
int idx, ret, routing_only = argc > 2, verbose = argc > 3;
char buffer[2048], oper;
psycString name, value, elem;
psycParseState state;
@ -23,8 +23,8 @@ int main(int argc, char **argv)
write(1, buffer, idx);
write(1, ">> PARSE\n", 9);
}
if (header_only)
psyc_initParseState2(&state, PSYC_PARSE_HEADER_ONLY);
if (routing_only)
psyc_initParseState2(&state, PSYC_PARSE_ROUTING_ONLY);
else
psyc_initParseState(&state);
psyc_nextParseBuffer(&state, psyc_newString(buffer, idx));

9
test/testServer.c
View file

@ -43,7 +43,7 @@ void *get_in_addr(struct sockaddr *sa)
int main(int argc, char **argv)
{
char *port = argc > 1 ? argv[1] : "4440";
uint8_t verbose = argc > 2;
uint8_t routing_only = argc > 2, verbose = argc > 3;
fd_set master; // master file descriptor list
fd_set read_fds; // temp file descriptor list for select()
@ -157,7 +157,10 @@ int main(int argc, char **argv)
}
// reset parser state & packet
psyc_initParseState(&parsers[newfd]);
if (routing_only)
psyc_initParseState2(&parsers[newfd], PSYC_PARSE_ROUTING_ONLY);
else
psyc_initParseState(&parsers[newfd]);
memset(&packets[newfd], 0, sizeof(psycPacket));
memset(&routing[newfd], 0, sizeof(psycModifier) * ROUTING_LINES);
memset(&entity[newfd], 0, sizeof(psycModifier) * ENTITY_LINES);
@ -193,6 +196,8 @@ int main(int argc, char **argv)
do {
ret = psyc_parse(&parsers[i], &oper, &name, &value);
if (verbose)
printf("# ret = %d\n", ret);
switch (ret) {
case PSYC_PARSE_ROUTING:
assert(packets[i].routing.lines < ROUTING_LINES);