Commit Graph

52896 Commits

Author SHA1 Message Date
ruengeler 53eeff6c91 Do not leave the Options Interfaces Dialog open, when the Main Window is closed.
Change-Id: Ifd4fb88ceff24561131fad1d72531889e323f5ac
Reviewed-on: https://code.wireshark.org/review/1651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-15 11:58:57 +00:00
Guy Harris 45da41d6fe Fix declaration to match definition.
Change-Id: I9fcfddb34b2a22c3e2cf8f8fc9671eed2e8aef43
Reviewed-on: https://code.wireshark.org/review/1649
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-15 04:17:01 +00:00
Guy Harris 84fcadcb05 Get rid of some uses of tvb_get_ptr().
Change-Id: I85232f984f273c9a6ceccd12df5b77a4d131596c
Reviewed-on: https://code.wireshark.org/review/1648
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-15 03:23:38 +00:00
Guy Harris 09bf1702a6 Get rid of some uses of tvb_get_ptr().
Introduce a new tvb_ipxnet_to_string() routine to help that.

Change-Id: Icb27f7cdd6e6e7de67e765715e450063d7de6072
Reviewed-on: https://code.wireshark.org/review/1647
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-15 03:16:15 +00:00
Guy Harris 1bfe396ca4 Get rid of some uses of tvb_get_ptr().
Change-Id: Ib49575e5d92419e0860bf92810a7ac69f30e9699
Reviewed-on: https://code.wireshark.org/review/1646
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-15 03:02:02 +00:00
Guy Harris b8f0e8cf03 Eliminate some calls to tvb_get_ptr().
Change-Id: I1c5e10467d68ed7372dfaa9109b350238418ffc1
Reviewed-on: https://code.wireshark.org/review/1645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-15 02:31:14 +00:00
Evan Huus d7f1ac33f6 wmem documentation updates
Change-Id: Ief20460ed8ec1b4bd1286cc2a5490d9aeefdf98f
Reviewed-on: https://code.wireshark.org/review/1643
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-14 20:05:14 +00:00
AndersBroman 9c07e97272 Add an expert info for GT with no digits.
Change-Id: I3595af1cae77fb07be942289b4a53c9edbd768fb
Reviewed-on: https://code.wireshark.org/review/1561
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-14 20:04:48 +00:00
Balint Reczey 99e92aca85 Drop unused voip_bg.xpm
Change-Id: I1130d9dbfb0aaf9b1de460cd26e136514b9b80b2
Reviewed-on: https://code.wireshark.org/review/1642
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-14 19:18:29 +00:00
Pascal Quantin bc15fad105 AMQP: always display its name in protocol column, whatever the protocol version
Bug: 10101
Change-Id: I41105b250384bd44c37c0707ad41c9d76700bc75
Reviewed-on: https://code.wireshark.org/review/1641
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-14 18:53:03 +00:00
Evan Huus a1b939313f Revert "Don't throw for offset at end of TVB with len -1."
This reverts commit fe195c0c97.

Conflicts:
	epan/tvbuff.c

Change-Id: I1af618d0bd1e6211281b6d67c0ad197cfa513a0c
Reviewed-on: https://code.wireshark.org/review/1639
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-14 17:12:12 +00:00
Peter Wu d7c4bde279 tcp: display calculated checksum
While debugging a network issue, I found incorrect TCP checksums. These
are shown in the packet details, but are not available as column. This
patch adds the "tcp.checksum_calculated" field which is only available
if a checksum can be calculated (i.e., checksumming is enabled and the
full segment is available).

The fields are added separately for each checksum case to make it appear
before "Checksum Bad/Good" and to avoid calculating the expected field
value for the "good" cases.

Change-Id: I36af7894d526382ef636c5fa51e74871212b2909
Reviewed-on: https://code.wireshark.org/review/1627
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-14 16:59:04 +00:00
Bill Meier aa5d91284b Add a comment indicating that 'PLATFORM' is apparently set only for X64.
Change-Id: I5248c421e53a4347789c076433af004697a1b682
Reviewed-on: https://code.wireshark.org/review/1637
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-14 15:45:49 +00:00
AndersBroman fbf3391246 - curr_layer_num got wrong for STUN.
- Change depreciated API.

