Commit graph

24 commits

Author SHA1 Message Date
Kovarththanan Rajaratnam
24ca3c44c9 Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29341
2009-08-09 06:47:24 +00:00
Stig Bjørlykke
da47d6113a From Joakim Wiberg via bug 3670:
This patch correctes serveral minor things.

1. Adds decoding of generic services to classes that have a separate dissect
   function.
2. Adds new error codes.
3. Adds new CIP objects.
4. Extends the VendorID list.

svn path=/trunk/; revision=28951
2009-07-06 13:59:09 +00:00
Stig Bjørlykke
7f1f48a8b2 From Joakim Wiberg via bug 3103:
Various improvements to the CIP and ENIP dissectors.

From me:
Updated to latest trunk changes.

svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Stig Bjørlykke
ff7ff86249 More hf_register_info related cleanup.
svn path=/trunk/; revision=28834
2009-06-24 03:03:25 +00:00
Stig Bjørlykke
1733596a6f Revert changes committed by an accident.
Will be committed again later.

svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
Stig Bjørlykke
b3e10e559a Moved setting of length2 to make it always set.
svn path=/trunk/; revision=28777
2009-06-19 05:45:40 +00:00
Stig Bjørlykke
b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Bill Meier
c544c20956 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27050
2008-12-18 19:08:49 +00:00
Bill Meier
a8f30cbca1 Fix some typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27037
2008-12-17 17:23:37 +00:00
Jaap Keuter
ddce920fd8 Let the dissectors fill the Protocol and Info columns by calling the even when tree == NULL.
svn path=/trunk/; revision=26531
2008-10-23 21:01:04 +00:00
Bill Meier
b52d95d591 #include <emem.h> not req'd
svn path=/trunk/; revision=26091
2008-08-26 01:28:50 +00:00
Bill Meier
aac2a36133 #include <prefs.h> not req'd; Fix indentation to be conistent
svn path=/trunk/; revision=26086
2008-08-25 20:41:05 +00:00
Jaap Keuter
f9792481d2 Replace custom data presentation with native one.
svn path=/trunk/; revision=25965
2008-08-08 21:39:25 +00:00
Jaap Keuter
c3914ce6d5 From Ryan Wamsley:
For the EtherNet/IP protocol (ENIP), display text for Additional Status in the
Forward Open Response packet.

svn path=/trunk/; revision=25865
2008-07-30 06:07:47 +00:00
Bill Meier
931cc922a1 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25305
2008-05-15 01:44:53 +00:00
Gerald Combs
b7d8f269b2 Make sure we don't try to allocate a negative number.
svn path=/trunk/; revision=23820
2007-12-10 03:12:11 +00:00
Anders Broman
1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Graham Bloice
0e5819e547 Permit decoding of individual service errors + removal of a few lines consisting of just whitespace
svn path=/trunk/; revision=22599
2007-08-23 09:26:01 +00:00
Bill Meier
211cdda386 From Ryan Wamsley: Add Connection Configuration Object support to EtherNet/IP dissector
svn path=/trunk/; revision=20897
2007-02-22 03:21:26 +00:00
Ronnie Sahlberg
feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Ronnie Sahlberg
f6d36d20d0 ememify cip
svn path=/trunk/; revision=15353
2005-08-14 05:54:54 +00:00
Ulf Lamping
0dc9fb3d4a various code cleanup:
-use g_snprintf instead of sprintf and snprintf
-use g_strdup_printf where appropriate
-remove #include "snprintf.h" (as only g_snprintf should be used)
-replace some more alloc/realloc/calloc/free with their glib pendants

svn path=/trunk/; revision=15264
2005-08-08 18:50:39 +00:00
Guy Harris
9cb86fda9c Squelch various signed vs. unsigned warnings by:
making pointers to byte data be "guint8 *" rather than "char *",
	and making buffers holding byte data arrays of "guint8" rather
	than arrays of "char";

	making pointers to text strings "char *" rather than "guchar *";

	appropriately casting pointers (cast to "guint8 *" when passing
	to routines expecting "guint8 *" or when assigning to "guint8
	*");

	making port-number preferences "guint";

	making enum preferences "gint";

	making hf_ variables "int".

Clean up white space.

svn path=/trunk/; revision=14884
2005-07-09 00:53:17 +00:00
Guy Harris
12d310a458 From Magnus Hansson:
move CIP protocol to own dissector
	clean up code and fix variable names
	add more info to info column
	fixed decoding of embedded messages in Unconnected send and
	    Multiple Service packets
	add more info to path decoding
	add more filter options/clean up
	complete CIP vendor codes

svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00