http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=33408
User: gerald
Date: 2010/07/01 05:21 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r33219 | wmeier | 2010-06-13 13:27:21 -0700 (Sun, 13 Jun 2010) | 3 lines
Changed paths:
M /trunk/gtk/prefs_nameres.c
Add info to the "Enable OID resolution" tooltip that if 'True' then the 'SMI paths' and the 'SMI modules' preferences will be shown;
Fix a comment.
------------------------------------------------------------------------
r33222 | gerald | 2010-06-13 16:02:18 -0700 (Sun, 13 Jun 2010) | 3 lines
Changed paths:
M /trunk/packaging/macosx/osx-dmg.sh
The .dmg packages can come in 32-bit and 64-bit flavors. Name them
accordingly.
------------------------------------------------------------------------
r33223 | wmeier | 2010-06-14 05:37:43 -0700 (Mon, 14 Jun 2010) | 3 lines
Changed paths:
M /trunk/gtk/flow_graph.c
Fix Bug #4871: Wrong Ack value in TCP flow graph when using relative sequence numbers.
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4871
------------------------------------------------------------------------
r33243 | stig | 2010-06-17 09:38:05 -0700 (Thu, 17 Jun 2010) | 2 lines
Changed paths:
M /trunk/epan/wslua/template-init.lua
Enable Lua by default.
------------------------------------------------------------------------
r33252 | stig | 2010-06-18 08:25:41 -0700 (Fri, 18 Jun 2010) | 2 lines
Changed paths:
M /trunk/epan/wslua/template-init.lua
Fix the check for disable_lua.
------------------------------------------------------------------------
r33316 | morriss | 2010-06-24 12:58:20 -0700 (Thu, 24 Jun 2010) | 1 line
Changed paths:
M /trunk/docbook/wsluarm.xml
Lua is now enabled by default. Capitalize Lua in a few places. Call protocol dissectors 'protocol dissectors' instead of protocols.
------------------------------------------------------------------------
r33250 | etxrab | 2010-06-17 21:18:08 -0700 (Thu, 17 Jun 2010) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-ethertype.c
M /trunk/epan/etypes.h
Add the Gigamon ethertype.
------------------------------------------------------------------------
r33253 | etxrab | 2010-06-18 10:18:00 -0700 (Fri, 18 Jun 2010) | 5 lines
Changed paths:
M /trunk/doc/tshark.pod
M /trunk/tshark.c
From Jim Young:
The attached patch simply documents a long supported but hidden tshark -G
option.
Tshark's print_usage() has been augmented as well as the tshark man page.
------------------------------------------------------------------------
r33255 | stig | 2010-06-18 18:16:29 -0700 (Fri, 18 Jun 2010) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-eth.c
M /trunk/epan/dissectors/packet-eth.h
M /trunk/epan/dissectors/packet-ethertype.c
M /trunk/epan/dissectors/packet-ieee8023.c
M /trunk/epan/dissectors/packet-isl.c
Use top level tree when using dissectors from "eth.trailer" heuristics.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r33256 | stig | 2010-06-18 18:43:11 -0700 (Fri, 18 Jun 2010) | 13 lines
Changed paths:
M /trunk/epan/CMakeLists.txt
M /trunk/epan/dissectors/Makefile.common
A /trunk/epan/dissectors/packet-gmhdr.c
From tieuthunhi via bug 4887:
Add support for Gigamon headers (timestamp, source port, length, etc)
that are inserted by Gigamon network equipments.
From me:
Various cleanup:
- Register to "eth.trailer" heuristics for trailer.
- Use standard dumping of timestamp.
- Rewrote gmhdr_plfm_str handling.
- Dump srcport details in a subtree.
- Removed packte-gmhdr.h.
- Ensure the while-loop will end.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/epan/dissectors/
Changes Path Action
+1 -0 Makefile.common Modified
+2 -2 packet-eth.c Modified
+1 -1 packet-eth.h Modified
+5 -4 packet-ethertype.c Modified
+309 -0 packet-gmhdr.c Added
+1 -1 packet-ieee8023.c Modified
+1 -1 packet-isl.c Modified
Directory: /trunk-1.4/doc/
Changes Path Action
+92 -0 tshark.pod Modified
Directory: /trunk-1.4/docbook/
Changes Path Action
+1 -0 release-notes.xml Modified
+6 -7 wsluarm.xml Modified
(7 files not shown)
