6 years agoEnhance KX DNS Type
Alexis La Goutte [Mon, 3 Jun 2013 13:11:02 +0000 (13:11 -0000)]
Enhance KX DNS Type

(and fix a minor bug.. KX Preference is always = 0...)

svn path=/trunk/; revision=49719

6 years agoEnhance NXT DNS Type
Alexis La Goutte [Mon, 3 Jun 2013 13:10:53 +0000 (13:10 -0000)]
Enhance NXT DNS Type

svn path=/trunk/; revision=49718

6 years agoEnhance NSEC DNS Type
Alexis La Goutte [Mon, 3 Jun 2013 13:10:39 +0000 (13:10 -0000)]
Enhance NSEC DNS Type

svn path=/trunk/; revision=49717

6 years agoEnhance LOC DNS Type
Alexis La Goutte [Mon, 3 Jun 2013 13:10:31 +0000 (13:10 -0000)]
Enhance LOC DNS Type

svn path=/trunk/; revision=49716

6 years agoEnhance DNAME DNS Type
Alexis La Goutte [Mon, 3 Jun 2013 13:10:22 +0000 (13:10 -0000)]
Enhance DNAME DNS Type

svn path=/trunk/; revision=49715

6 years agoEnhance A6 DNS Type
Alexis La Goutte [Mon, 3 Jun 2013 13:10:12 +0000 (13:10 -0000)]
Enhance A6 DNS Type

svn path=/trunk/; revision=49714

6 years agoEnhance AAAA DNS Type
Alexis La Goutte [Mon, 3 Jun 2013 13:10:02 +0000 (13:10 -0000)]
Enhance AAAA DNS Type

svn path=/trunk/; revision=49713

6 years agoEnhance IPSECKEY DNS Type
Alexis La Goutte [Mon, 3 Jun 2013 13:09:53 +0000 (13:09 -0000)]

svn path=/trunk/; revision=49712

6 years agoEnhance KEY Type
Alexis La Goutte [Mon, 3 Jun 2013 13:09:43 +0000 (13:09 -0000)]
Enhance KEY Type

svn path=/trunk/; revision=49711

6 years agoInitialize the whole hdr_info structure to please gcc 4.3.2
Pascal Quantin [Mon, 3 Jun 2013 07:48:59 +0000 (07:48 -0000)]
Initialize the whole hdr_info structure to please gcc 4.3.2

svn path=/trunk/; revision=49710

6 years agoPut back a fix that earlier checkins lost.
Guy Harris [Mon, 3 Jun 2013 06:36:55 +0000 (06:36 -0000)]
Put back a fix that earlier checkins lost.

svn path=/trunk/; revision=49709

6 years agocc1: warnings being treated as errors
Anders Broman [Mon, 3 Jun 2013 04:25:31 +0000 (04:25 -0000)]
cc1: warnings being treated as errors
../../asn1/nbap/packet-nbap-template.c: In function 'add_hsdsch_bind':
../../asn1/nbap/packet-nbap-template.c:349: warning: unused parameter 'tree'

svn path=/trunk/; revision=49708

6 years agoConvert ASN.1 dissectors to use filterable expert info.
Michael Mann [Mon, 3 Jun 2013 03:42:36 +0000 (03:42 -0000)]
Convert ASN.1 dissectors to use filterable expert info.

NOTE: Kerberos ASN.1 template was updated, but not generated to source.

svn path=/trunk/; revision=49707

6 years agoPut a space between "because" and the next word.
Guy Harris [Mon, 3 Jun 2013 02:08:13 +0000 (02:08 -0000)]
Put a space between "because" and the next word.

svn path=/trunk/; revision=49706

6 years agoInitialize some variables that GCC 4.7 complains about. I'm not 100% sure
Evan Huus [Mon, 3 Jun 2013 01:07:26 +0000 (01:07 -0000)]
Initialize some variables that GCC 4.7 complains about. I'm not 100% sure
that the complaints are valid, or that simply zeroing them is the right fix
if they are, but at least it builds now. Should we be erroring if we don't
see a sliceLength header?

