osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
43378 commits 23 branches 0 tags 1.3 GiB
Commit graph

43378 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gerald Combs
56546f1b91 Move the MWOverlay code into its own class, SplashOverlay. Use it to 
implement a splash screen.

svn path=/trunk/; revision=45912
 2012-11-05 03:54:21 +00:00
Michael Mann
9f84a8d340 Add a few more expert_add_info_format calls to giop dissector which requires packet_info* structure and proto_item* to be filtered down through the generated functions. 
Also removed some excessive whitespace.

svn path=/trunk/; revision=45911
 2012-11-05 03:36:07 +00:00
Anders Broman
eba7e0dc1e Use GtkGrid if GTK version is >= 3.2 
svn path=/trunk/; revision=45910
 2012-11-04 17:39:07 +00:00
Bill Meier
e1986f1fa8 Add 'svn:mime-type text/xml' property 
svn path=/trunk/; revision=45909
 2012-11-04 17:34:10 +00:00
Bill Meier
44d88ea3d3 Add 'svn:mime-type text/xml' property 
svn path=/trunk/; revision=45908
 2012-11-04 17:31:36 +00:00
Bill Meier
e123ae163e Add 'svn:mime-type text/xml' property 
svn path=/trunk/; revision=45907
 2012-11-04 17:29:50 +00:00
Bill Meier
3ef73570ac Add 'svn:mime-type text/xml' property 
svn path=/trunk/; revision=45906
 2012-11-04 17:27:28 +00:00
Bill Meier
08c73c1c87 Add 'svn:mime-type text/xml' property 
svn path=/trunk/; revision=45905
 2012-11-04 17:21:42 +00:00
Anders Broman
db6feef877 Use a define for max number of characters and use that for the array size 
svn path=/trunk/; revision=45904
 2012-11-04 17:17:39 +00:00
Bill Meier
1020f5569d Add 'svn:mime-type text/xml' property 
svn path=/trunk/; revision=45903
 2012-11-04 17:13:50 +00:00
Anders Broman
c28020cda0 Fix a typo 
svn path=/trunk/; revision=45902
 2012-11-04 17:06:22 +00:00
Anders Broman
5965384149 Use GtkGrid if GTK version is >= 3.2 
svn path=/trunk/; revision=45901
 2012-11-04 17:00:01 +00:00
Alexis La Goutte
c66efd679c From Jérôme LAFORGE via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7942 
[BOOTP] Implement option 119 : RFC3397 RFC3396 RFC1035

svn path=/trunk/; revision=45900
 2012-11-04 16:29:15 +00:00
Anders Broman
d23097f96d Add the row with the tags first 
svn path=/trunk/; revision=45899
 2012-11-04 16:05:28 +00:00
Alexis La Goutte
76c976f3e6 Update *.qm (translations file) lrelease QtShark.pro Updating 'ui/qt/qtshark_de.qm'... Generated 32 translation(s) (32 finished and 0 unfinished) Ignored 298 untranslated source text(s) Updating 'ui/qt/qtshark_fr.qm'... Generated 330 translation(s) (330 finished and 0 unfinished) 
svn path=/trunk/; revision=45897
 2012-11-04 16:01:54 +00:00
Alexis La Goutte
0d15031e43 Update .git(bzn)ignore add to ignore list : (already ignore in svn) ui/cli/tshark-tap-register-cache.pkl ui/gtk/wireshark-tap-register-cache.pkl packaging/macosx/osx-dmg.sh 
svn path=/trunk/; revision=45896
 2012-11-04 16:01:46 +00:00
Alexis La Goutte
f32370b9e6 Update French Translations 
svn path=/trunk/; revision=45895
 2012-11-04 16:01:38 +00:00
Alexis La Goutte
b037ac39d1 lupdate QtShark.pro (update translation file) Updating 'qtshark_de.ts'... Found 330 source text(s) (77 new and 253 already existing) Kept 4 obsolete entries Updating 'qtshark_fr.ts'... Found 330 source text(s) (77 new and 253 already existing) Kept 4 obsolete entries Same-text heuristic provided 3 translation(s) 
svn path=/trunk/; revision=45894
 2012-11-04 16:01:29 +00:00
