Commit Graph

4871 Commits

Author SHA1 Message Date
Ronnie Sahlberg ad861e7827 Moved the value_string for MS country codes from packet-dcerpc-nt.c to
packet-smb.c so that packet-smb-pipe.c can reference this struct as well.

svn path=/trunk/; revision=4947
2002-03-15 08:59:53 +00:00
Tim Potter d3c236be5e Added error messages for invalid name and invalid form size.
svn path=/trunk/; revision=4946
2002-03-15 04:46:43 +00:00
Guy Harris dc9448b2b4 From Andrew Feren: put all of Cisco's OUIs into manuf.tmpl.
svn path=/trunk/; revision=4945
2002-03-14 21:24:40 +00:00
Guy Harris 178a866877 From Andrew Feren: minor patch to correct what looks like a cut and
paste error in an error message.  The wrong filename is being displayed
if manuf can't be opened for writing.

svn path=/trunk/; revision=4944
2002-03-14 21:22:11 +00:00
Ronnie Sahlberg 7791aabe52 Added a value_string for the countreis which have their MS contry code listed
at www.unicode.org and made samr and netlogon use it.

svn path=/trunk/; revision=4943
2002-03-14 10:04:02 +00:00
Ronnie Sahlberg 5906cde27a hf_netlogon_code did not have an hf_[] entry.
some cruft removed from LSA_SECURITY_DESCRIPTOR that is not used anymore since
we call the dissector in packet-smb.c

svn path=/trunk/; revision=4942
2002-03-14 09:19:17 +00:00
Guy Harris e4832c8ca8 Fix a typo.
svn path=/trunk/; revision=4941
2002-03-14 05:46:59 +00:00
Guy Harris ecda579229 Clean up the display of the top-level item for the NT ACE Flags, so that
there's a space after the colon, and so that there's no extra comma at the
end and only one space between the items.

Fix a typo.

svn path=/trunk/; revision=4940
2002-03-14 05:45:16 +00:00
Guy Harris 435545629a Boost the maximum amount of indentation put into text output.
svn path=/trunk/; revision=4939
2002-03-14 05:41:59 +00:00
Gilbert Ramirez aacedfa1f2 When defining the struct select_item, don't create an instance of that
struct, alsoc alled select_item, as it's not used.

svn path=/trunk/; revision=4938
2002-03-14 04:32:35 +00:00
Ronnie Sahlberg 5012aa7acd Make LSA_SECURITY_DESCRIPTOR dissector call dissect_nt_sec_desc()
instead of just displaying it as some hex string.

svn path=/trunk/; revision=4937
2002-03-13 11:19:16 +00:00
Ronnie Sahlberg 40edb36c07 Added mockups for LSA_SECRET and LSA_SECURITY_DESCRIPTOR inside
packet-dcerpc-netlocon.c so that SamDelta_reply packets will be dissected properly.

svn path=/trunk/; revision=4936
2002-03-13 10:52:22 +00:00
Ronnie Sahlberg 7224c4f42a Fixed bug in SAMDELTAS_request.
There is still a bug in the dissection of SAMDELTA_reply but this is due to
LSA_SECRET not being implemented yet which is embedded in one of the
netlogon structures.

svn path=/trunk/; revision=4935
2002-03-13 09:03:28 +00:00
Ronnie Sahlberg 5a801aacfa Update dissect_ndr_nt_STRING so it can also accept FT_BYTES and for that type
display the data as a hexadecimal string.

Update netlogon so that nt and lm challenge response bytes are displayed
in hexadecimal form and not pseudo-ascii

svn path=/trunk/; revision=4934
2002-03-13 07:38:34 +00:00
Guy Harris 7e6d288db3 Give the "prevent/allow medium removal" command the right name (it's
"prevent/allow", not "prevent allow").

