aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-02-24epan: fix build error with gcc5Daniel Mack1-1/+1
gcc5 bails out with the below error. CC libwireshark_la-tvbparse.lo CC libwireshark_la-tvbuff_base64.lo tvbparse.c: In function 'cond_not_char': tvbparse.c:254:18: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] if (! offset < tt->end_offset ) { ^ cc1: all warnings being treated as errors Makefile:1843: recipe for target 'libwireshark_la-tvbparse.lo' failed Change-Id: I4e8654e97079da6b39be580fc766eecefb4c7ea6 Reviewed-on: https://code.wireshark.org/review/7339 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-24websocket: avoid recursion, use tcp_dissect_pdusPeter Wu2-50/+56
Use tcp_dissect_pdus to handle reassembly and avoid a recursion in dissect_websocket. The HTTP dissector is modified to preserve desegmentation functionality (tested with the capture from bug 8448). As tcp_dissect_pdus is used now, the workaround for bug 8448 can be removed and the actual frame dissection logic becomes simpler (the length is checked in get_websocket_frame_length). Bug: 10989 Change-Id: I67af96a6c7be88c2a77e1c4138abe90bdb880774 Reviewed-on: https://code.wireshark.org/review/7285 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-24NS Trace (NetScaler Trace) file format is not able to export specified packetsranushekhar1-0/+1
Bug: 10998 Change-Id: Ic2c5ad5b01be3e0c39b1e93badcc4f2246c420fe Reviewed-on: https://code.wireshark.org/review/7327 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: Anders Broman <a.broman58@gmail.com>
2015-02-24DNS: Ignore Client Subnet option's data length when > 16Alexis La Goutte1-5/+6
When DNS Client Subnet length is > 16, the limit coming from avoid stack smashing with tvb_memcpy Issue reported by Boaz Bug:10988 Change-Id: I6103ba47fac9817410c7fc399c18e96c66ab8438 Reviewed-on: https://code.wireshark.org/review/7308 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: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-24proto.c: avoid corrupting stack when printing a 64 bits field in ↵Pascal Quantin1-13/+13
BASE_DEC_HEX or BASE_HEX_DEC format Bug: 10994 Change-Id: Id5049054d5b04838df325f03a6bfa238a2063fb7 Reviewed-on: https://code.wireshark.org/review/7329 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: Michael Mann <mmann78@netscape.net>
2015-02-24Qt: Fix a crash when changing the layout.Gerald Combs5-5/+24
Freeze and thaw the packet list when changing the layout. This has the side effect of clearing the proto tree and byte view, which avoids reading a bad tvb pointer. Note that we might want to add a cleanup callback to free_data_sources. Save and restore the current row. Add CaptureFile::currentRow. Fix a couple of comparisons in PacketList. Change-Id: I26f9b97ae5a7cdb4fb6e5e6e675570884900e995 Reviewed-on: https://code.wireshark.org/review/7337 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-24pcap-common: fix build error with gcc5Daniel Mack1-1/+1
gcc5 complains about the issue below, so add a trivial fixup. CC libwiretap_la-pcap-common.lo pcap-common.c: In function 'pcap_byteswap_nflog_pseudoheader': pcap-common.c:1290:30: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] if (!(nfhdr->nflog_version) == 0) { ^ cc1: all warnings being treated as errors Change-Id: I9f5b090ffd564f203cc3fb4ff302f2e4752865f0 Reviewed-on: https://code.wireshark.org/review/7336 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-23BSSMAP: VGCS/VBS Assignment Request wrong first parameterunknown1-2/+2
According to specification first mandatary parameter is Channel Type (BE_CHAN_TYPE) but not Current Channel Type 1 (BE_CURR_CHAN_1). And also "Channel Type" is TLV but not TV type. Change-Id: I740dc10930a854fcb1cf2e09a19d57a16f8cf33e Reviewed-on: https://code.wireshark.org/review/7330 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-23Get rid of no-longer-needed variables.Guy Harris1-6/+4
Change-Id: I2758c4f57fdaaa61c1d73ca9b5ccaf427599a624 Reviewed-on: https://code.wireshark.org/review/7332 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-23Don't add redundant information to the top-level flags item for NBNS.Guy Harris1-5/+0
We already add the opcode, a "this is a response" indication for responses and, for non-WACK responses, the response code. No need to add it again. Change-Id: I2dd0f937568057a96cd70511c872f811ea838106 Reviewed-on: https://code.wireshark.org/review/7331 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-23RSVD: add missing initialization of lun parameterPascal Quantin1-0/+1
Bug: 10993 Change-Id: I0232cf616f880a02d50f20c67d9f76a642153737 Reviewed-on: https://code.wireshark.org/review/7328 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-23ui/gtk: use GTK+ 2 name for control keysPeter Wu1-2/+2
The GDK_KEY_* names are part of GTK+ 3, GTK+ 2 does not have the _KEY_ infix. See https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html#id-1.6.3.3.6 Fixes regression from "ui/gtk: fix control combos such as ctrl-a, ctrl-c". Change-Id: I4d470212d172f978c171e54ff7377ddc211817ac Reviewed-on: https://code.wireshark.org/review/7325 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-02-23ssl-utils: refactor keyfile matchingPeter Wu1-59/+61
Merge the three separate regexes into a single pattern and use named groups. This avoid magic numbers (group positions) and removes a possible error source when the ht array gets out of sync with the patterns array (by human error). This is supposed to be more readable and allows for easier extension of the regex. Change-Id: I816525f358cdb89ff9f8ebc1211139b1f8c23840 Reviewed-on: https://code.wireshark.org/review/7245 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-23jmirror packet dissector expects ipv6 flow label = 0Alexis La Goutte1-3/+3
When the ipv6 flow label is non-zero the dissector does not detect the payload as being ipv6. Issue reported by Shehan Perera Bug:10976 Change-Id: I1de4966dfefd1afa9bb51b9a7570091aad59fbdd Reviewed-on: https://code.wireshark.org/review/7260 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-23L2CAP information message contained two bits that were wrongly dissected.Jeroen Sack1-2/+2
Change-Id: I308b6ed1a3953676212b9c0bb6cd7fc180210534 Reviewed-on: https://code.wireshark.org/review/7323 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-23Fix generation of address-with-resolution strings.Guy Harris1-26/+26
XXX_to_str routines should return the length, in bytes, of the generated string, including the terminating '\0'. As their reutrn values include the terminating '\0', we need to subtract 1 from the return value if, when appending the ")" after the address string, we want to skip past the address string rather than skipping past the terminating '\0'. Change-Id: Ibfd41e6d7152d05070706e6d76fc3e56a097a75b Reviewed-on: https://code.wireshark.org/review/7324 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22BMP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I322be0953ce8c872f8464c3e095dfe9006d3b67b Reviewed-on: https://code.wireshark.org/review/7261 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-22Fix handling of longitude and latitude values.Guy Harris1-3/+3
The formatting routine is getting passed the 5-byte value, not some 8-byte value that includes the 3 bytes after it, so shifting it produces the wrong value. Make the longitude and latitude FT_UINT40, as they're only 5 bytes long. Change-Id: I35aa05887bcfdfc1107fef2ac5069f1fe96fda3a Reviewed-on: https://code.wireshark.org/review/7321 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Clean up display of raw hex latitude/longitude values.Guy Harris1-1/+1
1) It's only 40 bits long, so show only 10 hex digits. 2) If you're putting "0x" before the number, blank-padding on the left looks weird; use zero-padding. 3) Fix unbalanced parentheses. Change-Id: I76aedb1fb82f699ee08102b97b0d72e09d8c5917 Reviewed-on: https://code.wireshark.org/review/7320 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Put back address family field.Guy Harris1-0/+1
Change-Id: I89d60f78a0c834663c426f5ec50c6033ba9f99e1 Reviewed-on: https://code.wireshark.org/review/7318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Use file extensions even more as a heuristic.Guy Harris1-3/+56
If a file type has a list of "typical" extensions, and a file has an extension that is *not* one of those extensions, the file is unlikely to be of that type. For files that have extensions, after we try the heuristics that have a list of "typical" extensions that includes the file's extension, try the heuristics that have no such list, and after that try the heuristics that have such a list but where the list *doesn't* include the file's extension. This fixes, for example, some cases where non-PacketLogger files were getting identified as PacketLogger files. Change-Id: I2d8c3b983ed6ccd692beb888668f77eb9b5f437b Reviewed-on: https://code.wireshark.org/review/7315 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22[Automatic manuf, services and enterprise-numbers update for 2015-02-22]Gerald Combs5-28/+248
Change-Id: Ida0ae626be0753c05435f3828d5137863309ebf1 Reviewed-on: https://code.wireshark.org/review/7309 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-22Make FT_{U}INT{40,48,56,64} handle BASE_CUSTOM.Guy Harris1-85/+23
Finish the job of handling integral values > 32 bits similarly to who we handle values 32 bits or less. In cases that "should not happen", and where we might *not* be executing in the context of a dissector (filling in the field label can be done lazily, being deferred to "print" time, and that doesn't happen in the context of a dissector), use g_assert_not_reached() rather than DISSECTOR_ASSERT_NOT_REACHED() - the latter throws an assertion that's not caught if we're not doing dissection, so we crash anyway. Bug: 10983 Change-Id: Ia81a0a4925394f99aa35193a333f3e9659a9b93d Reviewed-on: https://code.wireshark.org/review/7307 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Set 64-bit signed values with proto_tree_set_int64().Guy Harris1-1/+1
As in "don't set it with proto_tree_set_uint64(), signed vs. unsigned matters". Change-Id: I23ef3d172fa40c0867dfb6a078ce292bd5282170 Reviewed-on: https://code.wireshark.org/review/7306 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Fetch values appropriately according to the value's type.Guy Harris1-4/+5
This fixes some crashes. Change-Id: I47583777486486114675ba98cb58971adb8b1b10 Reviewed-on: https://code.wireshark.org/review/7305 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-22Add tvb_address_with_resolution_to_str.Michael Mann11-95/+80
Convert dissectors to using the API where appropriate. Change-Id: I059582f73a75635d4a0338d02d4c4b212162480b Reviewed-on: https://code.wireshark.org/review/7296 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-21Update Debian symbols list.Guy Harris1-1/+1
Change-Id: Iaf5d8022f2005ac32133896c74f45246a2310684 Reviewed-on: https://code.wireshark.org/review/7303 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21Remove tvb_ from the names of wsutil mempbrk routines.Guy Harris14-92/+94
Routines that don't take a tvbuff as an argument shouldn't have tvb_ in the name. Change-Id: I3550256551e30b3f329cbbfca71ef27c727d29c0 Reviewed-on: https://code.wireshark.org/review/7302 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21Rename the slower-but-portable mempbrk to ws_mempbrk_portable_exec().Guy Harris3-6/+6
That parallels ws_mempbrk_sse42_exec(). Change-Id: I1662badc6d1efab5bdd827f29bbad3712464ec43 Reviewed-on: https://code.wireshark.org/review/7301 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21Move declarations of internal ws_mempbrk routines to a separate header.Guy Harris5-9/+35
Put the internal routines, which are only to be used by the implementation of the mempbrk functions, to a separate header file, so that they're not exported even in the standard header file. Change-Id: I92c39b138de3e4f9da1b102210b39d50728e2fd6 Reviewed-on: https://code.wireshark.org/review/7300 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21More wrapping of constants with G_GUINT64_CONSTANT().Guy Harris1-18/+18
Change-Id: I11771b08cc4e57692c42dd3fc8976fe390b3025d Reviewed-on: https://code.wireshark.org/review/7299 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21Update Debian symbols file.Guy Harris1-1/+5
Change-Id: Ide84741afffbd7c8c6dac44cf456291e2609af9d Reviewed-on: https://code.wireshark.org/review/7298 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-2164-bit constants need to be wrapped in G_G{U}INT64_CONSTANT().Guy Harris1-6/+6
Otherwise, they don't get the right suffix to tell the compiler that they're 64-bit even on ILP32 platforms. Change-Id: I5c52a999d21707602e0a4174a142d1d1036242be Reviewed-on: https://code.wireshark.org/review/7297 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21The shortening to 32 bits is intentional, so add a cast.Guy Harris1-4/+4
The cast reassures the compiler that we do, in fact, know what we're doing, so it doesn't issue a warning. Change-Id: Ie3bc4e1c955f9c5cad5506e26fc72e12f7a8f854 Reviewed-on: https://code.wireshark.org/review/7295 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-21Bluetooth/GUI: ATT: Use alphabetical order in makefileMichal Labedzki1-2/+2
Change-Id: Ia34dd6b783a1c8214956166b07ffb1537f04aa1d Reviewed-on: https://code.wireshark.org/review/7291 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Ftypes: Double: Minor fixesMichal Labedzki1-6/+8
Fix comments typos and use safe equivalent of sprintf. Change-Id: Icc9d69532dc35e8a58a78c0eacdb42214b679069 Reviewed-on: https://code.wireshark.org/review/7290 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Qt: Fix for QT < 4.8Michal Labedzki1-0/+4
QApplication::queryKeyboardModifiers() was introduced in 4.8. Try to be compatibile with my old Qt 4.7.2. Change-Id: Ie4abdd397cf2f10bb50132b09fed198d30425ee7 Reviewed-on: https://code.wireshark.org/review/7289 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Set phdr encap for pcap fileMichal Labedzki1-0/+2
Change-Id: Id600b395d6fd2711c9b392a60454e5bd9a3eb465 Reviewed-on: https://code.wireshark.org/review/7288 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Use correct mem scope for source address in Text LogcatMichal Labedzki1-1/+1
Change-Id: I94594e5c7ad8a398dd86ee3fe496077196f81fb9 Reviewed-on: https://code.wireshark.org/review/7287 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Fix GTK-sharkMichal Labedzki1-1/+1
Looks like a copy/paste issue. ERROR: wireshark/color_filters.c:100:color_filters_add_tmp: assertion failed: (strlen(prefs.gui_colorized_fg)==69) Change-Id: I7b8309cfc178fd834951078a098bbce986639ed2 Reviewed-on: https://code.wireshark.org/review/7286 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-21Make FT_{U}INT64 behave more like FT_{U}INT32, add support for ↵JC Wren26-465/+1725
FT_{U}INT{40,48,56} Change-Id: I57354c309ecf3a0c8f0c7cff485638027f30bb19 Reviewed-on: https://code.wireshark.org/review/5813 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-21Convert dissectors to use address_with_resolution_to_str instead of two ↵Michael Mann8-86/+82
separate calls for address string and name resolution. Change-Id: I7c8cfbcf201b3b73afe731302572646ce7833d64 Reviewed-on: https://code.wireshark.org/review/7284 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-21checkAPIs: match packet-*.[ch], independent of localePeter Wu1-1/+1
In perl, the \w character group seems to match '-' depending on the locale. On Linux (with the C or en_US.UTF-8 locale), packet-ssl-utils.c does not match. This patch makes the regex match anything except for the path separator. Change-Id: I27543072295af5f2bd5ea8ab36e5d913bebf7d85 Reviewed-on: https://code.wireshark.org/review/7266 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-21Call pre_init_prefs each time our profile changes.Gerald Combs2-54/+67
Manually back out gafa96c3 so that we can set our preferences to their default values each time we switch profiles. Zero the prefs struct at startup. Change-Id: Ic28db44cd0c4cdf640e977d7277f7357db10ebe8 Reviewed-on: https://code.wireshark.org/review/7282 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-21Qt: Fix unsaved changes behavior.Gerald Combs3-10/+11
Check the return value of testCaptureFileClose in MainWindow::openCaptureFile and add testCaptureFileClose to MainWindow::closeEvent. Some of the file opening and closing behavior still needs to be cleaned up but this should at least keep the user from losing unsaved data. Bug: 10944 Change-Id: I7d7b563a6b72f48b41a5a3aff2837655557869ff Reviewed-on: https://code.wireshark.org/review/7283 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-20Clear the filter expression list in prefs.c.Gerald Combs6-13/+39
Move filter_expression_nuke from ui/gtk to epan and rename it to filter_expression_free. Call it in prefs_reset along with the other preference reset routines. This keeps the Qt filter toolbar from filling up with duplicate expressions when the profile changes. Change-Id: I9fae9a7b48944079ea342a126979d9e79af0d22b Reviewed-on: https://code.wireshark.org/review/7281 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-20Qt: Apply the main window geometry directly.Gerald Combs1-51/+16
As of g2c00d66 we create the main window after we've read the recent settings. This means that we can get rid of the property animation workaround in MainWindow::loadWindowGeometry. Change-Id: I028061c5bdab9261f9394a1840bcdcb752a4f0c8 Reviewed-on: https://code.wireshark.org/review/7278 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-20ui/gtk: fix control combos such as ctrl-a, ctrl-cPeter Wu1-2/+10
Ignore any Ctrl combinations to allow pasting to work. Regression introduced in "gtk: fix crash on Broadway GDK backend". Change-Id: I3d53db2d224cb604b52081002ff923c8684a8d0a Reviewed-on: https://code.wireshark.org/review/7276 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2015-02-20[Diameter] It's MCC first in 3GPP AVP 909 RAIAndersBroman1-9/+8
Change-Id: If4dd0d64d5a8d313ae9e62d2fcce3606ef8eb4f4 Reviewed-on: https://code.wireshark.org/review/7274 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-20addr_resolv.c: fix a stack buffer overflow detected by ASANPascal Quantin1-1/+1
Issue reported by Alexis Change-Id: I0ef19625b6844fbc2996b75d51e86f949e358c8d Reviewed-on: https://code.wireshark.org/review/7273 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 21:16:30 +0000