metze/wireshark/wip.git
11 years agoMake idl2wrs dissectors filterable - Part 1
Michael Mann [Thu, 11 Oct 2012 14:42:33 +0000 (14:42 -0000)]
Make idl2wrs dissectors filterable - Part 1

Updated wireshark_gen.py to generate hf_ variables for all of the IDL "types".  The "simple" types use proto_tree_add_* (not text), while the "complex" types use the GIOP dissector API.  checkhf.pl generates some warnings because (some of) the hf_ variables are being generated for the "complex" types, but are not being used.  That will be done in Part 2.

expert_add_info_format now linked to a real item instead of being attached to a duplicative proto_tree_add_text().  This cleaned up literally thousands of unnecessary proto_tree_add_text()s

svn path=/trunk/; revision=45472

11 years agoShould have been part of r45470, changing format of "magic number"
Michael Mann [Thu, 11 Oct 2012 14:22:13 +0000 (14:22 -0000)]
Should have been part of r45470, changing format of "magic number"

svn path=/trunk/; revision=45471

11 years agoGeneral cleanup, made more items filterable. Checking in now to get a new baseline...
Michael Mann [Thu, 11 Oct 2012 14:16:25 +0000 (14:16 -0000)]
General cleanup, made more items filterable.  Checking in now to get a new baseline for some idl2wrs improvements involving getting more items filterable (see bug 7822)

svn path=/trunk/; revision=45470

11 years agoFix infinite loop in HART/IP dissector (https://bugs.wireshark.org/bugzilla/show_bug...
Michael Mann [Thu, 11 Oct 2012 14:05:27 +0000 (14:05 -0000)]
Fix infinite loop in HART/IP dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7845)

I also did a small bit of cleanup dissection while I was there, but it could definitely use more.  I just want to fix the fuzztest crash I discovered before the buildbots get a hold of it.

svn path=/trunk/; revision=45469

11 years agoFix crash when use pcapng with comments (with QtShark)
Alexis La Goutte [Thu, 11 Oct 2012 12:31:39 +0000 (12:31 -0000)]
Fix crash when use pcapng with comments (with QtShark)
ERROR:proto_tree.cpp:125:void proto_tree_draw_node(proto_node*, gpointer): code should not be reached

(Missing color information for PI_COMMENT)

svn path=/trunk/; revision=45468

11 years agoFrom Bartosz Brachaczek:
Anders Broman [Thu, 11 Oct 2012 08:28:57 +0000 (08:28 -0000)]
From Bartosz Brachaczek:
Make the SSL dissector work with GnuTLS compiled with nettle.

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

#BACKPORT

svn path=/trunk/; revision=45465

11 years agohf_isup_cic is now BASE_DEC, so there's no reason to use
Guy Harris [Thu, 11 Oct 2012 08:23:29 +0000 (08:23 -0000)]
hf_isup_cic is now BASE_DEC, so there's no reason to use
proto_tree_add_uint_format() to make it display in decimal -
proto_tree_add_uint() suffices.

svn path=/trunk/; revision=45464

11 years ago"Prepare/Apply a filter" on ISUP CIC should make a filter with decimal CIC number...
Anders Broman [Thu, 11 Oct 2012 08:12:41 +0000 (08:12 -0000)]
"Prepare/Apply a filter" on ISUP CIC should make a filter with decimal CIC number, not hex.

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

svn path=/trunk/; revision=45463

11 years agoChange 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Bill Meier [Thu, 11 Oct 2012 03:55:33 +0000 (03:55 -0000)]
Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'

Done on general principles altho none of the cases
changed would have actually resulted in an infinite
loop because a Bounds error would eventually occur.

svn path=/trunk/; revision=45462

11 years agoThe usual idiom in C for "do this N times" is "for (i = 0; i < N; i++)",
Guy Harris [Thu, 11 Oct 2012 00:02:14 +0000 (00:02 -0000)]
The usual idiom in C for "do this N times" is "for (i = 0; i < N; i++)",
not "for (i = 1; i < N+1; i++)".

Even if it weren't the idiom, it'd be safer, at least for unsigned
values, as, if i and N are the same width, and N has the maximum
possible value for that width, the first of those runs i from 0 to N-1,
all of which fit in a variable of that width, and the second of those
runs i from 1 to N, the latter of which doesn't fit into a variable of
that width, so modulo arithmetic turns it into 0 and the loop keeps
running forever.

