diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-08-01 23:34:47 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-08-01 23:34:47 +0000 |
| commit | 2df54da6e2b70777154d38ce3923093568358285 (patch) | |
| tree | 4bdb887d40a0a5fee501c0bd30f31388019fbe32 /epan/dissectors/packet-frame.c | |
| parent | 6ae3372687957dfbda6352598aee00e84f83f7da (diff) | |
Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.
Protect a bunch of the crypt header files from multiple inclusion.
svn path=/trunk/; revision=51100
Diffstat (limited to 'epan/dissectors/packet-frame.c')
| -rw-r--r-- | epan/dissectors/packet-frame.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 0eccdba794..42f0694fd6 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -30,13 +30,15 @@ #endif #include <glib.h> + +#include <wsutil/md5.h> + #include <epan/packet.h> #include <epan/show_exception.h> #include <epan/timestamp.h> #include <epan/prefs.h> #include <epan/tap.h> #include <epan/expert.h> -#include <epan/crypt/md5.h> #include "packet-frame.h" @@ -80,7 +82,7 @@ static int hf_frame_pack_preamble_error = -1; static int hf_frame_pack_symbol_error = -1; static int hf_frame_wtap_encap = -1; static int hf_comments_text = -1; -static int hf_frame_num_p_prot_data = -1; +static int hf_frame_num_p_prot_data = -1; static gint ett_frame = -1; static gint ett_flags = -1; @@ -765,13 +767,13 @@ proto_register_frame(void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, }; - + static hf_register_info hf_encap = { &hf_frame_wtap_encap, { "Encapsulation type", "frame.encap_type", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}; - + static gint *ett[] = { &ett_frame, &ett_flags, @@ -790,9 +792,9 @@ proto_register_frame(void) int encap_count = wtap_get_num_encap_types(); value_string *arr; int i; - - hf_encap.hfinfo.strings = arr = g_new(value_string, encap_count+1); - + + hf_encap.hfinfo.strings = arr = g_new(value_string, encap_count+1); + for (i = 0; i < encap_count; i++) { arr[i].value = i; arr[i].strptr = wtap_encap_string(i); |