Commit Graph

19059 Commits

Author SHA1 Message Date
Bill Meier 3c7d32017f From Jakub Zawadzki: Fix for memory leak in reassemble.c
Bug #4141

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4141#c10

svn path=/trunk/; revision=44371
2012-08-09 02:06:53 +00:00
Michael Mann bec794d51e Bugfix capture column preferences
svn path=/trunk/; revision=44370
2012-08-09 00:46:17 +00:00
Gerald Combs e9b6fa072e se_tree_lookup32_array() can destroy its key. Make sure we refresh it
before passing it to se_tree_insert32_array(). Fixes bug 7569 reported
by Laurent Butti.

svn path=/trunk/; revision=44366
2012-08-09 00:20:18 +00:00
Jeff Morriss adcb1775f6 Remove set-but-not-used variable.
svn path=/trunk/; revision=44365
2012-08-08 23:02:49 +00:00
Michael Mann c5a649d613 Complete compiler warnings from r44348
svn path=/trunk/; revision=44364
2012-08-08 21:40:22 +00:00
Michael Tüxen 58e6d17082 Get it compiling on Mac OS X.
svn path=/trunk/; revision=44363
2012-08-08 21:34:43 +00:00
Michael Mann acf2c06044 Compiler error fixes resulting from r44348
svn path=/trunk/; revision=44359
2012-08-08 20:47:20 +00:00
Pascal Quantin 25523bd0bf Various small changes:
- add a missing test on null pointer
- always initialize rrc_nas_sys_info_gsm_map_type with a value from its associated enum
- fix some typo errors
- remove some useless directives from conformance file
- detabify files (ASN.1 generated dissectors are indented with spaces)

svn path=/trunk/; revision=44358
2012-08-08 20:43:48 +00:00
Anders Broman a1218c94c9 From Jacob Nordgren and Rishie Sharma:
- FP: added header CRC validation, added crc11.c and crc11.h in wsutil/ for EDCH 11 bit CRC, fixed bug in RRC,
And also smaller bugfixes in umts_fp and rrc.

svn path=/trunk/; revision=44349
2012-08-08 17:24:14 +00:00
Michael Mann e0e533d643 Have (almost) all preferences use the generic preferences API (per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7402). This cleaned up a lot of hardcoded code and allows breaking up the prefs structure (or at least prevent it from growing too large) if desired.
Bugfixed problems mentioned in
http://www.wireshark.org/lists/wireshark-dev/201208/msg00001.html

Column preferences now support default '#' character

svn path=/trunk/; revision=44348
2012-08-08 16:54:02 +00:00
Alexis La Goutte daa1818d39 Enhance radiotap dissector
* Reorder code ! Match with Wireshark "Rules" (put in top value_string and static hf_..., in bottom proto_register_radiotap...)

svn path=/trunk/; revision=44336
2012-08-08 12:56:37 +00:00
Alexis La Goutte 88c219908e Enhance radiotap dissector
* Display unused/not defined present flags
* Add expert info if unused/not defined present flags has not "zero"

svn path=/trunk/; revision=44333
2012-08-08 12:32:04 +00:00
Jörg Mayer 37c7f3a7b0 Fix:
In file included from /home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:131:0:
/home/jmayer/work/wireshark/svn/trunk/epan/prefs.h:423:5: error: ‘struct pref_custom_cbs’ declared inside parameter list [-Werror]


svn path=/trunk/; revision=44332
2012-08-08 12:28:26 +00:00
Michael Mann 3d12ea758b Base framework to allow all preferences to be part of generic preferences API. Implementation will follow, but I wanted the framework in place first.
svn path=/trunk/; revision=44331
2012-08-08 12:13:24 +00:00
Alexis La Goutte 0e9df60466 Add A-MPDU Status Present flag
svn path=/trunk/; revision=44330
2012-08-08 08:30:51 +00:00
Alexis La Goutte 02cd557c95 From Johannes Berg via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7583
Add radiotap A-MPDU status

The new A-MPDU status extension for radiotap was adopted.
http://www.radiotap.org/defined-fields/A-MPDU%20status 

From me 
Use proto_tree_add_item

svn path=/trunk/; revision=44329
2012-08-08 08:16:34 +00:00
Jeff Morriss ff748a68c3 From Michael Mann on -dev:
The idl2wrs generated dissectors don't follow the convention of using the
filter name registered with the protocol as the start of any display filter
name.  This patch fixes that.

