Commit Graph

101 Commits

Author SHA1 Message Date
Bill Meier 695aff26f9 (Minor) Rename a few variables in the global namespace to be a bit more unique;
Also: rename additional (static) variables to be consistent with the above renames.

svn path=/trunk/; revision=34412
2010-10-07 21:23:36 +00:00
Bill Meier 10ffd14b8f Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)
svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Anders Broman aaa917be72 remove check_col
svn path=/trunk/; revision=32089
2010-03-03 13:52:17 +00:00
Jeff Morriss 1bb3148350 From Gregor Jasny via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4073 :
This patch adds the functionality to decode short capabilies.

svn path=/trunk/; revision=30391
2009-10-07 19:46:28 +00:00
Jeff Morriss ef267649c5 One of those if(check_col)'s was hiding another condition (should have been looking closer). Fixes the fuzz failure in bug 4074.
svn path=/trunk/; revision=30248
2009-10-02 13:04:00 +00:00
Jeff Morriss 469012ca87 From Gregor Jasny via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4065 :
Expose the FNAC family and subtype via a hf_ value so you can filter for
specific messages.

From me:

Re-arrange the code a bit: put dissect_aim() at the bottom near the
registration functions.  Remove unnecessary forward declarations.

Reindent a bunch.

Remove a couple check_col() calls; leave one in since it protects several
other calls.

svn path=/trunk/; revision=30243
2009-10-01 19:19:58 +00:00
Kovarththanan Rajaratnam 8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Kovarththanan Rajaratnam 6110a96f68 Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
Kovarththanan Rajaratnam 4b6090e576 Don't guard col_set_str (COL_INFO) with col_check
svn path=/trunk/; revision=29342
2009-08-09 07:01:26 +00:00
Kovarththanan Rajaratnam e971354a54 Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
Stig Bjørlykke 4d8dd01e8e Changed flags_set_truth -> tfs_set_notset
svn path=/trunk/; revision=28989
2009-07-07 14:54:15 +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
Stig Bjørlykke fc3f1b5283 From Artem Tamazov (bug 3472):
Save/Restore pinfo->private_data when used.

svn path=/trunk/; revision=28412
2009-05-19 17:16:14 +00:00
Jaap Keuter 40ab5fa84e From Gregor Jasny:
Merge onlinebuddy and userclass stuff from official Oscar protocol documentation.

svn path=/trunk/; revision=26971
2008-12-11 23:00:01 +00:00
Jaap Keuter 73c044fef8 From Gregor Jasny:
I've extended the AIM dissector with the information available from http://dev.aol.com/aim/oscar .
I've verified most of the additions by sniffing my iChat (OSX 10.4) data traffic.

svn path=/trunk/; revision=26813
2008-11-20 07:02:34 +00:00
Bill Meier b52d95d591 #include <emem.h> not req'd
svn path=/trunk/; revision=26091
2008-08-26 01:28:50 +00:00
Jaap Keuter 6198ef668f From Alex Turbov:
Function dissect_aim_tlv_value_uint32 have consumed 24 bits instead of 32 to
obtain a value.

svn path=/trunk/; revision=25752
2008-07-16 05:33:25 +00:00
Jaap Keuter a338ee2d4d From Alex Turbov:
AIM 'New Connection' packet dissector have incorrect size for details pane of
TLV 0x14. Actual size is 4 (not 2).

svn path=/trunk/; revision=25751
2008-07-16 05:17:32 +00:00
Bill Meier ceebccced4 Fix some warnings reported by gcc -Wshadow ...
svn path=/trunk/; revision=25607
2008-06-26 00:16:58 +00:00
Jaap Keuter 734f20160a From Alex Turbov:
Show result code of last SSI operation with a human readable description.

