Commit graph

38842 commits

Author SHA1 Message Date
Martin Mathieson
13316398dd Use bitfields to make channel_hash_key struct fit into one word.
svn path=/trunk/; revision=40683
2012-01-24 03:05:21 +00:00
Jeff Morriss
e36b1c6daf Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6738 :
size_t is sometimes an integer and sometimes a long.  To avoid compiler
warnings when formatting it, cast it to a long.

svn path=/trunk/; revision=40682
2012-01-24 02:42:01 +00:00
Jeff Morriss
b415128e48 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6739 :
Update company ids and HCI/LMP versions to the latest Assigned Numbers

I made the cosmetic changes:
- simplify version description
- I updated all company ids from Assigned Numbers, so there are some very small
differences with old version (inadvertently)

Based on:
https://www.bluetooth.org/Technical/AssignedNumbers/hci.htm
https://www.bluetooth.org/Technical/AssignedNumbers/link_manager.htm
https://www.bluetooth.org/technical/assignednumbers/identifiers.htm

From me: list the above URLs in comments in the code.

svn path=/trunk/; revision=40681
2012-01-24 02:30:57 +00:00
Jeff Morriss
f7e1f76659 From njtaylor0101 [AT] gmail.com via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6740 :
Fix an out-of-array-bounds warning from OpenBSD's compiler.  (Note: this is
actually a false positive since adequate memory is allocated.)

From me: some additional code simplification.

svn path=/trunk/; revision=40680
2012-01-24 02:20:46 +00:00
Guy Harris
7a3653b9c8 Don't treate WTAP_FILE_UNKNOWN as a real file type.
svn path=/trunk/; revision=40679
2012-01-24 00:48:48 +00:00
Guy Harris
3b1f82d063 In the table of capture file types, have:
a field that gives the default extension for the file type,
	*without* a leading "." (i.e., just the extension, not the "."
	that separates it from the rest of the file name), which is NULL
	if there are no known extensions;

	a field that gives a semicolon-separated list of *other*
	extensions, without "*." or ".", which is NULL if there are no
	known extensions or there are no known extensions other than the
	default.

Rename wtap_file_extension_default_string() to
wtap_default_file_extension() (matches the name of the field).

svn path=/trunk/; revision=40678
2012-01-23 23:17:03 +00:00
Jeff Morriss
dc0ad2aac7 Revert 40675 and set 'protocol' appropriately when IPv6 is used.
Initialize it to something other than UDP if we can't determine the protocol.

Reindent parts of the subject function.
Replace tabs with spaces (for consistency).
Remove trailing white space.

svn path=/trunk/; revision=40677
2012-01-23 22:37:53 +00:00
Guy Harris
e33f160de6 g_string_append_printf() returns nothing.
svn path=/trunk/; revision=40676
2012-01-23 22:23:37 +00:00
Jeff Morriss
4e7f5c2e8f Initialize 'protocol' to something, at least until it can be properly assigned in the IPv6 and default cases.
svn path=/trunk/; revision=40675
2012-01-23 22:20:15 +00:00
Guy Harris
bb98263aa4 Have wtap_file_extension_default_string() return the extension in the
sense of "what follows the last . in the file name", i.e. not including
the ".".

svn path=/trunk/; revision=40674
2012-01-23 21:57:45 +00:00
Anders Broman
4e30aece3a Only continue dissection if protocol is UDP.
svn path=/trunk/; revision=40673
2012-01-23 21:13:10 +00:00
Chris Maynard
58cab4f107 Fix some duplicate display filter names.
svn path=/trunk/; revision=40672
2012-01-23 20:42:54 +00:00
Jeff Morriss
c5be5ec99c Finish wrapping heuristic dissector functions in #if conditionals; change the condition to check if HEUR_DISSECTOR_LIST is defined.
svn path=/trunk/; revision=40671
2012-01-23 20:40:16 +00:00
Guy Harris
77005f2a8c Put back the #include changes from a previous commit.
svn path=/trunk/; revision=40670
2012-01-23 20:31:42 +00:00
Chris Maynard
fb6cce75d9 Fix some duplicate display filter names.
svn path=/trunk/; revision=40669
2012-01-23 20:14:37 +00:00
Anders Broman
008dd26ff5 Remove a debug statement.
svn path=/trunk/; revision=40668
2012-01-23 19:48:05 +00:00
Anders Broman
2b95c6601e Add the code to add a Heuristics protocol page.
#if 0:d out for now.

