Commit Graph

38416 Commits

Author SHA1 Message Date
Anders Broman cd6d0b075f Use hfi->abbrev insted.
svn path=/trunk/; revision=40376
2012-01-04 19:06:34 +00:00
Alexis La Goutte dbe733fcfc Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40375
2012-01-04 17:44:50 +00:00
Alexis La Goutte b30eadd6ef Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40374
2012-01-04 17:42:10 +00:00
Alexis La Goutte c21455ce0e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40373
2012-01-04 17:35:41 +00:00
Alexis La Goutte 360f156220 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40372
2012-01-04 17:34:36 +00:00
Alexis La Goutte 00dd4b455e From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697
Modbus object support for CIP dissector

Support for the Modbus object within the CIP dissector.  Essentially wraps the Modbus protocol within a CIP object.

Also included update to Modbus error code per 
http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html

svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
Alexis La Goutte c3c5e75678 From Andrei Maruseac via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6705
Multipath TCP Option

Extensions for Multipath Operation with Multiple Addresses, as defined in http://tools.ietf.org/html/draft-ietf-mptcp-multiaddressed-04. I implemented this as a TCP option.

From me :
Remove a subtree
Add Subtype in top of multiPath subtree


svn path=/trunk/; revision=40370
2012-01-04 13:01:53 +00:00
Anders Broman e6fdbd30a6 TMR should be OCTET STRING
svn path=/trunk/; revision=40369
2012-01-04 07:26:00 +00:00
Anders Broman 5308e8bfba Update to V10.3.0 (2011-09)
svn path=/trunk/; revision=40368
2012-01-04 07:20:15 +00:00
Guy Harris 002ad074c4 Expand, and fix, a comment. Change a function argument name to match
the name in the definition of the function it calls.

svn path=/trunk/; revision=40367
2012-01-04 03:31:21 +00:00
Guy Harris f6aa7ae0dd Move stuff that should *only* be known by the lowest-level code that
deals with the sync pipe - i.e., only by sync_pipe.c and dumpcap.c -
into sync_pipe.h.

svn path=/trunk/; revision=40366
2012-01-04 03:02:13 +00:00
Gerald Combs 19e493c049 Make sure each value in a GHashTable is unique. This avoids a
double-free bug triggered by using the "any" address wildcard.

Use g_malloc0 instead of zeroing elements by hand. Check for SSL_FAST
the same way everywhere.

svn path=/trunk/; revision=40365
2012-01-04 00:37:14 +00:00
Anders Broman c7db6a5d4d From Pascal Quantin:
Display Home eNodeB name.

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

svn path=/trunk/; revision=40363
2012-01-03 22:12:16 +00:00
Anders Broman 1b98cbfe97 Use a hash table to gather information from IR packets and store it in per-packet-data.
svn path=/trunk/; revision=40362
2012-01-03 22:08:13 +00:00
Anders Broman 906d2aecbb Enhance error information.
svn path=/trunk/; revision=40361
2012-01-03 22:06:42 +00:00
Guy Harris 781f71c375 Move capture_sync.h as well.
svn path=/trunk/; revision=40359
2012-01-03 05:37:56 +00:00
Guy Harris 08e0793deb capture_sync.c is another file common to all programs that capture
traffic by running dumpcap (not surprising, as it's the file with all
the "run dumpcap" routines).

svn path=/trunk/; revision=40358
2012-01-03 05:33:02 +00:00
Anders Broman 56188e9d27 From Mike Morrin:
GSM ENHANCED MEASUREMENT REPORT PDUs were not
dissected when present as L3_INFO in RSL MEAS_RES PDUs.

It seems that the RSL L3_INFO needs to be handled by a different dissector
depending on whether it contains a DTAP, SACCH or CCCH PDU, which fortunately
can be deduced from the RSL PDU type.  packet-rsl.c is updated to implement
this.

In packet-gsm_a_rr.c the dissection of PDUs with RR Short PD format is
improved, and also some items are renamed to make clearer the difference
between SACCH PDUs (which cna be normal or Short PD format) and RR Short PD
format PDUs (which can occur on SACCH, CCCH, or DCH).

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

svn path=/trunk/; revision=40357
2012-01-01 19:57:47 +00:00
Gerald Combs c1e296494d [Automatic manuf, services and enterprise-numbers update for 2012-01-01]
svn path=/trunk/; revision=40354
2012-01-01 15:03:27 +00:00
Stig Bjørlykke 92528dad84 Happy New Year!
svn path=/trunk/; revision=40353
2012-01-01 10:02:11 +00:00
Jörg Mayer 882d76f2b9 - Update the graphical packages
- Newer versions of glib etc require xz. At least Snow Leopard
  does not provide xz, so (unconditionally) download and install this first.
- Put in infrastructure to set up a GTK3 environment instead of GTK2
  (not active by default because configure'ing Wireshark still fails for some
  reason with GTK3 installed).

