7 years agoFix bugs I introduced. Now
Michael Tüxen [Tue, 25 Dec 2012 12:02:39 +0000 (12:02 -0000)]
Fix bugs I introduced. Now
od -Ax -tx1 -v stream | text2pcap -m1460 -T1234,1234 - stream.pcap
does work again.

svn path=/trunk/; revision=46734

7 years agoIf there's no packet data, there's nothing to check to see whether this
Guy Harris [Tue, 25 Dec 2012 12:00:32 +0000 (12:00 -0000)]
If there's no packet data, there's nothing to check to see whether this
is an MPEG-2 transport packet, so don't treat it as one.

svn path=/trunk/; revision=46733

7 years agoShow the Vines Fragmentation Protocol control flags field as bitflags,
Guy Harris [Tue, 25 Dec 2012 11:57:03 +0000 (11:57 -0000)]
Show the Vines Fragmentation Protocol control flags field as bitflags,
rather than as a single field.  If bits other than the two defined bits
are set in the first byte of the packet, don't dissect UDP packets as
Vines FRP, so that other dissectors get a chance to look at the packet.

svn path=/trunk/; revision=46732

7 years agoImprove description.
Michael Tüxen [Tue, 25 Dec 2012 10:31:21 +0000 (10:31 -0000)]
Improve description.

svn path=/trunk/; revision=46731

7 years agoAdd option to suppress duplicate suppression.
Michael Tüxen [Tue, 25 Dec 2012 10:29:22 +0000 (10:29 -0000)]
Add option to suppress duplicate suppression.

svn path=/trunk/; revision=46730

7 years agoThe inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it. That
Guy Harris [Mon, 24 Dec 2012 23:12:34 +0000 (23:12 -0000)]
The inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it.  That
squelches some warnings.

svn path=/trunk/; revision=46729

7 years agoThe inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it (this
Guy Harris [Mon, 24 Dec 2012 23:11:38 +0000 (23:11 -0000)]
The inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it (this
squelches some warnings).

svn path=/trunk/; revision=46728

7 years agoCast away warnings implicit 64-bit-to-32-bit conversions. (We should
Guy Harris [Mon, 24 Dec 2012 23:10:18 +0000 (23:10 -0000)]
Cast away warnings implicit 64-bit-to-32-bit conversions.  (We should
probably have routines that convert strings to numbers and do range
checks, and should also ignore values in the recent and preferences
files that are out of range.)

Cast a string to "char *" to squelch an otherwise-unavoidable warning
about qualifiers being ignored.

The media type for raw binary data is application/octet-stream, not
application octet_stream.

svn path=/trunk/; revision=46727

7 years agoFrom report of Elavarasan via
Alexis La Goutte [Sun, 23 Dec 2012 19:17:54 +0000 (19:17 -0000)]
From report of Elavarasan via Named field for each item in Selected Registrar Config methods is not available

The structure of both the Config Methods and Selected Registrar Config Methods are  the same.

Display filters such as "wps.config_methods.pushbutton", "wps.config_methods.display", etc are available for the different methods in the Config methods whereas the display filters for the elements in the Selected Registrar Config methods are found to be the same as the Config method Display filters.

From me :
add new filter for selected_registrar config method bitmask (and also permitted config method)

svn path=/trunk/; revision=46725

7 years agoWireshark Aruba Dictionary is sync with FreeRadius Aruba Dictionary
Alexis La Goutte [Sun, 23 Dec 2012 18:41:08 +0000 (18:41 -0000)]
Wireshark Aruba Dictionary is sync with FreeRadius Aruba Dictionary

svn path=/trunk/; revision=46724

7 years agoFrom Francesco Fondelli via
Alexis La Goutte [Sun, 23 Dec 2012 18:40:55 +0000 (18:40 -0000)]
From Francesco Fondelli via Add TCP Fast Open

This patch provides
i) support for Shared Use of Experimental TCP Options (draft-ietf-tcpm-experimental-options-03)
ii) support for TCP Fast Open (draft-ietf-tcpm-fastopen-02).