svn path=/trunk/; revision=44325
2012-08-08 03:37:05 +00:00
Jeff Morriss 98a893986d Use expert infos instead of g_warning when something unexpected is found.
svn path=/trunk/; revision=44324
2012-08-08 03:29:51 +00:00
Jeff Morriss 68aea944da Add SVN Id.
svn path=/trunk/; revision=44323
2012-08-08 03:28:02 +00:00
Jeff Morriss d380312c16 Move the pi==NULL test into TRY_TO_FAKE_THIS_REPR.
Since the tree will only be NULL here if someone messed up in proto.c and
since pi will only be NULL if tree is NULL, assert out if either of them are
NULL (don't use DISSECTOR_ASSERT() since such a condition wouldn't be the
dissector writer's fault).

Use TRY_TO_FAKE_THIS_REPR in ptvcursor_add_text_with_subtree().

We've had TRY_TO_FAKE_THIS_REPR for a long time now, don't wrap it in #if 1.

new_field_info() doesn't return NULL so don't check for it returning NULL in
ptvcursor_add().

svn path=/trunk/; revision=44322
2012-08-08 03:02:27 +00:00
Gerald Combs cfb93ddbf5 Use ep_strbufs instead of trying to track string offsets manually
and overflowing a buffer. Fixes a crash in bug 7568 discovered by
Laurent Butti.

We do the Dance Of The String Offset Pointers in several other
places. They should probably be changed to ep_strbufs as well.

svn path=/trunk/; revision=44320
2012-08-08 00:40:03 +00:00
Pascal Quantin 9f8b638cfa Remove Uplink messages from the RlcMacDownlink_t structure (as they are part of the RlcMacUplink_t structure that is also used to call csnStreamDissector function)
svn path=/trunk/; revision=44319
2012-08-08 00:11:14 +00:00
Pascal Quantin 670be00aea Various fixes:
- in UM mode, LI size boundary is at 125 bytes (regression introduced in r44292)
- define RLC_LI_UPPERLAYER outside of rlc_li_size enum as it is confusing: when set in preferences it means that the dissector will use the variable, 7 bits or 15 bits LI as indicated in the rlc_info struct (so using one of the rlc_li_size enum value); it is not a new LI value
- add value_string array for direction
- add BCCH channel to UDP framing format
- initialize p2p_dir when using UDP framing format

svn path=/trunk/; revision=44318
2012-08-07 23:25:07 +00:00
Gerald Combs 5bdeb03b83 Fix a large loop found by Stefan Cornelius of Red Hat Security Response
Team (bug 7603).

Display the ACL entry count as decimal instead of hexadecimal.

svn path=/trunk/; revision=44317
2012-08-07 23:06:29 +00:00
Michael Mann 06c393807c Add a sanity check so we don't unnecessarily allocate memory for a Multiple Service Packet message. Bugfix 7570 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7570)
svn path=/trunk/; revision=44312
2012-08-07 20:09:59 +00:00
Gerald Combs 6c32ba5ff1 Make sure we have a corresponding 'u' member to RlcMacDownlink_t for
every call to csnStreamDissector. This should fix bug 7561. Based on
attachment 8888 from Martin Kaiser.

svn path=/trunk/; revision=44307
2012-08-07 18:36:18 +00:00
Jeff Morriss 846b557614 Fix fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7563 :
Don't overflow in_fmt->m_vc_index_array: verify that speed is less than or
equal to DECHAN_MAX_AUG_INDEX before using it.

Also add a comment: there are comments here that indicate that this array
should have 5 entries but there are only 4.

svn path=/trunk/; revision=44306
2012-08-07 18:17:29 +00:00
Jeff Morriss fe7e9760fa Remove a set-but-not-used variable.
svn path=/trunk/; revision=44297
2012-08-07 13:18:01 +00:00
Anders Broman 7623b9bae7 From Rishie Sharma:
compile error fix

svn path=/trunk/; revision=44296
2012-08-07 11:49:06 +00:00
Anders Broman 1c20e4da84 error: variable ‘hsdsch_physical_layer_category’ set but not used
svn path=/trunk/; revision=44295
2012-08-07 10:54:24 +00:00
Anders Broman b2caee1d75 From Jacob Nordgren and Rishie Sharma:
- umts_fp: fixed so CS content is not malformed content
- RLC: added channel tree so you can filter on rbid etc
- umts_fp,rlc,mac: added some hdsch-common code

svn path=/trunk/; revision=44292
2012-08-07 09:44:16 +00:00
Gerald Combs 68920ce95a Add a maximum span length check to XTP. Fixes a crash discovered by Ben
Schmidt.

Just use proto_tree_add_item() instead of allocating a
big-ol-honkin'-block of guint64s and adding their values to the tree via
proto_tree_add_uint64().

Dissection *should* still work correctly but I can't find any XTP
captures for testing.

svn path=/trunk/; revision=44289
2012-08-06 23:12:13 +00:00
Gerald Combs 5a47e80ffe Check for a too-short BSON document length. Fixes a DoS reported by Ben
Schmidt in bug 7572.

Also check for a too-long BSON document length and too many nested BSON
documents.

svn path=/trunk/; revision=44288
2012-08-06 22:04:09 +00:00
Jaap Keuter 3a14c113bc Fix for bug 7555:
Add an expert item on the AD bit in a DNS query.
Also add some type values.

svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
Gerald Combs 29771084e1 [Automatic manuf, services and enterprise-numbers update for 2012-08-05]
svn path=/trunk/; revision=44275
2012-08-05 14:03:35 +00:00
Martin Kaiser 7bef3391cf make mpeg_pmt a new-style dissector
register it by name so that other protocols can call it more easily
highlight only the bytes that actually belong to the pmt

(the same changes as already applied to dvb-nit)


svn path=/trunk/; revision=44274
2012-08-05 12:57:29 +00:00
Chris Maynard 3a95aea153 Fix Coverity CID 714130: Dereference after null check.
svn path=/trunk/; revision=44267
2012-08-04 19:06:16 +00:00
Chris Maynard 6b733f55bc Plug a memory leak introduced with r44239. Resolves Coverity CID 714243: Unused pointer value. (Previous commit actually resolved Coverity CID 714242.)
svn path=/trunk/; revision=44266
2012-08-04 19:01:09 +00:00
Chris Maynard 230c57e6ec Plug a memory leak introduced with r44239. Resolves Coverity CID 714243: Unused pointer value.
svn path=/trunk/; revision=44265
2012-08-04 18:57:16 +00:00
Chris Maynard c7b5c1eabb Add a fall-through comment to appease Coverity and resolve CID 714131: Missing break in switch.
svn path=/trunk/; revision=44264
2012-08-04 18:45:57 +00:00
Martin Kaiser 02bb7124f9 dissect multiple nit sections in the CI+ operator_nit apdu
fetch handles for dvb_nit and data dissectors only once

svn path=/trunk/; revision=44261
2012-08-04 06:25:11 +00:00
Martin Kaiser 94476d0619 make dvb_nit a new-style dissector
register it by name so that other protocols can call it more easily
highlight only the bytes that belong to the nit

svn path=/trunk/; revision=44248
2012-08-03 17:02:24 +00:00
Jeff Morriss ba3db780d1 Fix fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7566 :
Don't try to reassemble a message of length 0 (fixes a later divide-by-zero
error but I don't see why we'd want to do any work for message whose length
we think is 0).

