[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2008/06/17 10:10 AM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r25014 | jake | 2008-04-13 23:43:42 -0700 (Sun, 13 Apr 2008) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-diameter_3gpp.c
 
 From Jim Young:
 Within the packet-diameter_3gpp.c module, the call to proto_register_protocol()
 comes AFTER the proto_register_field_array() call. 
 While the delayed call to proto_register_protocol() does not appear to impair the use 
 of the display filters, it DOES effect the generation of the wireshark-filter man page.
 ------------------------------------------------------------------------
 r25015 | jake | 2008-04-14 00:16:37 -0700 (Mon, 14 Apr 2008) | 2 lines
 Changed paths:
    M /trunk/manuf
    M /trunk/wka.tmpl
 
 Fix for bug 2456:
 IPv6 multicast MAC address incorrectly resolved to neighborhood discovery.
 ------------------------------------------------------------------------
 r25039 | stig | 2008-04-14 23:57:56 -0700 (Mon, 14 Apr 2008) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-pana.c
 
 Call DISSECTOR_ASSERT instead of g_assert in dissector code.
 
 This fixes bug 2464.
 
 ------------------------------------------------------------------------
 r25068 | guy | 2008-04-16 00:18:08 -0700 (Wed, 16 Apr 2008) | 14 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-pana.c
 
 The right length to use when scanning all the data in a packet is the
 *reported* length, so that if the packet was cut short by a snapshot
 length, we get an exception because we run past the end, and the packet
 is marked as having been cut short.
 
 Do not use DISSECTOR_ASSERT() to check for the validity of packet data;
 dissectors should try to handle even malformed packets, they shouldn't
 report malformed packets as dissector bugs (if DISSECTOR_ASSERT(), that
 is *ipso facto* evidence of a dissector bug, *even if the packet is
 malformed*).
 
 Update the offset when scanning the packet even if we *aren't* building
 the protocol tree.
 
 ------------------------------------------------------------------------
 r25040 | stig | 2008-04-14 23:58:37 -0700 (Mon, 14 Apr 2008) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-kismet.c
 
 Call DISSECTOR_ASSERT instead of g_assert in dissector code.
 
 ------------------------------------------------------------------------
 r25069 | guy | 2008-04-16 00:23:56 -0700 (Wed, 16 Apr 2008) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-kismet.c
 
 tvb_get_ephemeral_string() is defined never to return null (currently,
 it aborts - even if we don't make it abort, we should make it throw an
 assertion, so we abort the dissection of the packet and let the user
 know that we ran out of memory).
 
 ------------------------------------------------------------------------
 r25055 | sake | 2008-04-15 14:12:38 -0700 (Tue, 15 Apr 2008) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-rpc.c
 
 From Didier (bug 1392):
 
 Add port to conversation key so that RPC reassembly works when relative
 sequence numbers are used.
 
 ------------------------------------------------------------------------
 r25058 | sake | 2008-04-15 15:53:34 -0700 (Tue, 15 Apr 2008) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-rpc.c
 
 Fix for the "Malformed packet: RPC" that is encountered in bug 1392:
 
 Don't call a RPC subdissector if there is no more data in the packet.
 
 ------------------------------------------------------------------------
 r25118 | jake | 2008-04-19 03:41:45 -0700 (Sat, 19 Apr 2008) | 2 lines
 Changed paths:
    M /trunk/plugins/unistim/packet-unistim.c
 
 Fix for bug 2475:
 Add a preference to the UNISTIM dissector so that you can set the default port back to 5000, even though this conflicts with other dissectors.
 ------------------------------------------------------------------------
 r25134 | etxrab | 2008-04-21 11:23:23 -0700 (Mon, 21 Apr 2008) | 3 lines
 Changed paths:
    M /trunk/epan/oids.c
 
 TimeStamp are derived from timeticks_type (See SNMPv2-TC).
 Fixes Bug:
 http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2442
 ------------------------------------------------------------------------
 r25135 | etxrab | 2008-04-21 11:38:01 -0700 (Mon, 21 Apr 2008) | 5 lines
 Changed paths:
    M /trunk/epan/oids.c
 
 TimeTicks ::= [APPLICATION 3] IMPLICIT INTEGER (0..4294967295)
   If the BER encoding should not have the top bit set as to not become a negative number
   the ber encoding may take 5 octets to encode.
 Fixes BUG:
 http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2253
 ------------------------------------------------------------------------
 r25137 | stig | 2008-04-21 13:25:50 -0700 (Mon, 21 Apr 2008) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-tpncp.c
 
 Add "tpncp." before all filter names so we don't crash with others.
 
 This fixes solution 1 from bug 2402.
 
 ------------------------------------------------------------------------
 r25146 | jake | 2008-04-21 23:36:15 -0700 (Mon, 21 Apr 2008) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-mikey.c
 
 Fix for bug 2481:
 Remove debug code
 ------------------------------------------------------------------------
 r25148 | etxrab | 2008-04-22 12:31:03 -0700 (Tue, 22 Apr 2008) | 16 lines
 Changed paths:
    M /trunk/epan/oids.c
 
 Fix Dissector bug, protocol SNMP: proto.c:932: failed assertion
 From LEGO:
 DISSECTOR_ASSERT_NOT_REACHED() is a Bug regardless, it is triggered because we
 are proto_add_item()ing an FT_UINT32 of 5 bytes in length.
 
 IF-MIB:ifInOctets is a Counter32 so the value should (and is) application
 encoded using tag 41.
 
 the value's value (!) is  H'00d49e69fa (D'3567151610).
 
 the assertion is triggered because there's an error in oids.c:59 
 where states the ft_type as being an FT_UINT32 with a length of 1 to 4 bytes,
 It should be FT_UINT64 and the length from 1 to 5 bytes considering that
 integers bigger than 2^31 will be ber encoded in 5 bytes.
 
 http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2468
 ------------------------------------------------------------------------
 r25150 | jake | 2008-04-22 23:51:15 -0700 (Tue, 22 Apr 2008) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-rtp.c
 
 From Peter Fuller:
 If a UDP packet is submitted to the RTP heuristic dissector with either odd src
 or dst ports, the heuristic will correctly return FALSE.  However, that
 interferes with the next few lines of code that can potentially treat version 0
 RTP packets as either STUN or T38 depending on preference settings.
 ------------------------------------------------------------------------
 r25168 | stig | 2008-04-24 14:51:14 -0700 (Thu, 24 Apr 2008) | 3 lines
 Changed paths:
    M /trunk/plugins/wimax/msg_reg_rsp.c
 
 From Mohan (bug 2501):
 Add a missing break statement.
 
 ------------------------------------------------------------------------
 r25170 | etxrab | 2008-04-24 23:42:37 -0700 (Thu, 24 Apr 2008) | 1 line
 Changed paths:
    M /trunk/config.h.win32
 
 Flex (v 2.5.35) uses this symbol to "exclude" unistd.h
 ------------------------------------------------------------------------
 r25172 | wmeier | 2008-04-25 10:24:29 -0700 (Fri, 25 Apr 2008) | 5 lines
 Changed paths:
    M /trunk/tools/lemon/lemonflex-tail.inc
 
 Bug 2493: Fix (Part 1): 
 -TEXT_FUNC (const char *text) --> -TEXT_FUNC (char *text)
 To prevent Windows compiler error when using flex 2.5.35.
 (This also compiles OK for *NIX flex and for windows flex 2.5.4) 
 
 ------------------------------------------------------------------------
 r25173 | wmeier | 2008-04-25 10:40:29 -0700 (Fri, 25 Apr 2008) | 5 lines
 Changed paths:
    M /trunk/epan/dfilter/scanner.l
    M /trunk/epan/diam_dict.l
    M /trunk/epan/dtd_parse.l
    M /trunk/epan/dtd_preparse.l
    M /trunk/epan/radius_dict.l
    M /trunk/epan/uat_load.l
    M /trunk/plugins/mate/mate_parser.l
    M /trunk/plugins/wimaxasncp/wimaxasncp_dict.l
    M /trunk/text2pcap-scanner.l
    M /trunk/wiretap/ascend-scanner.l
    M /trunk/wiretap/k12text.l
 
  Bug 2493: Fix (Part 2): 
  To prevent Windows compiler errors when using flex 2.5.35.
  Fixes "missing unistd.h" and yywrap "mismatched parameter" warnings
  [Upcoming Part 3: ignore 'signed /unsigned mismatch' errors]
 
 ------------------------------------------------------------------------
 r25174 | wmeier | 2008-04-25 11:26:54 -0700 (Fri, 25 Apr 2008) | 5 lines
 Changed paths:
    M /trunk/epan/dfilter/scanner.l
    M /trunk/epan/dtd_preparse.l
    M /trunk/epan/radius_dict.l
    M /trunk/epan/uat_load.l
    M /trunk/plugins/mate/mate_parser.l
    M /trunk/text2pcap-scanner.l
 
  Bug 2493: Fix (Part 3 of 3): 
   To prevent Windows compiler errors when using flex 2.5.35.
   Ignore 'signed /unsigned mismatch' warnings
 
 ------------------------------------------------------------------------
 r25184 | jake | 2008-04-27 04:10:57 -0700 (Sun, 27 Apr 2008) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-rtp.c
 
 From Alon Tal:
 RTP header extensions that are longer than 4 bytes (rtp.ext.len > 1)
 get dissected incorrectly. The first 4 bytes of the header extension are
 repeated rtp.ext.len times, and the remaining bytes are ignored.
 ------------------------------------------------------------------------
 
 Update the release notes.

Directory: /trunk-1.0/epan/dfilter/
  Changes    Path          Action
  +6 -5      scanner.l     Modified

Directory: /trunk-1.0/epan/dissectors/
  Changes    Path                      Action
  +1 -2      packet-diameter_3gpp.c    Modified
  +0 -1      packet-kismet.c           Modified
  +0 -3      packet-mikey.c            Modified
  +50 -26    packet-pana.c             Modified
  +20 -8     packet-rpc.c              Modified
  +9 -6      packet-rtp.c              Modified
  +1 -1      packet-tpncp.c            Modified

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

Directory: /trunk-1.0/epan/
  Changes    Path              Action
  +11 -10    diam_dict.l       Modified
  +18 -5     dtd_parse.l       Modified


(15 files not shown)