Commit Graph

42917 Commits

Author SHA1 Message Date
Gerald Combs 4f1eb84444 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
2012-10-08 18:11:30 +00:00
Alexis La Goutte 3e602ee281 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45398
2012-10-08 17:55:12 +00:00
Alexis La Goutte 8d6260628e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45397
2012-10-08 17:54:39 +00:00
Gerald Combs 98d7549953 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
2012-10-08 17:52:42 +00:00
Guy Harris 4ab12fb640 col_cleanup is used outside libwireshark, so it needs to be exported.
svn path=/trunk/; revision=45395
2012-10-08 17:08:52 +00:00
Guy Harris 5c26eba9ea There's no longer a ep_free_all() routine.
svn path=/trunk/; revision=45394
2012-10-08 17:07:23 +00:00
Guy Harris 9d4d1a5794 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
2012-10-08 17:04:37 +00:00
Evan Huus 7c5f2ec024 Write a short essay in a comment explaining the weirdness that is now the
ephemeral allocation logic.

svn path=/trunk/; revision=45392
2012-10-08 16:42:54 +00:00
Guy Harris 2ab082faca 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
2012-10-08 16:28:13 +00:00
Evan Huus fef6b09666 Explicitly cast away const-ness to fix windows build-bots.
svn path=/trunk/; revision=45390
2012-10-08 15:39:02 +00:00
Evan Huus b6f0d11c6f 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
2012-10-08 15:23:36 +00:00
Evan Huus 92c3bc0228 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
2012-10-08 15:12:45 +00:00
Anders Broman 2c181db864 Fix unused parameters.
svn path=/trunk/; revision=45387
2012-10-08 15:10:24 +00:00
Anders Broman 4856bcfd40 Let ISUP national settings be valid for BICC too.
Extend dissection of Japan ISUP.

svn path=/trunk/; revision=45386
2012-10-08 14:22:24 +00:00
Anders Broman 9f38a46974 From GeorgiaK:
Add Nokia AVP:s

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

svn path=/trunk/; revision=45385
2012-10-08 14:20:34 +00:00
Alexis La Goutte 576d1fb8db Update French translations !
svn path=/trunk/; revision=45384
2012-10-08 12:25:23 +00:00
Alexis La Goutte 579eb18a6d 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
2012-10-08 12:16:54 +00:00
Jakub Zawadzki bf77a26b3f 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
2012-10-08 12:06:16 +00:00
Jakub Zawadzki cef1e32ede 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
2012-10-08 12:05:14 +00:00
Jakub Zawadzki da00b4089e 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
2012-10-08 09:50:47 +00:00
Jakub Zawadzki d6d3e59660 RFC 4627 allows upper case hex digits as well
svn path=/trunk/; revision=45379
2012-10-08 09:48:38 +00:00
Pascal Quantin e835a6f205 Fix crash when exporting packet dissection as plain text on Windows (regression introduced in r45333)
svn path=/trunk/; revision=45378
2012-10-08 09:22:46 +00:00
Anders Broman d0c2bc2232 From Martin Isaksson:
Preparattions for GTP tap.

svn path=/trunk/; revision=45377
2012-10-08 08:41:34 +00:00
Bill Meier ff7059d588 (Trivial) Remove unneeded #include.
svn path=/trunk/; revision=45376
2012-10-07 22:33:59 +00:00
Chris Maynard b44dcac8ba Fix a couple of typos.
svn path=/trunk/; revision=45375
2012-10-07 20:36:12 +00:00
Jakub Zawadzki 9baaa74218 +10 ;|
svn path=/trunk/; revision=45374
2012-10-07 20:13:11 +00:00
Jakub Zawadzki ac4419071b Unescape JSON strings.
svn path=/trunk/; revision=45373
2012-10-07 19:57:21 +00:00
Jakub Zawadzki cb12df2ca8 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
2012-10-07 19:33:47 +00:00
Bill Meier ebe086ef08 Minor cleanup:
- remove unneeded #includes;
- remove some "no effect" code;
- fix some whitespace and long lines.

