aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-01-24Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6738 :Jeff Morriss1-1/+1
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-24From Michal Labedzki via ↵Jeff Morriss1-40/+100
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-24From njtaylor0101 [AT] gmail.com via ↵Jeff Morriss1-14/+9
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-24Don't treate WTAP_FILE_UNKNOWN as a real file type.Guy Harris1-0/+8
svn path=/trunk/; revision=40679
2012-01-23In the table of capture file types, have:Guy Harris4-92/+116
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-23Revert 40675 and set 'protocol' appropriately when IPv6 is used.Jeff Morriss1-101/+106
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-23g_string_append_printf() returns nothing.Guy Harris1-1/+1
svn path=/trunk/; revision=40676
2012-01-23Initialize 'protocol' to something, at least until it can be properly ↵Jeff Morriss1-1/+2
assigned in the IPv6 and default cases. svn path=/trunk/; revision=40675
2012-01-23Have wtap_file_extension_default_string() return the extension in theGuy Harris2-4/+9
sense of "what follows the last . in the file name", i.e. not including the ".". svn path=/trunk/; revision=40674
2012-01-23Only continue dissection if protocol is UDP.Anders Broman1-56/+60
svn path=/trunk/; revision=40673
2012-01-23Fix some duplicate display filter names.Chris Maynard5-17/+17
svn path=/trunk/; revision=40672
2012-01-23Finish wrapping heuristic dissector functions in #if conditionals; change ↵Jeff Morriss1-8/+21
the condition to check if HEUR_DISSECTOR_LIST is defined. svn path=/trunk/; revision=40671
2012-01-23Put back the #include changes from a previous commit.Guy Harris1-7/+7
svn path=/trunk/; revision=40670
2012-01-23Fix some duplicate display filter names.Chris Maynard6-15/+15
svn path=/trunk/; revision=40669
2012-01-23Remove a debug statement.Anders Broman1-1/+1
svn path=/trunk/; revision=40668
2012-01-23Add the code to add a Heuristics protocol page.Anders Broman1-30/+290
#if 0:d out for now. svn path=/trunk/; revision=40667
2012-01-23From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6743 :Jeff Morriss1-12/+19
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-23Roman Donchenko → Роман ДонченкоGerald Combs1-1/+1
svn path=/trunk/; revision=40665
2012-01-23Fix some duplicate display filter names.Chris Maynard5-14/+14
svn path=/trunk/; revision=40664
2012-01-23From Pascal Quantin:Anders Broman1-11/+17
Use the private data if available, call the data dissector for data. svn path=/trunk/; revision=40663
2012-01-23From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6754 :Jeff Morriss1-30/+28
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-23Not working Conversation Filter in (analyse menu)Anders Broman1-5/+3
(Fix the path to the fileter menu.) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6751 svn path=/trunk/; revision=40661
2012-01-23Update command codes.Anders Broman1-4/+21
svn path=/trunk/; revision=40660
2012-01-23Use plane rather than channelType as part of key for looking up channelMartin Mathieson1-3/+3
state for sequence analysis. svn path=/trunk/; revision=40659
2012-01-23From Michael Mann:Anders Broman4-7/+8
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-23Add default extension names for all file types for which we haveGuy Harris1-13/+13
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-23PDCP:Martin Mathieson4-147/+256
- 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-22Use detailed key for sequence analysis results to avoid overwriting withMartin Mathieson1-21/+77
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-22Add a note as to how I was able to build & successfully use a Debug Qt ↵Bill Meier1-0/+9
Wireshark. svn path=/trunk/; revision=40654
2012-01-22[Automatic manuf, services and enterprise-numbers update for 2012-01-22]Gerald Combs3-15/+214
svn path=/trunk/; revision=40651
2012-01-22All valid file types should have file type strings (and, currently, theyGuy Harris1-14/+20
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-22Allow sequence analysis to be done either for PDCP frames found in RLCMartin Mathieson1-12/+68
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-22Various small tweaks to sequence analysis/re-assembly, plus implementMartin Mathieson2-20/+39
function to check for a frame being a retx as used by pdcp. svn path=/trunk/; revision=40648
2012-01-22Check for DL HARQ retx before calling RLC dissector to avoid sequenceMartin Mathieson1-11/+7
number analysis problems. svn path=/trunk/; revision=40647
2012-01-22Google translate suggested a different spelling for Roman's name, so use it ↵Chris Maynard1-1/+1
instead. svn path=/trunk/; revision=40646
2012-01-22Added Roman Dontsenko to the authors list for his contribution to fixing bug ↵Chris Maynard1-0/+1
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-22Patch from DXDragon [AT] yandex.ru (using e-mail address instead of name ↵Chris Maynard1-0/+4
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-21We already added the separator *if* we needed it; don't add it again.Guy Harris1-1/+1
svn path=/trunk/; revision=40643
2012-01-21Well, yeah, you can leave the list of patterns out, but then they don'tGuy Harris1-1/+2
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-21Fix calls to g_string_free() (added so as not to leak memory).Guy Harris1-2/+2
svn path=/trunk/; revision=40641
2012-01-21At least according to the Microsoft documentation, you don't duplicateGuy Harris1-17/+17
the list of patterns; see what happens. svn path=/trunk/; revision=40640
2012-01-21What you get from wtap_get_file_extensions_list() are extensions, notGuy Harris1-2/+2
patterns; add the "*.". svn path=/trunk/; revision=40639
2012-01-21Fix print call.Guy Harris1-1/+1
svn path=/trunk/; revision=40638
2012-01-21Append the trailing ), don't overwrite the string.Guy Harris1-1/+1
svn path=/trunk/; revision=40637
2012-01-21#define VENDOR_AT_AND_T 74Anders Broman1-37/+38
svn path=/trunk/; revision=40636
2012-01-21Try to fixAnders Broman1-1/+1
packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function svn path=/trunk/; revision=40635
2012-01-21Add the missing file fromAnders Broman1-57/+113
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-21Fix -v for QtSharkAlexis La Goutte3-3/+72
./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-21Update gitignore after the change of gtk directoryAlexis La Goutte1-1/+1
svn path=/trunk/; revision=40632
2012-01-21Revert a recent spelling change back to its UK variant.Chris Maynard1-4/+4
svn path=/trunk/; revision=40631