Fixes bug 7844.

svn path=/trunk/; revision=45459

11 years agoCopy of tap details needed to be a little bit deeper.
Martin Mathieson [Wed, 10 Oct 2012 23:09:52 +0000 (23:09 -0000)]
Copy of tap details needed to be a little bit deeper.

svn path=/trunk/; revision=45458

11 years agoFrom Bill Parker: fix typo.
Guy Harris [Wed, 10 Oct 2012 21:09:10 +0000 (21:09 -0000)]
From Bill Parker: fix typo.

svn path=/trunk/; revision=45457

11 years agoFix a copy+paste error and a missing include. Adjust the format_size
Gerald Combs [Wed, 10 Oct 2012 20:19:18 +0000 (20:19 -0000)]
Fix a copy+paste error and a missing include. Adjust the format_size
digit threshold.

svn path=/trunk/; revision=45456

11 years agoBased on patch from Bill Parker, check for ws_fopen() failing.
Guy Harris [Wed, 10 Oct 2012 19:50:37 +0000 (19:50 -0000)]
Based on patch from Bill Parker, check for ws_fopen() failing.

The rest of the code already checks for namelist being null, so it's OK
to call build_tree_view() - and it may be necessary to do so, as the
code below might assume that's worked.

However, we should not call fclose() on namelist if it's null; the C89
standard, at least, does *not* assert that fclose(NULL) is a no-op.

Clean up indentation a little bit.

Last part of fix for bug 7824.

svn path=/trunk/; revision=45455

11 years agoFrom Bill Parker: check for ws_fopen() failing.
Guy Harris [Wed, 10 Oct 2012 19:33:49 +0000 (19:33 -0000)]
From Bill Parker: check for ws_fopen() failing.

From me: instead of logging the error with a macro that requires dbg_out
to be set, and giving up, set dbg_out to stderr, log the message (which
now notes that logging will be done to the standard error), and drive
on.

Part of fix for bug 7824.

svn path=/trunk/; revision=45454

11 years agoAdd a format_size function similar to g_format_size that renders a size
Gerald Combs [Wed, 10 Oct 2012 19:17:31 +0000 (19:17 -0000)]
Add a format_size function similar to g_format_size that renders a size
value in a human-readable format. Use it in the welcome screen, status
bar, and Win32 interface details.

Note that in the welcome screen and status bar we've switched from
customary binary prefixes to strict SI.

svn path=/trunk/; revision=45453

11 years agoIn the include processing code, if ddict_open() fails, bail out
Guy Harris [Wed, 10 Oct 2012 19:06:34 +0000 (19:06 -0000)]
In the include processing code, if ddict_open() fails, bail out
*regardless* of whether errno is non-zero, so we at least report the
failure.

In the standalone test program built if TEST_DIAM_DICT_STANDALONE is
defined, check for ddict_scan() failing.

Part of fix for bug 7824.

svn path=/trunk/; revision=45452

11 years agoRevert changes to ep_ allocator, revert edt ref-counting.
Jakub Zawadzki [Wed, 10 Oct 2012 19:05:30 +0000 (19:05 -0000)]
Revert changes to ep_ allocator, revert edt ref-counting.

svn path=/trunk/; revision=45451

11 years agoGet rid of an outdated format
Martin Mathieson [Wed, 10 Oct 2012 16:39:51 +0000 (16:39 -0000)]
Get rid of an outdated format

svn path=/trunk/; revision=45450

11 years agoTake a deep copy of the tap struct in the tap function, as it is not
Martin Mathieson [Wed, 10 Oct 2012 16:17:19 +0000 (16:17 -0000)]
Take a deep copy of the tap struct in the tap function, as it is not
safe to access it after the packet has been fully dissected (the
struct will have been allocated with ep_alloc()).

svn path=/trunk/; revision=45449

11 years agoUpdate to format of string that indicates SR failure.
Martin Mathieson [Wed, 10 Oct 2012 15:18:52 +0000 (15:18 -0000)]
Update to format of string that indicates SR failure.

svn path=/trunk/; revision=45448

11 years agoProvide ability to find previous request packets in NCP hash table.
Greg Morris [Wed, 10 Oct 2012 13:55:18 +0000 (13:55 -0000)]
Provide ability to find previous request packets in NCP hash table.

