Commit Graph

213 Commits

Author SHA1 Message Date
Guy Harris 70f67d065f From Evan Huus: fix a memory leak. Fixes bug 7097.
svn path=/trunk/; revision=42088
2012-04-15 22:21:50 +00:00
Alexis La Goutte 9a988f7de5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=42086
2012-04-15 17:27:50 +00:00
Guy Harris cb8edf66a6 From Even Huus: free a strduped string. Fixes bug 7094.
svn path=/trunk/; revision=42074
2012-04-14 18:16:56 +00:00
Guy Harris 6b1c5a9e0d From Evan Huus: free if_string when we're done with it. Fixes bug 7093.
From me: don't bother initializing if_string in its definition, as if
it's used at all it's set to a different value before all uses.

svn path=/trunk/; revision=42073
2012-04-14 18:04:12 +00:00
Anders Broman 7330ec7035 From Evan Huus: Memory leak in scan_local_interfaces. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7086
svn path=/trunk/; revision=42061
2012-04-14 07:44:51 +00:00
Anders Broman ff2840fc2f From Evan Huus: Memory leaks in graph_analysis.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7082 changed to not allocating time_str unless needed.
svn path=/trunk/; revision=42060
2012-04-14 07:36:47 +00:00
Guy Harris de42012ffd If we don't even *have* a filter combo box, there's nothing we can check
or colorize; quit before we even *try* to get the link-layer header
type.

If we don't have an active link-layer header type, that probably means
we don't know what link-layer header types the interface provides, which
would be the case if it were a named pipe or an interface we can't open.
Don't crash in that case, just leave the filter combo box uncolored, to
indicate that we have no clue whether the filter is valid or not.

Fixes bug 7049.

svn path=/trunk/; revision=42059
2012-04-14 00:36:30 +00:00
Jakub Zawadzki 8a1dc57c03 Remove doubled semicolons and semicolons outside function.
svn path=/trunk/; revision=42053
2012-04-13 20:22:31 +00:00
Jakub Zawadzki a94826528b Simplify r42030 expression. Thanks!
svn path=/trunk/; revision=42038
2012-04-12 21:56:13 +00:00
Martin Mathieson 27e1c9e248 The last bit of a byte, on its own, needs a mask of 1, rather than 256.
It was not being highlighted in the bits view.

So add % 8 to avoid shifting the single mask bit right out of the byte
we're supposed to be showing...

svn path=/trunk/; revision=42030
2012-04-12 02:14:19 +00:00
Guy Harris c0bfe957b7 There's no __solaris__ predefine for Solaris; just use __sun.
svn path=/trunk/; revision=42011
2012-04-10 18:36:11 +00:00
Guy Harris be2bbb5ecd OK, that doesn't work; on Solaris, try _XOPEN_SOURCE=500, to request
SUSv2, and see if *that* makes the build work.

svn path=/trunk/; revision=42010
2012-04-10 17:56:55 +00:00
Jakub Zawadzki 8fca2eb7e5 Add missing consts.
svn path=/trunk/; revision=42004
2012-04-10 10:20:20 +00:00
Jakub Zawadzki 9d33f00098 Fix 'overflow in implicit constant conversion', make it const.
svn path=/trunk/; revision=41998
2012-04-09 19:12:17 +00:00
Jakub Zawadzki 23494db817 Add missing const attribute to some char *
Fix some "assignment discards qualifiers from pointer target type", etc

svn path=/trunk/; revision=41996
2012-04-09 18:44:10 +00:00
Jakub Zawadzki 9c48f9ca96 Add missing const attribute to some char *
Fix some "assignment discards qualifiers from pointer target type", etc

svn path=/trunk/; revision=41993
2012-04-09 17:53:04 +00:00
Gerald Combs 81334e311a Instead of loading our coordinates from a separate text file via
OpenLayers.Layer.Text, insert them into a JSON array and load them using
OpenLayers.Layer.Vector + OpenLayers.Format.GeoJSON. This should fix the
endpoint map feature on modern browsers.

Switch OpenStreetMap to a simpler map from OSGeo.

svn path=/trunk/; revision=41967
2012-04-05 22:10:53 +00:00
Martin Mathieson 7054049bef Fix test to avoid dividing by 0.0 (was displaying as "-nan" rather than
crashing).

svn path=/trunk/; revision=41948
2012-04-05 00:53:01 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Jeff Morriss fb207b5d5e Fix CID 613: item_str can't be NULL here so don't check for it being NULL.
svn path=/trunk/; revision=41935
2012-04-04 17:16:16 +00:00
Jeff Morriss 6c4697bc93 Fix CID 614: callsinfo can't be NULL here so don't check for it being NULL.
svn path=/trunk/; revision=41934
2012-04-04 16:57:31 +00:00
Jeff Morriss a95dd5cda7 Fix CID 615: strinfo can't be NULL here so don't check for it being NULL.
svn path=/trunk/; revision=41933
2012-04-04 16:55:14 +00:00
Jeff Morriss cc9f72e246 Fix CID 616: callsinfo can't be NULL here so don't check for it being NULL.
svn path=/trunk/; revision=41932
2012-04-04 16:52:18 +00:00
Jeff Morriss 6610b449b0 Fix CID 617: te can't be NULL here (unless si is NULL in which case we've
got bigger problems) so there's no need to check for it being NULL.

