# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am,v 1.18 2001/04/01 02:47:55 hagbard Exp $
+# $Id: Makefile.am,v 1.19 2001/04/01 03:18:41 hagbard Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
to_str.c \
to_str.h \
tvbuff.c \
- tvbuff.h
+ tvbuff.h \
+ value_string.c \
+ value_string.h
EXTRA_libethereal_a_SOURCES = \
inet_aton.c \
strutil.obj \
to_str.obj \
tvbuff.obj \
+ value_string.obj \
all: ftypes dfilter ethereal.lib
/* packet.c
* Routines for packet disassembly
*
- * $Id: packet.c,v 1.25 2001/04/01 02:47:55 hagbard Exp $
+ * $Id: packet.c,v 1.26 2001/04/01 03:18:41 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
/* nothing */
}
-/* Tries to match val against each element in the value_string array vs.
- Returns the associated string ptr on a match.
- Formats val with fmt, and returns the resulting string, on failure. */
-gchar*
-val_to_str(guint32 val, const value_string *vs, const char *fmt) {
- gchar *ret;
- static gchar str[3][64];
- static gchar *cur;
-
- ret = match_strval(val, vs);
- if (ret != NULL)
- return ret;
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
- }
- snprintf(cur, 64, fmt, val);
- return cur;
-}
-
-/* Tries to match val against each element in the value_string array vs.
- Returns the associated string ptr on a match, or NULL on failure. */
-gchar*
-match_strval(guint32 val, const value_string *vs) {
- gint i = 0;
-
- while (vs[i].strptr) {
- if (vs[i].value == val)
- return(vs[i].strptr);
- i++;
- }
-
- return(NULL);
-}
-
-/* Generate a string describing an enumerated bitfield (an N-bit field
- with various specific values having particular names). */
-const char *
-decode_enumerated_bitfield(guint32 val, guint32 mask, int width,
- const value_string *tab, const char *fmt)
-{
- static char buf[1025];
- char *p;
-
- p = decode_bitfield_value(buf, val, mask, width);
- sprintf(p, fmt, val_to_str(val & mask, tab, "Unknown"));
- return buf;
-}
-
/* Allocate all the data structures for constructing column data, given
the number of columns. */
void
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.25 2001/04/01 02:47:55 hagbard Exp $
+ * $Id: packet.h,v 1.26 2001/04/01 03:18:41 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "tvbuff.h"
#include "pint.h"
#include "to_str.h"
+#include "value_string.h"
#define hi_nibble(b) (((b) & 0xf0) >> 4)
#define lo_nibble(b) ((b) & 0x0f)
extern packet_info pi;
-/* Struct for the match_strval function */
-
-typedef struct _value_string {
- guint32 value;
- gchar *strptr;
-} value_string;
-
/* Struct for boolean enumerations */
typedef struct true_false_string {
char *true_string;
packet_info *pinfo, proto_tree *tree);
/* Utility routines used by packet*.c */
-gchar* val_to_str(guint32, const value_string *, const char *);
-gchar* match_strval(guint32, const value_string*);
-const char *decode_enumerated_bitfield(guint32 val, guint32 mask, int width,
- const value_string *tab, const char *fmt);
void col_set_writable(frame_data *fd, gboolean writable);
gint check_col(frame_data *, gint);
--- /dev/null
+/* value_string.c
+ * Routines for value_strings
+ *
+ * $Id: value_string.c,v 1.1 2001/04/01 03:18:41 hagbard Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
+#include "to_str.h"
+#include "value_string.h"
+
+/* Tries to match val against each element in the value_string array vs.
+ Returns the associated string ptr on a match.
+ Formats val with fmt, and returns the resulting string, on failure. */
+gchar*
+val_to_str(guint32 val, const value_string *vs, const char *fmt) {
+ gchar *ret;
+ static gchar str[3][64];
+ static gchar *cur;
+
+ ret = match_strval(val, vs);
+ if (ret != NULL)
+ return ret;
+ if (cur == &str[0][0]) {
+ cur = &str[1][0];
+ } else if (cur == &str[1][0]) {
+ cur = &str[2][0];
+ } else {
+ cur = &str[0][0];
+ }
+ snprintf(cur, 64, fmt, val);
+ return cur;
+}
+
+/* Tries to match val against each element in the value_string array vs.
+ Returns the associated string ptr on a match, or NULL on failure. */
+gchar*
+match_strval(guint32 val, const value_string *vs) {
+ gint i = 0;
+
+ while (vs[i].strptr) {
+ if (vs[i].value == val)
+ return(vs[i].strptr);
+ i++;
+ }
+
+ return(NULL);
+}
+
+/* Generate a string describing an enumerated bitfield (an N-bit field
+ with various specific values having particular names). */
+const char *
+decode_enumerated_bitfield(guint32 val, guint32 mask, int width,
+ const value_string *tab, const char *fmt)
+{
+ static char buf[1025];
+ char *p;
+
+ p = decode_bitfield_value(buf, val, mask, width);
+ sprintf(p, fmt, val_to_str(val & mask, tab, "Unknown"));
+ return buf;
+}
+
+
--- /dev/null
+/* value_string.h
+ * Definitions for value_string structures and routines
+ *
+ * $Id: value_string.h,v 1.1 2001/04/01 03:18:41 hagbard Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@zing.org>
+ * Copyright 1998 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __VALUE_STRING_H__
+#define __VALUE_STRING_H__
+
+#include <glib.h>
+
+/* Struct for the match_strval function */
+
+typedef struct _value_string {
+ guint32 value;
+ gchar *strptr;
+} value_string;
+
+gchar* match_strval(guint32, const value_string*);
+
+gchar* val_to_str(guint32, const value_string *, const char *);
+const char *decode_enumerated_bitfield(guint32 val, guint32 mask, int width,
+ const value_string *tab, const char *fmt);
+
+#endif /* __VALUE_STRING_H__ */
git.samba.org / obnox / wireshark / wip.git / commitdiff