Change-Id: I6f83f45d2d007d42efc9d81cbaa58c50e67373f1
Reviewed-on: https://code.wireshark.org/review/1636
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-14 15:44:35 +00:00
Evan Huus beb119f911 Don't use -1 as length in frame dissector.
Additional belated followup to gfe195c0c9 per conversation on -dev about the use
of -1 and when we should throw exceptions. See also g867a1827e7.

Should (in theory) permit reverting gfe195c0c9.

Bug:9999
Bug:10030
Change-Id: I56e5f4e5dc12fe82268243d0b113cfc9ff5fdd17
Reviewed-on: https://code.wireshark.org/review/1603
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-14 15:42:27 +00:00
Mark Weel b2055d73a8 Update enums to SISO_REF_010-00v20-0 Annex A, section A.1 and A.2
Change-Id: Ic4099145d84541297d72b018b21f88b4a120b138
Reviewed-on: https://code.wireshark.org/review/1634
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-14 15:41:32 +00:00
AndersBroman 836530e985 - Replace tvb_length_remaining -> tvb_captured_length_remaining,
- Use length_remaining in tvb_find_line_end() rather than -1 it should
  give a faster code path.

Change-Id: Ia6c289f1701add48429b25152db8a8e5cea9e053
Reviewed-on: https://code.wireshark.org/review/1632
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-14 10:50:22 +00:00
ruengeler 2828bf7777 The filter string can only be valid, if an interface is selected.
Change-Id: I578f6b46d5e2631c6315eb0a8b6141ba93ee21bb
Reviewed-on: https://code.wireshark.org/review/1631
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-14 10:46:15 +00:00
Guy Harris dcdd076ab0 pcapng->interface_data is an array of interface_data_t.
Change-Id: Ida44a8820948d509e74ab8475979e8695abb4288
Reviewed-on: https://code.wireshark.org/review/1630
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-14 02:26:47 +00:00
Alexis La Goutte 2c00d66fb7 Use pre-scan command line parameters with double while(opt=getopt...)
Don't need launch "Qt" for some console only parameters (-h -v ...)

Based on GTK+ code

Change-Id: I1a810e394088959aefbbb39fb88836591a8b2367
Reviewed-on: https://code.wireshark.org/review/1311
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 16:41:30 +00:00
Alexis La Goutte 218b8c9ad9 HTTP2 enhance display when priority flag is set
* Add bitmask and fix length for exclusive flag
* Add missing bitmask for stream dependency
* Add fielder with calcultated weight value (weight+1, see spec for more information)

Change-Id: I7a6e97be068a80caa7355f593d9497c431c681ed
Reviewed-on: https://code.wireshark.org/review/1625
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 16:38:38 +00:00
AndersBroman 3157bf6ba5 isprint() -> g_ascii_isprint()
Change-Id: Ia586ef8ce500d5fc7578c52014206fa7a7eaea41
Reviewed-on: https://code.wireshark.org/review/1624
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 16:14:07 +00:00
AndersBroman f7819de76a In ascii_xx_inplace use g_ascii_isupper/g_ascii_islower directly, it
*should* be slightly more efficient.

Change-Id: I3081e2e25f241cdb07fa46011f50709fd560fb1c
Reviewed-on: https://code.wireshark.org/review/1626
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 16:07:08 +00:00
AndersBroman cd8188ddb8 Reduce the number of calls to tvb_reported_lenght_remaining().
Change-Id: I717572d403b38a33ccd5e390ace3742f3d296250
Reviewed-on: https://code.wireshark.org/review/1622
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 11:49:31 +00:00
Alexis La Goutte f9647404e3 Enhance HTTP2 dissector
* Add missing padding for CONTINUATION frame
* Add filter for generated padding length
* add unused flags

Change-Id: I98ff759595d3018f11b6d3ec9ea298e92e032d73
Reviewed-on: https://code.wireshark.org/review/1604
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-13 09:10:33 +00:00
Alexis La Goutte c32fb055ca Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ieac2f4a288f6ed084f2ea83ad409e217168065b2
Reviewed-on: https://code.wireshark.org/review/1621
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 08:45:51 +00:00
Anish Bhatt fb1e251723 LLDP cleanup : Management Address TLV
Change-Id: I324fdd0482a9740f24e74688bd17d768fc37f60c
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1620
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 06:27:14 +00:00
Pascal Quantin 67bc39417c IPsec: fix implicit conversion of pointer warning
Change-Id: Id1b62e2a7ea525cf2d421e41d9f344d24b56506d
Reviewed-on: https://code.wireshark.org/review/1619
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-13 05:12:25 +00:00
Evan Huus 44191fc05b Dumber "simple" wmem allocator.
Instead of maintaining a hash table, just alloc a really big array of pointers.
This is theoretically bad since it means frees and reallocs become O(n), but in
practice it makes the capture from bug 10098 run about 20% faster under
valgrind. This makes sense, since the workload is heavily dominated by
allocations, and most frees/reallocs are recently allocated (so they will be
found quickly at the beginning of the scan).