svn path=/trunk/; revision=44247
2012-08-03 16:20:31 +00:00
Jeff Morriss e9ebe32dfd Fix the $ tag.
svn path=/trunk/; revision=44246
2012-08-03 14:47:32 +00:00
Jeff Morriss 783405a2da Replace blurbs which duplicate the field name with NULL.
Don't use dissector_add(), it's long since deprecated.

svn path=/trunk/; revision=44245
2012-08-03 14:46:12 +00:00
Jeff Morriss f99e04f2b0 Replace blurbs which duplicate the field name with NULL.
svn path=/trunk/; revision=44244
2012-08-03 14:44:44 +00:00
Jeff Morriss b63d63529c Fix fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7560 :
Don't assume that we stored off the SPRT conversation port.  This was code
comes from r43887/bug 3507 so no need to backport.

svn path=/trunk/; revision=44243
2012-08-03 13:55:07 +00:00
Irene Rüngeler c610984bf5 Fix bug in while loop
svn path=/trunk/; revision=44242
2012-08-03 13:46:57 +00:00
Irene Rüngeler 2e1952678f Make the columns of the capture options dialog selectable. Changes are stored in the preferences file.
The ordering can be changed by dragging the column. The order is not stored.

svn path=/trunk/; revision=44239
2012-08-03 11:15:40 +00:00
Guy Harris 285e322329 Add in the URL of a protocol specification.
Apparently, it's called "NET/ROM", not "NetROM" or "Net/ROM".

Get rid of check_col() calls and a clear-before-set.

svn path=/trunk/; revision=44238
2012-08-03 03:44:39 +00:00
Guy Harris ef88a5dc4c Use a value_string for the KISS frame types; associate it with the
command field.

svn path=/trunk/; revision=44237
2012-08-03 02:19:18 +00:00
Guy Harris c25adfe420 Newer version of the AX.25 spec.
svn path=/trunk/; revision=44236
2012-08-03 02:05:33 +00:00
Guy Harris 307e13d9f2 Move the list of AX.25 protocol IDs to epan/ax25_pids.h. Use it in
packet-ax25.c and packet-arp.c.

Add an "ax25.pid" dissector table for those protocol IDs, use it in the
AX.25 dissector, and have dissectors register in that table with their
protocol IDs.

Get rid of some unneeded includes.

Clean up some "AX25"s in user-visible strings - say "AX.25" instead.

Clean up some indentation.

svn path=/trunk/; revision=44235
2012-08-03 01:58:12 +00:00
Guy Harris ad3c303f16 Make the protocol ID field an integral field with a value_string table;
use that table for setting the column as well.

