[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/05/04 12:13 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r30191 | stig | 2009-09-29 03:01:06 -0700 (Tue, 29 Sep 2009) | 2 lines
 Changed paths:
    M /trunk/epan/ex-opt.h
 
 Corrected prototype for ex_opt_get_nth().
 ------------------------------------------------------------------------
 r32433 | morriss | 2010-04-08 18:42:12 -0700 (Thu, 08 Apr 2010) | 5 lines
 Changed paths:
    M /trunk/configure.in
    M /trunk/epan/dissectors/packet-http.c
 
 Use a 64-bit number to store the content length.  This fixes:
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1958
 
 Of course this doesn't mean we can reassemble that much data.
 ------------------------------------------------------------------------
 r32434 | guy | 2010-04-08 19:00:07 -0700 (Thu, 08 Apr 2010) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-http.c
 
 Squelch compiler warnings.  (We know that header.content_length is less
 than a value that fits into an int, so we know its value will fit into
 an int.)
 ------------------------------------------------------------------------
 r32456 | sake | 2010-04-13 12:37:44 -0700 (Tue, 13 Apr 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ssl.c
 
 Fix for bug 4535: The SSL dissector can not correctly resemple SSL records when the record header is spit between packets
 ------------------------------------------------------------------------
 r32465 | morriss | 2010-04-14 11:39:00 -0700 (Wed, 14 Apr 2010) | 6 lines
 Changed paths:
    M /trunk/plugins/mate/mate.h
    M /trunk/plugins/mate/mate_grammar.lemon
    M /trunk/plugins/mate/mate_setup.c
 
 Be sure we initialize the p_id in hf's.  This fixes
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3010 .
 
 Also finish the implementation of ShowTimes for GOGs so that the variable gets
 initialized (preventing another uninitialized variable warning from Valgrind).
 ------------------------------------------------------------------------
 r32481 | jake | 2010-04-15 14:12:34 -0700 (Thu, 15 Apr 2010) | 7 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ntp.c
 
 From Dave Higton:
 When decoding NTP where the Reference Clock ID is "MSF/0", Wireshark textifies
 this as "Rugby (UK) Radio 60 kHz".  The MSF transmitter was moved several years
 ago from Rugby to Anthorn.
 
 Also updates from RFC 4330.
 ------------------------------------------------------------------------
 r32500 | morriss | 2010-04-16 15:48:33 -0700 (Fri, 16 Apr 2010) | 9 lines
 Changed paths:
    M /trunk/gtk/main_packet_list.c
    M /trunk/gtk/main_packet_list.h
    M /trunk/gtk/prefs_dlg.c
 
 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3387 (crash
 when changing the font and deleting a column at the same time while using
 the old packet list):
 
 Don't calculate the default column widths until after both the font and column
 preferences have been applied.
 
 This isn't a problem in the new packet list.
 ------------------------------------------------------------------------
 r32548 | morriss | 2010-04-23 19:04:14 -0700 (Fri, 23 Apr 2010) | 1 line
 Changed paths:
    M /trunk/version_info.c
 
 Tell, in the version info, if we were compiled 32- or 64-bit.
 ------------------------------------------------------------------------
 r32582 | etxrab | 2010-04-27 21:54:25 -0700 (Tue, 27 Apr 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-evrc.c
 
 From Michael Lum:
 EVRC packet bundling not handled correctly.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4718
 ------------------------------------------------------------------------
 r32585 | jake | 2010-04-28 01:19:39 -0700 (Wed, 28 Apr 2010) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-tcp.c
 
 From jmmikkel:
 Set the sequence number for the next PDU if the current frame contains both the finish of the previous and the complete next one.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 ------------------------------------------------------------------------
 r32499 | wmeier | 2010-04-16 12:27:56 -0700 (Fri, 16 Apr 2010) | 3 lines
 Changed paths:
    M /trunk/AUTHORS
    M /trunk/epan/dissectors/packet-ptp.c
 
 From Marcus Renz: Fix for "PTP dissector displays big correction field values wrong"
 See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4635
 ------------------------------------------------------------------------
 r32517 | jake | 2010-04-19 11:48:12 -0700 (Mon, 19 Apr 2010) | 4 lines
 Changed paths:
    M /trunk/epan/wslua/wslua_proto.c
 
 Fix for bug 4695:
 Modify ProtoField_tostring() to ProtoField__tostring() 
 and clean up description.
 ------------------------------------------------------------------------
 r32603 | morriss | 2010-04-29 12:30:54 -0700 (Thu, 29 Apr 2010) | 6 lines
 Changed paths:
    M /trunk/gtk/main.c
 
 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4308 :
 
 Make a function that checks if the user is running as root or if npf.sys isn't
 loaded (on Windows) and call it *after* showing the main window so that the
 popup (if any) shows up above the main window.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path             Action
  +2 -2      packet-evrc.c    Modified
  +13 -5     packet-http.c    Modified
  +4 -2      packet-ntp.c     Modified
  +4 -17     packet-ptp.c     Modified
  +5 -1      packet-ssl.c     Modified
  +8 -0      packet-tcp.c     Modified

Directory: /trunk-1.2/docbook/
  Changes    Path                 Action
  +62 -0     release-notes.xml    Modified

Directory: /trunk-1.2/epan/
  Changes    Path          Action
  +1 -1      ex-opt.h      Modified

Directory: /trunk-1.2/gtk/
  Changes    Path                  Action
  +46 -26    main.c                Modified
  +10 -3     main_packet_list.c    Modified
  +3 -0      main_packet_list.h    Modified


(8 files not shown)