svn path=/trunk/; revision=41931
2012-04-04 16:42:48 +00:00
Michael Tüxen 937df7af18 From Irene Ruengeler: Fix a warning when capturing.
svn path=/trunk/; revision=41897
2012-04-02 17:15:58 +00:00
Anders Broman e12df043a7 If a comment is cleared, remove it from fdata->opt_comment.
svn path=/trunk/; revision=41895
2012-04-02 15:20:54 +00:00
Anders Broman a24133d747 Fix a couple of typos and missing return for GTK 3.
svn path=/trunk/; revision=41894
2012-04-02 12:23:33 +00:00
Anders Broman 0c481e3e96 Introduce utility function to ease GTK3 depcrecated funktion removal.
svn path=/trunk/; revision=41893
2012-04-02 11:35:53 +00:00
Michael Tüxen 16421a31cc More whitespace changes...
svn path=/trunk/; revision=41888
2012-04-01 18:16:15 +00:00
Michael Tüxen fc2377387d Remove waring.
While there: Some whitespace cleanups.

svn path=/trunk/; revision=41887
2012-04-01 17:27:26 +00:00
Anders Broman ba12caf301 From Cal Turney: IO Graph LOAD inaccuracy, intervals not displayed, wrong frames displayed. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6994
svn path=/trunk/; revision=41883
2012-04-01 16:01:12 +00:00
Anders Broman 653a1bb918 From Martin Kaiser: Fix for main_menubar.c:3874: error: set_menu_visible defined but not used
svn path=/trunk/; revision=41868
2012-03-31 09:22:07 +00:00
Stig Bjørlykke 019008548b Recreate the packet list when changing UAT for header fields.
This fixes a crash when changing settings for fields used as a custom column.

svn path=/trunk/; revision=41840
2012-03-30 08:57:57 +00:00
Jeff Morriss eb262d2cc2 As pointed out by Alexis: remove a bunch of set-but-unused variables.
svn path=/trunk/; revision=41839
2012-03-30 01:46:42 +00:00
Martin Mathieson be562947a6 Fix the flag used in a test.
svn path=/trunk/; revision=41835
2012-03-30 00:49:09 +00:00
Martin Mathieson c8933a43d1 Fix a test to avoid setting an invalid display filter.
Reorder some comments to make things a little clearer.

svn path=/trunk/; revision=41834
2012-03-29 23:12:07 +00:00
Stephen Fisher 0dd6243320 Add newline at end of file to fix compilation error.
svn path=/trunk/; revision=41820
2012-03-28 23:54:50 +00:00
Michael Tüxen 20fdcad8b5 From Irene Ruengeler: Fix a crash.
svn path=/trunk/; revision=41818
2012-03-28 11:54:42 +00:00
Michael Tüxen 0949fc1364 Fix compilation.
svn path=/trunk/; revision=41815
2012-03-28 09:26:47 +00:00
Stig Bjørlykke 6e1194d7ba User data is not used in capture_prepare_cb and capture_do_cb.
svn path=/trunk/; revision=41792
2012-03-27 06:57:21 +00:00
Jeff Morriss ce8d32d5bb Get things compiling if we HAVE_AIRPCAP.
svn path=/trunk/; revision=41789
2012-03-27 02:30:51 +00:00
Jeff Morriss b338cf8805 Only enable the OK button if we have an address and a name and name resolution
is enabled.

svn path=/trunk/; revision=41748
2012-03-23 03:14:53 +00:00
Jeff Morriss 48b1c7ae5c As I think Guy said a while back (quoting some HIG): anything you can do in a
popup should also be available through a regular menu.  So, make the
"Manually resolve address" function availble in under View->Name Resolution .
(Yes, technically this is an "Edit"-like action, but it just fits so well
under Name Resolution.)

While there, move "Resolve Name" from main_menu_bar_toggle_action_entries[]
into main_menu_bar_entries[] so it doesn't get a (useless) toggle indicator.
(At least as I understand this function, it's supposed to allow you to tell
Wireshark to go off and try to resolve the names in the current frame;
unfortunately it doesn't seem to actually work.)

svn path=/trunk/; revision=41747
2012-03-23 02:37:25 +00:00
Jeff Morriss 9c1bf7223e Don't mark the file as unsaved unless the capture or packet comments actually changed.
svn path=/trunk/; revision=41744
2012-03-23 01:41:59 +00:00
Martin Mathieson 611dcb0d68 When a TCP graph is summoned, work out how many unique TCP conversations
are present. However, still only create the graph for the first/only
one.

LTE MAC or RLC frames often contain multiple SDUs that are segments of
the same TCP conversation - this avoids the need to find a frame with
only one SDU.

svn path=/trunk/; revision=41721
2012-03-21 12:58:50 +00:00
Michael Tüxen 0f92a3a8d2 From Irene Ruengeler: Restore functinality of last patch.
svn path=/trunk/; revision=41719
2012-03-21 09:54:05 +00:00
Guy Harris 7ee4c2fb40 Make the comment I added, saying what scan_local_interfaces() does, more
accurate.

svn path=/trunk/; revision=41713
2012-03-21 06:37:34 +00:00
Guy Harris 7f5162352f scan_local_interfaces() isn't in capture_opts.c; don't declare it in
capture_opts.h.  (It arguably belongs somewhere other than in a file in
ui/gtk, but, if so, move it there, e.g. to something in ui.)

svn path=/trunk/; revision=41712
2012-03-21 06:31:39 +00:00
Guy Harris 4690f02928 Handle bogus values of the error that *should* be coming from
scan_local_interfaces() (but, currently, isn't, as the code wasn't
correctly restructured).

svn path=/trunk/; revision=41710
2012-03-21 06:20:01 +00:00
Guy Harris 40a034b3f5 Fix 4-space tabs.
svn path=/trunk/; revision=41708
2012-03-21 06:10:17 +00:00