diff options
author | Gerald Combs <gerald@wireshark.org> | 2007-01-02 22:49:57 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2007-01-02 22:49:57 +0000 |
commit | 53689800e6eff70913b237b513ab5db7ce742da2 (patch) | |
tree | 67e32c486f4dfc1e2784b27c71eb2aadb8a2dd09 /epan/dissectors/packet-3com-njack.c | |
parent | 77694f8b8e69ac9c074e0ff1076bcda0a9a6877d (diff) |
Move epan/crypt-md5.[ch] to epan/crypt. Remove
epan/crypt/airpdcap_md5.[ch]. Fix up whitespace.
svn path=/trunk/; revision=20277
Diffstat (limited to 'epan/dissectors/packet-3com-njack.c')
-rw-r--r-- | epan/dissectors/packet-3com-njack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index d6524fcfed..656844056e 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -218,14 +218,14 @@ static const value_string njack_setresult_vals[] = { { 0, NULL } }; -/* General settings TAB */ +/* General settings TAB */ static const value_string njack_dhcpcontrol[] = { { 0, "Disable" }, { 1, "Enable" }, { 0, NULL } }; -/* End General settings TAB */ +/* End General settings TAB */ /* Port settings TAB */ static const true_false_string tfs_port_state = { @@ -507,7 +507,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset) } #if 0 -#include <epan/crypt-md5.h> +#include <epan/crypt/crypt-md5.h> static gboolean verify_password(tvbuff_t *tvb, const char *password) @@ -551,7 +551,7 @@ verify_password(tvbuff_t *tvb, const char *password) fprintf(stderr, "%02X", digest[i]); /* debugging */ if (digest[i] != *(packetdata + 12 + i)) { is_valid = FALSE; - break; + break; } } fprintf(stderr, " (%d)\n", is_valid); /* debugging */ @@ -645,7 +645,7 @@ static gboolean test_njack(tvbuff_t *tvb) { /* We need at least 'NJ200' + 1 Byte packet type */ - if ( !tvb_bytes_exist(tvb, 0, 6) || + if ( !tvb_bytes_exist(tvb, 0, 6) || g_strncasecmp((const char *)tvb_get_ptr(tvb, 0, 5), "NJ200", 5) ) { return FALSE; } |