aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2006-01-09 21:12:22 +0000
committerAnders Broman <anders.broman@ericsson.com>2006-01-09 21:12:22 +0000
commitc0d17b88451e95deef350915420e49f442fca26e (patch)
tree150863eb7feceebb92cb80be34a2c6d5782c4755
parentefe2f4f5637c4b4c2dc64bf95d544e263959d2fd (diff)
Use col_set_fence(), not to owerwrite colinfo if more than one Camel pdu is in one TCAP message.
svn path=/trunk/; revision=16980
-rw-r--r--asn1/camel/packet-camel-template.c1
-rw-r--r--epan/dissectors/packet-camel.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index c23f6aebeb..d3b0e61df8 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -246,6 +246,7 @@ dissect_camel_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe
/* Add Camel Opcode to INFO column */
col_append_fstr(pinfo->cinfo, COL_INFO, val_to_str(opcode, camel_opr_code_strings, "Unknown Camel (%u)"));
col_append_fstr(pinfo->cinfo, COL_INFO, " ");
+ col_set_fence(pinfo->cinfo, COL_INFO);
}
return offset;
}
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 446784dc46..34be3d9b24 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -7876,6 +7876,7 @@ dissect_camel_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packe
/* Add Camel Opcode to INFO column */
col_append_fstr(pinfo->cinfo, COL_INFO, val_to_str(opcode, camel_opr_code_strings, "Unknown Camel (%u)"));
col_append_fstr(pinfo->cinfo, COL_INFO, " ");
+ col_set_fence(pinfo->cinfo, COL_INFO);
}
return offset;
}
@@ -10236,7 +10237,7 @@ void proto_register_camel(void) {
"", HFILL }},
/*--- End of included file: packet-camel-hfarr.c ---*/
-#line 697 "packet-camel-template.c"
+#line 698 "packet-camel-template.c"
};
/* List of subtrees */
@@ -10459,7 +10460,7 @@ void proto_register_camel(void) {
&ett_camel_CancelFailedPARAM,
/*--- End of included file: packet-camel-ettarr.c ---*/
-#line 710 "packet-camel-template.c"
+#line 711 "packet-camel-template.c"
};
/* Register protocol */