[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/11/16 09:43 AM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r34762 | jake | 2010-11-03 10:57:22 -0700 (Wed, 03 Nov 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-agentx.c
 
 From Fulko Hew:
 The hex field highlighting when the 'PDU Header' sub-tree is selected
 highlights 5 octets rather than the correct 4 (only) octets.
 ------------------------------------------------------------------------
 r34765 | jake | 2010-11-03 13:44:46 -0700 (Wed, 03 Nov 2010) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-agentx.c
 
 From Fulko Hew:
 According to RFC 2741 section 6.2.1 the Open-PDU can have an o.id
 field containing a 'null' identifier.  The dissector currently does
 not handle it and causes other (misleading) error messages to appear
 on the decode window.
 ------------------------------------------------------------------------
 r34779 | jake | 2010-11-04 13:53:02 -0700 (Thu, 04 Nov 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sip.c
 
 Prevent false related packet information, which may be missing or ignored.
 ------------------------------------------------------------------------
 r34783 | etxrab | 2010-11-05 00:14:21 -0700 (Fri, 05 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/wiretap/network_instruments.c
 
 From Robert Bullen:
 Network Instruments' trace files sometimes cannot be read with an error message of "Observer: bad record: Invalid magic number"
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5330
 ------------------------------------------------------------------------
 r34791 | etxrab | 2010-11-05 08:01:05 -0700 (Fri, 05 Nov 2010) | 2 lines
 Changed paths:
    M /trunk/tshark.c
 
 Bug fix: Running tshark with the following command will leave a temp file on the file system.
 \tshark -f "port 53" -a duration:1 -z proto,col info,dns.qry.type,dns.qry.type
 ------------------------------------------------------------------------
 r34796 | etxrab | 2010-11-06 08:25:34 -0700 (Sat, 06 Nov 2010) | 3 lines
 Changed paths:
    M /trunk/gtk/main_proto_draw.c
 
 From Alexander Koeppe:
 Patch that fixes overflowing highlighting of data.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5374
 ------------------------------------------------------------------------
 r34821 | stig | 2010-11-09 04:31:50 -0800 (Tue, 09 Nov 2010) | 5 lines
 Changed paths:
    M /trunk/gtk/main_proto_draw.c
 
 Added check for valid finfo->ds_tvb in packet_hex_print(), as we do not
 always have finfo->ds_tvb.
 
 This bug was introdused in revision 34796.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
 ------------------------------------------------------------------------
 r34759 | cmaynard | 2010-11-03 07:45:17 -0700 (Wed, 03 Nov 2010) | 4 lines
 Changed paths:
    M /trunk/gtk/file_dlg_win32.c
 
 Use g_utf16_toutf8() instead of utf_16to8() to avoid the last display filter
 applied from being overwritten.  Fixes bug 3894.  Also, combined the open and
 merge filters into one, so we have a single most recently used filter.
 ------------------------------------------------------------------------
 r34785 | stig | 2010-11-05 01:10:40 -0700 (Fri, 05 Nov 2010) | 5 lines
 Changed paths:
    M /trunk/gtk/dfilter_expr_dlg.c
 
 Corrected an if-statement in field_select_row_cb() where checking for
 hfinfo->strings and hfinfo->display.
 
 This bug was found by clang.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path               Action
  +2 -3      packet-agentx.c    Modified
  +1 -1      packet-sip.c       Modified

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

Directory: /trunk-1.4/gtk/
  Changes    Path                  Action
  +1 -1      dfilter_expr_dlg.c    Modified
  +15 -12    file_dlg_win32.c      Modified
  +2 -0      main_proto_draw.c     Modified

Directory: /trunk-1.4/
  Changes    Path          Action
  +4 -1      tshark.c      Modified

Directory: /trunk-1.4/wiretap/
  Changes    Path                     Action
  +60 -39    network_instruments.c    Modified