aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-netflow.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-netflow.c')
-rw-r--r--epan/dissectors/packet-netflow.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 89bb7d925e..1797951f04 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -141,15 +141,9 @@ void proto_register_netflow(void);
void proto_reg_handoff_netflow(void);
#if 0
-#define ipfix_debug0(str) g_warning(str)
-#define ipfix_debug1(str,p1) g_warning(str,p1)
-#define ipfix_debug2(str,p1,p2) g_warning(str,p1,p2)
-#define ipfix_debug3(str,p1,p2,p3) g_warning(str,p1,p2,p3)
+#define ipfix_debug(...) g_warning(__VA_ARGS__)
#else
-#define ipfix_debug0(str)
-#define ipfix_debug1(str,p1)
-#define ipfix_debug2(str,p1,p2)
-#define ipfix_debug3(str,p1,p2,p3)
+#define ipfix_debug(...)
#endif
@@ -2313,11 +2307,11 @@ dissect_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
dissect_pdu_t *pduptr;
guint32 flows_seen = 0;
- ipfix_debug0("dissect_netflow: start");
+ ipfix_debug("dissect_netflow: start");
ver = tvb_get_ntohs(tvb, offset);
- ipfix_debug1("dissect_netflow: found version %d", ver);
+ ipfix_debug("dissect_netflow: found version %d", ver);
switch (ver) {
case 1:
@@ -2351,13 +2345,13 @@ dissect_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFLOW");
col_clear(pinfo->cinfo, COL_INFO);
- ipfix_debug0("dissect_netflow: column cleared");
+ ipfix_debug("dissect_netflow: column cleared");
if (tree) {
ti = proto_tree_add_item(tree, proto_netflow, tvb, offset, -1, ENC_NA);
netflow_tree = proto_item_add_subtree(ti, ett_netflow);
}
- ipfix_debug0("dissect_netflow: tree added");
+ ipfix_debug("dissect_netflow: tree added");
hdrinfo.vspec = ver;
hdrinfo.src_id = 0;