svn path=/trunk/; revision=49705

6 years agoWhen reading sequentially, skip past any ignored data at the end of the
Guy Harris [Mon, 3 Jun 2013 00:26:16 +0000 (00:26 -0000)]
When reading sequentially, skip past any ignored data at the end of the

svn path=/trunk/; revision=49704

6 years agoPass the read_rec_data routines a wtap_pkthdr pointer, and have them
Guy Harris [Sun, 2 Jun 2013 23:32:17 +0000 (23:32 -0000)]
Pass the read_rec_data routines a wtap_pkthdr pointer, and have them
fill in that structure, so that it's filled in by both the read and
seek-read routines.

svn path=/trunk/; revision=49703

6 years agoPull the code to Fill in the wtap_pkthdr structure into a common
Guy Harris [Sun, 2 Jun 2013 23:23:47 +0000 (23:23 -0000)]
Pull the code to Fill in the wtap_pkthdr structure into a common
routine, and use it in both the read and seek-read routines.

svn path=/trunk/; revision=49702

6 years agoMove code to fill in the wtap_pkthdr into peektagged_process_header(),
Guy Harris [Sun, 2 Jun 2013 23:20:11 +0000 (23:20 -0000)]
Move code to fill in the wtap_pkthdr into peektagged_process_header(),
so that it's filled in by both the read and seek-read routines.

svn path=/trunk/; revision=49701

6 years agoPull code to read and process packet headers into
Guy Harris [Sun, 2 Jun 2013 23:12:58 +0000 (23:12 -0000)]
Pull code to read and process packet headers into
peekclassic_process_record_header_() routines, used in both the read and
seek-read routines.

svn path=/trunk/; revision=49700

6 years agoPull code to read process packet headers into a
Guy Harris [Sun, 2 Jun 2013 22:17:37 +0000 (22:17 -0000)]
Pull code to read process packet headers into a
packetlogger_process_header() routine, used in both the read and
seek-read routines.

svn path=/trunk/; revision=49699

6 years agoFix :
Pascal Quantin [Sun, 2 Jun 2013 20:57:48 +0000 (20:57 -0000)]
Fix :
Compute the number of septets needed for an alphanumeric address

svn path=/trunk/; revision=49698

6 years agoInitialize the frame_table_size field of the private data to 0 and the
Guy Harris [Sun, 2 Jun 2013 18:09:13 +0000 (18:09 -0000)]
Initialize the frame_table_size field of the private data to 0 and the
frame_table field to NULL before trying to allocate the frame table, so
that if we fail before we allocate the frame table, the attempt to free
the private data doesn't crash due to the frame_table field containing a
bogus pointer.

svn path=/trunk/; revision=49697

6 years agoRemove unused cc_type parameter
Pascal Quantin [Sun, 2 Jun 2013 18:01:14 +0000 (18:01 -0000)]
Remove unused cc_type parameter

svn path=/trunk/; revision=49696

6 years agoAdd UDT to the list of new protocols
Pascal Quantin [Sun, 2 Jun 2013 17:21:43 +0000 (17:21 -0000)]
Add UDT to the list of new protocols

svn path=/trunk/; revision=49695

6 years agoFix a typo error as reported on -dev
Pascal Quantin [Sun, 2 Jun 2013 16:54:16 +0000 (16:54 -0000)]
Fix a typo error as reported on -dev

svn path=/trunk/; revision=49694

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-06-02]
Gerald Combs [Sun, 2 Jun 2013 14:03:37 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-06-02]

svn path=/trunk/; revision=49690

6 years agoGet out of global variable hell and other optimizations.
Michael Mann [Sun, 2 Jun 2013 13:45:51 +0000 (13:45 -0000)]
Get out of global variable hell and other optimizations.

I'm stil not sure the copying of the packet_info structure is necessary (or what the consequences are), but at least it's not global anymore.

col_set_fence may be needed to prevent overwriting by PPP dissector,  Caching COL_INFO (or the other columns) into it's own string was way more work than necessary and could lead to no column info on a malformed packet.

svn path=/trunk/; revision=49689