svn path=/trunk/; revision=45447

11 years agoFix r45445
Jakub Zawadzki [Wed, 10 Oct 2012 12:30:53 +0000 (12:30 -0000)]
Fix r45445

svn path=/trunk/; revision=45446

11 years agoFix bug #7814
Jakub Zawadzki [Wed, 10 Oct 2012 12:24:56 +0000 (12:24 -0000)]
Fix bug #7814

We need to pass original pointer and length to munmap().

svn path=/trunk/; revision=45445

11 years agoTemporarilly disable ep's use of chunks until the bugs are fixed.
Evan Huus [Wed, 10 Oct 2012 11:17:28 +0000 (11:17 -0000)]
Temporarilly disable ep's use of chunks until the bugs are fixed.

svn path=/trunk/; revision=45444

11 years agoRevert
Jörg Mayer [Wed, 10 Oct 2012 04:42:03 +0000 (04:42 -0000)]
Revert

  ------------------------------------------------------------------------
  r45351 | eapache | 2012-10-06 22:18:28 +0200 (Sa, 06 Okt 2012) | 3 lines

  Don't store qm files in svn: they're generated from the ts files and get removed
  on a make clean.

  ------------------------------------------------------------------------

it breaks out of tree builds and I don't have the time to fix that right now.

svn path=/trunk/; revision=45441

11 years agoMove a couple of enums to the common UI directory. Remove an unused
Gerald Combs [Tue, 9 Oct 2012 23:51:30 +0000 (23:51 -0000)]
Move a couple of enums to the common UI directory. Remove an unused
definition.

svn path=/trunk/; revision=45440

11 years agoApply Ronnie Sahlberg's ICMP request/response tracking improvements from r45343 to...
Chris Maynard [Tue, 9 Oct 2012 22:34:40 +0000 (22:34 -0000)]
Apply Ronnie Sahlberg's ICMP request/response tracking improvements from r45343 to ICMPv6.  (Tested using captures from bug 5810).

svn path=/trunk/; revision=45439

11 years agoFrom Mark Phillips:
Jaap Keuter [Tue, 9 Oct 2012 21:29:09 +0000 (21:29 -0000)]
From Mark Phillips:
I have added support for the 11ac VHT Capabilities and Operation IEs.

svn path=/trunk/; revision=45438

11 years agoIf our error output is huge (> 5 MB) trim out the middle of the file.
Gerald Combs [Tue, 9 Oct 2012 20:47:22 +0000 (20:47 -0000)]
If our error output is huge (> 5 MB) trim out the middle of the file.
The recent loop bugs have generated output that's too large to attach to
Bugzilla.

svn path=/trunk/; revision=45437

11 years agoMore indentation fixes; add a reminder comment about where new XML files need to...
Jeff Morriss [Tue, 9 Oct 2012 20:29:21 +0000 (20:29 -0000)]
More indentation fixes; add a reminder comment about where new XML files need to be added.

svn path=/trunk/; revision=45436

11 years agoAdd another check for command APDU dissection
Pascal Quantin [Tue, 9 Oct 2012 20:11:48 +0000 (20:11 -0000)]
Add another check for command APDU dissection

svn path=/trunk/; revision=45435

11 years agoFix the layout of the "Export Dissected Packets" template and tweak a
Gerald Combs [Tue, 9 Oct 2012 17:52:38 +0000 (17:52 -0000)]
Fix the layout of the "Export Dissected Packets" template and tweak a
few other layouts.

svn path=/trunk/; revision=45434

11 years agoFix dissection of more instructions when having only the command APDU
Pascal Quantin [Tue, 9 Oct 2012 17:49:14 +0000 (17:49 -0000)]
Fix dissection of more instructions when having only the command APDU

svn path=/trunk/; revision=45433

11 years agoFix up indentation and white space.
Jeff Morriss [Tue, 9 Oct 2012 17:37:49 +0000 (17:37 -0000)]
Fix up indentation and white space.

svn path=/trunk/; revision=45432

11 years agoFrom Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7820
Alexis La Goutte [Tue, 9 Oct 2012 17:17:22 +0000 (17:17 -0000)]
From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7820
wlan_mgt.ht.capabilities bits 8-15 incorrectly decoded (from wrong packet offset)

