[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2012/01/05 10:39 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r39878 | guy | 2011-11-15 19:13:02 -0800 (Tue, 15 Nov 2011) | 3 lines
   Changed paths:
      M /trunk/capinfos.c
      M /trunk/gtk/summary_dlg.c
 
   Handle ctime() and localtime() returning NULL and localtime() on Windows
   blowing up when handed a bad value.
   ------------------------------------------------------------------------
   r39882 | guy | 2011-11-16 08:48:02 -0800 (Wed, 16 Nov 2011) | 3 lines
   Changed paths:
      M /trunk/wiretap/k12text.l
 
   Another place where we have to protect against MSVC's time-conversion
   routines blowing up if handed a too-large time_t.
   ------------------------------------------------------------------------
   r39883 | guy | 2011-11-16 09:08:00 -0800 (Wed, 16 Nov 2011) | 6 lines
   Changed paths:
      M /trunk/wiretap/ngsniffer.c
 
   Another place where we have to protect against MSVC's time-conversion
   routines blowing up if handed a too-large time_t.
 
   While we're at it, also check for dates that can't be represented in DOS
   format (pre-1980 dates).
   ------------------------------------------------------------------------
   r39884 | guy | 2011-11-16 09:12:47 -0800 (Wed, 16 Nov 2011) | 2 lines
   Changed paths:
      M /trunk/wiretap/k12text.l
 
   Fix build on Windows.
   ------------------------------------------------------------------------
   r39885 | guy | 2011-11-16 09:13:37 -0800 (Wed, 16 Nov 2011) | 2 lines
   Changed paths:
      M /trunk/wiretap/k12text.l
 
   OK, this should do it.
   ------------------------------------------------------------------------
   r39894 | cmaynard | 2011-11-16 18:17:57 -0800 (Wed, 16 Nov 2011) | 2 lines
   Changed paths:
      M /trunk/wiretap/ngsniffer.c
 
   Revert part of r39883 to avoid dereferencing a NULL pointer.  Thanks Clang.
   ------------------------------------------------------------------------
   r39886 | guy | 2011-11-16 09:54:44 -0800 (Wed, 16 Nov 2011) | 15 lines
   Changed paths:
      M /trunk/wiretap/netmon.c
 
   Support nanosecond-resolution time for NetMon 2.x format (it's only
   100-nanosecond resolution, but that's still better than microsecond
   resolution).
 
   For NetMon 1.x format, only claim to support millisecond resolution, as
   that's all you get.
 
   Fix handling of negative time deltas in NetMon 2.x format.
 
   When writing a NetMon file, trim the time of the first packet to
   millisecond precision to get the capture start time, so that the start
   time written to the file (which has millisecond precision) is the same
   as the start time used to calculate the deltas written to the packet
   headers.
   ------------------------------------------------------------------------
   r39930 | guy | 2011-11-17 23:13:33 -0800 (Thu, 17 Nov 2011) | 4 lines
   Changed paths:
      M /trunk/wiretap/pcapng.c
 
   Make sure pcap-ng supports a particular encapsulation type before
   trying to write out an interface description block for an interface with
   that type.
   ------------------------------------------------------------------------
   r39944 | guy | 2011-11-18 13:39:18 -0800 (Fri, 18 Nov 2011) | 3 lines
   Changed paths:
      M /trunk/wiretap/k12text.l
 
   Fail if somebody tries to write out a packet with an unsupported
   encapsulation.
   ------------------------------------------------------------------------
   r39959 | cmaynard | 2011-11-20 07:11:15 -0800 (Sun, 20 Nov 2011) | 2 lines
   Changed paths:
      M /trunk/file.c
 
   Fix "'Closing File!' Dialog Hangs" bug 3046: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3046
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +19 -1     release-notes.xml    Modified

Directory: /trunk-1.6/gtk/
  Changes    Path             Action
  +30 -22    summary_dlg.c    Modified

Directory: /trunk-1.6/
  Changes    Path          Action
  +30 -31    capinfos.c    Modified
  +1 -2      file.c        Modified

Directory: /trunk-1.6/wiretap/
  Changes    Path           Action
  +24 -7     k12text.l      Modified
  +125 -41   netmon.c       Modified
  +8 -0      ngsniffer.c    Modified
  +17 -1     pcapng.c       Modified