psyc-mirrors
/
libpsyc
mirror of git://git.psyc.eu/libpsyc
1
0
Fork 0
Code Issues Releases Wiki Activity

started new interface. incomplete.

This commit is contained in:
Mathias Laurenz Baumann 2011-04-16 01:42:36 +02:00
parent 37de85373c
commit 453011001d
2 changed files with 160 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
include/psyc/parser.h
View File

@ -1,4 +1,58 @@
#include <stdint.h> #include <stdint.h>
#include <string.h>
enum
{
}
typedef struct
{
unsigned int length;
const uint8_t *ptr;
} PSYC_Array;
typedef struct
{
unsigned int cursor; // current position in buffer
PSYC_Array buffer;
uint8_t flags;
char inHeader;
unsigned int length;
} PSYC_State;
inline PSYC_Array (const uint8_t memory, unsigned int length)
{
PSYC_Array arr = {length, memory};
return arr;
}
inline void PSYC_initState (PSYC_State* state)
{
memset(state, 0, sizeof(PSYC_State));
}
inline void PSYC_nextBuffer (PSYC_State* state, PSYC_Array newBuf)
{
state->buffer = newBuf;
}
int PSYC_parse(PSYC_State* state,
PSYC_ConstArray name,
PSYC_ConstArray value,
uint8_t modifier,
unsigned long *expectedBytes);
inline unsigned int PSYC_getBodyLength (PSYC_State* state)
{
return state->length;
}
/** @brief parses a routerVariable /** @brief parses a routerVariable
* *

355
src/parser.c
View File

@ -43,181 +43,89 @@ inline char isAlphaNumeric(uint8_t c)
} }
inline int PSYC_parseElement(
unsigned int* cursor,
const uint8_t * data, unsigned int dlength,
const uint8_t** name, unsigned int *nlength,
const uint8_t** value, unsigned int *vlength,
char inHeader,char complete);
/** @brief parses a routerVariable int PSYC_parse(PSYC_State* state,
* PSYC_ConstArray name,
* This function parses one routing variable, PSYC_ConstArray value,
* advances the cursor after the variable, uint8_t modifier,
* writes the variables name, value and their unsigned long *expectedBytes)
* lengths in the corresponding out parameters
* and returns 0 or an errorcode.
*
*
*
*
* @param data pointer to the packet data
* @param dlength length of the data (amount of bytes)
* @param cursor pointer to the current parsing position.
* should be initialized to 0.
* @param name pointer-pointer, used to return the position
* of the name string
* @param nlength pointer to which the length of
* the name string will be written
* @param value pointer-pointer, used to retrun the position
* of the value string
* @param vlength pointer to which the length of
* the value string will be written
*
* @returns 0 on success
* 1 on insufficient data.
* This does not advance
* the cursor.
* 2 header is now finished.
* no more header variables follow
* 3 the packet is complete.
* >3 on a context error,
* <0 on a parsing error.
* This invalidates all but the cursor
* out paramater. */
int PSYC_parseHeader(
unsigned int* cursor,
const uint8_t * data, unsigned int dlength,
const uint8_t** name, unsigned int *nlength,
const uint8_t** value, unsigned int *vlength)
{
return PSYC_parseElement(cursor,data,dlength,name,nlength,value,vlength,1,0);
}
/** @brief parses one bodyelement
*
* This function is nearly identical to
* its brother parseClosedBody. *
*
* It assumes that we don’t know the
* real length of the packet and thus
* searches for the terminator.
*/
extern int PSYC_parseOpenBody(
unsigned int* cursor,
const uint8_t * data, unsigned int dlength,
const uint8_t** name, unsigned int *nlength,
const uint8_t** value, unsigned int *vlength)
{ {
return PSYC_parseElement(cursor,data,dlength,name,nlength,value,vlength,0,0);
} }
/** @brief parses one bodyelement
*
* This parses one body element, that is
* either an entity-variable or the method
*
* The function assumes that dlength is set
* to the exact length of the packet
* so that data[dlength-1] would be the
* ending "\n" of the packet.
*
* The parameters are nearly the same as for
* PSYC_parseHeader, only difference is
* that a returnvalue of 2 means, we encountered
* the method.
* This means that the out paramterer
* name contains the methodname and
* value the content.
* */
int PSYC_parseClosedBody(
unsigned int* cursor,
const uint8_t * data, unsigned int dlength,
const uint8_t** name, unsigned int *nlength,
const uint8_t** value, unsigned int *vlength)
{
return PSYC_parseElement(cursor,data,dlength,name,nlength,value,vlength,0,1);
}
/** @brief generalized linebased parser */ /** @brief generalized linebased parser */
inline int PSYC_parseElement( inline int PSYC_parse(
unsigned int* cursor, PSYC_State* state,
const uint8_t * data, unsigned int dlength, PSYC_Array* name, PSYC_Array* value
const uint8_t** name, unsigned int *nlength, uint8_t* modifier, unsigned long* expectedBytes)
const uint8_t** value, unsigned int *vlength,
char inHeader,char complete)
{ {
/* first we test if we can access the first char */ /* first we test if we can access the first char */
if(dlength<=*cursor) // cursor is not inside the length if(state->buffer.length<=state->cursor) // cursor is not inside the length
return 1; // return insufficient data. return 1; // return insufficient data.
// in case we return insufficent, we rewind to the start. // in case we return insufficent, we rewind to the start.
unsigned int startc=*cursor; unsigned int startc=state->cursor;
/* each line of the header starts with a glyph. /* each line of the header starts with a glyph.
* iE :_name, -_name +_name etc, so just test if * iE :_name, -_name +_name etc, so just test if
* the first char is a glyph. */ * the first char is a glyph. */
if(1==inHeader) if(1==state->inHeader)
{ {
if(!isGlyph(data[*cursor])) // is the first char not a glyph? if(!isGlyph(state->buffer.ptr[state->cursor])) // is the first char not a glyph?
{ {
// the only other possibility now is that the packet // the only other possibility now is that the packet
// is complete(empty packet) or that the method started. // is complete(empty packet) or that the method started.
if(isAlphaNumeric(data[*cursor])) if(isAlphaNumeric(state->buffer.ptr[state->cursor]))
return 2; // return header finished
if(data[*cursor] == '|')
{ {
if(dlength<=++(*cursor)) // incremented cursor inside lenght? state->inHeader = 0;
return 2; // return header finished
}
if(state->buffer.ptr[state->cursor] == '|')
{
if(state->buffer.length<=++(state->cursor)) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value state->cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
if(data[*cursor]=='\n') if(state->buffer.ptr[state->cursor]=='\n')
{ {
++(*cursor); ++(state->cursor);
return 3; // return packet finished return 3; // return packet finished
} }
} }
return -6; // report error return -6; // report error
}else // it is a glyph, so a variable name starts here }else // it is a glyph, so a variable name starts here
{ {
*name = data+*cursor; *modifier = *state->buffer.ptr+state->cursor;
*nlength = 1; name->length = 0;
} }
} }
char method=0; char method=0;
/* in the body, the same applies, only that the /* in the body, the same applies, only that the
* method does not start with a glyph.*/ * method does not start with a glyph.*/
if(0==inHeader && !isGlyph(data[*cursor])) if(0==state->inHeader && !isGlyph(state->buffer.ptr[state->cursor]))
{ {
if(!isAlphaNumeric(data[*cursor]) && data[*cursor] != '_') if(!isAlphaNumeric(state->buffer.ptr[state->cursor]) && state->buffer.ptr[state->cursor] != '_')
{ {
// the body rule is optional, which means // the body rule is optional, which means
// that now also just |\n can follow. // that now also just |\n can follow.
if(data[*cursor] == '|') if(state->buffer.ptr[state->cursor] == '|')
{ {
if(dlength<=++(*cursor)) // incremented cursor inside lenght? if(state->buffer.length<=++(state->cursor)) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value state->cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
if(data[*cursor]=='\n') if(state->buffer.ptr[state->cursor]=='\n')
{ {
++(*cursor); ++(state->cursor);
return 3; // return packet finished return 3; // return packet finished
} }
} }
@ -225,21 +133,21 @@ inline int PSYC_parseElement(
} }
else else
{ {
*name = data+*cursor; name->ptr = state->buffer.ptr+state->cursor;
*nlength=1; name->length=1;
method=1; method=1;
} }
} }
else else
{ {
*name = data+*cursor; name->ptr = state->buffer.ptr+state->cursor;
*nlength=1; name->length=1;
} }
/* validate the incremented cursor */ /* validate the incremented cursor */
if(dlength <= ++(*cursor)) if(state->buffer.length <= ++(state->cursor))
{ {
*cursor=startc; state->cursor=startc;
return 1; return 1;
} }
@ -247,136 +155,139 @@ inline int PSYC_parseElement(
* allowed is alphanumeric and _ */ * allowed is alphanumeric and _ */
// first char must exist. // first char must exist.
if(!isAlphaNumeric(data[*cursor]) // is it not alphanum if(!isAlphaNumeric(state->buffer.ptr[state->cursor]) // is it not alphanum
&& data[*cursor] != '_') // AND not '_'. must be invalid then && state->buffer.ptr[state->cursor] != '_') // AND not '_'. must be invalid then
return -1; // return parser error. return -1; // return parser error.
*nlength+=1; name->length+=1;
/* now checking how long the name of the variable is. */ /* now checking how long the name of the variable is. */
unsigned int i=0; unsigned int i=0;
while(1) while(1)
{ {
if(dlength<= ++(*cursor)) // incremented cursor inside lenght? if(state->buffer.length<= ++(state->cursor)) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value state->cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
// same as bevore // same as bevore
if(!isAlphaNumeric(data[*cursor]) && if(!isAlphaNumeric(state->buffer.ptr[state->cursor]) &&
data[*cursor] != '_') state->buffer.ptr[state->cursor] != '_')
break; // not valid? then stop the loop right here break; // not valid? then stop the loop right here
++(*nlength); // was a valid char, increase length ++(name->length); // was a valid char, increase length
} }
/* we now parsed the variable name successfully /* we now parsed the variable name successfully
* after the name either a \n or a \t follows. * after the name either a \n or a \t follows.
* *
* for the method, the data starts after an \n * for the method, the state->buffer.ptr starts after an \n
* so checking for \n too here * so checking for \n too here
* We dont check if cursor inside length, because * We dont check if cursor inside length, because
* the last loop iteration did that already. * the last loop iteration did that already.
*/ */
if(data[*cursor] == '\t' || data[*cursor] == '\n') // && method==1)) if(state->buffer.ptr[state->cursor] == '\t' || state->buffer.ptr[state->cursor] == '\n') // && method==1))
{ {
/* after the \t the arg-data follows, which is /* after the \t the arg-state->buffer.ptr follows, which is
* anything but \n. arg-data can be of length 0 * anything but \n. arg-state->buffer.ptr can be of length 0
* *
* for the method: after the \n data follows, * for the method: after the \n state->buffer.ptr follows,
* which is anything but \n|\n * which is anything but \n|\n
* *
* but data is optional, so we first check * but state->buffer.ptr is optional, so we first check
* here if data follows at all. * here if state->buffer.ptr follows at all.
* *
* arg-data=*value. we set value here so it * arg-state->buffer.ptr=value->ptr. we set value here so it
* points to a valid range and so we point * points to a valid range and so we point
* to the first potential arg-data byte. * to the first potential arg-state->buffer.ptr byte.
* If there is no arg-data, we still have * If there is no arg-state->buffer.ptr, we still have
* the length attribute on 0. */ * the length attribute on 0. */
if((method == 0 && data[*cursor] == '\n') /* emptyvar */ || if((method == 0 && state->buffer.ptr[state->cursor] == '\n') /* emptyvar */ ||
(method == 1 && *cursor+2 < dlength && (method == 1 && state->cursor+2 < state->buffer.length &&
data[*cursor+1] == '|' && state->buffer.ptr[state->cursor+1] == '|' &&
data[*cursor+2] == '\n') /*no data */ ) state->buffer.ptr[state->cursor+2] == '\n') /*no state->buffer.ptr */ )
{ {
*value=data+*cursor; value->ptr=state->buffer.ptr+state->cursor;
*vlength=0; value->length=0;
} }
else else
{ {
*value=data+*cursor+1; value->ptr=state->buffer.ptr+state->cursor+1;
if(1== complete) // we know the length of the packet if (1==state->length) // we know the length of the packet
{ {
*vlength= dlength - *cursor -3; value->length= state->buffer.length - state->cursor -3;
}else }
else // else search for the terminator
{ {
*vlength=0; value->length=0;
while(1)
while (1)
{ {
if(dlength<=++(*cursor)) // incremented cursor inside lenght? if(state->buffer.length<=++(state->cursor)) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value state->cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
if(0 == method && data[*cursor] == '\n') if(0 == method && state->buffer.ptr[state->cursor] == '\n')
break; break;
if(1 == method && data[*cursor] == '\n') if(1 == method && state->buffer.ptr[state->cursor] == '\n')
{ {
if(dlength<=(*cursor)+2) // incremented cursor inside lenght? if(state->buffer.length<=(state->cursor)+2) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value state->cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
if(data[*cursor+1] == '|') if(state->buffer.ptr[state->cursor+1] == '|')
if(data[*cursor+2] == '\n') if(state->buffer.ptr[state->cursor+2] == '\n')
{ {
/* packet finishes here */ /* packet finishes here */
*cursor+=3; state->cursor+=3;
return 3; return 3;
} }
} }
++(*vlength); ++(value->length);
} }
} }
} }
}else if(inHeader == 0 && method==0 && data[*cursor] == ' ') // oi, its a binary var! }else if(state->inHeader == 0 && method==0 && state->buffer.ptr[state->cursor] == ' ') // oi, its a binary var!
{ // after SP the length follows. { // after SP the length follows.
const uint8_t * bin_length_str = data + *cursor+1; const uint8_t * bin_length_str = state->buffer.ptr + state->cursor+1;
int strln = 0; int strln = 0;
do do
{ {
if(dlength<=++(*cursor)) // incremented cursor inside lenght? if(state->buffer.length<=++(state->cursor)) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value state->cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
++strln; ++strln;
}
while(isNumeric(state->buffer.ptr[state->cursor]));
}while(isNumeric(data[*cursor]));
// after the length a TAB follows // after the length a TAB follows
if(data[*cursor] != '\t') if (state->buffer.ptr[state->cursor] != '\t')
return -8; return -8;
// now we have the length. convert it to int // now we have the length. convert it to int
int binLength = atoi(bin_length_str); int binLength = atoi(bin_length_str);
// is that still in this buffer? // is that still in this buffer?
if(dlength <= *cursor+binLength+1 ) if(state->buffer.length <= state->cursor+binLength+1 )
{ {
*cursor=startc; state->cursor=startc;
return 1; return 1;
} }
*value = data + *cursor+1; value->ptr = state->buffer.ptr + state->cursor+1;
*vlength=binLength; value->length=binLength;
*cursor += binLength+1; state->cursor += binLength+1;
}else }else
return -8; return -8;
@ -384,7 +295,7 @@ inline int PSYC_parseElement(
/* if there was a \t, then we parsed up until the /* if there was a \t, then we parsed up until the
* \n char from the simple-arg rule ( \t arg-data \n ) * \n char from the simple-arg rule ( \t arg-state->buffer.ptr \n )
* *
* Now, if there would be no \t, we still would be at * Now, if there would be no \t, we still would be at
* the point where a \n must follow. * the point where a \n must follow.
@ -395,90 +306,36 @@ inline int PSYC_parseElement(
* *
* again, the loop has already validated the cursors * again, the loop has already validated the cursors
* position*/ * position*/
if(data[*cursor] != '\n') if(state->buffer.ptr[state->cursor] != '\n')
return -2; // return parser error. return -2; // return parser error.
/* if a \n follows now, the an body is attached. /* if a \n follows now, the an body is attached.
* if not, a |\n must follow */ * if not, a |\n must follow */
if(dlength<=++(*cursor)) // incremented cursor inside lenght? if(state->buffer.length<=++(state->cursor)) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value state->cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
if(1 == inHeader && data[*cursor] == '\n') if(1 == state->inHeader && state->buffer.ptr[state->cursor] == '\n')
{ {
*cursor+=1; state->cursor+=1;
state->inHeader = 0;
return 2; // line is complete, but body starts now. return 2; // line is complete, but body starts now.
} }
if(data[*cursor] != '|') // no pipe, then only line complete, not the packet. if(state->buffer.ptr[state->cursor] != '|') // no pipe, then only line complete, not the packet.
return 0; return 0;
if(dlength<=++(*cursor)) // incremented cursor inside lenght? if(state->buffer.length<=++(state->cursor)) // incremented cursor inside lenght?
{ {
*cursor=startc; // set to start value state->cursor=startc; // set to start value
return 1; // return insufficient return 1; // return insufficient
} }
if(data[*cursor] != '\n') if(state->buffer.ptr[state->cursor] != '\n')
return -4; return -4;
*cursor+=1; state->cursor+=1;
return 3; // packet is complete return 3; // packet is complete
} }
/** @brief parses one variable in two buffers
*
* This function is nearly identical to its
* brother parseHeader. The difference is,
* it uses two buffers and return parameters
* for everything. It is meant to be used
* in case parseHeader returned 2 for
* insufficient data and you don’t
* like to copy memory around to
* have all the data in one buffer.
* Using this function, you can pass two
* data buffers. The consequence is,
* that name and value can be distributed
* on two different buffers and thus need
* also two out paramaters. If only one
* will be used, length of the second
* will be 0.
*
* If your data is spread over more
* than two buffers, you need to
* copy that in one or two buffers.
* Given the unlikleyness of that
* event, we don't offer a three
* or more buffer function here.
*
*/
int PSYC_parseHeader2(
unsigned int* cursor,
const uint8_t * data1, unsigned int dlength1,
const uint8_t * data2, unsigned int dlength2,
const uint8_t** name1, unsigned int *nlength1,
const uint8_t** name2, unsigned int *nlength2,
const uint8_t** value1, unsigned int *vlength1,
const uint8_t** value2, unsigned int *vlength2);
/* @brief parses an bodyelement in two buffers
*
* This function is the brother of parseHeader2.
* It behaives the same as
* parseOpenBody and parseHeader2. */
int PSYC_parseOpenBody2(
unsigned int* cursor,
const uint8_t * data1, unsigned int dlength1,
const uint8_t * data2, unsigned int dlength2,
const uint8_t** name1, unsigned int *nlength1,
const uint8_t** name2, unsigned int *nlength2,
const uint8_t** value1, unsigned int *vlength1,
const uint8_t** value2, unsigned int *vlength2);