Commit Graph

41496 Commits

Author SHA1 Message Date
Bill Meier 85504b052f Simplify code ....
svn path=/trunk/; revision=43665
2012-07-11 18:32:20 +00:00
Bill Meier 3b7e75852a Remove "comment to myself".
svn path=/trunk/; revision=43664
2012-07-11 16:24:01 +00:00
Bill Meier 0bace7313c General cleanup:
- Fix potential array overflow;
- Calls to expert...() should not be under 'if (tree)';
- Don't use DISSECTOR_ASSERT for bad data; use expert...();
- Add some XXX comments about enum item values different than
   specified in the comments associated with the enum items;
- Init global 'mfgCommandFlag' as appropriate before use;
- Add missing hf[] entries;
- #if 0 various unused #defines and enums;
- Reduce (somewhat) repeated fetches of the same tvb data;
- Remove unneeded initializers;
- Don't use 'l' as a variable name;
- Reformat long lines, hf[] array entries and other;;
- Fix some indentation;

svn path=/trunk/; revision=43663
2012-07-11 15:28:31 +00:00
Anders Broman 62f645715a failure cause is an OCTET STRING not a string.
svn path=/trunk/; revision=43662
2012-07-11 14:41:21 +00:00
Anders Broman 6dfa10bc57 Revert part of revision 43107 which broke sub dissection of
Signal and events as a new tvb wasn't created. 
|BASE_EXT_STRING also removed.

svn path=/trunk/; revision=43661
2012-07-11 14:40:35 +00:00
Anders Broman 6980e9474b e_addr_resolve has a new member.
svn path=/trunk/; revision=43660
2012-07-11 10:39:49 +00:00
Anders Broman 0a27ca29b2 Add a new preference to make it possible to only use the hosts file
for a profile for name resolution.

svn path=/trunk/; revision=43659
2012-07-11 08:52:51 +00:00
Guy Harris 4de568eb10 Don't ask for information about an interface greater than the maximum
interface for which we have information.

Fixes bug 7467.

Should also cause an error message, rather than an unreadable capture
file, to be produced for the cases in bug 7381.  (This isn't a fix for
bug 7381; it's arguably an improvement, in the sense that a circuit
breaker tripping or a fuse blowing for a short circuit is an improvement
over a fire starting, but it's not a *fix*, any more than a circuit
break or fuse *fixes* the short circuit.)

#BACKPORT

svn path=/trunk/; revision=43657
2012-07-11 03:57:13 +00:00
Guy Harris 447bc256c1 AARGH. There are two lumps of (almost-)identical code to handle
interface information when opening an output file, one of which I fixed
in my previous checkin and the other of which I didn't notice.  Shuffle
code around a little bit so that the lumps are identical and then put
them into a common routine (*with* the fix in question).

#BACKPORT

svn path=/trunk/; revision=43655
2012-07-11 03:50:28 +00:00
Martin Mathieson 5ad8cf408a Speed up line drawing by no longer creating and destroying a cairo_t
object for each line - rather create one and use it for the entire list,
then destroy it.

Simplify the allocation of segments, by no longer messing around with a
static that may or may not be used.  Also, there was a good chance the
last one would be leaked (if it was not part of the stream we are
interested in).

Note that both of these improvements would also apply to tcp_graph.c -
will wait a couple of days to be sure the changes are good.

svn path=/trunk/; revision=43654
2012-07-11 02:43:00 +00:00
Guy Harris d419e7e30c Set the time units per second correctly if, in wtap_dump_open_ng(),
we're making a fake interface description (it should match the time
stamp resolution).  The dump code for pcap-NG now requires the time
units per second value, as it needs to correctly compute the time stamp
value to write out in an EPB.

svn path=/trunk/; revision=43652
2012-07-10 19:59:39 +00:00
Guy Harris fb095f288f From Ben Bowen:
Add additional named fields for IMAP.

svn path=/trunk/; revision=43651
2012-07-10 19:43:55 +00:00
Guy Harris 8891144224 When writing an EPB, calculate the time stamp based on the resolution
for the interface, not based on the default resolution of 1 microsecond.
Fixes bug 7457.

Fix a comment.

Clean up indentation.

#BACKPORT

svn path=/trunk/; revision=43649
2012-07-10 19:12:37 +00:00
Pascal Quantin 1410207421 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438 :
Do not call tvb_ensure_length_remaining on an empty tvb

svn path=/trunk/; revision=43648
2012-07-10 15:43:03 +00:00
Jeff Morriss 9ece26aee9 Obey the new use-external-resolvers preference when translating IP
addresses into host names (in get_host_ipaddr() and get_host_ipaddr6()).

This may resolve
http://ask.wireshark.org/questions/12542/what-is-use-external-network-name-resolver-setting

