diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2012-10-06 15:00:38 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2012-10-06 15:00:38 +0000 |
| commit | 62d83ed0c8ec9e2bc0fe35a02442c8f6784e2e15 (patch) | |
| tree | 45ed1c109bca48552e202b071b990868a1c3a726 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | 5bd351fb32ed7c2f89902d7fee7df7f3972ae0cc (diff) | |
| download | wireshark-62d83ed0c8ec9e2bc0fe35a02442c8f6784e2e15.tar.gz | |
Give up trying to parse those lines - the format has changed and its too
complicated now.
svn path=/trunk/; revision=45342
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 658df19f60..2efbb880d8 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -101,13 +101,6 @@ static int hf_catapult_dct2000_lte_ccpri_opcode = -1; static int hf_catapult_dct2000_lte_ccpri_status = -1; static int hf_catapult_dct2000_lte_ccpri_channel = -1; -static int hf_catapult_dct2000_lte_monitor_cpu_user = -1; -static int hf_catapult_dct2000_lte_monitor_cpu_sys = -1; -static int hf_catapult_dct2000_lte_monitor_cpu_load = -1; -static int hf_catapult_dct2000_lte_monitor_lte_scs_cpu_user = -1; -static int hf_catapult_dct2000_lte_monitor_lte_scs_cpu_sys = -1; - - static int hf_catapult_dct2000_lte_nas_rrc_opcode = -1; static int hf_catapult_dct2000_lte_nas_rrc_establish_cause = -1; static int hf_catapult_dct2000_lte_nas_rrc_priority = -1; @@ -2480,41 +2473,6 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "%s", string); } - #define MONITOR_PREFIX ">> INFO ALL: Monitor: CPU=[" - if (strncmp(string, MONITOR_PREFIX, strlen(MONITOR_PREFIX)) == 0) { - gint user_cpu, sys_cpu, load_cpu; - gint memory_free, memory_load; - gint lte_scs_user_cpu, lte_scs_system_cpu; - int matched; - matched = sscanf(string+strlen(MONITOR_PREFIX), - "User%%=%d Sys%%=%d Load%%=%d] Memory=[FreeMb=%d Load%%=%d] LTE_SCS_CPU=[User%%=%d Sys%%=%d]", - &user_cpu, &sys_cpu, &load_cpu, - &memory_free, &memory_load, - <e_scs_user_cpu, <e_scs_system_cpu); - if (matched == 7) { - /* Overall CPU */ - ti = proto_tree_add_uint(tree, hf_catapult_dct2000_lte_monitor_cpu_user, - tvb, 0, 0, user_cpu); - PROTO_ITEM_SET_GENERATED(ti); - - ti = proto_tree_add_uint(tree, hf_catapult_dct2000_lte_monitor_cpu_sys, - tvb, 0, 0, sys_cpu); - PROTO_ITEM_SET_GENERATED(ti); - - ti = proto_tree_add_uint(tree, hf_catapult_dct2000_lte_monitor_cpu_load, - tvb, 0, 0, load_cpu); - PROTO_ITEM_SET_GENERATED(ti); - - /* LTE_SCS CPU */ - ti = proto_tree_add_uint(tree, hf_catapult_dct2000_lte_monitor_lte_scs_cpu_user, - tvb, 0, 0, lte_scs_user_cpu); - PROTO_ITEM_SET_GENERATED(ti); - - ti = proto_tree_add_uint(tree, hf_catapult_dct2000_lte_monitor_lte_scs_cpu_sys, - tvb, 0, 0, lte_scs_system_cpu); - PROTO_ITEM_SET_GENERATED(ti); - } - } return; } @@ -3199,37 +3157,6 @@ void proto_register_catapult_dct2000(void) } }, - { &hf_catapult_dct2000_lte_monitor_cpu_user, - { "User CPU", - "dct2000.lte.monitor.cpu.user", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL - } - }, - { &hf_catapult_dct2000_lte_monitor_cpu_sys, - { "Sys CPU", - "dct2000.lte.monitor.cpu.sys", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL - } - }, - { &hf_catapult_dct2000_lte_monitor_cpu_load, - { "Load CPU", - "dct2000.lte.monitor.cpu.load", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL - } - }, - { &hf_catapult_dct2000_lte_monitor_lte_scs_cpu_user, - { "lte-scs User CPU", - "dct2000.lte.monitor.lte-scs.cpu.user", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL - } - }, - { &hf_catapult_dct2000_lte_monitor_lte_scs_cpu_sys, - { "lte-scs Sys CPU", - "dct2000.lte.monitor.lte-scs.cpu.sys", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL - } - }, - { &hf_catapult_dct2000_lte_nas_rrc_opcode, { "NAS RRC Opcode", "dct2000.lte.nas-rrc.opcode", FT_UINT8, BASE_DEC, VALS(lte_nas_rrc_opcode_vals), 0x0, |