http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=39543
User: gerald
Date: 2011/10/24 03:34 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r39103 | wmeier | 2011-09-23 07:10:52 -0700 (Fri, 23 Sep 2011) | 2 lines
Changed paths:
M /trunk/epan/dissectors/Makefile.common
Put packet-vlan back into Makefile.common (to go with SVN #39100)
------------------------------------------------------------------------
r39104 | wmeier | 2011-09-23 07:15:49 -0700 (Fri, 23 Sep 2011) | 2 lines
Changed paths:
M /trunk/epan/CMakeLists.txt
Add packet-vlan.c
------------------------------------------------------------------------
r39106 | wmeier | 2011-09-23 07:47:18 -0700 (Fri, 23 Sep 2011) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-eth.c
Uh, "Fix the fix (in SVN #39105)" so it compiles.
------------------------------------------------------------------------
r39136 | wmeier | 2011-09-25 14:10:04 -0700 (Sun, 25 Sep 2011) | 3 lines
Changed paths:
M /trunk/epan/prefs.c
vlan dissector has been restored;
pref "eth.qinq_ethertype" has been moved(restored) to "vlan.qinq_ethertype".
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r39100 | etxrab | 2011-09-23 04:01:13 -0700 (Fri, 23 Sep 2011) | 9 lines
Changed paths:
M /trunk/epan/dissectors/packet-eth.c
M /trunk/epan/dissectors/packet-ethertype.c
M /trunk/epan/dissectors/packet-ieee8021ah.c
A /trunk/epan/dissectors/packet-vlan.c
A /trunk/epan/dissectors/packet-vlan.h
M /trunk/epan/prefs.c
Revert Revision 34838 "Resolve bug #2254: Migrate the 802.1q VLAN dissector into the Ethernet II."
as this causes a lot of problems.
See
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5680
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6305
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6366
Original bug:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2254
------------------------------------------------------------------------
r39101 | etxrab | 2011-09-23 04:22:48 -0700 (Fri, 23 Sep 2011) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-ethertype.c
Remove code commited by misstake.
------------------------------------------------------------------------
r39105 | wmeier | 2011-09-23 07:39:23 -0700 (Fri, 23 Sep 2011) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-eth.c
Correction for SVN #39100:"Revert Revision 34838";
Fixes buildbot compile error.
------------------------------------------------------------------------
r39134 | wmeier | 2011-09-25 12:28:07 -0700 (Sun, 25 Sep 2011) | 14 lines
Changed paths:
M /trunk/epan/dissectors/packet-eth.c
Do some cleanup related to the reversion of SVN #34848 donr in SVN #39100.
1. Revert SVN #35830 (See Bug #5645);
This patch is no longer needed given the reversion.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5645
http://anonsvn.wireshark.org/viewvc?revision=39100&view=revision
2. Restore 'col_set_str(pinfo->cinfo, COL_INFO, "Ethernet II");' just to
be safe (altho it's possible that this line is not needed).
3. Remove several lines of no longer needed code.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+2 -0 Makefile.common Modified
+8 -119 packet-eth.c Modified
+2 -1 packet-ethertype.c Modified
+1 -0 packet-ieee8021ah.c Modified
+219 -0 packet-vlan.c Added
+29 -0 packet-vlan.h Added
Directory: /trunk-1.6/docbook/
Changes Path Action
+26 -0 release-notes.xml Modified
Directory: /trunk-1.6/epan/
Changes Path Action
+1 -0 CMakeLists.txt Modified
+18 -5 prefs.c Modified