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

32593 Commits

Author SHA1 Message Date
Bill Meier 03b7c7b8fa I suspect the changes to config.nmake committed in SVN #33942 were not intended. 
Revert the changes (for now ?) so the Buildbot will run again.

svn path=/trunk/; revision=33945
 2010-08-26 23:40:27 +00:00
Anders Broman d4e0b348cf Doxygen fixes. 
svn path=/trunk/; revision=33942
 2010-08-26 20:31:09 +00:00
Stig Bjørlykke 6d5dfbffb3 Check input string in ps_clean_string(). 
This fixes bug 5148.

svn path=/trunk/; revision=33941
 2010-08-26 20:22:28 +00:00
Anders Broman 63fc078fed Fixed by running doxygen -u 
svn path=/trunk/; revision=33939
 2010-08-26 19:40:57 +00:00
Anders Broman a20bf7af0d Fix doxygen errors. 
svn path=/trunk/; revision=33938
 2010-08-26 19:40:08 +00:00
Stephen Fisher 36c2954387 Show a text string of the Windows version (if Windows 2000 or higher.) 
svn path=/trunk/; revision=33936
 2010-08-26 18:06:56 +00:00
Gerald Combs 88a0298183 Add a newline. Fixup whitespace. 
svn path=/trunk/; revision=33933
 2010-08-26 17:18:44 +00:00
Anders Broman 1c2b3b0eb9 Fix a number of doxygen directives. 
svn path=/trunk/; revision=33930
 2010-08-26 15:24:49 +00:00
Anders Broman d936d457c3 Fix a number of doxygen directives. 
svn path=/trunk/; revision=33929
 2010-08-26 15:02:27 +00:00
Stig Bjørlykke 113fac8b77 From Juha Siltanen via bug 5144: 
Added support for payload dissecting.

svn path=/trunk/; revision=33928
 2010-08-26 13:49:23 +00:00
Anders Broman 74131df4f0 - Try to fix a couple of doxygen comments. 
svn path=/trunk/; revision=33927
 2010-08-26 07:12:03 +00:00
Anders Broman 48ac5f90ff - Try to fix a couple of doxygen comments. 
- whitspace changes.

svn path=/trunk/; revision=33926
 2010-08-26 06:46:30 +00:00
Gerald Combs 58f1427305 Move Windows-specific material inside an appropriate #ifdef. 
svn path=/trunk/; revision=33925
 2010-08-25 22:41:26 +00:00
Gerald Combs 607b228df6 Add ws_load_library and ws_module_open, which respectively call 
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

svn path=/trunk/; revision=33924
 2010-08-25 20:30:59 +00:00
Jeff Morriss 43af5f6344 Update the WinPcap developer's pack to 4.1.2. Update PCAP_VERSION to 4.1.2 on Win64 too (for consistency more than anything I think). 
svn path=/trunk/; revision=33923
 2010-08-25 18:20:56 +00:00
Jeff Morriss dd53f9a1bd Use PCAP_VERSION (from config.nmake) instead of hard coding the WinPcap version. 
svn path=/trunk/; revision=33922
 2010-08-25 15:28:26 +00:00
Jeff Morriss 44f8a8824e Change PCAP_VERSION to 4.1.2. Hopefully this will cause the U3/PortableApps builds to pick up WinPcap again. 
svn path=/trunk/; revision=33921
 2010-08-25 15:27:14 +00:00
Tomas Kukosa f5e1f23cac Fix wrong length of CSeq Method parameter 
svn path=/trunk/; revision=33920
 2010-08-25 14:10:58 +00:00
Martin Mathieson c53d8b200b Let DCT2000 tree extend to end of ipprim or sctpprim bytes. 
svn path=/trunk/; revision=33919
 2010-08-25 13:27:27 +00:00
Martin Mathieson 3852415572 Show (again?) MAC-d PDUs inside MAC-es PDUs. 
svn path=/trunk/; revision=33918
 2010-08-25 13:01:00 +00:00
Gerald Combs b73454e8bd Fix !Windows compilation. 
svn path=/trunk/; revision=33917
 2010-08-25 00:20:50 +00:00
Gerald Combs ad4ffa5d49 Partial fix for bug 5133. On Windows, call SetDllDirectory at startup if 
it's present in Wireshark and dumpcap. This takes care of the airpcap.dll
PoC but we need to load wpcap.dll from a full path. We might want to
call SetDllDirectory from our other executables as well.

svn path=/trunk/; revision=33916
 2010-08-24 23:39:29 +00:00
Anders Broman 5fbc1e101b Make the expert filter popup behave as in filter_utils. 
svn path=/trunk/; revision=33915
 2010-08-24 20:03:33 +00:00
Stig Bjørlykke ce99177a00 Display content entry (with length) in tree. 
svn path=/trunk/; revision=33914
 2010-08-24 15:47:10 +00:00
Stig Bjørlykke 38a7ac0910 Fix modifier in .cnf file. 
svn path=/trunk/; revision=33913
 2010-08-24 15:46:33 +00:00
Stig Bjørlykke 98493ff110 Rewrote to fetch content_tvb from dissect_ber_octet_string(). 
Display eContent entry (with length) in tree.

svn path=/trunk/; revision=33912
 2010-08-24 15:43:32 +00:00
Stig Bjørlykke 1a5f73299e Display octet string fragments for RTSE segment data. 
svn path=/trunk/; revision=33911
 2010-08-24 15:09:11 +00:00
Stig Bjørlykke 8b6c6a3dbf Display constructed octet strings with correct hf_id. 
Show octet string fragments as for reassembly.

