aboutsummaryrefslogtreecommitdiffstats
path: root/epan/uat_load.l
diff options
context:
space:
mode:
Diffstat (limited to 'epan/uat_load.l')
-rw-r--r--epan/uat_load.l125
1 files changed, 81 insertions, 44 deletions
diff --git a/epan/uat_load.l b/epan/uat_load.l
index 1aceb6a703..8e07cf6fd2 100644
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -1,6 +1,11 @@
%top {
/* Include this before everything else, for various large-file definitions */
#include "config.h"
+#include <wireshark.h>
+
+#define WS_LOG_DOMAIN LOG_DOMAIN_UAT
+
+/* #define DEBUG_UAT_LOAD 1 */
}
/*
@@ -93,19 +98,19 @@
/*
* Disable diagnostics in the code generated by Flex.
*/
-DIAG_OFF_FLEX
+DIAG_OFF_FLEX()
typedef struct {
uat_t* uat;
- gchar *parse_str;
+ char *parse_str;
- gchar* error;
- gboolean valid_record;
- guint colnum;
- gchar* ptrx;
- guint len;
+ char* error;
+ bool valid_record;
+ unsigned colnum;
+ char* ptrx;
+ unsigned len;
void* record;
- guint linenum;
+ unsigned linenum;
size_t parse_str_pos;
} uat_load_scanner_state_t;
@@ -116,9 +121,9 @@ typedef struct {
* must also be freed.
*/
#define ERROR(fmtd) do { \
- char* fmt_str = g_strdup_printf fmtd; \
+ char* fmt_str = ws_strdup_printf fmtd; \
g_free(yyextra->error); \
- yyextra->error = g_strdup_printf("%s:%d: %s",yyextra->uat->filename,yyextra->linenum,fmt_str); \
+ yyextra->error = ws_strdup_printf("%s:%d: %s",yyextra->uat->filename,yyextra->linenum,fmt_str); \
g_free(fmt_str); \
if (yyextra->uat->free_cb) { \
yyextra->uat->free_cb(yyextra->record); \
@@ -135,16 +140,16 @@ typedef struct {
* this message will be overwritten though.)
*/
#define SET_FIELD() \
- { gchar* errx; \
+ { char* errx; \
if (yyextra->uat->fields[yyextra->colnum].cb.chk) { \
if ( ! yyextra->uat->fields[yyextra->colnum].cb.chk(yyextra->record, yyextra->ptrx, yyextra->len, yyextra->uat->fields[yyextra->colnum].cbdata.chk, yyextra->uat->fields[yyextra->colnum].fld_data, &errx) ) { \
g_free(yyextra->error); \
- yyextra->error = g_strdup_printf("%s:%d: %s",yyextra->uat->filename,yyextra->linenum,errx); \
+ yyextra->error = ws_strdup_printf("%s:%d: %s",yyextra->uat->filename,yyextra->linenum,errx); \
g_free(errx); \
- yyextra->valid_record = FALSE; \
+ yyextra->valid_record = false; \
}\
}\
- yyextra->uat->fields[yyextra->colnum].cb.set(yyextra->record, yyextra->ptrx, yyextra->len, yyextra->uat->fields[yyextra->colnum].cbdata.chk, yyextra->uat->fields[yyextra->colnum].fld_data);\
+ yyextra->uat->fields[yyextra->colnum].cb.set(yyextra->record, yyextra->ptrx, yyextra->len, yyextra->uat->fields[yyextra->colnum].cbdata.set, yyextra->uat->fields[yyextra->colnum].fld_data);\
g_free(yyextra->ptrx);\
yyextra->ptrx = NULL;\
yyextra->colnum++; \
@@ -152,7 +157,7 @@ typedef struct {
#ifdef DEBUG_UAT_LOAD
#define DUMP_FIELD(str) \
- { guint i; printf("%s: %s='",str,yyextra->uat->fields[yyextra->colnum].name); for(i=0;i<yyextra->len;i++) if (yyextra->uat->fields[yyextra->colnum].mode == PT_TXTMOD_HEXBYTES) { printf("%.2x ",((guint8*)yyextra->ptrx)[i]); } else putc(yyextra->ptrx[i],stdout); printf("'[%d]\n",yyextra->len); }
+ { unsigned i; printf("%s: %s='",str,yyextra->uat->fields[yyextra->colnum].name); for(i=0;i<yyextra->len;i++) if (yyextra->uat->fields[yyextra->colnum].mode == PT_TXTMOD_HEXBYTES) { printf("%.2x ",((uint8_t*)yyextra->ptrx)[i]); } else putc(yyextra->ptrx[i],stdout); printf("'[%d]\n",yyextra->len); }
#define DUMP(str) printf("%s\n",str)
#else
@@ -213,6 +218,7 @@ typedef struct {
%}
quoted_string \042([^\042]|\134\042)*\042
+extra_records_string (\042.*\042)
binstring ([0-9a-zA-Z][0-9a-zA-Z])*
separator [ \t]*,
newline [ \t]*[\r]?\n
@@ -240,7 +246,7 @@ comment #[^\n]*\n
BEGIN NEXT_FIELD;
}
-<START_OF_LINE,NEXT_FIELD>{newline} {
+<START_OF_LINE,NEXT_FIELD>{newline} {
yyextra->ptrx = g_strdup("");
yyextra->len = 0;
@@ -250,7 +256,7 @@ comment #[^\n]*\n
}
<START_OF_LINE,NEXT_FIELD>{quoted_string} {
- yyextra->ptrx = uat_undquote(yytext, (guint) yyleng, &yyextra->len);
+ yyextra->ptrx = uat_undquote(yytext, (unsigned) yyleng, &yyextra->len);
if (yyextra->colnum < yyextra->uat->ncols - 1) {
@@ -263,7 +269,7 @@ comment #[^\n]*\n
}
<START_OF_LINE,NEXT_FIELD>{binstring} {
- yyextra->ptrx = uat_unbinstring(yytext, (guint) yyleng, &yyextra->len);
+ yyextra->ptrx = uat_unbinstring(yytext, (unsigned) yyleng, &yyextra->len);
if (!yyextra->ptrx) {
ERROR(("uneven hexstring for field %s",yyextra->uat->fields[yyextra->colnum].name));
@@ -292,16 +298,47 @@ comment #[^\n]*\n
}
<SEPARATOR>{newline} {
+ DUMP("separator->newline");
+
+ /*
+ * We've run out of fields. Check to see if we have any default
+ * values that we can fill in. The field for the current column
+ * will be filled in below in <END_OF_RECORD>{newline}.
+ */
+ unsigned save_colnum = yyextra->colnum;
+ yyextra->colnum++;
+ while (yyextra->colnum < yyextra->uat->ncols) {
+ if (!yyextra->uat->default_values) {
+ break;
+ }
+ const char *default_value = yyextra->uat->default_values[yyextra->colnum];
+ if (!default_value) {
+ break;
+ }
+ yyextra->uat->fields[yyextra->colnum].cb.set(yyextra->record, default_value, (unsigned) strlen(default_value), yyextra->uat->fields[yyextra->colnum].cbdata.set, yyextra->uat->fields[yyextra->colnum].fld_data);
+ ws_log(WS_LOG_DOMAIN, LOG_LEVEL_INFO, "%s:%d: Set %s to %s.",
+ yyextra->uat->filename, yyextra->linenum, yyextra->uat->fields[yyextra->colnum].name, default_value);
+ yyextra->colnum++;
+ }
+
+ if (yyextra->colnum < yyextra->uat->ncols) {
+ ERROR(("expecting field %s", yyextra->uat->fields[yyextra->colnum].name));
+ }
+
+ yyextra->colnum = save_colnum;
yyextra->linenum++;
- ERROR(("expecting field %s in previous line",yyextra->uat->fields[yyextra->colnum].name));
+ BEGIN END_OF_RECORD;
+ yyless(0);
}
<SEPARATOR>. {
ERROR(("unexpected char '%s' while looking for field %s",yytext,yyextra->uat->fields[yyextra->colnum].name));
}
-<END_OF_RECORD>{separator} {
- ERROR(("more fields than required"));
+<END_OF_RECORD>{separator}{extra_records_string} {
+ /* If we wanted to be really fancy we could retain the extra data. */
+ ws_log(WS_LOG_DOMAIN, LOG_LEVEL_WARNING, "%s:%d: More fields than required. Discarding '%s'.",
+ yyextra->uat->filename, yyextra->linenum, yytext);
}
<END_OF_RECORD>{newline} {
@@ -331,7 +368,7 @@ comment #[^\n]*\n
}
memset(yyextra->record, 0, yyextra->uat->record_size);
- yyextra->valid_record = TRUE;
+ yyextra->valid_record = true;
yyextra->colnum = 0;
yyextra->ptrx = NULL;
yyextra->len = 0;
@@ -340,7 +377,7 @@ comment #[^\n]*\n
}
<END_OF_RECORD>. {
- ERROR(("unexpected char while looking for end of line"));
+ ERROR(("unexpected char %s while looking for end of line", yytext));
}
<ERRORED>{newline} { yyextra->linenum++; BEGIN START_OF_LINE; }
@@ -354,12 +391,12 @@ comment #[^\n]*\n
/*
* Turn diagnostics back on, so we check the code that we've written.
*/
-DIAG_ON_FLEX
+DIAG_ON_FLEX()
-gboolean
-uat_load(uat_t *uat, const gchar *filename, char **errx)
+bool
+uat_load(uat_t *uat, const char *filename, char **errx)
{
- gchar *fname;
+ char *fname;
FILE *in;
yyscan_t scanner;
uat_load_scanner_state_t state;
@@ -367,7 +404,7 @@ uat_load(uat_t *uat, const gchar *filename, char **errx)
if (filename) {
fname = g_strdup(filename);
} else {
- fname = uat_get_actual_filename(uat, FALSE);
+ fname = uat_get_actual_filename(uat, false);
}
if (!fname) {
@@ -376,21 +413,21 @@ uat_load(uat_t *uat, const gchar *filename, char **errx)
if (uat->post_update_cb)
uat->post_update_cb();
- return TRUE;
+ return true;
}
if (!(in = ws_fopen(fname,"r"))) {
*errx = g_strdup(g_strerror(errno));
g_free(fname);
- return FALSE;
+ return false;
}
if (uat_load_lex_init(&scanner) != 0) {
*errx = g_strdup(g_strerror(errno));
fclose(in);
g_free(fname);
- return FALSE;
+ return false;
}
uat_load_set_in(in, scanner);
@@ -399,7 +436,7 @@ uat_load(uat_t *uat, const gchar *filename, char **errx)
state.parse_str = NULL; /* we're reading from a file */
state.error = NULL;
- state.valid_record = TRUE;
+ state.valid_record = true;
state.colnum = 0;
state.ptrx = NULL;
state.len = 0;
@@ -419,33 +456,33 @@ uat_load(uat_t *uat, const gchar *filename, char **errx)
g_free(state.record);
fclose(in);
- uat->changed = FALSE;
- uat->loaded = TRUE;
+ uat->changed = false;
+ uat->loaded = true;
UAT_UPDATE(uat);
if (state.error) {
*errx = state.error;
- return FALSE;
+ return false;
}
if (uat->post_update_cb)
uat->post_update_cb();
*errx = NULL;
- return TRUE;
+ return true;
}
-gboolean
+bool
uat_load_str(uat_t *uat, char *entry, char **err)
{
yyscan_t scanner;
uat_load_scanner_state_t state;
state.uat = uat;
- state.parse_str = g_strdup_printf("%s\n", entry); /* Records must end with a newline */
+ state.parse_str = ws_strdup_printf("%s\n", entry); /* Records must end with a newline */
state.error = NULL;
- state.valid_record = TRUE;
+ state.valid_record = true;
state.colnum = 0;
state.ptrx = NULL;
state.len = 0;
@@ -457,7 +494,7 @@ uat_load_str(uat_t *uat, char *entry, char **err)
*err = g_strdup(g_strerror(errno));
g_free(state.parse_str);
g_free(state.record);
- return FALSE;
+ return false;
}
DUMP(entry);
@@ -471,18 +508,18 @@ uat_load_str(uat_t *uat, char *entry, char **err)
g_free(state.record);
g_free(state.parse_str);
- uat->changed = TRUE;
- uat->loaded = TRUE;
+ uat->changed = true;
+ uat->loaded = true;
UAT_UPDATE(uat);
if (state.error) {
*err = state.error;
- return FALSE;
+ return false;
}
if (uat->post_update_cb)
uat->post_update_cb();
*err = NULL;
- return TRUE;
+ return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 00:21:53 +0000