Don't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.

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

diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index 4599aa2095bde2e5e848ea43f6ad50eaa8c29296..92f16194aebc5d56675f02c7ce0c0010b15cbab2 100644 (file)
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -27,9 +27,7 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
 #include <glib.h>
-#include <string.h>
 #include <epan/packet.h>
 #include <epan/xdlc.h>
 
@@ -72,43 +70,34 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint8             byte0;
     tvbuff_t           *next_tvb;
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
-       col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPB");
-    if (check_col(pinfo->cinfo, COL_INFO))
-       col_clear(pinfo->cinfo, COL_INFO);
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPB");
+    col_clear(pinfo->cinfo, COL_INFO);
 
     switch (pinfo->p2p_dir) {
 
     case P2P_DIR_SENT:
-       if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-           col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
-       if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-           col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+       col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+       col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
        break;
 
     case P2P_DIR_RECV:
-       if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-           col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
-       if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-           col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+       col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+       col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
        break;
 
     default:
-       if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-           col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
-       if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-           col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
+       col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+       col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
        break;
     }
 
     byte0 = tvb_get_guint8(tvb, 0);
 
-    if (byte0 != 0x01 && byte0 != 0x03) /* invalid LAPB frame */
+    if (byte0 != 0x01 && byte0 != 0x03 && byte0 != 0x07 && byte0 != 0x0f) /* invalid LAPB frame */
     {
-       if (check_col(pinfo->cinfo, COL_INFO))
-           col_set_str(pinfo->cinfo, COL_INFO, "Invalid LAPB frame");
+       col_set_str(pinfo->cinfo, COL_INFO, "Invalid LAPB frame");
        if (tree)
-           ti = proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, -1,
+           proto_tree_add_protocol_format(tree, proto_lapb, tvb, 0, -1,
                            "Invalid LAPB frame");
        return;
     }
@@ -156,7 +145,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* not end of frame ==> X.25 */
     if (tvb_reported_length(tvb) > 2) {
-       next_tvb = tvb_new_subset(tvb, 2, -1, -1);
+       next_tvb = tvb_new_subset_remaining(tvb, 2);
        switch (pinfo->p2p_dir) {
 
        case P2P_DIR_SENT:
@@ -181,43 +170,43 @@ proto_register_lapb(void)
 
        { &hf_lapb_control,
          { "Control Field", "lapb.control", FT_UINT8, BASE_HEX, NULL, 0x0,
-               "Control field", HFILL }},
+               NULL, HFILL }},
 
        { &hf_lapb_n_r,
            { "N(R)", "lapb.control.n_r", FT_UINT8, BASE_DEC,
-             NULL, XDLC_N_R_MASK, "", HFILL }},
+             NULL, XDLC_N_R_MASK, NULL, HFILL }},
 
        { &hf_lapb_n_s,
            { "N(S)", "lapb.control.n_s", FT_UINT8, BASE_DEC,
-             NULL, XDLC_N_S_MASK, "", HFILL }},
+             NULL, XDLC_N_S_MASK, NULL, HFILL }},
 
        { &hf_lapb_p,
            { "Poll", "lapb.control.p", FT_BOOLEAN, 8,
-             TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+             TFS(&tfs_set_notset), XDLC_P_F, NULL, HFILL }},
 
        { &hf_lapb_f,
            { "Final", "lapb.control.f", FT_BOOLEAN, 8,
-             TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+             TFS(&tfs_set_notset), XDLC_P_F, NULL, HFILL }},
 
        { &hf_lapb_s_ftype,
            { "Supervisory frame type", "lapb.control.s_ftype", FT_UINT8, BASE_HEX,
-             VALS(stype_vals), XDLC_S_FTYPE_MASK, "", HFILL }},
+             VALS(stype_vals), XDLC_S_FTYPE_MASK, NULL, HFILL }},
 
        { &hf_lapb_u_modifier_cmd,
            { "Command", "lapb.control.u_modifier_cmd", FT_UINT8, BASE_HEX,
-             VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, "", HFILL }},
+             VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 
        { &hf_lapb_u_modifier_resp,
            { "Response", "lapb.control.u_modifier_resp", FT_UINT8, BASE_HEX,
-             VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, "", HFILL }},
+             VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 
        { &hf_lapb_ftype_i,
            { "Frame type", "lapb.control.ftype", FT_UINT8, BASE_HEX,
-             VALS(ftype_vals), XDLC_I_MASK, "", HFILL }},
+             VALS(ftype_vals), XDLC_I_MASK, NULL, HFILL }},
 
        { &hf_lapb_ftype_s_u,
            { "Frame type", "lapb.control.ftype", FT_UINT8, BASE_HEX,
-             VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }},
+             VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
     };
     static gint *ett[] = {
         &ett_lapb,
@@ -246,5 +235,5 @@ proto_reg_handoff_lapb(void)
     x25_handle = find_dissector("x.25");
 
     lapb_handle = find_dissector("lapb");
-    dissector_add("wtap_encap", WTAP_ENCAP_LAPB, lapb_handle);
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_LAPB, lapb_handle);
 }