svn path=/trunk/; revision=45371
2012-10-07 17:45:56 +00:00
Chris Maynard 62169cf312 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
2012-10-07 17:16:51 +00:00
Evan Huus c8308c7c40 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
2012-10-07 16:13:40 +00:00
Martin Mathieson af71608df6 Use GPOINTER_TO_UINT macro.
svn path=/trunk/; revision=45368
2012-10-07 15:59:26 +00:00
Martin Mathieson 96386ec1da 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
2012-10-07 15:14:44 +00:00
Gerald Combs 9caa8611eb [Automatic manuf, services and enterprise-numbers update for 2012-10-07]
svn path=/trunk/; revision=45364
2012-10-07 14:03:25 +00:00
Jaap Keuter 4a502ac864 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
2012-10-07 09:48:30 +00:00
Gerald Combs 5cb8f53f5c Make "tools", which includes lrelease. Update the version to 4.8.3.
svn path=/trunk/; revision=45362
2012-10-07 03:19:53 +00:00
Evan Huus 29fa1e7835 Clean up properly when we can't find a radius $INCLUDE regardless of the
state of errno. Don't treat it as a fatal parse error because it isn't,
so we keep parsing the rest of the dictionaries even if one is missing.

svn path=/trunk/; revision=45361
2012-10-07 01:15:16 +00:00
Evan Huus 0c966e603e Don't destroy the in-memory radius dictionary if we hit a parse error:
- If it's something as simple as a missing $INCLUDE then we probably still want
 whatever we could parse
 - We weren't doing it consistently anyways
 - There were a whole bunch of places where we were using it regardless of
 whether or not the parse failed, leading to read-after-free errors.

svn path=/trunk/; revision=45360
2012-10-07 00:06:21 +00:00
Evan Huus 4971b30d53 Clean up better if we can't open a radius dictionary included by another
radius dictionary. One of many issues with the way we load radius
dictionaries.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7803

svn path=/trunk/; revision=45359
2012-10-06 23:56:56 +00:00
Evan Huus 8bcc1ed05c Add modelines to packet-radius, and fix a bit of indentation.
svn path=/trunk/; revision=45358
2012-10-06 23:52:02 +00:00
Gerald Combs d808f5c13a Get QMake to build our .qm files.
svn path=/trunk/; revision=45356
2012-10-06 21:36:24 +00:00
Pascal Quantin fa9484715c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7802 :
Avoid an infinite loop when number_of_dup_tsns is equal to 65535

svn path=/trunk/; revision=45355
2012-10-06 21:07:34 +00:00
Evan Huus 6c56ad1b8d Work around bug 7803 by not freeing the old name value until after it's been
replaced in the key-set of the hash table. This doesn't really provide proper
behaviour, it just stops us from accessing freed memory.

Also, add modelines.

svn path=/trunk/; revision=45354
2012-10-06 20:47:35 +00:00
Evan Huus 0d9522c059 Unify the bzr and git ignore files - they're the exact same format,
so do any necessary cross-pollination and then just make one a symlink
to the other.

svn path=/trunk/; revision=45353
2012-10-06 20:23:37 +00:00
Evan Huus dd26e55049 Ignore qm files in bzr and git.
svn path=/trunk/; revision=45352
2012-10-06 20:20:25 +00:00
Evan Huus 5560416f3a Don't store qm files in svn: they're generated from the ts files and get removed
on a make clean.

svn path=/trunk/; revision=45351
2012-10-06 20:18:28 +00:00
Gerald Combs 4bbbc326c6 Reduce the contrast for many of the rules. Most of the color values were
taken from http://emilis.info/other/extended_tango/ .

svn path=/trunk/; revision=45350
2012-10-06 19:27:48 +00:00
Bill Meier add85b1cbb Remove unneeded code ("[set_but_unused]").
svn path=/trunk/; revision=45347
2012-10-06 15:56:08 +00:00
Ronnie Sahlberg cde73df2e7 ICMP: Icmp was a mad mix of different indentation styles.
indent -kr -i8   for now to make it use a consistent style
No code changes, only formatting in this patch


svn path=/trunk/; revision=45346
2012-10-06 15:53:01 +00:00
Bill Meier 4f578199b5 Minor changes:
- proto_reg_handoff...() called only once: simplify;
- move proto_register...() to just before proto_reg_handoff...() as per convention;
- misc.

svn path=/trunk/; revision=45345
2012-10-06 15:52:14 +00:00