dissect_xdlc_control() sets the Info column; don't set it ourselves
(dissect_xdlc_control() will overwrite it if called).

That means we should always call dissect_xdlc_control(), regardless of
whether we're building a protocol tree or not.  Just get rid of the test
for that.

Append the protocol ID, if present, to the column.

svn path=/trunk/; revision=44234
2012-08-03 01:02:27 +00:00
Guy Harris bf742abb62 Squelch narrowing warnings.
svn path=/trunk/; revision=44233
2012-08-03 00:23:27 +00:00
Guy Harris 931a1077ea From Richard Stearn: add support for BPQ (AX.25 on Ethernet).
svn path=/trunk/; revision=44232
2012-08-02 23:55:42 +00:00
Guy Harris 1b876c36f1 Oops, forgot to add packet-aprs.c to dissector source lists.
Fix warnings in packet-aprs.c.

svn path=/trunk/; revision=44231
2012-08-02 23:53:38 +00:00
Guy Harris bafaa14059 From Richard Stearn: APRS support.
Fix field names for AX.25 "No layer 3" to match the protocol name.

svn path=/trunk/; revision=44230
2012-08-02 22:40:02 +00:00
Jeff Morriss b9276f6e96 Replace blurbs which duplicate the field name with NULL.
svn path=/trunk/; revision=44229
2012-08-02 22:04:12 +00:00
Guy Harris b61be307a1 From Richard Stearn: AX.25 "No layer 3" support.
Also, [at]ify his e-mail address, and list packet-ax25.c before the
packet-ax25-XXX.c dissectors in the file lists.

svn path=/trunk/; revision=44228
2012-08-02 21:53:47 +00:00
Jeff Morriss eaf8d44a2d Replace blurbs which duplicate the field name with NULL.
svn path=/trunk/; revision=44227
2012-08-02 21:44:22 +00:00
Guy Harris 94eb487df6 From Richard Stearn: Rose (X.25 Packet Layer Protocol atop AX.25's
link-layer protocol) support.

Rename rose_handle to x25_handle, as it's not a handle for a protocol
named "Rose" or "ROSE", it's a handle for X.25's Packet Layer Protocol
(which we just call "x.25").

svn path=/trunk/; revision=44226
2012-08-02 20:41:50 +00:00
Guy Harris bb78da2687 Clean up indentation.
Get rid of capture_XXX routines that just bump ld->other.

*Do* bump ld->arp for AX.25 ARP packets.

Note that, as there's IP-over-NetROM, capture_netrom() should check for
it.

svn path=/trunk/; revision=44225
2012-08-02 19:42:59 +00:00
Jörg Mayer 33ec97e5c3 Fix:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c: In function ‘dissect_netrom_proto’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:211:9: error: variable ‘dst_ssid’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:210:9: error: variable ‘src_ssid’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c: In function ‘capture_netrom’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-netrom.c:684:16: error: variable ‘l_pd’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=44224
2012-08-02 19:35:36 +00:00
Pascal Quantin a77257f8a0 Fix a few issues:
- restore test on ciphered and deciphered variables removed in r44035: they are used by dct2000 and fp_hint dissectors
- rename channel information lchid to rbid: the corresponding variable is supposed to contain a Radio Bearer Identity and not a Logical Channel Identity and was already used like this in dct2000 and fp_hint dissectors or with UDP framing protocol. Please add a new variable in rlc_info structure if the lchid is really useful
- do not display channel information when the direction is unknown (useful for UDP framing protocol for ex)
- add channel information to UM dissection also
As a rule of thumb, please check that the changes do not break existing dissectors: UMTS RLC dissection can be configured in packet-catapult-dct2000.c, packet-fp_hint.c, through the UDP framing protocol explained in packet-rlc.h and not only in packet-umts_fp.c and packet-umts-mac.c

svn path=/trunk/; revision=44223
2012-08-02 19:34:40 +00:00
Guy Harris 10e2a00573 From Richard Stearn: Flexnet support.
Also, get rid of check_col() calls and unused preferences, and use
col_add_fstr() where appropriate.

Fix up some indentation.

svn path=/trunk/; revision=44222
2012-08-02 19:28:08 +00:00
Jörg Mayer 9e385966a7 Sync DISSECTOR_SRC to Makefile.common
svn path=/trunk/; revision=44221
2012-08-02 19:06:35 +00:00
Jeff Morriss 9b625975db Don't use dissector_add(): it's long since deprecated.
svn path=/trunk/; revision=44220
2012-08-02 19:01:58 +00:00
Guy Harris dfe0389590 Move the AX.25 address routines to address_to_str.c, where they belong;
hopefully this will fix some of the build errors.

svn path=/trunk/; revision=44219
2012-08-02 18:51:40 +00:00
Jeff Morriss aa65950896 Remove a created-but-unused subtree (and its ett). It's not obvious to me
whether this tree was going to be used for something or not.