svn path=/trunk/; revision=25375
2008-05-23 19:07:46 +00:00
Anders Broman 840a048b7f Implement some of the minor possible speed improvment patches.
svn path=/trunk/; revision=23192
2007-10-15 20:11:25 +00:00
Stephen Fisher aa4d4f727c From Sebastien Tandel:
Fixes for warnings


svn path=/trunk/; revision=21164
2007-03-24 07:33:25 +00:00
Stephen Fisher a058ef7325 Make IPv4 addresses in AIM TLV data human readable.
svn path=/trunk/; revision=20141
2006-12-17 05:37:18 +00:00
Ronnie Sahlberg 2d1bb39121 change the signature for the get_pdu_len() function pointer passed to tcp_dissect_pdus() to also include a packet_info pointer.
there are many reasons why some protocols actually need to be able to access the pinfo structure while determining the pdu size



svn path=/trunk/; revision=19751
2006-10-31 09:29:07 +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 f331077a60 waste a couple of bytes per tcp conversation and make the tree for acked_packets (i.e. packets that have interesting tcp properties such as being retransmissions etc) hang off the per conversation tcpd struct instead of being global.
while this should improve performance by unmeasurably little it does have the sideeffect that once we finish the rewrite   tcp analysis might actually work and work well even for tcp over tcp tunnelling. 

this also means that if you include packet-tcp.h   you also need to include emem.h .




svn path=/trunk/; revision=17681
2006-03-20 10:52:53 +00:00
Ronnie Sahlberg ed9d4d16c7 potential dereference of null pointer
coverity cid 39


svn path=/trunk/; revision=17512
2006-03-07 21:18:08 +00:00
Ronnie Sahlberg 213ef19c87 From Jelmer V AIM bugfix
Hi,

The attached patch fixes the name of the version field, which I
previously mistook for an authorization cookie (which is in fact in a
TLV that follows this field).



svn path=/trunk/; revision=16711
2005-12-07 00:27:17 +00:00
Ronnie Sahlberg ec3ab9ec3e rename ep_tvb_get_string() to tvb_get_ephemeral_string() asnd update the documentation in README.developer
svn path=/trunk/; revision=15270
2005-08-10 13:41:13 +00:00
Jörg Mayer 7b2ff03d8c Fix more "no previous declaration" warnings
svn path=/trunk/; revision=15169
2005-08-02 04:31:42 +00:00
Ronnie Sahlberg 835df3a1d2 convert some uses of tvb_get_string() to ep_tvb_get_string()
there was at least one obvious memleak in one of the uses of tvb_get_string()



svn path=/trunk/; revision=15027
2005-07-24 02:43:41 +00:00
Anders Broman 43c0144b8e From Ilya Konstantinov :
A patch to the AIM dissector to support Client Auto Response messages. I still don't know the meaning of all the fields as they weren't all mapped but this patch decodes all the important ones.

svn path=/trunk/; revision=14911
2005-07-13 05:06:38 +00:00
Guy Harris ab797734dd Get rid of the private "my_match_strval()" routine in many dissectors;
add a "match_strval_idx()" routine that does the same thing, and have
"match_strval()" call it.

Make those routines, and "val_to_str()", return a "const" pointer. 
Update dissectors as necessary to squelch compiler warnings produced by
that.

Use "val_to_str()" rather than using "match_strval()" and then, if the
result is null, substituting a specific string.  Clean up some other
"match_strval()"/"val_to_str()" usages.

Add a null pointer check in the NDPS dissector's "attribute_value()"
routine, as it's not clear that "global_attribute_name" won't be null at
that point.

Make some global variables in the AFS4INT dissector local.

Make some routines not used outside the module they're in static.

Make some tables "static const".

Clean up white space.

Fix Gerald's address in some files.

svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
Gerald Combs 131ab36a32 In tvb_get_string(), throw an exception if our length is less than zero.
Add a message block length check to the AIM dissector.