The bug is that the code defines the bit fields as 16 bit, but increments the
offset in-between decoding B0-B7 and B8-B15 which causes the wrong bits to be
decoded.

Also fix to change "Capability" to "Capabilities" to match spec

From me : Fix wrong length for A-MPDU

svn path=/trunk/; revision=45431

11 years agoFix Qt compilation on Windows. Check the user-supplied range syntax
Gerald Combs [Tue, 9 Oct 2012 15:34:40 +0000 (15:34 -0000)]
Fix Qt compilation on Windows. Check the user-supplied range syntax
and provide instant feedback in the Win32 file dialog similar to the Qt
code. Tango-ize some colors. Escape a backslash in QtShark.pro.

svn path=/trunk/; revision=45430

11 years agoSet fence after finishing writing to the info col in order to show
Anders Broman [Tue, 9 Oct 2012 15:07:46 +0000 (15:07 -0000)]
Set fence after finishing writing to the info col in order to show
info from more than one (SIP) message in the frame.

svn path=/trunk/; revision=45429

11 years agoAs ths SDP dissector adds /SDP to the protocol column I think that
Anders Broman [Tue, 9 Oct 2012 15:00:39 +0000 (15:00 -0000)]
As ths SDP dissector adds /SDP to the protocol column I think that
col_append_str(pinfo->cinfo, COL_INFO, ", with session description"); is redundant if some one has a different opinion fel free to revert.

svn path=/trunk/; revision=45428

11 years ago- Add Nokai Siemens Networks AVP.
Anders Broman [Tue, 9 Oct 2012 14:10:31 +0000 (14:10 -0000)]
- Add Nokai Siemens Networks AVP.
- Add a few enums to Event-Trigger
- Reformat the Nokia file a bit.

svn path=/trunk/; revision=45427

11 years agoFrom Andrew Kampjes:
Anders Broman [Tue, 9 Oct 2012 10:57:04 +0000 (10:57 -0000)]
From Andrew Kampjes:
Correcting a few fields in SDH dissector.

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

svn path=/trunk/; revision=45426

11 years agoFix dissection of Get Response when not in SIMtrace mode
Pascal Quantin [Tue, 9 Oct 2012 10:48:59 +0000 (10:48 -0000)]
Fix dissection of Get Response when not in SIMtrace mode

svn path=/trunk/; revision=45425

11 years agoFrom Michal Labedzki:
Anders Broman [Tue, 9 Oct 2012 10:45:14 +0000 (10:45 -0000)]
From Michal Labedzki:
[PATCH 17] Bluetooth: Add GNSS services to SDP

Based on https://www.bluetooth.org/Technical/AssignedNumbers/home.htm

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

svn path=/trunk/; revision=45424

11 years agoFrom Michal Labedzki:
Anders Broman [Tue, 9 Oct 2012 10:41:30 +0000 (10:41 -0000)]
From Michal Labedzki:
[PATCH 16] Bluetooth: Add SYNC and BPP service handles to OBEX
Also fix typo.

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

svn path=/trunk/; revision=45423

11 years agoFrom Michal Labedzki:
Anders Broman [Tue, 9 Oct 2012 10:36:04 +0000 (10:36 -0000)]
From Michal Labedzki:
[PATCH 15] Bluetooth: Add modelines

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

svn path=/trunk/; revision=45422

11 years agoReplace non ASCII chars.
Anders Broman [Tue, 9 Oct 2012 10:26:43 +0000 (10:26 -0000)]
Replace non ASCII chars.

svn path=/trunk/; revision=45421

11 years agoComment out unused variable remoce C++ style comments etc.
Anders Broman [Tue, 9 Oct 2012 10:24:15 +0000 (10:24 -0000)]
Comment out unused variable remoce C++ style comments etc.

svn path=/trunk/; revision=45420

11 years agoFrom Chris Wulff:
Anders Broman [Tue, 9 Oct 2012 08:49:40 +0000 (08:49 -0000)]
From Chris Wulff:
Minor bugfixes to packet-msrp.c and packet-mrp-mvrp.c

Major updates to packet-ieee17221.c

Changes to ieee17221.c update dissector from draft revision 18 / 19 code to
draft revision 21.

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

svn path=/trunk/; revision=45419

