Wireshark-commits: [Wireshark-commits] master 5981dab: Declare read_keytab_file() in epan/dissector
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5981dab95b87ffd629d6ab6a45289af60c3d3b27
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
5981dab by Guy Harris (guy@xxxxxxxxxxxx):
Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.
Don't throw its declaration in file.h, as it's not defined in file.c.
Instead, include it in epan/dissectors/packet-kerberos.h and include
that wherever read_keytab_file() is called.
Yes, that means you also have to include <epan/asn1.h> and, therefore,
you have to include <epan/packet.h>. Yes, that should be cleaned up,
perhaps by splitting the Kerberos support code into "stuff that handles
encryption keys without any reference to dissection" and "stuff that
does dissection-related work".
Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef
Reviewed-on: https://code.wireshark.org/review/6210
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 445ddc8 Lua: FieldInfo '==' check isn't really equality
adds 5981dab Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.
Summary of changes:
asn1/kerberos/packet-kerberos-template.c | 3 ---
asn1/kerberos/packet-kerberos-template.h | 3 +++
epan/dissectors/packet-kerberos.c | 9 +++------
epan/dissectors/packet-kerberos.h | 5 ++++-
file.h | 5 -----
tfshark.c | 6 ++++++
tshark.c | 5 +++++
ui/gtk/main.c | 5 +++++
wireshark-qt.cpp | 6 ++++++
9 files changed, 32 insertions(+), 15 deletions(-)