svn path=/trunk/; revision=13955
2005-03-28 15:55:47 +00:00
Guy Harris 3778ca99c1 If a given TLV type isn't found in an aim_tlv table, just use "Unknown"
as the description - some aim_tlv tables have NULL in the end-of-table
entry.

For those that don't, replace "Unknown" with NULL; "Unknown" is now
redundant.

svn path=/trunk/; revision=13084
2005-01-17 08:13:02 +00:00
Guy Harris 51014ac699 Use "tvb_format_text()" to extract and format the buddy name string in
the top-level item for the buddy name, rather than extracting the string
into a mallocated buffer (and not freeing it...).

Put all the code to put stuff into the protocol tree inside "if(tree)".

svn path=/trunk/; revision=12950
2005-01-05 09:41:20 +00:00
Ulf Lamping 5a89cfc00b Again, some warnings removed.
svn path=/trunk/; revision=12834
2004-12-25 18:35:21 +00:00
Gerald Combs f1857c511c Terminate value_strings with "{ 0, NULL }" instead of "{ 0, "Unknown" }".
Otherwise, "tethereal -G values" fails on some platforms.

svn path=/trunk/; revision=12701
2004-12-09 19:52:59 +00:00
Guy Harris 02c9bf57f4 Put the name, as well as the value, of the family and subfamily fields
into the protocol tree item that contains them.

svn path=/trunk/; revision=12379
2004-10-23 08:37:21 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Guy Harris 285066ac5b From Jelmer Vernooij:
- Dissect ICQ TLV values
- Dissect channel 1 and channel 2 messages correctly in Oscar (required
  for dissecting direct connections)

svn path=/trunk/; revision=12072
2004-09-23 17:40:36 +00:00
Guy Harris 8dedbeed1c From Jelmer Vernooij:
- Dissect the DC (Direct Connection) info structure
 - Dissect the complete buddy icon family (you can now save buddy
   icons as .JPG's/.PNG's directly from the capture using the "Export
   selected bytes..." option!)
 - Add a function that dissects a sequence of TLV's instead of having
   while() loops all over the place.

svn path=/trunk/; revision=12063
2004-09-22 08:04:40 +00:00
Guy Harris 94e550fe69 From Jelmer Vernooij:
Remove some code duplication from the Oscar dissector (reduces
	the number of lines by 500) by providing a custom registration
	function for oscar families (aim_init_family).  This also fixes
	a number of issues with column names.

	Add minor updates such as adding support for the Capability Info
	TLV on users.

svn path=/trunk/; revision=12060
2004-09-21 08:01:29 +00:00
Guy Harris 9a1ec8eb0b From Jelmer Vernooij:
- Support client capabilities list
	- Fix incorrect TLV usage

svn path=/trunk/; revision=12040
2004-09-18 06:42:16 +00:00
Guy Harris 431d187367 From Jelmer Vernooij: get rid of some unused tables.
svn path=/trunk/; revision=12030
2004-09-17 09:37:14 +00:00
Guy Harris 6bc5ac3949 from Thomas Boehne: don't put code before a declaration - that's a
GCCism.

De-@ify Marten Svantesson's e-mail address.

svn path=/trunk/; revision=12028
2004-09-17 09:30:41 +00:00
Guy Harris b3360018b5 From Jelmer Vernooij:
- Support for more generic TLV's
- Support for two more SNAC families: email and sst
- Support for extended status (as used by iChat)
- Use correct TLV in SSI RightsInfo
- Dissect and handle FNAC flags field correctly

svn path=/trunk/; revision=12022
2004-09-17 02:02:04 +00:00
Ulf Lamping d530bd4e14 Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions.
I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences.

Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect.

If you encounter any mistakes I've made here, please let me know...

svn path=/trunk/; revision=11784
2004-08-21 09:02:52 +00:00
Guy Harris c08032765d From Jelmer Vernooij: add support for some more TLVs and another SNAC.
svn path=/trunk/; revision=11577
2004-08-01 22:55:53 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00