2000-05-11 08:18:09 +00:00
|
|
|
/* tvbuff.c
|
|
|
|
*
|
|
|
|
* Testy, Virtual(-izable) Buffer of guint8*'s
|
2002-08-28 20:41:00 +00:00
|
|
|
*
|
2000-05-11 08:18:09 +00:00
|
|
|
* "Testy" -- the buffer gets mad when an attempt to access data
|
|
|
|
* beyond the bounds of the buffer. An exception is thrown.
|
|
|
|
*
|
|
|
|
* "Virtual" -- the buffer can have its own data, can use a subset of
|
|
|
|
* the data of a backing tvbuff, or can be a composite of
|
|
|
|
* other tvbuffs.
|
|
|
|
*
|
2004-07-18 00:24:25 +00:00
|
|
|
* $Id$
|
2000-05-11 08:18:09 +00:00
|
|
|
*
|
2001-11-13 23:55:44 +00:00
|
|
|
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
|
2000-05-11 08:18:09 +00:00
|
|
|
*
|
2002-04-24 21:19:38 +00:00
|
|
|
* Code to convert IEEE floating point formats to native floating point
|
|
|
|
* derived from code Copyright (c) Ashok Narayanan, 2000
|
|
|
|
*
|
2000-05-11 08:18:09 +00:00
|
|
|
* Ethereal - Network traffic analyzer
|
2001-05-27 21:34:05 +00:00
|
|
|
* By Gerald Combs <gerald@ethereal.com>
|
2000-05-11 08:18:09 +00:00
|
|
|
* Copyright 1998 Gerald Combs
|
2002-08-28 20:41:00 +00:00
|
|
|
*
|
2000-05-11 08:18:09 +00:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
2002-08-28 20:41:00 +00:00
|
|
|
*
|
2000-05-11 08:18:09 +00:00
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
2002-08-28 20:41:00 +00:00
|
|
|
*
|
2000-05-11 08:18:09 +00:00
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
2000-09-11 20:05:13 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
2004-05-05 06:55:09 +00:00
|
|
|
#ifdef HAVE_LIBZ
|
|
|
|
#include <zlib.h>
|
|
|
|
#endif
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
#include "pint.h"
|
|
|
|
#include "tvbuff.h"
|
2000-09-11 16:16:13 +00:00
|
|
|
#include "strutil.h"
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
ensure_contiguous_no_exception(tvbuff_t *tvb, gint offset, gint length,
|
|
|
|
int *exception);
|
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
2000-05-11 08:18:09 +00:00
|
|
|
ensure_contiguous(tvbuff_t *tvb, gint offset, gint length);
|
|
|
|
|
|
|
|
/* We dole out tvbuff's from this memchunk. */
|
|
|
|
GMemChunk *tvbuff_mem_chunk = NULL;
|
|
|
|
|
|
|
|
void
|
|
|
|
tvbuff_init(void)
|
|
|
|
{
|
|
|
|
if (!tvbuff_mem_chunk)
|
|
|
|
tvbuff_mem_chunk = g_mem_chunk_create(tvbuff_t, 20, G_ALLOC_AND_FREE);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
tvbuff_cleanup(void)
|
|
|
|
{
|
|
|
|
if (tvbuff_mem_chunk)
|
|
|
|
g_mem_chunk_destroy(tvbuff_mem_chunk);
|
|
|
|
|
|
|
|
tvbuff_mem_chunk = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
tvb_init(tvbuff_t *tvb, tvbuff_type type)
|
|
|
|
{
|
|
|
|
tvb_backing_t *backing;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
|
|
|
|
tvb->type = type;
|
|
|
|
tvb->initialized = FALSE;
|
|
|
|
tvb->usage_count = 1;
|
|
|
|
tvb->length = 0;
|
2000-05-16 04:44:14 +00:00
|
|
|
tvb->reported_length = 0;
|
2000-05-11 08:18:09 +00:00
|
|
|
tvb->free_cb = NULL;
|
|
|
|
tvb->real_data = NULL;
|
|
|
|
tvb->raw_offset = -1;
|
|
|
|
tvb->used_in = NULL;
|
2002-02-18 01:08:44 +00:00
|
|
|
tvb->ds_tvb = NULL;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
switch(type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
/* Nothing */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
backing = &tvb->tvbuffs.subset;
|
|
|
|
backing->tvb = NULL;
|
|
|
|
backing->offset = 0;
|
|
|
|
backing->length = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TVBUFF_COMPOSITE:
|
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
composite->tvbs = NULL;
|
|
|
|
composite->start_offsets = NULL;
|
|
|
|
composite->end_offsets = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tvbuff_t*
|
|
|
|
tvb_new(tvbuff_type type)
|
|
|
|
{
|
|
|
|
tvbuff_t *tvb;
|
|
|
|
|
|
|
|
tvb = g_chunk_new(tvbuff_t, tvbuff_mem_chunk);
|
|
|
|
g_assert(tvb);
|
|
|
|
|
|
|
|
tvb_init(tvb, type);
|
|
|
|
|
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
tvb_free(tvbuff_t* tvb)
|
|
|
|
{
|
|
|
|
tvbuff_t *member_tvb;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
GSList *slist;
|
|
|
|
|
|
|
|
tvb->usage_count--;
|
|
|
|
|
|
|
|
if (tvb->usage_count == 0) {
|
|
|
|
switch (tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
if (tvb->free_cb) {
|
2004-02-19 05:19:10 +00:00
|
|
|
/*
|
|
|
|
* XXX - do this with a union?
|
|
|
|
*/
|
|
|
|
tvb->free_cb((gpointer)tvb->real_data);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TVBUFF_SUBSET:
|
2000-09-14 16:04:28 +00:00
|
|
|
/* This will be NULL if tvb_new_subset() fails because
|
|
|
|
* reported_length < -1 */
|
|
|
|
if (tvb->tvbuffs.subset.tvb) {
|
|
|
|
tvb_decrement_usage_count(tvb->tvbuffs.subset.tvb, 1);
|
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case TVBUFF_COMPOSITE:
|
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
for (slist = composite->tvbs; slist != NULL ; slist = slist->next) {
|
|
|
|
member_tvb = slist->data;
|
|
|
|
tvb_decrement_usage_count(member_tvb, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_slist_free(composite->tvbs);
|
|
|
|
|
|
|
|
if (composite->start_offsets)
|
|
|
|
g_free(composite->start_offsets);
|
|
|
|
if (composite->end_offsets)
|
|
|
|
g_free(composite->end_offsets);
|
2004-02-19 05:19:10 +00:00
|
|
|
if (tvb->real_data) {
|
|
|
|
/*
|
|
|
|
* XXX - do this with a union?
|
|
|
|
*/
|
|
|
|
g_free((gpointer)tvb->real_data);
|
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tvb->used_in) {
|
|
|
|
g_slist_free(tvb->used_in);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_chunk_free(tvb, tvbuff_mem_chunk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
guint
|
|
|
|
tvb_increment_usage_count(tvbuff_t* tvb, guint count)
|
|
|
|
{
|
|
|
|
tvb->usage_count += count;
|
|
|
|
|
|
|
|
return tvb->usage_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint
|
|
|
|
tvb_decrement_usage_count(tvbuff_t* tvb, guint count)
|
|
|
|
{
|
|
|
|
if (tvb->usage_count <= count) {
|
|
|
|
tvb->usage_count = 1;
|
|
|
|
tvb_free(tvb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tvb->usage_count -= count;
|
|
|
|
return tvb->usage_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
tvb_free_chain(tvbuff_t* tvb)
|
|
|
|
{
|
|
|
|
GSList *slist;
|
|
|
|
|
|
|
|
/* Recursively call tvb_free_chain() */
|
|
|
|
for (slist = tvb->used_in; slist != NULL ; slist = slist->next) {
|
|
|
|
tvb_free_chain( (tvbuff_t*)slist->data );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Stop the recursion */
|
|
|
|
tvb_free(tvb);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
tvb_set_free_cb(tvbuff_t* tvb, tvbuff_free_cb_t func)
|
|
|
|
{
|
|
|
|
g_assert(tvb->type == TVBUFF_REAL_DATA);
|
|
|
|
tvb->free_cb = func;
|
|
|
|
}
|
|
|
|
|
2000-11-14 04:33:34 +00:00
|
|
|
static void
|
|
|
|
add_to_used_in_list(tvbuff_t *tvb, tvbuff_t *used_in)
|
|
|
|
{
|
|
|
|
tvb->used_in = g_slist_prepend(tvb->used_in, used_in);
|
|
|
|
tvb_increment_usage_count(tvb, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
tvb_set_child_real_data_tvbuff(tvbuff_t* parent, tvbuff_t* child)
|
|
|
|
{
|
|
|
|
g_assert(parent->initialized);
|
|
|
|
g_assert(child->initialized);
|
|
|
|
g_assert(child->type == TVBUFF_REAL_DATA);
|
|
|
|
add_to_used_in_list(parent, child);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
void
|
2000-05-16 04:44:14 +00:00
|
|
|
tvb_set_real_data(tvbuff_t* tvb, const guint8* data, guint length, gint reported_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
g_assert(tvb->type == TVBUFF_REAL_DATA);
|
|
|
|
g_assert(!tvb->initialized);
|
2000-09-13 20:17:23 +00:00
|
|
|
|
|
|
|
if (reported_length < -1) {
|
|
|
|
THROW(ReportedBoundsError);
|
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2004-02-01 06:49:25 +00:00
|
|
|
tvb->real_data = data;
|
2000-05-16 04:44:14 +00:00
|
|
|
tvb->length = length;
|
|
|
|
tvb->reported_length = reported_length;
|
|
|
|
tvb->initialized = TRUE;
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
tvbuff_t*
|
2002-02-18 01:08:44 +00:00
|
|
|
tvb_new_real_data(const guint8* data, guint length, gint reported_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2003-12-03 10:14:34 +00:00
|
|
|
static tvbuff_t *last_tvb=NULL;
|
2000-05-11 08:18:09 +00:00
|
|
|
tvbuff_t *tvb;
|
|
|
|
|
|
|
|
tvb = tvb_new(TVBUFF_REAL_DATA);
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2003-12-03 10:14:34 +00:00
|
|
|
if(last_tvb){
|
|
|
|
tvb_free(last_tvb);
|
|
|
|
}
|
|
|
|
/* remember this tvb in case we throw an exception and
|
|
|
|
* lose the pointer to it.
|
|
|
|
*/
|
|
|
|
last_tvb=tvb;
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2000-05-16 04:44:14 +00:00
|
|
|
tvb_set_real_data(tvb, data, length, reported_length);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2002-02-18 01:08:44 +00:00
|
|
|
/*
|
|
|
|
* This is the top-level real tvbuff for this data source,
|
|
|
|
* so its data source tvbuff is itself.
|
|
|
|
*/
|
|
|
|
tvb->ds_tvb = tvb;
|
2001-03-23 14:44:04 +00:00
|
|
|
|
2003-12-03 10:14:34 +00:00
|
|
|
/* ok no exception so we dont need to remember it any longer */
|
|
|
|
last_tvb=NULL;
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Computes the absolute offset and length based on a possibly-negative offset
|
|
|
|
* and a length that is possible -1 (which means "to the end of the data").
|
|
|
|
* Returns TRUE/FALSE indicating whether the offset is in bounds or
|
|
|
|
* not. The integer ptrs are modified with the new offset and length.
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
* No exception is thrown.
|
|
|
|
*
|
|
|
|
* XXX - we return TRUE, not FALSE, if the offset is positive and right
|
|
|
|
* after the end of the tvbuff (i.e., equal to the length). We do this
|
|
|
|
* so that a dissector constructing a subset tvbuff for the next protocol
|
|
|
|
* will get a zero-length tvbuff, not an exception, if there's no data
|
|
|
|
* left for the next protocol - we want the next protocol to be the one
|
|
|
|
* that gets an exception, so the error is reported as an error in that
|
|
|
|
* protocol rather than the containing protocol. */
|
2000-05-11 08:18:09 +00:00
|
|
|
static gboolean
|
|
|
|
compute_offset_length(tvbuff_t *tvb, gint offset, gint length,
|
2000-05-16 04:44:14 +00:00
|
|
|
guint *offset_ptr, guint *length_ptr, int *exception)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
g_assert(offset_ptr);
|
|
|
|
g_assert(length_ptr);
|
|
|
|
|
|
|
|
/* Compute the offset */
|
|
|
|
if (offset >= 0) {
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
/* Positive offset - relative to the beginning of the packet. */
|
2001-10-26 17:29:12 +00:00
|
|
|
if ((guint) offset > tvb->reported_length) {
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
if (exception) {
|
|
|
|
*exception = ReportedBoundsError;
|
|
|
|
}
|
|
|
|
return FALSE;
|
2000-05-16 04:44:14 +00:00
|
|
|
}
|
2001-10-26 17:29:12 +00:00
|
|
|
else if ((guint) offset > tvb->length) {
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
if (exception) {
|
|
|
|
*exception = BoundsError;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*offset_ptr = offset;
|
2000-05-16 04:44:14 +00:00
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
else {
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
/* Negative offset - relative to the end of the packet. */
|
2001-10-26 17:29:12 +00:00
|
|
|
if ((guint) -offset > tvb->reported_length) {
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
if (exception) {
|
|
|
|
*exception = ReportedBoundsError;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
2001-10-26 17:29:12 +00:00
|
|
|
else if ((guint) -offset > tvb->length) {
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
if (exception) {
|
|
|
|
*exception = BoundsError;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*offset_ptr = tvb->length + offset;
|
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute the length */
|
2002-01-04 06:45:14 +00:00
|
|
|
if (length < -1) {
|
2003-09-28 21:39:53 +00:00
|
|
|
if (exception) {
|
|
|
|
/* XXX - ReportedBoundsError? */
|
|
|
|
*exception = BoundsError;
|
|
|
|
}
|
2002-01-04 06:45:14 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else if (length == -1) {
|
2000-05-11 08:18:09 +00:00
|
|
|
*length_ptr = tvb->length - *offset_ptr;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*length_ptr = length;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
check_offset_length_no_exception(tvbuff_t *tvb, gint offset, gint length,
|
2000-05-16 04:44:14 +00:00
|
|
|
guint *offset_ptr, guint *length_ptr, int *exception)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2002-05-13 01:24:47 +00:00
|
|
|
guint end_offset;
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
g_assert(tvb->initialized);
|
|
|
|
|
2000-05-16 04:44:14 +00:00
|
|
|
if (!compute_offset_length(tvb, offset, length, offset_ptr, length_ptr, exception)) {
|
2000-05-11 08:18:09 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2002-05-13 01:24:47 +00:00
|
|
|
/*
|
|
|
|
* Compute the offset of the first byte past the length.
|
|
|
|
*/
|
|
|
|
end_offset = *offset_ptr + *length_ptr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check for an overflow, and clamp "end_offset" at the maximum
|
|
|
|
* if we got an overflow - that should force us to indicate that
|
|
|
|
* we're past the end of the tvbuff.
|
|
|
|
*/
|
|
|
|
if (end_offset < *offset_ptr)
|
|
|
|
end_offset = UINT_MAX;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check whether that offset goes more than one byte past the
|
|
|
|
* end of the buffer.
|
|
|
|
*
|
|
|
|
* If not, return TRUE; otherwise, return FALSE and, if "exception"
|
|
|
|
* is non-null, return the appropriate exception through it.
|
|
|
|
*/
|
|
|
|
if (end_offset <= tvb->length) {
|
2000-05-11 08:18:09 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
2002-05-13 01:24:47 +00:00
|
|
|
else if (end_offset <= tvb->reported_length) {
|
2000-05-16 04:44:14 +00:00
|
|
|
if (exception) {
|
|
|
|
*exception = BoundsError;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
else {
|
2000-05-16 04:44:14 +00:00
|
|
|
if (exception) {
|
|
|
|
*exception = ReportedBoundsError;
|
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
}
|
|
|
|
|
2002-05-13 01:24:47 +00:00
|
|
|
/* Checks (+/-) offset and length and throws an exception if
|
2000-05-11 08:18:09 +00:00
|
|
|
* either is out of bounds. Sets integer ptrs to the new offset
|
|
|
|
* and length. */
|
|
|
|
static void
|
|
|
|
check_offset_length(tvbuff_t *tvb, gint offset, gint length,
|
|
|
|
guint *offset_ptr, guint *length_ptr)
|
|
|
|
{
|
2000-05-16 04:44:14 +00:00
|
|
|
int exception = 0;
|
|
|
|
|
|
|
|
if (!check_offset_length_no_exception(tvb, offset, length, offset_ptr, length_ptr, &exception)) {
|
|
|
|
g_assert(exception > 0);
|
|
|
|
THROW(exception);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
tvb_set_subset(tvbuff_t *tvb, tvbuff_t *backing,
|
2000-05-16 04:44:14 +00:00
|
|
|
gint backing_offset, gint backing_length, gint reported_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
g_assert(tvb->type == TVBUFF_SUBSET);
|
|
|
|
g_assert(!tvb->initialized);
|
|
|
|
|
2000-09-13 20:17:23 +00:00
|
|
|
if (reported_length < -1) {
|
|
|
|
THROW(ReportedBoundsError);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
check_offset_length(backing, backing_offset, backing_length,
|
|
|
|
&tvb->tvbuffs.subset.offset,
|
|
|
|
&tvb->tvbuffs.subset.length);
|
|
|
|
|
2000-05-16 04:44:14 +00:00
|
|
|
tvb->tvbuffs.subset.tvb = backing;
|
|
|
|
tvb->length = tvb->tvbuffs.subset.length;
|
2000-09-13 20:17:23 +00:00
|
|
|
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
if (reported_length == -1) {
|
|
|
|
tvb->reported_length = backing->reported_length - tvb->tvbuffs.subset.offset;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tvb->reported_length = reported_length;
|
|
|
|
}
|
2000-05-16 04:44:14 +00:00
|
|
|
tvb->initialized = TRUE;
|
2000-05-11 08:18:09 +00:00
|
|
|
add_to_used_in_list(backing, tvb);
|
|
|
|
|
|
|
|
/* Optimization. If the backing buffer has a pointer to contiguous, real data,
|
|
|
|
* then we can point directly to our starting offset in that buffer */
|
|
|
|
if (backing->real_data != NULL) {
|
|
|
|
tvb->real_data = backing->real_data + tvb->tvbuffs.subset.offset;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tvbuff_t*
|
2000-05-16 04:44:14 +00:00
|
|
|
tvb_new_subset(tvbuff_t *backing, gint backing_offset, gint backing_length, gint reported_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2003-12-03 10:14:34 +00:00
|
|
|
static tvbuff_t *last_tvb=NULL;
|
2000-05-11 08:18:09 +00:00
|
|
|
tvbuff_t *tvb;
|
|
|
|
|
|
|
|
tvb = tvb_new(TVBUFF_SUBSET);
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2003-12-03 10:14:34 +00:00
|
|
|
if(last_tvb){
|
|
|
|
tvb_free(last_tvb);
|
|
|
|
}
|
|
|
|
/* remember this tvb in case we throw an exception and
|
|
|
|
* lose the pointer to it.
|
|
|
|
*/
|
|
|
|
last_tvb=tvb;
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2000-05-16 04:44:14 +00:00
|
|
|
tvb_set_subset(tvb, backing, backing_offset, backing_length, reported_length);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2002-02-18 01:08:44 +00:00
|
|
|
/*
|
|
|
|
* The top-level data source of this tvbuff is the top-level
|
|
|
|
* data source of its parent.
|
|
|
|
*/
|
|
|
|
tvb->ds_tvb = backing->ds_tvb;
|
|
|
|
|
2003-12-03 10:14:34 +00:00
|
|
|
/* ok no exception so we dont need to remember it any longer */
|
|
|
|
last_tvb=NULL;
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
tvb_composite_append(tvbuff_t* tvb, tvbuff_t* member)
|
|
|
|
{
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
|
|
|
|
g_assert(!tvb->initialized);
|
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
composite->tvbs = g_slist_append( composite->tvbs, member );
|
2000-11-14 04:33:34 +00:00
|
|
|
add_to_used_in_list(member, tvb);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
tvb_composite_prepend(tvbuff_t* tvb, tvbuff_t* member)
|
|
|
|
{
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
|
|
|
|
g_assert(!tvb->initialized);
|
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
composite->tvbs = g_slist_prepend( composite->tvbs, member );
|
2000-11-14 04:33:34 +00:00
|
|
|
add_to_used_in_list(member, tvb);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
tvbuff_t*
|
|
|
|
tvb_new_composite(void)
|
|
|
|
{
|
|
|
|
return tvb_new(TVBUFF_COMPOSITE);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
tvb_composite_finalize(tvbuff_t* tvb)
|
|
|
|
{
|
|
|
|
GSList *slist;
|
|
|
|
guint num_members;
|
|
|
|
tvbuff_t *member_tvb;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
g_assert(!tvb->initialized);
|
|
|
|
g_assert(tvb->length == 0);
|
|
|
|
|
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
num_members = g_slist_length(composite->tvbs);
|
|
|
|
|
|
|
|
composite->start_offsets = g_new(guint, num_members);
|
|
|
|
composite->end_offsets = g_new(guint, num_members);
|
|
|
|
|
|
|
|
for (slist = composite->tvbs; slist != NULL; slist = slist->next) {
|
2001-10-26 17:29:12 +00:00
|
|
|
g_assert((guint) i < num_members);
|
2000-05-11 08:18:09 +00:00
|
|
|
member_tvb = slist->data;
|
|
|
|
composite->start_offsets[i] = tvb->length;
|
|
|
|
tvb->length += member_tvb->length;
|
|
|
|
composite->end_offsets[i] = tvb->length - 1;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
tvb->initialized = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
guint
|
|
|
|
tvb_length(tvbuff_t* tvb)
|
|
|
|
{
|
|
|
|
g_assert(tvb->initialized);
|
|
|
|
|
|
|
|
return tvb->length;
|
|
|
|
}
|
|
|
|
|
2000-12-27 12:48:27 +00:00
|
|
|
gint
|
2000-05-11 08:18:09 +00:00
|
|
|
tvb_length_remaining(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
|
|
|
|
g_assert(tvb->initialized);
|
|
|
|
|
2000-05-16 04:44:14 +00:00
|
|
|
if (compute_offset_length(tvb, offset, -1, &abs_offset, &abs_length, NULL)) {
|
2000-05-11 08:18:09 +00:00
|
|
|
return abs_length;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-05-05 00:57:59 +00:00
|
|
|
guint
|
2002-02-01 04:34:17 +00:00
|
|
|
tvb_ensure_length_remaining(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
2002-05-05 21:07:52 +00:00
|
|
|
guint abs_offset, abs_length;
|
|
|
|
int exception;
|
2002-02-01 04:34:17 +00:00
|
|
|
|
2002-05-05 21:07:52 +00:00
|
|
|
g_assert(tvb->initialized);
|
2002-02-01 04:34:17 +00:00
|
|
|
|
2002-05-05 21:07:52 +00:00
|
|
|
if (!compute_offset_length(tvb, offset, -1, &abs_offset, &abs_length, &exception)) {
|
|
|
|
THROW(exception);
|
2002-02-01 04:34:17 +00:00
|
|
|
}
|
2003-12-23 21:22:00 +00:00
|
|
|
if (abs_length == 0) {
|
|
|
|
/*
|
|
|
|
* This routine ensures there's at least one byte available.
|
|
|
|
* There aren't any bytes available, so throw the appropriate
|
|
|
|
* exception.
|
|
|
|
*/
|
2003-12-24 23:28:17 +00:00
|
|
|
if (abs_offset >= tvb->reported_length)
|
2003-12-23 21:22:00 +00:00
|
|
|
THROW(ReportedBoundsError);
|
|
|
|
else
|
|
|
|
THROW(BoundsError);
|
|
|
|
}
|
2002-05-05 21:07:52 +00:00
|
|
|
return abs_length;
|
2002-02-01 04:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Validates that 'length' bytes are available starting from
|
2002-05-13 01:24:47 +00:00
|
|
|
* offset (pos/neg). Does not throw an exception. */
|
2000-05-11 08:18:09 +00:00
|
|
|
gboolean
|
|
|
|
tvb_bytes_exist(tvbuff_t *tvb, gint offset, gint length)
|
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
|
|
|
|
g_assert(tvb->initialized);
|
|
|
|
|
2000-05-16 04:44:14 +00:00
|
|
|
if (!compute_offset_length(tvb, offset, length, &abs_offset, &abs_length, NULL))
|
2000-05-11 08:18:09 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (abs_offset + abs_length <= tvb->length) {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-05-13 01:24:47 +00:00
|
|
|
/* Validates that 'length' bytes are available starting from
|
|
|
|
* offset (pos/neg). Throws an exception if they aren't. */
|
|
|
|
void
|
|
|
|
tvb_ensure_bytes_exist(tvbuff_t *tvb, gint offset, gint length)
|
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
|
|
|
|
g_assert(tvb->initialized);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* -1 doesn't mean "until end of buffer", as that's pointless
|
|
|
|
* for this routine. We must treat it as a Really Large Positive
|
|
|
|
* Number, so that we throw an exception; we throw
|
|
|
|
* ReportedBoundsError, as if it were past even the end of a
|
|
|
|
* reassembled packet, and past the end of even the data we
|
|
|
|
* didn't capture.
|
|
|
|
*
|
|
|
|
* We do the same with other negative lengths.
|
|
|
|
*/
|
|
|
|
if (length < 0) {
|
|
|
|
THROW(ReportedBoundsError);
|
|
|
|
}
|
|
|
|
check_offset_length(tvb, offset, length, &abs_offset, &abs_length);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
gboolean
|
|
|
|
tvb_offset_exists(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
|
|
|
|
g_assert(tvb->initialized);
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
if (!compute_offset_length(tvb, offset, -1, &abs_offset, &abs_length, NULL))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (abs_offset < tvb->length) {
|
2000-05-11 08:18:09 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add "tvb_reported_length()" to get the "reported length" of a tvbuff
(i.e., the amount of data that was in the packet, even if not all of it
was captured), for use when dissecting packets containing data that
fills the packet (we want the dissector to try to dissect all of it; if
it runs past the end of the captured data, we want it to throw an
exception so that we'll put a "Short Frame" note in the protocol tree).
This means we always want a tvbuff to have a real reported length value,
so we make it an unsigned integer, and don't bother checking it for -1,
as it should never be -1.
If the reported length passed in to "tvb_set_subset()" is -1, set the
reported length to the reported length of the tvbuff of which the new
tvbuff will be a subset minus the offset in that tvbuff of the subset,
so that "-1" means "what's left of the packet after we chop off the
header". This is necessary in order to ensure that all tvbuffs have a
real reported length value.
Have "dissect_packet()" set the reported length of the top-level tvbuff
to the reported length of the frame, so that we start out with a tvbuff
with a real reported length value.
Have "tvb_offset_exists()" return FALSE if the offset is past the end of
the tvbuff.
If the offset passed to it is postitive, have "compute_offset_length()"
check for that it's not more than one byte past the end of the tvbuff -
if it's just past the end, we don't want the check to fail, as we don't
want attempts to create a subset tvbuff containing zero bytes to fail;
that would be done if a captured packet was all header and no payload,
and we'd want the dissector of the payload, not the dissector of the
header, to throw an exception, as the problem isn't with the protocol
for the header, it's with the protocol for the payload.
Convert the ATM dissector, the SSCOP dissector, the Q.2931 dissector,
and the Q.931 dissector to use tvbuffs.
Make the LAPD dissector set up a tvbuff for the Q.931 dissector (it's
not converted yet).
svn path=/trunk/; revision=2023
2000-05-29 08:57:42 +00:00
|
|
|
guint
|
|
|
|
tvb_reported_length(tvbuff_t* tvb)
|
|
|
|
{
|
|
|
|
g_assert(tvb->initialized);
|
|
|
|
|
|
|
|
return tvb->reported_length;
|
|
|
|
}
|
|
|
|
|
2000-12-27 12:48:27 +00:00
|
|
|
gint
|
|
|
|
tvb_reported_length_remaining(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
|
|
|
|
g_assert(tvb->initialized);
|
|
|
|
|
|
|
|
if (compute_offset_length(tvb, offset, -1, &abs_offset, &abs_length, NULL)) {
|
|
|
|
if (tvb->reported_length >= abs_offset)
|
|
|
|
return tvb->reported_length - abs_offset;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
/* Set the reported length of a tvbuff to a given value; used for protocols
|
|
|
|
whose headers contain an explicit length and where the calling
|
|
|
|
dissector's payload may include padding as well as the packet for
|
|
|
|
this protocol.
|
2000-05-11 08:18:09 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
Also adjusts the data length. */
|
|
|
|
void
|
|
|
|
tvb_set_reported_length(tvbuff_t* tvb, guint reported_length)
|
|
|
|
{
|
|
|
|
g_assert(tvb->initialized);
|
2000-11-30 03:24:16 +00:00
|
|
|
|
|
|
|
if (reported_length > tvb->reported_length)
|
|
|
|
THROW(ReportedBoundsError);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
|
|
|
|
tvb->reported_length = reported_length;
|
|
|
|
if (reported_length < tvb->length)
|
|
|
|
tvb->length = reported_length;
|
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
2000-05-11 08:18:09 +00:00
|
|
|
first_real_data_ptr(tvbuff_t *tvb)
|
|
|
|
{
|
|
|
|
tvbuff_t *member;
|
|
|
|
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
return tvb->real_data;
|
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
member = tvb->tvbuffs.subset.tvb;
|
|
|
|
return first_real_data_ptr(member);
|
|
|
|
case TVBUFF_COMPOSITE:
|
|
|
|
member = tvb->tvbuffs.composite.tvbs->data;
|
|
|
|
return first_real_data_ptr(member);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2003-12-03 09:50:40 +00:00
|
|
|
int
|
2000-05-11 08:18:09 +00:00
|
|
|
offset_from_real_beginning(tvbuff_t *tvb, int counter)
|
|
|
|
{
|
|
|
|
tvbuff_t *member;
|
|
|
|
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
return counter;
|
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
member = tvb->tvbuffs.subset.tvb;
|
|
|
|
return offset_from_real_beginning(member, counter + tvb->tvbuffs.subset.offset);
|
|
|
|
case TVBUFF_COMPOSITE:
|
|
|
|
member = tvb->tvbuffs.composite.tvbs->data;
|
|
|
|
return offset_from_real_beginning(member, counter);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
composite_ensure_contiguous_no_exception(tvbuff_t *tvb, guint abs_offset,
|
|
|
|
guint abs_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
guint i, num_members;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
tvbuff_t *member_tvb = NULL;
|
|
|
|
guint member_offset, member_length;
|
|
|
|
GSList *slist;
|
|
|
|
|
|
|
|
g_assert(tvb->type == TVBUFF_COMPOSITE);
|
|
|
|
|
|
|
|
/* Maybe the range specified by offset/length
|
|
|
|
* is contiguous inside one of the member tvbuffs */
|
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
num_members = g_slist_length(composite->tvbs);
|
|
|
|
|
|
|
|
for (i = 0; i < num_members; i++) {
|
|
|
|
if (abs_offset <= composite->end_offsets[i]) {
|
|
|
|
slist = g_slist_nth(composite->tvbs, i);
|
|
|
|
member_tvb = slist->data;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_assert(member_tvb);
|
|
|
|
|
|
|
|
if (check_offset_length_no_exception(member_tvb, abs_offset - composite->start_offsets[i],
|
2000-05-16 04:44:14 +00:00
|
|
|
abs_length, &member_offset, &member_length, NULL)) {
|
2000-05-11 08:18:09 +00:00
|
|
|
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
/*
|
|
|
|
* The range is, in fact, contiguous within member_tvb.
|
|
|
|
*/
|
2000-05-11 08:18:09 +00:00
|
|
|
g_assert(!tvb->real_data);
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
return ensure_contiguous_no_exception(member_tvb, member_offset, member_length, NULL);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
tvb->real_data = tvb_memdup(tvb, 0, -1);
|
|
|
|
return tvb->real_data + abs_offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
2003-06-09 07:27:42 +00:00
|
|
|
ensure_contiguous_no_exception(tvbuff_t *tvb, gint offset, gint length,
|
|
|
|
int *exception)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
|
2003-06-09 07:27:42 +00:00
|
|
|
if (!check_offset_length_no_exception(tvb, offset, length,
|
|
|
|
&abs_offset, &abs_length, exception)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
/*
|
|
|
|
* We know that all the data is present in the tvbuff, so
|
|
|
|
* no exceptions should be thrown.
|
|
|
|
*/
|
2000-05-11 08:18:09 +00:00
|
|
|
if (tvb->real_data) {
|
|
|
|
return tvb->real_data + abs_offset;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
g_assert_not_reached();
|
|
|
|
case TVBUFF_SUBSET:
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
return ensure_contiguous_no_exception(tvb->tvbuffs.subset.tvb,
|
2000-05-11 08:18:09 +00:00
|
|
|
abs_offset - tvb->tvbuffs.subset.offset,
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
abs_length, NULL);
|
2000-05-11 08:18:09 +00:00
|
|
|
case TVBUFF_COMPOSITE:
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
return composite_ensure_contiguous_no_exception(tvb, abs_offset, abs_length);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
2003-06-09 07:27:42 +00:00
|
|
|
ensure_contiguous(tvbuff_t *tvb, gint offset, gint length)
|
|
|
|
{
|
|
|
|
int exception;
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8 *p;
|
2003-06-09 07:27:42 +00:00
|
|
|
|
|
|
|
p = ensure_contiguous_no_exception(tvb, offset, length, &exception);
|
|
|
|
if (p == NULL) {
|
|
|
|
g_assert(exception > 0);
|
|
|
|
THROW(exception);
|
|
|
|
}
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
static const guint8*
|
|
|
|
guint8_find(const guint8* haystack, size_t haystacklen, guint8 needle)
|
|
|
|
{
|
|
|
|
const guint8 *b;
|
|
|
|
int i;
|
|
|
|
|
2001-10-26 17:29:12 +00:00
|
|
|
for (b = haystack, i = 0; (guint) i < haystacklen; i++, b++) {
|
2000-08-30 02:50:18 +00:00
|
|
|
if (*b == needle) {
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2000-11-10 06:50:37 +00:00
|
|
|
static const guint8*
|
|
|
|
guint8_pbrk(const guint8* haystack, size_t haystacklen, guint8 *needles)
|
|
|
|
{
|
|
|
|
const guint8 *b;
|
|
|
|
int i;
|
|
|
|
guint8 item, *needlep, needle;
|
|
|
|
|
2001-10-26 17:29:12 +00:00
|
|
|
for (b = haystack, i = 0; (guint) i < haystacklen; i++, b++) {
|
2000-11-10 06:50:37 +00:00
|
|
|
item = *b;
|
|
|
|
needlep = needles;
|
|
|
|
while ((needle = *needlep) != '\0') {
|
|
|
|
if (item == needle)
|
|
|
|
return b;
|
|
|
|
needlep++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
/************** ACCESSORS **************/
|
|
|
|
|
|
|
|
static guint8*
|
|
|
|
composite_memcpy(tvbuff_t *tvb, guint8* target, guint abs_offset, guint abs_length)
|
|
|
|
{
|
|
|
|
guint i, num_members;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
tvbuff_t *member_tvb = NULL;
|
|
|
|
guint member_offset, member_length;
|
|
|
|
gboolean retval;
|
|
|
|
GSList *slist;
|
|
|
|
|
|
|
|
g_assert(tvb->type == TVBUFF_COMPOSITE);
|
|
|
|
|
|
|
|
/* Maybe the range specified by offset/length
|
|
|
|
* is contiguous inside one of the member tvbuffs */
|
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
num_members = g_slist_length(composite->tvbs);
|
|
|
|
|
|
|
|
for (i = 0; i < num_members; i++) {
|
|
|
|
if (abs_offset <= composite->end_offsets[i]) {
|
|
|
|
slist = g_slist_nth(composite->tvbs, i);
|
|
|
|
member_tvb = slist->data;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_assert(member_tvb);
|
|
|
|
|
|
|
|
if (check_offset_length_no_exception(member_tvb, abs_offset - composite->start_offsets[i],
|
2000-05-16 04:44:14 +00:00
|
|
|
abs_length, &member_offset, &member_length, NULL)) {
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
g_assert(!tvb->real_data);
|
|
|
|
return tvb_memcpy(member_tvb, target, member_offset, member_length);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* The requested data is non-contiguous inside
|
|
|
|
* the member tvb. We have to memcpy() the part that's in the member tvb,
|
|
|
|
* then iterate across the other member tvb's, copying their portions
|
|
|
|
* until we have copied all data.
|
|
|
|
*/
|
|
|
|
retval = compute_offset_length(member_tvb, abs_offset - composite->start_offsets[i], -1,
|
2000-05-16 04:44:14 +00:00
|
|
|
&member_offset, &member_length, NULL);
|
2000-05-11 08:18:09 +00:00
|
|
|
g_assert(retval);
|
|
|
|
|
|
|
|
tvb_memcpy(member_tvb, target, member_offset, member_length);
|
|
|
|
abs_offset += member_length;
|
|
|
|
abs_length -= member_length;
|
|
|
|
|
|
|
|
/* Recurse */
|
|
|
|
if (abs_length > 0) {
|
|
|
|
composite_memcpy(tvb, target + member_length, abs_offset, abs_length);
|
|
|
|
}
|
|
|
|
|
|
|
|
return target;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint8*
|
|
|
|
tvb_memcpy(tvbuff_t *tvb, guint8* target, gint offset, gint length)
|
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
g_assert(length >= -1);
|
2000-05-11 08:18:09 +00:00
|
|
|
check_offset_length(tvb, offset, length, &abs_offset, &abs_length);
|
|
|
|
|
|
|
|
if (tvb->real_data) {
|
|
|
|
return (guint8*) memcpy(target, tvb->real_data + abs_offset, abs_length);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
return tvb_memcpy(tvb->tvbuffs.subset.tvb, target,
|
|
|
|
abs_offset - tvb->tvbuffs.subset.offset,
|
|
|
|
abs_length);
|
|
|
|
|
|
|
|
case TVBUFF_COMPOSITE:
|
|
|
|
return composite_memcpy(tvb, target, offset, length);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-05-13 01:24:47 +00:00
|
|
|
/*
|
|
|
|
* XXX - this doesn't treat a length of -1 as an error.
|
|
|
|
* If it did, this could replace some code that calls
|
|
|
|
* "tvb_ensure_bytes_exist()" and then allocates a buffer and copies
|
|
|
|
* data to it.
|
|
|
|
*
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
* "composite_ensure_contiguous_no_exception()" depends on -1 not being
|
|
|
|
* an error; does anything else depend on this routine treating -1 as
|
|
|
|
* meaning "to the end of the buffer"?
|
2002-05-13 01:24:47 +00:00
|
|
|
*/
|
2000-05-11 08:18:09 +00:00
|
|
|
guint8*
|
|
|
|
tvb_memdup(tvbuff_t *tvb, gint offset, gint length)
|
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
guint8 *duped;
|
|
|
|
|
|
|
|
check_offset_length(tvb, offset, length, &abs_offset, &abs_length);
|
|
|
|
|
|
|
|
duped = g_malloc(abs_length);
|
|
|
|
return tvb_memcpy(tvb, duped, abs_offset, abs_length);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-08-28 20:41:00 +00:00
|
|
|
|
2001-03-13 21:34:28 +00:00
|
|
|
const guint8*
|
2000-05-11 08:18:09 +00:00
|
|
|
tvb_get_ptr(tvbuff_t *tvb, gint offset, gint length)
|
|
|
|
{
|
|
|
|
return ensure_contiguous(tvb, offset, length);
|
|
|
|
}
|
|
|
|
|
|
|
|
guint8
|
|
|
|
tvb_get_guint8(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8* ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, sizeof(guint8));
|
|
|
|
return *ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint16
|
|
|
|
tvb_get_ntohs(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8* ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, sizeof(guint16));
|
|
|
|
return pntohs(ptr);
|
|
|
|
}
|
|
|
|
|
2000-08-10 07:58:44 +00:00
|
|
|
guint32
|
|
|
|
tvb_get_ntoh24(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8* ptr;
|
2000-08-10 07:58:44 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, 3);
|
|
|
|
return pntoh24(ptr);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
guint32
|
|
|
|
tvb_get_ntohl(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8* ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, sizeof(guint32));
|
|
|
|
return pntohl(ptr);
|
|
|
|
}
|
|
|
|
|
2004-08-22 00:31:58 +00:00
|
|
|
guint64
|
|
|
|
tvb_get_ntoh64(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
|
|
|
const guint8* ptr;
|
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, sizeof(guint64));
|
|
|
|
return pntoh64(ptr);
|
|
|
|
}
|
|
|
|
|
2002-04-24 21:19:38 +00:00
|
|
|
/*
|
|
|
|
* Stuff for IEEE float handling on platforms that don't have IEEE
|
|
|
|
* format as the native floating-point format.
|
|
|
|
*
|
|
|
|
* For now, we treat only the VAX as such a platform.
|
|
|
|
*
|
|
|
|
* XXX - other non-IEEE boxes that can run UNIX include some Crays,
|
|
|
|
* and possibly other machines.
|
|
|
|
*
|
|
|
|
* It appears that the official Linux port to System/390 and
|
|
|
|
* zArchitecture uses IEEE format floating point (not a
|
|
|
|
* huge surprise).
|
|
|
|
*
|
|
|
|
* I don't know whether there are any other machines that
|
|
|
|
* could run Ethereal and that don't use IEEE format.
|
|
|
|
* As far as I know, all of the main commercial microprocessor
|
|
|
|
* families on which OSes that support Ethereal can run
|
|
|
|
* use IEEE format (x86, 68k, SPARC, MIPS, PA-RISC, Alpha,
|
|
|
|
* IA-64, and so on).
|
|
|
|
*/
|
|
|
|
|
|
|
|
#if defined(vax)
|
|
|
|
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Single-precision.
|
|
|
|
*/
|
|
|
|
#define IEEE_SP_NUMBER_WIDTH 32 /* bits in number */
|
|
|
|
#define IEEE_SP_EXP_WIDTH 8 /* bits in exponent */
|
|
|
|
#define IEEE_SP_MANTISSA_WIDTH 23 /* IEEE_SP_NUMBER_WIDTH - 1 - IEEE_SP_EXP_WIDTH */
|
|
|
|
|
|
|
|
#define IEEE_SP_SIGN_MASK 0x80000000
|
|
|
|
#define IEEE_SP_EXPONENT_MASK 0x7F800000
|
|
|
|
#define IEEE_SP_MANTISSA_MASK 0x007FFFFF
|
|
|
|
#define IEEE_SP_INFINITY IEEE_SP_EXPONENT_MASK
|
|
|
|
|
|
|
|
#define IEEE_SP_IMPLIED_BIT (1 << IEEE_SP_MANTISSA_WIDTH)
|
|
|
|
#define IEEE_SP_INFINITE ((1 << IEEE_SP_EXP_WIDTH) - 1)
|
|
|
|
#define IEEE_SP_BIAS ((1 << (IEEE_SP_EXP_WIDTH - 1)) - 1)
|
|
|
|
|
|
|
|
static int
|
|
|
|
ieee_float_is_zero(guint32 w)
|
|
|
|
{
|
|
|
|
return ((w & ~IEEE_SP_SIGN_MASK) == 0);
|
|
|
|
}
|
|
|
|
|
2002-04-24 21:53:05 +00:00
|
|
|
static gfloat
|
2002-04-24 21:19:38 +00:00
|
|
|
get_ieee_float(guint32 w)
|
|
|
|
{
|
|
|
|
long sign;
|
|
|
|
long exponent;
|
|
|
|
long mantissa;
|
|
|
|
|
|
|
|
sign = w & IEEE_SP_SIGN_MASK;
|
|
|
|
exponent = w & IEEE_SP_EXPONENT_MASK;
|
|
|
|
mantissa = w & IEEE_SP_MANTISSA_MASK;
|
|
|
|
|
|
|
|
if (ieee_float_is_zero(w)) {
|
|
|
|
/* number is zero, unnormalized, or not-a-number */
|
|
|
|
return 0.0;
|
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
/*
|
|
|
|
* XXX - how to handle this?
|
|
|
|
*/
|
|
|
|
if (IEEE_SP_INFINITY == exponent) {
|
|
|
|
/*
|
|
|
|
* number is positive or negative infinity, or a special value
|
|
|
|
*/
|
|
|
|
return (sign? MINUS_INFINITY: PLUS_INFINITY);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
exponent = ((exponent >> IEEE_SP_MANTISSA_WIDTH) - IEEE_SP_BIAS) -
|
|
|
|
IEEE_SP_MANTISSA_WIDTH;
|
|
|
|
mantissa |= IEEE_SP_IMPLIED_BIT;
|
|
|
|
|
|
|
|
if (sign)
|
|
|
|
return -mantissa * pow(2, exponent);
|
|
|
|
else
|
|
|
|
return mantissa * pow(2, exponent);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Double-precision.
|
|
|
|
* We assume that if you don't have IEEE floating-point, you have a
|
|
|
|
* compiler that understands 64-bit integral quantities.
|
|
|
|
*/
|
|
|
|
#define IEEE_DP_NUMBER_WIDTH 64 /* bits in number */
|
|
|
|
#define IEEE_DP_EXP_WIDTH 11 /* bits in exponent */
|
|
|
|
#define IEEE_DP_MANTISSA_WIDTH 52 /* IEEE_DP_NUMBER_WIDTH - 1 - IEEE_DP_EXP_WIDTH */
|
|
|
|
|
|
|
|
#define IEEE_DP_SIGN_MASK 0x8000000000000000LL
|
|
|
|
#define IEEE_DP_EXPONENT_MASK 0x7FF0000000000000LL
|
|
|
|
#define IEEE_DP_MANTISSA_MASK 0x000FFFFFFFFFFFFFLL
|
|
|
|
#define IEEE_DP_INFINITY IEEE_DP_EXPONENT_MASK
|
|
|
|
|
|
|
|
#define IEEE_DP_IMPLIED_BIT (1LL << IEEE_DP_MANTISSA_WIDTH)
|
|
|
|
#define IEEE_DP_INFINITE ((1 << IEEE_DP_EXP_WIDTH) - 1)
|
|
|
|
#define IEEE_DP_BIAS ((1 << (IEEE_DP_EXP_WIDTH - 1)) - 1)
|
|
|
|
|
|
|
|
static int
|
|
|
|
ieee_double_is_zero(guint64 w)
|
|
|
|
{
|
|
|
|
return ((w & ~IEEE_SP_SIGN_MASK) == 0);
|
|
|
|
}
|
|
|
|
|
2002-04-24 21:53:05 +00:00
|
|
|
static gdouble
|
2002-04-24 21:19:38 +00:00
|
|
|
get_ieee_double(guint64 w)
|
|
|
|
{
|
|
|
|
gint64 sign;
|
|
|
|
gint64 exponent;
|
|
|
|
gint64 mantissa;
|
|
|
|
|
|
|
|
sign = w & IEEE_DP_SIGN_MASK;
|
|
|
|
exponent = w & IEEE_DP_EXPONENT_MASK;
|
|
|
|
mantissa = w & IEEE_DP_MANTISSA_MASK;
|
|
|
|
|
|
|
|
if (ieee_double_is_zero(w)) {
|
|
|
|
/* number is zero, unnormalized, or not-a-number */
|
|
|
|
return 0.0;
|
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
/*
|
|
|
|
* XXX - how to handle this?
|
|
|
|
*/
|
|
|
|
if (IEEE_DP_INFINITY == exponent) {
|
|
|
|
/*
|
|
|
|
* number is positive or negative infinity, or a special value
|
|
|
|
*/
|
|
|
|
return (sign? MINUS_INFINITY: PLUS_INFINITY);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
exponent = ((exponent >> IEEE_DP_MANTISSA_WIDTH) - IEEE_DP_BIAS) -
|
|
|
|
IEEE_DP_MANTISSA_WIDTH;
|
|
|
|
mantissa |= IEEE_DP_IMPLIED_BIT;
|
|
|
|
|
|
|
|
if (sign)
|
|
|
|
return -mantissa * pow(2, exponent);
|
|
|
|
else
|
|
|
|
return mantissa * pow(2, exponent);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2002-04-12 23:25:24 +00:00
|
|
|
/*
|
|
|
|
* Fetches an IEEE single-precision floating-point number, in
|
|
|
|
* big-endian form, and returns a "float".
|
|
|
|
*
|
|
|
|
* XXX - should this be "double", in case there are IEEE single-
|
|
|
|
* precision numbers that won't fit in some platform's native
|
|
|
|
* "float" format?
|
|
|
|
*/
|
2002-04-24 21:53:05 +00:00
|
|
|
gfloat
|
2002-04-12 23:25:24 +00:00
|
|
|
tvb_get_ntohieee_float(tvbuff_t *tvb, int offset)
|
|
|
|
{
|
|
|
|
#if defined(vax)
|
2002-04-24 21:19:38 +00:00
|
|
|
return get_ieee_float(tvb_get_ntohl(tvb, offset));
|
2002-04-12 23:25:24 +00:00
|
|
|
#else
|
|
|
|
union {
|
2002-04-24 21:53:05 +00:00
|
|
|
gfloat f;
|
2002-04-12 23:25:24 +00:00
|
|
|
guint32 w;
|
|
|
|
} ieee_fp_union;
|
|
|
|
|
|
|
|
ieee_fp_union.w = tvb_get_ntohl(tvb, offset);
|
|
|
|
return ieee_fp_union.f;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fetches an IEEE double-precision floating-point number, in
|
|
|
|
* big-endian form, and returns a "double".
|
|
|
|
*/
|
2002-04-24 21:53:05 +00:00
|
|
|
gdouble
|
2002-04-12 23:25:24 +00:00
|
|
|
tvb_get_ntohieee_double(tvbuff_t *tvb, int offset)
|
|
|
|
{
|
|
|
|
#if defined(vax)
|
2002-04-24 21:19:38 +00:00
|
|
|
union {
|
|
|
|
guint32 w[2];
|
|
|
|
guint64 dw;
|
|
|
|
} ieee_fp_union;
|
2002-04-12 23:25:24 +00:00
|
|
|
#else
|
|
|
|
union {
|
2002-04-24 21:53:05 +00:00
|
|
|
gdouble d;
|
2002-04-12 23:25:24 +00:00
|
|
|
guint32 w[2];
|
|
|
|
} ieee_fp_union;
|
2002-04-24 21:19:38 +00:00
|
|
|
#endif
|
2002-04-12 23:25:24 +00:00
|
|
|
|
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
ieee_fp_union.w[0] = tvb_get_ntohl(tvb, offset);
|
|
|
|
ieee_fp_union.w[1] = tvb_get_ntohl(tvb, offset+4);
|
|
|
|
#else
|
|
|
|
ieee_fp_union.w[0] = tvb_get_ntohl(tvb, offset+4);
|
|
|
|
ieee_fp_union.w[1] = tvb_get_ntohl(tvb, offset);
|
|
|
|
#endif
|
2002-04-24 21:19:38 +00:00
|
|
|
#if defined(vax)
|
2002-04-24 21:53:05 +00:00
|
|
|
return get_ieee_double(ieee_fp_union.dw);
|
2002-04-24 21:19:38 +00:00
|
|
|
#else
|
2002-04-12 23:25:24 +00:00
|
|
|
return ieee_fp_union.d;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
guint16
|
|
|
|
tvb_get_letohs(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8* ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, sizeof(guint16));
|
|
|
|
return pletohs(ptr);
|
|
|
|
}
|
|
|
|
|
2000-08-10 07:58:44 +00:00
|
|
|
guint32
|
|
|
|
tvb_get_letoh24(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8* ptr;
|
2000-08-10 07:58:44 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, 3);
|
|
|
|
return pletoh24(ptr);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
guint32
|
|
|
|
tvb_get_letohl(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8* ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, sizeof(guint32));
|
|
|
|
return pletohl(ptr);
|
|
|
|
}
|
2000-05-15 04:37:27 +00:00
|
|
|
|
2004-08-22 00:31:58 +00:00
|
|
|
guint64
|
|
|
|
tvb_get_letoh64(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
|
|
|
const guint8* ptr;
|
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, sizeof(guint64));
|
|
|
|
return pletoh64(ptr);
|
|
|
|
}
|
|
|
|
|
2002-04-12 23:25:24 +00:00
|
|
|
/*
|
|
|
|
* Fetches an IEEE single-precision floating-point number, in
|
|
|
|
* little-endian form, and returns a "float".
|
|
|
|
*
|
|
|
|
* XXX - should this be "double", in case there are IEEE single-
|
|
|
|
* precision numbers that won't fit in some platform's native
|
|
|
|
* "float" format?
|
|
|
|
*/
|
2002-04-24 21:53:05 +00:00
|
|
|
gfloat
|
2002-04-12 23:25:24 +00:00
|
|
|
tvb_get_letohieee_float(tvbuff_t *tvb, int offset)
|
|
|
|
{
|
|
|
|
#if defined(vax)
|
2002-04-24 21:19:38 +00:00
|
|
|
return get_ieee_float(tvb_get_letohl(tvb, offset));
|
2002-04-12 23:25:24 +00:00
|
|
|
#else
|
|
|
|
union {
|
2002-04-24 21:53:05 +00:00
|
|
|
gfloat f;
|
2002-04-12 23:25:24 +00:00
|
|
|
guint32 w;
|
|
|
|
} ieee_fp_union;
|
|
|
|
|
|
|
|
ieee_fp_union.w = tvb_get_letohl(tvb, offset);
|
|
|
|
return ieee_fp_union.f;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fetches an IEEE double-precision floating-point number, in
|
|
|
|
* little-endian form, and returns a "double".
|
|
|
|
*/
|
2002-04-24 21:53:05 +00:00
|
|
|
gdouble
|
2002-04-12 23:25:24 +00:00
|
|
|
tvb_get_letohieee_double(tvbuff_t *tvb, int offset)
|
|
|
|
{
|
|
|
|
#if defined(vax)
|
2002-04-24 21:19:38 +00:00
|
|
|
union {
|
|
|
|
guint32 w[2];
|
|
|
|
guint64 dw;
|
|
|
|
} ieee_fp_union;
|
2002-04-12 23:25:24 +00:00
|
|
|
#else
|
|
|
|
union {
|
2002-04-24 21:53:05 +00:00
|
|
|
gdouble d;
|
2002-04-12 23:25:24 +00:00
|
|
|
guint32 w[2];
|
|
|
|
} ieee_fp_union;
|
2002-04-24 21:19:38 +00:00
|
|
|
#endif
|
2002-04-12 23:25:24 +00:00
|
|
|
|
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
ieee_fp_union.w[0] = tvb_get_letohl(tvb, offset+4);
|
|
|
|
ieee_fp_union.w[1] = tvb_get_letohl(tvb, offset);
|
|
|
|
#else
|
|
|
|
ieee_fp_union.w[0] = tvb_get_letohl(tvb, offset);
|
|
|
|
ieee_fp_union.w[1] = tvb_get_letohl(tvb, offset+4);
|
|
|
|
#endif
|
2002-04-24 21:19:38 +00:00
|
|
|
#if defined(vax)
|
2002-04-24 21:53:05 +00:00
|
|
|
return get_ieee_double(ieee_fp_union.dw);
|
2002-04-24 21:19:38 +00:00
|
|
|
#else
|
2002-04-12 23:25:24 +00:00
|
|
|
return ieee_fp_union.d;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
/* Find first occurence of needle in tvbuff, starting at offset. Searches
|
2000-11-10 09:15:57 +00:00
|
|
|
* at most maxlength number of bytes; if maxlength is -1, searches to
|
|
|
|
* end of tvbuff.
|
|
|
|
* Returns the offset of the found needle, or -1 if not found.
|
|
|
|
* Will not throw an exception, even if maxlength exceeds boundary of tvbuff;
|
|
|
|
* in that case, -1 will be returned if the boundary is reached before
|
|
|
|
* finding needle. */
|
2000-08-30 02:50:18 +00:00
|
|
|
gint
|
2001-10-26 17:29:12 +00:00
|
|
|
tvb_find_guint8(tvbuff_t *tvb, gint offset, gint maxlength, guint8 needle)
|
2000-08-30 02:50:18 +00:00
|
|
|
{
|
|
|
|
const guint8 *result;
|
2000-11-10 09:15:57 +00:00
|
|
|
guint abs_offset, junk_length;
|
|
|
|
guint tvbufflen;
|
2000-08-30 02:50:18 +00:00
|
|
|
guint limit;
|
|
|
|
|
|
|
|
check_offset_length(tvb, offset, 0, &abs_offset, &junk_length);
|
|
|
|
|
|
|
|
/* Only search to end of tvbuff, w/o throwing exception. */
|
2000-11-10 09:15:57 +00:00
|
|
|
tvbufflen = tvb_length_remaining(tvb, abs_offset);
|
|
|
|
if (maxlength == -1) {
|
2000-11-30 06:11:32 +00:00
|
|
|
/* No maximum length specified; search to end of tvbuff. */
|
2000-11-10 09:15:57 +00:00
|
|
|
limit = tvbufflen;
|
|
|
|
}
|
2001-10-26 17:29:12 +00:00
|
|
|
else if (tvbufflen < (guint) maxlength) {
|
2000-11-30 06:11:32 +00:00
|
|
|
/* Maximum length goes past end of tvbuff; search to end
|
|
|
|
of tvbuff. */
|
|
|
|
limit = tvbufflen;
|
2000-08-30 02:50:18 +00:00
|
|
|
}
|
|
|
|
else {
|
2000-11-30 06:11:32 +00:00
|
|
|
/* Maximum length doesn't go past end of tvbuff; search
|
|
|
|
to that value. */
|
2000-08-30 02:50:18 +00:00
|
|
|
limit = maxlength;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we have real data, perform our search now. */
|
|
|
|
if (tvb->real_data) {
|
|
|
|
result = guint8_find(tvb->real_data + abs_offset, limit, needle);
|
|
|
|
if (result == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return result - tvb->real_data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
return tvb_find_guint8(tvb->tvbuffs.subset.tvb,
|
|
|
|
abs_offset - tvb->tvbuffs.subset.offset,
|
|
|
|
limit, needle);
|
|
|
|
|
|
|
|
case TVBUFF_COMPOSITE:
|
|
|
|
g_assert_not_reached();
|
|
|
|
/* XXX - return composite_find_guint8(tvb, offset, limit, needle); */
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2000-11-10 06:50:37 +00:00
|
|
|
/* Find first occurence of any of the needles in tvbuff, starting at offset.
|
2000-11-10 09:15:57 +00:00
|
|
|
* Searches at most maxlength number of bytes; if maxlength is -1, searches
|
|
|
|
* to end of tvbuff.
|
|
|
|
* Returns the offset of the found needle, or -1 if not found.
|
|
|
|
* Will not throw an exception, even if maxlength exceeds boundary of tvbuff;
|
|
|
|
* in that case, -1 will be returned if the boundary is reached before
|
|
|
|
* finding needle. */
|
2000-11-10 06:50:37 +00:00
|
|
|
gint
|
2001-10-26 17:29:12 +00:00
|
|
|
tvb_pbrk_guint8(tvbuff_t *tvb, gint offset, gint maxlength, guint8 *needles)
|
2000-11-10 06:50:37 +00:00
|
|
|
{
|
|
|
|
const guint8 *result;
|
2000-11-10 09:15:57 +00:00
|
|
|
guint abs_offset, junk_length;
|
|
|
|
guint tvbufflen;
|
2000-11-10 06:50:37 +00:00
|
|
|
guint limit;
|
|
|
|
|
|
|
|
check_offset_length(tvb, offset, 0, &abs_offset, &junk_length);
|
|
|
|
|
|
|
|
/* Only search to end of tvbuff, w/o throwing exception. */
|
2000-11-10 09:15:57 +00:00
|
|
|
tvbufflen = tvb_length_remaining(tvb, abs_offset);
|
|
|
|
if (maxlength == -1) {
|
2000-11-30 06:11:32 +00:00
|
|
|
/* No maximum length specified; search to end of tvbuff. */
|
2000-11-10 09:15:57 +00:00
|
|
|
limit = tvbufflen;
|
|
|
|
}
|
2001-10-26 17:29:12 +00:00
|
|
|
else if (tvbufflen < (guint) maxlength) {
|
2000-11-30 06:11:32 +00:00
|
|
|
/* Maximum length goes past end of tvbuff; search to end
|
|
|
|
of tvbuff. */
|
|
|
|
limit = tvbufflen;
|
2000-11-10 06:50:37 +00:00
|
|
|
}
|
|
|
|
else {
|
2000-11-30 06:11:32 +00:00
|
|
|
/* Maximum length doesn't go past end of tvbuff; search
|
|
|
|
to that value. */
|
2000-11-10 06:50:37 +00:00
|
|
|
limit = maxlength;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we have real data, perform our search now. */
|
|
|
|
if (tvb->real_data) {
|
|
|
|
result = guint8_pbrk(tvb->real_data + abs_offset, limit, needles);
|
|
|
|
if (result == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return result - tvb->real_data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
return tvb_pbrk_guint8(tvb->tvbuffs.subset.tvb,
|
|
|
|
abs_offset - tvb->tvbuffs.subset.offset,
|
|
|
|
limit, needles);
|
|
|
|
|
|
|
|
case TVBUFF_COMPOSITE:
|
|
|
|
g_assert_not_reached();
|
|
|
|
/* XXX - return composite_pbrk_guint8(tvb, offset, limit, needle); */
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2000-12-25 23:48:16 +00:00
|
|
|
/* Find size of stringz (NUL-terminated string) by looking for terminating
|
|
|
|
* NUL. The size of the string includes the terminating NUL.
|
|
|
|
*
|
|
|
|
* If the NUL isn't found, it throws the appropriate exception.
|
|
|
|
*/
|
|
|
|
guint
|
|
|
|
tvb_strsize(tvbuff_t *tvb, gint offset)
|
|
|
|
{
|
|
|
|
guint abs_offset, junk_length;
|
|
|
|
gint nul_offset;
|
|
|
|
|
|
|
|
check_offset_length(tvb, offset, 0, &abs_offset, &junk_length);
|
|
|
|
nul_offset = tvb_find_guint8(tvb, abs_offset, -1, 0);
|
|
|
|
if (nul_offset == -1) {
|
|
|
|
/*
|
|
|
|
* OK, we hit the end of the tvbuff, so we should throw
|
|
|
|
* an exception.
|
|
|
|
*
|
|
|
|
* Did we hit the end of the captured data, or the end
|
|
|
|
* of the actual data? If there's less captured data
|
|
|
|
* than actual data, we presumably hit the end of the
|
|
|
|
* captured data, otherwise we hit the end of the actual
|
|
|
|
* data.
|
|
|
|
*/
|
|
|
|
if (tvb_length(tvb) < tvb_reported_length(tvb)) {
|
|
|
|
THROW(BoundsError);
|
|
|
|
} else {
|
|
|
|
THROW(ReportedBoundsError);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (nul_offset - abs_offset) + 1;
|
|
|
|
}
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
/* Find length of string by looking for end of string ('\0'), up to
|
2000-11-10 09:15:57 +00:00
|
|
|
* 'maxlength' characters'; if 'maxlength' is -1, searches to end
|
|
|
|
* of tvbuff.
|
|
|
|
* Returns -1 if 'maxlength' reached before finding EOS. */
|
2000-09-07 15:29:40 +00:00
|
|
|
gint
|
|
|
|
tvb_strnlen(tvbuff_t *tvb, gint offset, guint maxlength)
|
2000-08-30 02:50:18 +00:00
|
|
|
{
|
|
|
|
gint result_offset;
|
|
|
|
guint abs_offset, junk_length;
|
|
|
|
|
|
|
|
check_offset_length(tvb, offset, 0, &abs_offset, &junk_length);
|
|
|
|
|
|
|
|
result_offset = tvb_find_guint8(tvb, abs_offset, maxlength, 0);
|
|
|
|
|
|
|
|
if (result_offset == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else {
|
2000-10-17 08:50:57 +00:00
|
|
|
return result_offset - abs_offset;
|
2000-08-30 02:50:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-07 13:00:12 +00:00
|
|
|
/*
|
|
|
|
* Implement strneql etc
|
|
|
|
*/
|
|
|
|
|
2001-07-02 07:11:40 +00:00
|
|
|
/*
|
|
|
|
* Call strncmp after checking if enough chars left, returning 0 if
|
|
|
|
* it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1.
|
|
|
|
*/
|
2000-09-07 15:29:40 +00:00
|
|
|
gint
|
2004-02-01 21:30:17 +00:00
|
|
|
tvb_strneql(tvbuff_t *tvb, gint offset, const gchar *str, gint size)
|
2000-09-07 13:00:12 +00:00
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8 *ptr;
|
2000-09-07 13:00:12 +00:00
|
|
|
|
2003-06-09 07:27:42 +00:00
|
|
|
ptr = ensure_contiguous_no_exception(tvb, offset, size, NULL);
|
2000-09-07 13:00:12 +00:00
|
|
|
|
2000-11-09 10:56:33 +00:00
|
|
|
if (ptr) {
|
2004-02-19 05:19:10 +00:00
|
|
|
int cmp = strncmp((const char *)ptr, str, size);
|
2000-09-07 13:00:12 +00:00
|
|
|
|
2000-11-09 10:56:33 +00:00
|
|
|
/*
|
|
|
|
* Return 0 if equal, -1 otherwise.
|
|
|
|
*/
|
|
|
|
return (cmp == 0 ? 0 : -1);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Not enough characters in the tvbuff to match the
|
|
|
|
* string.
|
|
|
|
*/
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2000-09-07 13:00:12 +00:00
|
|
|
|
2001-07-02 07:11:40 +00:00
|
|
|
/*
|
|
|
|
* Call strncasecmp after checking if enough chars left, returning 0 if
|
|
|
|
* it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1.
|
|
|
|
*/
|
2000-11-09 10:56:33 +00:00
|
|
|
gint
|
2004-02-01 06:49:25 +00:00
|
|
|
tvb_strncaseeql(tvbuff_t *tvb, gint offset, const gchar *str, gint size)
|
2000-11-09 10:56:33 +00:00
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8 *ptr;
|
2000-09-07 13:00:12 +00:00
|
|
|
|
2003-06-09 07:27:42 +00:00
|
|
|
ptr = ensure_contiguous_no_exception(tvb, offset, size, NULL);
|
2000-09-07 13:00:12 +00:00
|
|
|
|
2000-11-09 10:56:33 +00:00
|
|
|
if (ptr) {
|
2004-02-19 05:19:10 +00:00
|
|
|
int cmp = strncasecmp((const char *)ptr, str, size);
|
2000-09-07 13:00:12 +00:00
|
|
|
|
2000-11-09 10:56:33 +00:00
|
|
|
/*
|
|
|
|
* Return 0 if equal, -1 otherwise.
|
|
|
|
*/
|
|
|
|
return (cmp == 0 ? 0 : -1);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Not enough characters in the tvbuff to match the
|
|
|
|
* string.
|
|
|
|
*/
|
|
|
|
return -1;
|
|
|
|
}
|
2000-09-07 13:00:12 +00:00
|
|
|
}
|
2000-08-30 02:50:18 +00:00
|
|
|
|
2001-07-02 07:11:40 +00:00
|
|
|
/*
|
|
|
|
* Call memcmp after checking if enough chars left, returning 0 if
|
|
|
|
* it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1.
|
|
|
|
*/
|
|
|
|
gint
|
|
|
|
tvb_memeql(tvbuff_t *tvb, gint offset, const guint8 *str, gint size)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8 *ptr;
|
2001-07-02 07:11:40 +00:00
|
|
|
|
2003-06-09 07:27:42 +00:00
|
|
|
ptr = ensure_contiguous_no_exception(tvb, offset, size, NULL);
|
2001-07-02 07:11:40 +00:00
|
|
|
|
|
|
|
if (ptr) {
|
|
|
|
int cmp = memcmp(ptr, str, size);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return 0 if equal, -1 otherwise.
|
|
|
|
*/
|
|
|
|
return (cmp == 0 ? 0 : -1);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Not enough characters in the tvbuff to match the
|
|
|
|
* string.
|
|
|
|
*/
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-02-24 01:22:30 +00:00
|
|
|
/* Convert a string from Unicode to ASCII. At the moment we fake it by
|
|
|
|
* assuming all characters are ASCII )-: The caller must free the
|
|
|
|
* result returned. The len parameter is the number of guint16's to
|
|
|
|
* convert from Unicode. */
|
|
|
|
char *
|
|
|
|
tvb_fake_unicode(tvbuff_t *tvb, int offset, int len, gboolean little_endian)
|
|
|
|
{
|
|
|
|
char *buffer;
|
|
|
|
int i;
|
|
|
|
guint16 character;
|
|
|
|
|
|
|
|
/* Make sure we have enough data before allocating the buffer,
|
2003-06-04 21:45:49 +00:00
|
|
|
so we don't blow up if the length is huge. */
|
|
|
|
tvb_ensure_bytes_exist(tvb, offset, 2*len);
|
2003-02-24 01:22:30 +00:00
|
|
|
|
|
|
|
/* We know we won't throw an exception, so we don't have to worry
|
|
|
|
about leaking this buffer. */
|
|
|
|
buffer = g_malloc(len + 1);
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
character = little_endian ? tvb_get_letohs(tvb, offset)
|
|
|
|
: tvb_get_ntohs(tvb, offset);
|
|
|
|
buffer[i] = character & 0xff;
|
|
|
|
offset += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
buffer[len] = 0;
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2000-09-08 06:16:58 +00:00
|
|
|
/*
|
|
|
|
* Format the data in the tvb from offset for length ...
|
|
|
|
*/
|
|
|
|
|
2004-01-23 09:40:38 +00:00
|
|
|
gchar *
|
2000-09-08 06:16:58 +00:00
|
|
|
tvb_format_text(tvbuff_t *tvb, gint offset, gint size)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8 *ptr;
|
2000-09-08 06:16:58 +00:00
|
|
|
gint len = size;
|
|
|
|
|
|
|
|
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
|
|
|
|
|
|
|
|
len = tvb_length_remaining(tvb, offset);
|
|
|
|
ptr = ensure_contiguous(tvb, offset, len);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return format_text(ptr, len);
|
2002-08-28 20:41:00 +00:00
|
|
|
|
2000-09-08 06:16:58 +00:00
|
|
|
}
|
|
|
|
|
2004-03-23 18:06:29 +00:00
|
|
|
/*
|
|
|
|
* Like "tvb_format_text()", but for null-padded strings; don't show
|
|
|
|
* the null padding characters as "\000".
|
|
|
|
*/
|
|
|
|
gchar *
|
|
|
|
tvb_format_stringzpad(tvbuff_t *tvb, gint offset, gint size)
|
|
|
|
{
|
|
|
|
const guint8 *ptr, *p;
|
|
|
|
gint len = size;
|
|
|
|
gint stringlen;
|
|
|
|
|
|
|
|
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
|
|
|
|
|
|
|
|
len = tvb_length_remaining(tvb, offset);
|
|
|
|
ptr = ensure_contiguous(tvb, offset, len);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
for (p = ptr, stringlen = 0; stringlen < len && *p != '\0'; p++, stringlen++)
|
|
|
|
;
|
|
|
|
return format_text(ptr, stringlen);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
/*
|
|
|
|
* Given a tvbuff, an offset, and a length, allocate a buffer big enough
|
|
|
|
* to hold a non-null-terminated string of that length at that offset,
|
|
|
|
* plus a trailing '\0', copy the string into it, and return a pointer
|
|
|
|
* to the string.
|
|
|
|
*
|
|
|
|
* Throws an exception if the tvbuff ends before the string does.
|
|
|
|
*/
|
|
|
|
guint8 *
|
|
|
|
tvb_get_string(tvbuff_t *tvb, gint offset, gint length)
|
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8 *ptr;
|
|
|
|
guint8 *strbuf;
|
Add new routines:
tvb_get_string() - takes a tvbuff, an offset, and a length as
arguments, allocates a buffer big enough to hold a string with
the specified number of bytes plus an added null terminator
(i.e., length+1), copies the specified number of bytes from the
tvbuff, at the specified offset, to that buffer and puts in a
null terminator, and returns a pointer to that buffer (or throws
an exception before allocating the buffer if that many bytes
aren't available in the tvbuff);
tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
a "gint" as arguments, gets the size of the null-terminated
string starting at the specified offset in the tvbuff (throwing
an exception if the null terminator isn't found), allocates a
buffer big enough to hold that string, copies the string to that
buffer, and returns a pointer to that buffer and stores the
length of the string (including the terminating null) in the
variable pointed to by the "gint" pointer.
Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).
Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string). Use "tvb_get_stringz()", instead.
In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.
svn path=/trunk/; revision=7859
2003-06-12 08:33:32 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, length);
|
|
|
|
strbuf = g_malloc(length + 1);
|
|
|
|
if (length != 0)
|
|
|
|
memcpy(strbuf, ptr, length);
|
|
|
|
strbuf[length] = '\0';
|
|
|
|
return strbuf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Given a tvbuff and an offset, with the offset assumed to refer to
|
|
|
|
* a null-terminated string, find the length of that string (and throw
|
|
|
|
* an exception if the tvbuff ends before we find the null), allocate
|
|
|
|
* a buffer big enough to hold the string, copy the string into it,
|
|
|
|
* and return a pointer to the string. Also return the length of the
|
|
|
|
* string (including the terminating null) through a pointer.
|
|
|
|
*/
|
|
|
|
guint8 *
|
|
|
|
tvb_get_stringz(tvbuff_t *tvb, gint offset, gint *lengthp)
|
|
|
|
{
|
|
|
|
guint size;
|
|
|
|
guint8 *strptr;
|
|
|
|
|
|
|
|
size = tvb_strsize(tvb, offset);
|
|
|
|
strptr = g_malloc(size);
|
|
|
|
tvb_memcpy(tvb, strptr, offset, size);
|
|
|
|
*lengthp = size;
|
|
|
|
return strptr;
|
|
|
|
}
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
/* Looks for a stringz (NUL-terminated string) in tvbuff and copies
|
2003-04-30 02:35:28 +00:00
|
|
|
* no more than bufsize number of bytes, including terminating NUL, to buffer.
|
|
|
|
* Returns length of string (not including terminating NUL), or -1 if the string was
|
|
|
|
* truncated in the buffer due to not having reached the terminating NUL.
|
|
|
|
* In this way, it acts like snprintf().
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
*
|
2003-08-08 08:19:50 +00:00
|
|
|
* bufsize MUST be greater than 0.
|
|
|
|
*
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
* When processing a packet where the remaining number of bytes is less
|
2003-04-30 02:35:28 +00:00
|
|
|
* than bufsize, an exception is not thrown if the end of the packet
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
* is reached before the NUL is found. If no NUL is found before reaching
|
|
|
|
* the end of the short packet, -1 is still returned, and the string
|
2003-04-30 02:35:28 +00:00
|
|
|
* is truncated with a NUL, albeit not at buffer[bufsize - 1], but
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
* at the correct spot, terminating the string.
|
|
|
|
*
|
|
|
|
* *bytes_copied will contain the number of bytes actually copied,
|
|
|
|
* including the terminating-NUL.
|
2000-08-30 02:50:18 +00:00
|
|
|
*/
|
2002-05-05 21:07:52 +00:00
|
|
|
static gint
|
2003-04-30 02:35:28 +00:00
|
|
|
_tvb_get_nstringz(tvbuff_t *tvb, gint offset, guint bufsize, guint8* buffer,
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
gint *bytes_copied)
|
2000-08-30 02:50:18 +00:00
|
|
|
{
|
2000-10-17 08:50:57 +00:00
|
|
|
gint stringlen;
|
2000-08-30 02:50:18 +00:00
|
|
|
guint abs_offset, junk_length;
|
2001-10-26 17:29:12 +00:00
|
|
|
gint limit, len;
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
gboolean decreased_max = FALSE;
|
2000-08-30 02:50:18 +00:00
|
|
|
|
|
|
|
check_offset_length(tvb, offset, 0, &abs_offset, &junk_length);
|
|
|
|
|
2003-08-08 08:19:50 +00:00
|
|
|
/* There must at least be room for the terminating NUL. */
|
|
|
|
g_assert(bufsize != 0);
|
|
|
|
|
|
|
|
/* If there's no room for anything else, just return the NUL. */
|
|
|
|
if (bufsize == 1) {
|
2000-08-30 02:50:18 +00:00
|
|
|
buffer[0] = 0;
|
2003-04-28 04:03:26 +00:00
|
|
|
*bytes_copied = 1;
|
2000-08-30 02:50:18 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
/* Only read to end of tvbuff, w/o throwing exception. */
|
2001-10-26 17:29:12 +00:00
|
|
|
len = tvb_length_remaining(tvb, abs_offset);
|
|
|
|
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
/* check_offset_length() won't throw an exception if we're
|
|
|
|
* looking at the byte immediately after the end of the tvbuff. */
|
|
|
|
if (len == 0) {
|
|
|
|
THROW(ReportedBoundsError);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This should not happen because check_offset_length() would
|
2003-04-28 04:03:26 +00:00
|
|
|
* have already thrown an exception if 'offset' were out-of-bounds.
|
|
|
|
*/
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
g_assert(len != -1);
|
2001-10-26 17:29:12 +00:00
|
|
|
|
2003-04-28 04:03:26 +00:00
|
|
|
/*
|
2003-04-30 02:35:28 +00:00
|
|
|
* If we've been passed a negative number, bufsize will
|
2003-04-28 04:03:26 +00:00
|
|
|
* be huge.
|
|
|
|
*/
|
2003-04-30 02:35:28 +00:00
|
|
|
g_assert(bufsize <= G_MAXINT);
|
2003-04-28 04:03:26 +00:00
|
|
|
|
2003-04-30 02:35:28 +00:00
|
|
|
if ((guint)len < bufsize) {
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
limit = len;
|
|
|
|
decreased_max = TRUE;
|
2000-08-30 02:50:18 +00:00
|
|
|
}
|
|
|
|
else {
|
2003-04-30 02:35:28 +00:00
|
|
|
limit = bufsize;
|
2000-08-30 02:50:18 +00:00
|
|
|
}
|
|
|
|
|
2003-04-30 02:35:28 +00:00
|
|
|
stringlen = tvb_strnlen(tvb, abs_offset, limit - 1);
|
2000-08-30 02:50:18 +00:00
|
|
|
/* If NUL wasn't found, copy the data and return -1 */
|
2000-10-17 08:50:57 +00:00
|
|
|
if (stringlen == -1) {
|
2000-08-30 02:50:18 +00:00
|
|
|
tvb_memcpy(tvb, buffer, abs_offset, limit);
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
if (decreased_max) {
|
|
|
|
buffer[limit] = 0;
|
|
|
|
/* Add 1 for the extra NUL that we set at buffer[limit],
|
|
|
|
* pretending that it was copied as part of the string. */
|
|
|
|
*bytes_copied = limit + 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*bytes_copied = limit;
|
|
|
|
}
|
2000-08-30 02:50:18 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the string to buffer */
|
|
|
|
tvb_memcpy(tvb, buffer, abs_offset, stringlen + 1);
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
*bytes_copied = stringlen + 1;
|
2000-08-30 02:50:18 +00:00
|
|
|
return stringlen;
|
|
|
|
}
|
|
|
|
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
/* Looks for a stringz (NUL-terminated string) in tvbuff and copies
|
2003-04-30 02:35:28 +00:00
|
|
|
* no more than bufsize number of bytes, including terminating NUL, to buffer.
|
|
|
|
* Returns length of string (not including terminating NUL), or -1 if the string was
|
|
|
|
* truncated in the buffer due to not having reached the terminating NUL.
|
|
|
|
* In this way, it acts like snprintf().
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
*
|
|
|
|
* When processing a packet where the remaining number of bytes is less
|
2003-04-30 02:35:28 +00:00
|
|
|
* than bufsize, an exception is not thrown if the end of the packet
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
* is reached before the NUL is found. If no NUL is found before reaching
|
|
|
|
* the end of the short packet, -1 is still returned, and the string
|
2003-04-30 02:35:28 +00:00
|
|
|
* is truncated with a NUL, albeit not at buffer[bufsize - 1], but
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
* at the correct spot, terminating the string.
|
|
|
|
*/
|
|
|
|
gint
|
2003-04-30 02:35:28 +00:00
|
|
|
tvb_get_nstringz(tvbuff_t *tvb, gint offset, guint bufsize, guint8* buffer)
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
{
|
|
|
|
gint bytes_copied;
|
|
|
|
|
2003-04-30 02:35:28 +00:00
|
|
|
return _tvb_get_nstringz(tvb, offset, bufsize, buffer, &bytes_copied);
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
}
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
/* Like tvb_get_nstringz(), but never returns -1. The string is guaranteed to
|
|
|
|
* have a terminating NUL. If the string was truncated when copied into buffer,
|
|
|
|
* a NUL is placed at the end of buffer to terminate it.
|
|
|
|
*/
|
|
|
|
gint
|
2003-04-30 02:35:28 +00:00
|
|
|
tvb_get_nstringz0(tvbuff_t *tvb, gint offset, guint bufsize, guint8* buffer)
|
2000-08-30 02:50:18 +00:00
|
|
|
{
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
gint len, bytes_copied;
|
2000-08-30 02:50:18 +00:00
|
|
|
|
2003-04-30 02:35:28 +00:00
|
|
|
len = _tvb_get_nstringz(tvb, offset, bufsize, buffer, &bytes_copied);
|
2000-08-30 02:50:18 +00:00
|
|
|
|
|
|
|
if (len == -1) {
|
2003-04-30 02:35:28 +00:00
|
|
|
buffer[bufsize - 1] = 0;
|
tvb_get_nstringz() needs to terminate a string with a NUL if the
end of the tvbuff is reached before the maximum_length passed by the
caller is reached and before a terminating NUL is found. In this case,
tvb_get_nstringz() returns a -1, but if the string is not artificially
terminated with a NUL by tvb_get_nstringz(), the
caller has no idea where the string should end because 1) the
return value "-1" gives the impression that the string ends
at the end of the buffer but 2) the string does
not end at the end of the buffer, but somewhere in the middle, due
to the packet being shorter than expected.
tvb_get_nstringz() and tvb_get_nstringz0() were both modified.
The FT_STRINGZ case in proto_tree_add_item() is made simpler.
During regression testing, when investigating a regression that I later
corrected, I discovered that strings added through proto_tree_add_item
(FT_STRING, FT_STRINGZ, and FT_UINT_STRING) leaked memory due to double
allocation of the string. The proto_tree_add_string*() functions do
not leak memory, since they only copy the string once. The memory
leak was fixed by adding another argument to the static function
proto_tree_set_string() to let the string ftype code know to g_strdup()
the string or not.
svn path=/trunk/; revision=4891
2002-03-06 19:17:06 +00:00
|
|
|
return bytes_copied - 1;
|
2000-08-30 02:50:18 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
}
|
2000-11-09 10:56:33 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Given a tvbuff, an offset into the tvbuff, and a length that starts
|
|
|
|
* at that offset (which may be -1 for "all the way to the end of the
|
|
|
|
* tvbuff"), find the end of the (putative) line that starts at the
|
|
|
|
* specified offset in the tvbuff, going no further than the specified
|
|
|
|
* length.
|
|
|
|
*
|
|
|
|
* Return the length of the line (not counting the line terminator at
|
2002-07-17 06:55:29 +00:00
|
|
|
* the end), or, if we don't find a line terminator:
|
|
|
|
*
|
|
|
|
* if "deseg" is true, return -1;
|
|
|
|
*
|
|
|
|
* if "deseg" is false, return the amount of data remaining in
|
|
|
|
* the buffer.
|
2000-11-09 10:56:33 +00:00
|
|
|
*
|
|
|
|
* Set "*next_offset" to the offset of the character past the line
|
|
|
|
* terminator, or past the end of the buffer if we don't find a line
|
2002-07-17 06:55:29 +00:00
|
|
|
* terminator. (It's not set if we return -1.)
|
2000-11-09 10:56:33 +00:00
|
|
|
*/
|
2000-11-10 06:50:37 +00:00
|
|
|
gint
|
2002-07-17 06:55:29 +00:00
|
|
|
tvb_find_line_end(tvbuff_t *tvb, gint offset, int len, gint *next_offset,
|
|
|
|
gboolean desegment)
|
2000-11-09 10:56:33 +00:00
|
|
|
{
|
|
|
|
gint eob_offset;
|
|
|
|
gint eol_offset;
|
|
|
|
int linelen;
|
|
|
|
|
|
|
|
if (len == -1)
|
|
|
|
len = tvb_length_remaining(tvb, offset);
|
|
|
|
/*
|
|
|
|
* XXX - what if "len" is still -1, meaning "offset is past the
|
|
|
|
* end of the tvbuff"?
|
|
|
|
*/
|
|
|
|
eob_offset = offset + len;
|
|
|
|
|
2000-11-12 00:59:09 +00:00
|
|
|
/*
|
|
|
|
* Look either for a CR or an LF.
|
|
|
|
*/
|
2004-02-01 21:30:17 +00:00
|
|
|
eol_offset = tvb_pbrk_guint8(tvb, offset, len, (guint8 *)"\r\n");
|
2000-11-09 10:56:33 +00:00
|
|
|
if (eol_offset == -1) {
|
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* No CR or LF - line is presumably continued in next packet.
|
2000-11-09 10:56:33 +00:00
|
|
|
*/
|
2002-07-17 06:55:29 +00:00
|
|
|
if (desegment) {
|
|
|
|
/*
|
|
|
|
* Tell our caller we saw no EOL, so they can
|
|
|
|
* try to desegment and get the entire line
|
|
|
|
* into one tvbuff.
|
|
|
|
*/
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Pretend the line runs to the end of the tvbuff.
|
|
|
|
*/
|
|
|
|
linelen = eob_offset - offset;
|
|
|
|
*next_offset = eob_offset;
|
|
|
|
}
|
2000-11-09 10:56:33 +00:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Find the number of bytes between the starting offset
|
2000-11-12 00:59:09 +00:00
|
|
|
* and the CR or LF.
|
2000-11-09 10:56:33 +00:00
|
|
|
*/
|
|
|
|
linelen = eol_offset - offset;
|
|
|
|
|
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* Is it a CR?
|
2000-11-09 10:56:33 +00:00
|
|
|
*/
|
2000-11-12 00:59:09 +00:00
|
|
|
if (tvb_get_guint8(tvb, eol_offset) == '\r') {
|
2000-11-09 10:56:33 +00:00
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* Yes - is it followed by an LF?
|
2000-11-09 10:56:33 +00:00
|
|
|
*/
|
2002-07-17 06:55:29 +00:00
|
|
|
if (eol_offset + 1 >= eob_offset) {
|
|
|
|
/*
|
|
|
|
* Dunno - the next byte isn't in this
|
|
|
|
* tvbuff.
|
|
|
|
*/
|
|
|
|
if (desegment) {
|
|
|
|
/*
|
|
|
|
* We'll return -1, although that
|
|
|
|
* runs the risk that if the line
|
|
|
|
* really *is* terminated with a CR,
|
|
|
|
* we won't properly dissect this
|
|
|
|
* tvbuff.
|
|
|
|
*
|
|
|
|
* It's probably more likely that
|
|
|
|
* the line ends with CR-LF than
|
|
|
|
* that it ends with CR by itself.
|
|
|
|
*/
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
2000-11-09 10:56:33 +00:00
|
|
|
/*
|
2002-07-17 06:55:29 +00:00
|
|
|
* Well, we can at least look at the next
|
|
|
|
* byte.
|
2000-11-09 10:56:33 +00:00
|
|
|
*/
|
2002-07-17 06:55:29 +00:00
|
|
|
if (tvb_get_guint8(tvb, eol_offset + 1) == '\n') {
|
|
|
|
/*
|
|
|
|
* It's an LF; skip over the CR.
|
|
|
|
*/
|
|
|
|
eol_offset++;
|
|
|
|
}
|
2000-11-09 10:56:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2000-11-10 06:50:37 +00:00
|
|
|
* Return the offset of the character after the last
|
2000-11-12 00:59:09 +00:00
|
|
|
* character in the line, skipping over the last character
|
|
|
|
* in the line terminator.
|
2000-11-10 06:50:37 +00:00
|
|
|
*/
|
|
|
|
*next_offset = eol_offset + 1;
|
|
|
|
}
|
|
|
|
return linelen;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Given a tvbuff, an offset into the tvbuff, and a length that starts
|
|
|
|
* at that offset (which may be -1 for "all the way to the end of the
|
|
|
|
* tvbuff"), find the end of the (putative) line that starts at the
|
|
|
|
* specified offset in the tvbuff, going no further than the specified
|
|
|
|
* length.
|
|
|
|
*
|
|
|
|
* However, treat quoted strings inside the buffer specially - don't
|
|
|
|
* treat newlines in quoted strings as line terminators.
|
|
|
|
*
|
|
|
|
* Return the length of the line (not counting the line terminator at
|
|
|
|
* the end), or the amount of data remaining in the buffer if we don't
|
|
|
|
* find a line terminator.
|
|
|
|
*
|
|
|
|
* Set "*next_offset" to the offset of the character past the line
|
|
|
|
* terminator, or past the end of the buffer if we don't find a line
|
|
|
|
* terminator.
|
|
|
|
*/
|
|
|
|
gint
|
|
|
|
tvb_find_line_end_unquoted(tvbuff_t *tvb, gint offset, int len,
|
|
|
|
gint *next_offset)
|
|
|
|
{
|
|
|
|
gint cur_offset, char_offset;
|
|
|
|
gboolean is_quoted;
|
2002-08-02 21:29:45 +00:00
|
|
|
guchar c;
|
2000-11-10 06:50:37 +00:00
|
|
|
gint eob_offset;
|
|
|
|
int linelen;
|
|
|
|
|
|
|
|
if (len == -1)
|
|
|
|
len = tvb_length_remaining(tvb, offset);
|
|
|
|
/*
|
|
|
|
* XXX - what if "len" is still -1, meaning "offset is past the
|
|
|
|
* end of the tvbuff"?
|
|
|
|
*/
|
|
|
|
eob_offset = offset + len;
|
|
|
|
|
|
|
|
cur_offset = offset;
|
|
|
|
is_quoted = FALSE;
|
|
|
|
for (;;) {
|
|
|
|
/*
|
|
|
|
* Is this part of the string quoted?
|
|
|
|
*/
|
|
|
|
if (is_quoted) {
|
|
|
|
/*
|
|
|
|
* Yes - look only for the terminating quote.
|
|
|
|
*/
|
|
|
|
char_offset = tvb_find_guint8(tvb, cur_offset, len,
|
|
|
|
'"');
|
|
|
|
} else {
|
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* Look either for a CR, an LF, or a '"'.
|
2000-11-10 06:50:37 +00:00
|
|
|
*/
|
|
|
|
char_offset = tvb_pbrk_guint8(tvb, cur_offset, len,
|
2004-02-01 21:30:17 +00:00
|
|
|
(guint8 *)"\r\n\"");
|
2000-11-10 06:50:37 +00:00
|
|
|
}
|
2000-11-30 06:11:32 +00:00
|
|
|
if (char_offset == -1) {
|
2000-11-10 06:50:37 +00:00
|
|
|
/*
|
|
|
|
* Not found - line is presumably continued in
|
|
|
|
* next packet.
|
|
|
|
* We pretend the line runs to the end of the tvbuff.
|
|
|
|
*/
|
|
|
|
linelen = eob_offset - offset;
|
|
|
|
*next_offset = eob_offset;
|
|
|
|
break;
|
|
|
|
}
|
2002-08-28 20:41:00 +00:00
|
|
|
|
2000-11-12 00:59:09 +00:00
|
|
|
if (is_quoted) {
|
|
|
|
/*
|
|
|
|
* We're processing a quoted string.
|
|
|
|
* We only looked for ", so we know it's a ";
|
|
|
|
* as we're processing a quoted string, it's a
|
|
|
|
* closing quote.
|
|
|
|
*/
|
|
|
|
is_quoted = FALSE;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* OK, what is it?
|
|
|
|
*/
|
|
|
|
c = tvb_get_guint8(tvb, char_offset);
|
|
|
|
if (c == '"') {
|
2000-11-10 06:50:37 +00:00
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* Un-quoted "; it begins a quoted
|
|
|
|
* string.
|
2000-11-10 06:50:37 +00:00
|
|
|
*/
|
2000-11-12 00:59:09 +00:00
|
|
|
is_quoted = TRUE;
|
2000-11-10 06:50:37 +00:00
|
|
|
} else {
|
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* It's a CR or LF; we've found a line
|
|
|
|
* terminator.
|
|
|
|
*
|
2000-11-10 06:50:37 +00:00
|
|
|
* Find the number of bytes between the
|
2000-11-12 00:59:09 +00:00
|
|
|
* starting offset and the CR or LF.
|
2000-11-10 06:50:37 +00:00
|
|
|
*/
|
|
|
|
linelen = char_offset - offset;
|
|
|
|
|
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* Is it a CR?
|
2000-11-10 06:50:37 +00:00
|
|
|
*/
|
2000-11-12 00:59:09 +00:00
|
|
|
if (c == '\r') {
|
2000-11-10 06:50:37 +00:00
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* Yes; is it followed by an LF?
|
2000-11-10 06:50:37 +00:00
|
|
|
*/
|
2000-11-12 00:59:09 +00:00
|
|
|
if (char_offset + 1 < eob_offset &&
|
|
|
|
tvb_get_guint8(tvb, char_offset + 1)
|
|
|
|
== '\n') {
|
2000-11-10 06:50:37 +00:00
|
|
|
/*
|
2000-11-12 00:59:09 +00:00
|
|
|
* Yes; skip over the CR.
|
2000-11-10 06:50:37 +00:00
|
|
|
*/
|
2000-11-12 00:59:09 +00:00
|
|
|
char_offset++;
|
2000-11-10 06:50:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the offset of the character after
|
2000-11-12 00:59:09 +00:00
|
|
|
* the last character in the line, skipping
|
|
|
|
* over the last character in the line
|
|
|
|
* terminator, and quit.
|
2000-11-10 06:50:37 +00:00
|
|
|
*/
|
|
|
|
*next_offset = char_offset + 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Step past the character we found.
|
2000-11-09 10:56:33 +00:00
|
|
|
*/
|
2000-11-10 06:50:37 +00:00
|
|
|
cur_offset = char_offset + 1;
|
|
|
|
if (cur_offset >= eob_offset) {
|
|
|
|
/*
|
|
|
|
* The character we found was the last character
|
|
|
|
* in the tvbuff - line is presumably continued in
|
|
|
|
* next packet.
|
|
|
|
* We pretend the line runs to the end of the tvbuff.
|
|
|
|
*/
|
|
|
|
linelen = eob_offset - offset;
|
|
|
|
*next_offset = eob_offset;
|
|
|
|
break;
|
|
|
|
}
|
2000-11-09 10:56:33 +00:00
|
|
|
}
|
|
|
|
return linelen;
|
|
|
|
}
|
2000-11-13 07:19:37 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Format a bunch of data from a tvbuff as bytes, returning a pointer
|
|
|
|
* to the string with the formatted data.
|
|
|
|
*/
|
|
|
|
gchar *
|
|
|
|
tvb_bytes_to_str(tvbuff_t *tvb, gint offset, gint len)
|
|
|
|
{
|
|
|
|
return bytes_to_str(tvb_get_ptr(tvb, offset, len), len);
|
|
|
|
}
|
2001-03-23 14:44:04 +00:00
|
|
|
|
2003-08-27 15:23:11 +00:00
|
|
|
/* Find a needle tvbuff within a haystack tvbuff. */
|
|
|
|
gint
|
|
|
|
tvb_find_tvb(tvbuff_t *haystack_tvb, tvbuff_t *needle_tvb, gint haystack_offset)
|
|
|
|
{
|
|
|
|
guint haystack_abs_offset, haystack_abs_length;
|
|
|
|
const guint8 *haystack_data;
|
|
|
|
const guint8 *needle_data;
|
|
|
|
const guint needle_len = needle_tvb->length;
|
|
|
|
const guint8 *location;
|
|
|
|
|
2003-09-10 21:19:47 +00:00
|
|
|
if (haystack_tvb->length < 1 || needle_tvb->length < 1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2003-08-27 15:23:11 +00:00
|
|
|
/* Get pointers to the tvbuffs' data. */
|
|
|
|
haystack_data = tvb_get_ptr(haystack_tvb, 0, -1);
|
|
|
|
needle_data = tvb_get_ptr(needle_tvb, 0, -1);
|
|
|
|
|
|
|
|
check_offset_length(haystack_tvb, haystack_offset, -1,
|
|
|
|
&haystack_abs_offset, &haystack_abs_length);
|
|
|
|
|
|
|
|
location = epan_memmem(haystack_data + haystack_abs_offset, haystack_abs_length,
|
|
|
|
needle_data, needle_len);
|
|
|
|
|
|
|
|
if (location) {
|
|
|
|
return location - haystack_data;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_LIBZ
|
|
|
|
/*
|
|
|
|
* Uncompresses a zlib compressed packet inside a message of tvb at offset with
|
|
|
|
* length comprlen. Returns an uncompressed tvbuffer if uncompression
|
|
|
|
* succeeded or NULL if uncompression failed.
|
|
|
|
*/
|
2004-05-10 22:14:07 +00:00
|
|
|
#define TVB_Z_MIN_BUFSIZ 32768
|
|
|
|
#define TVB_Z_MAX_BUFSIZ 1048576 * 10
|
|
|
|
/* #define TVB_Z_DEBUG 1 */
|
|
|
|
#undef TVB_Z_DEBUG
|
|
|
|
|
2004-05-05 06:55:09 +00:00
|
|
|
tvbuff_t *
|
|
|
|
tvb_uncompress(tvbuff_t *tvb, int offset, int comprlen)
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
gint err = Z_OK;
|
2004-05-10 22:14:07 +00:00
|
|
|
guint bytes_out = 0;
|
2004-05-05 06:55:09 +00:00
|
|
|
guint8 *compr = NULL;
|
|
|
|
guint8 *uncompr = NULL;
|
|
|
|
tvbuff_t *uncompr_tvb = NULL;
|
|
|
|
z_streamp strm = NULL;
|
2004-05-10 22:14:07 +00:00
|
|
|
Bytef *strmbuf = NULL;
|
|
|
|
guint inits_done = 0;
|
2004-05-05 06:55:09 +00:00
|
|
|
gint wbits = MAX_WBITS;
|
|
|
|
guint8 *next = NULL;
|
2004-05-10 22:14:07 +00:00
|
|
|
guint bufsiz = TVB_Z_MIN_BUFSIZ;
|
|
|
|
#ifdef TVB_Z_DEBUG
|
|
|
|
guint inflate_passes = 0;
|
|
|
|
guint bytes_in = tvb_length_remaining(tvb, offset);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (tvb == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
strm = g_malloc0(sizeof(z_stream));
|
|
|
|
|
|
|
|
if (strm == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
compr = tvb_memdup(tvb, offset, comprlen);
|
|
|
|
|
|
|
|
if (!compr) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-05-10 22:14:07 +00:00
|
|
|
/*
|
|
|
|
* Assume that the uncompressed data is at least twice as big as
|
|
|
|
* the compressed size.
|
|
|
|
*/
|
|
|
|
bufsiz = tvb_length_remaining(tvb, offset) * 2;
|
|
|
|
|
|
|
|
if (bufsiz < TVB_Z_MIN_BUFSIZ) {
|
|
|
|
bufsiz = TVB_Z_MIN_BUFSIZ;
|
|
|
|
} else if (bufsiz > TVB_Z_MAX_BUFSIZ) {
|
|
|
|
bufsiz = TVB_Z_MIN_BUFSIZ;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef TVB_Z_DEBUG
|
|
|
|
printf("bufsiz: %u bytes\n", bufsiz);
|
|
|
|
#endif
|
|
|
|
|
2004-05-05 06:55:09 +00:00
|
|
|
next = compr;
|
|
|
|
|
|
|
|
strm->next_in = next;
|
|
|
|
strm->avail_in = comprlen;
|
|
|
|
|
2004-05-10 22:14:07 +00:00
|
|
|
|
|
|
|
strmbuf = g_malloc0(bufsiz);
|
|
|
|
|
|
|
|
if(strmbuf == NULL) {
|
|
|
|
g_free(compr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
strm->next_out = strmbuf;
|
|
|
|
strm->avail_out = bufsiz;
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
err = inflateInit2(strm, wbits);
|
|
|
|
inits_done = 1;
|
|
|
|
if (err != Z_OK) {
|
|
|
|
g_free(strm);
|
|
|
|
g_free(compr);
|
2004-05-10 22:14:07 +00:00
|
|
|
g_free(strmbuf);
|
2004-05-05 06:55:09 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (1) {
|
2004-05-10 22:14:07 +00:00
|
|
|
memset(strmbuf, '\0', bufsiz);
|
|
|
|
strm->next_out = strmbuf;
|
|
|
|
strm->avail_out = bufsiz;
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
err = inflate(strm, Z_SYNC_FLUSH);
|
|
|
|
|
|
|
|
if (err == Z_OK || err == Z_STREAM_END) {
|
2004-05-10 22:14:07 +00:00
|
|
|
guint bytes_pass = bufsiz - strm->avail_out;
|
|
|
|
|
|
|
|
#ifdef TVB_Z_DEBUG
|
|
|
|
++inflate_passes;
|
|
|
|
#endif
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
if (uncompr == NULL) {
|
2004-05-10 22:14:07 +00:00
|
|
|
uncompr = g_memdup(strmbuf, bytes_pass);
|
2004-05-05 06:55:09 +00:00
|
|
|
} else {
|
|
|
|
guint8 *new_data = g_malloc0(bytes_out +
|
|
|
|
bytes_pass);
|
|
|
|
|
|
|
|
if (new_data == NULL) {
|
|
|
|
g_free(strm);
|
2004-05-10 22:14:07 +00:00
|
|
|
g_free(strmbuf);
|
2004-05-05 06:55:09 +00:00
|
|
|
g_free(compr);
|
|
|
|
|
|
|
|
if (uncompr != NULL) {
|
|
|
|
g_free(uncompr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_memmove(new_data, uncompr, bytes_out);
|
2004-05-10 22:14:07 +00:00
|
|
|
g_memmove((new_data + bytes_out), strmbuf,
|
2004-05-05 06:55:09 +00:00
|
|
|
bytes_pass);
|
|
|
|
|
|
|
|
g_free(uncompr);
|
|
|
|
uncompr = new_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
bytes_out += bytes_pass;
|
|
|
|
|
|
|
|
if ( err == Z_STREAM_END) {
|
|
|
|
inflateEnd(strm);
|
|
|
|
g_free(strm);
|
2004-05-10 22:14:07 +00:00
|
|
|
g_free(strmbuf);
|
2004-05-05 06:55:09 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else if (err == Z_BUF_ERROR) {
|
|
|
|
/*
|
|
|
|
* It's possible that not enough frames were captured
|
|
|
|
* to decompress this fully, so return what we've done
|
|
|
|
* so far, if any.
|
|
|
|
*/
|
|
|
|
|
|
|
|
g_free(strm);
|
2004-05-10 22:14:07 +00:00
|
|
|
g_free(strmbuf);
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
if (uncompr != NULL) {
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
g_free(compr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (err == Z_DATA_ERROR && inits_done == 1
|
|
|
|
&& uncompr == NULL && (*compr == 0x1f) &&
|
|
|
|
(*(compr + 1) == 0x8b)) {
|
|
|
|
/*
|
|
|
|
* inflate() is supposed to handle both gzip and deflate
|
|
|
|
* streams automatically, but in reality it doesn't
|
|
|
|
* seem to handle either (at least not within the
|
|
|
|
* context of an HTTP response.) We have to try
|
|
|
|
* several tweaks, depending on the type of data and
|
|
|
|
* version of the library installed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Gzip file format. Skip past the header, since the
|
|
|
|
* fix to make it work (setting windowBits to 31)
|
|
|
|
* doesn't work with all versions of the library.
|
|
|
|
*/
|
|
|
|
Bytef *c = compr + 2;
|
|
|
|
Bytef flags = 0;
|
|
|
|
|
|
|
|
if (*c == Z_DEFLATED) {
|
|
|
|
c++;
|
|
|
|
} else {
|
|
|
|
g_free(strm);
|
|
|
|
g_free(compr);
|
2004-05-10 22:14:07 +00:00
|
|
|
g_free(strmbuf);
|
2004-05-05 06:55:09 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
flags = *c;
|
|
|
|
|
|
|
|
/* Skip past the MTIME, XFL, and OS fields. */
|
|
|
|
c += 7;
|
|
|
|
|
2004-08-02 18:58:19 +00:00
|
|
|
if (flags & (1 << 2)) {
|
2004-05-05 06:55:09 +00:00
|
|
|
/* An Extra field is present. */
|
|
|
|
gint xsize = (gint)(*c |
|
|
|
|
(*(c + 1) << 8));
|
|
|
|
|
|
|
|
c += xsize;
|
|
|
|
}
|
|
|
|
|
2004-08-02 18:58:19 +00:00
|
|
|
if (flags & (1 << 3)) {
|
2004-05-05 06:55:09 +00:00
|
|
|
/* A null terminated filename */
|
|
|
|
|
2004-05-06 17:40:52 +00:00
|
|
|
while (*c != '\0') {
|
2004-05-05 06:55:09 +00:00
|
|
|
c++;
|
|
|
|
}
|
|
|
|
|
|
|
|
c++;
|
|
|
|
}
|
|
|
|
|
2004-08-02 18:58:19 +00:00
|
|
|
if (flags & (1 << 4)) {
|
2004-05-05 06:55:09 +00:00
|
|
|
/* A null terminated comment */
|
|
|
|
|
2004-05-06 17:40:52 +00:00
|
|
|
while (*c != '\0') {
|
2004-05-05 06:55:09 +00:00
|
|
|
c++;
|
|
|
|
}
|
|
|
|
|
|
|
|
c++;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
inflateReset(strm);
|
|
|
|
next = c;
|
|
|
|
strm->next_in = next;
|
|
|
|
comprlen -= (c - compr);
|
|
|
|
|
|
|
|
err = inflateInit2(strm, wbits);
|
|
|
|
inits_done++;
|
|
|
|
} else if (err == Z_DATA_ERROR && uncompr == NULL &&
|
|
|
|
inits_done <= 3) {
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Re-init the stream with a negative
|
|
|
|
* MAX_WBITS. This is necessary due to
|
|
|
|
* some servers (Apache) not sending
|
|
|
|
* the deflate header with the
|
|
|
|
* content-encoded response.
|
|
|
|
*/
|
|
|
|
wbits = -MAX_WBITS;
|
|
|
|
|
|
|
|
inflateReset(strm);
|
|
|
|
|
|
|
|
strm->next_in = next;
|
|
|
|
strm->avail_in = comprlen;
|
|
|
|
|
2004-05-10 22:14:07 +00:00
|
|
|
memset(strmbuf, '\0', bufsiz);
|
|
|
|
strm->next_out = strmbuf;
|
|
|
|
strm->avail_out = bufsiz;
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
err = inflateInit2(strm, wbits);
|
|
|
|
|
|
|
|
inits_done++;
|
|
|
|
|
|
|
|
if (err != Z_OK) {
|
|
|
|
g_free(strm);
|
2004-05-10 22:14:07 +00:00
|
|
|
g_free(strmbuf);
|
2004-05-05 06:55:09 +00:00
|
|
|
g_free(compr);
|
|
|
|
g_free(uncompr);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
g_free(strm);
|
2004-05-10 22:14:07 +00:00
|
|
|
g_free(strmbuf);
|
2004-05-05 06:55:09 +00:00
|
|
|
g_free(compr);
|
|
|
|
|
|
|
|
if (uncompr == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2004-05-10 22:14:07 +00:00
|
|
|
|
|
|
|
#ifdef TVB_Z_DEBUG
|
|
|
|
printf("inflate() total passes: %u\n", inflate_passes);
|
|
|
|
printf("bytes in: %u\nbytes out: %u\n\n", bytes_in, bytes_out);
|
|
|
|
#endif
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
if (uncompr != NULL) {
|
|
|
|
uncompr_tvb = tvb_new_real_data((guint8*) uncompr, bytes_out,
|
|
|
|
bytes_out);
|
2004-05-07 18:15:24 +00:00
|
|
|
tvb_set_free_cb(uncompr_tvb, g_free);
|
2004-05-05 06:55:09 +00:00
|
|
|
}
|
|
|
|
g_free(compr);
|
|
|
|
return uncompr_tvb;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
tvbuff_t *
|
|
|
|
tvb_uncompress(tvbuff_t *tvb _U_, int offset _U_, int comprlen _U_)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|