Commit graph

2868 commits

Author SHA1 Message Date
Jörg Mayer
d987ac4127 Fixes for: warning: function declaration isn't a prototype
svn path=/trunk/; revision=21082
2007-03-21 04:54:20 +00:00
Ulf Lamping
407d0aeab0 fix all warnings in gtk dir & set the "treat all warnings as errors" MSVC flag
svn path=/trunk/; revision=21080
2007-03-21 03:26:26 +00:00
Luis Ontanon
16f4a91dfc Add the sccp tap to the "VoIP Calls" Tap (which by now should be renamed to just "Calls") but that's for later.
Now it does H323, SIP, MGCP, ISUP/BICC, RANAP, BSSAP, H.248  and others...

svn path=/trunk/; revision=21077
2007-03-21 00:59:00 +00:00
Graeme Lunt
a51f1694c9 This change allows a structure to be created under the "Protocols" section of the preferences.
A new function is introduced, prefs_register_protocol_subtree(), that allows the subtree the protocol should appear under to be specified. The subtree is specified as a string, with a '/' delimiting each subtree element. For example,
	prefs_register_protocol(proto_dap, prefs_register_dap);
becomes
	prefs_register_protocol_subtree("OSI/X.500", proto_dap, prefs_register_dap);

The function will create all the intermediate subtree nodes that are required, if they don't already exist. 
This allows the grouping of procotols which should make the list of protocols more manageable as even more are added. The current aim is to group by protocol family e.g. 
+ OSI
  + X.400
      X.411
      X.420
  + X.500
      DISP
      DAP
      DOP
      DSP
  + X.509
      X509AF
      X509CE
      ...

but others grouping could be envisioned (e.g. by first letter). 

As the intermediate nodes may already have preferences (e.g. OSI), then modules are now allowed to have submodules. Previously each node was either a subtree or held preferences. This is consistent with the "User Interface" node.

The subtree structure has no effect on how the preferences are saved to file, and the "Protocol Preferences..." menu option will bring up the preferences expanded to the correct node.

In addition, a new "blank page" has been introduced for intermediate nodes that have no preferences (and is also used when the "Protocols" node itself is chosen). This prevents confusion when the user moves from a node with preferences to a node without preferences, but the page old page is still shown.

There is also a change to prevent '#' characters in a value being treated as a comment when parsing the preferences file. (There is nothing that adds comments when writing the preferences file.) 


svn path=/trunk/; revision=21066
2007-03-19 19:08:22 +00:00
Luis Ontanon
529c65f713 voip_calls.c:
- instead of wrongly using the h248 call counter use tapinfo's counter

graph_analysis.c:
- beautify  the code (I was trying to the bug that got fixed by bzeroing m3ua tap data however this looks better!).

svn path=/trunk/; revision=21063
2007-03-19 00:36:42 +00:00
Luis Ontanon
ef24b97061 have voip_calls using the m3ua tap
svn path=/trunk/; revision=21060
2007-03-18 23:16:54 +00:00
Luis Ontanon
9a9a4ebf01 check the pointer before derreferencing it
svn path=/trunk/; revision=21059
2007-03-18 23:15:19 +00:00
Luis Ontanon
cd824a3f67 squelch some warnings
svn path=/trunk/; revision=21057
2007-03-18 22:26:08 +00:00
Luis Ontanon
627f57b351 add h248 to VoIP Calls
svn path=/trunk/; revision=21056
2007-03-18 22:14:12 +00:00
Bill Meier
04d29de81d Fix Windows Makefiles so clean removes all pdb files (PDB_FILE no longer defined)
svn path=/trunk/; revision=21052
2007-03-18 15:36:22 +00:00
Jeff Morriss
be214868a5 Fix bug 1336:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1336

Since mtp3_stat_draw() returns immediately if passed a NULL tapdata pointer,
call it with a pointer to the stat data (instead of NULL) in
mtp3_stat_gtk_cb().