svn path=/trunk/; revision=4933
2002-03-13 02:52:21 +00:00
Guy Harris a5e2062503 From Dinesh Dutt: initial dissection of a variable-length CDB.
svn path=/trunk/; revision=4932
2002-03-12 11:30:45 +00:00
Guy Harris b882e373f0 Get rid of unnecessary includes.
svn path=/trunk/; revision=4931
2002-03-12 10:40:01 +00:00
Guy Harris 6327b456db Get rid of the "--enable-snmp" option; instead, use "--with-ucdsnmp".
Make the directory option to "--with-ucdsnmp" optional.  Handle
"--with-ucdsnmp" similar to the way "--with-pcap" is handled.

Get rid of unnecessary #defines in "packet-cops.c".

Get rid of no-longer-necessary include of "dlfcn.h" in "packet-snmp.c".

svn path=/trunk/; revision=4930
2002-03-12 10:37:04 +00:00
Ronnie Sahlberg 385c80e202 Small fix for dissect_ndr_nt_UNICODE_STRING_str() in packet-dcerpc-nt.c
so that NETLOGON will not dump core (since netlogon has these structs as top
level reference pointers)

Addition of full netlogon dissection. Full in the sense as it assumes the idl
is correct and complete.
Many calls and fields are unknown so they get dissected with "unknown long,
 contact ethereal-dev@... if you know what it is".

svn path=/trunk/; revision=4929
2002-03-12 08:16:41 +00:00
Guy Harris c41a4fe415 From Adam Sulmicki: use "proto_tree_add_uint()" rather than
"proto_tree_add_boolean()" for the "hf_eapol_keydes_key_index_indexnum"
field, as it's an FT_UINT8, not an FT_BOOLEAN.

svn path=/trunk/; revision=4928
2002-03-11 08:47:46 +00:00
Guy Harris dec4861d32 In the message at the end that indicates how Ethereal was configured,
refer to "UCD SNMP" rather than just "SNMP".

svn path=/trunk/; revision=4927
2002-03-11 07:02:47 +00:00
Guy Harris 709080b358 Update various README and INSTALL files to reflect the requirement for
UCD SNMP 4.2.2 or later if you want MIB-reading support.

svn path=/trunk/; revision=4926
2002-03-11 02:12:41 +00:00
Guy Harris bb172432d1 "format_var()" returns a "malloc()"ed string, not a "g_malloc()"ed
string; free it with "free()", not "g_free()".

svn path=/trunk/; revision=4925
2002-03-11 01:51:37 +00:00
Guy Harris 7e8c5a1741 If we're linking with the UCD SNMP library, make "format_oid()" append a
display of the symbolic form of the OID.  Remove code that used to do
that outside of "format_oid()".

Export "format_oid()" from "packet-snmp.c" and use it in
"packet-cops.c".

Remove support for CMU SNMP and older versions of UCD SNMP from
"packet-cops.c", as it has been removed from the rest of Ethereal.

svn path=/trunk/; revision=4924
2002-03-11 01:48:08 +00:00
Guy Harris 9f8d089e2e Put "extern" in front of the function declaration.
Update Gerald's e-mail address.

svn path=/trunk/; revision=4923
2002-03-11 01:42:58 +00:00
Guy Harris d9a00fc228 The "val_len" member of a "struct variable_list" should be set to the
length of the variable's value, in bytes, not the length of the BER
encoding of that variable's value.  The latter setting means it won't be
correct for object IDs.

svn path=/trunk/; revision=4922
2002-03-11 01:40:28 +00:00
Ronnie Sahlberg 81f29c2ce5 Final patch in preparing for NETLOGON dissector.
Exported some functions from packet-dcerpc-samr.c and added two
more functions the netlogon dissector will need.

svn path=/trunk/; revision=4921
2002-03-11 00:28:21 +00:00
Ronnie Sahlberg 7900235dad Move the STRING dissector to packet-dcerpc-nt.c and add one more parameter
to make it more similar to the UNICODE_STRING dissector.

svn path=/trunk/; revision=4920
2002-03-11 00:15:20 +00:00
Ronnie Sahlberg f060b0c68c Rename samr_dissect_LOGON_HOURS() to dissect_ndr_nt_LOGON_HOURS() and
export it to other modules.
NETLOGON dissector (and others) will need this function.

