[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/06/06 09:39 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37479 | cmaynard | 2011-05-31 08:27:48 -0700 (Tue, 31 May 2011) | 2 lines
   Changed paths:
      M /trunk/wiretap/wtap-int.h
      M /trunk/wiretap/wtap.c
      M /trunk/wiretap/wtap.h
 
   Declare the snapshot_length as unsigned.
   ------------------------------------------------------------------------
   r37480 | cmaynard | 2011-05-31 08:31:34 -0700 (Tue, 31 May 2011) | 4 lines
   Changed paths:
      M /trunk/editcap.c
 
   When a snaplen is specified using "-s <snaplen", if it's smaller than the
   original capture file's snaplen, save the new snaplen in the capture file
   header so wireshark and capinfos can report it.
   ------------------------------------------------------------------------
   r37524 | cmaynard | 2011-06-02 10:12:13 -0700 (Thu, 02 Jun 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dtls.c
 
   From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5983:
   Use offset instead of fragment_offset for boundary check.
   ------------------------------------------------------------------------
   r37530 | alagoutte | 2011-06-02 23:47:23 -0700 (Thu, 02 Jun 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
   Fix a minor typo about bitmask of a reserved field.
   ------------------------------------------------------------------------
   r37538 | rbalint | 2011-06-04 07:23:49 -0700 (Sat, 04 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/epan/Makefile.am
 
   Dump ABI using all header files related to libwireshark
   ------------------------------------------------------------------------
   r37540 | rbalint | 2011-06-04 09:44:37 -0700 (Sat, 04 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/epan/Makefile.am
      M /trunk/wiretap/Makefile.am
      M /trunk/wsutil/Makefile.am
 
   Reorganize dumpabi targets to keep temporary files
   ------------------------------------------------------------------------
   r37543 | rbalint | 2011-06-04 14:20:57 -0700 (Sat, 04 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/wiretap/5views.h
      M /trunk/wiretap/airopeek9.h
      M /trunk/wiretap/ascend-int.h
      M /trunk/wiretap/ascendtext.h
      M /trunk/wiretap/atm.h
      M /trunk/wiretap/ber.h
      M /trunk/wiretap/btsnoop.h
      M /trunk/wiretap/buffer.h
      M /trunk/wiretap/catapult_dct2000.h
      M /trunk/wiretap/commview.h
      M /trunk/wiretap/cosine.h
      M /trunk/wiretap/csids.h
      M /trunk/wiretap/daintree-sna.h
      M /trunk/wiretap/dbs-etherwatch.h
      M /trunk/wiretap/dct3trace.h
      M /trunk/wiretap/erf.h
      M /trunk/wiretap/etherpeek.h
      M /trunk/wiretap/eyesdn.h
      M /trunk/wiretap/file_wrappers.h
      M /trunk/wiretap/hcidump.h
      M /trunk/wiretap/i4b_trace.h
      M /trunk/wiretap/i4btrace.h
      M /trunk/wiretap/ipfix.h
      M /trunk/wiretap/iptrace.h
      M /trunk/wiretap/iseries.h
      M /trunk/wiretap/jpeg_jfif.h
      M /trunk/wiretap/k12.h
      M /trunk/wiretap/lanalyzer.h
      M /trunk/wiretap/libpcap.h
      M /trunk/wiretap/mpeg.h
      M /trunk/wiretap/netmon.h
      M /trunk/wiretap/netscaler.h
      M /trunk/wiretap/netscreen.h
      M /trunk/wiretap/nettl.h
      M /trunk/wiretap/network_instruments.h
      M /trunk/wiretap/netxray.h
      M /trunk/wiretap/ngsniffer.h
      M /trunk/wiretap/packetlogger.h
      M /trunk/wiretap/pcap-common.h
      M /trunk/wiretap/pcap-encap.h
      M /trunk/wiretap/pcapng.h
      M /trunk/wiretap/pppdump.h
      M /trunk/wiretap/radcom.h
      M /trunk/wiretap/snoop.h
      M /trunk/wiretap/tnef.h
      M /trunk/wiretap/toshiba.h
      M /trunk/wiretap/visual.h
      M /trunk/wiretap/vms.h
      M /trunk/wiretap/wtap-int.h
      M /trunk/wiretap/wtap.h
 
   Fix wiretap headers to allow error-free ABI dumping.
   ------------------------------------------------------------------------
   r37544 | rbalint | 2011-06-04 14:29:13 -0700 (Sat, 04 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/Makefile.am.inc
 
   Use more include dirs for ABI dumping to make preprocessor happier.
   ------------------------------------------------------------------------
   r37550 | etxrab | 2011-06-05 09:33:00 -0700 (Sun, 05 Jun 2011) | 3 lines
   Changed paths:
      M /trunk/gtk/rtp_stream_dlg.c
 
   wrong sort of column “Packets” in “RTP Streams” window.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5988
   ------------------------------------------------------------------------
   r37554 | darkjames | 2011-06-05 12:35:36 -0700 (Sun, 05 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/gtk/rtp_stream_dlg.c
 
   Fix memleaks and sigsegv when coping to clipboard RTP Streams.
   ------------------------------------------------------------------------
   r37558 | etxrab | 2011-06-05 13:12:44 -0700 (Sun, 05 Jun 2011) | 10 lines
   Changed paths:
      M /trunk/asn1/snmp/packet-snmp-template.c
      M /trunk/epan/dissectors/packet-snmp.c
 
   From Sean Van Gorder:
   When Wireshark attempts to read an SNMP packet with a variable-bindings item
   with an OID containing an index string which includes an entry of type
   "Unsigned32", Wireshark will stop dissecting the packet at this index entry and
   end with the error:
 
   [Dissector bug, protocol SNMP: proto.c:2761: failed assertion
   "DISSECTOR_ASSERT_NOT_REACHED"]
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5883
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r37525 | cmaynard | 2011-06-02 10:19:38 -0700 (Thu, 02 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/AUTHORS
 
   Add Michael Chen for his contributions to DTLS.
   ------------------------------------------------------------------------
 
 
 Update the wiretap DLL version.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +1 -1      packet-dtls.c         Modified
  +1 -1      packet-ieee80211.c    Modified
  +1 -1      packet-snmp.c         Modified

Directory: /trunk-1.6/epan/
  Changes    Path           Action
  +9 -3      Makefile.am    Modified

Directory: /trunk-1.6/gtk/
  Changes    Path                Action
  +16 -9     rtp_stream_dlg.c    Modified

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

Directory: /trunk-1.6/
  Changes    Path               Action
  +1 -0      AUTHORS            Modified
  +1 -1      Makefile.am.inc    Modified
  +3 -3      config.nmake       Modified
  +25 -19    editcap.c          Modified


(53 files not shown)