For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.

[obnox/wireshark/wip.git] / epan / dissectors / packet-sebek.c

diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c
index f907b5c7dce9c60128cd1a07ddeb953f5d708177..413e88a3bb95e561fccc858df66b4ee07f983b06 100644 (file)
--- a/epan/dissectors/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
@@ -31,8 +31,6 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
-
 #include <string.h>
 #include <time.h>
 #include <math.h>
@@ -126,21 +124,18 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_tree      *sebek_tree;
        proto_item      *ti;
        int offset = 0;
-       int datalen = 0;
        nstime_t ts;
        int sebek_ver = 0;
        int sebek_type = 0;
        int cmd_len = 0;
 
-       if (check_col(pinfo->cinfo, COL_PROTOCOL))
-               col_set_str(pinfo->cinfo, COL_PROTOCOL, "SEBEK");
+       col_set_str(pinfo->cinfo, COL_PROTOCOL, "SEBEK");
 
        if (check_col(pinfo->cinfo, COL_INFO))
        {
-               col_clear(pinfo->cinfo, COL_INFO);
                col_set_str(pinfo->cinfo, COL_INFO, "SEBEK - ");
 
-               if (tvb->length<6)
+               if (tvb_length(tvb)<6)
                        sebek_ver = 0;
                 else
                        sebek_ver = tvb_get_ntohs(tvb, 4);
@@ -167,26 +162,26 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        if (tree) {
                /* Adding Sebek item and subtree */
-               ti = proto_tree_add_item(tree, proto_sebek, tvb, 0, -1, FALSE);
+               ti = proto_tree_add_item(tree, proto_sebek, tvb, 0, -1, ENC_NA);
                sebek_tree = proto_item_add_subtree(ti, ett_sebek);
 
                /* check for minimum length before deciding where to go*/
-               if (tvb->length<6)
+               if (tvb_length(tvb)<6)
                        sebek_ver = 0;
                else
                        sebek_ver = tvb_get_ntohs(tvb, 4);
 
                switch (sebek_ver) {
-                       case 2: proto_tree_add_item(sebek_tree, hf_sebek_magic, tvb, offset, 4, FALSE);
+                       case 2: proto_tree_add_item(sebek_tree, hf_sebek_magic, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_version, tvb, offset, 2, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_version, tvb, offset, 2, ENC_BIG_ENDIAN);
                                offset += 2;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_type, tvb, offset, 2, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_type, tvb, offset, 2, ENC_BIG_ENDIAN);
                                offset += 2;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_counter, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_counter, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
                                ts.secs = tvb_get_ntohl(tvb, offset);
@@ -194,37 +189,36 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                proto_tree_add_time(sebek_tree, hf_sebek_time, tvb, offset, 8, &ts);
                                offset += 8;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_pid, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_pid, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_uid, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_uid, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, ENC_ASCII|ENC_NA);
                                offset += 12;
 
-                               datalen = tvb_get_letohl(tvb, offset);
-                               proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
 
                                break;
 
-                       case 3: proto_tree_add_item(sebek_tree, hf_sebek_magic, tvb, offset, 4, FALSE);
+                       case 3: proto_tree_add_item(sebek_tree, hf_sebek_magic, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_version, tvb, offset, 2, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_version, tvb, offset, 2, ENC_BIG_ENDIAN);
                                offset += 2;
 
                                sebek_type=tvb_get_ntohs(tvb, offset);
-                               proto_tree_add_item(sebek_tree, hf_sebek_type, tvb, offset, 2, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_type, tvb, offset, 2, ENC_BIG_ENDIAN);
                                offset += 2;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_counter, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_counter, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
                                ts.secs = tvb_get_ntohl(tvb, offset);
@@ -232,44 +226,43 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                proto_tree_add_time(sebek_tree, hf_sebek_time, tvb, offset, 8, &ts);
                                offset += 8;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_ppid, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_ppid, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_pid, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_pid, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_uid, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_uid, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_fd, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_inode, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_inode, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
-                               proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_cmd, tvb, offset, 12, ENC_ASCII|ENC_NA);
                                offset += 12;
 
-                                datalen = tvb_get_ntohl(tvb, offset);
-                               proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, FALSE);
+                               proto_tree_add_item(sebek_tree, hf_sebek_len, tvb, offset, 4, ENC_BIG_ENDIAN);
                                offset += 4;
 
                                if (sebek_type == 2) {
                                        /*data is socket data, process accordingly*/
-                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_ip, tvb, offset, 4, FALSE);
+                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_ip, tvb, offset, 4, ENC_BIG_ENDIAN);
                                        offset += 4;
-                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_port, tvb, offset, 2, FALSE);
+                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_dst_port, tvb, offset, 2, ENC_BIG_ENDIAN);
                                        offset += 2;
-                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_src_ip, tvb, offset, 4, FALSE);
+                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_src_ip, tvb, offset, 4, ENC_BIG_ENDIAN);
                                        offset += 4;
-                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_src_port, tvb, offset, 2, FALSE);
+                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_src_port, tvb, offset, 2, ENC_BIG_ENDIAN);
                                        offset += 2;
-                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_call, tvb, offset, 2, FALSE);
+                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_call, tvb, offset, 2, ENC_BIG_ENDIAN);
                                        offset += 2;
-                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_proto, tvb, offset, 1, FALSE);
+                                       proto_tree_add_item(sebek_tree, hf_sebek_socket_proto, tvb, offset, 1, ENC_BIG_ENDIAN);
                                        offset += 1;
                                } else {
-                                       proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, FALSE);
+                                       proto_tree_add_item(sebek_tree, hf_sebek_data, tvb, offset, -1, ENC_ASCII|ENC_NA);
                                }
 
                                break;
@@ -298,7 +291,7 @@ proto_register_sebek(void)
                        "Counter", "sebek.counter", FT_UINT32, BASE_DEC,
                        NULL, 0, NULL, HFILL }},
                { &hf_sebek_time, {
-                       "Time", "sebek.time.sec", FT_ABSOLUTE_TIME, BASE_NONE,
+                       "Time", "sebek.time.sec", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL,
                        NULL, 0, NULL, HFILL }},
                { &hf_sebek_pid, {
                        "Process ID", "sebek.pid", FT_UINT32, BASE_DEC,
@@ -358,5 +351,5 @@ proto_reg_handoff_sebek(void)
        dissector_handle_t sebek_handle;
 
        sebek_handle = create_dissector_handle(dissect_sebek, proto_sebek);
-       dissector_add("udp.port", UDP_PORT_SEBEK, sebek_handle);
+       dissector_add_uint("udp.port", UDP_PORT_SEBEK, sebek_handle);
 }