svn path=/trunk/; revision=43647
2012-07-10 15:02:23 +00:00
Anders Broman 59a4393cc8 Update the packet list and details if name resolution is changed.
svn path=/trunk/; revision=43646
2012-07-10 14:48:23 +00:00
Jeff Morriss 7a8a40946a host_lookup() and host_lookup6() are both called even when network-name
resolution is NOT enabled (it's always been like this and I'm not sure why
and I was hesitant to change that).  So: don't use the external name resolver
unless both network-name resolution AND use-external-resolvers are enabled.

svn path=/trunk/; revision=43645
2012-07-10 14:33:19 +00:00
Anders Broman c59ae18df7 Update the /View/NameResolution menu when activated in case the
settings has ben altered elswhere in the GUI.

svn path=/trunk/; revision=43644
2012-07-10 14:01:36 +00:00
Jeff Morriss a9004ef9ad From Guy Davies via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7462 :
There have been some updates to the dictionary.erx since it was last synced
from FreeRADIUS.  Please find attached an updated dictionary for Juniper
Networks ERX.

svn path=/trunk/; revision=43643
2012-07-10 13:26:25 +00:00
Jeff Morriss 83ac7ca8ae From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7461 :
When showing the TCP (and UDP and other protocols) port numbers in the
framelist columns, they are left aligned. This is sub-optimal if you are
scanning the list for a certain port.

This patch, very small, will properly right justify these numbers:
UNRESOLVED DST PORT
UNRESOLVED SRC PORT
DST PORT
SRC PORT

svn path=/trunk/; revision=43642
2012-07-10 13:22:46 +00:00
Anders Broman 8ecd85f1ad Introduce a preference setting for application context version.
svn path=/trunk/; revision=43641
2012-07-10 11:39:06 +00:00
Anders Broman 7003dbae37 From Martin Kaiser:
Add rlc_lte_graph.c

svn path=/trunk/; revision=43640
2012-07-10 11:37:25 +00:00
Anders Broman 81531a65dd Change the button order in all places.
svn path=/trunk/; revision=43639
2012-07-10 07:50:34 +00:00
Anders Broman 8762bd56a3 Group the network name resolution boxes together and make a more verbose explanation on the intended use.
svn path=/trunk/; revision=43638
2012-07-10 07:24:01 +00:00
Pascal Quantin a0c58375be Move LPP and LPPe dissectors to the ASN.1 dirty library
svn path=/trunk/; revision=43637
2012-07-10 07:19:40 +00:00
Martin Mathieson 3658990eb5 Trivial indentation fixes.
svn path=/trunk/; revision=43636
2012-07-10 02:19:34 +00:00
Guy Harris 4fad38dbd2 From Evan Huus:
Fix an uninitialized-variable error that was breaking compile with gcc.

Also remove some cruft that looks like it was copy-pasted from
ui/gtk/tcp_graph.c

Fixes bug 7460.

svn path=/trunk/; revision=43635
2012-07-10 01:57:55 +00:00
Martin Mathieson 3599fe0daf Add a sequence graph for LTE RLC channels under Telephony | LTE.
svn path=/trunk/; revision=43634
2012-07-10 01:32:54 +00:00
Guy Harris f71fd4318c Fix up some comments.
svn path=/trunk/; revision=43633
2012-07-09 23:14:50 +00:00
Guy Harris 881a925f6a Fix another comment.
svn path=/trunk/; revision=43632
2012-07-09 23:12:21 +00:00
Guy Harris 65b2c9a80e Fix some comments.
svn path=/trunk/; revision=43631
2012-07-09 23:10:45 +00:00
Guy Harris 9fcbc2377f The names "etherpeek" and "airopeek" are a bit misleading, as the
"etherpeek.c" file format is used by AiroPeek and the "airopeek9.c" file
format is used by EtherPeek.

Instead, use the names that WildPackets apparently uses for those
formats - "classic" and "tagged".

svn path=/trunk/; revision=43630
2012-07-09 23:07:28 +00:00
Pascal Quantin 4705839f11 Update comments
svn path=/trunk/; revision=43629
2012-07-09 21:04:50 +00:00
Pascal Quantin 309e6646f7 Add LTE Positioning Protocol Extensions dissector
Upgrade LTE Positioning Protocol to V10.5.0

svn path=/trunk/; revision=43628
2012-07-09 20:55:09 +00:00
Jeff Morriss 188d7d0f4a As suggested by Richard Sharpe: rename VALS_GROUP_NAMES[] so it's not all
upper case.

Don't mark stat_group_name()'s 'group' parameter unused: it is unused.

