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

fixes for inline functions, c99 mode, formatting

Browse source
This commit is contained in:
tg(x) 2011-05-04 01:00:35 +02:00
parent 09e8943afe
commit 259b51966c
14 changed files with 368 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/Makefile
View file

@ -1,6 +1,6 @@
OPT = -O2
DEBUG = 2
CFLAGS = -I../include -Wall ${OPT}
CFLAGS = -I../include -Wall -std=c99 ${OPT}
LDFLAGS = -L../lib
LOADLIBES = -lpsyc -lm
TARGETS = testServer testParser testMatch testRender testText isRoutingVar getVarType
@ -20,10 +20,13 @@ debug: all
test: ${TARGETS}
./testRender
./testMatch
./testText
./isRoutingVar
./getVarType
for f in packets/full-*; do echo ">> $$f"; ./testParser $$f; done
testServer: CFLAGS := $(subst -std=c99,,${CFLAGS})
netstart:
./testServer ${PORT}

43
test/testParser.c
View file

@ -2,10 +2,10 @@
#include <stdio.h>
#include <fcntl.h>
#include <psyc/lib.h>
#include <psyc.h>
#include <psyc/parser.h>
int main(int argc, char **argv)
int main (int argc, char **argv)
{
int idx, ret, routing_only = argc > 2, verbose = argc > 3;
char buffer[2048], oper;
@ -19,9 +19,9 @@ int main(int argc, char **argv)
idx = read(file,(void*)buffer,sizeof(buffer));
if (verbose) {
write(1, ">> INPUT\n", 9);
write(1, buffer, idx);
write(1, ">> PARSE\n", 9);
printf(">> INPUT\n");
printf("%.*s\n", (int)idx, buffer);
printf(">> PARSE\n");
}
if (routing_only)
@ -32,9 +32,8 @@ int main(int argc, char **argv)
psyc_setParseBuffer(&state, psyc_newString(buffer, idx));
// try parsing that now
// while ((ret = psyc_parse(&state, &oper, &name, &value)))
// {
do {
do
{
oper = 0;
name.length = 0;
value.length = 0;
@ -42,24 +41,24 @@ int main(int argc, char **argv)
ret = psyc_parse(&state, &oper, &name, &value);
if (verbose)
printf(">> ret = %d\n", ret);
switch (ret)
{
case PSYC_PARSE_ROUTING:
case PSYC_PARSE_ENTITY:
if (verbose)
write(1, &oper, 1);
printf("%c", oper);
case PSYC_PARSE_BODY:
// printf("the string is '%.*s'\n", name);
if (verbose) {
write(1, name.ptr, name.length);
write(1, " = ", 3);
write(1, value.ptr, value.length);
write(1, "\n", 1);
}
if (verbose)
printf("%.*s = %.*s\n",
(int)name.length, name.ptr,
(int)value.length, value.ptr);
if (memcmp(name.ptr, "_list", 5) == 0)
{
if (verbose)
write(1, ">>> LIST START\n", 15);
printf(">> LIST START\n");
psyc_initParseListState(&listState);
psyc_setParseListBuffer(&listState, value);
@ -70,11 +69,8 @@ int main(int argc, char **argv)
{
case PSYC_PARSE_LIST_END:
case PSYC_PARSE_LIST_ELEM:
if (verbose) {
write(1, "|", 1);
write(1, elem.ptr, elem.length);
write(1, "\n", 1);
}
if (verbose)
printf("|%.*s\n", (int)elem.length, elem.ptr);
break;
default:
printf("Error while parsing list: %i\n", ret);
@ -84,7 +80,7 @@ int main(int argc, char **argv)
if (ret == PSYC_PARSE_LIST_END)
{
if (verbose)
write(1, ">>> LIST END\n", 13);
printf(">> LIST END\n");
break;
}
}
@ -101,7 +97,8 @@ int main(int argc, char **argv)
printf("Error while parsing: %i\n", ret);
return 1;
}
} while (ret);
}
while (ret);
return 0;
}

22
test/testRender.c
View file

@ -1,13 +1,15 @@
#include <stdlib.h>
#include <unistd.h>
#include "../include/psyc/lib.h"
#include "../include/psyc/render.h"
#include "../include/psyc/syntax.h"
#include <stdio.h>
#include <psyc/lib.h>
#include <psyc/render.h>
#include <psyc/syntax.h>
#define myUNI "psyc://10.100.1000/~ludwig"
/* example renderer generating a presence packet */
int testPresence(const char *avail, int availlen, const char *desc, int desclen, const char *rendered, uint8_t verbose)
int testPresence (const char *avail, int availlen,
const char *desc, int desclen,
const char *rendered, uint8_t verbose)
{
psycModifier routing[] = {
psyc_newModifier2(C_GLYPH_OPERATOR_SET, PSYC_C2ARG("_context"), PSYC_C2ARG(myUNI),
@ -31,11 +33,11 @@ int testPresence(const char *avail, int availlen, const char *desc, int desclen,
char buffer[512];
psyc_render(&packet, buffer, sizeof(buffer));
if (verbose)
write(0, buffer, packet.length);
printf("%.*s\n", (int)packet.length, buffer);
return strncmp(rendered, buffer, packet.length);
}
int testList(const char *rendered, uint8_t verbose)
int testList (const char *rendered, uint8_t verbose)
{
psycModifier routing[] = {
psyc_newModifier2(C_GLYPH_OPERATOR_SET, PSYC_C2ARG("_source"), PSYC_C2ARG(myUNI),
@ -80,11 +82,11 @@ int testList(const char *rendered, uint8_t verbose)
char buffer[512];
psyc_render(&packet, buffer, sizeof(buffer));
if (verbose)
write(0, buffer, packet.length);
printf("%.*s\n", (int)packet.length, buffer);
return strncmp(rendered, buffer, packet.length);
}
int main(int argc, char **argv) {
int main (int argc, char **argv) {
uint8_t verbose = argc > 1;
if (testPresence(PSYC_C2ARG("_here"), PSYC_C2ARG("I'm omnipresent right now"), "\

150
test/testServer.c
View file

@ -31,16 +31,15 @@ const size_t ROUTING_LINES = 16;
const size_t ENTITY_LINES = 32;
// get sockaddr, IPv4 or IPv6:
void *get_in_addr(struct sockaddr *sa)
void *get_in_addr (struct sockaddr *sa)
{
if (sa->sa_family == AF_INET) {
if (sa->sa_family == AF_INET)
return &(((struct sockaddr_in*)sa)->sin_addr);
}
return &(((struct sockaddr_in6*)sa)->sin6_addr);
}
int main(int argc, char **argv)
int main (int argc, char **argv)
{
char *port = argc > 1 ? argv[1] : "4440";
uint8_t routing_only = argc > 2, verbose = argc > 3;
@ -71,12 +70,12 @@ int main(int argc, char **argv)
psycPacket packets[NUM_PARSERS];
psycModifier routing[NUM_PARSERS][ROUTING_LINES];
psycModifier entity[NUM_PARSERS][ENTITY_LINES];
psycModifier *mod;
psycModifier *mod = NULL;
int ret, retl;
char oper;
psycString name, value, elem;
psycString *pname, *pvalue;
psycString *pname = NULL, *pvalue = NULL;
psycParseListState listState;
FD_ZERO(&master); // clear the master and temp sets
@ -87,21 +86,23 @@ int main(int argc, char **argv)
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_PASSIVE;
if ((rv = getaddrinfo(NULL, port, &hints, &ai)) != 0) {
if ((rv = getaddrinfo(NULL, port, &hints, &ai)) != 0)
{
fprintf(stderr, "error: %s\n", gai_strerror(rv));
exit(1);
}
for (p = ai; p != NULL; p = p->ai_next) {
for (p = ai; p != NULL; p = p->ai_next)
{
listener = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
if (listener < 0) {
if (listener < 0)
continue;
}
// lose the pesky "address already in use" error message
setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int));
if (bind(listener, p->ai_addr, p->ai_addrlen) < 0) {
if (bind(listener, p->ai_addr, p->ai_addrlen) < 0)
{
close(listener);
continue;
}
@ -110,7 +111,8 @@ int main(int argc, char **argv)
}
// if we got here, it means we didn't get bound
if (p == NULL) {
if (p == NULL)
{
fprintf(stderr, "failed to bind\n");
exit(2);
}
@ -118,7 +120,8 @@ int main(int argc, char **argv)
freeaddrinfo(ai); // all done with this
// listen
if (listen(listener, 10) == -1) {
if (listen(listener, 10) == -1)
{
perror("listen");
exit(3);
}
@ -130,17 +133,22 @@ int main(int argc, char **argv)
fdmax = listener; // so far, it's this one
// main loop
for (;;) {
for (;;)
{
read_fds = master; // copy it
if (select(fdmax+1, &read_fds, NULL, NULL, NULL) == -1) {
if (select(fdmax+1, &read_fds, NULL, NULL, NULL) == -1)
{
perror("select");
exit(4);
}
// run through the existing connections looking for data to read
for (i = 0; i <= fdmax; i++) {
if (FD_ISSET(i, &read_fds)) { // we got one!!
if (i == listener) {
for (i = 0; i <= fdmax; i++)
{
if (FD_ISSET(i, &read_fds)) // we got one!!
{
if (i == listener)
{
// handle new connections
if (fdmax == NUM_PARSERS - 1)
continue; // ignore if there's too many
@ -148,13 +156,13 @@ int main(int argc, char **argv)
addrlen = sizeof remoteaddr;
newfd = accept(listener, (struct sockaddr *)&remoteaddr, &addrlen);
if (newfd == -1) {
if (newfd == -1)
perror("accept");
} else {
else
{
FD_SET(newfd, &master); // add to master set
if (newfd > fdmax) { // keep track of the max
if (newfd > fdmax) // keep track of the max
fdmax = newfd;
}
// reset parser state & packet
if (routing_only)
@ -174,19 +182,23 @@ int main(int argc, char **argv)
remoteIP, INET6_ADDRSTRLEN),
newfd);
}
} else {
}
else
{
// handle data from a client
if ((nbytes = recv(i, recvbuf, RECV_BUF_SIZE, 0)) <= 0) {
if ((nbytes = recv(i, recvbuf, RECV_BUF_SIZE, 0)) <= 0)
{
// got error or connection closed by client
if (nbytes == 0) {
// connection closed
if (nbytes == 0) // connection closed
printf("socket %d hung up\n", i);
} else {
else
perror("recv");
}
close(i); // bye!
FD_CLR(i, &master); // remove from master set
} else {
}
else
{
// we got some data from a client
parsebuf = recvbuf - contbytes;
psyc_setParseBuffer(&parsers[i], psyc_newString(parsebuf, contbytes + nbytes));
@ -195,7 +207,8 @@ int main(int argc, char **argv)
name.length = 0;
value.length = 0;
do {
do
{
ret = psyc_parse(&parsers[i], &oper, &name, &value);
if (verbose)
printf("# ret = %d\n", ret);
@ -209,69 +222,86 @@ int main(int argc, char **argv)
mod->flag = PSYC_MODIFIER_ROUTING;
packets[i].routing.lines++;
break;
case PSYC_PARSE_ENTITY_INCOMPLETE:
case PSYC_PARSE_ENTITY:
assert(packets[i].entity.lines < ENTITY_LINES);
mod = &(packets[i].entity.modifiers[packets[i].entity.lines]);
pname = &mod->name;
pvalue = &mod->value;
if (ret == PSYC_PARSE_ENTITY) {
if (ret == PSYC_PARSE_ENTITY)
{
packets[i].entity.lines++;
mod->flag = parsers[i].valueLength ? PSYC_MODIFIER_NEED_LENGTH : PSYC_MODIFIER_NO_LENGTH;
mod->flag = parsers[i].valueLength ?
PSYC_MODIFIER_NEED_LENGTH : PSYC_MODIFIER_NO_LENGTH;
}
break;
case PSYC_PARSE_BODY_INCOMPLETE:
case PSYC_PARSE_BODY:
pname = &(packets[i].method);
pvalue = &(packets[i].data);
break;
case PSYC_PARSE_COMPLETE:
printf("# Done parsing.\n");
packets[i].flag = parsers[i].contentLengthFound ? PSYC_PACKET_NEED_LENGTH : PSYC_PACKET_NO_LENGTH;
packets[i].flag = parsers[i].contentLengthFound ?
PSYC_PACKET_NEED_LENGTH : PSYC_PACKET_NO_LENGTH;
psyc_setPacketLength(&packets[i]);
psyc_render(&packets[i], sendbuf, SEND_BUF_SIZE);
if (send(i, sendbuf, packets[i].length, 0) == -1) {
if (send(i, sendbuf, packets[i].length, 0) == -1)
perror("send");
}
ret = -1;
break;
case PSYC_PARSE_INSUFFICIENT:
if (verbose)
printf("# Insufficient data.\n");
contbytes = parsers[i].buffer.length - parsers[i].cursor;
if (contbytes > 0) { // copy end of parsebuf before start of recvbuf
if (contbytes > 0) // copy end of parsebuf before start of recvbuf
{
assert(recvbuf - contbytes >= buf); // make sure it's still in the buffer
memcpy(recvbuf - contbytes, parsebuf + parsers[i].cursor, contbytes);
}
ret = 0;
break;
default:
printf("# Error while parsing: %i\n", ret);
ret = -1;
}
switch (ret) {
switch (ret)
{
case PSYC_PARSE_ENTITY_INCOMPLETE:
case PSYC_PARSE_BODY_INCOMPLETE:
ret = 0;
case PSYC_PARSE_ENTITY:
case PSYC_PARSE_ROUTING:
case PSYC_PARSE_BODY:
if (oper) {
if (oper)
{
mod->oper = oper;
if (verbose)
printf("%c", oper);
}
if (name.length) {
if (name.length)
{
pname->ptr = malloc(name.length);
pname->length = name.length;
assert(pname->ptr != NULL);
memcpy((void*)pname->ptr, name.ptr, name.length);
name.length = 0;
if (verbose) {
if (verbose)
printf("%.*s = ", (int)pname->length, pname->ptr);
}
}
if (value.length) {
@ -281,51 +311,65 @@ int main(int argc, char **argv)
memcpy((void*)pvalue->ptr + pvalue->length, value.ptr, value.length);
pvalue->length += value.length;
value.length = 0;
if (verbose) {
if (verbose)
{
printf("%.*s", (int)pvalue->length, pvalue->ptr);
if (parsers[i].valueLength > pvalue->length)
printf("...");
printf("\n");
}
} else if (verbose) {
printf("\n");
}
else if (verbose)
printf("\n");
if (verbose)
printf("\t\t\t\t\t\t\t\t# n:%ld v:%ld c:%ld r:%ld\n", pname->length, pvalue->length, parsers[i].contentParsed, parsers[i].routingLength);
printf("\t\t\t\t\t\t\t\t# n:%ld v:%ld c:%ld r:%ld\n",
pname->length, pvalue->length,
parsers[i].contentParsed, parsers[i].routingLength);
}
switch (ret) {
switch (ret)
{
case PSYC_PARSE_ROUTING:
case PSYC_PARSE_ENTITY:
if (pname->length >= 5 && memcmp(pname->ptr, "_list", 5) == 0) {
if (pname->length >= 5 && memcmp(pname->ptr, "_list", 5) == 0)
{
if (verbose)
printf("## LIST START\n");
psyc_initParseListState(&listState);
psyc_setParseListBuffer(&listState, *pvalue);
do {
do
{
retl = psyc_parseList(&listState, pname, pvalue, &elem);
switch (retl) {
switch (retl)
{
case PSYC_PARSE_LIST_END:
retl = 0;
case PSYC_PARSE_LIST_ELEM:
if (verbose) {
if (verbose)
{
printf("|%.*s\n", (int)elem.length, elem.ptr);
if (ret == PSYC_PARSE_LIST_END)
printf("## LIST END");
}
break;
default:
printf("# Error while parsing list: %i\n", ret);
ret = retl = -1;
}
} while (retl > 0);
}
while (retl > 0);
}
}
} while (ret > 0);
if (ret < 0) {
}
while (ret > 0);
if (ret < 0)
{
printf("# Closing connection: %i\n", i);
close(i); // bye!
FD_CLR(i, &master); // remove from master set