11 years agoFrom Bill Parker:
Anders Broman [Tue, 9 Oct 2012 08:40:02 +0000 (08:40 -0000)]
From Bill Parker:
Explicitly declare/cast 'unsigned <variable>' as 'unsigned int <variable>'

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

svn path=/trunk/; revision=45418

11 years agoFix dissection of Bearer parameters for E-UTRAN / mapped UTRAN packet service
Pascal Quantin [Tue, 9 Oct 2012 07:40:06 +0000 (07:40 -0000)]
Fix dissection of Bearer parameters for E-UTRAN / mapped UTRAN packet service

svn path=/trunk/; revision=45417

11 years agoAdd initial support for three new RTCP packet types: AVB, RSI and TOKEN.
Jaap Keuter [Tue, 9 Oct 2012 06:41:32 +0000 (06:41 -0000)]
Add initial support for three new RTCP packet types: AVB, RSI and TOKEN.

svn path=/trunk/; revision=45416

11 years agoCheck if Bearer Parameters field is present before displaying it
Pascal Quantin [Tue, 9 Oct 2012 05:34:48 +0000 (05:34 -0000)]
Check if Bearer Parameters field is present before displaying it

svn path=/trunk/; revision=45415

11 years agoAdd syntax_line_edit.h to CMakeLists to fix CMake qtshark build.
Evan Huus [Tue, 9 Oct 2012 00:54:40 +0000 (00:54 -0000)]
Add syntax_line_edit.h to CMakeLists to fix CMake qtshark build.

svn path=/trunk/; revision=45414

11 years agoEnhance dissection of Open Channel proactive command
Pascal Quantin [Mon, 8 Oct 2012 22:30:47 +0000 (22:30 -0000)]
Enhance dissection of Open Channel proactive command

svn path=/trunk/; revision=45413

11 years agoActually destroy chunks in emem_free_all. We lose the efficiency of re-using
Evan Huus [Mon, 8 Oct 2012 22:27:03 +0000 (22:27 -0000)]
Actually destroy chunks in emem_free_all. We lose the efficiency of re-using
them, but until I can figure out the correct logic for that (3rd try and
counting...) this at least plugs the leak.

svn path=/trunk/; revision=45412

11 years agoAdd "gsm_sim.command" and "gsm_sim.response" dissectors and call them in btsap dissector
Pascal Quantin [Mon, 8 Oct 2012 21:46:30 +0000 (21:46 -0000)]
Add "gsm_sim.command" and "gsm_sim.response" dissectors and call them in btsap dissector
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7715

svn path=/trunk/; revision=45411

11 years agofix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7800
Martin Kaiser [Mon, 8 Oct 2012 20:43:06 +0000 (20:43 -0000)]
fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7800

use correct data types in eigrp dissector to prevent overflow

svn path=/trunk/; revision=45408

11 years agoAdd a cast.
Gerald Combs [Mon, 8 Oct 2012 20:22:21 +0000 (20:22 -0000)]
Add a cast.

svn path=/trunk/; revision=45407

11 years agoRemove a debugging #include.
Gerald Combs [Mon, 8 Oct 2012 20:04:38 +0000 (20:04 -0000)]
Remove a debugging #include.

svn path=/trunk/; revision=45406

11 years agoAdd a PacketRangeGroupBox widget. Use it to implement "Export Selected
Gerald Combs [Mon, 8 Oct 2012 20:01:59 +0000 (20:01 -0000)]
Add a PacketRangeGroupBox widget. Use it to implement "Export Selected
Packets". Not yet tested on Windows. "Ignore Packet" hasn't been
implemented so we can't test that either.

Create a SyntaxLineEdit widget from the QLineEdit code in
DisplayFilterEdit. Use it in the file import and export dialogs and the
PacketRangeGroupBox widget. This lets us provide instant feedback
instead of popping up an error dialog.

Expand the Tango color list based on
http://emilis.info/other/extended_tango .

Rearrange QtShark.pro to (hopefully) work better with Qt Creator.

svn path=/trunk/; revision=45405

11 years agoTry to clarify some of the ifdefs in emem.c.
Evan Huus [Mon, 8 Oct 2012 19:43:03 +0000 (19:43 -0000)]
Try to clarify some of the ifdefs in emem.c.

svn path=/trunk/; revision=45404