svn path=/trunk/; revision=33910
 2010-08-24 15:08:07 +00:00
Bill Meier 5dfb597163 Fix issue which causes daintree-sna frames to be rejected with "capture length > packet length". 
This fix adds back two lines of code removed in SVN #33678.

 "Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
  include the FCS, and use it for the Daintree SNA file format. [...]"

This fix just restores the discarding of two end-of-frame "pad" bytes as each frame is read
from the capture file; This seems to me to be the correct behaviour.



svn path=/trunk/; revision=33909
 2010-08-24 14:59:11 +00:00
Stig Bjørlykke f3f59dbf95 Indicate abort and abort-reason in info column. 
svn path=/trunk/; revision=33908
 2010-08-24 11:36:10 +00:00
Anders Broman 02ffdfea34 Add Id. 
svn path=/trunk/; revision=33907
 2010-08-24 07:44:36 +00:00
Anders Broman f5f29d8931 From Gregor Beck: 
ERROR:capture.c:141:capture_start: assertion failed: (capture_opts->state == CAPTURE_STOPPED)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5126

svn path=/trunk/; revision=33906
 2010-08-24 06:15:40 +00:00
Tomas Kukosa 7c60d30dc5 - fix using hex values as constraint 
- avoid crash if unknown type is used in type assignment

svn path=/trunk/; revision=33905
 2010-08-24 05:53:17 +00:00
Anders Broman 95901a9b76 From Hamish Moffatt: 
daintree-sna.c doesn't initialise capture_file snapshot_length.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5128

svn path=/trunk/; revision=33904
 2010-08-24 05:44:55 +00:00
Anders Broman 5371cb66b9 From Christian Durrer: 
Not all Ether-S-Bus telegrams are recognized and displayed correctly.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5123

svn path=/trunk/; revision=33903
 2010-08-24 05:38:49 +00:00
Anders Broman 7e8752c70c Change the wording in the menu. 
svn path=/trunk/; revision=33902
 2010-08-24 05:11:37 +00:00
Bill Meier e5fc612fb2 Use consistent indentation; 
Fix a few @param comments.

svn path=/trunk/; revision=33901
 2010-08-24 00:25:50 +00:00
Gerald Combs a875855c39 Display ISATAP encapsulated IPv4 addresses. 
svn path=/trunk/; revision=33900
 2010-08-24 00:24:44 +00:00
Stephen Fisher b4addc04fe The ARP hardware type and operation code are listed with the IANA in decimal notation, not hex. 
svn path=/trunk/; revision=33898
 2010-08-23 23:09:32 +00:00
Bill Meier 66d340863f (Minor) Cleanup signal callbak signatures and related: 
- Don't mark callback arg as _U_ if actually used (and vice-versa);
- Use Null as user_data in g_signal_callback if unused in callback;
- Use correct signature for certain event callbacks.

svn path=/trunk/; revision=33895
 2010-08-23 19:29:08 +00:00
Jaap Keuter f2b0e1f5df On request from Albert Chin: 
Update libtoolize files

svn path=/trunk/; revision=33894
 2010-08-23 18:16:22 +00:00
Bill Meier 32f17466e3 [Trivial] Use g_signal_connect() instead of g_signal_connect_data(). 
svn path=/trunk/; revision=33893
 2010-08-23 16:48:42 +00:00
Bill Meier e637e22313 (Trivial) Use consistent indentation. 
svn path=/trunk/; revision=33892
 2010-08-23 16:39:52 +00:00
Jeff Morriss bcca3fb3d5 Remove #if 0'd out code (dfilter_combo_add_empty()). 
svn path=/trunk/; revision=33891
 2010-08-23 16:18:06 +00:00
Bill Meier 9451aa90a7 (Trivial/Cosmetic) Fix signatures of some signal callback functions; 
Also:Add some missing G_CALLBACKs (even in commented out code)

svn path=/trunk/; revision=33890
 2010-08-23 15:58:48 +00:00
Bill Meier 254135d807 (Trivial) Whitespace cleanup. 
svn path=/trunk/; revision=33889
 2010-08-23 14:36:01 +00:00
Bill Meier 539712c5ad new_packet_list_column_button_pressed_cb(): return gboolean (not void): it's an event callback; 
Note:
 the original code:
   static void new_packet_list_column_button_pressed_cb() {
     ...
     packet_list_popup(...);
     }
 the revised code:
   static gboolean new_packet_list_column_button_pressed_cb() {
     ...
     return packet_list_popup(...);
     }

 My guess is that the original code happened to work 
 on some?/all? supported platforms depending upon the actual
 details of the generated calling_sequence/return code.
---------------
Also: 
- new_packet_list_column_button_pressed_cb(): 'path' arg is unused;
- new_packet_list_double_click_cb(): user_data arg is unused so 
  don't supply same in the g_signal_connect.

svn path=/trunk/; revision=33888
 2010-08-23 14:08:35 +00:00
Stig Bjørlykke d0dfefaca8 Fix for attribute boolean, from bug 5127. 
svn path=/trunk/; revision=33887
 2010-08-23 09:17:03 +00:00
Gerald Combs 66c34b8293 [Automatic manuf and enterprise-numbers update for 2010-08-22] 
svn path=/trunk/; revision=33881
 2010-08-22 15:03:30 +00:00
Gerald Combs 4f5057e218 Add !ENDIF if needed. 
svn path=/trunk/; revision=33880
 2010-08-22 00:41:06 +00:00