osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
37,102 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

37102 Commits

Author SHA1 Message Date
Stephen Fisher d69f85cb4e Mark length parameter as unused 
svn path=/trunk/; revision=38714
 2011-08-24 15:35:32 +00:00
Anders Broman 357767d835 Use elm_len for the length. 
svn path=/trunk/; revision=38713
 2011-08-24 15:22:29 +00:00
Guy Harris fb162bf95f Xcode 4 isn't available on DVD, but is available for download from 
developer.apple.com, and the current version is available, at least for
Lion, from the Mac App Store.

While we're at it, make sure the X11 SDK is present, by checking for
/usr/X11/include.

svn path=/trunk/; revision=38712
 2011-08-24 10:18:25 +00:00
Martin Mathieson ac36ea096c Call gdk_cairo_create() for earlier versions of gtk. 
Is this correct?

svn path=/trunk/; revision=38711
 2011-08-24 09:41:17 +00:00
Anders Broman 31341b543a Code clean up as draw_arc works with cairo now. 
svn path=/trunk/; revision=38710
 2011-08-24 08:48:19 +00:00
Anders Broman 6bc9e93a77 Paths changed for UI_MANAGER 
svn path=/trunk/; revision=38709
 2011-08-24 08:32:14 +00:00
Stig Bjørlykke 09017cb3ea Simplified some GTK_CHECK_VERSION to improve readability. 
svn path=/trunk/; revision=38708
 2011-08-24 08:28:39 +00:00
Anders Broman 21ba557e5c GTK3 Remove gtk_window_set_has_resize_grip() as it creates 
warning "invalid cast from GtkStatusbar to GtkWindow".

svn path=/trunk/; revision=38707
 2011-08-24 08:12:08 +00:00
Anders Broman d72712a59a GTK3 Remove gtk_window_set_has_resize_grip() as it creates 
warning "invalid cast from GtkStatusbar to GtkWindow".

svn path=/trunk/; revision=38706
 2011-08-24 08:02:37 +00:00
Stig Bjørlykke 5a8e9365df Several Time Shift menu improvements: 
- Added shortcut Shift-Control-T
- Set inactive when no loaded packets
- Add stock time icon
- Moved below time reference functions

svn path=/trunk/; revision=38705
 2011-08-24 07:26:20 +00:00
Anders Broman af2718e81c GTK3 expose_event -> draw 
svn path=/trunk/; revision=38704
 2011-08-24 07:26:11 +00:00
Stig Bjørlykke d0f83e0d8d Yet another cast. 
svn path=/trunk/; revision=38703
 2011-08-24 06:57:14 +00:00
Stig Bjørlykke cf114c1124 Fix a warning by changing a pointer type. 
text2pcap.c: In function ‘parse_token’:
text2pcap.c:1076: warning: cast from pointer to integer of different size
text2pcap.c:1076: warning: cast from pointer to integer of different size

svn path=/trunk/; revision=38702
 2011-08-24 06:42:40 +00:00
Jörg Mayer cd850e3404 GTK3 typo fixes: 
Change iso->surface -> ios->surface
Rename draw_area_draw -> on_draw_area_draw_event
Change callback on_draw -> on_draw_area_draw_event
Remove trailing whitespace.


svn path=/trunk/; revision=38701
 2011-08-24 05:48:26 +00:00
Jörg Mayer f69a789664 GTK3: 
Rename the function parameter from usr_data -> data.
Use allocation instead of allocationarea in one place.
Remove trailing whitespace.

svn path=/trunk/; revision=38700
 2011-08-24 05:37:51 +00:00
Anders Broman 85b63208ee Fix a typo. 
svn path=/trunk/; revision=38699
 2011-08-24 05:25:04 +00:00
Anders Broman c0547f6351 GTK3 expose_event -> draw 
svn path=/trunk/; revision=38698
 2011-08-24 05:04:30 +00:00
Anders Broman 643653e90a GTK3 expose_event -> draw 
svn path=/trunk/; revision=38697
 2011-08-24 04:53:50 +00:00
Guy Harris 40a863f8bf Fix prematurely-terminated comment. 
svn path=/trunk/; revision=38696
 2011-08-24 02:37:36 +00:00
Guy Harris 898334c7a5 Fix a comment; this includes describing an additional way in which we 
could fail to open the capture file.

svn path=/trunk/; revision=38695
 2011-08-24 02:25:08 +00:00
Michael Tüxen 2ab112d5dd Hopefully fix 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6256.

svn path=/trunk/; revision=38694
 2011-08-23 23:10:50 +00:00
Stig Bjørlykke 713de3b54b From Akos Lukovics: 
Bugfix moving averages.

svn path=/trunk/; revision=38693
 2011-08-23 20:40:34 +00:00
Anders Broman 7dc08c05c8 Make the byte highlighting work in GTK3 
svn path=/trunk/; revision=38692
 2011-08-23 16:39:40 +00:00
Jörg Mayer 0ff88cef85 Status update. 
The lua menu items do work in the ItemFactory code.

svn path=/trunk/; revision=38691
 2011-08-23 14:53:18 +00:00
Anders Broman fbbdfa8d1e Missed backing out one line... 
svn path=/trunk/; revision=38690
 2011-08-23 14:48:05 +00:00
Anders Broman a192182e1c Make colors work on GTK3 take 2 
Revert tcp_graph commit by mistake, typo etc

svn path=/trunk/; revision=38689
 2011-08-23 14:17:30 +00:00
