diff options
| author | Richard Sharpe <sharpe@ns.aus.com> | 2004-01-02 06:35:45 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@ns.aus.com> | 2004-01-02 06:35:45 +0000 |
| commit | 507a8e2bbb01e1a649a894d0a8fe4d1f9cab2536 (patch) | |
| tree | 91dc81c8e88ed570cfe9f0fe13d8c5b5753c8eb4 /packet-smb.c | |
| parent | 595f0c3aaf9a9219e51000bcd6cc68da1132f1c5 (diff) | |
| download | wireshark-507a8e2bbb01e1a649a894d0a8fe4d1f9cab2536.tar.gz wireshark-507a8e2bbb01e1a649a894d0a8fe4d1f9cab2536.tar.bz2 wireshark-507a8e2bbb01e1a649a894d0a8fe4d1f9cab2536.zip | |
Revert a small change I made a day or so ago because Guy has captures that
show that the short name can be in ASCII if flags 2 says ASCII.
svn path=/trunk/; revision=9519
Diffstat (limited to 'packet-smb.c')
| -rw-r--r-- | packet-smb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-smb.c b/packet-smb.c index bd066d4814..993221ef88 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.381 2003/12/30 04:38:20 sharpe Exp $ + * $Id: packet-smb.c,v 1.382 2004/01/02 06:35:45 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12806,7 +12806,7 @@ dissect_4_3_4_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, COUNT_BYTES_SUBR(1); /* short file name, it is always in UNICODE, it seems */ - sfn = get_unicode_or_ascii_string(tvb, &offset, TRUE, &sfn_len, FALSE, TRUE, bcp); + sfn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &sfn_len, FALSE, TRUE, bcp); CHECK_STRING_SUBR(sfn); proto_tree_add_string(tree, hf_smb_short_file_name, tvb, offset, 24, sfn); |