diff options
| -rw-r--r-- | epan/dissectors/packet-gluster_cli.c | 211 | ||||
| -rw-r--r-- | epan/dissectors/packet-gluster_pmap.c | 21 | ||||
| -rw-r--r-- | epan/dissectors/packet-glusterd.c | 225 | ||||
| -rw-r--r-- | epan/dissectors/packet-glusterfs.c | 178 | ||||
| -rw-r--r-- | epan/dissectors/packet-glusterfs_hndsk.c | 21 |
5 files changed, 330 insertions, 326 deletions
diff --git a/epan/dissectors/packet-gluster_cli.c b/epan/dissectors/packet-gluster_cli.c index 7fa5f91c33..cb7e6cc630 100644 --- a/epan/dissectors/packet-gluster_cli.c +++ b/epan/dissectors/packet-gluster_cli.c @@ -38,9 +38,8 @@ #endif #include <glib.h> -#include <string.h> + #include <epan/packet.h> -#include <epan/tfs.h> #include "packet-rpc.h" #include "packet-gluster.h" @@ -209,7 +208,7 @@ gluster_cli_2_umount_call(tvbuff_t *tvb, int offset, { gchar* path = NULL; - offset = dissect_rpc_uint32(tvb, tree,hf_gluster_lazy, offset); + offset = dissect_rpc_uint32(tvb, tree, hf_gluster_lazy, offset); offset = dissect_rpc_string(tvb, tree, hf_gluster_path, offset, &path); return offset; @@ -217,40 +216,40 @@ gluster_cli_2_umount_call(tvbuff_t *tvb, int offset, /* procedures for GLUSTER_CLI_PROGRAM */ static const vsff gluster_cli_proc[] = { - { GLUSTER_CLI_NULL, "NULL", NULL, NULL }, - { GLUSTER_CLI_PROBE, "PROBE", NULL, NULL }, - { GLUSTER_CLI_DEPROBE, "DEPROBE", NULL, NULL }, - { GLUSTER_CLI_LIST_FRIENDS, "LIST_FRIENDS", NULL, NULL }, - { GLUSTER_CLI_CREATE_VOLUME, "CREATE_VOLUME", NULL, NULL }, - { GLUSTER_CLI_GET_VOLUME, "GET_VOLUME", NULL, NULL }, - { GLUSTER_CLI_GET_NEXT_VOLUME, "GET_NEXT_VOLUME", NULL, NULL }, - { GLUSTER_CLI_DELETE_VOLUME, "DELETE_VOLUME", NULL, NULL }, - { GLUSTER_CLI_START_VOLUME, "START_VOLUME", NULL, NULL }, - { GLUSTER_CLI_STOP_VOLUME, "STOP_VOLUME", NULL, NULL }, - { GLUSTER_CLI_RENAME_VOLUME, "RENAME_VOLUME", NULL, NULL }, - { GLUSTER_CLI_DEFRAG_VOLUME, "DEFRAG_VOLUME", NULL, NULL }, - { GLUSTER_CLI_SET_VOLUME, "SET_VOLUME", NULL, NULL }, - { GLUSTER_CLI_ADD_BRICK, "ADD_BRICK", NULL, NULL }, - { GLUSTER_CLI_REMOVE_BRICK, "REMOVE_BRICK", NULL, NULL }, - { GLUSTER_CLI_REPLACE_BRICK, "REPLACE_BRICK", NULL, NULL }, - { GLUSTER_CLI_LOG_FILENAME, "LOG_FILENAME", NULL, NULL }, - { GLUSTER_CLI_LOG_LOCATE, "LOG_LOCATE", NULL, NULL }, - { GLUSTER_CLI_LOG_ROTATE, "LOG_ROTATE", NULL, NULL }, - { GLUSTER_CLI_GETSPEC, "GETSPEC", NULL, NULL }, - { GLUSTER_CLI_PMAP_PORTBYBRICK, "PMAP_PORTBYBRICK", NULL , NULL }, - { GLUSTER_CLI_SYNC_VOLUME, "SYNC_VOLUME", NULL, NULL }, - { GLUSTER_CLI_RESET_VOLUME, "RESET_VOLUME", NULL, NULL }, - { GLUSTER_CLI_FSM_LOG, "FSM_LOG", NULL, NULL }, - { GLUSTER_CLI_GSYNC_SET, "GSYNC_SET", NULL, NULL }, - { GLUSTER_CLI_PROFILE_VOLUME, "PROFILE_VOLUME", NULL, NULL }, - { GLUSTER_CLI_QUOTA, "QUOTA", NULL, NULL }, - { GLUSTER_CLI_TOP_VOLUME, "TOP_VOLUME", NULL, NULL }, - { GLUSTER_CLI_GETWD, "GETWD", NULL, NULL }, - { GLUSTER_CLI_LOG_LEVEL, "LOG_LEVEL", NULL, NULL }, - { GLUSTER_CLI_STATUS_VOLUME, "STATUS_VOLUME", NULL, NULL }, - { GLUSTER_CLI_MOUNT, "MOUNT", NULL, NULL }, - { GLUSTER_CLI_UMOUNT, "UMOUNT", NULL, NULL }, - { GLUSTER_CLI_HEAL_VOLUME, "HEAL_VOLUME", NULL, NULL }, + { GLUSTER_CLI_NULL, "NULL", NULL, NULL }, + { GLUSTER_CLI_PROBE, "PROBE", NULL, NULL }, + { GLUSTER_CLI_DEPROBE, "DEPROBE", NULL, NULL }, + { GLUSTER_CLI_LIST_FRIENDS, "LIST_FRIENDS", NULL, NULL }, + { GLUSTER_CLI_CREATE_VOLUME, "CREATE_VOLUME", NULL, NULL }, + { GLUSTER_CLI_GET_VOLUME, "GET_VOLUME", NULL, NULL }, + { GLUSTER_CLI_GET_NEXT_VOLUME, "GET_NEXT_VOLUME", NULL, NULL }, + { GLUSTER_CLI_DELETE_VOLUME, "DELETE_VOLUME", NULL, NULL }, + { GLUSTER_CLI_START_VOLUME, "START_VOLUME", NULL, NULL }, + { GLUSTER_CLI_STOP_VOLUME, "STOP_VOLUME", NULL, NULL }, + { GLUSTER_CLI_RENAME_VOLUME, "RENAME_VOLUME", NULL, NULL }, + { GLUSTER_CLI_DEFRAG_VOLUME, "DEFRAG_VOLUME", NULL, NULL }, + { GLUSTER_CLI_SET_VOLUME, "SET_VOLUME", NULL, NULL }, + { GLUSTER_CLI_ADD_BRICK, "ADD_BRICK", NULL, NULL }, + { GLUSTER_CLI_REMOVE_BRICK, "REMOVE_BRICK", NULL, NULL }, + { GLUSTER_CLI_REPLACE_BRICK, "REPLACE_BRICK", NULL, NULL }, + { GLUSTER_CLI_LOG_FILENAME, "LOG_FILENAME", NULL, NULL }, + { GLUSTER_CLI_LOG_LOCATE, "LOG_LOCATE", NULL, NULL }, + { GLUSTER_CLI_LOG_ROTATE, "LOG_ROTATE", NULL, NULL }, + { GLUSTER_CLI_GETSPEC, "GETSPEC", NULL, NULL }, + { GLUSTER_CLI_PMAP_PORTBYBRICK, "PMAP_PORTBYBRICK", NULL, NULL }, + { GLUSTER_CLI_SYNC_VOLUME, "SYNC_VOLUME", NULL, NULL }, + { GLUSTER_CLI_RESET_VOLUME, "RESET_VOLUME", NULL, NULL }, + { GLUSTER_CLI_FSM_LOG, "FSM_LOG", NULL, NULL }, + { GLUSTER_CLI_GSYNC_SET, "GSYNC_SET", NULL, NULL }, + { GLUSTER_CLI_PROFILE_VOLUME, "PROFILE_VOLUME", NULL, NULL }, + { GLUSTER_CLI_QUOTA, "QUOTA", NULL, NULL }, + { GLUSTER_CLI_TOP_VOLUME, "TOP_VOLUME", NULL, NULL }, + { GLUSTER_CLI_GETWD, "GETWD", NULL, NULL }, + { GLUSTER_CLI_LOG_LEVEL, "LOG_LEVEL", NULL, NULL }, + { GLUSTER_CLI_STATUS_VOLUME, "STATUS_VOLUME", NULL, NULL }, + { GLUSTER_CLI_MOUNT, "MOUNT", NULL, NULL }, + { GLUSTER_CLI_UMOUNT, "UMOUNT", NULL, NULL }, + { GLUSTER_CLI_HEAL_VOLUME, "HEAL_VOLUME", NULL, NULL }, { GLUSTER_CLI_STATEDUMP_VOLUME, "STATEDUMP_VOLUME", NULL, NULL }, { 0, NULL, NULL, NULL } }; @@ -402,82 +401,84 @@ static const vsff gluster_cli_2_proc[] = { static const value_string gluster_cli_proc_vals[] = { - { GLUSTER_CLI_NULL, "NULL" }, - { GLUSTER_CLI_PROBE, "PROBE" }, - { GLUSTER_CLI_DEPROBE, "DEPROBE" }, - { GLUSTER_CLI_LIST_FRIENDS, "LIST_FRIENDS" }, - { GLUSTER_CLI_CREATE_VOLUME, "CREATE_VOLUME" }, - { GLUSTER_CLI_GET_VOLUME, "GET_VOLUME" }, - { GLUSTER_CLI_GET_NEXT_VOLUME, "GET_NEXT_VOLUME" }, - { GLUSTER_CLI_DELETE_VOLUME, "DELETE_VOLUME" }, - { GLUSTER_CLI_START_VOLUME, "START_VOLUME" }, - { GLUSTER_CLI_STOP_VOLUME, "STOP_VOLUME" }, - { GLUSTER_CLI_RENAME_VOLUME, "RENAME_VOLUME" }, - { GLUSTER_CLI_DEFRAG_VOLUME, "DEFRAG_VOLUME" }, - { GLUSTER_CLI_SET_VOLUME, "SET_VOLUME" }, - { GLUSTER_CLI_ADD_BRICK, "ADD_BRICK" }, - { GLUSTER_CLI_REMOVE_BRICK, "REMOVE_BRICK" }, - { GLUSTER_CLI_REPLACE_BRICK, "REPLACE_BRICK" }, - { GLUSTER_CLI_LOG_FILENAME, "LOG_FILENAME" }, - { GLUSTER_CLI_LOG_LOCATE, "LOG_LOCATE" }, - { GLUSTER_CLI_LOG_ROTATE, "LOG_ROTATE" }, - { GLUSTER_CLI_GETSPEC, "GETSPEC" }, + { GLUSTER_CLI_NULL, "NULL" }, + { GLUSTER_CLI_PROBE, "PROBE" }, + { GLUSTER_CLI_DEPROBE, "DEPROBE" }, + { GLUSTER_CLI_LIST_FRIENDS, "LIST_FRIENDS" }, + { GLUSTER_CLI_CREATE_VOLUME, "CREATE_VOLUME" }, + { GLUSTER_CLI_GET_VOLUME, "GET_VOLUME" }, + { GLUSTER_CLI_GET_NEXT_VOLUME, "GET_NEXT_VOLUME" }, + { GLUSTER_CLI_DELETE_VOLUME, "DELETE_VOLUME" }, + { GLUSTER_CLI_START_VOLUME, "START_VOLUME" }, + { GLUSTER_CLI_STOP_VOLUME, "STOP_VOLUME" }, + { GLUSTER_CLI_RENAME_VOLUME, "RENAME_VOLUME" }, + { GLUSTER_CLI_DEFRAG_VOLUME, "DEFRAG_VOLUME" }, + { GLUSTER_CLI_SET_VOLUME, "SET_VOLUME" }, + { GLUSTER_CLI_ADD_BRICK, "ADD_BRICK" }, + { GLUSTER_CLI_REMOVE_BRICK, "REMOVE_BRICK" }, + { GLUSTER_CLI_REPLACE_BRICK, "REPLACE_BRICK" }, + { GLUSTER_CLI_LOG_FILENAME, "LOG_FILENAME" }, + { GLUSTER_CLI_LOG_LOCATE, "LOG_LOCATE" }, + { GLUSTER_CLI_LOG_ROTATE, "LOG_ROTATE" }, + { GLUSTER_CLI_GETSPEC, "GETSPEC" }, { GLUSTER_CLI_PMAP_PORTBYBRICK, "PMAP_PORTBYBRICK" }, - { GLUSTER_CLI_SYNC_VOLUME, "SYNC_VOLUME" }, - { GLUSTER_CLI_RESET_VOLUME, "RESET_VOLUME" }, - { GLUSTER_CLI_FSM_LOG, "FSM_LOG" }, - { GLUSTER_CLI_GSYNC_SET, "GSYNC_SET" }, - { GLUSTER_CLI_PROFILE_VOLUME, "PROFILE_VOLUME" }, - { GLUSTER_CLI_QUOTA, "QUOTA" }, - { GLUSTER_CLI_TOP_VOLUME, "TOP_VOLUME" }, - { GLUSTER_CLI_GETWD, "GETWD" }, - { GLUSTER_CLI_LOG_LEVEL, "LOG_LEVEL" }, - { GLUSTER_CLI_STATUS_VOLUME, "STATUS_VOLUME" }, - { GLUSTER_CLI_MOUNT, "MOUNT" }, - { GLUSTER_CLI_UMOUNT, "UMOUNT" }, - { GLUSTER_CLI_HEAL_VOLUME, "HEAL_VOLUME" }, + { GLUSTER_CLI_SYNC_VOLUME, "SYNC_VOLUME" }, + { GLUSTER_CLI_RESET_VOLUME, "RESET_VOLUME" }, + { GLUSTER_CLI_FSM_LOG, "FSM_LOG" }, + { GLUSTER_CLI_GSYNC_SET, "GSYNC_SET" }, + { GLUSTER_CLI_PROFILE_VOLUME, "PROFILE_VOLUME" }, + { GLUSTER_CLI_QUOTA, "QUOTA" }, + { GLUSTER_CLI_TOP_VOLUME, "TOP_VOLUME" }, + { GLUSTER_CLI_GETWD, "GETWD" }, + { GLUSTER_CLI_LOG_LEVEL, "LOG_LEVEL" }, + { GLUSTER_CLI_STATUS_VOLUME, "STATUS_VOLUME" }, + { GLUSTER_CLI_MOUNT, "MOUNT" }, + { GLUSTER_CLI_UMOUNT, "UMOUNT" }, + { GLUSTER_CLI_HEAL_VOLUME, "HEAL_VOLUME" }, { GLUSTER_CLI_STATEDUMP_VOLUME, "STATEDUMP_VOLUME" }, { 0, NULL } }; +static value_string_ext gluster_cli_proc_vals_ext = VALUE_STRING_EXT_INIT(gluster_cli_proc_vals); static const value_string gluster_cli_2_proc_vals[] = { - { GLUSTER_CLI_2_NULL, "NULL" }, - { GLUSTER_CLI_2_PROBE, "PROBE" }, - { GLUSTER_CLI_2_DEPROBE, "DEPROBE" }, - { GLUSTER_CLI_2_LIST_FRIENDS, "LIST_FRIENDS" }, - { GLUSTER_CLI_2_CREATE_VOLUME, "CREATE_VOLUME" }, - { GLUSTER_CLI_2_GET_VOLUME, "GET_VOLUME" }, - { GLUSTER_CLI_2_GET_NEXT_VOLUME, "GET_NEXT_VOLUME" }, - { GLUSTER_CLI_2_DELETE_VOLUME, "DELETE_VOLUME" }, - { GLUSTER_CLI_2_START_VOLUME, "START_VOLUME" }, - { GLUSTER_CLI_2_STOP_VOLUME, "STOP_VOLUME" }, - { GLUSTER_CLI_2_RENAME_VOLUME, "RENAME_VOLUME" }, - { GLUSTER_CLI_2_DEFRAG_VOLUME, "DEFRAG_VOLUME" }, - { GLUSTER_CLI_2_SET_VOLUME, "SET_VOLUME" }, - { GLUSTER_CLI_2_ADD_BRICK, "ADD_BRICK" }, - { GLUSTER_CLI_2_REMOVE_BRICK, "REMOVE_BRICK" }, - { GLUSTER_CLI_2_REPLACE_BRICK, "REPLACE_BRICK" }, - { GLUSTER_CLI_2_LOG_ROTATE, "LOG_ROTATE" }, - { GLUSTER_CLI_2_GETSPEC, "GETSPEC" }, + { GLUSTER_CLI_2_NULL, "NULL" }, + { GLUSTER_CLI_2_PROBE, "PROBE" }, + { GLUSTER_CLI_2_DEPROBE, "DEPROBE" }, + { GLUSTER_CLI_2_LIST_FRIENDS, "LIST_FRIENDS" }, + { GLUSTER_CLI_2_CREATE_VOLUME, "CREATE_VOLUME" }, + { GLUSTER_CLI_2_GET_VOLUME, "GET_VOLUME" }, + { GLUSTER_CLI_2_GET_NEXT_VOLUME, "GET_NEXT_VOLUME" }, + { GLUSTER_CLI_2_DELETE_VOLUME, "DELETE_VOLUME" }, + { GLUSTER_CLI_2_START_VOLUME, "START_VOLUME" }, + { GLUSTER_CLI_2_STOP_VOLUME, "STOP_VOLUME" }, + { GLUSTER_CLI_2_RENAME_VOLUME, "RENAME_VOLUME" }, + { GLUSTER_CLI_2_DEFRAG_VOLUME, "DEFRAG_VOLUME" }, + { GLUSTER_CLI_2_SET_VOLUME, "SET_VOLUME" }, + { GLUSTER_CLI_2_ADD_BRICK, "ADD_BRICK" }, + { GLUSTER_CLI_2_REMOVE_BRICK, "REMOVE_BRICK" }, + { GLUSTER_CLI_2_REPLACE_BRICK, "REPLACE_BRICK" }, + { GLUSTER_CLI_2_LOG_ROTATE, "LOG_ROTATE" }, + { GLUSTER_CLI_2_GETSPEC, "GETSPEC" }, { GLUSTER_CLI_2_PMAP_PORTBYBRICK, "PMAP_PORTBYBRICK" }, - { GLUSTER_CLI_2_SYNC_VOLUME, "SYNC_VOLUME" }, - { GLUSTER_CLI_2_RESET_VOLUME, "RESET_VOLUME" }, - { GLUSTER_CLI_2_FSM_LOG, "FSM_LOG" }, - { GLUSTER_CLI_2_GSYNC_SET, "GSYNC_SET" }, - { GLUSTER_CLI_2_PROFILE_VOLUME, "PROFILE_VOLUME" }, - { GLUSTER_CLI_2_QUOTA, "QUOTA" }, - { GLUSTER_CLI_2_TOP_VOLUME, "TOP_VOLUME" }, - { GLUSTER_CLI_2_GETWD, "GETWD" }, - { GLUSTER_CLI_2_STATUS_VOLUME, "STATUS_VOLUME" }, - { GLUSTER_CLI_2_STATUS_ALL, "STATUS_ALL" }, - { GLUSTER_CLI_2_MOUNT, "MOUNT" }, - { GLUSTER_CLI_2_UMOUNT, "UMOUNT" }, - { GLUSTER_CLI_2_HEAL_VOLUME, "HEAL_VOLUME" }, + { GLUSTER_CLI_2_SYNC_VOLUME, "SYNC_VOLUME" }, + { GLUSTER_CLI_2_RESET_VOLUME, "RESET_VOLUME" }, + { GLUSTER_CLI_2_FSM_LOG, "FSM_LOG" }, + { GLUSTER_CLI_2_GSYNC_SET, "GSYNC_SET" }, + { GLUSTER_CLI_2_PROFILE_VOLUME, "PROFILE_VOLUME" }, + { GLUSTER_CLI_2_QUOTA, "QUOTA" }, + { GLUSTER_CLI_2_TOP_VOLUME, "TOP_VOLUME" }, + { GLUSTER_CLI_2_GETWD, "GETWD" }, + { GLUSTER_CLI_2_STATUS_VOLUME, "STATUS_VOLUME" }, + { GLUSTER_CLI_2_STATUS_ALL, "STATUS_ALL" }, + { GLUSTER_CLI_2_MOUNT, "MOUNT" }, + { GLUSTER_CLI_2_UMOUNT, "UMOUNT" }, + { GLUSTER_CLI_2_HEAL_VOLUME, "HEAL_VOLUME" }, { GLUSTER_CLI_2_STATEDUMP_VOLUME, "STATEDUMP_VOLUME" }, - { GLUSTER_CLI_2_LIST_VOLUME, "LIST_VOLUME"}, - { GLUSTER_CLI_2_CLRLOCKS_VOLUME, "CLRLOCKS_VOLUME" }, + { GLUSTER_CLI_2_LIST_VOLUME, "LIST_VOLUME"}, + { GLUSTER_CLI_2_CLRLOCKS_VOLUME, "CLRLOCKS_VOLUME" }, { 0, NULL } }; +static value_string_ext gluster_cli_2_proc_vals_ext = VALUE_STRING_EXT_INIT(gluster_cli_2_proc_vals); void proto_register_gluster_cli(void) @@ -487,12 +488,12 @@ proto_register_gluster_cli(void) /* programs */ { &hf_gluster_cli_proc, { "Gluster CLI", "gluster.cli.proc", FT_UINT32, - BASE_DEC, VALS(gluster_cli_proc_vals), 0, NULL, + BASE_DEC | BASE_EXT_STRING, &gluster_cli_proc_vals_ext, 0, NULL, HFILL } }, { &hf_gluster_cli_2_proc, { "Gluster CLI", "gluster.cli.proc", FT_UINT32, - BASE_DEC, VALS(gluster_cli_2_proc_vals), 0, + BASE_DEC | BASE_EXT_STRING, &gluster_cli_2_proc_vals_ext, 0, NULL, HFILL } }, { &hf_gluster_dict, diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index 00cc34c7b0..8cca6ee04f 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -38,9 +38,8 @@ #endif #include <glib.h> -#include <string.h> + #include <epan/packet.h> -#include <epan/tfs.h> #include "packet-rpc.h" #include "packet-gluster.h" @@ -147,24 +146,24 @@ gluster_dump_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, /* GLUSTER_PMAP_PROGRAM from xlators/mgmt/glusterd/src/glusterd-pmap.c */ static const vsff gluster_pmap_proc[] = { - { GF_PMAP_NULL, "NULL", NULL, NULL }, + { GF_PMAP_NULL, "NULL", NULL, NULL }, { GF_PMAP_PORTBYBRICK, "PORTBYBRICK", gluster_pmap_portbybrick_call, gluster_pmap_portbybrick_reply }, { GF_PMAP_BRICKBYPORT, "BRICKBYPORT", NULL, NULL }, - { GF_PMAP_SIGNIN, "SIGNIN", NULL, NULL }, - { GF_PMAP_SIGNOUT, "SIGNOUT", NULL, NULL }, - { GF_PMAP_SIGNUP, "SIGNUP", NULL, NULL }, + { GF_PMAP_SIGNIN, "SIGNIN", NULL, NULL }, + { GF_PMAP_SIGNOUT, "SIGNOUT", NULL, NULL }, + { GF_PMAP_SIGNUP, "SIGNUP", NULL, NULL }, { 0, NULL, NULL, NULL } }; static const value_string gluster_pmap_proc_vals[] = { - { GF_PMAP_NULL, "NULL" }, + { GF_PMAP_NULL, "NULL" }, { GF_PMAP_PORTBYBRICK, "PORTBYBRICK" }, { GF_PMAP_BRICKBYPORT, "BRICKBYPORT" }, - { GF_PMAP_SIGNIN, "SIGNIN" }, - { GF_PMAP_SIGNOUT, "SIGNOUT" }, - { GF_PMAP_SIGNUP, "SIGNUP" }, + { GF_PMAP_SIGNIN, "SIGNIN" }, + { GF_PMAP_SIGNOUT, "SIGNOUT" }, + { GF_PMAP_SIGNUP, "SIGNUP" }, { 0, NULL } }; @@ -175,7 +174,7 @@ static const vsff gluster_dump_proc[] = { { 0, NULL, NULL, NULL } }; static const value_string gluster_dump_proc_vals[] = { - { 0, "NULL" }, + { 0, "NULL" }, { GF_DUMP_DUMP, "DUMP" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-glusterd.c b/epan/dissectors/packet-glusterd.c index e05d414702..914e283c2f 100644 --- a/epan/dissectors/packet-glusterd.c +++ b/epan/dissectors/packet-glusterd.c @@ -40,9 +40,7 @@ #endif #include <glib.h> -#include <string.h> #include <epan/packet.h> -#include <epan/tfs.h> #include "packet-rpc.h" #include "packet-gluster.h" @@ -435,31 +433,31 @@ static const vsff gd_mgmt_proc[] = { gluster_gd_mgmt_friend_update_call, gluster_gd_mgmt_friend_update_reply }, - { GD_MGMT_CLI_PROBE, "CLI_PROBE", NULL, NULL}, - { GD_MGMT_CLI_DEPROBE, "CLI_DEPROBE", NULL, NULL}, - { GD_MGMT_CLI_LIST_FRIENDS, "CLI_LIST_FRIENDS", NULL, NULL}, - { GD_MGMT_CLI_CREATE_VOLUME, "CLI_CREATE_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_GET_VOLUME, "CLI_GET_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_DELETE_VOLUME, "CLI_DELETE_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_START_VOLUME, "CLI_START_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_STOP_VOLUME, "CLI_STOP_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_RENAME_VOLUME, "CLI_RENAME_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_DEFRAG_VOLUME, "CLI_DEFRAG_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_SET_VOLUME, "CLI_DEFRAG_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_ADD_BRICK, "CLI_ADD_BRICK", NULL, NULL}, - { GD_MGMT_CLI_REMOVE_BRICK, "CLI_REMOVE_BRICK", NULL, NULL}, - { GD_MGMT_CLI_REPLACE_BRICK, "CLI_REPLACE_BRICK", NULL, NULL}, - { GD_MGMT_CLI_LOG_FILENAME, "CLI_LOG_FILENAME", NULL, NULL}, - { GD_MGMT_CLI_LOG_LOCATE, "CLI_LOG_LOCATE", NULL, NULL}, - { GD_MGMT_CLI_LOG_ROTATE, "CLI_LOG_ROTATE", NULL, NULL}, - { GD_MGMT_CLI_SYNC_VOLUME, "CLI_SYNC_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_RESET_VOLUME, "CLI_RESET_VOLUME", NULL, NULL}, - { GD_MGMT_CLI_FSM_LOG, "CLI_FSM_LOG", NULL, NULL}, - { GD_MGMT_CLI_GSYNC_SET, "CLI_GSYNC_SET", NULL, NULL}, + { GD_MGMT_CLI_PROBE, "CLI_PROBE", NULL, NULL}, + { GD_MGMT_CLI_DEPROBE, "CLI_DEPROBE", NULL, NULL}, + { GD_MGMT_CLI_LIST_FRIENDS, "CLI_LIST_FRIENDS", NULL, NULL}, + { GD_MGMT_CLI_CREATE_VOLUME, "CLI_CREATE_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_GET_VOLUME, "CLI_GET_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_DELETE_VOLUME, "CLI_DELETE_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_START_VOLUME, "CLI_START_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_STOP_VOLUME, "CLI_STOP_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_RENAME_VOLUME, "CLI_RENAME_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_DEFRAG_VOLUME, "CLI_DEFRAG_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_SET_VOLUME, "CLI_DEFRAG_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_ADD_BRICK, "CLI_ADD_BRICK", NULL, NULL}, + { GD_MGMT_CLI_REMOVE_BRICK, "CLI_REMOVE_BRICK", NULL, NULL}, + { GD_MGMT_CLI_REPLACE_BRICK, "CLI_REPLACE_BRICK", NULL, NULL}, + { GD_MGMT_CLI_LOG_FILENAME, "CLI_LOG_FILENAME", NULL, NULL}, + { GD_MGMT_CLI_LOG_LOCATE, "CLI_LOG_LOCATE", NULL, NULL}, + { GD_MGMT_CLI_LOG_ROTATE, "CLI_LOG_ROTATE", NULL, NULL}, + { GD_MGMT_CLI_SYNC_VOLUME, "CLI_SYNC_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_RESET_VOLUME, "CLI_RESET_VOLUME", NULL, NULL}, + { GD_MGMT_CLI_FSM_LOG, "CLI_FSM_LOG", NULL, NULL}, + { GD_MGMT_CLI_GSYNC_SET, "CLI_GSYNC_SET", NULL, NULL}, { GD_MGMT_CLI_PROFILE_VOLUME, "CLI_PROFILE_VOLUME", NULL, NULL}, - { GD_MGMT_BRICK_OP, "BRICK_OP", NULL, NULL}, - { GD_MGMT_CLI_LOG_LEVEL, "CLI_LOG_LEVEL", NULL, NULL}, - { GD_MGMT_CLI_STATUS_VOLUME, "CLI_STATUS_VOLUME", NULL, NULL}, + { GD_MGMT_BRICK_OP, "BRICK_OP", NULL, NULL}, + { GD_MGMT_CLI_LOG_LEVEL, "CLI_LOG_LEVEL", NULL, NULL}, + { GD_MGMT_CLI_STATUS_VOLUME, "CLI_STATUS_VOLUME", NULL, NULL}, { 0, NULL, NULL, NULL} }; @@ -525,111 +523,116 @@ static const vsff gd_mgmt_brick_2_proc[] = { }; static const vsff glusterd_friend_proc[] = { - { GLUSTERD_FRIEND_NULL,"NULL" , NULL,NULL }, - { GLUSTERD_PROBE_QUERY, "PROBE_QUERY" , NULL , NULL }, - { GLUSTERD_FRIEND_ADD, "ADD" , NULL , NULL }, - { GLUSTERD_FRIEND_REMOVE,"REMOVE", NULL , NULL }, - { GLUSTERD_FRIEND_UPDATE,"UPDATE" , NULL , NULL }, + { GLUSTERD_FRIEND_NULL, "NULL" , NULL , NULL }, + { GLUSTERD_PROBE_QUERY, "PROBE_QUERY" , NULL , NULL }, + { GLUSTERD_FRIEND_ADD, "ADD" , NULL , NULL }, + { GLUSTERD_FRIEND_REMOVE, "REMOVE", NULL , NULL }, + { GLUSTERD_FRIEND_UPDATE, "UPDATE" , NULL , NULL }, { 0, NULL, NULL, NULL } }; static const value_string gd_mgmt_proc_vals[] = { - { GD_MGMT_NULL, "NULL" }, - { GD_MGMT_PROBE_QUERY, "PROBE_QUERY" }, - { GD_MGMT_FRIEND_ADD, "FRIEND_ADD" }, - { GD_MGMT_CLUSTER_LOCK, "CLUSTER_LOCK" }, - { GD_MGMT_CLUSTER_UNLOCK, "CLUSTER_UNLOCK" }, - { GD_MGMT_STAGE_OP, "STAGE_OP" }, - { GD_MGMT_COMMIT_OP, "COMMIT_OP" }, - { GD_MGMT_FRIEND_REMOVE, "FRIEND_REMOVE" }, - { GD_MGMT_FRIEND_UPDATE, "FRIEND_UPDATE" }, - { GD_MGMT_CLI_PROBE, "CLI_PROBE" }, - { GD_MGMT_CLI_DEPROBE, "CLI_DEPROBE" }, - { GD_MGMT_CLI_LIST_FRIENDS, "CLI_LIST_FRIENDS" }, - { GD_MGMT_CLI_CREATE_VOLUME, "CLI_CREATE_VOLUME" }, - { GD_MGMT_CLI_GET_VOLUME, "CLI_GET_VOLUME" }, - { GD_MGMT_CLI_DELETE_VOLUME, "CLI_DELETE_VOLUME" }, - { GD_MGMT_CLI_START_VOLUME, "CLI_START_VOLUME" }, - { GD_MGMT_CLI_STOP_VOLUME, "CLI_STOP_VOLUME" }, - { GD_MGMT_CLI_RENAME_VOLUME, "CLI_RENAME_VOLUME" }, - { GD_MGMT_CLI_DEFRAG_VOLUME, "CLI_DEFRAG_VOLUME" }, - { GD_MGMT_CLI_SET_VOLUME, "CLI_DEFRAG_VOLUME" }, - { GD_MGMT_CLI_ADD_BRICK, "CLI_ADD_BRICK" }, - { GD_MGMT_CLI_REMOVE_BRICK, "CLI_REMOVE_BRICK" }, - { GD_MGMT_CLI_REPLACE_BRICK, "CLI_REPLACE_BRICK" }, - { GD_MGMT_CLI_LOG_FILENAME, "CLI_LOG_FILENAME" }, - { GD_MGMT_CLI_LOG_LOCATE, "CLI_LOG_LOCATE" }, - { GD_MGMT_CLI_LOG_ROTATE, "CLI_LOG_ROTATE" }, - { GD_MGMT_CLI_SYNC_VOLUME, "CLI_SYNC_VOLUME" }, - { GD_MGMT_CLI_RESET_VOLUME, "CLI_RESET_VOLUME" }, - { GD_MGMT_CLI_FSM_LOG, "CLI_FSM_LOG" }, - { GD_MGMT_CLI_GSYNC_SET, "CLI_GSYNC_SET" }, + { GD_MGMT_NULL, "NULL" }, + { GD_MGMT_PROBE_QUERY, "PROBE_QUERY" }, + { GD_MGMT_FRIEND_ADD, "FRIEND_ADD" }, + { GD_MGMT_CLUSTER_LOCK, "CLUSTER_LOCK" }, + { GD_MGMT_CLUSTER_UNLOCK, "CLUSTER_UNLOCK" }, + { GD_MGMT_STAGE_OP, "STAGE_OP" }, + { GD_MGMT_COMMIT_OP, "COMMIT_OP" }, + { GD_MGMT_FRIEND_REMOVE, "FRIEND_REMOVE" }, + { GD_MGMT_FRIEND_UPDATE, "FRIEND_UPDATE" }, + { GD_MGMT_CLI_PROBE, "CLI_PROBE" }, + { GD_MGMT_CLI_DEPROBE, "CLI_DEPROBE" }, + { GD_MGMT_CLI_LIST_FRIENDS, "CLI_LIST_FRIENDS" }, + { GD_MGMT_CLI_CREATE_VOLUME, "CLI_CREATE_VOLUME" }, + { GD_MGMT_CLI_GET_VOLUME, "CLI_GET_VOLUME" }, + { GD_MGMT_CLI_DELETE_VOLUME, "CLI_DELETE_VOLUME" }, + { GD_MGMT_CLI_START_VOLUME, "CLI_START_VOLUME" }, + { GD_MGMT_CLI_STOP_VOLUME, "CLI_STOP_VOLUME" }, + { GD_MGMT_CLI_RENAME_VOLUME, "CLI_RENAME_VOLUME" }, + { GD_MGMT_CLI_DEFRAG_VOLUME, "CLI_DEFRAG_VOLUME" }, + { GD_MGMT_CLI_SET_VOLUME, "CLI_DEFRAG_VOLUME" }, + { GD_MGMT_CLI_ADD_BRICK, "CLI_ADD_BRICK" }, + { GD_MGMT_CLI_REMOVE_BRICK, "CLI_REMOVE_BRICK" }, + { GD_MGMT_CLI_REPLACE_BRICK, "CLI_REPLACE_BRICK" }, + { GD_MGMT_CLI_LOG_FILENAME, "CLI_LOG_FILENAME" }, + { GD_MGMT_CLI_LOG_LOCATE, "CLI_LOG_LOCATE" }, + { GD_MGMT_CLI_LOG_ROTATE, "CLI_LOG_ROTATE" }, + { GD_MGMT_CLI_SYNC_VOLUME, "CLI_SYNC_VOLUME" }, + { GD_MGMT_CLI_RESET_VOLUME, "CLI_RESET_VOLUME" }, + { GD_MGMT_CLI_FSM_LOG, "CLI_FSM_LOG" }, + { GD_MGMT_CLI_GSYNC_SET, "CLI_GSYNC_SET" }, { GD_MGMT_CLI_PROFILE_VOLUME, "CLI_PROFILE_VOLUME" }, - { GD_MGMT_BRICK_OP, "BRICK_OP" }, - { GD_MGMT_CLI_LOG_LEVEL, "CLI_LOG_LEVEL" }, - { GD_MGMT_CLI_STATUS_VOLUME, "CLI_STATUS_VOLUME" }, + { GD_MGMT_BRICK_OP, "BRICK_OP" }, + { GD_MGMT_CLI_LOG_LEVEL, "CLI_LOG_LEVEL" }, + { GD_MGMT_CLI_STATUS_VOLUME, "CLI_STATUS_VOLUME" }, { 0, NULL } }; +static value_string_ext gd_mgmt_proc_vals_ext = VALUE_STRING_EXT_INIT(gd_mgmt_proc_vals); static const value_string gd_mgmt_2_proc_vals[] = { - { GLUSTERD_MGMT_2_NULL , "NULL" }, - { GLUSTERD_MGMT_2_CLUSTER_LOCK, "CLUSTER_LOCK" }, + { GLUSTERD_MGMT_2_NULL , "NULL" }, + { GLUSTERD_MGMT_2_CLUSTER_LOCK, "CLUSTER_LOCK" }, { GLUSTERD_MGMT_2_CLUSTER_UNLOCK, "CLUSTER_UNLOCK" }, - { GLUSTERD_MGMT_2_STAGE_OP, "STAGE_OP"}, - { GLUSTERD_MGMT_2_COMMIT_OP, " GLUSTERD_MGMT_COMMIT_OP"}, + { GLUSTERD_MGMT_2_STAGE_OP, "STAGE_OP"}, + { GLUSTERD_MGMT_2_COMMIT_OP, " GLUSTERD_MGMT_COMMIT_OP"}, { 0, NULL } }; +static value_string_ext gd_mgmt_2_proc_vals_ext = VALUE_STRING_EXT_INIT(gd_mgmt_2_proc_vals); static const value_string gd_mgmt_brick_2_proc_vals[] = { - { GLUSTERD_2_BRICK_NULL,"NULL" }, /* 0 */ - { GLUSTERD_2_BRICK_TERMINATE, "TERMINATE" }, - { GLUSTERD_2_BRICK_XLATOR_INFO, "XLATOR_INFO" }, - { GLUSTERD_2_BRICK_XLATOR_OP, "XLATOR_OP" }, - { GLUSTERD_2_BRICK_STATUS, "STATUS" }, - { GLUSTERD_2_BRICK_OP, "OP" }, + { GLUSTERD_2_BRICK_NULL, "NULL" }, /* 0 */ + { GLUSTERD_2_BRICK_TERMINATE, "TERMINATE" }, + { GLUSTERD_2_BRICK_XLATOR_INFO, "XLATOR_INFO" }, + { GLUSTERD_2_BRICK_XLATOR_OP, "XLATOR_OP" }, + { GLUSTERD_2_BRICK_STATUS, "STATUS" }, + { GLUSTERD_2_BRICK_OP, "OP" }, { GLUSTERD_2_BRICK_XLATOR_DEFRAG, "XLATOR_DEFRAG" }, - { GLUSTERD_2_NODE_PROFILE, "GLUSTERD_2_NODE_PROFILE" }, - { GLUSTERD_2_NODE_STATUS, "GLUSTERD_2_NODE_PROFILE" }, + { GLUSTERD_2_NODE_PROFILE, "GLUSTERD_2_NODE_PROFILE" }, + { GLUSTERD_2_NODE_STATUS, "GLUSTERD_2_NODE_PROFILE" }, { 0, NULL } }; +static value_string_ext gd_mgmt_brick_2_proc_vals_ext = VALUE_STRING_EXT_INIT(gd_mgmt_brick_2_proc_vals); static const value_string glusterd_op_vals[] = { - { GD_OP_NONE, "NONE" }, - { GD_OP_CREATE_VOLUME, "CREATE_VOLUME" }, - { GD_OP_START_BRICK, "START_BRICK" }, - { GD_OP_STOP_BRICK, "STOP_BRICK" }, - { GD_OP_DELETE_VOLUME, "DELETE_VOLUME" }, - { GD_OP_START_VOLUME, "START_VOLUME" }, - { GD_OP_STOP_VOLUME, "STOP_VOLUME" }, - { GD_OP_DEFRAG_VOLUME, "DEFRAG_VOLUME" }, - { GD_OP_ADD_BRICK, "ADD_BRICK" }, - { GD_OP_REMOVE_BRICK, "REMOVE_BRICK" }, - { GD_OP_REPLACE_BRICK, "REPLACE_BRICK" }, - { GD_OP_SET_VOLUME, "SET_VOLUME" }, - { GD_OP_RESET_VOLUME, "RESET_VOLUME" }, - { GD_OP_SYNC_VOLUME, "SYNC_VOLUME" }, - { GD_OP_LOG_ROTATE, "LOG_ROTATE" }, - { GD_OP_GSYNC_SET, "GSYNC_SET" }, - { GD_OP_PROFILE_VOLUME, "PROFILE_VOLUME" }, - { GD_OP_QUOTA, "QUOTA" }, - { GD_OP_STATUS_VOLUME, "STATUS_VOLUME" }, - { GD_OP_REBALANCE, "REBALANCE" }, - { GD_OP_HEAL_VOLUME, "HEAL_VOLUME" }, - { GD_OP_STATEDUMP_VOLUME, "STATEDUMP_VOLUME" }, - { GD_OP_LIST_VOLUME, "LIST_VOLUME" }, - { GD_OP_CLEARLOCKS_VOLUME, "CLEARLOCKS_VOLUME" }, + { GD_OP_NONE, "NONE" }, + { GD_OP_CREATE_VOLUME, "CREATE_VOLUME" }, + { GD_OP_START_BRICK, "START_BRICK" }, + { GD_OP_STOP_BRICK, "STOP_BRICK" }, + { GD_OP_DELETE_VOLUME, "DELETE_VOLUME" }, + { GD_OP_START_VOLUME, "START_VOLUME" }, + { GD_OP_STOP_VOLUME, "STOP_VOLUME" }, + { GD_OP_DEFRAG_VOLUME, "DEFRAG_VOLUME" }, + { GD_OP_ADD_BRICK, "ADD_BRICK" }, + { GD_OP_REMOVE_BRICK, "REMOVE_BRICK" }, + { GD_OP_REPLACE_BRICK, "REPLACE_BRICK" }, + { GD_OP_SET_VOLUME, "SET_VOLUME" }, + { GD_OP_RESET_VOLUME, "RESET_VOLUME" }, + { GD_OP_SYNC_VOLUME, "SYNC_VOLUME" }, + { GD_OP_LOG_ROTATE, "LOG_ROTATE" }, + { GD_OP_GSYNC_SET, "GSYNC_SET" }, + { GD_OP_PROFILE_VOLUME, "PROFILE_VOLUME" }, + { GD_OP_QUOTA, "QUOTA" }, + { GD_OP_STATUS_VOLUME, "STATUS_VOLUME" }, + { GD_OP_REBALANCE, "REBALANCE" }, + { GD_OP_HEAL_VOLUME, "HEAL_VOLUME" }, + { GD_OP_STATEDUMP_VOLUME, "STATEDUMP_VOLUME" }, + { GD_OP_LIST_VOLUME, "LIST_VOLUME" }, + { GD_OP_CLEARLOCKS_VOLUME, "CLEARLOCKS_VOLUME" }, { GD_OP_DEFRAG_BRICK_VOLUME, "DEFRAG_BRICK_VOLUME" }, { 0, NULL } }; +static value_string_ext glusterd_op_vals_ext = VALUE_STRING_EXT_INIT(glusterd_op_vals); static const value_string glusterd_friend_proc_vals[] = { - { GLUSTERD_FRIEND_NULL, "NULL" }, - { GLUSTERD_PROBE_QUERY, "PROBE_QUERY" }, - { GLUSTERD_FRIEND_ADD, "ADD" }, + { GLUSTERD_FRIEND_NULL, "NULL" }, + { GLUSTERD_PROBE_QUERY, "PROBE_QUERY" }, + { GLUSTERD_FRIEND_ADD, "ADD" }, { GLUSTERD_FRIEND_REMOVE, "REMOVE" }, { GLUSTERD_FRIEND_UPDATE, "UPDATE" }, { 0, NULL } }; +static value_string_ext glusterd_friend_proc_vals_ext = VALUE_STRING_EXT_INIT(glusterd_friend_proc_vals); void proto_register_gluster_gd_mgmt(void) @@ -639,24 +642,24 @@ proto_register_gluster_gd_mgmt(void) /* programs */ { &hf_gd_mgmt_proc, { "Gluster Daemon Management", "glusterd.mgmt.proc", - FT_UINT32, BASE_DEC, VALS(gd_mgmt_proc_vals), + FT_UINT32, BASE_DEC | BASE_EXT_STRING, &gd_mgmt_proc_vals_ext, 0, NULL, HFILL } }, { &hf_gd_mgmt_2_proc, { "Gluster Daemon Management", "glusterd.mgmt.proc", - FT_UINT32, BASE_DEC, VALS(gd_mgmt_2_proc_vals), + FT_UINT32, BASE_DEC | BASE_EXT_STRING, &gd_mgmt_2_proc_vals_ext, 0, NULL, HFILL } }, { &hf_gd_mgmt_brick_2_proc, { "Gluster Daemon Brick Operations", - "glusterd.brick.proc", FT_UINT32, BASE_DEC, - VALS(gd_mgmt_brick_2_proc_vals), 0, NULL, + "glusterd.brick.proc", FT_UINT32, BASE_DEC | BASE_EXT_STRING, + &gd_mgmt_brick_2_proc_vals_ext, 0, NULL, HFILL } }, { &hf_glusterd_friend_proc , { "Gluster Daemon Friend Operations", - "glusterd.friend.proc", FT_UINT32, BASE_DEC, - VALS(glusterd_friend_proc_vals), 0, NULL, + "glusterd.friend.proc", FT_UINT32, BASE_DEC | BASE_EXT_STRING, + &glusterd_friend_proc_vals_ext, 0, NULL, HFILL } }, { &hf_glusterd_dict, @@ -664,8 +667,8 @@ proto_register_gluster_gd_mgmt(void) NULL, 0, NULL, HFILL } }, { &hf_glusterd_op, - { "Operation", "glusterd.op", FT_UINT32, BASE_DEC, - VALS(glusterd_op_vals), 0, NULL, HFILL } + { "Operation", "glusterd.op", FT_UINT32, BASE_DEC | BASE_EXT_STRING, + &glusterd_op_vals_ext, 0, NULL, HFILL } }, { &hf_glusterd_op_errstr, { "Error", "glusterd.op_errstr", FT_STRING, diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 879e5d21f1..608bd7ae06 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -38,9 +38,8 @@ #endif #include <glib.h> -#include <string.h> + #include <epan/packet.h> -#include <epan/tfs.h> #include <epan/guid-utils.h> #include "packet-rpc.h" @@ -1019,7 +1018,7 @@ static int glusterfs_gfs3_3_op_symlink_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - gchar *bname = NULL; + gchar *bname = NULL; gchar *linkname = NULL; offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_pargfid, offset); @@ -1479,7 +1478,7 @@ glusterfs_gfs3_3_op_entrylk_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { gchar* volume = NULL; - gchar* name = NULL; + gchar* name = NULL; offset = glusterfs_rpc_dissect_gfid(tree, tvb, hf_glusterfs_gfid, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterfs_cmd, offset); offset = dissect_rpc_uint32(tvb, tree, hf_glusterfs_type, offset); @@ -1682,23 +1681,23 @@ glusterfs_gfs3_3_op_common_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, * - xlators/protocol/server/src/server3_1-fops.c */ static const vsff glusterfs3_1_fop_proc[] = { - { GFS3_OP_NULL, "NULL", NULL, NULL }, - { GFS3_OP_STAT, "STAT", NULL, NULL }, + { GFS3_OP_NULL, "NULL", NULL, NULL }, + { GFS3_OP_STAT, "STAT", NULL, NULL }, { GFS3_OP_READLINK, "READLINK", NULL, NULL }, - { GFS3_OP_MKNOD, "MKNOD", NULL, NULL }, - { GFS3_OP_MKDIR, "MKDIR", NULL, NULL }, + { GFS3_OP_MKNOD, "MKNOD", NULL, NULL }, + { GFS3_OP_MKDIR, "MKDIR", NULL, NULL }, { GFS3_OP_UNLINK, "UNLINK", glusterfs_gfs3_op_unlink_call, glusterfs_gfs3_op_unlink_reply }, - { GFS3_OP_RMDIR, "RMDIR", NULL, NULL }, - { GFS3_OP_SYMLINK, "SYMLINK", NULL, NULL }, - { GFS3_OP_RENAME, "RENAME", NULL, NULL }, - { GFS3_OP_LINK, "LINK", NULL, NULL }, + { GFS3_OP_RMDIR, "RMDIR", NULL, NULL }, + { GFS3_OP_SYMLINK, "SYMLINK", NULL, NULL }, + { GFS3_OP_RENAME, "RENAME", NULL, NULL }, + { GFS3_OP_LINK, "LINK", NULL, NULL }, { GFS3_OP_TRUNCATE, "TRUNCATE", NULL, NULL }, - { GFS3_OP_OPEN, "OPEN", NULL, NULL }, - { GFS3_OP_READ, "READ", NULL, NULL }, - { GFS3_OP_WRITE, "WRITE", NULL, NULL }, + { GFS3_OP_OPEN, "OPEN", NULL, NULL }, + { GFS3_OP_READ, "READ", NULL, NULL }, + { GFS3_OP_WRITE, "WRITE", NULL, NULL }, { GFS3_OP_STATFS, "STATFS", glusterfs_gfs3_op_statfs_call, glusterfs_gfs3_op_statfs_reply @@ -1712,21 +1711,21 @@ static const vsff glusterfs3_1_fop_proc[] = { GFS3_OP_SETXATTR, "SETXATTR", glusterfs_gfs3_op_setxattr_call, gluster_dissect_common_reply }, - { GFS3_OP_GETXATTR, "GETXATTR", NULL, NULL }, + { GFS3_OP_GETXATTR, "GETXATTR", NULL, NULL }, { GFS3_OP_REMOVEXATTR, "REMOVEXATTR", NULL, NULL }, { GFS3_OP_OPENDIR, "OPENDIR", glusterfs_gfs3_op_opendir_call, glusterfs_gfs3_op_opendir_reply }, { GFS3_OP_FSYNCDIR, "FSYNCDIR", NULL, NULL }, - { GFS3_OP_ACCESS, "ACCESS", NULL, NULL }, + { GFS3_OP_ACCESS, "ACCESS", NULL, NULL }, { GFS3_OP_CREATE, "CREATE", glusterfs_gfs3_op_create_call, glusterfs_gfs3_op_create_reply }, { GFS3_OP_FTRUNCATE, "FTRUNCATE", NULL, NULL }, - { GFS3_OP_FSTAT, "FSTAT", NULL, NULL }, - { GFS3_OP_LK, "LK", NULL, NULL }, + { GFS3_OP_FSTAT, "FSTAT", NULL, NULL }, + { GFS3_OP_LK, "LK", NULL, NULL }, { GFS3_OP_LOOKUP, "LOOKUP", glusterfs_gfs3_op_lookup_call, glusterfs_gfs3_op_lookup_reply @@ -1736,11 +1735,11 @@ static const vsff glusterfs3_1_fop_proc[] = { GFS3_OP_INODELK, "INODELK", glusterfs_gfs3_op_inodelk_call, gluster_dissect_common_reply }, - { GFS3_OP_FINODELK, "FINODELK", NULL, NULL }, - { GFS3_OP_ENTRYLK, "ENTRYLK", NULL, NULL }, - { GFS3_OP_FENTRYLK, "FENTRYLK", NULL, NULL }, - { GFS3_OP_XATTROP, "XATTROP", NULL, NULL }, - { GFS3_OP_FXATTROP, "FXATTROP", NULL, NULL }, + { GFS3_OP_FINODELK, "FINODELK", NULL, NULL }, + { GFS3_OP_ENTRYLK, "ENTRYLK", NULL, NULL }, + { GFS3_OP_FENTRYLK, "FENTRYLK", NULL, NULL }, + { GFS3_OP_XATTROP, "XATTROP", NULL, NULL }, + { GFS3_OP_FXATTROP, "FXATTROP", NULL, NULL }, { GFS3_OP_FGETXATTR, "FGETXATTR", NULL, NULL }, { GFS3_OP_FSETXATTR, "FSETXATTR", NULL, NULL }, { GFS3_OP_RCHECKSUM, "RCHECKSUM", NULL, NULL }, @@ -1757,7 +1756,7 @@ static const vsff glusterfs3_1_fop_proc[] = { GFS3_OP_READDIRP, "READDIRP", glusterfs_gfs3_op_readdirp_call, glusterfs_gfs3_op_readdirp_reply }, - { GFS3_OP_RELEASE, "RELEASE", NULL, NULL }, + { GFS3_OP_RELEASE, "RELEASE", NULL, NULL }, { GFS3_OP_RELEASEDIR, "RELEASEDIR", NULL, NULL }, { 0, NULL, NULL, NULL } }; @@ -1941,84 +1940,87 @@ static const vsff glusterfs3_3_fop_proc[] = { static const value_string glusterfs3_1_fop_proc_vals[] = { - { GFS3_OP_NULL, "NULL" }, - { GFS3_OP_STAT, "STAT" }, - { GFS3_OP_READLINK, "READLINK" }, - { GFS3_OP_MKNOD, "MKNOD" }, - { GFS3_OP_MKDIR, "MKDIR" }, - { GFS3_OP_UNLINK, "UNLINK" }, - { GFS3_OP_RMDIR, "RMDIR" }, - { GFS3_OP_SYMLINK, "SYMLINK" }, - { GFS3_OP_RENAME, "RENAME" }, - { GFS3_OP_LINK, "LINK" }, - { GFS3_OP_TRUNCATE, "TRUNCATE" }, - { GFS3_OP_OPEN, "OPEN" }, - { GFS3_OP_READ, "READ" }, - { GFS3_OP_WRITE, "WRITE" }, - { GFS3_OP_STATFS, "STATFS" }, - { GFS3_OP_FLUSH, "FLUSH" }, - { GFS3_OP_FSYNC, "FSYNC" }, - { GFS3_OP_SETXATTR, "SETXATTR" }, - { GFS3_OP_GETXATTR, "GETXATTR" }, + { GFS3_OP_NULL, "NULL" }, + { GFS3_OP_STAT, "STAT" }, + { GFS3_OP_READLINK, "READLINK" }, + { GFS3_OP_MKNOD, "MKNOD" }, + { GFS3_OP_MKDIR, "MKDIR" }, + { GFS3_OP_UNLINK, "UNLINK" }, + { GFS3_OP_RMDIR, "RMDIR" }, + { GFS3_OP_SYMLINK, "SYMLINK" }, + { GFS3_OP_RENAME, "RENAME" }, + { GFS3_OP_LINK, "LINK" }, + { GFS3_OP_TRUNCATE, "TRUNCATE" }, + { GFS3_OP_OPEN, "OPEN" }, + { GFS3_OP_READ, "READ" }, + { GFS3_OP_WRITE, "WRITE" }, + { GFS3_OP_STATFS, "STATFS" }, + { GFS3_OP_FLUSH, "FLUSH" }, + { GFS3_OP_FSYNC, "FSYNC" }, + { GFS3_OP_SETXATTR, "SETXATTR" }, + { GFS3_OP_GETXATTR, "GETXATTR" }, { GFS3_OP_REMOVEXATTR, "REMOVEXATTR" }, - { GFS3_OP_OPENDIR, "OPENDIR" }, - { GFS3_OP_FSYNCDIR, "FSYNCDIR" }, - { GFS3_OP_ACCESS, "ACCESS" }, - { GFS3_OP_CREATE, "CREATE" }, - { GFS3_OP_FTRUNCATE, "FTRUNCATE" }, - { GFS3_OP_FSTAT, "FSTAT" }, - { GFS3_OP_LK, "LK" }, - { GFS3_OP_LOOKUP, "LOOKUP" }, - { GFS3_OP_READDIR, "READDIR" }, - { GFS3_OP_INODELK, "INODELK" }, - { GFS3_OP_FINODELK, "FINODELK" }, - { GFS3_OP_ENTRYLK, "ENTRYLK" }, - { GFS3_OP_FENTRYLK, "FENTRYLK" }, - { GFS3_OP_XATTROP, "XATTROP" }, - { GFS3_OP_FXATTROP, "FXATTROP" }, - { GFS3_OP_FGETXATTR, "FGETXATTR" }, - { GFS3_OP_FSETXATTR, "FSETXATTR" }, - { GFS3_OP_RCHECKSUM, "RCHECKSUM" }, - { GFS3_OP_SETATTR, "SETATTR" }, - { GFS3_OP_FSETATTR, "FSETATTR" }, - { GFS3_OP_READDIRP, "READDIRP" }, - { GFS3_OP_RELEASE, "RELEASE" }, - { GFS3_OP_RELEASEDIR, "RELEASEDIR" }, + { GFS3_OP_OPENDIR, "OPENDIR" }, + { GFS3_OP_FSYNCDIR, "FSYNCDIR" }, + { GFS3_OP_ACCESS, "ACCESS" }, + { GFS3_OP_CREATE, "CREATE" }, + { GFS3_OP_FTRUNCATE, "FTRUNCATE" }, + { GFS3_OP_FSTAT, "FSTAT" }, + { GFS3_OP_LK, "LK" }, + { GFS3_OP_LOOKUP, "LOOKUP" }, + { GFS3_OP_READDIR, "READDIR" }, + { GFS3_OP_INODELK, "INODELK" }, + { GFS3_OP_FINODELK, "FINODELK" }, + { GFS3_OP_ENTRYLK, "ENTRYLK" }, + { GFS3_OP_FENTRYLK, "FENTRYLK" }, + { GFS3_OP_XATTROP, "XATTROP" }, + { GFS3_OP_FXATTROP, "FXATTROP" }, + { GFS3_OP_FGETXATTR, "FGETXATTR" }, + { GFS3_OP_FSETXATTR, "FSETXATTR" }, + { GFS3_OP_RCHECKSUM, "RCHECKSUM" }, + { GFS3_OP_SETATTR, "SETATTR" }, + { GFS3_OP_FSETATTR, "FSETATTR" }, + { GFS3_OP_READDIRP, "READDIRP" }, + { GFS3_OP_RELEASE, "RELEASE" }, + { GFS3_OP_RELEASEDIR, "RELEASEDIR" }, { 0, NULL } }; +static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(glusterfs3_1_fop_proc_vals); /* 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" }, + { 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" }, { 0, NULL } }; +static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names); /* Normal locking commands */ static const value_string glusterfs_lk_cmd_names[] = { - { GF_LK_GETLK, "GF_LK_GETLK" }, - { GF_LK_SETLK, "GF_LK_SETLK" }, - { GF_LK_SETLKW, "GF_LK_SETLKW" }, - { GF_LK_RESLK_LCK, "GF_LK_RESLK_LCK" }, - { GF_LK_RESLK_LCKW, "GF_LK_RESLK_LCKW" }, + { GF_LK_GETLK, "GF_LK_GETLK" }, + { GF_LK_SETLK, "GF_LK_SETLK" }, + { GF_LK_SETLKW, "GF_LK_SETLKW" }, + { GF_LK_RESLK_LCK, "GF_LK_RESLK_LCK" }, + { GF_LK_RESLK_LCKW, "GF_LK_RESLK_LCKW" }, { GF_LK_RESLK_UNLCK, "GF_LK_RESLK_UNLCK" }, - { GF_LK_GETLK_FD, "GF_LK_GETLK_FD" }, + { GF_LK_GETLK_FD, "GF_LK_GETLK_FD" }, { 0, NULL } }; +static value_string_ext glusterfs_lk_cmd_names_ext = VALUE_STRING_EXT_INIT(glusterfs_lk_cmd_names); /* Different lock types */ static const value_string glusterfs_lk_type_names[] = { { GF_LK_F_RDLCK, "GF_LK_F_RDLCK" }, { GF_LK_F_WRLCK, "GF_LK_F_WRLCK" }, { GF_LK_F_UNLCK, "GF_LK_F_UNLCK" }, - { GF_LK_EOL, "GF_LK_EOL" }, + { GF_LK_EOL, "GF_LK_EOL" }, { 0, NULL } }; @@ -2036,8 +2038,8 @@ proto_register_glusterfs(void) static hf_register_info hf[] = { /* programs */ { &hf_glusterfs_proc, - { "GlusterFS", "glusterfs.proc", FT_UINT32, BASE_DEC, - VALS(glusterfs3_1_fop_proc_vals), 0, NULL, HFILL } + { "GlusterFS", "glusterfs.proc", FT_UINT32, BASE_DEC | BASE_EXT_STRING, + &glusterfs3_1_fop_proc_vals_ext, 0, NULL, HFILL } }, /* fields used by multiple programs/procedures and other * Gluster dissectors with gluster_dissect_common_reply() */ @@ -2096,8 +2098,8 @@ proto_register_glusterfs(void) VALS(glusterfs_lk_type_names), 0, NULL, HFILL } }, { &hf_glusterfs_cmd, - { "Command", "glusterfs.cmd", FT_INT32, BASE_DEC, - VALS(glusterfs_lk_cmd_names), 0, NULL, HFILL } + { "Command", "glusterfs.cmd", FT_INT32, BASE_DEC | BASE_EXT_STRING, + &glusterfs_lk_cmd_names_ext, 0, NULL, HFILL } }, { &hf_glusterfs_volume, { "Volume", "glusterfs.volume", FT_STRING, BASE_NONE, @@ -2280,8 +2282,8 @@ proto_register_glusterfs(void) NULL, 0, NULL, HFILL } }, { &hf_glusterfs_entry_type, - { "Type", "glusterfs.entry.d_type", FT_UINT32, BASE_DEC, - VALS(glusterfs_entry_type_names), 0, NULL, HFILL } + { "Type", "glusterfs.entry.d_type", FT_UINT32, BASE_DEC | BASE_EXT_STRING, + &glusterfs_entry_type_names_ext, 0, NULL, HFILL } }, { &hf_glusterfs_entry_path, { "Path", "glusterfs.entry.path", FT_STRING, BASE_NONE, diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index 4ff3e841e9..8e635a2cad 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -38,9 +38,8 @@ #endif #include <glib.h> -#include <string.h> + #include <epan/packet.h> -#include <epan/tfs.h> #include "packet-rpc.h" #include "packet-gluster.h" @@ -177,13 +176,13 @@ gluster_hndsk_2_event_notify_reply(tvbuff_t *tvb, int offset, } static const vsff gluster_hndsk_proc[] = { - { GF_HNDSK_NULL, "NULL", NULL, NULL }, + { GF_HNDSK_NULL, "NULL", NULL, NULL }, { GF_HNDSK_SETVOLUME, "SETVOLUME", gluster_hndsk_setvolume_call, gluster_hndsk_setvolume_reply }, { GF_HNDSK_GETSPEC, "GETSPEC", NULL, NULL }, - { GF_HNDSK_PING, "PING", NULL, gluster_dissect_common_reply }, + { GF_HNDSK_PING, "PING", NULL, gluster_dissect_common_reply }, { 0, NULL, NULL, NULL } }; @@ -212,11 +211,11 @@ static const vsff gluster_hndsk_2_proc[] = { static const value_string gluster_hndsk_proc_vals[] = { - { GF_HNDSK_NULL, "NULL" }, - { GF_HNDSK_SETVOLUME, "DUMP" }, - { GF_HNDSK_GETSPEC, "GETSPEC" }, - { GF_HNDSK_PING, "PING" }, - { GF_HNDSK_SET_LK_VER,"LOCK VERSION" }, + { GF_HNDSK_NULL, "NULL" }, + { GF_HNDSK_SETVOLUME, "DUMP" }, + { GF_HNDSK_GETSPEC, "GETSPEC" }, + { GF_HNDSK_PING, "PING" }, + { GF_HNDSK_SET_LK_VER, "LOCK VERSION" }, { GF_HNDSK_EVENT_NOTIFY, "EVENTNOTIFY" }, { 0, NULL } }; @@ -291,13 +290,13 @@ proto_reg_handoff_gluster_hndsk(void) /* Legacy GlusterFS Callback procedures, they don't contain any data. */ static const vsff gluster_cbk_proc[] = { - { GF_CBK_NULL, "NULL", NULL, NULL }, + { GF_CBK_NULL, "NULL", NULL, NULL }, { GF_CBK_FETCHSPEC, "FETCHSPEC", NULL, NULL }, { GF_CBK_INO_FLUSH, "INO_FLUSH", NULL, NULL }, { 0, NULL, NULL, NULL } }; static const value_string gluster_cbk_proc_vals[] = { - { GF_CBK_NULL, "NULL" }, + { GF_CBK_NULL, "NULL" }, { GF_CBK_FETCHSPEC, "FETCHSPEC" }, { GF_CBK_INO_FLUSH, "INO_FLUSH" }, { 0, NULL } |