[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2009/09/09 12:15 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r29719 | stig | 2009-09-05 11:13:48 -0700 (Sat, 05 Sep 2009) | 3 lines
 Changed paths:
    M /trunk/gtk/main.c
 
 Move reloading pane geometry to a point where we have the correct
 main_first_pane and main_second_pane.
 ------------------------------------------------------------------------
 r29814 | jake | 2009-09-09 00:22:44 -0700 (Wed, 09 Sep 2009) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-dhcpv6.c
 
 Fix for bug 3987:
 Option Request option values are in 16 bit units.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 ------------------------------------------------------------------------
 r29726 | krj | 2009-09-05 21:26:50 -0700 (Sat, 05 Sep 2009) | 4 lines
 Changed paths:
    M /trunk/asn1/camel/packet-camel-template.c
    M /trunk/asn1/gsmmap/packet-gsmmap-template.c
    M /trunk/asn1/pkixcmp/packet-cmp-template.c
    M /trunk/asn1/smrse/packet-smrse-template.c
    M /trunk/epan/dissectors/packet-camel.c
    M /trunk/epan/dissectors/packet-catapult-dct2000.c
    M /trunk/epan/dissectors/packet-cmp.c
    M /trunk/epan/dissectors/packet-dlm3.c
    M /trunk/epan/dissectors/packet-gsm_map.c
    M /trunk/epan/dissectors/packet-hip.c
    M /trunk/epan/dissectors/packet-ieee802154.c
    M /trunk/epan/dissectors/packet-mtp2.c
    M /trunk/epan/dissectors/packet-nat-pmp.c
    M /trunk/epan/dissectors/packet-ptp.c
    M /trunk/epan/dissectors/packet-rpl.c
    M /trunk/epan/dissectors/packet-smrse.c
    M /trunk/epan/dissectors/packet-wow.c
    M /trunk/epan/dissectors/packet-zbee-aps.c
    M /trunk/epan/dissectors/packet-zbee-nwk.c
    M /trunk/epan/dissectors/packet-zbee-zdp.c
    M /trunk/epan/value_string.c
    M /trunk/epan/value_string.h
 
 Don't pass ep_alloc()'ed strings to col_set_str().
 
 Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3984
 
 ------------------------------------------------------------------------
 r29727 | krj | 2009-09-05 22:29:51 -0700 (Sat, 05 Sep 2009) | 1 line
 Changed paths:
    M /trunk/asn1/camel/packet-camel-template.c
    M /trunk/asn1/gsmmap/packet-gsmmap-template.c
    M /trunk/asn1/pkixcmp/packet-cmp-template.c
    M /trunk/asn1/smrse/packet-smrse-template.c
    M /trunk/epan/dissectors/packet-camel.c
    M /trunk/epan/dissectors/packet-cmp.c
    M /trunk/epan/dissectors/packet-gsm_map.c
    M /trunk/epan/dissectors/packet-nat-pmp.c
    M /trunk/epan/dissectors/packet-ptp.c
    M /trunk/epan/dissectors/packet-smrse.c
 
 s/col_add_fstr/col_add_str
 ------------------------------------------------------------------------
 r29813 | gerald | 2009-09-08 17:18:15 -0700 (Tue, 08 Sep 2009) | 4 lines
 Changed paths:
    M /trunk/plugins/opcua/opcua.c
    M /trunk/plugins/opcua/opcua_simpletypes.c
    M /trunk/plugins/opcua/opcua_transport_layer.c
 
 Check our array lengths and refuse to process them if they're too large.
 Fixes bug 3986. Use tvb_memeql and proto_tree_add_item instead of
 digging around in tvb->real_data.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.2/asn1/camel/
  Changes    Path                       Action
  +1 -1      packet-camel-template.c    Modified

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path                         Action
  +123 -123  packet-camel.c               Modified
  +1 -2      packet-catapult-dct2000.c    Modified
  +39 -39    packet-cmp.c                 Modified
  +1 -1      packet-dhcpv6.c              Modified
  +1 -1      packet-dlm3.c                Modified
  +528 -528  packet-gsm_map.c             Modified
  +2 -2      packet-ieee802154.c          Modified
  +1 -1      packet-mtp2.c                Modified
  +1 -1      packet-nat-pmp.c             Modified
  +2 -2      packet-ptp.c                 Modified


(16 files not shown)