svn path=/trunk/; revision=40667
2012-01-23 19:47:13 +00:00
Jeff Morriss
cea1ad9500 From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6743 :
The dissection [added with the previous patch on this bug] was not complete.
Attaching a diff on top of the existing SVN to properly dissect small
packets with mini header.

svn path=/trunk/; revision=40666
2012-01-23 19:41:35 +00:00
Gerald Combs
9d1459a796 Roman Donchenko → Роман Донченко
svn path=/trunk/; revision=40665
2012-01-23 19:18:50 +00:00
Chris Maynard
ae9c9a3906 Fix some duplicate display filter names.
svn path=/trunk/; revision=40664
2012-01-23 19:17:42 +00:00
Anders Broman
088723a512 From Pascal Quantin:
Use the private data if available, call the data dissector for data.

svn path=/trunk/; revision=40663
2012-01-23 19:10:50 +00:00
Jeff Morriss
1c81971d42 From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6754 :
Due to the variable remaining_bits_len getting out of sync with bit_offset (in
one case due to a mistake in the patch for bug 6375, and in another case
pre-existing).

I have shuffled the decrements of remaining_bits_len so that they always occur
next to an increment of bit_offset, so that this type of problem is easier to
spot.

From me: convert tabs to spaces to match the rest of the file.

svn path=/trunk/; revision=40662
2012-01-23 18:54:02 +00:00
Anders Broman
dcf10c7c10 Not working Conversation Filter in (analyse menu)
(Fix the path to the fileter menu.)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6751

svn path=/trunk/; revision=40661
2012-01-23 17:55:52 +00:00
Anders Broman
b458bdfe98 Update command codes.
svn path=/trunk/; revision=40660
2012-01-23 17:52:12 +00:00
Martin Mathieson
26d6d4ce8a Use plane rather than channelType as part of key for looking up channel
state for sequence analysis.

svn path=/trunk/; revision=40659
2012-01-23 14:39:38 +00:00
Anders Broman
e553c70fe8 From Michael Mann:
help page update (pcapng is now the default file format).

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

svn path=/trunk/; revision=40658
2012-01-23 07:48:53 +00:00
Guy Harris
ef2bf47e32 Add default extension names for all file types for which we have
extensions at all.

For file types that are plain text and that don't already have
extensions, add "txt" as the extension.

svn path=/trunk/; revision=40657
2012-01-23 02:38:56 +00:00
Martin Mathieson
7e5f6d9fc1 PDCP:
- Pass is_retx flag to PDCP from RLC in struct instead of calling function
RLC:
- use full key to look up sequence analysis results
    - avoids overwriting and attaching result details to wrong PDU
- add links to previous and next 'OK' PDUs in channel
- shorten some long variable and type names.

svn path=/trunk/; revision=40656
2012-01-23 02:36:46 +00:00
Martin Mathieson
7a17238dab Use detailed key for sequence analysis results to avoid overwriting with
other PDUs info from same frame.  Also:
- initialise next-frame value to 0
- don't show expected-SN when analysis result is 'ok'

svn path=/trunk/; revision=40655
2012-01-22 20:31:09 +00:00
Bill Meier
7ff47a2a32 Add a note as to how I was able to build & successfully use a Debug Qt Wireshark.
svn path=/trunk/; revision=40654
2012-01-22 19:52:40 +00:00
Gerald Combs
e10723aa96 [Automatic manuf, services and enterprise-numbers update for 2012-01-22]
svn path=/trunk/; revision=40651
2012-01-22 15:03:30 +00:00
Guy Harris
340d882fba All valid file types should have file type strings (and, currently, they
all do); get rid of the test for a null return from
wtap_file_type_string().)

