/*
* uat.c
*
- * $Id$
- *
* User Accessible Tables
- * Mantain an array of user accessible data strucures
+ * Maintain an array of user accessible data structures
*
* (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
*
* By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "config.h"
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <ctype.h>
#include <stdarg.h>
#include <glib.h>
#include <wsutil/file_util.h>
#include <wsutil/str_util.h>
-#include <wsutil/report_err.h>
+#include <wsutil/report_message.h>
-#include <epan/emem.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
#include <epan/packet.h>
#include <epan/range.h>
#include "uat-int.h"
-static GPtrArray* all_uats = NULL;
+/*
+ * XXX Files are encoded as ASCII. We might want to encode them as UTF8
+ * instead.
+ */
-void uat_init(void) {
- all_uats = g_ptr_array_new();
-}
+static GPtrArray* all_uats = NULL;
uat_t* uat_new(const char* name,
size_t size,
const char* filename,
gboolean from_profile,
- void** data_ptr,
+ void* data_ptr,
guint* numitems_ptr,
guint flags,
const char* help,
uat_update_cb_t update_cb,
uat_free_cb_t free_cb,
uat_post_update_cb_t post_update_cb,
+ uat_reset_cb_t reset_cb,
uat_field_t* flds_array) {
/* Create new uat */
uat_t* uat = (uat_t *)g_malloc(sizeof(uat_t));
uat->record_size = size;
uat->filename = g_strdup(filename);
uat->from_profile = from_profile;
- uat->user_ptr = data_ptr;
+ /* Callers of uat_new() pass in (void*) for data_ptr, because
+ * that is the "universal" pointer type that can be cast to
+ * anything. However, for our purposes, we want a (void**).
+ * So, we cast (void*) data_ptr to (void**) here. That keeps
+ * gcc -fstrict-aliasing from complaining. */
+ uat->user_ptr = (void**) data_ptr;
uat->nrows_p = numitems_ptr;
uat->copy_cb = copy_cb;
uat->update_cb = update_cb;
uat->free_cb = free_cb;
uat->post_update_cb = post_update_cb;
+ uat->reset_cb = reset_cb;
uat->fields = flds_array;
uat->user_data = g_array_new(FALSE,FALSE,(guint)uat->record_size);
uat->raw_data = g_array_new(FALSE,FALSE,(guint)uat->record_size);
uat->from_global = FALSE;
uat->rep = NULL;
uat->free_rep = NULL;
- uat->help = help;
+ uat->help = g_strdup(help);
uat->flags = flags;
for (i=0;flds_array[i].title;i++) {
uat->ncols = i;
- *data_ptr = NULL;
+ *((void**)data_ptr) = NULL;
*numitems_ptr = 0;
return uat;
void* rec;
gboolean* valid;
- /* Save a copy of the raw (possibly that may contain invalid field values) data */
- g_array_append_vals (uat->raw_data, data, 1);
-
- rec = uat->raw_data->data + (uat->record_size * (uat->raw_data->len-1));
-
- if (uat->copy_cb) {
- uat->copy_cb(rec, data, (unsigned int) uat->record_size);
- }
+ uat_insert_record_idx(uat, uat->raw_data->len, data);
if (valid_rec) {
/* Add a "known good" record to the list to be used by the dissector */
g_array_append_vals (uat->user_data, data, 1);
- rec = uat->user_data->data + (uat->record_size * (uat->user_data->len-1));
+ rec = UAT_USER_INDEX_PTR(uat, uat->user_data->len - 1);
if (uat->copy_cb) {
uat->copy_cb(rec, data, (unsigned int) uat->record_size);
}
UAT_UPDATE(uat);
+
+ valid = &g_array_index(uat->valid_data, gboolean, uat->valid_data->len-1);
+ *valid = valid_rec;
} else {
rec = NULL;
}
- g_array_append_vals (uat->valid_data, &valid_rec, 1);
- valid = (gboolean*)(uat->valid_data->data + (sizeof(gboolean) * (uat->valid_data->len-1)));
- *valid = valid_rec;
-
return rec;
}
+/* Updates the validity of a record. */
+void uat_update_record(uat_t *uat, const void *record, gboolean valid_rec) {
+ guint pos;
+ gboolean *valid;
+
+ /* Locate internal UAT data pointer. */
+ for (pos = 0; pos < uat->raw_data->len; pos++) {
+ if (UAT_INDEX_PTR(uat, pos) == record) {
+ break;
+ }
+ }
+ if (pos == uat->raw_data->len) {
+ /* Data is not within list?! */
+ g_assert_not_reached();
+ }
+
+ valid = &g_array_index(uat->valid_data, gboolean, pos);
+ *valid = valid_rec;
+}
+
void uat_swap(uat_t* uat, guint a, guint b) {
size_t s = uat->record_size;
- void* tmp = ep_alloc(s);
+ void* tmp;
gboolean tmp_bool;
g_assert( a < uat->raw_data->len && b < uat->raw_data->len );
if (a == b) return;
+ tmp = g_malloc(s);
memcpy(tmp, UAT_INDEX_PTR(uat,a), s);
memcpy(UAT_INDEX_PTR(uat,a), UAT_INDEX_PTR(uat,b), s);
memcpy(UAT_INDEX_PTR(uat,b), tmp, s);
+ g_free(tmp);
tmp_bool = *(gboolean*)(uat->valid_data->data + (sizeof(gboolean) * (a)));
*(gboolean*)(uat->valid_data->data + (sizeof(gboolean) * (a))) = *(gboolean*)(uat->valid_data->data + (sizeof(gboolean) * (b)));
}
+void uat_insert_record_idx(uat_t* uat, guint idx, const void *src_record) {
+ /* Allow insert before an existing item or append after the last item. */
+ g_assert( idx <= uat->raw_data->len );
+
+ /* Store a copy of the record and invoke copy_cb to clone pointers too. */
+ g_array_insert_vals(uat->raw_data, idx, src_record, 1);
+ void *rec = UAT_INDEX_PTR(uat, idx);
+ if (uat->copy_cb) {
+ uat->copy_cb(rec, src_record, (unsigned int) uat->record_size);
+ } else {
+ memcpy(rec, src_record, (unsigned int) uat->record_size);
+ }
+
+ /* Initially assume that the record is invalid, it is not copied to the
+ * user-visible records list. */
+ gboolean valid_rec = FALSE;
+ g_array_insert_val(uat->valid_data, idx, valid_rec);
+}
+
void uat_remove_record_idx(uat_t* uat, guint idx) {
g_assert( idx < uat->raw_data->len );
g_array_remove_index(uat->valid_data, idx);
}
+void uat_move_index(uat_t * uat, guint old_idx, guint new_idx)
+{
+ guint dir = 1;
+ guint start = old_idx;
+ if ( old_idx > new_idx )
+ dir = -1;
+
+ while ( start != new_idx )
+ {
+ uat_swap(uat, start, start + dir);
+ start += dir;
+ }
+}
+
/* The returned filename was g_malloc()'d so the caller must free it */
gchar* uat_get_actual_filename(uat_t* uat, gboolean for_writing) {
gchar *pers_fname = NULL;
return NULL;
}
+char *uat_fld_tostr(void *rec, uat_field_t *f) {
+ guint len;
+ char *ptr;
+ char *out;
+
+ f->cb.tostr(rec, &ptr, &len, f->cbdata.tostr, f->fld_data);
+
+ switch(f->mode) {
+ case PT_TXTMOD_NONE:
+ case PT_TXTMOD_STRING:
+ case PT_TXTMOD_ENUM:
+ case PT_TXTMOD_BOOL:
+ case PT_TXTMOD_FILENAME:
+ case PT_TXTMOD_DIRECTORYNAME:
+ case PT_TXTMOD_DISPLAY_FILTER:
+ case PT_TXTMOD_COLOR:
+ case PT_TXTMOD_PROTO_FIELD:
+ out = g_strndup(ptr, len);
+ break;
+ case PT_TXTMOD_HEXBYTES: {
+ GString *s = g_string_sized_new( len*2 + 1 );
+ guint i;
+
+ for (i=0; i<len;i++) g_string_append_printf(s, "%.2X", ((const guint8*)ptr)[i]);
+
+ out = g_strdup(s->str);
+
+ g_string_free(s, TRUE);
+ break;
+ }
+ default:
+ g_assert_not_reached();
+ out = NULL;
+ break;
+ }
+
+ g_free(ptr);
+ return out;
+}
+
static void putfld(FILE* fp, void* rec, uat_field_t* f) {
guint fld_len;
- const char* fld_ptr;
+ char* fld_ptr;
f->cb.tostr(rec,&fld_ptr,&fld_len,f->cbdata.tostr,f->fld_data);
switch(f->mode){
+ case PT_TXTMOD_NONE:
case PT_TXTMOD_ENUM:
case PT_TXTMOD_FILENAME:
case PT_TXTMOD_DIRECTORYNAME:
+ case PT_TXTMOD_DISPLAY_FILTER:
+ case PT_TXTMOD_PROTO_FIELD:
+ case PT_TXTMOD_COLOR:
case PT_TXTMOD_STRING: {
guint i;
for(i=0;i<fld_len;i++) {
char c = fld_ptr[i];
- if (c == '"' || c == '\\' || ! isprint((guchar)c) ) {
- fprintf(fp,"\\x%.2x",c);
+ if (c == '"' || c == '\\' || ! g_ascii_isprint((guchar)c) ) {
+ fprintf(fp,"\\x%02x", (guchar) c);
} else {
putc(c,fp);
}
}
putc('"',fp);
- return;
+ break;
}
case PT_TXTMOD_HEXBYTES: {
guint i;
for(i=0;i<fld_len;i++) {
- fprintf(fp,"%.2x",((guint8*)fld_ptr)[i]);
+ fprintf(fp,"%02x", (guchar)fld_ptr[i]);
}
- return;
+ break;
+ }
+ case PT_TXTMOD_BOOL: {
+ fprintf(fp,"\"%s\"", fld_ptr);
+ break;
}
default:
g_assert_not_reached();
}
+
+ g_free(fld_ptr);
}
-gboolean uat_save(uat_t* uat, const char** error) {
+gboolean uat_save(uat_t* uat, char** error) {
guint i;
gchar* fname = uat_get_actual_filename(uat,TRUE);
FILE* fp;
/* Parent directory does not exist, try creating first */
gchar *pf_dir_path = NULL;
if (create_persconffile_dir(&pf_dir_path) != 0) {
- *error = ep_strdup_printf("uat_save: error creating '%s'", pf_dir_path);
+ *error = g_strdup_printf("uat_save: error creating '%s'", pf_dir_path);
g_free (pf_dir_path);
return FALSE;
}
}
if (!fp) {
- *error = ep_strdup_printf("uat_save: error opening '%s': %s",fname,g_strerror(errno));
+ *error = g_strdup_printf("uat_save: error opening '%s': %s",fname,g_strerror(errno));
return FALSE;
}
/* Now copy "good" raw_data entries to user_data */
for ( i = 0 ; i < uat->raw_data->len ; i++ ) {
- void* rec = uat->raw_data->data + (uat->record_size * i);
- gboolean* valid = (gboolean*)(uat->valid_data->data + sizeof(gboolean)*i);
- if (*valid) {
+ void *rec = UAT_INDEX_PTR(uat, i);
+ gboolean valid = g_array_index(uat->valid_data, gboolean, i);
+ if (valid) {
g_array_append_vals(uat->user_data, rec, 1);
if (uat->copy_cb) {
- uat->copy_cb(UAT_USER_INDEX_PTR(uat,i), rec, (unsigned int) uat->record_size);
+ uat->copy_cb(UAT_USER_INDEX_PTR(uat, uat->user_data->len - 1),
+ rec, (unsigned int) uat->record_size);
}
UAT_UPDATE(uat);
return TRUE;
}
-void uat_destroy(uat_t* uat) {
- /* XXX still missing a destructor */
- g_ptr_array_remove(all_uats,uat);
-
-}
-
uat_t *uat_find(gchar *name) {
guint i;
*((uat)->user_ptr) = NULL;
*((uat)->nrows_p) = 0;
-}
-void* uat_dup(uat_t* uat, guint* len_p) {
- guint size = (guint) (uat->record_size * uat->user_data->len);
- *len_p = size;
- return size ? g_memdup(uat->user_data->data,size) : NULL ;
-}
-
-void* uat_se_dup(uat_t* uat, guint* len_p) {
- guint size = (guint) (uat->record_size * uat->user_data->len);
- *len_p = (guint) size;
- return size ? se_memdup(uat->user_data->data,size) : NULL ;
+ if (uat->reset_cb) {
+ uat->reset_cb();
+ }
}
void uat_unload_all(void) {
}
void uat_cleanup(void) {
- while( all_uats->len ) {
- uat_destroy((uat_t*)all_uats->pdata);
+ guint i;
+ guint j;
+ uat_t* uat;
+
+ for (i = 0; i < all_uats->len; i++) {
+ uat = (uat_t *)g_ptr_array_index(all_uats, i);
+ uat_clear(uat);
+ g_free(uat->help);
+ g_free(uat->name);
+ g_free(uat->filename);
+ g_array_free(uat->user_data, TRUE);
+ g_array_free(uat->raw_data, TRUE);
+ g_array_free(uat->valid_data, TRUE);
+ for (j = 0; uat->fields[j].title; j++)
+ g_free(uat->fields[j].priv);
+ g_free(uat);
}
g_ptr_array_free(all_uats,TRUE);
}
-
void uat_foreach_table(uat_cb_t cb,void* user_data) {
guint i;
}
-
void uat_load_all(void) {
guint i;
- const gchar* err;
+ gchar* err;
for (i=0; i < all_uats->len; i++) {
uat_t* u = (uat_t *)g_ptr_array_index(all_uats,i);
- err = NULL;
-
- if (!u->loaded)
- uat_load(u, &err);
- if (err) {
- report_failure("Error loading table '%s': %s",u->name,err);
+ if (!u->loaded) {
+ err = NULL;
+ if (!uat_load(u, NULL, &err)) {
+ report_failure("Error loading table '%s': %s",u->name,err);
+ g_free(err);
+ }
}
}
}
-gboolean uat_fld_chk_str(void* u1 _U_, const char* strptr, guint len _U_, const void* u2 _U_, const void* u3 _U_, const char** err) {
+gboolean uat_fld_chk_str(void* u1 _U_, const char* strptr, guint len _U_, const void* u2 _U_, const void* u3 _U_, char** err) {
if (strptr == NULL) {
- *err = "NULL pointer";
+ *err = g_strdup("NULL pointer");
return FALSE;
}
return TRUE;
}
-gboolean uat_fld_chk_oid(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, const char** err) {
+gboolean uat_fld_chk_oid(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
unsigned int i;
*err = NULL;
if (strptr == NULL) {
- *err = "NULL pointer";
+ *err = g_strdup("NULL pointer");
+ return FALSE;
+ }
+
+ if (len == 0) {
+ *err = g_strdup("Empty OID");
return FALSE;
}
for(i = 0; i < len; i++)
- if(!(isdigit(strptr[i]) || strptr[i] == '.')) {
- *err = "Only digits [0-9] and \".\" allowed in an OID";
- break;
+ if(!(g_ascii_isdigit(strptr[i]) || strptr[i] == '.')) {
+ *err = g_strdup("Only digits [0-9] and \".\" allowed in an OID");
+ return FALSE;
}
- if(strptr[len-1] == '.')
- *err = "OIDs must not be terminated with a \".\"";
+ if(strptr[len-1] == '.') {
+ *err = g_strdup("OIDs must not be terminated with a \".\"");
+ return FALSE;
+ }
- if(!((*strptr == '0' || *strptr == '1' || *strptr =='2') && (len > 1 && strptr[1] == '.')))
- *err = "OIDs must start with \"0.\" (ITU-T assigned), \"1.\" (ISO assigned) or \"2.\" (joint ISO/ITU-T assigned)";
+ if(!((*strptr == '0' || *strptr == '1' || *strptr =='2') && (len > 1 && strptr[1] == '.'))) {
+ *err = g_strdup("OIDs must start with \"0.\" (ITU-T assigned), \"1.\" (ISO assigned) or \"2.\" (joint ISO/ITU-T assigned)");
+ return FALSE;
+ }
/* should also check that the second arc is in the range 0-39 */
return *err == NULL;
}
-gboolean uat_fld_chk_proto(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, const char** err) {
+gboolean uat_fld_chk_proto(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
if (len) {
- char* name = ep_strndup(strptr,len);
+ char* name = g_strndup(strptr,len);
ascii_strdown_inplace(name);
g_strchug(name);
if (find_dissector(name)) {
*err = NULL;
+ g_free(name);
return TRUE;
} else {
- *err = "dissector not found";
+ *err = g_strdup("dissector not found");
+ g_free(name);
return FALSE;
}
} else {
}
}
-gboolean uat_fld_chk_num_dec(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, const char** err) {
+static gboolean uat_fld_chk_num(int base, const char* strptr, guint len, char** err) {
if (len > 0) {
- char* str = ep_strndup(strptr,len);
- long i = strtol(str,&str,10);
+ char* str = g_strndup(strptr, len);
+ const char* strn;
+ gboolean result;
+ guint32 value;
+
+ result = ws_basestrtou32(str, &strn, &value, base);
+ if (result && ((*strn != '\0') && (*strn != ' '))) {
+ /* string valid, but followed by something other than a space */
+ result = FALSE;
+ errno = EINVAL;
+ }
+ if (!result) {
+ switch (errno) {
- if ( ( i == 0) && (errno == ERANGE || errno == EINVAL) ) {
- *err = g_strerror(errno);
- return FALSE;
+ case EINVAL:
+ *err = g_strdup("Invalid value");
+ break;
+
+ case ERANGE:
+ *err = g_strdup("Value too large");
+ break;
+
+ default:
+ *err = g_strdup(g_strerror(errno));
+ break;
+ }
}
+ g_free(str);
+
+ return result;
}
*err = NULL;
return TRUE;
}
-gboolean uat_fld_chk_num_hex(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, const char** err) {
+gboolean uat_fld_chk_num_dec(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
+ return uat_fld_chk_num(10, strptr, len, err);
+}
+
+gboolean uat_fld_chk_num_hex(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
+ return uat_fld_chk_num(16, strptr, len, err);
+}
+
+gboolean uat_fld_chk_num_signed_dec(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
if (len > 0) {
- char* str = ep_strndup(strptr,len);
- long i = strtol(str,&str,16);
+ char* str = g_strndup(strptr,len);
+ const char* strn;
+ gboolean result;
+ gint32 value;
+
+ result = ws_strtoi32(str, &strn, &value);
+ if (result && ((*strn != '\0') && (*strn != ' '))) {
+ /* string valid, but followed by something other than a space */
+ result = FALSE;
+ errno = EINVAL;
+ }
+ if (!result) {
+ switch (errno) {
- if ( ( i == 0) && (errno == ERANGE || errno == EINVAL) ) {
- *err = g_strerror(errno);
- return FALSE;
+ case EINVAL:
+ *err = g_strdup("Invalid value");
+ break;
+
+ case ERANGE:
+ *err = g_strdup("Value too large");
+ break;
+
+ default:
+ *err = g_strdup(g_strerror(errno));
+ break;
+ }
}
+ g_free(str);
+
+ return result;
}
*err = NULL;
return TRUE;
}
-gboolean uat_fld_chk_enum(void* u1 _U_, const char* strptr, guint len, const void* v, const void* u3 _U_, const char** err) {
- char* str = ep_strndup(strptr,len);
+gboolean uat_fld_chk_bool(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err)
+{
+ char* str = g_strndup(strptr,len);
+
+ if ((g_strcmp0(str, "TRUE") == 0) ||
+ (g_strcmp0(str, "FALSE") == 0)) {
+ *err = NULL;
+ g_free(str);
+ return TRUE;
+ }
+
+ *err = g_strdup_printf("invalid value: %s (must be TRUE or FALSE)", str);
+ g_free(str);
+ return FALSE;
+}
+
+
+gboolean uat_fld_chk_enum(void* u1 _U_, const char* strptr, guint len, const void* v, const void* u3 _U_, char** err) {
+ char* str = g_strndup(strptr,len);
guint i;
const value_string* vs = (const value_string *)v;
for(i=0;vs[i].strptr;i++) {
- if (g_str_equal(vs[i].strptr,str)) {
+ if (g_strcmp0(vs[i].strptr,str) == 0) {
*err = NULL;
+ g_free(str);
return TRUE;
}
}
- *err = ep_strdup_printf("invalid value: %s",str);
+ *err = g_strdup_printf("invalid value: %s",str);
+ g_free(str);
return FALSE;
}
-gboolean uat_fld_chk_range(void* u1 _U_, const char* strptr, guint len, const void* v _U_, const void* u3, const char** err) {
- char* str = ep_strndup(strptr,len);
+gboolean uat_fld_chk_range(void* u1 _U_, const char* strptr, guint len, const void* v _U_, const void* u3, char** err) {
+ char* str = g_strndup(strptr,len);
range_t* r = NULL;
- convert_ret_t ret = range_convert_str(&r, str,GPOINTER_TO_UINT(u3));
+ convert_ret_t ret = range_convert_str(NULL, &r, str,GPOINTER_TO_UINT(u3));
+ gboolean ret_value = FALSE;
switch ( ret ) {
case CVT_NO_ERROR:
*err = NULL;
- return TRUE;
+ ret_value = TRUE;
+ break;
case CVT_SYNTAX_ERROR:
- *err = ep_strdup_printf("syntax error in range: %s",str);
- return FALSE;
+ *err = g_strdup_printf("syntax error in range: %s",str);
+ ret_value = FALSE;
+ break;
case CVT_NUMBER_TOO_BIG:
- *err = ep_strdup_printf("value too large in range: '%s' (max = %u)",str,GPOINTER_TO_UINT(u3));
- return FALSE;
+ *err = g_strdup_printf("value too large in range: '%s' (max = %u)",str,GPOINTER_TO_UINT(u3));
+ ret_value = FALSE;
+ break;
default:
- *err = "This should not happen, it is a bug in wireshark! please report to wireshark-dev@wireshark.org";
- return FALSE;
+ *err = g_strdup("Unable to convert range. Please report this to wireshark-dev@wireshark.org");
+ ret_value = FALSE;
+ break;
}
+
+ g_free(str);
+ wmem_free(NULL, r);
+ return ret_value;
}
-static int xton(char d) {
- switch(d) {
- case '0': return 0;
- case '1': return 1;
- case '2': return 2;
- case '3': return 3;
- case '4': return 4;
- case '5': return 5;
- case '6': return 6;
- case '7': return 7;
- case '8': return 8;
- case '9': return 9;
- case 'a': case 'A': return 10;
- case 'b': case 'B': return 11;
- case 'c': case 'C': return 12;
- case 'd': case 'D': return 13;
- case 'e': case 'E': return 14;
- case 'f': case 'F': return 15;
- default: return -1;
+gboolean uat_fld_chk_color(void* u1 _U_, const char* strptr, guint len, const void* v _U_, const void* u3 _U_, char** err) {
+
+ if ((len != 7) || (*strptr != '#')) {
+ *err = g_strdup("Color must be of the format #RRGGBB");
+ return FALSE;
}
+
+ /* Color is just # followed by hex string, so use hex verification */
+ return uat_fld_chk_num(16, strptr + 1, len - 1, err);
}
char* uat_unbinstring(const char* si, guint in_len, guint* len_p) {
if (len_p) *len_p = len;
while(in_len) {
- d1 = xton(*(si++));
- d0 = xton(*(si++));
+ d1 = ws_xton(*(si++));
+ d0 = ws_xton(*(si++));
buf[i++] = (d1 * 16) + d0;
const char* s;
const char* in_end = si+in_len;
- for (s = (const char *)si; s < in_end; s++) {
+ for (s = si; s < in_end; s++) {
switch(*s) {
case '\\':
switch(*(++s)) {
char c1 = *(s+1);
char c0 = *(s+2);
- if (isxdigit((guchar)c1) && isxdigit((guchar)c0)) {
- *(p++) = (xton(c1) * 0x10) + xton(c0);
+ if (g_ascii_isxdigit(c1) && g_ascii_isxdigit(c0)) {
+ *(p++) = (ws_xton(c1) * 0x10) + ws_xton(c0);
s += 2;
} else {
*(p++) = *s;
char* uat_esc(const char* buf, guint len) {
- const guint8* end = ((guint8*)buf)+len;
- char* out = (char *)ep_alloc0((4*len)+1);
+ const guint8* end = ((const guint8*)buf)+len;
+ char* out = (char *)g_malloc0((4*len)+1);
const guint8* b;
char* s = out;
- for (b = (guint8 *)buf; b < end; b++) {
- if (isprint(*b) ) {
- *(s++) = (*b);
- } else {
- g_snprintf(s,5,"\\x%.2x",((guint)*b));
+ for (b = (const guint8 *)buf; b < end; b++) {
+ if (*b == '"' || *b == '\\' || ! g_ascii_isprint(*b) ) {
+ g_snprintf(s,5,"\\x%02x",((guint)*b));
s+=4;
+ } else {
+ *(s++) = (*b);
}
}
}
-CHK_STR_IS_DEF(isprint)
-CHK_STR_IS_DEF(isalpha)
-CHK_STR_IS_DEF(isalnum)
-CHK_STR_IS_DEF(isdigit)
-CHK_STR_IS_DEF(isxdigit)
+gboolean uat_fld_chk_str_isprint(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
+ guint i;
+
+ for (i = 0; i < len; i++) {
+ char c = strptr[i];
+ if (! g_ascii_isprint(c)) {
+ *err = g_strdup_printf("invalid char pos=%d value=%02x", i, (guchar) c);
+ return FALSE;
+ }
+ }
+ *err = NULL;
+ return TRUE;
+}
+
+gboolean uat_fld_chk_str_isalpha(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
+ guint i;
+
+ for (i = 0; i < len; i++) {
+ char c = strptr[i];
+ if (! g_ascii_isalpha(c)) {
+ *err = g_strdup_printf("invalid char pos=%d value=%02x", i, (guchar) c);
+ return FALSE;
+ }
+ }
+ *err = NULL;
+ return TRUE;
+}
+
+gboolean uat_fld_chk_str_isalnum(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
+ guint i;
+
+ for (i = 0; i < len; i++) {
+ char c = strptr[i];
+ if (! g_ascii_isalnum(c)) {
+ *err = g_strdup_printf("invalid char pos=%d value=%02x", i, (guchar) c);
+ return FALSE;
+ }
+ }
+ *err = NULL;
+ return TRUE;
+}
+
+gboolean uat_fld_chk_str_isdigit(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
+ guint i;
+
+ for (i = 0; i < len; i++) {
+ char c = strptr[i];
+ if (! g_ascii_isdigit(c)) {
+ *err = g_strdup_printf("invalid char pos=%d value=%02x", i, (guchar) c);
+ return FALSE;
+ }
+ }
+ *err = NULL;
+ return TRUE;
+}
+
+gboolean uat_fld_chk_str_isxdigit(void* u1 _U_, const char* strptr, guint len, const void* u2 _U_, const void* u3 _U_, char** err) {
+ guint i;
+
+ for (i = 0; i < len; i++) {
+ char c = strptr[i];
+ if (! g_ascii_isxdigit(c)) {
+ *err = g_strdup_printf("invalid char pos=%d value=%02x", i, (guchar) c);
+ return FALSE;
+ }
+ }
+ *err = NULL;
+ return TRUE;
+}
+
/*
* Editor modelines
git.samba.org / metze / wireshark / wip.git / blobdiff