svn path=/trunk/; revision=44218
2012-08-02 18:46:36 +00:00
Guy Harris 25080346fd From Richard Stearn: AX.25 NetROM support.
Also add packet-ax25.c to the CMake list.

svn path=/trunk/; revision=44217
2012-08-02 18:38:40 +00:00
Jörg Mayer d2e5b83ad5 Stuff missed in the first pass of sorting alphabetically
svn path=/trunk/; revision=44216
2012-08-02 18:36:57 +00:00
Jörg Mayer a2428935a4 Alphabetically sort entries of DISSECTOR_SRC
svn path=/trunk/; revision=44215
2012-08-02 18:33:36 +00:00
Jörg Mayer a0855ab987 Fix:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c:164:7: error: variable ‘v2cmdresp’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c: In function ‘proto_register_ax25’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-ax25.c:398:12: error: variable ‘ax25_module’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=44214
2012-08-02 18:15:44 +00:00
Jörg Mayer 262c6c664a Fix:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-arp.c:1239:42: error: variable ‘tha_val’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-arp.c:1239:22: error: variable ‘sha_val’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=44213
2012-08-02 18:12:59 +00:00
Guy Harris 86bf808c15 From Richard Stearn: IP-over-AX.25 and AX.25 ARP.
svn path=/trunk/; revision=44212
2012-08-02 17:48:18 +00:00
Guy Harris 835111692f From Richard Stearn: support for AX.25, including support for
LINKTYPE_AX25.

svn path=/trunk/; revision=44211
2012-08-02 16:54:43 +00:00
Gerald Combs e57672dbcc Convert a C++ comment.
svn path=/trunk/; revision=44209
2012-08-02 15:28:59 +00:00
Jeff Morriss 3ab1e68751 From Lori Tribble via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7556 :
The BACnet GetEnrollmentSummary-ACK has an optional parameter Notification
Class.  The Wireshark decoding does not correctly decode when this parameter is
missing.

The fix is to verify the context exists before attempting to decode this
parameter.


From me: replace the few remaining tabs in the file with spaces.

svn path=/trunk/; revision=44207
2012-08-02 14:21:57 +00:00
Jeff Morriss e71e8e041c Replace blurbs which duplicate the field name with NULL.
Don't use dissector_add(): it's long since deprecated.

svn path=/trunk/; revision=44206
2012-08-02 14:10:43 +00:00
Anders Broman 704e2f524e From Jacob Nordgren and Rishie Sharma:
NBAP: fixed segfault, FP: aesthetic fix, RLC: added channel info to GUI, MAC-is: fixed case with reassembly when a middle segment arrives 

 MAC, RLC, added preferences for LI-size and TSN-size

svn path=/trunk/; revision=44205
2012-08-02 14:03:17 +00:00
Jörg Mayer 5c24a31859 Fix: wireshark/svn/trunk/epan/dissectors/packet-ax25-kiss.c:288:12: error: variable ‘ax25_kiss_module’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=44203
2012-08-02 09:00:15 +00:00
Guy Harris 4fc130af79 From Richard Stearn: AX.25 KISS protocol support.
Part 1 of the fix for bug 7529.

svn path=/trunk/; revision=44202
2012-08-02 06:45:51 +00:00
Pascal Quantin 51fd116d6d Do not register fields twice
svn path=/trunk/; revision=44195
2012-08-01 19:22:59 +00:00
Pascal Quantin ecf26166fa Follow-up of r44161: GMR-1 RR dissector is not used only on Common Control CHannels but also on Dedicated Control CHannels; update protocol name and filters accordingly
svn path=/trunk/; revision=44193
2012-08-01 19:01:26 +00:00
Pascal Quantin 68194dd0d5 The minimum CCCH size is 3 bytes (L2 pseudo length + protocol discriminator + message type)
svn path=/trunk/; revision=44192
2012-08-01 19:00:13 +00:00
Pascal Quantin 6c8d938dd4 Follow-up of r44162: clean more filters
svn path=/trunk/; revision=44187
2012-08-01 14:07:18 +00:00
Pascal Quantin 2303b8dcfc Follow-up of r44162: RR dissector is not used only on Common Control CHannels but also on Dedicated Control CHannels; update protocol name and filters accordingly
svn path=/trunk/; revision=44185
2012-08-01 13:32:07 +00:00
Alexis La Goutte 90ca174c9e From Vasu D. Dasari via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7550
Decode Provider Bridge GVRP Address

Packets with destination MAC address to be that of, provider bridge GVRP address
 or 01:80:c2:00:00:0d, the packets are decoded as STP packets 
with "Unknown BPDU type".