Alexis La Goutte
5019d32907 Make new text translatable for Qtshark (print_dialog) 
svn path=/trunk/; revision=45893
 2012-11-04 16:01:20 +00:00
Alexis La Goutte
686e72c011 Add Modelines infos to new Qtshark file (print_dialog.*) 
svn path=/trunk/; revision=45892
 2012-11-04 16:01:11 +00:00
Alexis La Goutte
615efadd77 Not ignore *.qm file 
svn path=/trunk/; revision=45891
 2012-11-04 16:01:00 +00:00
Gerald Combs
b326845377 [Automatic manuf, services and enterprise-numbers update for 2012-11-04] 
svn path=/trunk/; revision=45889
 2012-11-04 15:03:51 +00:00
Alexis La Goutte
ecd2324583 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7953 Improve COL_INFO output for DCE/RPC dissector 
The attached patch contains some improvements to the COL_INFO output of the
DCE/RPC dissector. The changes are:

- separate the informations by commas
- make output of Context ID always use "Ctx: %u"
- print names of RPC over HTTP PDUs on the protocol tree line (in addition to
COL_INFO)

svn path=/trunk/; revision=45888
 2012-11-04 14:58:55 +00:00
Anders Broman
8004ecccde From Andrei Emeltchenko: Add OUI_BLUETOOTH part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7633 bt-oui: Add decoding Bluetooth High Speed over wireless 
svn path=/trunk/; revision=45887
 2012-11-04 12:47:02 +00:00
Evan Huus
13f8a0466c Make a few variables volatile to satisfy gcc. 
svn path=/trunk/; revision=45886
 2012-11-03 23:41:59 +00:00
Gerald Combs
5b2890e573 Move the main window creation to the top of main() in anticipation of a 
splash pane.

Add an "initialized" state to WiresharkApplication and set it when we're
done calling our init routines. Handle FileOpen events. Wait until we're
initialized to try to open the files. On OS X

    open -a /path/to/qtshark.app /path/to/some/file.pcap
    
now works as expected, and

    osascript -e 'tell application "qtshark" to open posix file "'"/path/to/some/file.pcap"'"'
    
works but returns "missing value". 

svn path=/trunk/; revision=45885
 2012-11-03 22:48:29 +00:00
Jakub Zawadzki
bdcdec560c Manually revert r45669 
svn path=/trunk/; revision=45884
 2012-11-03 20:51:19 +00:00
Gerald Combs
2e6f4fafd4 Allow a display filter to be specified in openCaptureFile(). 
svn path=/trunk/; revision=45883
 2012-11-03 18:02:01 +00:00
Evan Huus
f28a5df5df More wmem documentation additions and updates. Still incomplete. 
svn path=/trunk/; revision=45882
 2012-11-03 17:58:07 +00:00
Evan Huus
5d6b306391 Wmem stack implementation using the wmem slab implementation to allocate frames. 
svn path=/trunk/; revision=45881
 2012-11-03 17:34:28 +00:00
Evan Huus
cc87609f31 SVN Properties. 
svn path=/trunk/; revision=45880
 2012-11-03 15:51:47 +00:00
Evan Huus
2737b7b7d3 Add wmem scopes for packet and file lifetimes. The file lifetime scope isn't 
yet initialized because I can't figure out where the enter() and leave() calls
should go - the obvious place in packet.c causes a lot of assertion errors.

svn path=/trunk/; revision=45879
 2012-11-03 15:49:15 +00:00
Anders Broman
b117383961 Make it compil by adding a cast, not sure if payload_length = (int)tvb_get_ntoh64(tvb, 2); can overflow 
svn path=/trunk/; revision=45878
 2012-11-03 15:36:09 +00:00
Evan Huus
6ef55f30d8 Rename wmem_permanent_scope -> wmem_epan_scope to reflect the fact that it 
is technically scoped to the library, not the process. It's also shorter :)

svn path=/trunk/; revision=45877
 2012-11-03 15:08:00 +00:00
Alexis La Goutte
1deb8ffc1e Try to fix Windows XP/7 buildbot 
svn path=/trunk/; revision=45876
 2012-11-02 21:09:52 +00:00
Alexis La Goutte
94ae27661e From vanviegen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7934 WebSocket dissector improvements 
- Now works for WebSocket packets not aligned with IP packets.
- Support subdissectors.