svn path=/trunk/; revision=43627
2012-07-09 20:45:14 +00:00
Chris Maynard cab215090a Minor formatting changes: Surround Clement Marrast's e-mail with <> like everyone else's and no need to capitalize Clement's entire last name. Convert some spaces to tabs. Remove spaces surrounding " [AT] ", as it seems that initially that's how they were being written.
svn path=/trunk/; revision=43626
2012-07-09 14:45:30 +00:00
Anders Broman 3dc1e2df63 Update AVP dissection.
svn path=/trunk/; revision=43625
2012-07-09 14:10:40 +00:00
Anders Broman eedc186e94 Dissect Release 8 CDR:s
svn path=/trunk/; revision=43624
2012-07-09 14:09:59 +00:00
Bill Meier 3be39a23aa From Evan Huus: Struct cleanup in packet-assa_r3.c
Cleanup and simplify structures and arrays in packet-assa_r3.c as described in
my email to the -dev list [1].

[1] http://www.wireshark.org/lists/wireshark-dev/201207/msg00050.html


From me:
 Do the same as above for the commandDissectorParser_t struct mentioned in the EMail
 (but not fixed in the patch).


svn path=/trunk/; revision=43623
2012-07-09 03:00:03 +00:00
Anders Broman f090a73e9c From Michael Mann:
disable hide checkboxes with error messages

Updated preference dialog to include text if hide checkbox is disabled.

Used error message for "Local Interfaces" dialog.

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

svn path=/trunk/; revision=43622
2012-07-09 02:40:20 +00:00
Anders Broman 4fd366e321 From Evan Huus:
IO Graph Fixes

- Allow counting *any* type of field, FT_NONE, FT_PROTOCOL, whatever, by moving
FT_NONE case to default case per Jakub's suggestion.

- Fix get_it_value() for FT_PROTOCOL fields by breaking CALC_TYPE_COUNT_FRAMES
and CALC_TYPE_COUNT_FIELDS out of the adv_type switch statement just like
COUNT_TYPE_FRAMES.

- Avoid an overflow in pixmap_clicked_event() that was causing crashes when
clicking outside the data portion of the graph (when the capture hasn't enough
files to fill the entire graph window),

svn path=/trunk/; revision=43621
2012-07-09 02:33:39 +00:00
Anders Broman f207987aa3 From Martin Kaiser:
DVB-CI/CI+: dissect the payload of LSC messages.

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

svn path=/trunk/; revision=43620
2012-07-09 02:28:14 +00:00
Anders Broman 80aba5ebf7 From Martin Kaiser:
CID 280531: "Argument cannot be negative" in lemon
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7453

svn path=/trunk/; revision=43619
2012-07-09 02:24:07 +00:00
Anders Broman e0d9282f86 From Evan Huus:
Redundant conditions in iax2_analysis.c

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

svn path=/trunk/; revision=43618
2012-07-09 02:02:03 +00:00
Anders Broman 45e9efc6a9 From Evan Huus:
Fix leaks

- don't g_strdup a string just to use it in a g_strdup_printf
- clean up properly in error cases in lua bindings
- misc. other missing g_free() calls
- one missing fclose() in the new 80211_utils

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

svn path=/trunk/; revision=43617
2012-07-09 01:56:27 +00:00
Anders Broman 1ae38887b6 From Evan Huus:
Grab-bag of unused variables.

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

svn path=/trunk/; revision=43616
2012-07-09 01:49:02 +00:00
Anders Broman 0696f30690 From Michael Mann:
GUI use external name resolver proliferation

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

svn path=/trunk/; revision=43615
2012-07-09 01:36:54 +00:00
Gerald Combs a63de46ddd [Automatic manuf, services and enterprise-numbers update for 2012-07-08]
svn path=/trunk/; revision=43611
2012-07-08 14:03:29 +00:00
Jeff Morriss 0cb874b9ec Add a function to packet-giop.c that does what the code that
template_get_CDR_string (in wireshark_gen.py) did.  This eliminates another
whole pile of function-local variables in packet-parlay.c.

Unfortunately it doesn't seem to speed up compilation (or eliminate the
variable tracking size limit problem).  But it does eliminate a lot of
lines of code...

svn path=/trunk/; revision=43610
2012-07-08 03:57:35 +00:00
Jeff Morriss a2c4716670 Eliminate a lot of function-local variables by not storing the result of
(several of the) get_CDR_*() functions: instead call the function directly
in the proto_tree_add_text() calls.

Eliminate a lot of global variables that are only later used in (a single)
strcmp().

All the GIOP dissectors are built-in now; don't include the (#if'd out) plugin
registration code in the generated dissector.

Try to clean up the formatting of the generated code a bit.

Regenerate the IDL dissectors; as noted in r39932, this seems to involve a
lot of function re-ordering in packet-parlay.c (making the delta bigger).


These changes decrease the time to compile packet-parlay.c by, on my system,
about half.  But it still complains:

variable tracking size limit exceeded with -fvar-tracking-assignments, retrying without

and it still takes "too long."

svn path=/trunk/; revision=43609
2012-07-08 03:29:49 +00:00