svn path=/trunk/; revision=4919
2002-03-11 00:00:15 +00:00
Ronnie Sahlberg 853654f2f3 Moved dissect_ndr_nt_NTTIME() from packet-dcerpc-samr.c to packet-dcerpc-nt.c
since this function will be used by other NT services as well such as NETLOGON.

svn path=/trunk/; revision=4918
2002-03-10 23:24:48 +00:00
Guy Harris 37dd5f340c Remove code to show the presence, and version number, of the CMU SNMP
library, as we no longer support linking with that library.

svn path=/trunk/; revision=4917
2002-03-10 23:19:44 +00:00
Guy Harris bdbb567087 Use "ds_set_int()", not "snmp_set_suffix_only()", to set the "print
suffixes only" setting.

svn path=/trunk/; revision=4916
2002-03-10 23:17:00 +00:00
Ronnie Sahlberg 024f90f4fe Absolute and Relative times were swapped. Also add comment that there seems
to be an unknown special time constant : 0x40000000 00000000 that we dont know
yet what it means.

svn path=/trunk/; revision=4915
2002-03-10 23:13:04 +00:00
Guy Harris d50103f67f Use the "sprint_realloc_" routines in UCD SNMP 4.2.2 and later, rather
than the "sprint_" routines in UCD and CMU SNMP; the latter routines
have no bounds checking, and if you use them you cannot protect against
buffer overflows.

As we now require UCD SNMP 4.2.2 or later:

	1) we no longer need code to support CMU SNMP;

	2) we no longer need code to work around problems with UCD SNMP
	   4.1.1;

and, as we no longer use the "sprint_" routines, we no longer need code
to work around the changed API and ABI of those routines in some
nonstandard versions of the UCD SNMP library.

svn path=/trunk/; revision=4914
2002-03-10 22:18:12 +00:00
Guy Harris ce5c18736d Don't use "proto_tree_add_string_format()" when
"proto_tree_add_string()" will suffice.

svn path=/trunk/; revision=4913
2002-03-10 22:04:25 +00:00
Guy Harris bf1c8de997 Use "dissect_ndr_nt_UNICODE_STRING_str()", not
"dissect_ndr_nt_UNICODE_STRING_string()", in
"samr_dissect_connect2_server()"; that eliminates an unnecessary extra
level of protocol tree.

That removes the last call to "dissect_ndr_nt_UNICODE_STRING_string()";
eliminate that routine.

In "dissect_ndr_nt_UNICODE_STRING()", initially create the subtree with
the name of the field as a string, so that if an exception is thrown
before the name is set, the subtree won't show up as blank when
displayed or printed.  Also pass in the name to "dissect_ndr_pointer()",
so the same happens for subtrees below it.  Append only the string data,
not its name, to items up the tree, as the name was put in when the item
was created.  Also, when adding a colon before the string, put a space
after the colon, as is done elsewhere in Ethereal.

When appending additional strings, put the blank before the new string,
not after it.

In "dissect_ndr_nt_STRING()", put the subtree into the string with the
name of the field, rather than just "String".  Pass in that name to
"dissect_ndr_pointer()", so subtrees below it get a name when they're
initially created.

Get rid of colons in the name string passed to "dissect_ndr_pointer()"
in some calls.  Supply a non-null name string in more calls to
"dissect_ndr_pointer()", and fix some calls to pass in the name of the
field being handed to "dissect_ndr_pointer()".

There's no need to fetch the entire "header_field_info" structure for a
protocol field in order to get the field's name - just use
"proto_registrar_get_name()" to get the name.

Use a length of -1, not 0, when creating a subtree whose length will be
set when the dissection of the items under the subtree is complete; that
way, if an exception is thrown while dissecting the items - which means
the item goes past the end of the tvbuff - the item will refer to all
data to the end of the tvbuff, rather than referring to nothing.

Fix a typo in the name of the "hf_samr_unknown_string" field.