svn path=/trunk/; revision=21042
2007-03-17 08:56:11 +00:00
Stephen Fisher
e99aa2fe23 Update to revision 21038 - line up the IP address label with the
rest of the items in that part of the capture dialog.


svn path=/trunk/; revision=21039
2007-03-17 00:10:48 +00:00
Stephen Fisher
c1132d9a4b Fix bug #1375: Capture Options with many IP addresses scrolls off
screen

Changed IP address label to fit into an event box which is in the ip
address hbox.  This allows the label to expand to fit the capture dialog
window, but no further.  Expanding the capture dialog window will show 
more IP addresses.  Left align the label.  Add ... in the middle of a
long list of IP addresses to show the first few and the last few with
the gtk_label_set_ellipsize() function in GTK 2.6 and up. 


svn path=/trunk/; revision=21038
2007-03-16 22:05:57 +00:00
Guy Harris
082282b6f4 Don't enable "Save As" if you don't have an unsaved live capture file
and there are no formats in which the file can be saved by some means
other than copying the raw data; "Save As" isn't a very useful function
in that case, and that prevents us from having an empty list of formats
in which the file can be saved.

svn path=/trunk/; revision=21032
2007-03-14 19:30:19 +00:00
Guy Harris
50bb064108 Get rid of some #if-ed out includes, which aren't needed.
svn path=/trunk/; revision=21031
2007-03-14 19:29:42 +00:00
Guy Harris
8a3ea1a6f7 Fix indentation.
svn path=/trunk/; revision=21027
2007-03-14 18:19:13 +00:00
Ulf Lamping
7366ae37a0 as requested by "John T. Haller" for PortableApps.com:
add new WS command line option -P to be able to change some of the path settings

this is experimental, please report bugs

svn path=/trunk/; revision=21022
2007-03-14 02:55:54 +00:00
Stephen Fisher
eeea95ccbe HTTP Export Object updates:
- Split the HTTP tap into two taps: one for the HTTP statistics
   and the other for the export object function.  This allows the
   HTTP statistics to work again (they seem to have been
   partially broken since SVN rev 18901).
 - Pass the conversation data (conv_data) between functions now
   instead of using the global variable stat_info (now only used
   for the HTTP stats)
 - Pass only pointers from the HTTP dissector to the Export Object
   tap, where we'll then copy the values and insert into the slist.
 - Make sure we free all memory allocated by this feature when
   we're done with it.
 - Various other minor improvements


svn path=/trunk/; revision=21021
2007-03-13 20:42:04 +00:00
Jörg Mayer
fb820f0a07 GCC warning fixes
epan/dissectors/
packet-bctp.c:
	no newline at end of file
packet-epl.c:
	C++ style comments are not allowed in ISO C90
packet-sccp.c:
	missing initializer
packet-sccp.h:
	comma at end of enumerator list
packet-sctp.c:
	suggest parentheses around assignment used as truth value
packet-vnc.c:
	control reaches end of non-void function
	pointer targets in passing argument 1 of 'g_strtod' differ in
		signedness
	pointer targets in passing argument 3 of 'vnc_client_to_server'
		differ in signedness
gtk/
main.c:
	C++ style comments are not allowed in ISO C90
u3.h:
	function declaration isn't a prototype

Other (trivial) stuff
packet-sccp.h:
	Add svn properties


svn path=/trunk/; revision=21011
2007-03-09 13:14:09 +00:00
Ulf Lamping
acefba187a from Sake Blok:
I have changed the patch according to your suggestions and also changed
the doc[book] files accordingly. I tested the patch and it does seem to
work fine on my test-system.

ULFL: In addition, I've added the en-/disabling to the other (already existing) Copy menu items - some just did nothing, some crashed if nothing was selected.
I've also sligthly changed the menu seperators and made both context menus look a bit more identical.