6 years agoFix an infinite loop in the GSM CBCH dissector.
Evan Huus [Sat, 1 Jun 2013 23:56:32 +0000 (23:56 -0000)]
Fix an infinite loop in the GSM CBCH dissector.

The looping logic is a bit odd, and there was a case where we were never
incrementing any of the multiple loop variables. I suspect the entire function
could be simplified, but this commit fixes the hang and is better suited to
backporting than anything complex.

svn path=/trunk/; revision=49686

6 years agoAlso notify CMAS alerts
Pascal Quantin [Sat, 1 Jun 2013 23:27:16 +0000 (23:27 -0000)]
Also notify CMAS alerts

svn path=/trunk/; revision=49685

6 years agoFix :
Pascal Quantin [Sat, 1 Jun 2013 23:10:37 +0000 (23:10 -0000)]
Fix :
Upgrade AP-title ASN.1 description

svn path=/trunk/; revision=49684

6 years agoMake Earthquake and Tsunami Warning Sytem indications stand out a
Martin Mathieson [Sat, 1 Jun 2013 22:26:47 +0000 (22:26 -0000)]
Make Earthquake and Tsunami Warning Sytem indications stand out a
bit more.

svn path=/trunk/; revision=49683

6 years agoFix :
Pascal Quantin [Sat, 1 Jun 2013 20:51:14 +0000 (20:51 -0000)]
Fix :
Display C12.22 Invocation Id as unsigned integer

svn path=/trunk/; revision=49682

6 years agoMore constification.
Guy Harris [Sat, 1 Jun 2013 19:33:44 +0000 (19:33 -0000)]
More constification.

svn path=/trunk/; revision=49681

6 years agoMore constification.
Guy Harris [Sat, 1 Jun 2013 18:38:36 +0000 (18:38 -0000)]
More constification.

svn path=/trunk/; revision=49680

6 years agoMore constification.
Guy Harris [Sat, 1 Jun 2013 17:49:12 +0000 (17:49 -0000)]
More constification.

svn path=/trunk/; revision=49678

6 years agoChange a forward-slash to a back-slash as the path separator..
Chris Maynard [Sat, 1 Jun 2013 13:05:28 +0000 (13:05 -0000)]
Change a forward-slash to a back-slash as the path separator..

svn path=/trunk/; revision=49677

6 years agoCheck on fh_tree is already done within add_ethernet_trailer()
Sake Blok [Sat, 1 Jun 2013 12:00:56 +0000 (12:00 -0000)]
Check on fh_tree is already done within add_ethernet_trailer()

svn path=/trunk/; revision=49676

6 years agoAdd ethernet protocol preference to manually set the trailer length.
Sake Blok [Sat, 1 Jun 2013 09:05:56 +0000 (09:05 -0000)]
Add ethernet protocol preference to manually set the trailer length.
(some TAPs can slice packets and then add a custom trailer)

svn path=/trunk/; revision=49675

6 years agoMore constification.
Guy Harris [Sat, 1 Jun 2013 07:02:34 +0000 (07:02 -0000)]
More constification.

svn path=/trunk/; revision=49674

6 years agoWhen allocating the frame table for a NetMon file, use g_try_malloc(),
Guy Harris [Sat, 1 Jun 2013 06:48:37 +0000 (06:48 -0000)]
When allocating the frame table for a NetMon file, use g_try_malloc(),
and fail with ENOMEM if that fails (and the frame table is not empty -
g_try_malloc() will return NULL if you ask it to allocate zero bytes).

Have an error message for ENOMEM on an open that attempts to tell the
user what the problem is without making their head explode.

svn path=/trunk/; revision=49673