svn path=/trunk/; revision=44184
2012-08-01 12:22:34 +00:00
Pascal Quantin 025200992d Follow-up of r44162: gsm_a_gm dissector is used for both GPRS Mobility Management and Session Management protocols. Update filter names accordingly.
svn path=/trunk/; revision=44183
2012-08-01 09:44:57 +00:00
Michael Mann 1741731384 remove unnecessary underscores from display filters
svn path=/trunk/; revision=44181
2012-08-01 02:59:17 +00:00
Chris Maynard fcd9a6d729 Fix the remaining part of Coverity CID 280009 (formerly CID 9): "Logically dead code". The first part seems to have been committed in r17565, although the checkin comment mistakenly indicates, at least as far as I can tell, that it was for CID 6 instead of CID 9, which is what Coverity is telling me it used to be.
svn path=/trunk/; revision=44180
2012-08-01 02:24:29 +00:00
Chris Maynard c38a247faa Fix Coverity CID 280019 (formerly 19): "Logically dead code" that abroman previously commited a fix for in r17532, but forgot to also commit a change to asn1/snmp/packet-snmp-template.c as well, so the change was apparently inadvertently reverted the next time that packet-snmp.c was regenerated.
svn path=/trunk/; revision=44179
2012-08-01 02:08:29 +00:00
Michael Mann dd6ca38fff updated more display filters per checkfiltername.pl
svn path=/trunk/; revision=44178
2012-08-01 01:57:18 +00:00
Chris Maynard 07503d2af5 Fix the 2nd part of Coverity CID 280361 (formerly 361): "Logically dead code" that mmartin seems to have unintentionally missed in r36256.
svn path=/trunk/; revision=44177
2012-08-01 01:50:27 +00:00
Pascal Quantin 5f501f83b1 Follow-up of r44162: A-bis interface is not the same thing as A interface; update filters and protocol names accordingly
svn path=/trunk/; revision=44172
2012-07-31 21:12:16 +00:00
Pascal Quantin 8ce8431f4e Update filter names following the changes done in r44162
svn path=/trunk/; revision=44168
2012-07-31 20:44:34 +00:00
Alexis La Goutte d229d813d0 Update to the last draft-ietf-6lowpan-nd-19 updates
Extended ABRO with longer version number and valid lifetime, 
while maintaining backward compatibility

svn path=/trunk/; revision=44164
2012-07-31 19:42:20 +00:00
Alexis La Goutte 6111c40173 From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7548
HomeplugAV dissector: decode device id

adds proper device id decoding the in the Homeplug AV "Get Device/SW Version 
Confirm (A001)" response.

svn path=/trunk/; revision=44163
2012-07-31 19:09:57 +00:00
Michael Mann 175851fb40 Updated GSM dissectors display filters per checkfiltername.pl
Tried to provide consistency with GSM dissector (protocol) names, even if the filenames now don't match the dissector name.

svn path=/trunk/; revision=44162
2012-07-31 18:54:11 +00:00
Michael Mann 7f3703de34 update GMR-1 protocols display filers
svn path=/trunk/; revision=44161
2012-07-31 17:19:32 +00:00
Alexis La Goutte e761d193c9 Update ICMPv6 to last IANA Parameters (2012-07-18)
Add draft-irtf-rrg-ilnp-icmpv6-06: ICMP Locator Update message for ILNPv6 ID (Conflit with draft-ietf-6lowpan-nd-18...)

svn path=/trunk/; revision=44160
2012-07-31 17:16:52 +00:00
Chris Maynard 6590deb37f Fix Coverity CID 712526: Missing break in switch. Bug introduced with r44134.
svn path=/trunk/; revision=44157
2012-07-31 14:32:10 +00:00
Anders Broman 796bbde5d3 - Put back not used constants to fill value_strings_ext.
- Don't dissect RRC container, it seems to only cause grief.

svn path=/trunk/; revision=44156
2012-07-31 13:49:39 +00:00
Anders Broman baabe8b191 Make it possible to configure TIPC over UDP ports.
svn path=/trunk/; revision=44155
2012-07-31 08:57:41 +00:00
Jakub Zawadzki b503d9d659 Restore includes from r44107 to fix abi check.
Reverted (by mistake?) in r44129

svn path=/trunk/; revision=44154
2012-07-31 08:40:22 +00:00
Anders Broman df0bef704a From Michael Mann:
Expand show version preference.
implementation of Steven's suggestion of a radio button (actually
dropdown) of the 4 possibilities. 

I changed  the default to  have the version on both in
the welcome screen and on the window as that's how it was and people tend not to change the preferences I think.

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

svn path=/trunk/; revision=44153
2012-07-31 07:27:39 +00:00
Anders Broman fc5a63c97f From Stephen Donnelly:
ERF dissector cleanup

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

svn path=/trunk/; revision=44152
2012-07-31 07:03:25 +00:00
Anders Broman ad95fa259b From Jacob Nordgren and Rishie Sharma:
NBAP: added preferences to change logical channel id to mac content type mapping.