11 years agoFrom Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7796
Evan Huus [Mon, 8 Oct 2012 19:31:17 +0000 (19:31 -0000)]
From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7796

Add summary information to USB isodesc trees to make interesting descriptors
obvious to the user.

svn path=/trunk/; revision=45403

11 years agoexpert.h needs packet_info.h
Martin Kaiser [Mon, 8 Oct 2012 19:30:34 +0000 (19:30 -0000)]
expert.h needs packet_info.h

(trying to ensure that the order in which files are included
 does not matter)

svn path=/trunk/; revision=45402

11 years agoFrom Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7807
Evan Huus [Mon, 8 Oct 2012 19:23:50 +0000 (19:23 -0000)]
From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7807

Fix dissection of some GlusterFS procedures.

From me:

Use TRUE/FALSE instead of 1/0 for boolean literals.

svn path=/trunk/; revision=45401

11 years agoRename emem_header_t to emem_pool_t to better indicate what it can be
Guy Harris [Mon, 8 Oct 2012 18:33:00 +0000 (18:33 -0000)]
Rename emem_header_t to emem_pool_t to better indicate what it can be
used for - it represents a memory pool that parcels out memory from
larger allocated chunks (reducing the number of individual malloc-style
calls that are made) and that can be freed in its entirety.

svn path=/trunk/; revision=45400

11 years agoLog the time we spend waiting for the capture child to exit.
Gerald Combs [Mon, 8 Oct 2012 18:11:30 +0000 (18:11 -0000)]
Log the time we spend waiting for the capture child to exit.

Add breadcrumbs so that we can switch from g_get_current_time to
g_get_real_time when our minimum GLib version is >= 2.28.

svn path=/trunk/; revision=45399

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 8 Oct 2012 17:55:12 +0000 (17:55 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=45398

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 8 Oct 2012 17:54:39 +0000 (17:54 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=45397

11 years agoWe've already typedef'ed emem_header_t in emem.h. We don't have to do it
Gerald Combs [Mon, 8 Oct 2012 17:52:42 +0000 (17:52 -0000)]
We've already typedef'ed emem_header_t in emem.h. We don't have to do it
again in emem.c.

svn path=/trunk/; revision=45396

11 years agocol_cleanup is used outside libwireshark, so it needs to be exported.
Guy Harris [Mon, 8 Oct 2012 17:08:52 +0000 (17:08 -0000)]
col_cleanup is used outside libwireshark, so it needs to be exported.

svn path=/trunk/; revision=45395

11 years agoThere's no longer a ep_free_all() routine.
Guy Harris [Mon, 8 Oct 2012 17:07:23 +0000 (17:07 -0000)]
There's no longer a ep_free_all() routine.

svn path=/trunk/; revision=45394

11 years agocol_cleanup() is undoing the allocations that col_init() does, so it's
Guy Harris [Mon, 8 Oct 2012 17:04:37 +0000 (17:04 -0000)]
col_cleanup() is undoing the allocations that col_init() does, so it's
freeing the allocated array of pointers, not what the pointers ported
to, so it should free col_data.  Note that it does that, and put it
after col_init() in the source file and header file.

Put in a comment explaining the MSVC bug that we're working around with
the casts.

svn path=/trunk/; revision=45393

11 years agoWrite a short essay in a comment explaining the weirdness that is now the
Evan Huus [Mon, 8 Oct 2012 16:42:54 +0000 (16:42 -0000)]
Write a short essay in a comment explaining the weirdness that is now the
ephemeral allocation logic.

svn path=/trunk/; revision=45392

11 years agocol_data is not necessarily set to point to something g_malloc()ated,
Guy Harris [Mon, 8 Oct 2012 16:28:13 +0000 (16:28 -0000)]
col_data is not necessarily set to point to something g_malloc()ated,
and, if it is, it might be set to point to col_buf, which gets g_free()d
in the next statement, so we shouldn't g_free() it.

svn path=/trunk/; revision=45391

11 years agoExplicitly cast away const-ness to fix windows build-bots.
Evan Huus [Mon, 8 Oct 2012 15:39:02 +0000 (15:39 -0000)]
Explicitly cast away const-ness to fix windows build-bots.

svn path=/trunk/; revision=45390

11 years agoEDT structures now own their ep_ memory pools. This should finally clean
Evan Huus [Mon, 8 Oct 2012 15:23:36 +0000 (15:23 -0000)]
EDT structures now own their ep_ memory pools. This should finally clean
up the last little bits of:
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5284
- https://www.wireshark.org/lists/wireshark-dev/201208/msg00128.html

and possibly part of:
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7775

This is a fairly invasive change that required some funky work with linked
lists to avoid changing any of the public ep_* APIs, so if something breaks
blame me :)

svn path=/trunk/; revision=45389

11 years agoDon't leak all of our column data in packet_list_recreate (I think we still leak
Evan Huus [Mon, 8 Oct 2012 15:12:45 +0000 (15:12 -0000)]
Don't leak all of our column data in packet_list_recreate (I think we still leak
some of it?).

