diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2008-04-13 16:20:12 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2008-04-13 16:20:12 +0000 |
| commit | 85536e668e07a57e60e4c0296f702131e5ae07f9 (patch) | |
| tree | 2bcfb228d21417ab48ac10620c8479a911bfc7f9 /asn1/dop | |
| parent | fb3b8307e8da998e2a949c98b41d548b9d6b68a5 (diff) | |
Removal of #defined preference grouping and tidy up agreement id.
svn path=/trunk/; revision=24986
Diffstat (limited to 'asn1/dop')
| -rw-r--r-- | asn1/dop/dop.cnf | 2 | ||||
| -rw-r--r-- | asn1/dop/packet-dop-template.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index 00ffc726b5..2574737769 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -185,7 +185,7 @@ OpBindingErrorParam/bindingType BindingType %(DEFAULT_BODY)s if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " id=%%d", value); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, ",%%d", value); } #.FN_PARS Precedence VAL_PTR = &precedence diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c index 4a1057719e..fcd08e582e 100644 --- a/asn1/dop/packet-dop-template.c +++ b/asn1/dop/packet-dop-template.c @@ -274,11 +274,7 @@ void proto_register_dop(void) { /* Register our configuration options for DOP, particularly our port */ -#ifdef PREFERENCE_GROUPING dop_module = prefs_register_protocol_subtree("OSI/X.500", proto_dop, prefs_register_dop); -#else - dop_module = prefs_register_protocol(proto_dop, prefs_register_dop); -#endif prefs_register_uint_preference(dop_module, "tcp.port", "DOP TCP Port", "Set the port for DOP operations (if other" @@ -344,6 +340,6 @@ void prefs_register_dop(void) { tcp_port = global_dop_tcp_port; if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle) - dissector_add("tcp.port", global_dop_tcp_port, tpkt_handle); + dissector_add("tcp.port", tcp_port, tpkt_handle); } |