svn path=/trunk/; revision=21005
2007-03-08 23:37:55 +00:00
Jörg Mayer
736e5fdfef Whitespace changes
svn path=/trunk/; revision=21002
2007-03-08 14:49:14 +00:00
Stephen Fisher
7389b3fabd Add a "Bits/Tick" option to the IO Stats dialog to complement the
"Bytes/Tick" option.


svn path=/trunk/; revision=20997
2007-03-07 23:39:45 +00:00
Stephen Fisher
2865e52843 Export Object code/documentation updates:
- Note in the user's guide that export object is not available 
   in GTK1 builds of Wireshark.
 - Make scanning through the slists more efficient
 - Use new tap.c function called have_tap_listener() to only save
   object payload data when the export object listener is actively
   listening for it.
 - Save objects in the HTTP dissector with g_malloc() instead of
   se_malloc() and free it when we're done with it - when the
   export object window is closed (Fixes bug #1412)
 - Various minor improvements


svn path=/trunk/; revision=20980
2007-03-06 00:36:25 +00:00
Luis Ontanon
4b4d4fed2a protect callbacks of derived windows from dereferencing a null pointer if the main table has being closed in the meanwhile.
svn path=/trunk/; revision=20970
2007-03-04 02:27:11 +00:00
Stephen Fisher
2c5ccc66ef Update object export code:
- Add to User's Guide
 - Add a help button
 - Move a lot of code into the shared export_object.c file and out of
   dissector specific file export_object_http.c.  This will make adding
   additional protocols much easier.
 - Change comment in packet-http.c to reflect new name (Export Object)
 - Various other minor improvements 


svn path=/trunk/; revision=20961
2007-03-03 03:14:00 +00:00
Stephen Fisher
f8d82fab38 Activate the File -> Export menu when a capture is in
progress in addition to when a capture file is open.


svn path=/trunk/; revision=20959
2007-03-02 21:47:34 +00:00
Ulf Lamping
ae89a24c37 add export_object.h so distcheck don't fail
svn path=/trunk/; revision=20954
2007-03-01 09:36:01 +00:00
Stephen Fisher
bdf7c9bfb1 Wrap long lines in simple dialogs so that the dialog and its message
won't ever extend off the screen.


svn path=/trunk/; revision=20953
2007-03-01 02:18:18 +00:00
Stephen Fisher
d3b873b60d Sync up my changes so far to the content list (now called object
list) feature for http traffic.  It's now available under File->
Export->Objects->HTTP.  More changes to come..


svn path=/trunk/; revision=20951
2007-02-28 23:20:40 +00:00
Anders Broman
ccf3253f35 From Floren Drouin:
This patch add a test on the GTK version to avoid a warning with the "gtk-label-select-on-focus" configuration parameter, introduced in GTK-2.9.0.

svn path=/trunk/; revision=20936
2007-02-27 06:38:49 +00:00
Luis Ontanon
a2a25e7586 revert (most) changes in rev #20753, to avoid items being created on a wrong menu on windows.
svn path=/trunk/; revision=20928
2007-02-25 18:03:05 +00:00
Stephen Fisher
122ac7dd0e Treat "<NULL>" as returned from a call to se_strdup() in packet-http.c as a
NULL value when checking if the content-type was found.


svn path=/trunk/; revision=20880
2007-02-20 19:57:04 +00:00
Stephen Fisher
07f8ad771e Put the rest of the #if GTK_MAJOR_VERSION >= 2 preprocessor statements around parts of the Content List -> HTTP feature code.
svn path=/trunk/; revision=20869
2007-02-20 00:22:00 +00:00
Stephen Fisher
7a2bfb7a61 Initial version of the new Statistics -> Content List -> HTTP feature. This
feature lists all of the content found in an HTTP stream (images, http, etc.)
and displays it in a list that allows the user to save each one as a file that
is already reassembled by the dissectors.


svn path=/trunk/; revision=20867
2007-02-19 22:37:45 +00:00
Bill Meier
547a03b25b Fix some C++ style comments
svn path=/trunk/; revision=20865
2007-02-19 21:45:27 +00:00
Jeff Morriss
0787b688cc Squelch a few unused parameter warnings.
svn path=/trunk/; revision=20863
2007-02-19 15:30:06 +00:00
Jeff Morriss
eade8066bd Oops, help_topic_gtk() is _only_ needed in GTK1.2 builds, so #ifdef it (and some of its helpers) out in GTK2 builds.
svn path=/trunk/; revision=20859
2007-02-19 10:43:53 +00:00
Jeff Morriss
8c6bda4db5 Squelch a couple (false) uninitialized variable warnings
svn path=/trunk/; revision=20858
2007-02-19 10:26:21 +00:00
Guy Harris
29755e2a35 Squelch a "used without being set" warning.
svn path=/trunk/; revision=20848
2007-02-19 01:21:10 +00:00
Guy Harris
b8a2977742 We only need the Wireshark splash image if we have the welcome page.
svn path=/trunk/; revision=20847
2007-02-19 01:19:36 +00:00
Ulf Lamping
3a77db6b26 bugfix: call set_proto_selection() before actually writing the selections to disk. Otherwise the changes won't be written to disk correctly (when pressing the OK button).
Interestingly, no complains were heard about this before ...

svn path=/trunk/; revision=20818
2007-02-15 20:48:39 +00:00
Luis Ontanon
c63b0a6bc6 From Peter Johansson:
I have provided a patch for a crash that occurs in uat_gui.c if from the
"Edit preferences..." button when you choose Protocols -> DLT_USER ->
the "Edit..." button -> the "New" button -> the "Cancel" button.
The crash happens because dd gets freed prior to traversing its internal
structure, hence I moved the call to g_free for dd beneath the traversal
of the dd internals.



svn path=/trunk/; revision=20813
2007-02-14 19:21:37 +00:00
Stephen Fisher
0ebc01dc03 From Sebastien Tandel:
Create two new files (ws_strsplit.[ch]) that use GTK2 code to override
the buggy g_strsplit() function when compiling for GTK1.  Include this
work-around function (ws_strsplit) in libwireshark.def.  Add notes on usage
to README.developer.  Include epan/ws_strsplit.h in all files that use
g_strsplit().


svn path=/trunk/; revision=20804
2007-02-13 20:57:22 +00:00
Ronnie Sahlberg
d059526285 use g_string_append() instead of g_string_append_printf()
we dont have g_string_append_printf() in gtk 1 

svn path=/trunk/; revision=20798
2007-02-12 20:11:42 +00:00
Luis Ontanon
b26c1c4ca2 Add a description of UAT fields, and have it as a tooltip in the New/Edit Dialog.
svn path=/trunk/; revision=20797
2007-02-12 19:57:41 +00:00
Luis Ontanon
ee4cf097ad From Albert Chin:
Gnutls can be located in a different place than the other libs.


svn path=/trunk/; revision=20796
2007-02-12 19:55:54 +00:00
Ulf Lamping
64f5bec543 delimit each CSV output with "
(this should be combined into a generic function as this CSV encapsulation functionality is implemented several times)

svn path=/trunk/; revision=20791
2007-02-12 05:10:52 +00:00
Ulf Lamping
ca590fafbe ooops, and here comes the actual context menu code change from Douglas Pratley ... already mentioned in SVN 20787
svn path=/trunk/; revision=20790
2007-02-12 05:08:33 +00:00
Luis Ontanon
5db2005993 Have Aply, Cancel and OK buttons instead of the save and ok button.
Have these buttons reloading the capture file if needed.
Some rearrangement of the window (the editor is still missing "ornaments" and tooltips)


svn path=/trunk/; revision=20788
2007-02-11 16:09:21 +00:00
Michael Tüxen
7e8098c520 A fix from Irene Ruengeler to keep assocs selected when
setting/applying filters.
Remove some warnings.


svn path=/trunk/; revision=20759
2007-02-09 21:05:43 +00:00