Maybe part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7775

svn path=/trunk/; revision=45388

11 years agoFix unused parameters.
Anders Broman [Mon, 8 Oct 2012 15:10:24 +0000 (15:10 -0000)]
Fix unused parameters.

svn path=/trunk/; revision=45387

11 years agoLet ISUP national settings be valid for BICC too.
Anders Broman [Mon, 8 Oct 2012 14:22:24 +0000 (14:22 -0000)]
Let ISUP national settings be valid for BICC too.
Extend dissection of Japan ISUP.

svn path=/trunk/; revision=45386

11 years agoFrom GeorgiaK:
Anders Broman [Mon, 8 Oct 2012 14:20:34 +0000 (14:20 -0000)]
From GeorgiaK:
Add Nokia AVP:s

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

svn path=/trunk/; revision=45385

11 years agoUpdate French translations !
Alexis La Goutte [Mon, 8 Oct 2012 12:25:23 +0000 (12:25 -0000)]
Update French translations !

svn path=/trunk/; revision=45384

11 years agoMake new text translatable (for QtShark:file_set_dialog.cpp)
Alexis La Goutte [Mon, 8 Oct 2012 12:16:54 +0000 (12:16 -0000)]
Make new text translatable (for QtShark:file_set_dialog.cpp)
and lupdate qtshark.pro (update translation file)
Updating 'qtshark_de.ts'...
    Found 243 source text(s) (45 new and 198 already existing)
Updating 'qtshark_fr.ts'...
    Found 243 source text(s) (45 new and 198 already existing)
    Number heuristic provided 1 translation(s)

svn path=/trunk/; revision=45383

11 years agoPatch from Florian Fainelli via bug #7772
Jakub Zawadzki [Mon, 8 Oct 2012 12:06:16 +0000 (12:06 -0000)]
Patch from Florian Fainelli via bug #7772

Cleans up the mask used for the "High" part of the sub-carrier modulation
to match (modulus the 4-bits shifting) the one used for the "Low" part.

svn path=/trunk/; revision=45382

11 years agoPatch from Florian Fainelli
Jakub Zawadzki [Mon, 8 Oct 2012 12:05:14 +0000 (12:05 -0000)]
Patch from Florian Fainelli
Fix bug #7772: dissect only the number of active HomePlug AV subcarriers

The dissector currently dissects all 1156 sub-carriers available in the Tone
Map Characteristisc Confirmation frame no matter what is the number of active
ones.

This is not valid, because the frame only contains the number of active
sub-carriers, even though it is padded to 1156 sub-carriers. This is also an
issue for newest HomePlug AV devices with a 500Mbits/sec PHY rate, because
those will have up to 2690 sub-carriers, and we would only dissect the first
1156 active ones.

svn path=/trunk/; revision=45381

11 years agoContinuation of r43335
Jakub Zawadzki [Mon, 8 Oct 2012 09:50:47 +0000 (09:50 -0000)]
Continuation of r43335

- ipv6.traffic_class.dscp use ext string so and need BASE_EXT_STRING flag (fix SIGSEGV)
- dscp_vals was removed from .h file, so make it static
- export dscp_vals_ext

svn path=/trunk/; revision=45380

11 years agoRFC 4627 allows upper case hex digits as well
Jakub Zawadzki [Mon, 8 Oct 2012 09:48:38 +0000 (09:48 -0000)]
RFC 4627 allows upper case hex digits as well

svn path=/trunk/; revision=45379