svn path=/trunk/; revision=40352
2011-12-31 16:20:47 +00:00
Guy Harris 34c702458b Put back paragraph break.
svn path=/trunk/; revision=40351
2011-12-31 03:20:19 +00:00
Guy Harris 9f46f8b39e Leave more word-wrapping to the toolkit.
svn path=/trunk/; revision=40350
2011-12-31 03:14:30 +00:00
Gerald Combs 110aea3a5e Add more entries and sort them.
svn path=/trunk/; revision=40349
2011-12-31 01:23:06 +00:00
Chris Maynard 58ace15a34 Add Gaurav Tungatkar.
svn path=/trunk/; revision=40348
2011-12-30 19:19:19 +00:00
Stig Bjørlykke 57036a02ec Fix formatting issues.
svn path=/trunk/; revision=40347
2011-12-30 15:49:02 +00:00
Bill Meier eea1de5489 Fix 'encoding-arg' for ptvcursor_add_with_subtree(): TRUE=>ENC_LITTLE_ENDIAN, etc
svn path=/trunk/; revision=40346
2011-12-30 15:30:32 +00:00
Bill Meier 484b58f622 Regenerated packet-h245.c (should have been included in SVN #40311: add_new_data_source() needed in several places).
svn path=/trunk/; revision=40345
2011-12-30 15:28:04 +00:00
Alexis La Goutte b524ad6f88 From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6698
Updates for newest profile identifier database, ZigBee 053298r19

Corrects error in Samsung manufacturer code in r18.

svn path=/trunk/; revision=40344
2011-12-30 11:07:04 +00:00
Guy Harris 8acc256afe We don't have any links to activate if we don't have pcap.
svn path=/trunk/; revision=40343
2011-12-30 07:31:18 +00:00
Guy Harris a031c4aec3 Make the links in the "WinPcap doesn't appear to be installed" text
active.

Get rid of hard returns, and make it word wrap.

svn path=/trunk/; revision=40342
2011-12-30 07:07:20 +00:00
Guy Harris 3c2f7c883d Clean up word wrapping a bit.
svn path=/trunk/; revision=40341
2011-12-30 04:26:33 +00:00
Guy Harris 815d6367c4 For the "don't have WinPcap" case, put up some stuff in the welcome
screen discussing that.  (XXX - those links should be made live.)

svn path=/trunk/; revision=40340
2011-12-30 00:52:15 +00:00
Guy Harris f210836a02 I had a capture_errs.c but capture-wpcap.c eated it.
svn path=/trunk/; revision=40339
2011-12-30 00:17:50 +00:00
Guy Harris cc98c8a901 Get rid of extra blank line.
svn path=/trunk/; revision=40338
2011-12-29 23:34:20 +00:00
Guy Harris 32c1ee2010 Leave it up to dumpcap to determine whether WinPcap was loaded and, if
it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

svn path=/trunk/; revision=40337
2011-12-29 23:33:29 +00:00
Guy Harris 53eb852fa7 Leave it up to dumpcap to determine whether WinPcap was loaded and, if
it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

svn path=/trunk/; revision=40336
2011-12-29 23:21:18 +00:00
Guy Harris 7e531049a0 Swallow cant_load_winpcap_err() up into capture-wpcap.c, so that
anything that uses WinPcap can use that message text in its error
messages.

svn path=/trunk/; revision=40335
2011-12-29 23:09:42 +00:00
Guy Harris 3864d5d19d Add an additional DONT_HAVE_PCAP return value from get_interface_list()
and capture_interface_list().  Return it if, on Windows, we ask for the
interface list but don't have WinPcap installed.  Handle it like
CANT_GET_INTERFACE_LIST.

svn path=/trunk/; revision=40334
2011-12-29 22:49:49 +00:00
Guy Harris 21f5ea24e4 Just hard-code the error for "can't load WinPcap"; the one that
cant_load_winpcap_err() has some redundant gunk in it.

svn path=/trunk/; revision=40333
2011-12-29 22:06:22 +00:00
Guy Harris 71c7f43d37 On Windows, if we can't open a capture device, check whether WinPcap is
loaded and, if not, report that as the problem, rather than suggesting
that you didn't specify the proper interface.

svn path=/trunk/; revision=40332
2011-12-29 21:59:24 +00:00
Guy Harris aefe098467 Forgot the buffer length argument to g_snprintf().
svn path=/trunk/; revision=40331
2011-12-29 21:43:59 +00:00
Guy Harris 757de7e1cf If pcap_open_live() or pcap_open() fails due to not having WinPcap,
supply an appropriate error string.

svn path=/trunk/; revision=40330
2011-12-29 21:18:08 +00:00
Bill Meier dddb66178b AFAIKT sys/stat.h, sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes aren't needed.
also: Add #include <epan/packet.h>  (altho included by one of the other includes).

svn path=/trunk/; revision=40329
2011-12-29 21:08:53 +00:00
Bill Meier 9beae6eb86 AFAIKT sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes aren't needed.
svn path=/trunk/; revision=40328
2011-12-29 20:44:19 +00:00
Bill Meier ab5ead6bb0 Do whitespace cleanup; Reformat long lines;
Move proto_register...() to be near the end of the file.

svn path=/trunk/; revision=40327
2011-12-29 20:23:18 +00:00
Bill Meier 96151f1910 Define GTK_DISABLE_DEPRECATED only if GTK lt 3.2 since
GTK 3.2 deprecates GtkVBox & GtkHBox which are currently used extensively by Wireshark.

svn path=/trunk/; revision=40326
2011-12-29 16:58:41 +00:00
Chris Maynard b97844bcaa Fix LTP multiple bundle bug and allow LTP/DCCP. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5035
svn path=/trunk/; revision=40325
2011-12-29 16:22:02 +00:00
Stig Bjørlykke 87d587b53f Set filter text after connecting to filter string callback so the
initial filter will be syntax checked.

svn path=/trunk/; revision=40324
2011-12-29 11:54:08 +00:00
Stig Bjørlykke 5adae76d68 Fixed a typo: btyes -> bytes
svn path=/trunk/; revision=40323
2011-12-29 11:44:22 +00:00