[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/11/15 02:43 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r34661 | stig | 2010-10-27 02:45:31 -0500 (Wed, 27 Oct 2010) | 4 lines
 Changed paths:
    M /trunk/gtk/io_stat.c
 
 Calculate correct io->start_time.
 
 This fixes bug 5340.
 ------------------------------------------------------------------------
 r34665 | etxrab | 2010-10-28 09:33:55 -0500 (Thu, 28 Oct 2010) | 3 lines
 Changed paths:
    M /trunk/wiretap/erf.c
 
 From Stephen Donnelly:
 Wireshark tools do not detect and read some ERF files correctly
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5344
 ------------------------------------------------------------------------
 r34709 | stig | 2010-10-30 06:43:11 -0500 (Sat, 30 Oct 2010) | 3 lines
 Changed paths:
    M /trunk/gtk/uat_gui.c
 
 Redissect packets instead of reload file on UAT changes.
 This way we can do changes while capturing.
 ------------------------------------------------------------------------
 r34742 | morriss | 2010-11-01 09:33:14 -0500 (Mon, 01 Nov 2010) | 12 lines
 Changed paths:
    M /trunk/editcap.c
 
 From Jose Pedro Oliveira via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5353 :
 
 editcap -h sends 9 lines to stderr and the rest to stdout.  This problem
 affects editcap 1.4.x (branch 1.4) and devel (trunk).
 
 How to duplicate:
  1) run "editcap -h"
  2) run "editcap -h > /dev/null"
 
 The attached patch replaces 9 ocurrences of "stderr" by "output" in the usage
 function.
 ------------------------------------------------------------------------
 r34750 | jake | 2010-11-02 03:48:06 -0500 (Tue, 02 Nov 2010) | 8 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ip.c
 
 From Simon Leinen:
 The IP Timestamp Option (RFC 781) has three variants.  One (flag=0) just stores
 a sequence timestamps in the option, but the other two (flag=1 and flag=3)
 store alternate IP addresses and timestamps.
 
 From me:
 Mark option full when offset (pointer) is set to one, as per RFC 781.
 ------------------------------------------------------------------------
 r34755 | cmaynard | 2010-11-02 13:43:26 -0500 (Tue, 02 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-nbns.c
 
 Removed call to proto_item_set_len() for SESSION_MESSAGE case.  Protect some
 other of these calls with "if (ti != NULL)".  Fixes bug 5289.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 ------------------------------------------------------------------------
 r34660 | stig | 2010-10-27 02:44:26 -0500 (Wed, 27 Oct 2010) | 2 lines
 Changed paths:
    M /trunk/epan/libwireshark.def
    M /trunk/epan/nstime.c
    M /trunk/epan/nstime.h
 
 Added two new functions: nstime_diff() and nstime_subtract().
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path             Action
  +4 -3      packet-ip.c      Modified
  +3 -1      packet-nbns.c    Modified

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

Directory: /trunk-1.4/epan/
  Changes    Path                Action
  +1 -0      libwireshark.def    Modified
  +18 -0     nstime.c            Modified
  +12 -0     nstime.h            Modified

Directory: /trunk-1.4/gtk/
  Changes    Path          Action
  +1 -1      io_stat.c     Modified
  +3 -6      uat_gui.c     Modified

Directory: /trunk-1.4/
  Changes    Path          Action
  +9 -9      editcap.c     Modified

Directory: /trunk-1.4/wiretap/
  Changes    Path          Action
  +7 -3      erf.c         Modified