A new 'TFO=R' string is appended at the column info in case a client sends a SYN packet with a Fast Open Cookie Request. Moreover, if the server responds with a SYN-ACK containing a Fast Open Cookie option a 'TFO=C' is shown (as well as in any subsequent client attempt to send SYN + DATA).

tcp.options.tfo display filter can be used in order to easily select the complete TFO three-way handshake.

Chrome (and I think also Firefox) has support for client-side TFO. Linux 3.7 got both client and server-side support.

svn path=/trunk/; revision=46723

7 years agoUpdate Dictonary from FreeRadius(-server) Master branch
Alexis La Goutte [Sun, 23 Dec 2012 18:40:40 +0000 (18:40 -0000)]
Update Dictonary from FreeRadius(-server) Master branch

Add RFC 5447 dictionary

Add RFC 6519 dictionary

Add RFC 6572 dictionary

svn path=/trunk/; revision=46722

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-12-23]
Gerald Combs [Sun, 23 Dec 2012 15:03:29 +0000 (15:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-12-23]

svn path=/trunk/; revision=46719

7 years agoIn nlsp_dissect_clvs(), count len down at the same time we increment the
Guy Harris [Sun, 23 Dec 2012 10:51:34 +0000 (10:51 -0000)]
In nlsp_dissect_clvs(), count len down at the same time we increment the
offset, and do the bounds checking on the length before we count len

svn path=/trunk/; revision=46718

7 years agoUse the types that PortAudio specifies for values passed to or returned
Guy Harris [Sun, 23 Dec 2012 10:18:43 +0000 (10:18 -0000)]
Use the types that PortAudio specifies for values passed to or returned
from PortAudio; that squelches some implicit 64-bit-to-32-bit conversion

Mark unused arguments with _U_ rather than adding fake usages for them.

svn path=/trunk/; revision=46717

7 years agoMore whitespace cleanups.
Guy Harris [Sun, 23 Dec 2012 09:54:05 +0000 (09:54 -0000)]
More whitespace cleanups.

svn path=/trunk/; revision=46716

7 years agoAdd support for writing per packet comments when using pcapng.
Michael Tüxen [Sun, 23 Dec 2012 09:25:42 +0000 (09:25 -0000)]
Add support for writing per packet comments when using pcapng.
Not actually used with this commit, which just brings in the

svn path=/trunk/; revision=46715

7 years agoWhen using pcapng, provide input file name as comment.
Michael Tüxen [Sun, 23 Dec 2012 09:00:55 +0000 (09:00 -0000)]
When using pcapng, provide input file name as comment.

svn path=/trunk/; revision=46714

7 years agoFix syntax error showing up when using debug ouput.
Michael Tüxen [Sun, 23 Dec 2012 08:59:30 +0000 (08:59 -0000)]
Fix syntax error showing up when using debug ouput.

svn path=/trunk/; revision=46713

7 years agoFix indentation.
Guy Harris [Sun, 23 Dec 2012 06:52:50 +0000 (06:52 -0000)]
Fix indentation.

svn path=/trunk/; revision=46712

7 years agoAdd ui_packet_comment_dialog.h and ui_time_shift_dialog.h.
Gerald Combs [Sun, 23 Dec 2012 05:11:49 +0000 (05:11 -0000)]
Add ui_packet_comment_dialog.h and ui_time_shift_dialog.h.

svn path=/trunk/; revision=46711

7 years agoQt .ui files are XML. Set their SVN properties accordingly.
Gerald Combs [Sun, 23 Dec 2012 04:39:33 +0000 (04:39 -0000)]
Qt .ui files are XML. Set their SVN properties accordingly.

svn path=/trunk/; revision=46710

7 years agoQt: Implement packet comments. Fix packet detail updates.
Gerald Combs [Sun, 23 Dec 2012 04:37:58 +0000 (04:37 -0000)]
Qt: Implement packet comments. Fix packet detail updates.

GTK+: Shorten the packet comment menu item name.  Remove a couple of
unneeded includes.

Both: Add an arbitrary 20 MB limit when fetching all packet comments.
Use a color from the Tango palette for comments.

svn path=/trunk/; revision=46709

7 years agoAdd the time shift dialog.
Gerald Combs [Sun, 23 Dec 2012 03:45:35 +0000 (03:45 -0000)]
Add the time shift dialog.

svn path=/trunk/; revision=46708

7 years agorevert r46678
Martin Kaiser [Sat, 22 Dec 2012 23:56:50 +0000 (23:56 -0000)]
revert r46678
now that tvb_get_ephemeral_unicode_string() throws an exception for
invalid length parameters, there's no point in doing an explicit check

(when I added the check, there were many places that I missed)

svn path=/trunk/; revision=46707

7 years agotrivial: clean up epan/strutil.c
Martin Kaiser [Sat, 22 Dec 2012 23:27:40 +0000 (23:27 -0000)]
trivial: clean up epan/strutil.c
   replace TABs with spaces
   add editor modelines

svn path=/trunk/; revision=46706

7 years agocheck the length parameter for tvb_get_unicode_string() and
Martin Kaiser [Sat, 22 Dec 2012 22:35:07 +0000 (22:35 -0000)]
check the length parameter for tvb_get_unicode_string() and
tvb_get_ephemeral_unicode_string(), throw an exception for invalid
lengths (including -1, but length==-1 does not work for other tvb string
functions either)

I believe this is the proper fix for

svn path=/trunk/; revision=46705

7 years agoDefine GTK_SCHEMAS_DIR
Anders Broman [Sat, 22 Dec 2012 22:18:29 +0000 (22:18 -0000)]

svn path=/trunk/; revision=46704

7 years agoPut back the 'right' GTK3 bundles
Anders Broman [Sat, 22 Dec 2012 21:46:59 +0000 (21:46 -0000)]
Put back the 'right' GTK3 bundles

svn path=/trunk/; revision=46703

7 years agoRemove unneeded initializations, and one redundant if condition.
Evan Huus [Sat, 22 Dec 2012 21:14:13 +0000 (21:14 -0000)]
Remove unneeded initializations, and one redundant if condition.

svn path=/trunk/; revision=46702

7 years agoFox copy-and-paste error.
Michael Tüxen [Sat, 22 Dec 2012 20:56:58 +0000 (20:56 -0000)]
Fox copy-and-paste error.

svn path=/trunk/; revision=46701

7 years agoRemove one unneeded initializer and add one missing initializer, as found
Evan Huus [Sat, 22 Dec 2012 20:53:09 +0000 (20:53 -0000)]
Remove one unneeded initializer and add one missing initializer, as found
by CppCheck.

svn path=/trunk/; revision=46700

7 years agoAdd support for writing the packet block flags for pcapng.
Michael Tüxen [Sat, 22 Dec 2012 20:38:08 +0000 (20:38 -0000)]
Add support for writing the packet block flags for pcapng.
While there, do some minor cleanup.

svn path=/trunk/; revision=46699

7 years agoAdd support for displaying the Packet Block Flags Word of pcapng.
Michael Tüxen [Sat, 22 Dec 2012 19:48:17 +0000 (19:48 -0000)]
Add support for displaying the Packet Block Flags Word of pcapng.

svn path=/trunk/; revision=46698

7 years agoUpdate User Guide
Pascal Quantin [Sat, 22 Dec 2012 19:30:44 +0000 (19:30 -0000)]
Update User Guide

svn path=/trunk/; revision=46697

7 years agoThe Wireshark file icon makes more sense than a floppy disk[1]. Switch
Gerald Combs [Sat, 22 Dec 2012 17:41:40 +0000 (17:41 -0000)]
The Wireshark file icon makes more sense than a floppy disk[1]. Switch
back to it and name it "Save" instead of "File".


svn path=/trunk/; revision=46696

7 years agoFrom G.Gerrits:
Jaap Keuter [Sat, 22 Dec 2012 14:28:52 +0000 (14:28 -0000)]
From G.Gerrits:
Minor patch just adding the newer AR7400/INT7400 with dev_id==4 for decoding
in the Homeplug AV "Get Device/SW Version Confirm (A001)" response.

svn path=/trunk/; revision=46695

7 years agoWhitespace changes.
Michael Tüxen [Sat, 22 Dec 2012 14:06:50 +0000 (14:06 -0000)]
Whitespace changes.

svn path=/trunk/; revision=46694

7 years agoSpecifiy time resolution explicitly.
Michael Tüxen [Sat, 22 Dec 2012 12:35:01 +0000 (12:35 -0000)]
Specifiy time resolution explicitly.

svn path=/trunk/; revision=46693

7 years agoFix timestamp computation when using pcapng.
Michael Tüxen [Sat, 22 Dec 2012 12:09:38 +0000 (12:09 -0000)]
Fix timestamp computation when using pcapng.

svn path=/trunk/; revision=46692

7 years agoAdd support for writing pcap-ng files by specifying -n as an option.
Michael Tüxen [Sat, 22 Dec 2012 09:43:17 +0000 (09:43 -0000)]
Add support for writing pcap-ng files by specifying -n as an option.
Leave pcap the default file format for now. The is should be reconsidered
before the next release as it might make sense to use pcapgn as
the default as we do for dumpcap. (We can use the -P option to allow
switching back to pcap).

svn path=/trunk/; revision=46691

7 years agoR46374 replaced too many GTK_STOCK_SAVEs. Put them back.
Gerald Combs [Sat, 22 Dec 2012 05:21:46 +0000 (05:21 -0000)]
R46374 replaced too many GTK_STOCK_SAVEs. Put them back.

svn path=/trunk/; revision=46690

7 years agoDon't use so much white space.
Gerald Combs [Fri, 21 Dec 2012 23:57:51 +0000 (23:57 -0000)]
Don't use so much white space.

svn path=/trunk/; revision=46689

7 years agoGet rid of unnecessary initialization that causes "discards qualifiers"
Guy Harris [Fri, 21 Dec 2012 22:00:40 +0000 (22:00 -0000)]
Get rid of unnecessary initialization that causes "discards qualifiers"

svn path=/trunk/; revision=46688

7 years agoFix GSM 7-bit default alphabet decoding in ANSI IS-637-A
Pascal Quantin [Fri, 21 Dec 2012 21:03:31 +0000 (21:03 -0000)]
Fix GSM 7-bit default alphabet decoding in ANSI IS-637-A

svn path=/trunk/; revision=46687

7 years agoInclude packet-gsm_sms.h and remove extern declarations
Pascal Quantin [Fri, 21 Dec 2012 21:01:45 +0000 (21:01 -0000)]
Include packet-gsm_sms.h and remove extern declarations

svn path=/trunk/; revision=46686

7 years agoAdd time shifting to the packet list context menu.
Gerald Combs [Fri, 21 Dec 2012 19:21:34 +0000 (19:21 -0000)]
Add time shifting to the packet list context menu.

svn path=/trunk/; revision=46685

7 years agoMicrosoft CRT's _write expects an unsigned int.
Gerald Combs [Fri, 21 Dec 2012 18:59:42 +0000 (18:59 -0000)]
Microsoft CRT's _write expects an unsigned int.

svn path=/trunk/; revision=46684

7 years agoEnable and disable the time shift menu action as needed.
Gerald Combs [Fri, 21 Dec 2012 18:49:44 +0000 (18:49 -0000)]
Enable and disable the time shift menu action as needed.

svn path=/trunk/; revision=46683

7 years agoUse TVB_SET_ADDRESS_HF() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
Jeff Morriss [Fri, 21 Dec 2012 17:43:46 +0000 (17:43 -0000)]
Use TVB_SET_ADDRESS_HF() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
and a couple of SET_ADDRESS()s.

Use proto_tree_add_item() instead of proto_tree_add_ether() called with a
pointer into the TVB.

Leave a comment for a place where a bunch of code in several case statements
could probably be collapsed into much less code.

svn path=/trunk/; revision=46682

7 years agoUse TVB_SET_ADDRESS() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
Jeff Morriss [Fri, 21 Dec 2012 17:43:44 +0000 (17:43 -0000)]
Use TVB_SET_ADDRESS() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
and a couple of SET_ADDRESS()s.

svn path=/trunk/; revision=46681

7 years agoMove common time shifting code to ui/time_shift.[ch]. Change the
Gerald Combs [Fri, 21 Dec 2012 17:37:57 +0000 (17:37 -0000)]
Move common time shifting code to ui/time_shift.[ch]. Change the
shifting routines to return an error message on failure or NULL on
success.  Prettify and simplify the layout of the GTK+ time shift
dialog. Make the cancel button work as expected.

Add a time shift dialog to the Qt port. I used a Mad Lib (sentence)
layout. Hopefully that won't make translation too difficult.  For some
reason time shifts aren't immediately shown in the packet detail. This
appears to be a bug in the packet list / packet detail code.

Add warning role color definitions to tango_colors.h and use them.

svn path=/trunk/; revision=46680

7 years agotrivial: clean up ui/gtk/prefs_filter_expressions.c
Martin Kaiser [Fri, 21 Dec 2012 17:07:51 +0000 (17:07 -0000)]
trivial: clean up ui/gtk/prefs_filter_expressions.c
   replace TABs with spaces
   add editor modelines

svn path=/trunk/; revision=46679

7 years agofix
Martin Kaiser [Fri, 21 Dec 2012 15:52:42 +0000 (15:52 -0000)]
by adding a range to the length that is passed to

svn path=/trunk/; revision=46678

7 years agoRemove redundant (commented out) definition for GTK_PKG
Bill Meier [Fri, 21 Dec 2012 15:43:51 +0000 (15:43 -0000)]
Remove redundant (commented out) definition for GTK_PKG
(introduced by me in SVN #46612).

svn path=/trunk/; revision=46677

7 years agoThis should get it building on Windows.
Michael Tüxen [Fri, 21 Dec 2012 15:03:35 +0000 (15:03 -0000)]
This should get it building on Windows.

svn path=/trunk/; revision=46676

7 years agoTry to get text2pcap building on Windows.
Michael Tüxen [Fri, 21 Dec 2012 14:59:41 +0000 (14:59 -0000)]
Try to get text2pcap building on Windows.

svn path=/trunk/; revision=46675

7 years agoFix a warning on Windows.
Michael Tüxen [Fri, 21 Dec 2012 14:38:00 +0000 (14:38 -0000)]
Fix a warning on Windows.

svn path=/trunk/; revision=46674

7 years agoUse pcapio routines. This concludes the preperation for
Michael Tüxen [Fri, 21 Dec 2012 14:34:26 +0000 (14:34 -0000)]
Use pcapio routines. This concludes the preperation for
adding pcapng support.

svn path=/trunk/; revision=46673

7 years agoThis should make the Linux buildbot happy.
Michael Tüxen [Fri, 21 Dec 2012 13:53:21 +0000 (13:53 -0000)]
This should make the Linux buildbot happy.

svn path=/trunk/; revision=46670

7 years agoAddress a build issue on Windows.
Michael Tüxen [Fri, 21 Dec 2012 13:17:20 +0000 (13:17 -0000)]
Address a build issue on Windows.

svn path=/trunk/; revision=46669

7 years agoBuild the packet to be sent completely in the buffer and
Michael Tüxen [Fri, 21 Dec 2012 13:05:43 +0000 (13:05 -0000)]
Build the packet to be sent completely in the buffer and
then send it out at once.
This allows the usage of routines from pcapio.

svn path=/trunk/; revision=46668

7 years agoThe KRB_RM_ #defines fit in 32 bits, so just make them unsigned, not
Guy Harris [Fri, 21 Dec 2012 11:37:54 +0000 (11:37 -0000)]
The KRB_RM_ #defines fit in 32 bits, so just make them unsigned, not

dissect_krb5_Checksum() is declared in
epan/dissectors/packet-kerberos.h; don't declare it again here.

svn path=/trunk/; revision=46666

7 years agoCheck whether something's too big before subtracting it from another
Guy Harris [Fri, 21 Dec 2012 11:12:23 +0000 (11:12 -0000)]
Check whether something's too big before subtracting it from another

Adjust offset and len in parallel.

svn path=/trunk/; revision=46665

7 years agoSquelch a qualifier-discard warning.
Guy Harris [Fri, 21 Dec 2012 11:04:10 +0000 (11:04 -0000)]
Squelch a qualifier-discard warning.

svn path=/trunk/; revision=46664

7 years agoWell, at least on my machine, packet-pres.c now compiles cleanly, with
Guy Harris [Fri, 21 Dec 2012 10:55:43 +0000 (10:55 -0000)]
Well, at least on my machine, packet-pres.c now compiles cleanly, with
the recent changes to pres.cnf to keep from generating some code.

svn path=/trunk/; revision=46663

7 years agoGet rid of unused routines for UDC-type.
Guy Harris [Fri, 21 Dec 2012 10:52:29 +0000 (10:52 -0000)]
Get rid of unused routines for UDC-type.

svn path=/trunk/; revision=46662

7 years agoDon't assume a pointer fits inside an unsigned long - it doesn't, in
Guy Harris [Fri, 21 Dec 2012 10:26:52 +0000 (10:26 -0000)]
Don't assume a pointer fits inside an unsigned long - it doesn't, in
LLP64 environments such as Windows.

Cast the result of a modulus op that causes the result to fit into an
int to int, to suppress implicit 64-bit-to-32-bit conversion warnings.

svn path=/trunk/; revision=46661

7 years agoGet rid of duplicate declarations (so that -Wredundant-decls doesn't
Guy Harris [Fri, 21 Dec 2012 09:29:46 +0000 (09:29 -0000)]
Get rid of duplicate declarations (so that -Wredundant-decls doesn't

svn path=/trunk/; revision=46660

7 years agoEverything else in the floating-point calculations is single-precision,
Guy Harris [Fri, 21 Dec 2012 08:18:47 +0000 (08:18 -0000)]
Everything else in the floating-point calculations is single-precision,
so make the constants single-precision, so we don't end up with warnings
about double-precision values being assigned to single-precision

svn path=/trunk/; revision=46658

7 years agoMake some loop counters unsigned, so that we handle very large loop
Guy Harris [Fri, 21 Dec 2012 08:16:12 +0000 (08:16 -0000)]
Make some loop counters unsigned, so that we handle very large loop
counts by trying to iterate all over the items (and, presumably, failing
when we go past the end of the packet).

When assigning to the loop count, cast the value down, to avoid implicit
64-bit-to-32-bit conversion warnings.

Write those loops as for loops - it makes it a bit clearer what's going

svn path=/trunk/; revision=46657

7 years agoConvert to use new ws_gtk_grid...() wrappers to replace
Bill Meier [Fri, 21 Dec 2012 06:30:55 +0000 (06:30 -0000)]
Convert to use new ws_gtk_grid...() wrappers to replace
direct use of Gtktable.

(The first of many conversions ...)

Essentially: the wrappers use GtkTable on Gtk2 and GtkGrid on Gtk3.

svn path=/trunk/; revision=46655

7 years agoWrapper functions and macros to be used to replace
Bill Meier [Fri, 21 Dec 2012 06:27:00 +0000 (06:27 -0000)]
Wrapper functions and macros to be used to replace
 Wireshark Gtk2 GtkTable code with code providing
 essentially equivalent funtionality on Gtk2 and Gtk3.

 See gui_utils.h for details.

svn path=/trunk/; revision=46654

7 years agoConstify some character pointer variables to avoid warnings about
Guy Harris [Fri, 21 Dec 2012 05:34:38 +0000 (05:34 -0000)]
Constify some character pointer variables to avoid warnings about
strings being assigned to them.

svn path=/trunk/; revision=46653

7 years agoSquelch a warning - the code shouldn't ever let "have" get so large that
Guy Harris [Fri, 21 Dec 2012 04:52:15 +0000 (04:52 -0000)]
Squelch a warning - the code shouldn't ever let "have" get so large that
it exceeds size_t on any platform, including Win64.

svn path=/trunk/; revision=46652

7 years agoReduce the spacer height in the "go to" and search frames. Fix the
Gerald Combs [Fri, 21 Dec 2012 04:42:05 +0000 (04:42 -0000)]
Reduce the spacer height in the "go to" and search frames. Fix the
search frame class.

svn path=/trunk/; revision=46651

7 years agoSquelch implicit 64-bit-to-32-bit conversion warnings.
Guy Harris [Fri, 21 Dec 2012 03:32:16 +0000 (03:32 -0000)]
Squelch implicit 64-bit-to-32-bit conversion warnings.

svn path=/trunk/; revision=46650

7 years agoSquelch 64-bit-to-32-bit implicit conversion warning; the warning
Guy Harris [Fri, 21 Dec 2012 02:30:35 +0000 (02:30 -0000)]
Squelch 64-bit-to-32-bit implicit conversion warning; the warning
appears to be bogus - even if I put "(gint64) phdr->ts.nsecs" in an
extra layer of parentheses, i.e.

(((gint64) phdr->ts.nsecs) / 1000)

I still get the warning from

i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple
    Inc. build 5658) (LLVM build 2336.11.00)

svn path=/trunk/; revision=46649

7 years agoInclude <wsutil/crc11.h> so that we check whether the prototypes therein
Guy Harris [Fri, 21 Dec 2012 01:57:03 +0000 (01:57 -0000)]
Include <wsutil/crc11.h> so that we check whether the prototypes therein
match the actual function types here.

svn path=/trunk/; revision=46648

7 years agoSquelch some cast-discard warnings.
Guy Harris [Fri, 21 Dec 2012 00:53:30 +0000 (00:53 -0000)]
Squelch some cast-discard warnings.

svn path=/trunk/; revision=46647

7 years agoClean up white space.
Guy Harris [Fri, 21 Dec 2012 00:43:00 +0000 (00:43 -0000)]
Clean up white space.

Add a return where I presume it was intended to be - a 4-octet address
is completely handled in that if clause, so there's no reason to fall

Fix a comment.

svn path=/trunk/; revision=46646

7 years agoFix some valgrind warnings from the capture attached to
Evan Huus [Fri, 21 Dec 2012 00:19:16 +0000 (00:19 -0000)]
Fix some valgrind warnings from the capture attached to

I can't reproduce the actual reported crash on trunk.

svn path=/trunk/; revision=46645

7 years agoFix :
Pascal Quantin [Thu, 20 Dec 2012 21:18:26 +0000 (21:18 -0000)]
Fix :
Fix dissection of GPRS-NS over Frame Relay over MPLS

svn path=/trunk/; revision=46644

7 years agoRevert r46595
Pascal Quantin [Thu, 20 Dec 2012 21:17:23 +0000 (21:17 -0000)]
Revert r46595

svn path=/trunk/; revision=46643

7 years agoExpand the comment about alignment.
Guy Harris [Thu, 20 Dec 2012 21:02:22 +0000 (21:02 -0000)]
Expand the comment about alignment.

svn path=/trunk/; revision=46642

7 years ago32-bit Linux (at least from Redhat) has a host_cpu of i686 (not i386). Don't force...
Jeff Morriss [Thu, 20 Dec 2012 20:52:26 +0000 (20:52 -0000)]
32-bit Linux (at least from Redhat) has a host_cpu of i686 (not i386).  Don't force 8-byte alignment on such systems.

svn path=/trunk/; revision=46641

7 years agofclose() and fflush() are standard C routines, so there's no need for
Guy Harris [Thu, 20 Dec 2012 20:00:06 +0000 (20:00 -0000)]
fclose() and fflush() are standard C routines, so there's no need for
our own wrappers.  (pcapio.c isn't using wrappers around, for example,

svn path=/trunk/; revision=46640

7 years agoNeed to include Windows.h for gettting FILETIME.
Michael Tüxen [Thu, 20 Dec 2012 15:40:28 +0000 (15:40 -0000)]
Need to include Windows.h for gettting FILETIME.

svn path=/trunk/; revision=46638

7 years agoDon't use an pcap structures in pcapio.[ch].
Michael Tüxen [Thu, 20 Dec 2012 15:20:10 +0000 (15:20 -0000)]
Don't use an pcap structures in pcapio.[ch].
Currently, pcapio is only used by dumpcap, which is only compiled
if there is pcap support. However, making pcapio independent from
libpcap allows it also to be used from text2pcap, which does not
rely on libpcap.

svn path=/trunk/; revision=46637

7 years agoAdd ws_fclose(), ws_fflush(), and ws_fdopen() to the fileutils.
Michael Tüxen [Thu, 20 Dec 2012 14:53:09 +0000 (14:53 -0000)]
Add ws_fclose(), ws_fflush(), and ws_fdopen() to the fileutils.
Retire libpcap_fdopen(), libpcap_dump_flush(), and libpcap_dump_close().

svn path=/trunk/; revision=46636

7 years agorawshark does not use any routine from pcapio.c. So remove header.
Michael Tüxen [Thu, 20 Dec 2012 14:50:24 +0000 (14:50 -0000)]
rawshark does not use any routine from pcapio.c. So remove header.

svn path=/trunk/; revision=46635

7 years agotshark now accepts -Q.
Jeff Morriss [Thu, 20 Dec 2012 14:36:06 +0000 (14:36 -0000)]
tshark now accepts -Q.

svn path=/trunk/; revision=46633

7 years agoFrom Edwin Groothuis:
Anders Broman [Thu, 20 Dec 2012 13:15:20 +0000 (13:15 -0000)]
From Edwin Groothuis:
IO Stats - Smooth should be per graph.

svn path=/trunk/; revision=46631

7 years agoTry to determine wether it is MEAS REP, EXT MEAS REP or ENH MEAS REP.
Anders Broman [Thu, 20 Dec 2012 12:53:38 +0000 (12:53 -0000)]
Try to determine wether it is MEAS REP, EXT MEAS REP or ENH MEAS REP.

svn path=/trunk/; revision=46630

7 years agoTweak the order of the UI updates when finishing a live-update capture so that
Evan Huus [Thu, 20 Dec 2012 04:06:44 +0000 (04:06 -0000)]
Tweak the order of the UI updates when finishing a live-update capture so that
certain menu items are enabled correctly.

Should fix

svn path=/trunk/; revision=46629

7 years agoRemove unused parameter from iousers_process_address_packet
Evan Huus [Thu, 20 Dec 2012 03:20:24 +0000 (03:20 -0000)]
Remove unused parameter from iousers_process_address_packet

svn path=/trunk/; revision=46628

7 years agoAdd -Q option to TShark to force only "true" errors to stderr. No "status" messages...
Michael Mann [Thu, 20 Dec 2012 01:22:42 +0000 (01:22 -0000)]
Add -Q option to TShark to force only "true" errors to stderr.  No "status" messages should be included if -Q option is specified.  Bug 2881 (

svn path=/trunk/; revision=46627

7 years agoAdd absolute date options (-ad) for start date/time of conversation in TShark. Bug...
Michael Mann [Thu, 20 Dec 2012 01:19:22 +0000 (01:19 -0000)]
Add absolute date options (-ad) for start date/time of conversation in TShark.  Bug 1849 (

svn path=/trunk/; revision=46626

7 years agoAdd missing wmem strbuf routine to the documentation.
Evan Huus [Wed, 19 Dec 2012 23:12:58 +0000 (23:12 -0000)]
Add missing wmem strbuf routine to the documentation.

svn path=/trunk/; revision=46625

7 years agoOnly include wmem_core.h in packet_info.h. It's not technically a
Evan Huus [Wed, 19 Dec 2012 23:11:22 +0000 (23:11 -0000)]
Only include wmem_core.h in packet_info.h. It's not technically a
public header, but since packet_info.h is included in most of the tree it saves
a great deal of recompilation when something in one of the wmem data structures

svn path=/trunk/; revision=46624