svn path=/trunk/; revision=44151
2012-07-31 06:56:13 +00:00
Jörg Mayer 51b40ed150 Whitespace fixes:
- trailing whitespace
- mixing TAB and space for indentation

svn path=/trunk/; revision=44150
2012-07-31 05:37:57 +00:00
Chris Maynard 63592a1442 tvb_length_remaining() can return -1 if the offset is out of bounds, so return if it does. In this case, it won't since tvb_offset_exists() is previously called, but it's not a bad idea to do it anyway in case the call to tvb_offset_exists() is ever removed, which we might just want to do? Anyway, this is a simple enough change and fixes Coverity CID 280522: Improper use of negative value.
svn path=/trunk/; revision=44149
2012-07-31 00:35:38 +00:00
Chris Maynard d3a8e5614c tvb_length_remaining() can return -1 if the offset is out of bounds. Be sure to deal with it if it does. Fixes Coverity CID 280523: Improper use of negative value.
svn path=/trunk/; revision=44146
2012-07-30 23:43:17 +00:00
Stig Bjørlykke 29cdc9a4cf Added Custom.common as dependency for register.c
svn path=/trunk/; revision=44137
2012-07-30 13:54:02 +00:00
Chris Maynard 4efded1f50 Fix Coverity CID 712343: Wrong sizeof argument.
svn path=/trunk/; revision=44136
2012-07-30 13:38:51 +00:00
Anders Broman 5a4c037e87 Add Russian national variant.
svn path=/trunk/; revision=44134
2012-07-30 13:22:38 +00:00
Michael Tüxen 07e87691f6 Fix compilation issues.
svn path=/trunk/; revision=44133
2012-07-30 11:34:56 +00:00
Michael Mann 7dc7977c04 Add Mojito dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2688)
properly alphabetize packet-mim.c in makefiles

svn path=/trunk/; revision=44132
2012-07-30 11:07:29 +00:00
Jakub Zawadzki c852982ebc wrappers for label filling (with information about string truncation)
svn path=/trunk/; revision=44131
2012-07-30 10:52:20 +00:00
Guy Harris 4ed63300d8 No // comments, please.
svn path=/trunk/; revision=44130
2012-07-30 09:19:07 +00:00
Anders Broman ee071c887a From Jacob Nordgren and Rishie Sharma:
-MAC-is update

svn path=/trunk/; revision=44129
2012-07-30 08:37:00 +00:00
Bill Meier 2479be037f Use consistent indentation.
svn path=/trunk/; revision=44122
2012-07-29 21:59:25 +00:00
Bill Meier 6326869cca Minor cleanup.
svn path=/trunk/; revision=44119
2012-07-29 21:05:08 +00:00
Bill Meier 3c71068c12 Several right-shifts should be left-shifts.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6881#c12

svn path=/trunk/; revision=44118
2012-07-29 20:39:46 +00:00
Bill Meier c68e50e0e8 g_assert --> DISSECTOR_ASSERT
svn path=/trunk/; revision=44117
2012-07-29 20:19:38 +00:00
Bill Meier 72f8a17e92 Minor cleanup....
svn path=/trunk/; revision=44116
2012-07-29 20:11:33 +00:00
Pascal Quantin b94cd13e93 Fix usage of range string and use extended value strings in a few places
svn path=/trunk/; revision=44115
2012-07-29 19:48:22 +00:00
Bill Meier f0d8bf411e Don't do 'return 0' in mpls-y1722 dissector (so mpls dissector won't try to continue dissecting).
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6787
     Comments 14, 16, 17