svn path=/trunk/; revision=4912
2002-03-10 21:30:11 +00:00
Guy Harris 2223587585 Catch another "(NULL pointer)%s" we didn't catch with the previous
checkin.

svn path=/trunk/; revision=4911
2002-03-10 03:11:10 +00:00
Guy Harris b27f1ac14d Put a space between "(NULL pointer)" and the name of the item being
dissected, just as is done with "(duplicate PTR)".

svn path=/trunk/; revision=4910
2002-03-10 03:09:48 +00:00
Guy Harris dc2f822c01 Register the heuristic SMPP dissector with X.25.
svn path=/trunk/; revision=4909
2002-03-10 03:08:31 +00:00
Guy Harris 7d1dfae50d Initialize the "tm_isdst" field of a "struct tm" to -1 before passing it
to "mktime()".

svn path=/trunk/; revision=4908
2002-03-10 03:07:16 +00:00
Guy Harris c9c0a8373b Initialize the "tm_isdst" field of a "struct tm" to -1 before passing it
to "mktime()".

svn path=/trunk/; revision=4907
2002-03-10 01:02:06 +00:00
Guy Harris 9f6c9ba35b For Reverse ARP replies, the *target* hardware and protocol addresses
contain the interesting "XXX is at YYY" data; put that into the Info
column.  Thanks to Andreas Sikkema for catching this.

svn path=/trunk/; revision=4906
2002-03-10 00:05:20 +00:00
Guy Harris 7d77975a14 Sigh. Tcpdump cannot handle capture files with a snapshot length of 0,
as BPF filters return either 0 if they fail or the snapshot length if
they succeed, and a snapshot length of 0 means success is
indistinguishable from failure and the filter expression would reject
all packets.

Now that a snapshot length of 0, inside Ethereal, means "snapshot length
unknown", we have to, when opening a libpcap file for output, make the
snapshot length some non-zero value.  We make it WTAP_MAX_PACKET_SIZE,
in case some program uses the snapshot length as a buffer size.  (That
doesn't help if there are packets with more than 65535 bytes of data; if
there are, we'd need to raise WTAP_MAX_PACKET_SIZE just to make those
files readable in Ethereal in any case.)

svn path=/trunk/; revision=4905
2002-03-09 23:07:26 +00:00
Guy Harris 5690265087 Fix some "proto_tree_add_uint()" and "proto_tree_add_uint_hidden()"
calls that passed TRUE or FALSE, rather than an integer value, as the
last argument.

A SOCKS command is one byte, so make the "socks.command" field an
FT_UINT8.

svn path=/trunk/; revision=4904
2002-03-09 22:54:27 +00:00
Guy Harris f4ee24a894 Use -1, rather than 0, as the length when creating an item with a
subtree under it, so that if an exception is thrown while we're
dissecting the items in the subtree, it runs to the end of the tvbuff
(as, if an exception is thrown, it means the item should cover the stuff
in the tvbuff *and* stuff beyond it).

svn path=/trunk/; revision=4903
2002-03-09 22:46:29 +00:00
Guy Harris 688ad377fe From Jouni Malinen: fix bugs in 802.11 authentication frame dissection.
svn path=/trunk/; revision=4902
2002-03-09 22:41:51 +00:00
Guy Harris eb62c04d71 No need to put ", N byte{s} at offset O" into the Info column twice;
once is enough.

svn path=/trunk/; revision=4901
2002-03-09 02:12:47 +00:00
Guy Harris 828df9d18f Fix a comment.
svn path=/trunk/; revision=4899
2002-03-07 21:46:06 +00:00
Guy Harris ab0302ea1b Fix a typo - IFT_ISO88025 is 9, not 8.
svn path=/trunk/; revision=4898
2002-03-07 21:31:12 +00:00
Guy Harris 0070f850df Bug fix from Marc Milgram: occasionally the VMS parser would read off
the end of string, and find some old data that looked useful, but was
bogus for the frame.

svn path=/trunk/; revision=4897
2002-03-07 21:08:33 +00:00