]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
pidl:Wireshark Rename tvb_new_subset()
authorJohn Thacker <johnthacker@gmail.com>
Tue, 25 Jun 2024 22:38:43 +0000 (18:38 -0400)
committerDouglas Bagnall <dbagnall@samba.org>
Wed, 3 Jul 2024 01:35:31 +0000 (01:35 +0000)
Picked from Wireshark's fork:

    commit 7cd6906056922e4b8f68f1216d94eaa0809896fe
    Author: Guy Harris <guy@alum.mit.edu>
    Date:   Mon Jan 9 22:18:49 2017 -0800

        Rename tvb_new_subset() to tvb_new_subset_length_caplen().

        This emphasizes that there is no such thing as *the* routine to
        construct a subset tvbuff; you need to choose one of
        tvb_new_subset_remaining() (if you want a new tvbuff that contains
        everything past a certain point in an existing tvbuff),
        tvb_new_subset_length() (if you want a subset that contains everything
        past a certain point, for some number of bytes, in an existing tvbuff),
        and tvb_new_subset_length_caplen() (for all other cases).

        Many of the calls to tvb_new_subset_length_caplen() should really be
        calling one of the other routines; that's the next step.  (This also
        makes it easier to find the calls that need fixing.)

        Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b
        Reviewed-on: https://code.wireshark.org/review/19597
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Signed-off-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
pidl/lib/Parse/Pidl/Wireshark/NDR.pm

index 760dd1539f8be174ce31f14087bb8f907a8c7f4f..f5484ca734db42902c9c71c7ce3b0e8655aeb582 100644 (file)
@@ -421,7 +421,7 @@ sub ElementLevel($$$$$$$$)
                # continue to dissect handmarshalled stuff with pidl
                $self->pidl_code("di->call_data->flags &= ~DCERPC_IS_NDR64;");
 
-               $self->pidl_code("subtvb = tvb_new_subset(tvb, offset, (const gint)size, -1);");
+               $self->pidl_code("subtvb = tvb_new_subset_length_caplen(tvb, offset, (const gint)size, -1);");
                if ($param ne 0) {
                        $self->pidl_code("$myname\_(subtvb, 0, pinfo, tree, di, drep, $param);");
                } else {