svn path=/trunk/; revision=44114
2012-07-29 19:47:50 +00:00
Bill Meier 4e1bad0218 Fix a typo :(
svn path=/trunk/; revision=44113
2012-07-29 19:05:18 +00:00
Bill Meier 3933d7591b Cast away a compile warning: "conversion from '__int64' to 'gulong', possible loss of data"
svn path=/trunk/; revision=44112
2012-07-29 19:00:46 +00:00
Bill Meier 7a22f13aa0 Fix crash when "file_name_snooping" & "file_full_name_snooping" prefs enabled.
Crash due to a g_snprintf() incorrect (too large) "max number of bytes" parameter.

Note that g_snprintf() apparently writes to (initializes ?) bytes beyond the
 actual string written.

Fixes Bug #7948: (To be confirmed by the user)
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7498


svn path=/trunk/; revision=44111
2012-07-29 18:17:17 +00:00
Alexis La Goutte 2f328434f2 From Tobias Rutz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7518
Add new dissector for DVB-S2 Baseband Frame and GSE dissection

There is a standard for satellite receiving equipment to output all the received
data over an ethernet interface. This dissector is able to show these packets
according to the ETSI standards.
By default the dissector is disabled, it can be enabled in the protocol
settings dialogue

With the dissector...

svn path=/trunk/; revision=44110
2012-07-29 16:57:54 +00:00
Alexis La Goutte c132f85385 From Tobias Rutz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7518
Add new dissector for DVB-S2 Baseband Frame and GSE dissection

There is a standard for satellite receiving equipment to output all the received
data over an ethernet interface. This dissector is able to show these packets
according to the ETSI standards.
By default the dissector is disabled, it can be enabled in the protocol
settings dialogue

svn path=/trunk/; revision=44109
2012-07-29 16:43:03 +00:00
Alexis La Goutte 3e5cc78d46 From Weijun Wang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7481
Description for Kerberos 5's ENC-TKT-IN-SKEY is wrong

http://tools.ietf.org/html/rfc4120#section-2.9.2

#Backport

svn path=/trunk/; revision=44108
2012-07-29 16:33:34 +00:00
Jakub Zawadzki e66f10b125 Try to fix ABI check.
svn path=/trunk/; revision=44107
2012-07-29 16:12:17 +00:00
Gerald Combs b9ff022476 [Automatic manuf, services and enterprise-numbers update for 2012-07-29]
svn path=/trunk/; revision=44101
2012-07-29 14:03:32 +00:00
Martin Mathieson 4f65e11ad9 Add a comment that VS Code Analyzer makes a very good point here -
masking the m.s.b. of the command code does mean that several of them
won't ever get detected.  I couldn't readily see from the spec what the
right think to do is.

svn path=/trunk/; revision=44098
2012-07-28 23:51:06 +00:00
Martin Mathieson e1389f1196 VS code analysis was right - 'x' & 0 *was* always going to return 0...
svn path=/trunk/; revision=44097
2012-07-28 23:30:40 +00:00
Martin Mathieson dfd2753b06 Use the _vs suffix for value_string variables consistently. There was a
clash between the value_string 'addr_fmt' and where the raw value was
parsed.

svn path=/trunk/; revision=44096
2012-07-28 22:55:27 +00:00
Martin Mathieson 923c530545 Avoid 2 redeclarations of 'len' in inner scopes - they can all use the
outer one.  They had 3 different types, so use guint, which is what
tvb_length() returns.

svn path=/trunk/; revision=44095
2012-07-28 22:46:11 +00:00
Martin Mathieson 84182d3451 Fix VC code analaysis warning about definition of variable in inner
scope.

svn path=/trunk/; revision=44094
2012-07-28 22:35:11 +00:00
Evan Huus 1457a01f49 Always memset the packet-header struct in Lua to avoid
crashes from garbage data.

Also, give Lua a copy of the packet comment if there is one.

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

svn path=/trunk/; revision=44093
2012-07-28 15:51:37 +00:00
Pascal Quantin f4e322cd56 Fix inverted dissection of Pre-emption Capability and Pre-emption Vulnerability
svn path=/trunk/; revision=44091
2012-07-28 13:40:11 +00:00
Pascal Quantin 857f19c622 Fix a 'dead increment' warning forgotten in r44084
svn path=/trunk/; revision=44090
2012-07-28 13:02:35 +00:00
Evan Huus 3ed453c4d5 Decode SSL streams in XMPP sessions. Fixes:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3177

The logic is rather conservative for now, but I imagine false negatives are
better than false positives for this sort of thing.

svn path=/trunk/; revision=44088
2012-07-28 03:09:46 +00:00
Pascal Quantin 9f8467f1bf Fix 'dead increment' and 'dereference of null pointer' Clang warnings
svn path=/trunk/; revision=44084
2012-07-27 22:45:46 +00:00
Pascal Quantin c299201935 Fix a few Clang warnings (dead increment, dead assignment)
svn path=/trunk/; revision=44082
2012-07-27 21:58:26 +00:00
Gerald Combs 5fc656ee46 Add a preview to the common file dialog. Adjust the win32 file dialog
preview logic slightly.

svn path=/trunk/; revision=44080
2012-07-27 21:43:02 +00:00
Pascal Quantin 1f6b7eb9c4 Fix dead assignment Clang warning and use consistent indentation
The two remaining Clang warnings (function call argument is an uninitialized value, result of operation is garbage or undefined) seem to be false positives

svn path=/trunk/; revision=44079
2012-07-27 21:09:11 +00:00
Bill Meier 26d1cbb989 Create/use extended value strings to access certain value string arrays;
Remove unneeded initializers;
Use consistent indentation.

svn path=/trunk/; revision=44073
2012-07-27 16:02:06 +00:00
Bill Meier 0a631d2543 Sort value-string array by value to allow extended-value-string binary search;
Add XXX comments as to possible missing entries in a value-string array.

svn path=/trunk/; revision=44071
2012-07-27 14:49:04 +00:00