11 years agoFix crash when exporting packet dissection as plain text on Windows (regression intro...
Pascal Quantin [Mon, 8 Oct 2012 09:22:46 +0000 (09:22 -0000)]
Fix crash when exporting packet dissection as plain text on Windows (regression introduced in r45333)

svn path=/trunk/; revision=45378

11 years agoFrom Martin Isaksson:
Anders Broman [Mon, 8 Oct 2012 08:41:34 +0000 (08:41 -0000)]
From Martin Isaksson:
Preparattions for GTP tap.

svn path=/trunk/; revision=45377

11 years ago(Trivial) Remove unneeded #include.
Bill Meier [Sun, 7 Oct 2012 22:33:59 +0000 (22:33 -0000)]
(Trivial) Remove unneeded #include.

svn path=/trunk/; revision=45376

11 years agoFix a couple of typos.
Chris Maynard [Sun, 7 Oct 2012 20:36:12 +0000 (20:36 -0000)]
Fix a couple of typos.

svn path=/trunk/; revision=45375

11 years ago+10 ;|
Jakub Zawadzki [Sun, 7 Oct 2012 20:13:11 +0000 (20:13 -0000)]
+10 ;|

svn path=/trunk/; revision=45374

11 years agoUnescape JSON strings.
Jakub Zawadzki [Sun, 7 Oct 2012 19:57:21 +0000 (19:57 -0000)]
Unescape JSON strings.

svn path=/trunk/; revision=45373

11 years agoFix bug #7805: application/json HTTP packets sometimes isn't decoded
Jakub Zawadzki [Sun, 7 Oct 2012 19:33:47 +0000 (19:33 -0000)]
Fix bug #7805: application/json HTTP packets sometimes isn't decoded

tvbparse_quoted() don't support well JSON string escaping, use our own tvbparse rule.

svn path=/trunk/; revision=45372

11 years agoMinor cleanup:
Bill Meier [Sun, 7 Oct 2012 17:45:56 +0000 (17:45 -0000)]
Minor cleanup:
- remove unneeded #includes;
- remove some "no effect" code;
- fix some whitespace and long lines.

svn path=/trunk/; revision=45371

11 years agoThis is an attempt to improve the default window placement position when there's...
Chris Maynard [Sun, 7 Oct 2012 17:16:51 +0000 (17:16 -0000)]
This is an attempt to improve the default window placement position when there's more than one monitor and Wireshark's main window isn't located on the primary monitor.  New windows will now open on the same monitor as Wireshark's main window, at a fixed location slightly offset from the main window.  Previously, new windows would always open on the primary monitor regardless of the monitor that Wireshark was on.  Note that this is only the default position and future patches will likely cause many windows to change this position.  Further usage/feedback will determine if this is a good temporary stategy or not.  It *may* help obviate the need to save every window's x,y & size though.

svn path=/trunk/; revision=45370

11 years agoFrom Tomofumi Hayashi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7806
Evan Huus [Sun, 7 Oct 2012 16:13:40 +0000 (16:13 -0000)]
From Tomofumi Hayashi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7806

Update MPLS-Echo to support part of rfc6425.

svn path=/trunk/; revision=45369

11 years agoUse GPOINTER_TO_UINT macro.
Martin Mathieson [Sun, 7 Oct 2012 15:59:26 +0000 (15:59 -0000)]
Use GPOINTER_TO_UINT macro.

svn path=/trunk/; revision=45368

11 years agoMake the channel state key fit into the gpointer to avoid allocations.
Martin Mathieson [Sun, 7 Oct 2012 15:14:44 +0000 (15:14 -0000)]
Make the channel state key fit into the gpointer to avoid allocations.
Don't fetch the first byte of the payload length multiple times.

svn path=/trunk/; revision=45367

11 years ago[Automatic manuf, services and enterprise-numbers update for 2012-10-07]
Gerald Combs [Sun, 7 Oct 2012 14:03:25 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-10-07]

svn path=/trunk/; revision=45364

11 years agoFrom Роман Донченко:
Jaap Keuter [Sun, 7 Oct 2012 09:48:30 +0000 (09:48 -0000)]
From Роман Донченко:
Currently, when Wireshark encounters the first entropy-coded segment in a JPEG
file it stops dissection.
However, the design of the JPEG format allows to find the next marker even if
the entropy-coded segment is not decoded. Thus, a better strategy for Wireshark
would be to skip the entropy-coded segment and continue dissection at the next
marker.

svn path=/trunk/; revision=45363