Bug:10098
Change-Id: I7097ad0653d3fb5f4f723cc84046cbc4450e3494
Reviewed-on: https://code.wireshark.org/review/1602
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 04:21:21 +00:00
Martin Mathieson f1c240685d Allow 16 SAs to be added, but allocate on heap to avoid growing stack
Change-Id: I68a4437c35c6e1e629cace06cfea07ae1ec45066
Reviewed-on: https://code.wireshark.org/review/1616
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13 04:17:14 +00:00
Gerald Combs 2981ae46ad Add default paths for the Qt online installer for Windows.
Change-Id: I55d1ad6e4cc14aa5f02597d2afc8512018181543
Reviewed-on: https://code.wireshark.org/review/1618
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-12 22:17:53 +00:00
AndersBroman 89e61b9b37 Save the result of tvb_reported_length_remaining() and use it to reduce the number of calls to tvb_reported_length_remaining().
Change-Id: I6c110d7d995e4c771bbeea9013d867c46ca96778
Reviewed-on: https://code.wireshark.org/review/1613
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-12 21:49:00 +00:00
Martin Mathieson d7befa8b26 Fix copy-and-paste error with cause value_strings, and change indentation to match generated code
Change-Id: I629f010f2430c5765c1adb41c57e6ea26d92b049
Reviewed-on: https://code.wireshark.org/review/1615
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-12 21:45:35 +00:00
Sean O. Stalley a22b91250f Added dissection of EPHandleDelete Req & Resp packets
Added support for dissecting Media Agnostic USB EPHandleDelete
Req & Resp packets.

Change-Id: I225a38291c3f47065755c01b336ef75c719e5d58
Reviewed-on: https://code.wireshark.org/review/1546
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-12 20:15:40 +00:00
Gerald Combs 9803122c8e Ignore SIGPIPE on systems that have it.
According to the GTK+ docs, gtk_init calls "signal(SIGPIPE, SIG_IGN)" at
startup. Replicate that behavior here, otherwise we tend to terminate
unexpectedly.

Change-Id: Ia017402755d647e6050af40deacef6765eea8694
Reviewed-on: https://code.wireshark.org/review/1614
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-12 17:05:06 +00:00
Bill Meier 483e459a7e Do some cleanup related to deprecated function names and revised function return values):
- tvb_length_remaining() ==> tvb_captured_length_remaining();
- tvb_ensure_length_remaining() ==> tvb_ensure_captured_length_remaining();
- tvb_(captured|reported)_length_remaining() now return 0 instead of -1 if error
   and thus MAX(0, ...) is no longer required;
- Rename variable: length_remaining ==> captured_length_remaining;
- tabs ==> spaces (to match editor modelines).

Change-Id: I93b947a0a4cc52ccd2ad21c914abf4c4218b59e6
Reviewed-on: https://code.wireshark.org/review/1610
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-12 16:00:26 +00:00
Pascal Quantin d1d5caaf25 Fix tshark -z follow,tcp stats regression when TCP stream index is > 0
With tshark stats are being configured before the file gets loaded and the number of TCP streams are computed

Bug: 9541
Change-Id: I42c2891124f1781b05967d5f071ad40df2d6d9f5
Reviewed-on: https://code.wireshark.org/review/1598
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-12 05:20:45 +00:00
Michael Mann 9554b2fc62 Condense DIS dissector to a single file.
This doesn't appears to be "autogenerated", and it certainly isn't the biggest dissector even after the merge.  This avoid file pollution, makes less non-static variables/functions and makes the check* scripts job easier.

Change-Id: If94857e4a3e602c3d45201b1aebbf466ba3e1dd1
Reviewed-on: https://code.wireshark.org/review/1597
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-12 01:41:23 +00:00
Evan Huus d73400a607 Minor optimization to packet-frame.c
When printing the protocol list item (which happens for every packet when using
tshark -T) the resulting string is almost guaranteed to be longer than the
default 16 characters. By allocating a bigger buffer right away we avoid some
potentially-expensive reallocs as the string grows.

