[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=33415

User: gerald
Date: 2010/07/02 11:12 AM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r33257 | etxrab | 2010-06-20 03:25:26 -0700 (Sun, 20 Jun 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-diameter_3gpp.c
 
 From KATAOKA Toshihiro:
 3GPP Diameter S6a flags.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4893
 Modified to use tfs_set_notset.
 ------------------------------------------------------------------------
 r33258 | jake | 2010-06-20 05:21:45 -0700 (Sun, 20 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-nas_eps.c
 
 From KATAOKA Toshihiro:
 The sequence number in 3GPP NAS EPS(TS24.301) cyphered PDU is outside of ciphered text.
 ------------------------------------------------------------------------
 r33264 | stig | 2010-06-20 09:17:10 -0700 (Sun, 20 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ip.c
 
 Revert back to the old Flags entry.
 Add number of bits used for Flags in the description.
 ------------------------------------------------------------------------
 r33265 | stig | 2010-06-20 09:22:51 -0700 (Sun, 20 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ip.c
    M /trunk/epan/dissectors/packet-ppp.c
    M /trunk/epan/dissectors/packet-tcp.c
    M /trunk/epan/ip_opts.h
 
 Added an expert info for "4 NOP in a row" in IP and TCP.
 ------------------------------------------------------------------------
 r33266 | stig | 2010-06-20 09:23:43 -0700 (Sun, 20 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/epan/column.c
    M /trunk/epan/column.h
    M /trunk/epan/prefs.c
    M /trunk/gtk/menus.c
    M /trunk/gtk/menus.h
    M /trunk/gtk/new_packet_list.c
    M /trunk/gtk/new_packet_list.h
    M /trunk/gtk/prefs_column.c
 
 Added "Hide Column" functionality.
 ------------------------------------------------------------------------
 r33279 | stig | 2010-06-21 06:57:03 -0700 (Mon, 21 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/gtk/menus.c
    M /trunk/gtk/prefs_column.c
 
 Rename "Visible" to "Displayed" for hide columns functions.
 ------------------------------------------------------------------------
 r33281 | stig | 2010-06-21 13:33:39 -0700 (Mon, 21 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/gtk/menus.c
 
 Added the displayed columns menu in the heading popup.
 ------------------------------------------------------------------------
 r33284 | stig | 2010-06-22 01:56:05 -0700 (Tue, 22 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/gtk/menus.c
 
 Include some column details in the "Displayed Columns" list.
 ------------------------------------------------------------------------
 r33285 | stig | 2010-06-22 04:09:07 -0700 (Tue, 22 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/epan/prefs.c
    M /trunk/gtk/prefs_column.c
 
 Always make new columns visible.
 ------------------------------------------------------------------------
 r33288 | stig | 2010-06-22 06:40:28 -0700 (Tue, 22 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/epan/prefs.c
    M /trunk/gtk/menus.c
 
 Check for custom column before using custom_field.
 Store hidden columns correctly.
 ------------------------------------------------------------------------
 r33267 | jake | 2010-06-20 09:27:03 -0700 (Sun, 20 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/gtk/main_welcome.c
 
 Fix for bug 4875:
 Don't hint at a local User's Gude when there isn't one.
 ------------------------------------------------------------------------
 r33268 | wmeier | 2010-06-20 09:57:50 -0700 (Sun, 20 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/epan/libwireshark.def
 
 Add get_column_visible & set_column_visible
 ------------------------------------------------------------------------
 r33269 | jake | 2010-06-20 11:23:35 -0700 (Sun, 20 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/epan/prefs.c
 
 Fix for bug 4888:
 Convert DSCP column to the proper custom column filter code.
 ------------------------------------------------------------------------
 r33270 | jake | 2010-06-20 11:24:25 -0700 (Sun, 20 Jun 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ip.c
 
 Fix for bug 4888:
 Restore setting DSCP column value, when relevant.
 ------------------------------------------------------------------------
 r33274 | etxrab | 2010-06-20 20:01:41 -0700 (Sun, 20 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ieee80211.c
 
 The length of the dot11CurrentChannelNumber parameter is 1 octet.
 Fixes bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4894
 ------------------------------------------------------------------------
 r33277 | stig | 2010-06-21 04:29:54 -0700 (Mon, 21 Jun 2010) | 2 lines
 Changed paths:
    M /trunk/asn1/ess/ess.cnf
    M /trunk/epan/dissectors/packet-ess.c
 
 Corrected printed name for id-permissiveAttributes.
 ------------------------------------------------------------------------

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                      Action
  +543 -3    packet-diameter_3gpp.c    Modified
  +1 -1      packet-ess.c              Modified
  +10 -16    packet-ieee80211.c        Modified
  +23 -5     packet-ip.c               Modified
  +4 -1      packet-nas_eps.c          Modified
  +5 -5      packet-ppp.c              Modified
  +4 -2      packet-tcp.c              Modified

Directory: /trunk-1.4/epan/
  Changes    Path                Action
  +28 -0     column.c            Modified
  +3 -0      column.h            Modified
  +1 -1      ip_opts.h           Modified
  +2 -0      libwireshark.def    Modified


(8 files not shown)