osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the 

collision.

svn path=/trunk/; revision=52144
This commit is contained in:
Evan Huus 2013-09-19 13:04:37 +00:00
parent 6c41404ecf
commit 27c4a47c29
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-gluster.h
View File

@ -357,6 +357,20 @@ enum gf_fop_procnum {
GFS3_OP_MAXVALUE
};
/* dir-entry types from libglusterfs/src/compat.h */
enum gluster_entry_types {
GLUSTER_DT_UNKNOWN = 0,
GLUSTER_DT_FIFO = 1,
GLUSTER_DT_CHR = 2,
GLUSTER_DT_DIR = 4,
GLUSTER_DT_BLK = 6,
GLUSTER_DT_REG = 8,
GLUSTER_DT_LNK = 10,
GLUSTER_DT_SOCK = 12,
GLUSTER_DT_WHT = 14
};
/* LOCKING operators come from libglusterfs/src/glusterfs.h */
/* based on original enum glusterfs_lk_cmds_t */

18
epan/dissectors/packet-glusterfs.c
View File

@ -2030,15 +2030,15 @@ static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(g
/* dir-entry types */
static const value_string glusterfs_entry_type_names[] = {
{ DT_UNKNOWN, "DT_UNKNOWN" },
{ DT_FIFO, "DT_FIFO" },
{ DT_CHR, "DT_CHR" },
{ DT_DIR, "DT_DIR" },
{ DT_BLK, "DT_BLK" },
{ DT_REG, "DT_REG" },
{ DT_LNK, "DT_LNK" },
{ DT_SOCK, "DT_SOCK" },
{ DT_WHT, "DT_WHT" },
{ GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" },
{ GLUSTER_DT_FIFO, "DT_FIFO" },
{ GLUSTER_DT_CHR, "DT_CHR" },
{ GLUSTER_DT_DIR, "DT_DIR" },
{ GLUSTER_DT_BLK, "DT_BLK" },
{ GLUSTER_DT_REG, "DT_REG" },
{ GLUSTER_DT_LNK, "DT_LNK" },
{ GLUSTER_DT_SOCK, "DT_SOCK" },
{ GLUSTER_DT_WHT, "DT_WHT" },
{ 0, NULL }
};
static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names);