Commit graph

37558 commits

Author SHA1 Message Date
Bill Meier
126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +00:00
Bill Meier
4c9bb81ad7 Remove some unneeded code form proto_reg_handoff...();
Comment out an unused #define;
Do some whitespace cleanup ("4 space tabs" ==> spaces).

svn path=/trunk/; revision=39425
2011-10-15 15:21:35 +00:00
Martin Mathieson
db8cf1b15b Make make_menu_actions() static again, but protect with
#ifdef HAVE_LUA_5_1
#endif
As per discission on wireshark-dev, this function might later see wider use, so don't add 'lua' to the function name.

svn path=/trunk/; revision=39424
2011-10-14 16:03:11 +00:00
Jeff Morriss
17f77e0597 Build generate_export when building 'all' on Windows too.
svn path=/trunk/; revision=39423
2011-10-14 13:26:32 +00:00
Martin Mathieson
745496c742 make_menu_items() isn't called without LUA support, so can't be static.
svn path=/trunk/; revision=39422
2011-10-14 11:03:29 +00:00
Jeff Morriss
b21b495f9f Don't generate the conformance file for exported types when building the
dissector; instead built it only when the separate target (generate_export)
is built.

Built generate_export when building "all".

This prevents the exp_*.cnf files from being regenerated each time another one
of the exp_*.cnf files (which the current dissector depends on) has changed
(despite the fact that the exported types does not depe

Also fix the CLEANFILES definition so it actually cleans things.

svn path=/trunk/; revision=39421
2011-10-14 10:22:01 +00:00
Stig Bjørlykke
5ae2712e9a Removed unused old_offset in mapi_dissect_struct_request.
svn path=/trunk/; revision=39420
2011-10-14 08:39:23 +00:00
Stig Bjørlykke
967b9086aa Removed newencap as it's unused.
svn path=/trunk/; revision=39419
2011-10-14 08:22:16 +00:00
Guy Harris
180a4725d2 From Iain Arnell:
Adds additional header fields for AJP13 request attributes.

svn path=/trunk/; revision=39418
2011-10-14 08:00:21 +00:00
Guy Harris
e191aae350 From Iain Arnell:
The existing code adds all ajp13 header names to the protocol tree as
ajp13.hval; header values aren't added at all. The original intention
appears to have been to add header names as ajp13.hname and their values
as ajp13.hval. Even if implemented properly, this doesn't allow
filtering properly (unless there's some funky syntax I'm not aware of).

This patch uses dedicated header fields for those request/response
headers that are explicitly defined in AJP13 protocol. Undefined headers
names and their values are added as a single ajp13.additional_header in
easily matched "Header-Name: Value" string format.

svn path=/trunk/; revision=39417
2011-10-14 07:52:11 +00:00
Guy Harris
4b8267116e From Iain Arnell:
AJP13 uses a string size of 0xFFFF to indicate a null string;
ajp13_get_nstring function would incorrectly return invalid data.

In disaply_req_body function, the content_length really is the length of
the data; there is no trailing null.

svn path=/trunk/; revision=39416
2011-10-14 07:45:22 +00:00
Stig Bjørlykke
7fe5caa929 Added support for SIO-Label from draft-zeilenga-email-seclabel-04.
svn path=/trunk/; revision=39415
2011-10-14 07:44:50 +00:00
Stig Bjørlykke
df5adb7f3c Export MessageSecurityLabel_PDU.
svn path=/trunk/; revision=39414
2011-10-14 07:44:40 +00:00
Stig Bjørlykke
60edd8a0a8 Export ESSSecurityLabel_PDU.
svn path=/trunk/; revision=39413
2011-10-14 07:44:20 +00:00
Anders Broman
70dd953336 {0, NULL} is required as the last value_string array entry: value_string VALS_GROUP_NAMES[]
svn path=/trunk/; revision=39412
2011-10-14 06:19:37 +00:00
Anders Broman
b6c8373fd6 From Rob Kruciak:
Add a port preference setting.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6430

svn path=/trunk/; revision=39411
2011-10-14 05:42:37 +00:00
Anders Broman
5902e7fa06 From Tony Trinh:
Patch to fix/restore Lua menu functionality

Remove unnecessary Lua placeholder in UI definition for the main menu bar

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6405

svn path=/trunk/; revision=39410
2011-10-14 05:08:39 +00:00
Michael Tüxen
59891bb9e4 Use g_list_first() to find the first element in the list.
svn path=/trunk/; revision=39409
2011-10-13 20:13:52 +00:00
Anders Broman
c20e6b8a25 Dissect NSAP encoded transport layer address.
svn path=/trunk/; revision=39408
2011-10-13 19:41:34 +00:00
Stig Bjørlykke
022929724b Added some Lua pinfo fields:
ethertype, fragmented, in_error_pkt, match_uint and match_string.

svn path=/trunk/; revision=39407
2011-10-13 19:39:35 +00:00
Michael Tüxen
2579d4f5d0 Make clang on Mac OS X 10.7.2. happy.
svn path=/trunk/; revision=39406
2011-10-13 19:04:25 +00:00
Anders Broman
c8bbccfd2a From Pascal Quantin.
a follow-up patch that fixes the dissection of the Generic NAS transport messages.

svn path=/trunk/; revision=39405
2011-10-13 18:22:55 +00:00
Chris Maynard
c55d00576e Delete unused hf_ entries found by checkhf.pl.
svn path=/trunk/; revision=39404
2011-10-13 15:49:45 +00:00
Anders Broman
b768a63583 From Christophe PALETOU:
Add dissector for public protocol Flight Message Transfer Protocol (FMTP)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6433

- Modified and moved col_add_fstr outside of if(tree)
- call data dissector for data
- use ENC_BIG_ENDIAN
- minor cleanups

svn path=/trunk/; revision=39403
2011-10-13 06:06:53 +00:00
Anders Broman
e925a84e7e From Horaci Macias:
Parse User-to-User header 
http://tools.ietf.org/html/draft-ietf-cuss-sip-uui-02

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6432

svn path=/trunk/; revision=39402
2011-10-13 05:15:50 +00:00
Bill Meier
65547923b1 Fix a typo
svn path=/trunk/; revision=39401
2011-10-13 02:05:00 +00:00
Bill Meier
47c7565571 Initial a variable to prevent a (not actualy valid) compiler warning:
'inst_count' may be used uninitialized in this function.

svn path=/trunk/; revision=39400
2011-10-13 01:24:43 +00:00
Bill Meier
de7561dc53 Fix a "set but not used" compiler warning.
svn path=/trunk/; revision=39399
2011-10-13 01:17:51 +00:00
Bill Meier
eadae8da5f Fix a "defined but not used" compiler warning.
svn path=/trunk/; revision=39398
2011-10-13 01:09:17 +00:00
Bill Meier
45b2da0e44 Mark some function parameters as unused (_U_); Fixes compiler warnings.
svn path=/trunk/; revision=39397
2011-10-13 00:16:54 +00:00
Bill Meier
a2e8e1cdcd From Benjamin Stocks (with some work by Michael Mann): "CIP Motion" dissector;
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5929

From me:
packet-cipmotion.c:
  FT_BOOLEAN fields with bitmasks need a bit-fieldwidth in the hf[] entry 'display' field;
  Define attribute_size as guint32 since it has to store guint8*guint16;
  Use ENC_NA as encoding arg in proto_tree_add_item() for FT_BYTES field types;
  Remove trailing whitespace from lines;
  Other minor cleanup and reformatting.

packet-enip.c:
  Use ENC_NA as encoding arg in proto_tree_add_item() for FT_BYTES field types;

svn path=/trunk/; revision=39396
2011-10-13 00:00:52 +00:00
Anders Broman
5b34fd161d From Pascal Quantin.
Add dissection of Location services messages
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6454

svn path=/trunk/; revision=39395
2011-10-12 21:17:23 +00:00
Anders Broman
62ba07a8fc From Tobias Witek:
This patch extends the ATM parser so as to allow GPRS NS traffic encapsulated
in ATM AAL5.

Additionally, added support for this into the 'Meta' dissector.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6447

svn path=/trunk/; revision=39394
2011-10-12 18:57:50 +00:00
Chris Maynard
92e7adcfc9 When looping, be sure to iterate over the right number of elements. Fixes Coverity OVERRUN_STATIC errors reported in CID's 1305 and 1306. Also, fix the 3 offending display filter names discovered with tools/checkfiltername.pl.
svn path=/trunk/; revision=39393
2011-10-12 18:38:38 +00:00
Bill Meier
59e64cff77 From Robert Bullen: Fix for: Two minor bugs in Wiretap library:
First bug: The Network Instruments Observer file format abbreviation is
incorrect. It is "niobserverv" instead of "niobserver", which is probably a
vestige from 1.4 when the abbreviation was "niobserverv9".

Second bug: The packet header magic number field is correctly swapped the first
time when reading the entire packet header. It is incorrectly swapped yet again
when reporting an invalid value. Both swaps use GUINT_FROM_LE, which is a no-op
on little-endian platforms. But the error message that is displayed to users of
big-endian platforms will contain a byte-reversed value.

svn path=/trunk/; revision=39392
2011-10-12 18:04:58 +00:00
Chris Maynard
5bcc7450ee There are no preferences for this dissector so eliminate unneeded preference-related code. Fixes Coverity CID 1311.
svn path=/trunk/; revision=39391
2011-10-12 18:01:41 +00:00
Guy Harris
4e579d9f60 From Iain Arnell:
A missing value_ptr parameter in the handling of ajp13 response headers
led to them being displayed differently than the request headers.

This patch also simplifies the offset/length calculation for header
values, and skips the size for consistency with handling of other ajp13
string values.

svn path=/trunk/; revision=39390
2011-10-12 17:55:49 +00:00
Guy Harris
17c21b91f2 Add Iain Arnell, who contributed ajp13 patches.
svn path=/trunk/; revision=39389
2011-10-12 17:54:23 +00:00
Guy Harris
9177afaf0c From Iain Arnell:
Revision 35984 introduced a regression in ajp13_get_nstring. According
to the comments here, the returned length _includes_ the trailing null.
The encoded length, however, does _not_ including the trailing null.
This patch resolves the problem by simply adding 1 to the returned
length.

svn path=/trunk/; revision=39388
2011-10-12 17:53:58 +00:00
Bill Meier
4401bad3cd Fix a benign bug: use intended proto_tree_add_uint() instaed of proto_tree_add_item();
Fix an endianness issue;
Add a comment re "tvb_memcpy to a struct is not kosher".

svn path=/trunk/; revision=39387
2011-10-12 17:30:31 +00:00
Anders Broman
59a363da40 Update the Camel and MAP ASN.1 files.
svn path=/trunk/; revision=39386
2011-10-12 16:41:42 +00:00
Bill Meier
daa85b0464 Cleanup use of proto_tree_add_item()/proto_tree_add_uint() in a few cases
svn path=/trunk/; revision=39385
2011-10-12 16:31:41 +00:00
Bill Meier
20aa78a1d2 Fix a benign bug: Use correct proto_tree_add_item() encoding arg.
svn path=/trunk/; revision=39384
2011-10-12 15:02:11 +00:00
Bill Meier
b666d5ca18 Fix some proto_tree_add_item() FT_ABSOLUTE_TIME encoding parameters:
Again: a tip o'the hat to Guy.


svn path=/trunk/; revision=39383
2011-10-12 14:12:36 +00:00
Alexis La Goutte
990b483a54 Add Modification CMake (Following add in Rev 39379)
svn path=/trunk/; revision=39382
2011-10-12 07:44:14 +00:00
Anders Broman
735191c3c8 Revert http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=39380
svn path=/trunk/; revision=39381
2011-10-12 05:27:41 +00:00
Anders Broman
0516c89156 From Eliot:
Patch libwireshark.def adding some symbols needed by wspyton
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6448

svn path=/trunk/; revision=39380
2011-10-12 05:12:49 +00:00
Anders Broman
3e9d852a1b From Jouni Malinen:
Move sniffer meta data parsing to separate files

packet-ieee80211.c includes dissectors for three different styles
of IEEE 802.11 sniffer meta data (like signal strength). Move these
to separate files in the same style as a fourth format (radiotap)
was already handled, so that packet-ieee80211.c focuses on the
actual IEEE 802.11 frame dissecting.

This reverts
http://anonsvn.wireshark.org/viewvc?revision=23911&view=revision
Objections?
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6443

svn path=/trunk/; revision=39379
2011-10-12 05:08:51 +00:00
Bill Meier
9ef1758adf Fix a case wherein proto_tree_add_boolean() was intended instead of proto_tree_add_item().
Also: Use proto_tree_add_boolean() instead of proto_tree_add_item() for code consistency in 2 other cases.


svn path=/trunk/; revision=39378
2011-10-12 03:28:07 +00:00
Guy Harris
dd7e20d472 Update template to match generated dissector - dissector_try_port() is
dead, long live dissector_try_uint().

svn path=/trunk/; revision=39377
2011-10-11 20:19:46 +00:00