summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-12-22Wrong array.Guy Harris1-1/+1
Change-Id: I69ceca8be624b13f910997dee3bc6852b61b0162 Reviewed-on: https://code.wireshark.org/review/5962 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22Improve the message for "this field has an integral type" assertions.Guy Harris2-3/+12
(Along the lines of provious changes.) Change-Id: I22d76f22400d4a93242392ff4688acc753eb0039 Reviewed-on: https://code.wireshark.org/review/5961 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Register the ORFEntry IP address as an IPv4 address.Guy Harris1-1/+1
We're adding it with proto_tree_add_ipv4(), so that it's displayed as, and can be tested as, an IPv4 address. That means that the field for it must be of type FT_IPv4, *even though it's calculated from an 8-bit prefix value* - you can't make it an FT_UINT8. Change-Id: I7d668fb2a707cdda4ad228afcbdcaf47ee6cba1b Reviewed-on: https://code.wireshark.org/review/5960 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Improve the message for "this field doesn't have the right type" assertions.Guy Harris2-28/+68
Give the field name in the message. Change-Id: I046c74b451b473c9c87c2980122b025390f82cc8 Reviewed-on: https://code.wireshark.org/review/5959 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Move another helper macro.Guy Harris1-5/+5
Change-Id: Id3801373526af57146a87abe9698b192074a0fa0 Reviewed-on: https://code.wireshark.org/review/5958 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Define helper macros before they're used.Guy Harris1-12/+12
The code works if they're defined afterwards, but defining them earlier makes it a bit clearer that they're helper macros used as components of the macros we're exporting. Change-Id: I326894eea67d2db43fedf4567699cd9eaaa0e004 Reviewed-on: https://code.wireshark.org/review/5956 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Use the "netbios" heuristic dissector list elsewhere.Guy Harris4-3/+42
Use find_heur_dissector_list() to find the "netbios" heuristic dissector list, rather than using code from packet-netbios.c. Change-Id: Ieeab58d7c6eb32491b026b242c687bd18c4d5cdb Reviewed-on: https://code.wireshark.org/review/5955 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Do not use packet scoped memory in GUIPascal Quantin7-19/+19
It will trigger an assertion Change-Id: I2436c11b45e1505a94256a06ed3ad0c5480e034b Reviewed-on: https://code.wireshark.org/review/5953 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-21Qt: rename SummaryDialog class to CaptureFilePropertiesDialogPascal Quantin3-5/+5
Change-Id: I79aa63621853ff15b8c568e1c7949fb8fa0caca2 Reviewed-on: https://code.wireshark.org/review/5929 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Qt: Better accordion frame layout.Gerald Combs1-9/+9
Calling invalidate + activate on the parent layout has better results than calling adjustSize on the parent widget. Change-Id: I844bee49b868d988b0fc93a72687407adf232ef9 Reviewed-on: https://code.wireshark.org/review/5951 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Do not use packet scope memory outside packet dissectorsPascal Quantin2-2/+2
Otherwise it will trigger an assert Fixes a regression introduced in gf002332 Change-Id: I0cffa2c952b7eff085a1834ebabfec03342095bd Reviewed-on: https://code.wireshark.org/review/5950 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-21no need for if(tree)Martin Kaiser1-25/+17
Change-Id: Ie06738d99851b35e53effb50b2c109ce50e9c6df Reviewed-on: https://code.wireshark.org/review/5949 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-21[Automatic manuf, services and enterprise-numbers update for 2014-12-21]Gerald Combs4-30/+314
Change-Id: I08b7be1ab911e8f578173a45dc2055a81e8cbffb Reviewed-on: https://code.wireshark.org/review/5945 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Replace ether_to_str with either address_to_str or tvb_ether_to_str.Michael Mann17-263/+157
Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260 Reviewed-on: https://code.wireshark.org/review/5933 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21Replace ax25_to_str and get_ax25_name with address_to_str.Michael Mann8-47/+27
Change-Id: I74ddb6fc629ef32b217dede7a3ba652cbbf5ab12 Reviewed-on: https://code.wireshark.org/review/5932 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21Allow "cba" filter prefix for hf_ fields (missed a Profinet file the first time)Michael Mann1-0/+1
Change-Id: I3ff65a8f6307a9ee08e173c0b2658d96985e0c45 Reviewed-on: https://code.wireshark.org/review/5943 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21Qt: keep "Copy to clipboard" button active when closing the ↵Pascal Quantin1-4/+0
capture_file_properties_dialog As the Capture File Properties window content is kept once the capture is closed, allow to copy it Change-Id: I11466e102fcf75a31aaa22225861ad8bf27f89a8 Reviewed-on: https://code.wireshark.org/review/5942 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-21Fix Python 3 compatibility in LocatePythonModulePeter Wu1-1/+1
Regression introduced with cb345eb4bd0149b4a71d6069f957600a83cc3417. Change-Id: I625432ac4572d2449cb6981a158e46c560a81f1a Reviewed-on: https://code.wireshark.org/review/5883 Reviewed-by: Maarten Bezemer <maarten.bezemer@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-21Add comments, change structure member name.Guy Harris1-9/+19
"GSList *" implies a list; call the pointer in a struct heur_dissector_list "dissectors", to indicate what it's a list *of*. Change-Id: Idf5011e08d35d28934cd52f818b945db1cc7f37b Reviewed-on: https://code.wireshark.org/review/5941 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Clean up some error messages.Guy Harris1-2/+4
Correct one message, change another one from a g_assert() to a g_error() with descriptive text. Change-Id: I667beb08ac1677205a9323ab623ed0a9766bac79 Reviewed-on: https://code.wireshark.org/review/5940 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21packet-PROTOABBREV.c: Update re #includeusageBill Meier1-4/+2
- packet.h should be first Wireshark #include after config.h and "system" includes. - '#include <glib.h>' not needed. Change-Id: Ibec076818f3f509aabb4d240e939ef719f3798d6 Reviewed-on: https://code.wireshark.org/review/5939 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21Cleanup use of #includes in a few recently committed dissectors.Bill Meier4-6/+2
Change-Id: Ie66d4c3f0c5d0037cac65ff39e4dedcedff462f1 Reviewed-on: https://code.wireshark.org/review/5938 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier978-2212/+359
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21Qt: Don't clear the capture file properties.Gerald Combs1-2/+0
Don't clear the contents of the capture file properties dialog when the capture closes. Retaining the contents lets users compare the properties for multiple files. Change-Id: I6bf684e7bd996f22032ec3d0adcddc343bb17992 Reviewed-on: https://code.wireshark.org/review/5937 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Qt: Fix accordion frame height calculation.Gerald Combs3-12/+41
Change-Id: I32d2ea2ff34544e285b52e4e35e035306c33d3aa Reviewed-on: https://code.wireshark.org/review/5935 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Have a heur_dissector_list_t be an opaque handle.Guy Harris54-91/+93
This allows dissector lists to be looked up by name, so they can be shared by multiple dissectors. (This means that there's no "udplite" heuristic dissector list, but there shouldn't be one - protocols can run atop UDP or UDPLite equally well, and they share a port namespace and uint dissector table, so they should share a heuristic dissector table as well.) Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7 Reviewed-on: https://code.wireshark.org/review/5936 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Qt: fix a crash when closing a file while capture file properties window is openPascal Quantin2-5/+14
refresh_button_ and copy_comment_button_ are not used neither initialized, get rid of them Also clear text areas and disable buttons Change-Id: I418d712313041dcf4f15aceee01497f01ae74918 Reviewed-on: https://code.wireshark.org/review/5927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Qt: disable Capture File Properties toolbar icon by defaultPascal Quantin1-1/+2
Otherwise it can be opened by clikcing on the icon just after launching Wireshark Also update tooltip to match the exact dialog name Change-Id: I5ce5e0c24f3dfb44c2303c78114102c5c03ccc88 Reviewed-on: https://code.wireshark.org/review/5930 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Remove profinet_type from packet_info structure.Michael Mann3-36/+43
Profinet I/O and DCOM CBA had completely separate uses for the profinet_type member, so it's okay to separate them with different proto ids tracking the proto_data. Change-Id: I7b9c01b8d4f74d51fe9f9ef2f957479dff0a7157 Reviewed-on: https://code.wireshark.org/review/5852 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21MIPv6: simplify fixed point degrees conversionLuke Mewburn1-31/+14
* Simplify the conversion of degrees from 24 bit fixed point to a float. Avoids strict-aliasing warning by gcc 4.4. * Add reference to RFC 6757. * Correct spelling of 'convert' in degrees_convert_fixed_to_float(). Change-Id: Icb680d009fdd960e8668fa3020060799d6a74c2f Reviewed-on: https://code.wireshark.org/review/5913 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-20Use "" rather than <> for includes; that might fix ABI check failures.Guy Harris1-2/+2
Change-Id: I80e291031e4e8e347422e4a1e636d2ce40efc5c2 Reviewed-on: https://code.wireshark.org/review/5931 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Qt: Use an accordion frame in the welcome screen.Gerald Combs3-15/+52
Place the recent files list in an accordion frame so that showing and hiding is more visually smooth. Change-Id: Ifdc534a33aa9f93949c9f919cfe0765fbfcde750 Reviewed-on: https://code.wireshark.org/review/5924 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Remove debugging code.Gerald Combs1-6/+0
Change-Id: If3a64a6914ae8ce2521c85766df6f733a13ca7e1 Reviewed-on: https://code.wireshark.org/review/5926 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Fix filter test for multifield custom columnStig Bjørlykke2-2/+2
This adds support for "field||field" without spaces. Change-Id: Ia738d6642d12a188d1629bbdd9701cc8f8bb7a68 Reviewed-on: https://code.wireshark.org/review/5922 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-20Qt: Revert back to an all-in-one main window.Gerald Combs3-230/+197
Switch back to having everything on the main window similar to GTK+. It's more cluttered but this way but you don't have to navigate the task selector to get to the recent files and help links. Retain the "Capture", "Open", and "Learn" imperative text. Move "Open" to the top as suggested by Michal. Change-Id: Iaf7d93f9caf686b5cbeb640e5e5f95ecb46f7f2d Reviewed-on: https://code.wireshark.org/review/5896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20802.11: VHT NDP announcement frame is no correctly decode when there is FCSAlexis La Goutte1-22/+28
The FCS at the end of the frame is decoded as additional STA info fields which does not seem correct. Issue reported by Sudheer Bug:10786 Change-Id: Idffaa41cd7c79ad4c9937e7f32aa2444c1b9033f Reviewed-on: https://code.wireshark.org/review/5849 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-20FCoIB / Infiniband SDP: prevent a crash when 'enable manual settings' is set ↵Pascal Quantin2-2/+6
without filling address field Bug: 10796 Change-Id: Ifdb7804ec5e1146b08f00e54647d802a69d52113 Reviewed-on: https://code.wireshark.org/review/5914 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-20no need for if (tree)Martin Kaiser1-38/+23
Change-Id: I0749f8e10d6f8d97b85da6bb52b0ab336ba06c38 Reviewed-on: https://code.wireshark.org/review/5919 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-20hide the hf_msmms_data item, not the NULL itemMartin Kaiser1-1/+1
Change-Id: If92c9bc281f44de8f3b1de71005240755748403a Reviewed-on: https://code.wireshark.org/review/5918 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-20Fix filter valid/invalid test for multifield custom typeMichal Labedzki5-20/+48
Check for "or" or "||" (also ignore whitespaces) and check both arguments of this operator to be fieldname (character check), then check whole filter is valid for dfilter compiler. Change-Id: I412b5dc1fca16fcd2b640aa74af81167300fd11e Reviewed-on: https://code.wireshark.org/review/5848 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-20Fix handling of 3-component OS version numbers.Guy Harris1-2/+3
Get rid of doubled square brackets (what were those for?), and match dots in the version number with "\.", so we only match dots. This fixes the handling of version numbers such as 10.10.1. (A 2-component version number doesn't match, but that's OK - the sed command doesn't use -n, so that just means it's unchanged by the command.) Change-Id: I3046133de732c80410592272d1f7b961a64d9289 Reviewed-on: https://code.wireshark.org/review/5915 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Qt: Add a CaptureFile class.Gerald Combs21-370/+567
Wrap the capture_file struct in a QObject which translates cf_cb_* and capture_cb_* events into signals. Move the global cfile to capture_file.cpp. Don't use a void pointer for the capture file struct. Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a Reviewed-on: https://code.wireshark.org/review/5885 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Consolidate RTP stream structs.Gerald Combs7-246/+169
Consolidate the three different RTP stream structs in ui/rtp_stream.h, ui/gtk/rtp_player.c, and ui/voip_calls.c into one. Make the member names a bit more consistent. Document what each GList contains. Use nstime_t for timestamps since that's what we get from the frame data. Use g_new0 to initialize our structs. Change-Id: I2b3f8f2051394a6a98a5c7bc49c117f07161d031 Reviewed-on: https://code.wireshark.org/review/5843 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Fix typo.Guy Harris1-10/+1
One position off on the keyboard and everything falls apart. Change-Id: I00909ca3344642d3eeaae0d8563403b56cc62f79 Reviewed-on: https://code.wireshark.org/review/5912 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20When checking for floorl(), include math.h.Guy Harris1-2/+6
It's not being found with MSVC, but is apparently present; perhaps math.h does something magic, e.g. defining it as a macro, so try using check_symbol_exists with "math.h". Change-Id: Idaecac641fb0b87d399807d8bf1fcb74e7251a4e Reviewed-on: https://code.wireshark.org/review/5911 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Add a check for floorl().Guy Harris2-3/+7
Also, we don't use NEED_STRPTIME_H, we use HAVE_STRPTIME. Change-Id: I330e8ce408c05b74c50f3369691283e35e68505c Reviewed-on: https://code.wireshark.org/review/5910 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Don't bother with __builtin_floorl().Guy Harris1-11/+0
At least as I read the GCC documentation, if GCC supports a builtin floorl() at all, it will always treat floorl() and __builtin_floorl() the same (it's reserved in C90 and defined in C99, so nobody should ever write C code assuming floorl() won't be treated in that afshion). In addition, the GCC 3.3.6 manual says nothing about __builtin_floorl(), so it probably won't help to use it. If it appears to help, there's probably something else going on. Also, GCC appears not to like "#ifdef (__GNUC__)", as the parentheses mean it's testing an expression, not a macro name. Change-Id: Ib88b52c366d7f3b1637bb408fb18d04b67c27e4b Reviewed-on: https://code.wireshark.org/review/5909 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Use AC_SEARCH_LIBS() for math functions.Guy Harris2-24/+31
Use it to check whether we need -lm for various math functions - including floorl(). Let it handle adding -lm, rather than having that in the various _LDADD macros. Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81 Reviewed-on: https://code.wireshark.org/review/5908 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Include <math.h> to declare floor().Guy Harris1-0/+2
Change-Id: I39de31c3e38b83aaec76396048e6960f609bc63e Reviewed-on: https://code.wireshark.org/review/5907 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Remove trailing white space.Guy Harris2-2/+2
Change-Id: I0777945a5234cf380e2f3bc2461cc638c316f499 Reviewed-on: https://code.wireshark.org/review/5906 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 03:02:17 +0000