6 years agoNote which *particular* IDL this is. (Actually, is that the OSF's DCE
Guy Harris [Sat, 1 Jun 2013 03:17:59 +0000 (03:17 -0000)]
Note which *particular* IDL this is.  (Actually, is that the OSF's DCE
RPC IDL, Microsoft's DCE RPC IDL, or Samba's DCE RPC IDL?)

Constify some stuff to squelch warnings.

svn path=/trunk/; revision=49672

6 years agoMove the record header processing code into a common routine, and read
Guy Harris [Sat, 1 Jun 2013 02:58:58 +0000 (02:58 -0000)]
Move the record header processing code into a common routine, and read
that header in both the read and seek-read routines.

svn path=/trunk/; revision=49671

6 years agoUpdate various warning-option lists to match what the configure script
Guy Harris [Sat, 1 Jun 2013 02:20:12 +0000 (02:20 -0000)]
Update various warning-option lists to match what the configure script
adds by default.

svn path=/trunk/; revision=49670

6 years agoImplement PARAM_UINT as a spin button with a range of 0 to G_MAXUINT.
Guy Harris [Sat, 1 Jun 2013 01:23:59 +0000 (01:23 -0000)]
Implement PARAM_UINT as a spin button with a range of 0 to G_MAXUINT.

svn path=/trunk/; revision=49669

6 years agoMove -Wlogical-op to list of standard compiler flags for c-only.
Jörg Mayer [Sat, 1 Jun 2013 00:13:25 +0000 (00:13 -0000)]
Move -Wlogical-op to list of standard compiler flags for c-only.

svn path=/trunk/; revision=49668

6 years agoFix buildbot:
Jörg Mayer [Sat, 1 Jun 2013 00:11:29 +0000 (00:11 -0000)]
Fix buildbot:

cc1: warnings being treated as errors
packet-wccp.c: In function 'wccp_fmt_ipadddress':
packet-wccp.c:555: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:125: warning: shadowed declaration is here
packet-wccp.c: In function 'dissect_wccp2_alternate_mask_value_set_element':
packet-wccp.c:2570: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:125: warning: shadowed declaration is here
make[5]: *** [libdissectors_la-packet-wccp.lo] Error 1
make[5]: *** Waiting for unfinished jobs....

svn path=/trunk/; revision=49667

6 years agoPeter Van Eynde <>
Jörg Mayer [Fri, 31 May 2013 23:17:10 +0000 (23:17 -0000)]
Peter Van Eynde <>

This is an enhanced WCCP decoder handling the new draft 2.01 standard from

svn path=/trunk/; revision=49666

6 years agoTry to port glbp dissector to new expert info infrastructure.
Jörg Mayer [Fri, 31 May 2013 23:11:43 +0000 (23:11 -0000)]
Try to port glbp dissector to new expert info infrastructure.
Compile tested only.

svn path=/trunk/; revision=49665

6 years agoNeither gtk_mac_lte_stat_init() nor gtk_rlc_lte_stat_init() are referred
Guy Harris [Fri, 31 May 2013 23:07:51 +0000 (23:07 -0000)]
Neither gtk_mac_lte_stat_init() nor gtk_rlc_lte_stat_init() are referred
to outside the files that define them; make them static.

svn path=/trunk/; revision=49664

6 years agoThe SIP and WSP statistics taps register themselves; get rid of their
Guy Harris [Fri, 31 May 2013 23:05:40 +0000 (23:05 -0000)]
The SIP and WSP statistics taps register themselves; get rid of their
hardcoded menu items.

svn path=/trunk/; revision=49663

6 years agoAdd a REGISTER_STAT_GROUP_TELEPHONY_SCTP, make the SCTP chunk counter
Guy Harris [Fri, 31 May 2013 23:00:39 +0000 (23:00 -0000)]
register itself in that group, and get rid of its hardcoded menu item.

Also, as the H.225 counter is registering itself, get rid of its
hardcoded menu item.

svn path=/trunk/; revision=49662

6 years agoFix the name resolution tests so that they run on Windows. Enable them
Gerald Combs [Fri, 31 May 2013 22:32:14 +0000 (22:32 -0000)]
Fix the name resolution tests so that they run on Windows. Enable them
by default. Remove some unused code.

svn path=/trunk/; revision=49661

6 years agoThe BOOTP/DHCP statistics tap registers itself; get rid of the explicit
Guy Harris [Fri, 31 May 2013 22:10:43 +0000 (22:10 -0000)]
The BOOTP/DHCP statistics tap registers itself; get rid of the explicit
menu item for it.

svn path=/trunk/; revision=49660

6 years agoConsistently use "/Statistics", rather than "/StatisticsMenu", in action
Guy Harris [Fri, 31 May 2013 22:07:11 +0000 (22:07 -0000)]
Consistently use "/Statistics", rather than "/StatisticsMenu", in action
names, to avoid confusion.  (Action names are not, in fact, paths; we're
just using path syntax for them as a convention.)

svn path=/trunk/; revision=49659

6 years agoAdd a REGISTER_STAT_GROUP_TELEPHONY_LTE for the Telephony/LTE menu, and
Guy Harris [Fri, 31 May 2013 21:57:15 +0000 (21:57 -0000)]
Add a REGISTER_STAT_GROUP_TELEPHONY_LTE for the Telephony/LTE menu, and
use it o register the MAC and RLC statistics dialogues.  Get rid of the
explicit menu items for them, as they now show up in the menu as a
result of the tap registering itself.

svn path=/trunk/; revision=49658

6 years agonameres.hosts_file_handling shouldn't affect loading the profile "hosts"
Gerald Combs [Fri, 31 May 2013 21:40:26 +0000 (21:40 -0000)]
nameres.hosts_file_handling shouldn't affect loading the profile "hosts"
file. That should be loaded no matter what if we have name resolution

Add a name resolution test suite. Currently disabled until I can test it
on Windows.

svn path=/trunk/; revision=49657

6 years agoDon't call gtk_widget_unregister_window() in bytes_view_unrealize() after GTK+ 3.8.0
Balint Reczey [Fri, 31 May 2013 20:57:07 +0000 (20:57 -0000)]
Don't call gtk_widget_unregister_window() in bytes_view_unrealize() after GTK+ 3.8.0

to prevent double invocation causing crash.

This fixes .
The patch is from Jakub Zawadzki.

svn path=/trunk/; revision=49655

6 years agoAdd UDT dissector. Bug 8741 (
Michael Mann [Fri, 31 May 2013 20:37:46 +0000 (20:37 -0000)]
Add UDT dissector.  Bug 8741 (

From Chas Williams

svn path=/trunk/; revision=49654

6 years agoReport the operation number in all places where we note that we don't
Guy Harris [Fri, 31 May 2013 19:00:28 +0000 (19:00 -0000)]
Report the operation number in all places where we note that we don't
know about a given operation number.

svn path=/trunk/; revision=49653

6 years agoFix the integer overflow case Jakub caught in
Evan Huus [Fri, 31 May 2013 13:08:03 +0000 (13:08 -0000)]
Fix the integer overflow case Jakub caught in

Also use indentation consistent with the rest of the file.

svn path=/trunk/; revision=49652

6 years agoCheck USB CCID length to see if subdissectors should be called instead of doing it...
Michael Mann [Fri, 31 May 2013 12:54:35 +0000 (12:54 -0000)]
Check USB CCID length to see if subdissectors should be called instead of doing it blindly (which could lead to malformed packets).  Bug 8735 (

Also minor cleanup of column info.

svn path=/trunk/; revision=49651

6 years agoUse #ifdefs in the XML to include or exclude the packet-editor and
Guy Harris [Fri, 31 May 2013 07:06:10 +0000 (07:06 -0000)]
Use #ifdefs in the XML to include or exclude the packet-editor and
capture menu items, rather than hiding them at run time.

For the capture menu items, translate the GtkAction callback calling
sequence to the normal widget callback calling sequence with individual
routines for each action, rather than a generic translator.

svn path=/trunk/; revision=49649

6 years agoDon't intentionally use -1 as an hfindex: while only naughty before, with the
Jeff Morriss [Fri, 31 May 2013 02:27:40 +0000 (02:27 -0000)]
Don't intentionally use -1 as an hfindex: while only naughty before, with the
changes from r49644 you'll get complaints about the hf being unregistered...

Note that this code also intentionally passes -1 as an ett_index.  It doesn't
currently complain so I'm leaving it alone for now...

svn path=/trunk/; revision=49648

6 years agoIOSTAT: plot LOAD y-axis in number of I/O not number of I/O times 1000
Ronnie Sahlberg [Fri, 31 May 2013 02:14:19 +0000 (02:14 -0000)]
IOSTAT: plot LOAD y-axis in number of I/O  not number of I/O times 1000

svn path=/trunk/; revision=49647

6 years agoOh yeah, -R is now -Y in trunk.
Jeff Morriss [Fri, 31 May 2013 02:03:03 +0000 (02:03 -0000)]
Oh yeah, -R is now -Y in trunk.

svn path=/trunk/; revision=49646

6 years agoGet rid of most of the if(tree) checks: the proto_tree_add_*() functions
Jeff Morriss [Fri, 31 May 2013 01:46:40 +0000 (01:46 -0000)]
Get rid of most of the if(tree) checks: the proto_tree_add_*() functions
don't need them any more and, as shown in
we really want to check if we're looking at something beyond the end of the TVB
(in order to break out of very long loops).

svn path=/trunk/; revision=49645

6 years ago(Finally!) check in part of Didier's patch to fix
Jeff Morriss [Fri, 31 May 2013 01:46:28 +0000 (01:46 -0000)]
(Finally!) check in part of Didier's patch to fix
(TRY_TO_FAKE_THIS_ITEM disables bounds errors):

Before calling TRY_TO_FAKE_THIS_ITEM() check if the length given (or, in
the case of FT_UINT_{STRING,BYTES}, the length we retrieve from the TVB)
exceeds what's left in the TVB.

Do this only for proto_tree_add_item() for now (it's the most commonly used
and thus the biggest trouble maker in this area).

Similar changes for other APIs will come later (if nothing blows up).  Despite
the fuzz failures this bug has caused I'm not sure about back-porting it...

svn path=/trunk/; revision=49644

6 years agoAs discussed in :
Jeff Morriss [Fri, 31 May 2013 01:38:55 +0000 (01:38 -0000)]
As discussed in :

Running tshark with a read filter ("-R") and without building the full tree
("-V") causes it to run into some more bugs (usually loops adding more than
100000 items to the tree).  Add some (commented out for now) code to do

svn path=/trunk/; revision=49643

6 years agoPut back some conversation list and endpoint list statistics presumably
Guy Harris [Thu, 30 May 2013 22:40:31 +0000 (22:40 -0000)]
Put back some conversation list and endpoint list statistics presumably
lost in the conversion to GTKUiManager.

svn path=/trunk/; revision=49642

6 years agoAdd a stat group REGISTER_STAT_GROUP_TELEPHONY_GSM for the Telephony/GSM
Guy Harris [Thu, 30 May 2013 22:32:10 +0000 (22:32 -0000)]
Add a stat group REGISTER_STAT_GROUP_TELEPHONY_GSM for the Telephony/GSM
statistics menu.

Have the CAMEL counter register itself in that menu, rather than having
main_menubar.c create the menu item for it.

svn path=/trunk/; revision=49641

6 years agoAdd Doxygen boilerplate for some of our core modules and data structures.
Gerald Combs [Thu, 30 May 2013 22:20:21 +0000 (22:20 -0000)]
Add Doxygen boilerplate for some of our core modules and data structures.

svn path=/trunk/; revision=49640

6 years agoInstall fop and asciidoc too
Jeff Morriss [Thu, 30 May 2013 21:47:24 +0000 (21:47 -0000)]
Install fop and asciidoc too

svn path=/trunk/; revision=49639

6 years agoOops: revert 49636. We tell a2x to use fop to generate the PDFs.
Jeff Morriss [Thu, 30 May 2013 21:41:17 +0000 (21:41 -0000)]
Oops: revert 49636. We tell a2x to use fop to generate the PDFs.

svn path=/trunk/; revision=49638

6 years agoAdd SEL RTAC to list of new protocols.
Jeff Morriss [Thu, 30 May 2013 21:37:26 +0000 (21:37 -0000)]
Add SEL RTAC to list of new protocols.

svn path=/trunk/; revision=49637

6 years agoWhich release notes targets we can build no longer depends on whether we HAVE_FOP.
Jeff Morriss [Thu, 30 May 2013 21:33:04 +0000 (21:33 -0000)]
Which release notes targets we can build no longer depends on whether we HAVE_FOP.

svn path=/trunk/; revision=49636

6 years agoFrom Chris Bontje via :
Pascal Quantin [Thu, 30 May 2013 20:51:18 +0000 (20:51 -0000)]
From Chris Bontje via :
SEL RTAC (Real Time Automation Controller) EIA-232 Serial-Line Dissection

svn path=/trunk/; revision=49635

6 years agoUpgrade user manual
Pascal Quantin [Thu, 30 May 2013 20:13:56 +0000 (20:13 -0000)]
Upgrade user manual

svn path=/trunk/; revision=49634

6 years agoUse gtk_widget_register_window() and gtk_widget_unregister_window()
Balint Reczey [Thu, 30 May 2013 16:42:32 +0000 (16:42 -0000)]
Use gtk_widget_register_window() and gtk_widget_unregister_window()

instead of deprecated gdk_window_set_user_data() for GTK+ 3 >= 3.8

svn path=/trunk/; revision=49633

6 years agoGet rid of C++/C99-style comments.
Jeff Morriss [Thu, 30 May 2013 12:54:24 +0000 (12:54 -0000)]
Get rid of C++/C99-style comments.

svn path=/trunk/; revision=49632

6 years agoRename "http.response_ts" to "http.time" to be inline with other response time fiels...
Sake Blok [Thu, 30 May 2013 07:16:04 +0000 (07:16 -0000)]
Rename "http.response_ts" to "http.time" to be inline with other response time fiels (like dns.time and smb.time etc)

svn path=/trunk/; revision=49630

6 years agoFrom Cal Turney:
Anders Broman [Thu, 30 May 2013 05:30:08 +0000 (05:30 -0000)]
From Cal Turney:
Preferences with trailing commas are ignored.

svn path=/trunk/; revision=49629

6 years agoFrom Chris Pane:
Anders Broman [Thu, 30 May 2013 05:24:37 +0000 (05:24 -0000)]
From Chris Pane:
Updates to IEEE 1722.1 dissector for Draft 23R2.

svn path=/trunk/; revision=49628

6 years doesn't need to be executable (it is sourced, not executed); remove...
Jeff Morriss [Thu, 30 May 2013 00:36:58 +0000 (00:36 -0000)] doesn't need to be executable (it is sourced, not executed); remove the svn:executable property.

svn path=/trunk/; revision=49626

6 years agoExit if we can't load the library.
Jeff Morriss [Thu, 30 May 2013 00:35:46 +0000 (00:35 -0000)]
Exit if we can't load the library.

svn path=/trunk/; revision=49625

6 years agoBatch (some of) the plugins to filterable expert infos. The Profinet plugin started...
Michael Mann [Wed, 29 May 2013 23:41:33 +0000 (23:41 -0000)]
Batch (some of) the plugins to filterable expert infos.  The Profinet plugin started to get a bit complex in determining filter names (especially the DCOM stuff), so I'll leave that to someone more familiar with the protocol.

svn path=/trunk/; revision=49624

6 years agoFix the infinite recursion problem reported in
Jeff Morriss [Wed, 29 May 2013 22:43:20 +0000 (22:43 -0000)]
Fix the infinite recursion problem reported in :

We can't solely rely on the port in the URI to determine whether we will be
recursively called by decode_tcp_ports().  Instead also check the conversation
entry too: if we find that we are the subdissector for this conversation
(which we might be--without the port being in our list of ports--if we
heuristically picked up the conversation or the user did Decode-As),
just bail out and dissect the payload as data.

svn path=/trunk/; revision=49623

6 years agoFix and clarify name resolution preference tooltips. Print the
Gerald Combs [Wed, 29 May 2013 18:01:03 +0000 (18:01 -0000)]
Fix and clarify name resolution preference tooltips. Print the
description before the name+type since that's presumably what people
are looking for.

svn path=/trunk/; revision=49622

6 years agoAdjust some fonts and colors.
Gerald Combs [Wed, 29 May 2013 17:58:01 +0000 (17:58 -0000)]
Adjust some fonts and colors.

svn path=/trunk/; revision=49621

6 years agoIf using cygwin, there is no pbcopy or xsel, but we do have putclip.
Chris Maynard [Wed, 29 May 2013 15:59:19 +0000 (15:59 -0000)]
If using cygwin, there is no pbcopy or xsel, but we do have putclip.

svn path=/trunk/; revision=49618

6 years agowslua: Adda a wtap_encaps name to replace wtap which is too generic.
Luis Ontanon [Wed, 29 May 2013 15:52:25 +0000 (15:52 -0000)]
wslua: Adda a wtap_encaps name to replace wtap which is too generic.

svn path=/trunk/; revision=49617

6 years agoCorrect the c-ares directory name in the clean_setup target.
Chris Maynard [Wed, 29 May 2013 15:41:57 +0000 (15:41 -0000)]
Correct the c-ares directory name in the clean_setup target.

svn path=/trunk/; revision=49616

6 years agoBugfix crash when 'SCTP' -> 'Prepare Filter for this Association' has no associations...
Michael Mann [Wed, 29 May 2013 13:50:45 +0000 (13:50 -0000)]
Bugfix crash when 'SCTP' -> 'Prepare Filter for this Association' has no associations.  Bug 8731 (

Dialog (wants to) pop up noting no associations, but sctp_set_filter() wants to press on assuming there is an association. Added NULL check to prevent assumption.

svn path=/trunk/; revision=49610

6 years agoFix what looks to be a typo in definition of wtap_encaps.
Jeff Morriss [Wed, 29 May 2013 13:03:52 +0000 (13:03 -0000)]
Fix what looks to be a typo in definition of wtap_encaps.

svn path=/trunk/; revision=49609

6 years ago fix for bug 7465
Luis Ontanon [Wed, 29 May 2013 06:50:28 +0000 (06:50 -0000)]
 fix for bug 7465
add a wiretap file type table to init.lua

svn path=/trunk/; revision=49608

6 years agoFix the fuzz failure reported in
Jeff Morriss [Wed, 29 May 2013 03:19:31 +0000 (03:19 -0000)]
Fix the fuzz failure reported in :

Make proto_tree_children_foreach() NULL-tree safe.  Crash is new since r49602
took out an if(tree).

svn path=/trunk/; revision=49607

6 years agoIn ICMP taps, don't use g_slist_insert_sorted (which results in
Evan Huus [Tue, 28 May 2013 23:20:44 +0000 (23:20 -0000)]
In ICMP taps, don't use g_slist_insert_sorted (which results in
n^2 time on the number of packets). Just prepend to the list, then sort
it when we actually need to calculate the statistics.

Should fix

svn path=/trunk/; revision=49606

6 years agoAs described in the thread starting with:
Jeff Morriss [Tue, 28 May 2013 22:33:33 +0000 (22:33 -0000)]
As described in the thread starting with:

The PC and SSN are mandatory for the SCCP "user table" to work.  Complain if
they are not given.

svn path=/trunk/; revision=49605

6 years agoUse the local libtool rather than whatever is in PATH. This works just
Evan Huus [Tue, 28 May 2013 22:29:02 +0000 (22:29 -0000)]
Use the local libtool rather than whatever is in PATH. This works just
the same everywhere I've tested except my mac setup where it works better
(since the libtool in PATH doesn't have --mode=execute for some strange reason).

This is fairly experimental - feel free to revert if it breaks something.

svn path=/trunk/; revision=49604

6 years agoAdd some info to make it easier to see when SI config changes:
Martin Mathieson [Tue, 28 May 2013 22:11:56 +0000 (22:11 -0000)]
Add some info to make it easier to see when SI config changes:
- show systemInfoModification in info column (and expert info), also
  show number of UEs paged
- add expert item when systemInfoValueTag changes
- for MIB, add SFN to info column

svn path=/trunk/; revision=49603