[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/06/18 10:26 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r43303 | sake | 2012-06-17 02:02:04 -0700 (Sun, 17 Jun 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ssl-utils.c
 
   Fix reading back exported SSL keys. Bug was introduced in r43097.
   ------------------------------------------------------------------------
   r43304 | sake | 2012-06-17 04:30:25 -0700 (Sun, 17 Jun 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dtls.c
      M /trunk/epan/dissectors/packet-ssl.c
 
   Enhance dissection of the NewSessionTicket handshake message.
   ------------------------------------------------------------------------
   r43204 | wmeier | 2012-06-11 08:47:50 -0700 (Mon, 11 Jun 2012) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ip.c
      M /trunk/epan/dissectors/packet-ip.h
 
   Create dscp_vals_ext value_str_ext (based upon dscp_vals); Use it as appropriate.
   Also:
    - use val_to_str_const() [instead of val_to_str()] in a few cases;
    - do some trivial formatting cleanup.
   ------------------------------------------------------------------------
   r43211 | wmeier | 2012-06-11 12:07:53 -0700 (Mon, 11 Jun 2012) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ip.h
      M /trunk/epan/dissectors/packet-megaco.c
      M /trunk/epan/dissectors/packet-mpls-pm.c
      M /trunk/epan/dissectors/packet-nhrp.h
 
   Use dscp_vals_ext everyplace (instead of dscp_vals);
   (dscp_vals is now a static array in packet-ip.c)
   ------------------------------------------------------------------------
   r43221 | jmayer | 2012-06-12 03:38:22 -0700 (Tue, 12 Jun 2012) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ip.c
      M /trunk/epan/dissectors/packet-ip.h
      M /trunk/epan/dissectors/packet-ipv6.c
 
   Manually revert r41953
 
     BACKPORT to 1.8
   ------------------------------------------------------------------------
   r43222 | jmayer | 2012-06-12 03:44:57 -0700 (Tue, 12 Jun 2012) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ip.c
      M /trunk/epan/dissectors/packet-ip.h
      M /trunk/epan/dissectors/packet-ipv6.c
 
   Revert r41952
 
     BACKPORT to 1.8
   ------------------------------------------------------------------------

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                  Action
  +105 -54   packet-dtls.c         Modified
  +20 -30    packet-ip.c           Modified
  +2 -4      packet-ip.h           Modified
  +25 -4     packet-ipv6.c         Modified
  +2 -1      packet-megaco.c       Modified
  +2 -2      packet-mpls-pm.c      Modified
  +0 -3      packet-nhrp.h         Modified
  +3 -3      packet-ssl-utils.c    Modified
  +53 -1     packet-ssl.c          Modified