Add ENUM and HEXBYTES modes

svn path=/trunk/; revision=20733

3 files changed, 111 insertions, 74 deletions

diff --git a/epan/uat.c b/epan/uat.c
index de8966a329..3f2a560796 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -174,6 +174,7 @@ static void putfld(FILE* fp, void* rec, uat_field_t* f) {
 	f->cb.tostr(rec,&fld_ptr,&fld_len,f->cbdata.tostr,f->fld_data);
 	
 	switch(f->mode){
+		case  PT_TXTMOD_ENUM:
 		case  PT_TXTMOD_STRING: {
 			guint i;
 			
@@ -196,7 +197,7 @@ static void putfld(FILE* fp, void* rec, uat_field_t* f) {
 			guint i;
 			
 			for(i=0;i<fld_len;i++) {
-				fprintf(fp,"%.2x",fld_ptr[i]);
+				fprintf(fp,"%.2x",((guint8*)fld_ptr)[i]);
 			}
 			
 			return;
@@ -311,30 +312,20 @@ gboolean uat_fld_chk_proto(void* u1 _U_, const char* strptr, unsigned len, void*
 	}
 }
 
-gboolean uat_fld_chk_num_dec(void* u1 _U_, const char* strptr, unsigned len, void* u2 _U_, void* u3 _U_, char** err) {
+gboolean uat_fld_chk_enum(void* u1 _U_, const char* strptr, unsigned len, void* v, void* u3 _U_, char** err) {
 	char* str = ep_strndup(strptr,len);
-	long i = strtol(str,&str,10);
+	guint i;
+	value_string* vs = v;
 	
-	if ( ( i == 0) && (errno == ERANGE || errno == EINVAL) ) {
-		*err = strerror(errno);
-		return FALSE;
+	for(i=0;vs[i].strptr;i++) {
+		if (g_str_equal(vs[i].strptr,str)) {
+			*err = NULL;
+			return TRUE;
+		}
 	}
-	
-	*err = NULL;
-	return TRUE;
-}
 
-gboolean uat_fld_chk_num_hex(void* u1 _U_, const char* strptr, unsigned len, void* u2 _U_, void* u3 _U_, char** err) {
-	char* str = ep_strndup(strptr,len);
-	long i = strtol(str,&str,16);
-	
-	if ( ( i == 0) && (errno == ERANGE || errno == EINVAL) ) {
-		*err = strerror(errno);
-		return FALSE;
-	}
-	
-	*err = NULL;
-	return TRUE;
+	*err = ep_strdup_printf("invalid value: %s",str);
+	return FALSE;
 }
 
 CHK_STR_IS_DEF(isprint)
diff --git a/epan/uat.h b/epan/uat.h
index 1b025ea3f3..068622ca49 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -168,6 +168,7 @@ typedef enum _uat_text_mode_t {
 		 "invalid" as NULL,3
 		 "a1b" as NULL, 1
 	 */
+	PT_TXTMOD_ENUM
 } uat_text_mode_t;
 
 /*
@@ -253,6 +254,7 @@ gboolean uat_fld_chk_str(void*, const char*, unsigned, void*,void*, char** err);
 gboolean uat_fld_chk_proto(void*, const char*, unsigned, void*,void*, char** err);
 gboolean uat_fld_chk_num_dec(void*, const char*, unsigned, void*, void*, char** err);
 gboolean uat_fld_chk_num_hex(void*, const char*, unsigned, void*, void*, char** err);
+gboolean uat_fld_chk_enum(void*, const char*, unsigned, void*, void*, char**);
 
 #define CHK_STR_IS_DECL(what) \
 gboolean uat_fld_chk_str_ ## what (void*, const char*, unsigned, void*, void*, char**)
@@ -302,6 +304,23 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
 #define UAT_FLD_CSTRING_OTHER(basename,field_name,chk) \
 	{#field_name, PT_TXTMOD_STRING,{ chk ,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
 
+/*
+ * LSTRING MACROS
+ */
+#define UAT_LSTRING_CB_DEF(basename,field_name,rec_t,ptr_element,len_element) \
+static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* u1 _U_, void* u2 _U_) {\
+	if ((((rec_t*)rec)->ptr_element)) g_free((((rec_t*)rec)->ptr_element)); \
+	(((rec_t*)rec)->ptr_element) = g_strndup(buf,len); \
+	(((rec_t*)rec)->len_element) = len; } \
+static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* u1 _U_, void* u2 _U_) {\
+	if (((rec_t*)rec)->ptr_element ) { \
+		*out_ptr = (((rec_t*)rec)->ptr_element); *out_len = (((rec_t*)rec)->len_element); \
+	} else { \
+		*out_ptr = ""; *out_len = 0; } }
+
+#define UAT_FLD_LSTRING(basename,field_name) \
+{#field_name, PT_TXTMOD_STRING,{NULL,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+
 
 /*
  * BUFFER macros,
@@ -309,17 +328,17 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr,
  *    and its len in (((rec_t*)rec)->(len_name))
  *  XXX: UNTESTED
  */
-#define UAT_BUFFER_CB_DEF(field_name,len_name,rec_t,ptr_element,len_element) \
-static void basename ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* u1 _U_, void* u2 _U_) {\
-		if ((((rec_t*)rec)->(field_name))) g_free((((rec_t*)rec)->(field_name))); \
-			(((rec_t*)rec)->(field_name)) = g_memdup(buf,len); \
-			(((rec_t*)rec)->(len_name)) = len; \ } \
-static void basename ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* u1 _U_, void* u2 _U_) {\
-	*out_ptr = ep_memdup(((rec_t*)rec)->(field_name),((rec_t*)rec)->(len_name)); \
-	*len_ptr = (((rec_t*)rec)->(len_name)); }
+#define UAT_BUFFER_CB_DEF(basename,field_name,rec_t,ptr_element,len_element) \
+static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* u1 _U_, void* u2 _U_) {\
+		if ((((rec_t*)rec)->ptr_element) ) g_free((((rec_t*)rec)->ptr_element)); \
+			(((rec_t*)rec)->ptr_element) = len ? g_memdup(buf,len) : NULL; \
+			(((rec_t*)rec)->len_element) = len; } \
+static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* u1 _U_, void* u2 _U_) {\
+	*out_ptr = ((rec_t*)rec)->ptr_element ? ep_memdup(((rec_t*)rec)->ptr_element,((rec_t*)rec)->len_element) : ""; \
+	*out_len = ((rec_t*)rec)->len_element; }
 
 #define UAT_FLD_BUFFER(basename,field_name) \