Change-Id: Iaa35840f66975f03d8f92bbea26979df48bbc887
Reviewed-on: https://code.wireshark.org/review/1601
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-11 23:13:54 +00:00
Evan Huus ff466a9b92 Increase time permitted when fuzzing with valgrind.
The capture on bug 10098 times out but I don't see any culprits for bad loops or
anything - I think the capture is just too big. I'd prefer somebody else take a
look at it to verify I'm not missing anything before submitting this.

Bug:10098
Change-Id: I2cc43fd6ac9afaa345e7d31184483a9732fd6bf0
Reviewed-on: https://code.wireshark.org/review/1583
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-11 21:13:06 +00:00
Joerg Mayer 03f75ddfee It is possible to check out a source tree that is not co-located with
the .git repository. First attempts to support that setup.

Change-Id: Ie1560c372e23e58fb0e310f681388b5e1a65ba5b
Reviewed-on: https://code.wireshark.org/review/1596
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-11 19:35:33 +00:00
Joerg Mayer 7a010fa71b NEWS got updated again. This shows two inconsistencies how
Gerald's and my machine generate this file:
- Line width seems to be different
- We use different time zones.
Is there a way to make at least the first point consistent?

Change-Id: I1f7ac0318eccc2fc5af94bfb8dc1f4e7410d4bcc
Reviewed-on: https://code.wireshark.org/review/1595
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-11 19:25:04 +00:00
Pascal Quantin 98f608cc0d Identify client/server by their IP address and port number in follow streams dialog box
This allows to properly identify hosts that use the same port number

Change-Id: I93bf5b53e4df1d339fb06b372b90f88fce6785a0
Reviewed-on: https://code.wireshark.org/review/1588
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-11 17:01:54 +00:00
Gerald Combs 44d83c2f4f Don't build update-sminmpec by default when using CMake.
Change-Id: Iccce783eeef23a90ca23900cf18e2d3d2620c767
Reviewed-on: https://code.wireshark.org/review/1592
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-11 16:54:10 +00:00
Pascal Quantin 4af23b0d7f Fix display of unidirectional follow TCP/UDP streams
It was broken since 48285bb16b
While we are at it, display the streams in the same order as Qt version

Change-Id: I12df1c033dd51b7a162adca3fd36b31af5c074a1
Reviewed-on: https://code.wireshark.org/review/1587
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-11 16:53:01 +00:00
Peter Ross df2dc9222b packet-dis: SISO-J Link 16 PDU dissector (SISO-STD-002)
Change-Id: Id2ed7b7786705ad5fa345b0d1904cec508d3161e
Reviewed-on: https://code.wireshark.org/review/1552
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-11 16:47:51 +00:00
Pascal Quantin e2eea89698 Small fixes to Follow Streams dialog box:
- get the right IPv6 client address
- display the right client to server string for UDP/SSL in Qt port

Change-Id: I399cc38b8a32321198deccdd8e2ecd05b54e14db
Reviewed-on: https://code.wireshark.org/review/1586
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-11 16:47:18 +00:00
Evan Huus 5d98ab793e Simplify IPv4 address hashing
Rather than allocate 4 bytes and use g_int_*, use GUINT_TO_POINTER and
g_direct_*. Should save some time/memory.

Change-Id: Ie03d234703f68bb76131c5ddf17953d23bb54a0d
Reviewed-on: https://code.wireshark.org/review/1582
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-11 15:50:46 +00:00
Evan Huus 4ca79e9de6 Remove some dead emem code.
Odds and ends that are no longer used anywhere in wireshark's codebase. It's
slowly going away.

Also internalize some code (remove header prototypes and make static) some
functions that are only called internally to emem now.

Change-Id: Ic1686a0f73c9ecaa333bc7b44a5a67a6a0369884
Reviewed-on: https://code.wireshark.org/review/1581
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-11 15:36:11 +00:00
Evan Huus 8e37416cd9 Fix leaking heuristic dissector names.
I believe we started taking copies of these names for lua purposes, but we need
to free them afterwards. This accounts for about half the leaked blocks (though
only a tiny fraction of the memory) valgrind reported on a recent run.

Change-Id: I74a656716cbf169905476f6c3e2cbcb0bd5ac0bc
Reviewed-on: https://code.wireshark.org/review/1580
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-11 15:35:59 +00:00