From me :
- Fix checkAPIs warning (about comments)
- Remove some whitespace

svn path=/trunk/; revision=45875
 2012-11-02 20:35:24 +00:00
Alexis La Goutte
2ed0d19555 Set SVN properties (not work in git-svn...) 
svn path=/trunk/; revision=45874
 2012-11-02 15:46:29 +00:00
Alexis La Goutte
84e8345c82 From Tomasz Mon via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7809 Add USBAudio and MIDI System Exclusive dissectors. 
USBAudio dissector can reassemble SysEx commands.
MIDI SysEx dissector can (partially) dissect DigiTech protocol.

From me :
Fix a wrong encoding type found by fix-encoding-args tools
Add Modelines info

svn path=/trunk/; revision=45873
 2012-11-02 15:35:28 +00:00
Jakub Zawadzki
ff03289b1a Remove const specifier from argument. 
svn path=/trunk/; revision=45872
 2012-11-02 11:44:50 +00:00
Anders Broman
df1fe6422e Assign a default value to temp_tree; 
svn path=/trunk/; revision=45871
 2012-11-02 11:15:29 +00:00
Anders Broman
4d83f6f557 packet-ssl.c add a cast to build on Win64 
pccket-lldp.c #if 0 out not used variables.

svn path=/trunk/; revision=45870
 2012-11-02 10:04:38 +00:00
Anders Broman
d54b681f84 From Jim Young and updated by Max Romanov: 
The modification to acinclude.m4 adds a new test in the
AC_WIRESHARK_OSX_INTEGRATION_CHECK section to first look for the library
gtkmacintegration.  "gtkmacintegration" is the new internal name for GTK+ MAC
OSX library after the project was moved to www.gtk.org.  Previously this
library was known as igemacintegration.

The patches to the three gtk/*.c files update the conditional #include
<gtkmacintegration/gtkosxapplication.h> to use the new folder name.   The
Option 1 patch will break any build environment that expects to find the
gtkosapplication.h file in the older igemacintegration folder.  
In addition the patch includes updates to
gtk/main.c and gtk/main_menubar.c for a more standard looking App menu.

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

svn path=/trunk/; revision=45869
 2012-11-02 09:58:43 +00:00
Anders Broman
a43acbd8c3 From Wido Kelling: 
updated the TLVs for Profinet IEC 61158
updated the MRP decoding
wrong formattype changed to avoid fault in unknown subtype (atatched capture)

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

svn path=/trunk/; revision=45868
 2012-11-02 09:30:27 +00:00
Anders Broman
e25f7c5a33 From Sho Amano: 
Patch to update the decryption status right after the user updates
WEP/WPA keys in the UAT.

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

svn path=/trunk/; revision=45867
 2012-11-02 09:00:01 +00:00
Anders Broman
ecbf47ff3a From Dirk: 
This patch will print the information if an
invalid string was entered. It would be better to have a button to click on in
the UAT dialog to show valid values, but I don't know how I could do that with
the UAT system. So I'm simply printing it now in the error dialog, which should
be good enough.

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

svn path=/trunk/; revision=45866
 2012-11-02 08:48:13 +00:00
Anders Broman
d3c2aa3199 From Dirk: 
Print the GNUTLS error message upon import failure.

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

svn path=/trunk/; revision=45865
 2012-11-02 08:41:15 +00:00
Jörg Mayer
854ae179ef Fix ui/qt/print_dialog.cpp:228:23: error: variable ‘status’ set but not used [-Werror=unused-but-set-variable] 
svn path=/trunk/; revision=45864
 2012-11-01 23:09:02 +00:00
Gerald Combs
66b13e2961 Enable and disable the File→Print and Go menu items as needed. Have the 
print dialog cancel itself if we don't hand it a capture file.

svn path=/trunk/; revision=45863
 2012-11-01 22:12:57 +00:00
Gerald Combs
606a7433ce Add changes missing from the last commit. 
svn path=/trunk/; revision=45862
 2012-11-01 21:17:29 +00:00
Gerald Combs
abf7f1c724 Set SVN properties. 
svn path=/trunk/; revision=45861
 2012-11-01 20:58:30 +00:00