summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nstrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-nstrace.c')
-rw-r--r--epan/dissectors/packet-nstrace.c398
1 files changed, 199 insertions, 199 deletions
diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c
index d02862b6..d14cb01b 100644
--- a/epan/dissectors/packet-nstrace.c
+++ b/epan/dissectors/packet-nstrace.c
@@ -110,184 +110,184 @@
void proto_register_ns(void);
void proto_reg_handoff_ns(void);
-static int proto_nstrace = -1;
-
-static int hf_ns_nicno = -1;
-static int hf_ns_src_vm = -1;
-static int hf_ns_dst_vm = -1;
-static int hf_ns_dir = -1;
-static int hf_ns_pcbdevno = -1;
-static int hf_ns_l_pcbdevno = -1;
-static int hf_ns_devno = -1;
-static int hf_ns_vlantag = -1;
-static int hf_ns_coreid = -1;
-
-static int hf_ns_errorcode = -1;
-static int hf_ns_app = -1;
-
-static int hf_ns_snode = -1;
-static int hf_ns_dnode = -1;
-static int hf_ns_clflags = -1;
-static int hf_ns_clflags_res = -1;
-static int hf_ns_clflags_rssh = -1;
-static int hf_ns_clflags_rss = -1;
-static int hf_ns_clflags_dfd = -1;
-static int hf_ns_clflags_fr = -1;
-static int hf_ns_clflags_fp = -1;
-
-static int hf_ns_activity = -1;
-static int hf_ns_activity_perf_collection = -1;
-static int hf_ns_activity_pcb_zombie = -1;
-static int hf_ns_activity_natpcb_zombie = -1;
-static int hf_ns_activity_lbstats_sync = -1;
-static int hf_ns_activity_stats_req = -1;
-
-static int hf_ns_capflags = -1;
-static int hf_ns_capflags_dbg = -1;
-static int hf_ns_capflags_int = -1;
-static int hf_ns_capflags_skipnwhdr = -1;
-
-static int hf_ns_tcpdbg = -1;
-static int hf_ns_tcpdbg_cwnd = -1;
-static int hf_ns_tcpdbg_rtrtt = -1;
-static int hf_ns_tcpdbg_tsrecent = -1;
-static int hf_ns_tcpdbg_httpabort = -1;
-
-static int hf_ns_tcpdbg2 = -1;
-static int hf_ns_tcpdbg2_sndCwnd = -1;
-static int hf_ns_tcpdbg2_ssthresh = -1;
-static int hf_ns_tcpdbg2_sndbuf = -1;
-static int hf_ns_tcpdbg2_max_rcvbuf = -1;
-static int hf_ns_tcpdbg2_bw_estimate = -1;
-static int hf_ns_tcpdbg2_rtt = -1;
-static int hf_ns_tcpdbg2_tcpos_pktcnt = -1;
-static int hf_ns_tcpdbg2_ts_recent = -1;
-static int hf_ns_tcpdbg2_tcp_cfgsndbuf = -1;
-static int hf_ns_tcpdbg2_tcp_flvr = -1;
-static int hf_ns_trcdbg = -1;
-static int hf_ns_trcdbg_val1 = -1;
-static int hf_ns_trcdbg_val1_PRR = -1;
-static int hf_ns_trcdbg_val1_NILE = -1;
-static int hf_ns_trcdbg_val1_RTT = -1;
-static int hf_ns_trcdbg_val1_BURST = -1;
-static int hf_ns_trcdbg_val2 = -1;
-static int hf_ns_trcdbg_val2_PRR = -1;
-static int hf_ns_trcdbg_val2_NILE = -1;
-static int hf_ns_trcdbg_val2_RTT = -1;
-static int hf_ns_trcdbg_val3 = -1;
-static int hf_ns_trcdbg_val3_PRR = -1;
-static int hf_ns_trcdbg_val3_NILE = -1;
-static int hf_ns_trcdbg_val3_RTT = -1;
-static int hf_ns_trcdbg_val4 = -1;
-static int hf_ns_trcdbg_val4_PRR = -1;
-static int hf_ns_trcdbg_val4_NILE = -1;
-static int hf_ns_trcdbg_val4_RTT = -1;
-static int hf_ns_trcdbg_val5 = -1;
-static int hf_ns_trcdbg_val5_DRB_APP = -1;
-static int hf_ns_trcdbg_val5_NILE = -1;
-static int hf_ns_trcdbg_val5_RTT = -1;
-static int hf_ns_trcdbg_val6 = -1;
-static int hf_ns_trcdbg_val6_DRB_APP = -1;
-static int hf_ns_trcdbg_val6_NILE = -1;
-static int hf_ns_trcdbg_val6_RTT = -1;
-static int hf_ns_trcdbg_val7 = -1;
-static int hf_ns_trcdbg_val7_DRB = -1;
-static int hf_ns_trcdbg_val7_NILE = -1;
-static int hf_ns_trcdbg_val7_DRB_APP = -1;
-static int hf_ns_trcdbg_val8 = -1;
-static int hf_ns_trcdbg_val8_DRB = -1;
-static int hf_ns_trcdbg_val8_NILE = -1;
-static int hf_ns_trcdbg_val8_DRB_APP = -1;
-static int hf_ns_trcdbg_val9 = -1;
-static int hf_ns_trcdbg_val9_DRB = -1;
-static int hf_ns_trcdbg_val9_NILE = -1;
-static int hf_ns_trcdbg_val10 = -1;
-static int hf_ns_trcdbg_val10_DRB = -1;
-static int hf_ns_trcdbg_val10_NILE = -1;
-static int hf_ns_trcdbg_val11 = -1;
-static int hf_ns_trcdbg_val11_RTT = -1;
-static int hf_ns_trcdbg_val11_DRB = -1;
-static int hf_ns_trcdbg_val11_DRB_APP = -1;
-static int hf_ns_trcdbg_val11_NILE = -1;
-static int hf_ns_trcdbg_val11_BURST = -1;
-static int hf_ns_trcdbg_val12 = -1;
-static int hf_ns_trcdbg_val12_NILE = -1;
-static int hf_ns_trcdbg_val12_RTT = -1;
-static int hf_ns_trcdbg_val13 = -1;
-static int hf_ns_trcdbg_val13_DRB = -1;
-static int hf_ns_trcdbg_val13_NILE = -1;
-static int hf_ns_trcdbg_val14 = -1;
-static int hf_ns_trcdbg_val14_NILE = -1;
-static int hf_ns_trcdbg_val15 = -1;
-static int hf_ns_httpInfo = -1;
-static int hf_ns_httpInfo_httpabort = -1;
-
-static int hf_ns_tcpcc = -1;
-static int hf_ns_tcpcc_last_max_cwnd = -1;
-static int hf_ns_tcpcc_loss_cwnd = -1;
-static int hf_ns_tcpcc_last_time = -1;
-static int hf_ns_tcpcc_last_cwnd = -1;
-static int hf_ns_tcpcc_delay_min = -1;
-static int hf_ns_tcpcc_ack_cnt = -1;
-static int hf_ns_tcpcc_last_ack = -1;
-static int hf_ns_tcpcc_round_start = -1;
-static int hf_ns_tcpcc_end_seq = -1;
-static int hf_ns_tcpcc_curr_rtt = -1;
-static int hf_ns_tcpcc_rtt_min = -1;
-static int hf_ns_tcpcc_alpha = -1;
-static int hf_ns_tcpcc_beta_val = -1;
-static int hf_ns_tcpcc_rtt_low = -1;
-static int hf_ns_tcpcc_rtt_above = -1;
-static int hf_ns_tcpcc_max_rtt = -1;
-static int hf_ns_tcpcc_base_rtt = -1;
-static int hf_ns_unknownrec = -1;
-static int hf_ns_unknowndata = -1;
-
-static int hf_ns_inforec = -1;
-static int hf_ns_inforec_info = -1;
-
-static int hf_ns_sslrec = -1;
-static int hf_ns_sslrec_seq = -1;
-
-static int hf_ns_mptcprec = -1;
-static int hf_ns_mptcprec_subflowid = -1;
-
-static int hf_ns_vmnamerec = -1;
-static int hf_ns_vmnamerec_srcvmname = -1;
-static int hf_ns_vmnamerec_dstvmname = -1;
-
-static int hf_ns_clusterrec = -1;
-static int hf_ns_clu_snode = -1;
-static int hf_ns_clu_dnode = -1;
-static int hf_ns_clu_clflags = -1;
-static int hf_ns_clu_clflags_res = -1;
-static int hf_ns_clu_clflags_rssh = -1;
-static int hf_ns_clu_clflags_rss = -1;
-static int hf_ns_clu_clflags_dfd = -1;
-static int hf_ns_clu_clflags_fr = -1;
-static int hf_ns_clu_clflags_fp = -1;
-
-static gint ett_ns = -1;
-static gint ett_ns_flags = -1;
-static gint ett_ns_activity_flags = -1;
-static gint ett_ns_tcpdebug = -1;
-static gint ett_ns_tcpdebug2 = -1;
-static gint ett_ns_trcdbg = -1;
-static gint ett_ns_httpInfo = -1;
-static gint ett_ns_tcpcc = -1;
-static gint ett_ns_inforec = -1;
-static gint ett_ns_sslrec = -1;
-static gint ett_ns_mptcprec = -1;
-static gint ett_ns_vmnamerec = -1;
-static gint ett_ns_clusterrec = -1;
-static gint ett_ns_clu_clflags = -1;
-static gint ett_ns_unknownrec = -1;
-static gint ett_ns_capflags = -1;
-
-static int hf_ns_snd_cwnd = -1;
-static int hf_ns_realtime_rtt = -1;
-static int hf_ns_ts_recent = -1;
-static int hf_ns_http_abort_tracking_reason = -1;
+static int proto_nstrace;
+
+static int hf_ns_nicno;
+static int hf_ns_src_vm;
+static int hf_ns_dst_vm;
+static int hf_ns_dir;
+static int hf_ns_pcbdevno;
+static int hf_ns_l_pcbdevno;
+static int hf_ns_devno;
+static int hf_ns_vlantag;
+static int hf_ns_coreid;
+
+static int hf_ns_errorcode;
+static int hf_ns_app;
+
+static int hf_ns_snode;
+static int hf_ns_dnode;
+static int hf_ns_clflags;
+static int hf_ns_clflags_res;
+static int hf_ns_clflags_rssh;
+static int hf_ns_clflags_rss;
+static int hf_ns_clflags_dfd;
+static int hf_ns_clflags_fr;
+static int hf_ns_clflags_fp;
+
+static int hf_ns_activity;
+static int hf_ns_activity_perf_collection;
+static int hf_ns_activity_pcb_zombie;
+static int hf_ns_activity_natpcb_zombie;
+static int hf_ns_activity_lbstats_sync;
+static int hf_ns_activity_stats_req;
+
+static int hf_ns_capflags;
+static int hf_ns_capflags_dbg;
+static int hf_ns_capflags_int;
+static int hf_ns_capflags_skipnwhdr;
+
+static int hf_ns_tcpdbg;
+static int hf_ns_tcpdbg_cwnd;
+static int hf_ns_tcpdbg_rtrtt;
+static int hf_ns_tcpdbg_tsrecent;
+static int hf_ns_tcpdbg_httpabort;
+
+static int hf_ns_tcpdbg2;
+static int hf_ns_tcpdbg2_sndCwnd;
+static int hf_ns_tcpdbg2_ssthresh;
+static int hf_ns_tcpdbg2_sndbuf;
+static int hf_ns_tcpdbg2_max_rcvbuf;
+static int hf_ns_tcpdbg2_bw_estimate;
+static int hf_ns_tcpdbg2_rtt;
+static int hf_ns_tcpdbg2_tcpos_pktcnt;
+static int hf_ns_tcpdbg2_ts_recent;
+static int hf_ns_tcpdbg2_tcp_cfgsndbuf;
+static int hf_ns_tcpdbg2_tcp_flvr;
+static int hf_ns_trcdbg;
+static int hf_ns_trcdbg_val1;
+static int hf_ns_trcdbg_val1_PRR;
+static int hf_ns_trcdbg_val1_NILE;
+static int hf_ns_trcdbg_val1_RTT;
+static int hf_ns_trcdbg_val1_BURST;
+static int hf_ns_trcdbg_val2;
+static int hf_ns_trcdbg_val2_PRR;
+static int hf_ns_trcdbg_val2_NILE;
+static int hf_ns_trcdbg_val2_RTT;
+static int hf_ns_trcdbg_val3;
+static int hf_ns_trcdbg_val3_PRR;
+static int hf_ns_trcdbg_val3_NILE;
+static int hf_ns_trcdbg_val3_RTT;
+static int hf_ns_trcdbg_val4;
+static int hf_ns_trcdbg_val4_PRR;
+static int hf_ns_trcdbg_val4_NILE;
+static int hf_ns_trcdbg_val4_RTT;
+static int hf_ns_trcdbg_val5;
+static int hf_ns_trcdbg_val5_DRB_APP;
+static int hf_ns_trcdbg_val5_NILE;
+static int hf_ns_trcdbg_val5_RTT;
+static int hf_ns_trcdbg_val6;
+static int hf_ns_trcdbg_val6_DRB_APP;
+static int hf_ns_trcdbg_val6_NILE;
+static int hf_ns_trcdbg_val6_RTT;
+static int hf_ns_trcdbg_val7;
+static int hf_ns_trcdbg_val7_DRB;
+static int hf_ns_trcdbg_val7_NILE;
+static int hf_ns_trcdbg_val7_DRB_APP;
+static int hf_ns_trcdbg_val8;
+static int hf_ns_trcdbg_val8_DRB;
+static int hf_ns_trcdbg_val8_NILE;
+static int hf_ns_trcdbg_val8_DRB_APP;
+static int hf_ns_trcdbg_val9;
+static int hf_ns_trcdbg_val9_DRB;
+static int hf_ns_trcdbg_val9_NILE;
+static int hf_ns_trcdbg_val10;
+static int hf_ns_trcdbg_val10_DRB;
+static int hf_ns_trcdbg_val10_NILE;
+static int hf_ns_trcdbg_val11;
+static int hf_ns_trcdbg_val11_RTT;
+static int hf_ns_trcdbg_val11_DRB;
+static int hf_ns_trcdbg_val11_DRB_APP;
+static int hf_ns_trcdbg_val11_NILE;
+static int hf_ns_trcdbg_val11_BURST;
+static int hf_ns_trcdbg_val12;
+static int hf_ns_trcdbg_val12_NILE;
+static int hf_ns_trcdbg_val12_RTT;
+static int hf_ns_trcdbg_val13;
+static int hf_ns_trcdbg_val13_DRB;
+static int hf_ns_trcdbg_val13_NILE;
+static int hf_ns_trcdbg_val14;
+static int hf_ns_trcdbg_val14_NILE;
+static int hf_ns_trcdbg_val15;
+static int hf_ns_httpInfo;
+static int hf_ns_httpInfo_httpabort;
+
+static int hf_ns_tcpcc;
+static int hf_ns_tcpcc_last_max_cwnd;
+static int hf_ns_tcpcc_loss_cwnd;
+static int hf_ns_tcpcc_last_time;
+static int hf_ns_tcpcc_last_cwnd;
+static int hf_ns_tcpcc_delay_min;
+static int hf_ns_tcpcc_ack_cnt;
+static int hf_ns_tcpcc_last_ack;
+static int hf_ns_tcpcc_round_start;
+static int hf_ns_tcpcc_end_seq;
+static int hf_ns_tcpcc_curr_rtt;
+static int hf_ns_tcpcc_rtt_min;
+static int hf_ns_tcpcc_alpha;
+static int hf_ns_tcpcc_beta_val;
+static int hf_ns_tcpcc_rtt_low;
+static int hf_ns_tcpcc_rtt_above;
+static int hf_ns_tcpcc_max_rtt;
+static int hf_ns_tcpcc_base_rtt;
+static int hf_ns_unknownrec;
+static int hf_ns_unknowndata;
+
+static int hf_ns_inforec;
+static int hf_ns_inforec_info;
+
+static int hf_ns_sslrec;
+static int hf_ns_sslrec_seq;
+
+static int hf_ns_mptcprec;
+static int hf_ns_mptcprec_subflowid;
+
+static int hf_ns_vmnamerec;
+static int hf_ns_vmnamerec_srcvmname;
+static int hf_ns_vmnamerec_dstvmname;
+
+static int hf_ns_clusterrec;
+static int hf_ns_clu_snode;
+static int hf_ns_clu_dnode;
+static int hf_ns_clu_clflags;
+static int hf_ns_clu_clflags_res;
+static int hf_ns_clu_clflags_rssh;
+static int hf_ns_clu_clflags_rss;
+static int hf_ns_clu_clflags_dfd;
+static int hf_ns_clu_clflags_fr;
+static int hf_ns_clu_clflags_fp;
+
+static int ett_ns;
+static int ett_ns_flags;
+static int ett_ns_activity_flags;
+static int ett_ns_tcpdebug;
+static int ett_ns_tcpdebug2;
+static int ett_ns_trcdbg;
+static int ett_ns_httpInfo;
+static int ett_ns_tcpcc;
+static int ett_ns_inforec;
+static int ett_ns_sslrec;
+static int ett_ns_mptcprec;
+static int ett_ns_vmnamerec;
+static int ett_ns_clusterrec;
+static int ett_ns_clu_clflags;
+static int ett_ns_unknownrec;
+static int ett_ns_capflags;
+
+static int hf_ns_snd_cwnd;
+static int hf_ns_realtime_rtt;
+static int hf_ns_ts_recent;
+static int hf_ns_http_abort_tracking_reason;
static const value_string ns_errorcode_vals[] = {
{ ERR_NONE, "No Error" },
@@ -466,9 +466,9 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
proto_item *ti;
struct nstr_phdr *pnstr = &(pinfo->pseudo_header->nstr);
tvbuff_t *next_tvb_eth_client;
- guint8 src_vmname_len = 0, dst_vmname_len = 0;
- guint8 variable_ns_len = 0;
- guint32 vlan;
+ uint8_t src_vmname_len = 0, dst_vmname_len = 0;
+ uint8_t variable_ns_len = 0;
+ uint32_t vlan;
static int * const activity_flags[] = {
&hf_ns_activity_perf_collection,
&hf_ns_activity_pcb_zombie,
@@ -483,8 +483,8 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
case NSPR_HEADER_VERSION205:
case NSPR_HEADER_VERSION300:
case NSPR_HEADER_VERSION206:
- src_vmname_len = tvb_get_guint8(tvb,pnstr->src_vmname_len_offset);
- dst_vmname_len = tvb_get_guint8(tvb,pnstr->dst_vmname_len_offset);
+ src_vmname_len = tvb_get_uint8(tvb,pnstr->src_vmname_len_offset);
+ dst_vmname_len = tvb_get_uint8(tvb,pnstr->dst_vmname_len_offset);
variable_ns_len = src_vmname_len + dst_vmname_len;
pnstr->eth_offset += variable_ns_len;
break;
@@ -571,7 +571,7 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
proto_tree_add_bitmask(ns_tree, tvb, pnstr->ns_activity_offset, hf_ns_capflags, ett_ns_capflags, cap_flags, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ns_tree, hf_ns_errorcode, tvb, NSPR_V35_ERROR_CODE_OFFSET, 1, ENC_LITTLE_ENDIAN);
- error_code = tvb_get_guint8(tvb, NSPR_V35_ERROR_CODE_OFFSET);
+ error_code = tvb_get_uint8(tvb, NSPR_V35_ERROR_CODE_OFFSET);
proto_tree_add_item(ns_tree, hf_ns_app, tvb, NSPR_V35_APP_OFFSET, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ns_tree, hf_ns_coreid, tvb, pnstr->coreid_offset, 2, ENC_LITTLE_ENDIAN);
@@ -608,32 +608,32 @@ dissect_nstrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
return tvb_captured_length(tvb);
}
-static gboolean no_record_header(int rec_type)
+static bool no_record_header(int rec_type)
{
switch(rec_type)
{
case NSREC_ETHERNET:
case NSREC_HTTP:
case NSREC_NULL:
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
static void add35records(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *ns_tree)
{
tvbuff_t *next_tvb;
- guint nsheaderlen=0;
- guint8 ssl_internal=0;
- guint offset;
+ unsigned nsheaderlen=0;
+ uint8_t ssl_internal=0;
+ unsigned offset;
int flavour_value = 0;
int app_value = 0;
int morerecs=1;
int loopcount=0;
int reclen = 0, nextrec = 0;
- int cur_record=tvb_get_guint8(tvb, NSPR_V35_NEXT_RECORD_OFFSET);
- gboolean record_header;
+ int cur_record=tvb_get_uint8(tvb, NSPR_V35_NEXT_RECORD_OFFSET);
+ bool record_header;
proto_tree* subtree;
proto_item* subitem;
unsigned int tcp_mode = 0;
@@ -669,7 +669,7 @@ static void add35records(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr
if (record_header)
{
reclen = tvb_get_letohs(tvb,offset);
- nextrec = tvb_get_guint8(tvb,offset+2);
+ nextrec = tvb_get_uint8(tvb,offset+2);
}
switch (cur_record){
@@ -718,7 +718,7 @@ static void add35records(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr
proto_tree_add_item(subtree, hf_ns_tcpdbg2_ts_recent, tvb, offset + 31, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(subtree, hf_ns_tcpdbg2_tcp_cfgsndbuf, tvb, offset + 35, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(subtree, hf_ns_tcpdbg2_tcp_flvr, tvb, offset + 39, 1, ENC_LITTLE_ENDIAN);
- flavour_value = tvb_get_guint8(tvb, offset + 39);
+ flavour_value = tvb_get_uint8(tvb, offset + 39);
offset += reclen;
cur_record = nextrec;
@@ -727,8 +727,8 @@ static void add35records(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr
/* Add tcpdebug2 subtree */
subitem = proto_tree_add_item(ns_tree, hf_ns_trcdbg, tvb, offset, reclen, ENC_NA);
subtree = proto_item_add_subtree(subitem, ett_ns_trcdbg);
- app_value = tvb_get_guint8(tvb, NSPR_V35_APP_OFFSET);
- tcp_mode = tvb_get_guint32(tvb, offset + 59, ENC_LITTLE_ENDIAN);
+ app_value = tvb_get_uint8(tvb, NSPR_V35_APP_OFFSET);
+ tcp_mode = tvb_get_uint32(tvb, offset + 59, ENC_LITTLE_ENDIAN);
switch(tcp_mode)
{
case TRCDBG_PRR:
@@ -902,8 +902,8 @@ static void add35records(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pr
break;
case NSREC_VMNAMES:
{
- gint srcvmnamelen = tvb_get_guint8(tvb,offset+3);
- gint dstvmnamelen = tvb_get_guint8(tvb,offset+4);
+ int srcvmnamelen = tvb_get_uint8(tvb,offset+3);
+ int dstvmnamelen = tvb_get_uint8(tvb,offset+4);
subitem = proto_tree_add_item(ns_tree, hf_ns_vmnamerec, tvb, offset, reclen, ENC_NA);
subtree = proto_item_add_subtree(subitem, ett_ns_vmnamerec);
proto_tree_add_item(subtree, hf_ns_vmnamerec_srcvmname, tvb, offset+5,
@@ -1835,7 +1835,7 @@ proto_register_ns(void)
};
- static gint *ett[] = {
+ static int *ett[] = {
&ett_ns,
&ett_ns_flags,
&ett_ns_activity_flags,