If wtap_get_file_extensions_list() returns NULL, include the file type
in the list of filters, and use "*.*" as the filter.  That way the list
of filters will include all file types, even if you can't really ask
only for files of that type (actually, you can't really ask only for
files of *any* type unless you're running under a desktop environment
where file types are specified by, for example, looking for magic
numbers, as there's no guarantee that, for example, a pcap file will
have an extension at all, given that it might come from a command-line
tool that doesn't default to any extension).

svn path=/trunk/; revision=40650
2012-01-22 11:37:33 +00:00
Martin Mathieson
c585d8de24 Allow sequence analysis to be done either for PDCP frames found in RLC
frames, or logged at the PDCP level.  Provide a forward link to the next
SN frame for a channel.

svn path=/trunk/; revision=40649
2012-01-22 03:02:10 +00:00
Martin Mathieson
02e8a91a35 Various small tweaks to sequence analysis/re-assembly, plus implement
function to check for a frame being a retx as used by pdcp.

svn path=/trunk/; revision=40648
2012-01-22 02:55:47 +00:00
Martin Mathieson
3751e782dd Check for DL HARQ retx before calling RLC dissector to avoid sequence
number analysis problems.

svn path=/trunk/; revision=40647
2012-01-22 02:52:50 +00:00
Chris Maynard
00c3c66813 Google translate suggested a different spelling for Roman's name, so use it instead.
svn path=/trunk/; revision=40646
2012-01-22 02:14:55 +00:00
Chris Maynard
c0bd4e29b5 Added Roman Dontsenko to the authors list for his contribution to fixing bug 5687. I did my best with the Cyrillic translation, but for the actual Cyrillic spelling of his name, refer to bug 5687.
svn path=/trunk/; revision=40645
2012-01-22 02:11:54 +00:00
Chris Maynard
96f14a1946 Patch from DXDragon [AT] yandex.ru (using e-mail address instead of name because I don't know how to enter Cyrillic letters) to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5687 - Some PGM options are not parsed correctly.
svn path=/trunk/; revision=40644
2012-01-22 01:59:00 +00:00
Guy Harris
7b9deb699a We already added the separator *if* we needed it; don't add it again.
svn path=/trunk/; revision=40643
2012-01-21 23:50:06 +00:00
Guy Harris
cc4bae5159 Well, yeah, you can leave the list of patterns out, but then they don't
show up in the UI, and they appear to show up in the UI in the Windows
apps I've seen, so I guess Windows apps put the list of patterns into
the description.

svn path=/trunk/; revision=40642
2012-01-21 23:48:03 +00:00
Guy Harris
d494beebcf Fix calls to g_string_free() (added so as not to leak memory).
svn path=/trunk/; revision=40641
2012-01-21 23:45:15 +00:00
Guy Harris
d19dba2c76 At least according to the Microsoft documentation, you don't duplicate
the list of patterns; see what happens.

svn path=/trunk/; revision=40640
2012-01-21 23:44:19 +00:00
Guy Harris
1831fc8106 What you get from wtap_get_file_extensions_list() are extensions, not
patterns; add the "*.".

svn path=/trunk/; revision=40639
2012-01-21 23:23:18 +00:00
Guy Harris
73b8659ae4 Fix print call.
svn path=/trunk/; revision=40638
2012-01-21 23:09:40 +00:00
Guy Harris
34d26e6ee0 Append the trailing ), don't overwrite the string.
svn path=/trunk/; revision=40637
2012-01-21 22:07:49 +00:00
Anders Broman
d887821ef6 #define VENDOR_AT_AND_T 74
svn path=/trunk/; revision=40636
2012-01-21 21:59:37 +00:00
Anders Broman
fd9f182f4b Try to fix
packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function

svn path=/trunk/; revision=40635
2012-01-21 21:45:33 +00:00
Anders Broman
e8407dd6c1 Add the missing file from
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=40627

Patch was whining about csn1.h fixing that i must have missed that csn1.c did not get patched.

svn path=/trunk/; revision=40634
2012-01-21 20:26:46 +00:00
Alexis La Goutte
94e4fa3e76 Fix -v for QtShark
./Wireshark -v
wireshark 1.7.1 (SVN Rev Unknown from unknown)

Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz 1.2.3.4, with POSIX capabilities (Linux), with SMI 0.4.8,
with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt
1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27
2011 11:52:20), without AirPcap.

Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version
1.1.1, with libz 1.2.3.4, GnuTLS 2.10.5, Gcrypt 1.5.0.

Built using gcc 4.6.1.

get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c 
the function is common to GTK and Qt need to put in version_info.[ch] ?

svn path=/trunk/; revision=40633
2012-01-21 18:56:01 +00:00
Alexis La Goutte
3a4a342cbc Update gitignore after the change of gtk directory
svn path=/trunk/; revision=40632
2012-01-21 16:59:11 +00:00