-	{#field_name, PT_TXTMOD_HEXBYTES,{NULL,basename ## field_name ## _set_cb,basename ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+	{#field_name, PT_TXTMOD_HEXBYTES,{NULL,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
 
 
 /*
@@ -327,14 +346,14 @@ static void basename ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsig
  *   a decimal number contained in 
  */
 #define UAT_DEC_CB_DEF(basename,field_name,rec_t) \
-static void basename ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* u1 _U_, void* u2 _U_) {\
+static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* u1 _U_, void* u2 _U_) {\
 	((rec_t*)rec)->(field_name) = strtol(buf,end,10); } \
-static void basename ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* u1 _U_, void* u2 _U_) {\
+static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* u1 _U_, void* u2 _U_) {\
 	*out_ptr = ep_strdup_printf("%d",((rec_t*)rec)->(field_name)); \
 	*out_len = strlen(*out_ptr); }
 
 #define UAT_FLD_DEC(basename,field_name) \
-	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_num_dec,basename ## field_name ## _set_cb,basename ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_num_dec,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
 
 
 /*
@@ -342,14 +361,14 @@ static void basename ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsig
  *   an hexadecimal number contained in 
  */
 #define UAT_HEX_CB_DEF(basename,field_name,rec_t) \
-static void basename ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* u1 _U_, void* u2 _U_) {\
+static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* u1 _U_, void* u2 _U_) {\
 	((rec_t*)rec)->(field_name) = strtol(buf,end,16); } \
-static void basename ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* u1 _U_, void* u2 _U_) {\
+static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* u1 _U_, void* u2 _U_) {\
 	*out_ptr = ep_strdup_printf("%x",((rec_t*)rec)->(field_name)); \
 	*out_len = strlen(*out_ptr); }
 
 #define UAT_FLD_HEX(basename,field_name) \
