X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgldecoder.c;h=f61e327aa92a9217a589ebb8f7174680f8125a7c;hb=03c86c2f632b642aa94f721e326787e91aa69c25;hp=93a525876c64c4b033bb92cd6f770239fcbc2dd9;hpb=9d1825d591a7261b1cff620ba535d333352984bf;p=gldbg.git

diff --git a/source/gldecoder.c b/source/gldecoder.c
index 93a5258..f61e327 100644
--- a/source/gldecoder.c
+++ b/source/gldecoder.c
@@ -9,6 +9,12 @@ Distributed under the GPL
 #include <string.h>
 #include "functions.h"
 #include "gldecoder.h"
+#include "tmpalloc.h"
+
+static unsigned read_short(short *, const char *);
+static unsigned read_int(int *, const char *);
+static int decode_func(GlDecoder *, unsigned short, const char *);
+static int decode_gldfunc(GlDecoder *, unsigned short, const char *);
 
 GlDecoder *gldecoder_new(void *user_data, void (*destroy)(void *))
 {
@@ -29,72 +35,129 @@ void gldecoder_delete(GlDecoder *dec)
 	free(dec);
 }
 
-unsigned read_char(char *v, const char *data, unsigned len)
+int gldecoder_decode(GlDecoder *dec, const char *data, unsigned len)
+{
+	unsigned pos = 0;
+	unsigned pktlen;
+	unsigned short func;
+	int ret;
+
+	if(len<sizeof(int)+sizeof(short))
+		return -1;
+	pos += read_int((int *)&pktlen, data);
+	if(len<pktlen)
+		return -1;
+	pos += read_short((short *)&func, data+pos);
+	if(dec)
+	{
+		if(func&0x8000)
+			ret = decode_gldfunc(dec, func, data+pos);
+		else
+			ret = decode_func(dec, func, data+pos);
+		if(ret<0)
+			return -1;
+	}
+	return pktlen;
+}
+
+static unsigned read_char(char *v, const char *data)
 {
 	*v = *data;
 	return 1;
 }
 
-unsigned read_short(short *v, const char *data, unsigned len)
+static unsigned read_short(short *v, const char *data)
 {
 	*v = *(short *)data;
 	return sizeof(short);
 }
 
-unsigned read_int(int *v, const char *data, unsigned len)
+static unsigned read_int(int *v, const char *data)
 {
 	*v = *(int *)data;
 	return sizeof(int);
 }
 
-unsigned read_long(long *v, const char *data, unsigned len)
+static unsigned read_long(long *v, const char *data)
 {
 	*v = *(long *)data;
 	return sizeof(long);
 }
 
-unsigned read_ulong(unsigned long *v, const char *data, unsigned len)
-{
-	*v = *(unsigned long *)data;
-	return sizeof(unsigned long);
-}
-
-unsigned read_longlong(long long *v, const char *data, unsigned len)
+static unsigned read_long_long(long long *v, const char *data)
 {
 	*v = *(long long *)data;
 	return sizeof(long long);
 }
 
-unsigned read_float(float *v, const char *data, unsigned len)
+static unsigned read_float(float *v, const char *data)
 {
 	*v = *(float *)data;
 	return sizeof(float);
 }
 
-unsigned read_double(double *v, const char *data, unsigned len)
+static unsigned read_double(double *v, const char *data)
 {
 	*v = *(double *)data;
 	return sizeof(double);
 }
 
-unsigned read_pointer(void **v, const char *data, unsigned len)
+typedef void *pointer;
+
+static unsigned read_pointer(pointer *v, const char *data)
 {
 	*v = *(void **)data;
 	return sizeof(void *);
 }
 
-unsigned read_data(const void **v, const char *data, unsigned len)
+static unsigned read_data(const void **v, const char *data)
 {
 	int vlen;
 	unsigned pos = 0;
-	pos += read_int(&vlen, data, len);
-	*v = data+pos;
+	pos += read_int(&vlen, data);
+	if(vlen)
+		*v = data+pos;
+	else
+		*v = NULL;
 	return pos+vlen;
 }
 
-unsigned read_string(const unsigned char **v, const char *data, unsigned len)
+typedef const char *string;
+
+static unsigned read_string(string *v, const char *data)
 {
-	return read_data((const void **)v, data, len);
+	return read_data((const void **)v, data);
 }
 
-#include "gldecoder.funcs"
+static unsigned read_string_array(string **v, const char *data)
+{
+	int count;
+	unsigned pos = 0;
+	int i;
+	pos += read_int(&count, data);
+	*v = (string *)tmpalloc(count*sizeof(string));
+	for(i=0; i<count; ++i)
+		pos += read_string(*v+i, data+pos);
+	return pos;
+}
+
+#include "gensrc/gldecoder.funcs"
+
+static int decode_gldError(GlDecoder *dec, const char *data)
+{
+	unsigned pos = 0;
+	GLenum code;
+	pos += read_int((int *)&code, data);
+	if(dec->gldError)
+		dec->gldError(dec->user_data, code);
+	return pos;
+}
+
+static int decode_gldfunc(GlDecoder *dec, unsigned short func, const char *data)
+{
+	switch(func)
+	{
+	case FUNC_GLDERROR: return decode_gldError(dec, data);
+	default: return -1;
+	}
+}