Jörg Mayer 97548261df Fix build in the non gtk3 case: Add gpointer data to the 
parameter list.
Remove some trailing spaces.

svn path=/trunk/; revision=38688
 2011-08-23 14:13:34 +00:00
Anders Broman 637490272d Make colors work on GTK3 
svn path=/trunk/; revision=38687
 2011-08-23 13:49:37 +00:00
Stig Bjørlykke 8f2076f5ef From Gisle Vanem: 
Rename header guard.

svn path=/trunk/; revision=38686
 2011-08-23 13:16:44 +00:00
Anders Broman 7fc21673a5 Make the IO-grph work in GTK3. 
The "expose-event" needs to be changed to "draw" in all files.

svn path=/trunk/; revision=38685
 2011-08-23 11:18:35 +00:00
Jörg Mayer 4c7d6af730 GTK3 only builds if portaudio is disabled (rtp player is not 
yet gtk3 ready).

svn path=/trunk/; revision=38684
 2011-08-23 09:31:25 +00:00
Stig Bjørlykke 5603cef9f2 Remove support for libpcre, we use GRegex in GLib. 
svn path=/trunk/; revision=38683
 2011-08-23 09:25:06 +00:00
Anders Broman b213104006 Fix colors in GTK3 
svn path=/trunk/; revision=38682
 2011-08-23 07:36:41 +00:00
Anders Broman 7e3d918027 "fix": 
Error: Found non-ASCII characters on line 4135 of packet-bacapp.c
Error: Found non-ASCII characters on line 4163 of packet-bacapp.c
Error: Found non-ASCII characters on line 4198 of packet-bacapp.c

svn path=/trunk/; revision=38681
 2011-08-23 05:06:54 +00:00
Anders Broman 3acc73fd0c From Andrei Emeltchenko via Chris Maynard: 
btl2cap extended window shows wrong bit.
Patch would not apply cleanly so added by hand.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6257

svn path=/trunk/; revision=38680
 2011-08-23 04:49:24 +00:00
Anders Broman 1f23674191 From Jack Yu modified by Chris Maynard: 
Enhancement of text2cap for parsing flexibility.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1723

svn path=/trunk/; revision=38679
 2011-08-23 04:36:37 +00:00
Anders Broman 01d1f950d3 From Steve Karg: 
BACnet Dissector latest enumerations for properties, states, error codes, and vendor ids.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6249

svn path=/trunk/; revision=38678
 2011-08-23 04:26:01 +00:00
Chris Maynard f8cc368559 From Gisle Vanem via http://www.wireshark.org/lists/wireshark-dev/201108/msg00377.html: In follow_stream_cb(), if ct is NULL, bail out. It was noted in a follow-up post by Guy that the "Follow stream" button should be grayed out if there are no conversations. Until that is fixed, let's at least not crash. 
svn path=/trunk/; revision=38677
 2011-08-23 01:54:13 +00:00
Chris Maynard 4d30da3a59 Removed the call to g_warning() in proto_reg_handoff_opensafety(), as I didn't care to see the "openSAFETY - Profinet IO heuristic dissector cannot be registered, openSAFETY/PNIO native dissection." message when I ran, "tshark -v". 
svn path=/trunk/; revision=38676
 2011-08-23 01:08:32 +00:00
Jörg Mayer 25f4979255 Get the build working with GTK3 for real. 
Remove the check whether to disable the GTK_DEPRECATED stuff from menus.c,
  as it is only used for the deprecated code.

svn path=/trunk/; revision=38675
 2011-08-22 16:35:53 +00:00
Jörg Mayer 8268c2c656 Missed (at least) one place where to rename UI_MANAGER -> ENABLE_UI_MANAGER 
svn path=/trunk/; revision=38674
 2011-08-22 16:16:16 +00:00
Anders Broman 3334a753a7 From Akos Lukovics: 
Calculate moving averages in IO Graphs.

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

svn path=/trunk/; revision=38673
 2011-08-22 14:22:50 +00:00
Michael Tüxen 9050e380c8 gtk_action_get_label() is available in gtk+ 2.16 and higher... 
svn path=/trunk/; revision=38672
 2011-08-22 14:15:57 +00:00
Anders Broman 3c0f8dbb61 gtk_action_get_label() is GTK 2.16 
svn path=/trunk/; revision=38671
 2011-08-22 13:30:45 +00:00
Anders Broman d9efa28128 Typo 
svn path=/trunk/; revision=38670
 2011-08-22 13:01:53 +00:00
Anders Broman f1546275e0 Add conversation filter menu 
svn path=/trunk/; revision=38669
 2011-08-22 12:34:41 +00:00
Michael Tüxen 131a7195f4 #if 0 in a consistent way. This should unbreak the Mac OS builders. 
svn path=/trunk/; revision=38668
 2011-08-22 11:27:39 +00:00
Michael Tüxen 6651ef4b53 merge_all_tap_menus() has been moved to menus.c. 
svn path=/trunk/; revision=38667
 2011-08-22 11:25:59 +00:00
Michael Tüxen bdca36761c our_menu_callback() is only used when MAIN_MENU_USE_UIMANAGER 
is not defined.

svn path=/trunk/; revision=38666
 2011-08-22 11:25:00 +00:00
Anders Broman 1d40fa4604 More code cleanup. 
svn path=/trunk/; revision=38665
 2011-08-22 10:36:04 +00:00