-{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_num_hex,basename ## field_name ## _set_cb,basename ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
+{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_num_hex,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{NULL,NULL,NULL},NULL,FLDFILL}
 
 
 /*
@@ -359,25 +378,25 @@ static void basename ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsig
  *  rec_t:
  *        value
  */
-#define UAT_SET_ENUM_DEF(basename,field_name,rec_t,enum_t,default) \
-void static void basename ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* enum, void* u2 _U_) {\
+#define UAT_VS_DEF(basename,field_name,rec_t,default_val,default_str) \
+static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, unsigned len, void* vs, void* u2 _U_) {\
+	guint i; ((rec_t*)rec)->field_name = default_val; \
 	char* str = ep_strndup(buf,len); \
-	for(;((enum_t*)enum)->strptr;((enum_t*)enum)++) { \
-		if (g_strequal(((enum_t*)enum)->strptr,str)) { \
-			((rec_t*)rec)->(field_name) = ((enum_t*)enum)->value; return; } } \
-	(rec_t*)rec)->(field_name) = default; \
-}
-
-#define UAT_TOSTR_ENUM_DEF(basename,field_name,rec_t,enum_t) {\
-static void basename ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* enum, void* u2 _U_) {\
-	for(;((enum_t*)enum)->strptr;((enum_t*)enum)++) { \
-		if ( ((enum_t*)enum)->value == ((rec_t*)rec)->(field_name) ) { \
-			*out_str = ((enum_t*)enum)->strptr; \
-			*out_len = strlen(*out_ptr); } } }
-
-
-#define UAT_FLD_ENUM(basename,field_name,enum_t,enum) \
-	{#field_name, PT_TXTMOD_STRING,{uat_fld_chk_enum,basename ## field_name ## _set_cb,basename ## field_name ## _tostr_cb},{&(enum),&(enum),&(enum)},NULL,FLDFILL}
+	char* cstr;\
+	for(i=0; ( cstr = ((value_string*)vs)[i].strptr ) ;i++) { \
+		if (g_str_equal(cstr,str)) { \
+			((rec_t*)rec)->field_name = ((value_string*)vs)[i].value; return; } } } \
+static void basename ## _ ## field_name ## _tostr_cb(void* rec, char** out_ptr, unsigned* out_len, void* vs, void* u2 _U_) {\
+	guint i; \
+	*out_ptr = default_str; *out_len = strlen(default_str);\
+	for(i=0;((value_string*)vs)[i].strptr;i++) { \
+		if ( ((value_string*)vs)[i].value == ((rec_t*)rec)->field_name ) { \
+			*out_ptr = ep_strdup(((value_string*)vs)[i].strptr); \
+			*out_len = strlen(*out_ptr); return; } } }
+
+
+#define UAT_FLD_VS(basename,field_name,enum) \
+	{#field_name, PT_TXTMOD_ENUM,{uat_fld_chk_enum,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{&(enum),&(enum),&(enum)},&(enum),FLDFILL}
 
 
 
diff --git a/epan/uat_load.l b/epan/uat_load.l
index 9e2cf3f392..b5ef2ff268 100644
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -1,12 +1,11 @@
 %option noyywrap
-%option nounput
 %option prefix="uat_load_"
 %option never-interactive
-%option yylineno
+%option nounput
 
 %{
 	/*
-	 * uat_load.c
+	 * uat_load.l
 	 *
 	 * $Id$
 	 *
@@ -55,27 +54,28 @@
 	static guint len;
 	static gchar* error;
 	static void* record;
-	
+	static guint linenum;
+
 	static char* unbinstring(const char* si, guint in_len, guint* len_p);
 	static char* undquote(const char* si, guint in_len, guint* len_p);
 	
-#define ERROR(fmtd) do { error = ep_strdup_printf("%s:%d: %s",uat->filename,yylineno,ep_strdup_printf fmtd); yyterminate(); } while(0)
+#define ERROR(fmtd) do { error = ep_strdup_printf("%s:%d: %s",uat->filename,linenum,ep_strdup_printf fmtd); yyterminate(); } while(0)
 
 #define SET_FIELD() \
 	{ gchar* err; \
 	if (uat->fields[colnum].cb.chk) { \
-		if ( ! uat->fields[colnum].cb.chk(record, ptr, len, uat->fields[colnum].cbdata.chk,uat->fields[colnum].fld_data, &err) ) { \
+		if ( ! uat->fields[colnum].cb.chk(record, ptr, len, uat->fields[colnum].cbdata.chk, uat->fields[colnum].fld_data, &err) ) { \
 			ERROR(("%s",err)); \
 		}\
 	}\
-	uat->fields[colnum].cb.set(record, ptr, len,uat->fields[colnum].cbdata.chk,uat->fields[colnum].fld_data);\
+	uat->fields[colnum].cb.set(record, ptr, len, uat->fields[colnum].cbdata.chk, uat->fields[colnum].fld_data);\
 	g_free(ptr);\
 		colnum++; \
 	} while(0)
 
 #ifdef DEBUG_UAT_LOAD
 #define DUMP_FIELD(str) \
-		{ guint i; printf("%s: '",str); for(i=0;i<len;i++) putc(ptr[i],stdout); printf("'[%d]\n",len); }
+		{ guint i; printf("%s: %s='",str,uat->fields[colnum].name); for(i=0;i<len;i++) if (uat->fields[colnum].mode == PT_TXTMOD_HEXBYTES) { printf("%.2x ",((guint8*)ptr)[i]); } else putc(ptr[i],stdout); printf("'[%d]\n",len); }
 
 #define DUMP(str) printf("%s\n",str)
 #else
@@ -90,7 +90,7 @@
 %}
 
 quoted_string \042([^\042]|\134\134|\134\042)*\042
-binstring ([0-9a-zA-Z][0-9a-zA-Z])+
+binstring ([0-9a-zA-Z][0-9a-zA-Z])*
 separator [ \t]*,
 newline [ \t]*[\r]?\n
 ws [ \t]+
@@ -99,11 +99,31 @@ comment #[^\n]*\n
 %x START_OF_LINE NEXT_FIELD SEPARATOR END_OF_RECORD ERRORED
 %%
 <START_OF_LINE,NEXT_FIELD>{ws} ;
-<START_OF_LINE>{newline} ;
+<START_OF_LINE>{newline} linenum++;
 <START_OF_LINE>{comment} ;
-<NEXT_FIELD>{newline} {
-	ERROR(("expecting %s field in previuos line",uat->fields[colnum].name));
-	BEGIN START_OF_LINE;
+
+<START_OF_LINE,NEXT_FIELD>{separator} {
+	ptr = g_strdup("");
+	len = 0;
+	
+	DUMP_FIELD("empty->next");
+	
+	SET_FIELD();
+	
+	if ( colnum >= uat->ncols ) {
+		ERROR(("more fields than required"));
+	}
+	
+	BEGIN NEXT_FIELD;
+}
+
+<START_OF_LINE,NEXT_FIELD>{newline}   {
+	ptr = "";
+	len = 0;
+	
+	BEGIN END_OF_RECORD;
+
+	yyless(yyleng);
 }
 
 <START_OF_LINE,NEXT_FIELD>{quoted_string} {
@@ -149,12 +169,13 @@ comment #[^\n]*\n
 }
 
 <SEPARATOR>{newline} {
+	linenum++;
 	ERROR(("expecting field %s in previuos line",uat->fields[colnum].name));
 	BEGIN START_OF_LINE;
 }
 
 <SEPARATOR>. {
-	ERROR(("unexpected char while looking for field %s",uat->fields[colnum].name));
+	ERROR(("unexpected char '%s' while looking for field %s",yytext,uat->fields[colnum].name));
 	BEGIN ERRORED;
 }
 
@@ -167,6 +188,8 @@ comment #[^\n]*\n
 	void* rec;
 	gchar* err = NULL;
 	
+	linenum++;
+
 	DUMP_FIELD("newline->start");
 
 	SET_FIELD();
@@ -193,10 +216,10 @@ comment #[^\n]*\n
 	BEGIN ERRORED;
 }
 
-<ERRORED>{newline} BEGIN START_OF_LINE;
+<ERRORED>{newline} { linenum++; BEGIN START_OF_LINE; }
 <ERRORED>. ;
 
-{newline} { ERROR(("incomplete record")); }
+{newline} { linenum++; ERROR(("incomplete record")); BEGIN START_OF_LINE; }
 . { ERROR(("unexpected input")); }
 
 %%
@@ -224,7 +247,7 @@ static int xton(char d) {
 }
 
 static char* unbinstring(const char* si, guint in_len, guint* len_p) {
-	char* buf;
+	guint8* buf;
 	guint len = in_len/2;
 	int i = 0;
 	
@@ -232,7 +255,7 @@ static char* unbinstring(const char* si, guint in_len, guint* len_p) {
 		return NULL;
 	}
 	
-	buf= g_malloc(len); /* wastes one byte for every '\\' in text */
+	buf= g_malloc(len);
 	*len_p = len;
 
 	while(in_len) {
@@ -244,7 +267,7 @@ static char* unbinstring(const char* si, guint in_len, guint* len_p) {
 		in_len -= 2;
 	}
 	
-	return buf;
+	return (void*)buf;
 }
 
 static char* undquote(const char* si, guint in_len, guint* len_p) {
@@ -346,6 +369,7 @@ gboolean uat_load(uat_t* uat_in, char** err) {
 		UAT_UPDATE(uat);
 		return TRUE;
 	}
+	
 
 	if (!(yyin = fopen(fname,"r"))) {
 		*err = strerror(errno);
@@ -355,11 +379,14 @@ gboolean uat_load(uat_t* uat_in, char** err) {
 	error = NULL;
 	colnum = 0;
 	record = g_malloc0(uat->record_size);
+	linenum = 1;
 	
 	BEGIN START_OF_LINE;
+	DUMP(fname);
 	
 	yylex();
-	
+	yyrestart(NULL);
+
 	uat->changed = FALSE;
 
 	if (error) {