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
|
2009-09-20 07:35:39 +00:00
|
|
|
* beyond the bounds of the buffer. An exception is thrown.
|
2000-05-11 08:18:09 +00:00
|
|
|
*
|
|
|
|
* "Virtual" -- the buffer can have its own data, can use a subset of
|
2009-09-20 07:35:39 +00:00
|
|
|
* the data of a backing tvbuff, or can be a composite of
|
|
|
|
* other tvbuffs.
|
2000-05-11 08:18:09 +00:00
|
|
|
*
|
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
|
|
|
|
*
|
2006-05-21 05:12:17 +00:00
|
|
|
* Wireshark - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@wireshark.org>
|
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
|
2012-06-28 22:56:06 +00:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
2000-05-11 08:18:09 +00:00
|
|
|
*/
|
|
|
|
|
2012-09-20 01:48:30 +00:00
|
|
|
#include "config.h"
|
2000-09-11 20:05:13 +00:00
|
|
|
|
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"
|
2011-05-27 03:06:50 +00:00
|
|
|
#include "tvbuff-int.h"
|
2000-09-11 16:16:13 +00:00
|
|
|
#include "strutil.h"
|
2005-07-24 01:56:01 +00:00
|
|
|
#include "emem.h"
|
2011-07-03 17:08:25 +00:00
|
|
|
#include "charsets.h"
|
2005-09-23 18:27:30 +00:00
|
|
|
#include "proto.h" /* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
2010-04-03 18:18:50 +00:00
|
|
|
ensure_contiguous_no_exception(tvbuff_t *tvb, const gint offset, const gint length,
|
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
|
|
|
int *exception);
|
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
2010-04-03 18:18:50 +00:00
|
|
|
ensure_contiguous(tvbuff_t *tvb, const gint offset, const gint length);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2012-02-28 16:29:07 +00:00
|
|
|
|
2012-02-28 20:32:42 +00:00
|
|
|
static guint64
|
2012-04-04 21:54:22 +00:00
|
|
|
_tvb_get_bits64(tvbuff_t *tvb, guint bit_offset, const gint total_no_of_bits);
|
2012-02-28 16:29:07 +00:00
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
static void
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_init(tvbuff_t *tvb, const tvbuff_type type)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
tvb_backing_t *backing;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb->previous = NULL;
|
|
|
|
tvb->next = NULL;
|
2011-12-21 17:39:02 +00:00
|
|
|
tvb->type = type;
|
|
|
|
tvb->initialized = FALSE;
|
|
|
|
tvb->length = 0;
|
|
|
|
tvb->reported_length = 0;
|
|
|
|
tvb->free_cb = NULL;
|
|
|
|
tvb->real_data = NULL;
|
|
|
|
tvb->raw_offset = -1;
|
|
|
|
tvb->ds_tvb = NULL;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
switch(type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
/* Nothing */
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TVBUFF_SUBSET:
|
2011-12-21 17:39:02 +00:00
|
|
|
backing = &tvb->tvbuffs.subset;
|
2000-05-11 08:18:09 +00:00
|
|
|
backing->tvb = NULL;
|
|
|
|
backing->offset = 0;
|
|
|
|
backing->length = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TVBUFF_COMPOSITE:
|
2011-12-21 17:39:02 +00:00
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
composite->tvbs = NULL;
|
|
|
|
composite->start_offsets = NULL;
|
|
|
|
composite->end_offsets = NULL;
|
2000-05-11 08:18:09 +00:00
|
|
|
break;
|
2009-08-15 12:41:24 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
|
|
|
break;
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-12-16 16:49:52 +00:00
|
|
|
tvbuff_t *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_new(const tvbuff_type type)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvbuff_t *tvb;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-08-15 13:24:59 +00:00
|
|
|
tvb = g_slice_new(tvbuff_t);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
tvb_init(tvb, type);
|
|
|
|
|
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
2012-12-16 16:49:52 +00:00
|
|
|
static tvbuff_t *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_new_with_subset(const guint subset_tvb_offset, const guint subset_tvb_length)
|
2009-08-16 10:53:47 +00:00
|
|
|
{
|
2009-09-20 07:35:39 +00:00
|
|
|
tvbuff_t *tvb = tvb_new(TVBUFF_SUBSET);
|
2011-12-22 18:13:18 +00:00
|
|
|
|
2009-08-16 10:53:47 +00:00
|
|
|
tvb->tvbuffs.subset.offset = subset_tvb_offset;
|
|
|
|
tvb->tvbuffs.subset.length = subset_tvb_length;
|
|
|
|
|
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
2011-12-21 17:39:02 +00:00
|
|
|
static void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_free_internal(tvbuff_t *tvb)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
|
2011-12-21 17:39:02 +00:00
|
|
|
DISSECTOR_ASSERT(tvb);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2011-12-21 17:39:02 +00:00
|
|
|
switch (tvb->type) {
|
2011-12-22 18:13:18 +00:00
|
|
|
case TVBUFF_REAL_DATA:
|
|
|
|
if (tvb->free_cb) {
|
|
|
|
/*
|
|
|
|
* XXX - do this with a union?
|
|
|
|
*/
|
|
|
|
tvb->free_cb((gpointer)tvb->real_data);
|
|
|
|
}
|
|
|
|
break;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
/* Nothing */
|
|
|
|
break;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
case TVBUFF_COMPOSITE:
|
|
|
|
composite = &tvb->tvbuffs.composite;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
g_slist_free(composite->tvbs);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
g_free(composite->start_offsets);
|
|
|
|
g_free(composite->end_offsets);
|
|
|
|
if (tvb->real_data) {
|
|
|
|
/*
|
|
|
|
* XXX - do this with a union?
|
|
|
|
*/
|
|
|
|
g_free((gpointer)tvb->real_data);
|
|
|
|
}
|
|
|
|
break;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
default:
|
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
2011-12-21 17:39:02 +00:00
|
|
|
g_slice_free(tvbuff_t, tvb);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
2011-12-21 17:39:02 +00:00
|
|
|
/* XXX: just call tvb_free_chain();
|
|
|
|
* Not removed so that existing dissectors using tvb_free() need not be changed.
|
|
|
|
* I'd argue that existing calls to tvb_free() should have actually beeen
|
|
|
|
* calls to tvb_free_chain() although the calls were OK as long as no
|
|
|
|
* subsets, etc had been created on the tvb. */
|
|
|
|
void
|
|
|
|
tvb_free(tvbuff_t *tvb)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-21 17:39:02 +00:00
|
|
|
tvb_free_chain(tvb);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_free_chain(tvbuff_t *tvb)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-21 17:39:02 +00:00
|
|
|
tvbuff_t *next_tvb;
|
|
|
|
DISSECTOR_ASSERT(tvb);
|
2012-04-20 05:12:20 +00:00
|
|
|
DISSECTOR_ASSERT_HINT(tvb->previous==NULL, "tvb_free_chain(): tvb must be initial tvb in chain");
|
2011-12-21 17:39:02 +00:00
|
|
|
while (tvb) {
|
|
|
|
next_tvb=tvb->next;
|
2012-04-20 05:12:20 +00:00
|
|
|
DISSECTOR_ASSERT_HINT((next_tvb==NULL) || (tvb==next_tvb->previous), "tvb_free_chain(): corrupt tvb chain ?");
|
2011-12-21 17:39:02 +00:00
|
|
|
tvb_free_internal(tvb);
|
|
|
|
tvb = next_tvb;
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_set_free_cb(tvbuff_t *tvb, const tvbuff_free_cb_t func)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb);
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->type == TVBUFF_REAL_DATA);
|
2000-05-11 08:18:09 +00:00
|
|
|
tvb->free_cb = func;
|
|
|
|
}
|
|
|
|
|
2000-11-14 04:33:34 +00:00
|
|
|
static void
|
2011-12-21 17:39:02 +00:00
|
|
|
add_to_chain(tvbuff_t *parent, tvbuff_t *child)
|
2000-11-14 04:33:34 +00:00
|
|
|
{
|
2011-12-21 17:39:02 +00:00
|
|
|
DISSECTOR_ASSERT(parent && child);
|
2011-12-22 18:13:18 +00:00
|
|
|
DISSECTOR_ASSERT(!child->next && !child->previous);
|
2011-12-21 17:39:02 +00:00
|
|
|
child->next = parent->next;
|
|
|
|
child->previous = parent;
|
|
|
|
if (parent->next)
|
|
|
|
parent->next->previous = child;
|
|
|
|
parent->next = child;
|
2000-11-14 04:33:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_set_child_real_data_tvbuff(tvbuff_t *parent, tvbuff_t *child)
|
2000-11-14 04:33:34 +00:00
|
|
|
{
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(parent && child);
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(parent->initialized);
|
|
|
|
DISSECTOR_ASSERT(child->initialized);
|
|
|
|
DISSECTOR_ASSERT(child->type == TVBUFF_REAL_DATA);
|
2011-12-21 17:39:02 +00:00
|
|
|
add_to_chain(parent, child);
|
2000-11-14 04:33:34 +00:00
|
|
|
}
|
|
|
|
|
2009-08-16 07:29:11 +00:00
|
|
|
static void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_set_real_data_no_exceptions(tvbuff_t *tvb, const guint8* data, const guint length, const gint reported_length)
|
2009-08-16 07:29:11 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb->real_data = data;
|
|
|
|
tvb->length = length;
|
2009-08-16 07:29:11 +00:00
|
|
|
tvb->reported_length = reported_length;
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb->initialized = TRUE;
|
2009-08-16 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_set_real_data(tvbuff_t *tvb, const guint8* data, const guint length, const gint reported_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb);
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->type == TVBUFF_REAL_DATA);
|
|
|
|
DISSECTOR_ASSERT(!tvb->initialized);
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2009-08-16 07:29:11 +00:00
|
|
|
THROW_ON(reported_length < -1, ReportedBoundsError);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-08-16 07:29:11 +00:00
|
|
|
tvb_set_real_data_no_exceptions(tvb, data, length, reported_length);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
2012-12-16 16:49:52 +00:00
|
|
|
tvbuff_t *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_new_real_data(const guint8* data, const guint length, const gint reported_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvbuff_t *tvb;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-08-16 07:29:11 +00:00
|
|
|
THROW_ON(reported_length < -1, ReportedBoundsError);
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2009-08-16 07:29:11 +00:00
|
|
|
tvb = tvb_new(TVBUFF_REAL_DATA);
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2009-08-16 07:29:11 +00:00
|
|
|
tvb_set_real_data_no_exceptions(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;
|
2000-05-11 08:18:09 +00:00
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
2012-12-16 16:49:52 +00:00
|
|
|
tvbuff_t *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_new_child_real_data(tvbuff_t *parent, const guint8* data, const guint length, const gint reported_length)
|
2009-04-01 16:22:51 +00:00
|
|
|
{
|
|
|
|
tvbuff_t *tvb = tvb_new_real_data(data, length, reported_length);
|
|
|
|
if (tvb) {
|
|
|
|
tvb_set_child_real_data_tvbuff (parent, tvb);
|
|
|
|
}
|
2009-09-10 16:54:02 +00:00
|
|
|
|
2009-04-01 16:22:51 +00:00
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
static const unsigned char left_aligned_bitmask[] = {
|
|
|
|
0xff,
|
|
|
|
0x80,
|
|
|
|
0xc0,
|
|
|
|
0xe0,
|
|
|
|
0xf0,
|
|
|
|
0xf8,
|
|
|
|
0xfc,
|
|
|
|
0xfe
|
|
|
|
};
|
|
|
|
|
|
|
|
tvbuff_t *
|
|
|
|
tvb_new_octet_aligned(tvbuff_t *tvb, guint32 bit_offset, gint32 no_of_bits)
|
|
|
|
{
|
|
|
|
tvbuff_t *sub_tvb = NULL;
|
|
|
|
guint32 byte_offset;
|
|
|
|
gint32 datalen, i;
|
|
|
|
guint8 left, right, remaining_bits, *buf;
|
|
|
|
const guint8 *data;
|
|
|
|
|
|
|
|
byte_offset = bit_offset >> 3;
|
|
|
|
left = bit_offset % 8; /* for left-shifting */
|
|
|
|
right = 8 - left; /* for right-shifting */
|
|
|
|
|
|
|
|
if (no_of_bits == -1) {
|
|
|
|
datalen = tvb_length_remaining(tvb, byte_offset);
|
|
|
|
remaining_bits = 0;
|
|
|
|
} else {
|
|
|
|
datalen = no_of_bits >> 3;
|
|
|
|
remaining_bits = no_of_bits % 8;
|
|
|
|
if (remaining_bits) {
|
|
|
|
datalen++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* already aligned -> shortcut */
|
|
|
|
if ((left == 0) && (remaining_bits == 0)) {
|
|
|
|
return tvb_new_subset(tvb, byte_offset, datalen, -1);
|
|
|
|
}
|
|
|
|
|
2012-04-12 05:36:26 +00:00
|
|
|
DISSECTOR_ASSERT(datalen>0);
|
2011-12-22 18:13:18 +00:00
|
|
|
buf = ep_alloc0(datalen);
|
|
|
|
|
|
|
|
/* if at least one trailing byte is available, we must use the content
|
|
|
|
* of that byte for the last shift (i.e. tvb_get_ptr() must use datalen + 1
|
|
|
|
* if non extra byte is available, the last shifted byte requires
|
|
|
|
* special treatment
|
|
|
|
*/
|
|
|
|
if (tvb_length_remaining(tvb, byte_offset) > datalen) {
|
|
|
|
data = tvb_get_ptr(tvb, byte_offset, datalen + 1);
|
|
|
|
/* shift tvb data bit_offset bits to the left */
|
|
|
|
for (i = 0; i < datalen; i++)
|
|
|
|
buf[i] = (data[i] << left) | (data[i+1] >> right);
|
|
|
|
} else {
|
|
|
|
data = tvb_get_ptr(tvb, byte_offset, datalen);
|
|
|
|
/* shift tvb data bit_offset bits to the left */
|
|
|
|
for (i = 0; i < (datalen-1); i++)
|
|
|
|
buf[i] = (data[i] << left) | (data[i+1] >> right);
|
|
|
|
buf[datalen-1] = data[datalen-1] << left; /* set last octet */
|
|
|
|
}
|
|
|
|
buf[datalen-1] &= left_aligned_bitmask[remaining_bits];
|
|
|
|
|
|
|
|
sub_tvb = tvb_new_child_real_data(tvb, buf, datalen, datalen);
|
|
|
|
|
|
|
|
return sub_tvb;
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
/* 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
|
2011-12-22 18:13:18 +00:00
|
|
|
compute_offset_length(const guint tvb_length_val, const guint tvb_reported_length_val,
|
|
|
|
const gint offset, const gint length_val,
|
|
|
|
guint *offset_ptr, guint *length_ptr, int *exception)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(offset_ptr);
|
|
|
|
DISSECTOR_ASSERT(length_ptr);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
/* 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. */
|
2010-01-28 18:45:46 +00:00
|
|
|
if ((guint) offset > tvb_reported_length_val) {
|
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
|
|
|
}
|
2010-01-28 18:45:46 +00:00
|
|
|
else if ((guint) offset > tvb_length_val) {
|
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. */
|
2010-01-28 18:45:46 +00:00
|
|
|
if ((guint) -offset > tvb_reported_length_val) {
|
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;
|
|
|
|
}
|
2010-01-28 18:45:46 +00:00
|
|
|
else if ((guint) -offset > tvb_length_val) {
|
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 {
|
2010-01-28 18:45:46 +00:00
|
|
|
*offset_ptr = tvb_length_val + offset;
|
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
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute the length */
|
2010-01-28 18:45:46 +00:00
|
|
|
if (length_val < -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;
|
|
|
|
}
|
2010-01-28 18:45:46 +00:00
|
|
|
else if (length_val == -1) {
|
|
|
|
*length_ptr = tvb_length_val - *offset_ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
else {
|
2010-01-28 18:45:46 +00:00
|
|
|
*length_ptr = length_val;
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static gboolean
|
2011-12-22 18:13:18 +00:00
|
|
|
check_offset_length_no_exception(const guint tvb_length_val, const guint tvb_reported_length_val,
|
|
|
|
const gint offset, gint const length_val,
|
|
|
|
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;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (!compute_offset_length(tvb_length_val, tvb_reported_length_val,
|
|
|
|
offset, length_val, 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.
|
|
|
|
*/
|
2010-01-28 18:45:46 +00:00
|
|
|
if (end_offset <= tvb_length_val) {
|
2000-05-11 08:18:09 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
2010-01-28 18:45:46 +00:00
|
|
|
else if (end_offset <= tvb_reported_length_val) {
|
2000-05-16 04:44:14 +00:00
|
|
|
if (exception) {
|
|
|
|
*exception = BoundsError;
|
|
|
|
}
|
|
|
|
}
|
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
|
|
|
}
|
|
|
|
|
2009-06-11 10:03:08 +00:00
|
|
|
return FALSE;
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
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
|
2011-12-22 18:13:18 +00:00
|
|
|
check_offset_length(const guint tvb_length_val, const guint tvb_reported_length_val,
|
|
|
|
const gint offset, gint const length_val,
|
|
|
|
guint *offset_ptr, guint *length_ptr)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2000-05-16 04:44:14 +00:00
|
|
|
int exception = 0;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (!check_offset_length_no_exception(tvb_length_val, tvb_reported_length_val,
|
|
|
|
offset, length_val, offset_ptr, length_ptr, &exception)) {
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(exception > 0);
|
2000-05-16 04:44:14 +00:00
|
|
|
THROW(exception);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-16 09:18:17 +00:00
|
|
|
static void
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_set_subset_no_exceptions(tvbuff_t *tvb, tvbuff_t *backing, const gint reported_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +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) {
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb->reported_length = backing->reported_length - tvb->tvbuffs.subset.offset;
|
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
|
|
|
}
|
|
|
|
else {
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb->reported_length = 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
|
|
|
}
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb->initialized = TRUE;
|
2011-12-21 17:39:02 +00:00
|
|
|
add_to_chain(backing, tvb);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-16 09:18:17 +00:00
|
|
|
void
|
|
|
|
tvb_set_subset(tvbuff_t *tvb, tvbuff_t *backing,
|
2011-12-22 18:13:18 +00:00
|
|
|
const gint backing_offset, const gint backing_length, const gint reported_length)
|
2009-08-16 09:18:17 +00:00
|
|
|
{
|
|
|
|
DISSECTOR_ASSERT(tvb);
|
|
|
|
DISSECTOR_ASSERT(tvb->type == TVBUFF_SUBSET);
|
|
|
|
DISSECTOR_ASSERT(!tvb->initialized);
|
|
|
|
|
|
|
|
THROW_ON(reported_length < -1, ReportedBoundsError);
|
|
|
|
|
|
|
|
check_offset_length(backing->length, backing->reported_length, backing_offset, backing_length,
|
|
|
|
&tvb->tvbuffs.subset.offset,
|
|
|
|
&tvb->tvbuffs.subset.length);
|
|
|
|
|
2009-08-16 09:48:25 +00:00
|
|
|
tvb_set_subset_no_exceptions(tvb, backing, reported_length);
|
2009-08-16 09:18:17 +00:00
|
|
|
}
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2012-12-16 16:49:52 +00:00
|
|
|
tvbuff_t *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_new_subset(tvbuff_t *backing, const gint backing_offset, const gint backing_length, const gint reported_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvbuff_t *tvb;
|
|
|
|
guint subset_tvb_offset;
|
|
|
|
guint subset_tvb_length;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-10-08 15:01:25 +00:00
|
|
|
DISSECTOR_ASSERT(backing && backing->initialized);
|
|
|
|
|
2009-08-16 09:18:17 +00:00
|
|
|
THROW_ON(reported_length < -1, ReportedBoundsError);
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2009-08-16 09:18:17 +00:00
|
|
|
check_offset_length(backing->length, backing->reported_length, backing_offset, backing_length,
|
2011-12-22 18:13:18 +00:00
|
|
|
&subset_tvb_offset,
|
|
|
|
&subset_tvb_length);
|
2009-08-16 09:18:17 +00:00
|
|
|
|
2009-09-20 07:35:39 +00:00
|
|
|
tvb = tvb_new_with_subset(subset_tvb_offset, subset_tvb_length);
|
2000-09-13 20:17:23 +00:00
|
|
|
|
2009-08-16 09:48:25 +00:00
|
|
|
tvb_set_subset_no_exceptions(tvb, backing, 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;
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
2012-12-16 16:49:52 +00:00
|
|
|
tvbuff_t *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_new_subset_remaining(tvbuff_t *backing, const gint backing_offset)
|
2009-08-16 10:53:47 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvbuff_t *tvb;
|
|
|
|
guint subset_tvb_offset;
|
|
|
|
guint subset_tvb_length;
|
2009-08-16 10:53:47 +00:00
|
|
|
|
|
|
|
check_offset_length(backing->length, backing->reported_length, backing_offset, -1 /* backing_length */,
|
2011-12-22 18:13:18 +00:00
|
|
|
&subset_tvb_offset,
|
|
|
|
&subset_tvb_length);
|
2009-08-16 10:53:47 +00:00
|
|
|
|
2009-09-20 07:35:39 +00:00
|
|
|
tvb = tvb_new_with_subset(subset_tvb_offset, subset_tvb_length);
|
2009-08-16 10:53:47 +00:00
|
|
|
|
|
|
|
tvb_set_subset_no_exceptions(tvb, backing, -1 /* reported_length */);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The top-level data source of this tvbuff is the top-level
|
|
|
|
* data source of its parent.
|
|
|
|
*/
|
|
|
|
tvb->ds_tvb = backing->ds_tvb;
|
|
|
|
|
|
|
|
return tvb;
|
|
|
|
}
|
|
|
|
|
2011-12-21 17:39:02 +00:00
|
|
|
/*
|
|
|
|
* Composite tvb
|
|
|
|
*
|
|
|
|
* 1. A composite tvb is automatically chained to its first member when the
|
|
|
|
* tvb is finalized.
|
|
|
|
* This means that composite tvb members must all be in the same chain.
|
|
|
|
* ToDo: enforce this: By searching the chain?
|
|
|
|
*/
|
2012-12-16 16:49:52 +00:00
|
|
|
tvbuff_t *
|
2011-12-21 17:39:02 +00:00
|
|
|
tvb_new_composite(void)
|
|
|
|
{
|
|
|
|
return tvb_new(TVBUFF_COMPOSITE);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_composite_append(tvbuff_t *tvb, tvbuff_t *member)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb_comp_t *composite;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && !tvb->initialized);
|
2008-06-20 20:33:38 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
|
2012-12-16 16:49:52 +00:00
|
|
|
|
|
|
|
/* Don't allow zero-length TVBs: composite_memcpy() can't handle them
|
|
|
|
* and anyway it makes no sense.
|
|
|
|
*/
|
|
|
|
DISSECTOR_ASSERT(member->length);
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
composite->tvbs = g_slist_append(composite->tvbs, member);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_composite_prepend(tvbuff_t *tvb, tvbuff_t *member)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb_comp_t *composite;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && !tvb->initialized);
|
2008-06-20 20:33:38 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
|
2012-12-16 16:49:52 +00:00
|
|
|
|
|
|
|
/* Don't allow zero-length TVBs: composite_memcpy() can't handle them
|
|
|
|
* and anyway it makes no sense.
|
|
|
|
*/
|
|
|
|
DISSECTOR_ASSERT(member->length);
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
composite = &tvb->tvbuffs.composite;
|
|
|
|
composite->tvbs = g_slist_prepend(composite->tvbs, member);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_composite_finalize(tvbuff_t *tvb)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
GSList *slist;
|
|
|
|
guint num_members;
|
|
|
|
tvbuff_t *member_tvb;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
int i = 0;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && !tvb->initialized);
|
2008-06-20 20:33:38 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->length == 0);
|
2011-04-04 05:48:06 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->reported_length == 0);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
composite = &tvb->tvbuffs.composite;
|
2000-05-11 08:18:09 +00:00
|
|
|
num_members = g_slist_length(composite->tvbs);
|
|
|
|
|
2012-12-16 19:26:12 +00:00
|
|
|
/* Dissectors should not create composite TVBs if they're not going to
|
|
|
|
* put at least one TVB in them.
|
|
|
|
* (Without this check--or something similar--we'll seg-fault below.)
|
|
|
|
*/
|
|
|
|
DISSECTOR_ASSERT(num_members);
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
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) {
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_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;
|
2011-04-04 05:48:06 +00:00
|
|
|
tvb->reported_length += member_tvb->reported_length;
|
2000-05-11 08:18:09 +00:00
|
|
|
composite->end_offsets[i] = tvb->length - 1;
|
|
|
|
i++;
|
|
|
|
}
|
2011-12-22 18:13:18 +00:00
|
|
|
add_to_chain((tvbuff_t *)composite->tvbs->data, tvb); /* chain composite tvb to first member */
|
2000-05-11 08:18:09 +00:00
|
|
|
tvb->initialized = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
guint
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_length(const tvbuff_t *tvb)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
return tvb->length;
|
|
|
|
}
|
|
|
|
|
2000-12-27 12:48:27 +00:00
|
|
|
gint
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_length_remaining(const tvbuff_t *tvb, const gint offset)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint abs_offset, abs_length;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
if (compute_offset_length(tvb->length, tvb->reported_length, 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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_ensure_length_remaining(const tvbuff_t *tvb, const gint offset)
|
2002-02-01 04:34:17 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint abs_offset, abs_length;
|
|
|
|
int exception;
|
2002-02-01 04:34:17 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
2002-02-01 04:34:17 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
if (!compute_offset_length(tvb->length, tvb->reported_length, offset, -1, &abs_offset, &abs_length, &exception)) {
|
2002-05-05 21:07:52 +00:00
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_bytes_exist(const tvbuff_t *tvb, const gint offset, const gint length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint abs_offset, abs_length;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
if (!compute_offset_length(tvb->length, tvb->reported_length, 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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_ensure_bytes_exist(const tvbuff_t *tvb, const gint offset, const gint length)
|
2002-05-13 01:24:47 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint abs_offset, abs_length;
|
2002-05-13 01:24:47 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
2002-05-13 01:24:47 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* -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);
|
|
|
|
}
|
2009-08-16 08:18:17 +00:00
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, length, &abs_offset, &abs_length);
|
2002-05-13 01:24:47 +00:00
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
gboolean
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_offset_exists(const tvbuff_t *tvb, const gint offset)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint abs_offset, abs_length;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
2009-08-16 08:18:17 +00:00
|
|
|
if (!compute_offset_length(tvb->length, tvb->reported_length, offset, -1, &abs_offset, &abs_length, NULL))
|
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
|
|
|
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
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_reported_length(const tvbuff_t *tvb)
|
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
|
|
|
{
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && 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
|
|
|
|
|
|
|
return tvb->reported_length;
|
|
|
|
}
|
|
|
|
|
2000-12-27 12:48:27 +00:00
|
|
|
gint
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_reported_length_remaining(const tvbuff_t *tvb, const gint offset)
|
2000-12-27 12:48:27 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint abs_offset, abs_length;
|
2000-12-27 12:48:27 +00:00
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
2000-12-27 12:48:27 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
if (compute_offset_length(tvb->length, tvb->reported_length, offset, -1, &abs_offset, &abs_length, NULL)) {
|
2000-12-27 12:48:27 +00:00
|
|
|
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
|
2011-12-22 18:13:18 +00:00
|
|
|
* whose headers contain an explicit length and where the calling
|
|
|
|
* dissector's payload may include padding as well as the packet for
|
|
|
|
* this protocol.
|
|
|
|
* Also adjusts the data length. */
|
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
|
|
|
void
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_set_reported_length(tvbuff_t *tvb, const guint reported_length)
|
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
|
|
|
{
|
2006-07-05 18:47:21 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && 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
|
|
|
|
|
|
|
|
2008-04-14 21:31:19 +00:00
|
|
|
#if 0
|
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)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvbuff_t *member;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2008-04-14 21:31:19 +00:00
|
|
|
#endif
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-09-10 16:54:02 +00:00
|
|
|
static guint
|
2010-04-03 18:18:50 +00:00
|
|
|
offset_from_real_beginning(const tvbuff_t *tvb, const guint counter)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
tvbuff_t *member;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-09-10 16:54:02 +00:00
|
|
|
guint
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_offset_from_real_beginning(const tvbuff_t *tvb)
|
2009-09-10 16:54:02 +00:00
|
|
|
{
|
2009-09-20 07:35:39 +00:00
|
|
|
return offset_from_real_beginning(tvb, 0);
|
2009-09-10 16:54:02 +00:00
|
|
|
}
|
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
2011-12-22 18:13:18 +00:00
|
|
|
composite_ensure_contiguous_no_exception(tvbuff_t *tvb, const guint abs_offset, const guint abs_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint i, num_members;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
tvbuff_t *member_tvb = NULL;
|
|
|
|
guint member_offset, member_length;
|
|
|
|
GSList *slist;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
}
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(member_tvb);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (check_offset_length_no_exception(member_tvb->length, member_tvb->reported_length,
|
|
|
|
abs_offset - composite->start_offsets[i],
|
|
|
|
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.
|
|
|
|
*/
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_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;
|
|
|
|
}
|
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
2004-02-19 05:19:10 +00:00
|
|
|
static const guint8*
|
2011-12-22 18:13:18 +00:00
|
|
|
ensure_contiguous_no_exception(tvbuff_t *tvb, const gint offset, const gint length, int *exception)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint abs_offset, abs_length;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
if (!check_offset_length_no_exception(tvb->length, tvb->reported_length, offset, length,
|
2009-09-20 07:35:39 +00:00
|
|
|
&abs_offset, &abs_length, exception)) {
|
2003-06-09 07:27:42 +00:00
|
|
|
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:
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-08-11 18:28:10 +00:00
|
|
|
static const guint8*
|
2010-04-03 18:18:50 +00:00
|
|
|
ensure_contiguous(tvbuff_t *tvb, const gint offset, const gint length)
|
2009-08-11 18:28:10 +00:00
|
|
|
{
|
2012-05-15 21:56:02 +00:00
|
|
|
int exception = 0;
|
2009-08-11 18:28:10 +00:00
|
|
|
const guint8 *p;
|
|
|
|
|
|
|
|
p = ensure_contiguous_no_exception(tvb, offset, length, &exception);
|
|
|
|
if (p == NULL) {
|
|
|
|
DISSECTOR_ASSERT(exception > 0);
|
|
|
|
THROW(exception);
|
|
|
|
}
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
static const guint8*
|
2010-04-03 18:18:50 +00:00
|
|
|
fast_ensure_contiguous(tvbuff_t *tvb, const gint offset, const guint length)
|
2007-10-27 14:44:29 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint end_offset;
|
|
|
|
guint u_offset;
|
2007-10-27 14:44:29 +00:00
|
|
|
|
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
2009-08-11 18:16:55 +00:00
|
|
|
/* We don't check for overflow in this fast path so we only handle simple types */
|
|
|
|
DISSECTOR_ASSERT(length <= 8);
|
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
if (offset < 0 || !tvb->real_data) {
|
2009-09-20 07:35:39 +00:00
|
|
|
return ensure_contiguous(tvb, offset, length);
|
2007-10-27 14:44:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
u_offset = offset;
|
|
|
|
end_offset = u_offset + length;
|
|
|
|
|
|
|
|
if (end_offset <= tvb->length) {
|
|
|
|
return tvb->real_data + u_offset;
|
|
|
|
}
|
2008-07-08 20:04:11 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
if (end_offset > tvb->reported_length) {
|
|
|
|
THROW(ReportedBoundsError);
|
|
|
|
}
|
|
|
|
THROW(BoundsError);
|
|
|
|
/* not reached */
|
2009-08-11 18:16:55 +00:00
|
|
|
return NULL;
|
2007-10-27 14:44:29 +00:00
|
|
|
}
|
|
|
|
|
2000-11-10 06:50:37 +00:00
|
|
|
static const guint8*
|
2010-03-08 20:45:13 +00:00
|
|
|
guint8_pbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles, guchar *found_needle)
|
2000-11-10 06:50:37 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gchar tmp[256] = { 0 };
|
2010-04-28 07:58:59 +00:00
|
|
|
const guint8 *haystack_end;
|
2010-10-30 18:18:12 +00:00
|
|
|
|
2010-04-28 07:58:59 +00:00
|
|
|
while (*needles)
|
|
|
|
tmp[*needles++] = 1;
|
|
|
|
|
|
|
|
haystack_end = haystack + haystacklen;
|
|
|
|
while (haystack < haystack_end) {
|
|
|
|
if (tmp[*haystack]) {
|
2011-12-22 18:13:18 +00:00
|
|
|
if (found_needle)
|
2010-04-28 07:58:59 +00:00
|
|
|
*found_needle = *haystack;
|
|
|
|
return haystack;
|
2000-11-10 06:50:37 +00:00
|
|
|
}
|
2010-04-28 07:58:59 +00:00
|
|
|
haystack++;
|
2000-11-10 06:50:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2000-08-30 02:50:18 +00:00
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
/************** ACCESSORS **************/
|
|
|
|
|
2012-12-16 16:49:52 +00:00
|
|
|
static void *
|
2009-04-03 15:30:38 +00:00
|
|
|
composite_memcpy(tvbuff_t *tvb, guint8* target, guint abs_offset, size_t abs_length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint i, num_members;
|
|
|
|
tvb_comp_t *composite;
|
|
|
|
tvbuff_t *member_tvb = NULL;
|
|
|
|
guint member_offset, member_length;
|
|
|
|
gboolean retval;
|
|
|
|
GSList *slist;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(tvb->type == TVBUFF_COMPOSITE);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
/* Maybe the range specified by offset/length
|
|
|
|
* is contiguous inside one of the member tvbuffs */
|
2011-12-22 18:13:18 +00:00
|
|
|
composite = &tvb->tvbuffs.composite;
|
2000-05-11 08:18:09 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(member_tvb);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
if (check_offset_length_no_exception(member_tvb->length, member_tvb->reported_length, abs_offset - composite->start_offsets[i],
|
2009-04-03 15:30:38 +00:00
|
|
|
(gint) abs_length, &member_offset, &member_length, NULL)) {
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(!tvb->real_data);
|
2000-05-11 08:18:09 +00:00
|
|
|
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.
|
|
|
|
*/
|
2009-08-16 08:18:17 +00:00
|
|
|
retval = compute_offset_length(member_tvb->length, member_tvb->reported_length, abs_offset - composite->start_offsets[i], -1,
|
2000-05-16 04:44:14 +00:00
|
|
|
&member_offset, &member_length, NULL);
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(retval);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2012-12-16 18:23:10 +00:00
|
|
|
/* composite_memcpy() can't handle a member_length of zero. */
|
|
|
|
DISSECTOR_ASSERT(member_length);
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
2012-12-16 16:49:52 +00:00
|
|
|
void *
|
|
|
|
tvb_memcpy(tvbuff_t *tvb, void *target, const gint offset, size_t length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
2009-04-05 17:24:06 +00:00
|
|
|
/*
|
|
|
|
* XXX - we should eliminate the "length = -1 means 'to the end
|
|
|
|
* of the tvbuff'" convention, and use other means to achieve
|
|
|
|
* that; this would let us eliminate a bunch of checks for
|
|
|
|
* negative lengths in cases where the protocol has a 32-bit
|
|
|
|
* length field.
|
|
|
|
*
|
|
|
|
* Allowing -1 but throwing an assertion on other negative
|
|
|
|
* lengths is a bit more work with the length being a size_t;
|
|
|
|
* instead, we check for a length <= 2^31-1.
|
|
|
|
*/
|
|
|
|
DISSECTOR_ASSERT(length <= 0x7FFFFFFF);
|
2009-08-16 08:18:17 +00:00
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, (gint) length, &abs_offset, &abs_length);
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
if (tvb->real_data) {
|
2007-04-24 11:54:18 +00:00
|
|
|
return memcpy(target, tvb->real_data + abs_offset, abs_length);
|
2000-05-11 08:18:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-05-11 08:18:09 +00:00
|
|
|
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
|
|
|
*/
|
2012-12-16 16:49:52 +00:00
|
|
|
void *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_memdup(tvbuff_t *tvb, const gint offset, size_t length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
2007-04-28 21:06:15 +00:00
|
|
|
void *duped;
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, (gint) length, &abs_offset, &abs_length);
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
duped = g_malloc(abs_length);
|
|
|
|
return tvb_memcpy(tvb, duped, abs_offset, abs_length);
|
|
|
|
}
|
|
|
|
|
2005-07-26 18:32:12 +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.
|
|
|
|
*
|
|
|
|
* "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"?
|
2006-07-05 18:47:21 +00:00
|
|
|
*
|
2005-07-26 18:32:12 +00:00
|
|
|
* This function allocates memory from a buffer with packet lifetime.
|
|
|
|
* You do not have to free this buffer, it will be automatically freed
|
2006-05-21 05:12:17 +00:00
|
|
|
* when wireshark starts decoding the next packet.
|
2005-07-26 18:32:12 +00:00
|
|
|
* Do not use this function if you want the allocated memory to be persistent
|
|
|
|
* after the current packet has been dissected.
|
|
|
|
*/
|
2012-12-16 16:49:52 +00:00
|
|
|
void *
|
2010-04-03 18:18:50 +00:00
|
|
|
ep_tvb_memdup(tvbuff_t *tvb, const gint offset, size_t length)
|
2005-07-26 18:32:12 +00:00
|
|
|
{
|
|
|
|
guint abs_offset, abs_length;
|
2007-04-24 11:54:18 +00:00
|
|
|
void *duped;
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, (gint) length, &abs_offset, &abs_length);
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2005-07-26 18:32:12 +00:00
|
|
|
duped = ep_alloc(abs_length);
|
|
|
|
return tvb_memcpy(tvb, duped, abs_offset, abs_length);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2002-08-28 20:41:00 +00:00
|
|
|
|
2001-03-13 21:34:28 +00:00
|
|
|
const guint8*
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ptr(tvbuff_t *tvb, const gint offset, const gint length)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
|
|
|
return ensure_contiguous(tvb, offset, length);
|
|
|
|
}
|
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
/* ---------------- */
|
2000-05-11 08:18:09 +00:00
|
|
|
guint8
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_guint8(tvbuff_t *tvb, const gint offset)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint8));
|
2000-05-11 08:18:09 +00:00
|
|
|
return *ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint16
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ntohs(tvbuff_t *tvb, const gint offset)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint16));
|
2000-05-11 08:18:09 +00:00
|
|
|
return pntohs(ptr);
|
|
|
|
}
|
|
|
|
|
2000-08-10 07:58:44 +00:00
|
|
|
guint32
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ntoh24(tvbuff_t *tvb, const gint offset)
|
2000-08-10 07:58:44 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2000-08-10 07:58:44 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, 3);
|
2000-08-10 07:58:44 +00:00
|
|
|
return pntoh24(ptr);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
guint32
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ntohl(tvbuff_t *tvb, const gint offset)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint32));
|
2000-05-11 08:18:09 +00:00
|
|
|
return pntohl(ptr);
|
|
|
|
}
|
|
|
|
|
2011-01-14 19:02:38 +00:00
|
|
|
guint64
|
|
|
|
tvb_get_ntoh40(tvbuff_t *tvb, const gint offset)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2011-01-14 19:02:38 +00:00
|
|
|
|
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, 5);
|
|
|
|
return pntoh40(ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
guint64
|
|
|
|
tvb_get_ntoh48(tvbuff_t *tvb, const gint offset)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2011-01-14 19:02:38 +00:00
|
|
|
|
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, 6);
|
|
|
|
return pntoh48(ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
guint64
|
|
|
|
tvb_get_ntoh56(tvbuff_t *tvb, const gint offset)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2011-01-14 19:02:38 +00:00
|
|
|
|
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, 7);
|
|
|
|
return pntoh56(ptr);
|
|
|
|
}
|
|
|
|
|
2004-08-22 00:31:58 +00:00
|
|
|
guint64
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ntoh64(tvbuff_t *tvb, const gint offset)
|
2004-08-22 00:31:58 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2004-08-22 00:31:58 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint64));
|
2004-08-22 00:31:58 +00:00
|
|
|
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
|
2006-05-21 05:12:17 +00:00
|
|
|
* could run Wireshark and that don't use IEEE format.
|
2002-04-24 21:19:38 +00:00
|
|
|
* As far as I know, all of the main commercial microprocessor
|
2006-05-21 05:12:17 +00:00
|
|
|
* families on which OSes that support Wireshark can run
|
2002-04-24 21:19:38 +00:00
|
|
|
* 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
|
2010-04-03 18:18:50 +00:00
|
|
|
ieee_float_is_zero(const guint32 w)
|
2002-04-24 21:19:38 +00:00
|
|
|
{
|
|
|
|
return ((w & ~IEEE_SP_SIGN_MASK) == 0);
|
|
|
|
}
|
|
|
|
|
2002-04-24 21:53:05 +00:00
|
|
|
static gfloat
|
2010-04-03 18:18:50 +00:00
|
|
|
get_ieee_float(const guint32 w)
|
2002-04-24 21:19:38 +00:00
|
|
|
{
|
|
|
|
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) -
|
2009-09-20 07:35:39 +00:00
|
|
|
IEEE_SP_MANTISSA_WIDTH;
|
2002-04-24 21:19:38 +00:00
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
ieee_double_is_zero(const guint64 w)
|
2002-04-24 21:19:38 +00:00
|
|
|
{
|
|
|
|
return ((w & ~IEEE_SP_SIGN_MASK) == 0);
|
|
|
|
}
|
|
|
|
|
2002-04-24 21:53:05 +00:00
|
|
|
static gdouble
|
2010-04-03 18:18:50 +00:00
|
|
|
get_ieee_double(const guint64 w)
|
2002-04-24 21:19:38 +00:00
|
|
|
{
|
|
|
|
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) -
|
2009-09-20 07:35:39 +00:00
|
|
|
IEEE_DP_MANTISSA_WIDTH;
|
2002-04-24 21:19:38 +00:00
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ntohieee_float(tvbuff_t *tvb, const int offset)
|
2002-04-12 23:25:24 +00:00
|
|
|
{
|
|
|
|
#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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ntohieee_double(tvbuff_t *tvb, const int offset)
|
2002-04-12 23:25:24 +00:00
|
|
|
{
|
|
|
|
#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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_letohs(tvbuff_t *tvb, const gint offset)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint16));
|
2000-05-11 08:18:09 +00:00
|
|
|
return pletohs(ptr);
|
|
|
|
}
|
|
|
|
|
2000-08-10 07:58:44 +00:00
|
|
|
guint32
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_letoh24(tvbuff_t *tvb, const gint offset)
|
2000-08-10 07:58:44 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2000-08-10 07:58:44 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, 3);
|
2000-08-10 07:58:44 +00:00
|
|
|
return pletoh24(ptr);
|
|
|
|
}
|
|
|
|
|
2000-05-11 08:18:09 +00:00
|
|
|
guint32
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_letohl(tvbuff_t *tvb, const gint offset)
|
2000-05-11 08:18:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2000-05-11 08:18:09 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint32));
|
2000-05-11 08:18:09 +00:00
|
|
|
return pletohl(ptr);
|
|
|
|
}
|
2000-05-15 04:37:27 +00:00
|
|
|
|
2011-01-14 19:02:38 +00:00
|
|
|
guint64
|
|
|
|
tvb_get_letoh40(tvbuff_t *tvb, const gint offset)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2011-01-14 19:02:38 +00:00
|
|
|
|
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, 5);
|
|
|
|
return pletoh40(ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
guint64
|
|
|
|
tvb_get_letoh48(tvbuff_t *tvb, const gint offset)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2011-01-14 19:02:38 +00:00
|
|
|
|
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, 6);
|
|
|
|
return pletoh48(ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
guint64
|
|
|
|
tvb_get_letoh56(tvbuff_t *tvb, const gint offset)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2011-01-14 19:02:38 +00:00
|
|
|
|
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, 7);
|
|
|
|
return pletoh56(ptr);
|
|
|
|
}
|
|
|
|
|
2004-08-22 00:31:58 +00:00
|
|
|
guint64
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_letoh64(tvbuff_t *tvb, const gint offset)
|
2004-08-22 00:31:58 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2004-08-22 00:31:58 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint64));
|
2004-08-22 00:31:58 +00:00
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_letohieee_float(tvbuff_t *tvb, const int offset)
|
2002-04-12 23:25:24 +00:00
|
|
|
{
|
|
|
|
#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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_letohieee_double(tvbuff_t *tvb, const int offset)
|
2002-04-12 23:25:24 +00:00
|
|
|
{
|
|
|
|
#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
|
|
|
|
}
|
|
|
|
|
2005-09-10 19:43:41 +00:00
|
|
|
/* Fetch an IPv4 address, in network byte order.
|
|
|
|
* We do *not* convert them to host byte order; we leave them in
|
|
|
|
* network byte order. */
|
|
|
|
guint32
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ipv4(tvbuff_t *tvb, const gint offset)
|
2005-09-10 19:43:41 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
|
|
|
guint32 addr;
|
2005-09-10 19:43:41 +00:00
|
|
|
|
2007-10-27 14:44:29 +00:00
|
|
|
ptr = fast_ensure_contiguous(tvb, offset, sizeof(guint32));
|
2005-09-10 19:43:41 +00:00
|
|
|
memcpy(&addr, ptr, sizeof addr);
|
|
|
|
return addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fetch an IPv6 address. */
|
|
|
|
void
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ipv6(tvbuff_t *tvb, const gint offset, struct e_in6_addr *addr)
|
2005-09-10 19:43:41 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
2005-09-10 19:43:41 +00:00
|
|
|
|
|
|
|
ptr = ensure_contiguous(tvb, offset, sizeof(*addr));
|
|
|
|
memcpy(addr, ptr, sizeof *addr);
|
|
|
|
}
|
|
|
|
|
2006-03-10 11:58:22 +00:00
|
|
|
/* Fetch a GUID. */
|
|
|
|
void
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ntohguid(tvbuff_t *tvb, const gint offset, e_guid_t *guid)
|
2006-03-10 11:58:22 +00:00
|
|
|
{
|
|
|
|
ensure_contiguous(tvb, offset, sizeof(*guid));
|
|
|
|
guid->data1 = tvb_get_ntohl(tvb, offset);
|
|
|
|
guid->data2 = tvb_get_ntohs(tvb, offset + 4);
|
|
|
|
guid->data3 = tvb_get_ntohs(tvb, offset + 6);
|
|
|
|
tvb_memcpy(tvb, guid->data4, offset + 8, sizeof guid->data4);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_letohguid(tvbuff_t *tvb, const gint offset, e_guid_t *guid)
|
2006-03-10 11:58:22 +00:00
|
|
|
{
|
|
|
|
ensure_contiguous(tvb, offset, sizeof(*guid));
|
|
|
|
guid->data1 = tvb_get_letohl(tvb, offset);
|
|
|
|
guid->data2 = tvb_get_letohs(tvb, offset + 4);
|
|
|
|
guid->data3 = tvb_get_letohs(tvb, offset + 6);
|
|
|
|
tvb_memcpy(tvb, guid->data4, offset + 8, sizeof guid->data4);
|
|
|
|
}
|
|
|
|
|
2010-05-24 06:06:17 +00:00
|
|
|
/*
|
|
|
|
* NOTE: to support code written when proto_tree_add_item() took a
|
|
|
|
* gboolean as its last argument, with FALSE meaning "big-endian"
|
|
|
|
* and TRUE meaning "little-endian", we treat any non-zero value of
|
|
|
|
* "representation" as meaning "little-endian".
|
|
|
|
*/
|
2006-03-10 11:58:22 +00:00
|
|
|
void
|
2010-05-24 06:06:17 +00:00
|
|
|
tvb_get_guid(tvbuff_t *tvb, const gint offset, e_guid_t *guid, const guint representation)
|
2006-03-10 11:58:22 +00:00
|
|
|
{
|
2010-05-24 06:06:17 +00:00
|
|
|
if (representation) {
|
2006-03-10 11:58:22 +00:00
|
|
|
tvb_get_letohguid(tvb, offset, guid);
|
|
|
|
} else {
|
|
|
|
tvb_get_ntohguid(tvb, offset, guid);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-28 20:32:42 +00:00
|
|
|
static const guint8 inverse_bit_mask8[] = {
|
2009-09-20 07:35:39 +00:00
|
|
|
0xff,
|
|
|
|
0x7f,
|
|
|
|
0x3f,
|
|
|
|
0x1f,
|
|
|
|
0x0f,
|
|
|
|
0x07,
|
|
|
|
0x03,
|
|
|
|
0x01
|
2007-04-28 12:13:25 +00:00
|
|
|
};
|
|
|
|
|
2012-02-28 20:32:42 +00:00
|
|
|
static const guint8 bit_mask8[] = {
|
|
|
|
0x00,
|
|
|
|
0x01,
|
|
|
|
0x03,
|
|
|
|
0x07,
|
|
|
|
0x0f,
|
|
|
|
0x1f,
|
|
|
|
0x3f,
|
|
|
|
0x7f,
|
|
|
|
0xff
|
|
|
|
};
|
|
|
|
|
2007-05-18 16:46:35 +00:00
|
|
|
/* Get 1 - 8 bits */
|
|
|
|
guint8
|
2012-04-04 21:54:22 +00:00
|
|
|
tvb_get_bits8(tvbuff_t *tvb, guint bit_offset, const gint no_of_bits)
|
2007-05-18 16:46:35 +00:00
|
|
|
{
|
2012-02-28 20:32:42 +00:00
|
|
|
return (guint8)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
|
2007-05-18 16:46:35 +00:00
|
|
|
}
|
|
|
|
|
2012-02-28 16:29:07 +00:00
|
|
|
/* Get 1 - 16 bits */
|
2011-05-17 22:20:14 +00:00
|
|
|
void
|
2012-04-04 21:54:22 +00:00
|
|
|
tvb_get_bits_buf(tvbuff_t *tvb, guint bit_offset, gint no_of_bits, guint8 *buf, gboolean lsb0)
|
2011-05-17 22:20:14 +00:00
|
|
|
{
|
2011-05-18 18:49:33 +00:00
|
|
|
guint8 bit_mask, bit_shift;
|
2011-05-17 22:20:14 +00:00
|
|
|
/* Byte align offset */
|
2011-12-22 18:13:18 +00:00
|
|
|
gint offset = bit_offset >> 3;
|
2011-05-17 22:20:14 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
bit_offset = bit_offset & 0x7;
|
|
|
|
|
2012-02-28 20:32:42 +00:00
|
|
|
bit_mask = (lsb0) ? 0xff : inverse_bit_mask8[bit_offset];
|
2011-05-18 18:49:33 +00:00
|
|
|
bit_shift = (lsb0) ? bit_offset : (8 - bit_offset);
|
|
|
|
|
2011-05-17 22:20:14 +00:00
|
|
|
if (G_LIKELY(bit_offset != 0)) {
|
2011-05-18 18:49:33 +00:00
|
|
|
guint16 value = (guint16) tvb_get_guint8(tvb, offset);
|
2011-05-17 22:20:14 +00:00
|
|
|
|
2011-05-18 18:49:33 +00:00
|
|
|
while (no_of_bits >= 8) {
|
2011-05-17 22:20:14 +00:00
|
|
|
offset++;
|
2011-05-18 18:49:33 +00:00
|
|
|
value = ((value & bit_mask) << 8) | tvb_get_guint8(tvb, offset);
|
|
|
|
|
2011-05-18 21:33:05 +00:00
|
|
|
if (lsb0)
|
|
|
|
*buf++ = (guint8) (GUINT16_SWAP_LE_BE(value) >> bit_shift);
|
|
|
|
else
|
|
|
|
*buf++ = (guint8) (value >> bit_shift);
|
2011-05-17 22:20:14 +00:00
|
|
|
no_of_bits -= 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* something left? */
|
2011-05-18 18:49:33 +00:00
|
|
|
if (no_of_bits > 0) {
|
|
|
|
guint8 tot_no_bits = bit_offset+no_of_bits;
|
|
|
|
|
|
|
|
/* Overlaps with next byte? Get next byte */
|
|
|
|
if (tot_no_bits > 8) {
|
|
|
|
offset++;
|
|
|
|
value = ((value & bit_mask) << 8) | tvb_get_guint8(tvb, offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lsb0) {
|
2011-05-18 21:33:05 +00:00
|
|
|
if (tot_no_bits > 8)
|
2012-02-28 20:32:42 +00:00
|
|
|
value = (GUINT16_SWAP_LE_BE(value) >> bit_offset) & (bit_mask8[no_of_bits]);
|
2011-05-18 21:33:05 +00:00
|
|
|
else
|
2012-02-28 20:32:42 +00:00
|
|
|
value = (value >> bit_offset) & (bit_mask8[no_of_bits]);
|
2011-05-18 18:49:33 +00:00
|
|
|
|
|
|
|
/* value = (value & ((1 << tot_no_bits)-1)) >> bit_offset; */
|
|
|
|
|
|
|
|
} else {
|
|
|
|
if (tot_no_bits > 8)
|
|
|
|
value = value >> (16 - tot_no_bits);
|
|
|
|
else
|
|
|
|
value = (value & bit_mask) >> (8-tot_no_bits);
|
|
|
|
}
|
|
|
|
*buf = (guint8) value;
|
|
|
|
}
|
2011-05-17 22:20:14 +00:00
|
|
|
|
|
|
|
} else {
|
|
|
|
/* fast code path for bit_offset == 0 */
|
|
|
|
while (no_of_bits >= 8) {
|
|
|
|
*buf++ = tvb_get_guint8(tvb, offset);
|
|
|
|
offset++;
|
|
|
|
no_of_bits -= 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* something left? */
|
2011-05-18 18:49:33 +00:00
|
|
|
if (no_of_bits > 0) {
|
|
|
|
if (lsb0)
|
2012-02-28 20:32:42 +00:00
|
|
|
*buf = tvb_get_guint8(tvb, offset) & bit_mask8[no_of_bits]; /* read: ((1 << no_of_bits)-1) */
|
2011-05-18 18:49:33 +00:00
|
|
|
else
|
|
|
|
*buf = tvb_get_guint8(tvb, offset) >> (8-no_of_bits);
|
|
|
|
}
|
2011-05-17 22:20:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
guint8 *
|
2012-04-04 21:54:22 +00:00
|
|
|
ep_tvb_get_bits(tvbuff_t *tvb, guint bit_offset, gint no_of_bits, gboolean lsb0)
|
2011-05-17 22:20:14 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gint no_of_bytes;
|
2011-05-17 22:20:14 +00:00
|
|
|
guint8 *buf;
|
|
|
|
|
|
|
|
/* XXX, no_of_bits == -1 -> to end of tvb? */
|
|
|
|
|
2012-04-04 21:54:22 +00:00
|
|
|
if (no_of_bits < 0) {
|
2011-05-17 22:20:14 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
|
|
|
}
|
|
|
|
|
|
|
|
no_of_bytes = (no_of_bits >> 3) + ((no_of_bits & 0x7) != 0); /* ceil(no_of_bits / 8.0) */
|
2011-12-22 18:13:18 +00:00
|
|
|
buf = ep_alloc(no_of_bytes);
|
2011-05-18 18:49:33 +00:00
|
|
|
tvb_get_bits_buf(tvb, bit_offset, no_of_bits, buf, lsb0);
|
2011-05-17 22:20:14 +00:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2007-05-18 16:46:35 +00:00
|
|
|
/* Get 9 - 16 bits */
|
|
|
|
guint16
|
2012-04-04 21:54:22 +00:00
|
|
|
tvb_get_bits16(tvbuff_t *tvb, guint bit_offset, const gint no_of_bits,const guint encoding _U_)
|
2007-04-28 12:13:25 +00:00
|
|
|
{
|
2012-02-28 20:32:42 +00:00
|
|
|
/* note that encoding has no meaning here, as the tvb is considered to contain an octet array */
|
|
|
|
return (guint16)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
|
2007-05-18 16:46:35 +00:00
|
|
|
}
|
|
|
|
|
2012-02-28 16:29:07 +00:00
|
|
|
/* Get 1 - 32 bits */
|
2007-05-18 16:46:35 +00:00
|
|
|
guint32
|
2012-04-04 21:54:22 +00:00
|
|
|
tvb_get_bits32(tvbuff_t *tvb, guint bit_offset, const gint no_of_bits, const guint encoding _U_)
|
2007-05-18 16:46:35 +00:00
|
|
|
{
|
2012-02-28 20:32:42 +00:00
|
|
|
/* note that encoding has no meaning here, as the tvb is considered to contain an octet array */
|
|
|
|
return (guint32)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
|
2007-05-18 16:46:35 +00:00
|
|
|
}
|
2009-06-08 08:28:42 +00:00
|
|
|
|
2012-02-28 16:29:07 +00:00
|
|
|
/* Get 1 - 64 bits */
|
2007-05-18 16:46:35 +00:00
|
|
|
guint64
|
2012-04-04 21:54:22 +00:00
|
|
|
tvb_get_bits64(tvbuff_t *tvb, guint bit_offset, const gint no_of_bits, const guint encoding _U_)
|
2007-05-18 16:46:35 +00:00
|
|
|
{
|
2012-02-28 20:32:42 +00:00
|
|
|
/* note that encoding has no meaning here, as the tvb is considered to contain an octet array */
|
|
|
|
return _tvb_get_bits64(tvb, bit_offset, no_of_bits);
|
2007-04-28 12:13:25 +00:00
|
|
|
}
|
2012-02-28 16:29:07 +00:00
|
|
|
/*
|
|
|
|
* This function will dissect a sequence of bits that does not need to be byte aligned; the bits
|
|
|
|
* set will be shown in the tree as ..10 10.. and the integer value returned if return_value is set.
|
|
|
|
* Offset should be given in bits from the start of the tvb.
|
|
|
|
* The function tolerates requests for more than 64 bits, but will only return the least significant 64 bits.
|
|
|
|
*/
|
2012-02-28 17:44:49 +00:00
|
|
|
static guint64
|
2012-04-04 21:54:22 +00:00
|
|
|
_tvb_get_bits64(tvbuff_t *tvb, guint bit_offset, const gint total_no_of_bits)
|
2012-02-28 16:29:07 +00:00
|
|
|
{
|
2012-02-28 20:32:42 +00:00
|
|
|
guint64 value;
|
|
|
|
guint octet_offset = bit_offset >> 3;
|
|
|
|
guint8 required_bits_in_first_octet = 8 - (bit_offset % 8);
|
|
|
|
|
|
|
|
if(required_bits_in_first_octet > total_no_of_bits)
|
|
|
|
{
|
|
|
|
/* the required bits don't extend to the end of the first octet */
|
|
|
|
guint8 right_shift = required_bits_in_first_octet - total_no_of_bits;
|
2012-04-06 00:32:26 +00:00
|
|
|
value = (tvb_get_guint8(tvb, octet_offset) >> right_shift) & bit_mask8[total_no_of_bits % 8];
|
2012-02-28 20:32:42 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
guint8 remaining_bit_length = total_no_of_bits;
|
|
|
|
|
|
|
|
/* get the bits up to the first octet boundary */
|
|
|
|
value = 0;
|
|
|
|
required_bits_in_first_octet %= 8;
|
|
|
|
if(required_bits_in_first_octet != 0)
|
|
|
|
{
|
|
|
|
value = tvb_get_guint8(tvb, octet_offset) & bit_mask8[required_bits_in_first_octet];
|
|
|
|
remaining_bit_length -= required_bits_in_first_octet;
|
|
|
|
octet_offset ++;
|
|
|
|
}
|
|
|
|
/* take the biggest words, shorts or octets that we can */
|
|
|
|
while (remaining_bit_length > 7)
|
|
|
|
{
|
|
|
|
switch (remaining_bit_length >> 4)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
/* 8 - 15 bits. (note that 0 - 7 would have dropped out of the while() loop) */
|
|
|
|
value <<= 8;
|
|
|
|
value += tvb_get_guint8(tvb, octet_offset);
|
|
|
|
remaining_bit_length -= 8;
|
|
|
|
octet_offset ++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
/* 16 - 31 bits */
|
|
|
|
value <<= 16;
|
|
|
|
value += tvb_get_ntohs(tvb, octet_offset);
|
|
|
|
remaining_bit_length -= 16;
|
|
|
|
octet_offset += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
case 3:
|
|
|
|
/* 32 - 63 bits */
|
|
|
|
value <<= 32;
|
|
|
|
value += tvb_get_ntohl(tvb, octet_offset);
|
|
|
|
remaining_bit_length -= 32;
|
|
|
|
octet_offset += 4;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* 64 bits (or more???) */
|
|
|
|
value = tvb_get_ntoh64(tvb, octet_offset);
|
|
|
|
remaining_bit_length -= 64;
|
|
|
|
octet_offset += 8;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* get bits from any partial octet at the tail */
|
|
|
|
if(remaining_bit_length)
|
|
|
|
{
|
|
|
|
value <<= remaining_bit_length;
|
|
|
|
value += (tvb_get_guint8(tvb, octet_offset) >> (8 - remaining_bit_length));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return value;
|
2012-02-28 16:29:07 +00:00
|
|
|
}
|
|
|
|
/* Get 1 - 32 bits (should be deprecated as same as tvb_get_bits32??) */
|
2009-11-14 20:13:43 +00:00
|
|
|
guint32
|
2012-04-04 21:54:22 +00:00
|
|
|
tvb_get_bits(tvbuff_t *tvb, const guint bit_offset, const gint no_of_bits, const guint encoding _U_)
|
2009-11-14 20:13:43 +00:00
|
|
|
{
|
2012-02-28 20:32:42 +00:00
|
|
|
/* note that encoding has no meaning here, as the tvb is considered to contain an octet array */
|
|
|
|
return (guint32)_tvb_get_bits64(tvb, bit_offset, no_of_bits);
|
2009-11-14 20:13:43 +00:00
|
|
|
}
|
|
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_find_guint8(tvbuff_t *tvb, const gint offset, const gint maxlength, const guint8 needle)
|
2000-08-30 02:50:18 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *result;
|
|
|
|
guint abs_offset, junk_length;
|
|
|
|
guint tvbufflen;
|
|
|
|
guint limit;
|
2000-08-30 02:50:18 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
|
2000-08-30 02:50:18 +00:00
|
|
|
|
|
|
|
/* 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) {
|
2010-04-28 08:15:20 +00:00
|
|
|
result = memchr(tvb->real_data + abs_offset, needle, limit);
|
2000-08-30 02:50:18 +00:00
|
|
|
if (result == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else {
|
2009-04-03 15:30:38 +00:00
|
|
|
return (gint) (result - tvb->real_data);
|
2000-08-30 02:50:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-08-30 02:50:18 +00:00
|
|
|
|
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
return tvb_find_guint8(tvb->tvbuffs.subset.tvb,
|
|
|
|
abs_offset - tvb->tvbuffs.subset.offset,
|
|
|
|
limit, needle);
|
|
|
|
|
|
|
|
case TVBUFF_COMPOSITE:
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-08-30 02:50:18 +00:00
|
|
|
/* XXX - return composite_find_guint8(tvb, offset, limit, needle); */
|
|
|
|
}
|
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-08-30 02:50:18 +00:00
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_pbrk_guint8(tvbuff_t *tvb, const gint offset, const gint maxlength, const guint8 *needles, guchar *found_needle)
|
2000-11-10 06:50:37 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *result;
|
|
|
|
guint abs_offset, junk_length;
|
|
|
|
guint tvbufflen;
|
|
|
|
guint limit;
|
2000-11-10 06:50:37 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
|
2000-11-10 06:50:37 +00:00
|
|
|
|
|
|
|
/* 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) {
|
2010-03-08 20:45:13 +00:00
|
|
|
result = guint8_pbrk(tvb->real_data + abs_offset, limit, needles, found_needle);
|
2000-11-10 06:50:37 +00:00
|
|
|
if (result == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else {
|
2009-04-03 15:30:38 +00:00
|
|
|
return (gint) (result - tvb->real_data);
|
2000-11-10 06:50:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(tvb->type) {
|
|
|
|
case TVBUFF_REAL_DATA:
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-11-10 06:50:37 +00:00
|
|
|
|
|
|
|
case TVBUFF_SUBSET:
|
|
|
|
return tvb_pbrk_guint8(tvb->tvbuffs.subset.tvb,
|
|
|
|
abs_offset - tvb->tvbuffs.subset.offset,
|
2010-03-08 20:45:13 +00:00
|
|
|
limit, needles, found_needle);
|
2000-11-10 06:50:37 +00:00
|
|
|
|
|
|
|
case TVBUFF_COMPOSITE:
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-11-10 06:50:37 +00:00
|
|
|
/* XXX - return composite_pbrk_guint8(tvb, offset, limit, needle); */
|
|
|
|
}
|
|
|
|
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT_NOT_REACHED();
|
2000-11-10 06:50:37 +00:00
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_strsize(tvbuff_t *tvb, const gint offset)
|
2000-12-25 23:48:16 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint abs_offset, junk_length;
|
|
|
|
gint nul_offset;
|
2000-12-25 23:48:16 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
|
2000-12-25 23:48:16 +00:00
|
|
|
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
|
2009-09-20 07:35:39 +00:00
|
|
|
* of the actual data? If there's less captured data
|
2000-12-25 23:48:16 +00:00
|
|
|
* 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;
|
|
|
|
}
|
|
|
|
|
2012-05-14 00:49:05 +00:00
|
|
|
/* UTF-16/UCS-2 version of tvb_strsize */
|
2012-05-14 06:32:16 +00:00
|
|
|
/* Returns number of bytes including the (two-bytes) null terminator */
|
2010-12-23 17:59:34 +00:00
|
|
|
guint
|
|
|
|
tvb_unicode_strsize(tvbuff_t *tvb, const gint offset)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint i = 0;
|
|
|
|
gunichar2 uchar;
|
2010-12-23 17:59:34 +00:00
|
|
|
|
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
|
|
|
do {
|
|
|
|
/* Endianness doesn't matter when looking for null */
|
|
|
|
uchar = tvb_get_ntohs(tvb, offset + i);
|
|
|
|
i += 2;
|
|
|
|
} while(uchar != 0);
|
|
|
|
|
2012-05-14 06:32:16 +00:00
|
|
|
return i;
|
2010-12-23 17:59:34 +00:00
|
|
|
}
|
|
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_strnlen(tvbuff_t *tvb, const gint offset, const guint maxlength)
|
2000-08-30 02:50:18 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gint result_offset;
|
|
|
|
guint abs_offset, junk_length;
|
2000-08-30 02:50:18 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
|
2000-08-30 02:50:18 +00:00
|
|
|
|
|
|
|
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
|
2010-10-30 18:18:12 +00:00
|
|
|
tvb_strneql(tvbuff_t *tvb, const gint offset, const gchar *str, const size_t 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
|
|
|
|
2010-10-30 18:53:31 +00:00
|
|
|
ptr = ensure_contiguous_no_exception(tvb, offset, (gint)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
|
|
|
/*
|
strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delenda
est. Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our
own versions if they're missing from GLib (as is the case with GLib
1.x).
In the code to build the list of named fields for Diameter, don't use
g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping
in the hash function and use g_ascii_strcasecmp() in the compare
function.
We do this because there is no guarantee that toupper(), tolower(), and
functions that use them will, for example, map between "I" and "i" in
all locales; in Turkish locales, for example, there are, in both
upper case and lower case, versions of "i" with and without a dot, and
the upper-case version of "i" is "I"-with-a-dot and the lower-case
version of "I" is "i"-without-a-dot. This causes strings that should
match not to match.
This finishes fixing bug 2010 - an earlier checkin prevented the crash
(as there are other ways to produce the same crash, e.g. a bogus
dictionary.xml file), but didn't fix the case-insensitive string matching.
svn path=/trunk/; revision=23623
2007-11-27 18:52:51 +00:00
|
|
|
* Call g_ascii_strncasecmp after checking if enough chars left, returning
|
|
|
|
* 0 if it returns 0 (meaning "equal") and -1 otherwise, otherwise return -1.
|
2001-07-02 07:11:40 +00:00
|
|
|
*/
|
2000-11-09 10:56:33 +00:00
|
|
|
gint
|
2010-10-30 18:53:31 +00:00
|
|
|
tvb_strncaseeql(tvbuff_t *tvb, const gint offset, const gchar *str, const size_t 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
|
|
|
|
2010-10-30 18:53:31 +00:00
|
|
|
ptr = ensure_contiguous_no_exception(tvb, offset, (gint)size, NULL);
|
2000-09-07 13:00:12 +00:00
|
|
|
|
2000-11-09 10:56:33 +00:00
|
|
|
if (ptr) {
|
strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delenda
est. Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our
own versions if they're missing from GLib (as is the case with GLib
1.x).
In the code to build the list of named fields for Diameter, don't use
g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping
in the hash function and use g_ascii_strcasecmp() in the compare
function.
We do this because there is no guarantee that toupper(), tolower(), and
functions that use them will, for example, map between "I" and "i" in
all locales; in Turkish locales, for example, there are, in both
upper case and lower case, versions of "i" with and without a dot, and
the upper-case version of "i" is "I"-with-a-dot and the lower-case
version of "I" is "i"-without-a-dot. This causes strings that should
match not to match.
This finishes fixing bug 2010 - an earlier checkin prevented the crash
(as there are other ways to produce the same crash, e.g. a bogus
dictionary.xml file), but didn't fix the case-insensitive string matching.
svn path=/trunk/; revision=23623
2007-11-27 18:52:51 +00:00
|
|
|
int cmp = g_ascii_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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_memeql(tvbuff_t *tvb, const gint offset, const guint8 *str, size_t size)
|
2001-07-02 07:11:40 +00:00
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8 *ptr;
|
2001-07-02 07:11:40 +00:00
|
|
|
|
2009-04-03 15:30:38 +00:00
|
|
|
ptr = ensure_contiguous_no_exception(tvb, offset, (gint) 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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-20 07:35:39 +00:00
|
|
|
/* Convert a string from Unicode to ASCII. At the moment we fake it by
|
2004-11-12 10:26:56 +00:00
|
|
|
* replacing all non-ASCII characters with a '.' )-: The caller must
|
|
|
|
* free the result returned. The len parameter is the number of guint16's
|
|
|
|
* to convert from Unicode. */
|
2011-01-28 20:01:01 +00:00
|
|
|
/* XXX - this function has been superceded by tvb_get_unicode_string() */
|
2003-02-24 01:22:30 +00:00
|
|
|
char *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_fake_unicode(tvbuff_t *tvb, int offset, const int len, const gboolean little_endian)
|
2003-02-24 01:22:30 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
char *buffer;
|
|
|
|
int i;
|
|
|
|
guint16 character;
|
2003-02-24 01:22:30 +00:00
|
|
|
|
|
|
|
/* 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);
|
2004-11-12 10:26:56 +00:00
|
|
|
buffer[i] = character < 256 ? character : '.';
|
2003-02-24 01:22:30 +00:00
|
|
|
offset += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
buffer[len] = 0;
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2009-09-20 07:35:39 +00:00
|
|
|
/* Convert a string from Unicode to ASCII. At the moment we fake it by
|
2006-07-05 18:47:21 +00:00
|
|
|
* replacing all non-ASCII characters with a '.' )-: The len parameter is
|
2005-08-10 13:56:34 +00:00
|
|
|
* the number of guint16's to convert from Unicode.
|
2005-07-28 08:55:11 +00:00
|
|
|
*
|
|
|
|
* This function allocates memory from a buffer with packet lifetime.
|
|
|
|
* You do not have to free this buffer, it will be automatically freed
|
2006-05-21 05:12:17 +00:00
|
|
|
* when wireshark starts decoding the next packet.
|
2005-07-28 08:55:11 +00:00
|
|
|
*/
|
2011-10-23 22:02:56 +00:00
|
|
|
/* XXX: This has been replaced by tvb_get_ephemeral_unicode_string() */
|
2005-07-28 08:55:11 +00:00
|
|
|
char *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_ephemeral_faked_unicode(tvbuff_t *tvb, int offset, const int len, const gboolean little_endian)
|
2005-07-28 08:55:11 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
char *buffer;
|
|
|
|
int i;
|
|
|
|
guint16 character;
|
2005-07-28 08:55:11 +00:00
|
|
|
|
|
|
|
/* Make sure we have enough data before allocating the buffer,
|
|
|
|
so we don't blow up if the length is huge. */
|
|
|
|
tvb_ensure_bytes_exist(tvb, offset, 2*len);
|
|
|
|
|
|
|
|
/* We know we won't throw an exception, so we don't have to worry
|
|
|
|
about leaking this buffer. */
|
|
|
|
buffer = ep_alloc(len + 1);
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
character = little_endian ? tvb_get_letohs(tvb, offset)
|
|
|
|
: tvb_get_ntohs(tvb, offset);
|
|
|
|
buffer[i] = character < 256 ? character : '.';
|
|
|
|
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 *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_format_text(tvbuff_t *tvb, const gint offset, const gint size)
|
2000-09-08 06:16:58 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
|
|
|
gint len = size;
|
2000-09-08 06:16:58 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
|
|
|
|
len = tvb_length_remaining(tvb, offset);
|
|
|
|
ptr = ensure_contiguous(tvb, offset, len);
|
|
|
|
}
|
2000-09-08 06:16:58 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
return format_text(ptr, len);
|
2000-09-08 06:16:58 +00:00
|
|
|
}
|
|
|
|
|
2006-06-19 15:53:03 +00:00
|
|
|
/*
|
|
|
|
* Format the data in the tvb from offset for length ...
|
|
|
|
*/
|
|
|
|
|
|
|
|
gchar *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_format_text_wsp(tvbuff_t *tvb, const gint offset, const gint size)
|
2006-06-19 15:53:03 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr;
|
|
|
|
gint len = size;
|
2006-06-19 15:53:03 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
|
2006-06-19 15:53:03 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
len = tvb_length_remaining(tvb, offset);
|
|
|
|
ptr = ensure_contiguous(tvb, offset, len);
|
2006-06-19 15:53:03 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
}
|
2006-06-19 15:53:03 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
return format_text_wsp(ptr, len);
|
2006-06-19 15:53:03 +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 *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_format_stringzpad(tvbuff_t *tvb, const gint offset, const gint size)
|
2004-03-23 18:06:29 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr, *p;
|
|
|
|
gint len = size;
|
|
|
|
gint stringlen;
|
2004-03-23 18:06:29 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
|
2004-03-23 18:06:29 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
len = tvb_length_remaining(tvb, offset);
|
|
|
|
ptr = ensure_contiguous(tvb, offset, len);
|
2004-03-23 18:06:29 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
}
|
2004-03-23 18:06:29 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
for (p = ptr, stringlen = 0; stringlen < len && *p != '\0'; p++, stringlen++)
|
|
|
|
;
|
|
|
|
return format_text(ptr, stringlen);
|
2004-03-23 18:06:29 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-04-24 08:08:37 +00:00
|
|
|
/*
|
|
|
|
* Like "tvb_format_text_wsp()", but for null-padded strings; don't show
|
|
|
|
* the null padding characters as "\000".
|
|
|
|
*/
|
|
|
|
gchar *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_format_stringzpad_wsp(tvbuff_t *tvb, const gint offset, const gint size)
|
2009-04-24 08:08:37 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
const guint8 *ptr, *p;
|
|
|
|
gint len = size;
|
|
|
|
gint stringlen;
|
2009-04-24 08:08:37 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
|
2009-04-24 08:08:37 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
len = tvb_length_remaining(tvb, offset);
|
|
|
|
ptr = ensure_contiguous(tvb, offset, len);
|
2009-04-24 08:08:37 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
}
|
2009-04-24 08:08:37 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
for (p = ptr, stringlen = 0; stringlen < len && *p != '\0'; p++, stringlen++)
|
|
|
|
;
|
|
|
|
return format_text_wsp(ptr, stringlen);
|
2009-04-24 08:08:37 +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
|
|
|
/*
|
|
|
|
* 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 *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_string(tvbuff_t *tvb, const gint offset, const gint length)
|
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
|
|
|
{
|
2004-02-19 05:19:10 +00:00
|
|
|
const guint8 *ptr;
|
2011-12-22 18:13:18 +00:00
|
|
|
guint8 *strbuf = NULL;
|
2005-03-28 15:55:47 +00:00
|
|
|
|
2005-04-28 18:07:40 +00:00
|
|
|
tvb_ensure_bytes_exist(tvb, offset, length);
|
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
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
ptr = ensure_contiguous(tvb, offset, length);
|
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
|
|
|
strbuf = g_malloc(length + 1);
|
2005-03-28 15:55:47 +00:00
|
|
|
if (length != 0) {
|
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
|
|
|
memcpy(strbuf, ptr, length);
|
2005-03-28 15:55:47 +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
|
|
|
strbuf[length] = '\0';
|
|
|
|
return strbuf;
|
|
|
|
}
|
2011-01-03 18:29:29 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Unicode (UTF-16) version of tvb_get_string()
|
2012-05-11 23:55:54 +00:00
|
|
|
* XXX - this is UCS-2, not UTF-16, as it doesn't handle surrogate pairs
|
2011-01-12 02:25:08 +00:00
|
|
|
*
|
2011-01-03 18:29:29 +00:00
|
|
|
* Encoding paramter should be ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN
|
|
|
|
*
|
|
|
|
* Specify length in bytes
|
2011-01-12 02:25:08 +00:00
|
|
|
*
|
2011-01-03 18:29:29 +00:00
|
|
|
* Returns an UTF-8 string that must be freed by the caller
|
|
|
|
*/
|
|
|
|
gchar *
|
|
|
|
tvb_get_unicode_string(tvbuff_t *tvb, const gint offset, gint length, const guint encoding)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gunichar2 uchar;
|
|
|
|
gint i; /* Byte counter for tvbuff */
|
|
|
|
GString *strbuf = NULL;
|
2011-01-03 18:29:29 +00:00
|
|
|
|
2012-12-22 22:35:07 +00:00
|
|
|
tvb_ensure_bytes_exist(tvb, offset, length);
|
|
|
|
|
2011-01-03 18:29:29 +00:00
|
|
|
strbuf = g_string_new(NULL);
|
|
|
|
|
|
|
|
for(i = 0; i < length; i += 2) {
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (encoding == ENC_BIG_ENDIAN)
|
2011-01-03 18:29:29 +00:00
|
|
|
uchar = tvb_get_ntohs(tvb, offset + i);
|
|
|
|
else
|
|
|
|
uchar = tvb_get_letohs(tvb, offset + i);
|
|
|
|
|
2012-06-14 19:08:19 +00:00
|
|
|
g_string_append_unichar(strbuf, uchar);
|
2011-01-03 18:29:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return g_string_free(strbuf, FALSE);
|
|
|
|
}
|
|
|
|
|
2005-07-24 01:56:01 +00:00
|
|
|
/*
|
2011-07-03 17:08:25 +00:00
|
|
|
* Given a tvbuff, an offset, a length, and an encoding, allocate a
|
|
|
|
* buffer big enough to hold a non-null-terminated string of that length
|
2012-05-15 05:42:58 +00:00
|
|
|
* at that offset, plus a trailing '\0', copy into the buffer the
|
|
|
|
* string as converted from the appropriate encoding to UTF-8, and
|
|
|
|
* return a pointer to the string.
|
2005-07-24 01:56:01 +00:00
|
|
|
*
|
|
|
|
* Throws an exception if the tvbuff ends before the string does.
|
|
|
|
*
|
|
|
|
* This function allocates memory from a buffer with packet lifetime.
|
|
|
|
* You do not have to free this buffer, it will be automatically freed
|
2006-05-21 05:12:17 +00:00
|
|
|
* when wireshark starts decoding the next packet.
|
2005-07-24 01:56:01 +00:00
|
|
|
* Do not use this function if you want the allocated memory to be persistent
|
|
|
|
* after the current packet has been dissected.
|
|
|
|
*/
|
|
|
|
guint8 *
|
2011-07-03 17:08:25 +00:00
|
|
|
tvb_get_ephemeral_string_enc(tvbuff_t *tvb, const gint offset,
|
2012-05-15 05:42:58 +00:00
|
|
|
const gint length, const guint encoding)
|
2005-07-24 01:56:01 +00:00
|
|
|
{
|
|
|
|
const guint8 *ptr;
|
2012-05-15 05:42:58 +00:00
|
|
|
guint8 *strbuf;
|
2005-07-24 01:56:01 +00:00
|
|
|
|
2012-05-11 23:55:54 +00:00
|
|
|
switch (encoding & ENC_CHARENCODING_MASK) {
|
|
|
|
|
|
|
|
case ENC_ASCII:
|
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* For now, we treat bogus values as meaning
|
|
|
|
* "ASCII" rather than reporting an error,
|
|
|
|
* for the benefit of old dissectors written
|
|
|
|
* when the last argument to proto_tree_add_item()
|
|
|
|
* was a gboolean for the byte order, not an
|
|
|
|
* encoding value, and passed non-zero values
|
|
|
|
* other than TRUE to mean "little-endian".
|
|
|
|
*
|
|
|
|
* XXX - should map all octets with the 8th bit
|
|
|
|
* not set to a "substitute" UTF-8 character.
|
|
|
|
*/
|
2012-05-15 05:42:58 +00:00
|
|
|
strbuf = tvb_get_ephemeral_string(tvb, offset, length);
|
2012-05-11 23:55:54 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ENC_UTF_8:
|
|
|
|
/*
|
|
|
|
* XXX - should map all invalid UTF-8 sequences
|
|
|
|
* to a "substitute" UTF-8 character.
|
|
|
|
*/
|
2012-05-15 05:42:58 +00:00
|
|
|
strbuf = tvb_get_ephemeral_string(tvb, offset, length);
|
2012-05-11 23:55:54 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ENC_UTF_16:
|
|
|
|
/*
|
|
|
|
* XXX - needs to handle surrogate pairs and to map
|
|
|
|
* invalid characters and sequences to a "substitute"
|
|
|
|
* UTF-8 character.
|
|
|
|
*/
|
|
|
|
strbuf = tvb_get_ephemeral_unicode_string(tvb, offset, length,
|
|
|
|
encoding & ENC_LITTLE_ENDIAN);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ENC_UCS_2:
|
|
|
|
/*
|
|
|
|
* XXX - needs to map values that are not valid UCS-2
|
|
|
|
* characters (such as, I think, values used as the
|
|
|
|
* components of a UTF-16 surrogate pair) to a
|
|
|
|
* "substitute" UTF-8 character.
|
|
|
|
*/
|
|
|
|
strbuf = tvb_get_ephemeral_unicode_string(tvb, offset, length,
|
|
|
|
encoding & ENC_LITTLE_ENDIAN);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ENC_EBCDIC:
|
|
|
|
/*
|
|
|
|
* XXX - do the copy and conversion in one pass.
|
|
|
|
*
|
|
|
|
* XXX - multiple "dialects" of EBCDIC?
|
|
|
|
*/
|
2012-05-15 05:42:58 +00:00
|
|
|
tvb_ensure_bytes_exist(tvb, offset, length); /* make sure length = -1 fails */
|
2012-05-11 23:55:54 +00:00
|
|
|
strbuf = ep_alloc(length + 1);
|
|
|
|
if (length != 0) {
|
2012-05-15 05:42:58 +00:00
|
|
|
ptr = ensure_contiguous(tvb, offset, length);
|
2012-05-11 23:55:54 +00:00
|
|
|
memcpy(strbuf, ptr, length);
|
2012-05-15 05:42:58 +00:00
|
|
|
EBCDIC_to_ASCII(strbuf, length);
|
2012-05-11 23:55:54 +00:00
|
|
|
}
|
2012-05-15 05:42:58 +00:00
|
|
|
strbuf[length] = '\0';
|
2012-05-11 23:55:54 +00:00
|
|
|
break;
|
|
|
|
}
|
2005-07-24 01:56:01 +00:00
|
|
|
return strbuf;
|
|
|
|
}
|
|
|
|
|
2011-07-03 17:08:25 +00:00
|
|
|
guint8 *
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb_get_ephemeral_string(tvbuff_t *tvb, const gint offset, const gint length)
|
2011-07-03 17:08:25 +00:00
|
|
|
{
|
2012-05-15 05:42:58 +00:00
|
|
|
guint8 *strbuf;
|
|
|
|
|
|
|
|
tvb_ensure_bytes_exist(tvb, offset, length); /* make sure length = -1 fails */
|
|
|
|
strbuf = ep_alloc(length + 1);
|
|
|
|
tvb_memcpy(tvb, strbuf, offset, length);
|
|
|
|
strbuf[length] = '\0';
|
|
|
|
return strbuf;
|
2011-07-03 17:08:25 +00:00
|
|
|
}
|
|
|
|
|
2011-01-03 18:29:29 +00:00
|
|
|
/*
|
|
|
|
* Unicode (UTF-16) version of tvb_get_ephemeral_string()
|
2012-05-11 23:55:54 +00:00
|
|
|
* XXX - this is UCS-2, not UTF-16, as it doesn't handle surrogate pairs
|
2011-01-12 02:25:08 +00:00
|
|
|
*
|
2012-05-15 05:42:58 +00:00
|
|
|
* Encoding parameter should be ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN
|
2011-01-03 18:29:29 +00:00
|
|
|
*
|
|
|
|
* Specify length in bytes
|
2011-01-12 02:25:08 +00:00
|
|
|
*
|
2011-01-03 18:29:29 +00:00
|
|
|
* Returns an ep_ allocated UTF-8 string
|
|
|
|
*/
|
|
|
|
gchar *
|
|
|
|
tvb_get_ephemeral_unicode_string(tvbuff_t *tvb, const gint offset, gint length, const guint encoding)
|
|
|
|
{
|
2012-06-14 20:13:45 +00:00
|
|
|
/* Longest UTF-8 character takes 6 bytes + 1 byte for NUL, round it to 8B */
|
2012-06-14 19:08:19 +00:00
|
|
|
gchar tmpbuf[8];
|
2011-12-22 18:13:18 +00:00
|
|
|
gunichar2 uchar;
|
|
|
|
gint i; /* Byte counter for tvbuff */
|
|
|
|
gint tmpbuf_len;
|
2011-01-03 18:29:29 +00:00
|
|
|
emem_strbuf_t *strbuf = NULL;
|
|
|
|
|
2012-12-22 22:35:07 +00:00
|
|
|
tvb_ensure_bytes_exist(tvb, offset, length);
|
|
|
|
|
2011-01-03 18:29:29 +00:00
|
|
|
strbuf = ep_strbuf_new(NULL);
|
|
|
|
|
|
|
|
for(i = 0; i < length; i += 2) {
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (encoding == ENC_BIG_ENDIAN)
|
2011-01-03 18:29:29 +00:00
|
|
|
uchar = tvb_get_ntohs(tvb, offset + i);
|
|
|
|
else
|
|
|
|
uchar = tvb_get_letohs(tvb, offset + i);
|
|
|
|
|
2012-06-14 19:08:19 +00:00
|
|
|
tmpbuf_len = g_unichar_to_utf8(uchar, tmpbuf);
|
2011-01-03 18:29:29 +00:00
|
|
|
|
|
|
|
/* NULL terminate the tmpbuf so ep_strbuf_append knows where
|
|
|
|
* to stop */
|
|
|
|
tmpbuf[tmpbuf_len] = '\0';
|
|
|
|
|
|
|
|
ep_strbuf_append(strbuf, tmpbuf);
|
|
|
|
}
|
|
|
|
|
|
|
|
return strbuf->str;
|
|
|
|
}
|
|
|
|
|
2009-03-27 19:40:23 +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.
|
|
|
|
*
|
|
|
|
* This function allocates memory from a buffer with capture session lifetime.
|
|
|
|
* You do not have to free this buffer, it will be automatically freed
|
|
|
|
* when wireshark starts or opens a new capture.
|
|
|
|
*/
|
|
|
|
guint8 *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_seasonal_string(tvbuff_t *tvb, const gint offset, const gint length)
|
2009-03-27 19:40:23 +00:00
|
|
|
{
|
|
|
|
const guint8 *ptr;
|
2011-12-22 18:13:18 +00:00
|
|
|
guint8 *strbuf = NULL;
|
2009-03-27 19:40:23 +00:00
|
|
|
|
|
|
|
tvb_ensure_bytes_exist(tvb, offset, length);
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
ptr = ensure_contiguous(tvb, offset, length);
|
2009-03-27 19:40:23 +00:00
|
|
|
strbuf = se_alloc(length + 1);
|
|
|
|
if (length != 0) {
|
|
|
|
memcpy(strbuf, ptr, length);
|
|
|
|
}
|
|
|
|
strbuf[length] = '\0';
|
|
|
|
return 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
|
|
|
|
|
|
|
/*
|
2011-07-05 23:59:23 +00:00
|
|
|
* Given a tvbuff, an offset, and an encoding, 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; if the encoding is EBCDIC, map
|
|
|
|
* the string from EBCDIC to ASCII. Also return the length of the
|
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
|
|
|
* string (including the terminating null) through a pointer.
|
|
|
|
*/
|
|
|
|
guint8 *
|
2012-05-15 05:42:58 +00:00
|
|
|
tvb_get_stringz_enc(tvbuff_t *tvb, const gint offset, gint *lengthp, const guint encoding)
|
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
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint size;
|
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
|
|
|
guint8 *strptr;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
size = tvb_strsize(tvb, 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
|
|
|
strptr = g_malloc(size);
|
|
|
|
tvb_memcpy(tvb, strptr, offset, size);
|
2011-07-05 23:59:23 +00:00
|
|
|
if ((encoding & ENC_CHARENCODING_MASK) == ENC_EBCDIC)
|
|
|
|
EBCDIC_to_ASCII(strptr, size);
|
2009-11-23 22:02:12 +00:00
|
|
|
if (lengthp)
|
|
|
|
*lengthp = size;
|
2005-08-10 14:25:59 +00:00
|
|
|
return strptr;
|
|
|
|
}
|
2011-07-05 23:59:23 +00:00
|
|
|
|
|
|
|
guint8 *
|
|
|
|
tvb_get_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp)
|
|
|
|
{
|
|
|
|
return tvb_get_stringz_enc(tvb, offset, lengthp, ENC_UTF_8|ENC_NA);
|
|
|
|
}
|
|
|
|
|
2011-01-12 02:25:08 +00:00
|
|
|
/*
|
|
|
|
* 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), ensure that
|
|
|
|
* the TVB is flat, and return a pointer to the string (in the TVB).
|
|
|
|
* Also return the length of the string (including the terminating null)
|
|
|
|
* through a pointer.
|
|
|
|
*
|
|
|
|
* As long as we aren't using composite TVBs, this saves the cycles used
|
|
|
|
* (often unnecessariliy) in allocating a buffer and copying the string into
|
|
|
|
* it. (If we do start using composite TVBs, we may want to replace this
|
|
|
|
* function with the _ephemeral versoin.)
|
|
|
|
*/
|
|
|
|
const guint8 *
|
|
|
|
tvb_get_const_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint size;
|
2011-01-12 02:25:08 +00:00
|
|
|
const guint8 *strptr;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
size = tvb_strsize(tvb, offset);
|
2011-01-12 20:25:36 +00:00
|
|
|
strptr = ensure_contiguous(tvb, offset, size);
|
2011-01-12 02:25:08 +00:00
|
|
|
if (lengthp)
|
|
|
|
*lengthp = size;
|
|
|
|
return strptr;
|
|
|
|
}
|
2011-07-05 23:59:23 +00:00
|
|
|
|
2005-08-10 14:25:59 +00:00
|
|
|
/*
|
|
|
|
* 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,
|
2009-09-20 07:35:39 +00:00
|
|
|
* and return a pointer to the string. Also return the length of the
|
2005-08-10 14:25:59 +00:00
|
|
|
* string (including the terminating null) through a pointer.
|
|
|
|
*
|
|
|
|
* This function allocates memory from a buffer with packet lifetime.
|
|
|
|
* You do not have to free this buffer, it will be automatically freed
|
2006-05-21 05:12:17 +00:00
|
|
|
* when wireshark starts decoding the next packet.
|
2005-08-10 14:25:59 +00:00
|
|
|
* Do not use this function if you want the allocated memory to be persistent
|
|
|
|
* after the current packet has been dissected.
|
|
|
|
*/
|
|
|
|
guint8 *
|
2012-05-15 05:42:58 +00:00
|
|
|
tvb_get_ephemeral_stringz_enc(tvbuff_t *tvb, const gint offset, gint *lengthp, const guint encoding)
|
2005-08-10 14:25:59 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint size;
|
2005-08-10 14:25:59 +00:00
|
|
|
guint8 *strptr;
|
|
|
|
|
2012-05-15 05:42:58 +00:00
|
|
|
switch (encoding & ENC_CHARENCODING_MASK) {
|
|
|
|
|
|
|
|
case ENC_ASCII:
|
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* For now, we treat bogus values as meaning
|
|
|
|
* "ASCII" rather than reporting an error,
|
|
|
|
* for the benefit of old dissectors written
|
|
|
|
* when the last argument to proto_tree_add_item()
|
|
|
|
* was a gboolean for the byte order, not an
|
|
|
|
* encoding value, and passed non-zero values
|
|
|
|
* other than TRUE to mean "little-endian".
|
|
|
|
*
|
|
|
|
* XXX - should map all octets with the 8th bit
|
|
|
|
* not set to a "substitute" UTF-8 character.
|
|
|
|
*/
|
|
|
|
strptr = tvb_get_ephemeral_stringz(tvb, offset, lengthp);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ENC_UTF_8:
|
|
|
|
/*
|
|
|
|
* XXX - should map all invalid UTF-8 sequences
|
|
|
|
* to a "substitute" UTF-8 character.
|
|
|
|
*/
|
|
|
|
strptr = tvb_get_ephemeral_stringz(tvb, offset, lengthp);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ENC_UTF_16:
|
|
|
|
/*
|
|
|
|
* XXX - needs to handle surrogate pairs and to map
|
|
|
|
* invalid characters and sequences to a "substitute"
|
|
|
|
* UTF-8 character.
|
|
|
|
*/
|
|
|
|
strptr = tvb_get_ephemeral_unicode_stringz(tvb, offset, lengthp,
|
|
|
|
encoding & ENC_LITTLE_ENDIAN);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ENC_UCS_2:
|
|
|
|
/*
|
|
|
|
* XXX - needs to map values that are not valid UCS-2
|
|
|
|
* characters (such as, I think, values used as the
|
|
|
|
* components of a UTF-16 surrogate pair) to a
|
|
|
|
* "substitute" UTF-8 character.
|
|
|
|
*/
|
|
|
|
strptr = tvb_get_ephemeral_unicode_stringz(tvb, offset, lengthp,
|
|
|
|
encoding & ENC_LITTLE_ENDIAN);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ENC_EBCDIC:
|
|
|
|
/*
|
|
|
|
* XXX - do the copy and conversion in one pass.
|
|
|
|
*
|
|
|
|
* XXX - multiple "dialects" of EBCDIC?
|
|
|
|
*/
|
|
|
|
size = tvb_strsize(tvb, offset);
|
|
|
|
strptr = ep_alloc(size);
|
|
|
|
tvb_memcpy(tvb, strptr, offset, size);
|
2011-07-05 23:59:23 +00:00
|
|
|
EBCDIC_to_ASCII(strptr, size);
|
2012-05-15 05:42:58 +00:00
|
|
|
if (lengthp)
|
|
|
|
*lengthp = size;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
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 strptr;
|
|
|
|
}
|
|
|
|
|
2011-07-05 23:59:23 +00:00
|
|
|
guint8 *
|
|
|
|
tvb_get_ephemeral_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp)
|
|
|
|
{
|
2012-05-15 05:42:58 +00:00
|
|
|
guint size;
|
|
|
|
guint8 *strptr;
|
|
|
|
|
|
|
|
size = tvb_strsize(tvb, offset);
|
|
|
|
strptr = ep_alloc(size);
|
|
|
|
tvb_memcpy(tvb, strptr, offset, size);
|
|
|
|
if (lengthp)
|
|
|
|
*lengthp = size;
|
|
|
|
return strptr;
|
2011-07-05 23:59:23 +00:00
|
|
|
}
|
|
|
|
|
2010-12-23 17:59:34 +00:00
|
|
|
/*
|
|
|
|
* Unicode (UTF-16) version of tvb_get_ephemeral_stringz()
|
2011-01-12 02:25:08 +00:00
|
|
|
*
|
2010-12-23 17:59:34 +00:00
|
|
|
* Encoding paramter should be ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN
|
|
|
|
*
|
2011-01-03 18:29:29 +00:00
|
|
|
* Returns an ep_ allocated UTF-8 string and updates lengthp pointer with length of string (in bytes)
|
2010-12-23 17:59:34 +00:00
|
|
|
*/
|
|
|
|
gchar *
|
|
|
|
tvb_get_ephemeral_unicode_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp, const guint encoding)
|
|
|
|
{
|
2012-06-14 20:13:45 +00:00
|
|
|
/* Longest UTF-8 character takes 6 bytes + 1 byte for NUL, round it to 8B */
|
2012-06-14 19:08:19 +00:00
|
|
|
gchar tmpbuf[8];
|
2011-12-22 18:13:18 +00:00
|
|
|
gunichar2 uchar;
|
|
|
|
gint size; /* Number of UTF-16 characters */
|
|
|
|
gint i; /* Byte counter for tvbuff */
|
|
|
|
gint tmpbuf_len;
|
2010-12-23 17:59:34 +00:00
|
|
|
emem_strbuf_t *strbuf = NULL;
|
|
|
|
|
|
|
|
strbuf = ep_strbuf_new(NULL);
|
|
|
|
|
|
|
|
size = tvb_unicode_strsize(tvb, offset);
|
|
|
|
|
2010-12-23 18:24:39 +00:00
|
|
|
for(i = 0; i < size; i += 2) {
|
2010-12-23 17:59:34 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (encoding == ENC_BIG_ENDIAN)
|
2010-12-23 17:59:34 +00:00
|
|
|
uchar = tvb_get_ntohs(tvb, offset + i);
|
|
|
|
else
|
|
|
|
uchar = tvb_get_letohs(tvb, offset + i);
|
|
|
|
|
2012-06-14 19:08:19 +00:00
|
|
|
tmpbuf_len = g_unichar_to_utf8(uchar, tmpbuf);
|
2010-12-23 17:59:34 +00:00
|
|
|
|
2010-12-23 18:24:39 +00:00
|
|
|
/* NULL terminate the tmpbuf so ep_strbuf_append knows where
|
|
|
|
* to stop */
|
2010-12-23 17:59:34 +00:00
|
|
|
tmpbuf[tmpbuf_len] = '\0';
|
|
|
|
|
|
|
|
ep_strbuf_append(strbuf, tmpbuf);
|
|
|
|
}
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (lengthp)
|
2010-12-23 18:26:25 +00:00
|
|
|
*lengthp = i; /* Number of *bytes* processed */
|
2010-12-23 17:59:34 +00:00
|
|
|
|
|
|
|
return strbuf->str;
|
|
|
|
}
|
|
|
|
|
2009-03-27 19:40:23 +00:00
|
|
|
/*
|
|
|
|
* 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,
|
2009-09-20 07:35:39 +00:00
|
|
|
* and return a pointer to the string. Also return the length of the
|
2009-03-27 19:40:23 +00:00
|
|
|
* string (including the terminating null) through a pointer.
|
|
|
|
*
|
|
|
|
* This function allocates memory from a buffer with capture session lifetime.
|
|
|
|
* You do not have to free this buffer, it will be automatically freed
|
|
|
|
* when wireshark starts or opens a new capture.
|
|
|
|
*/
|
|
|
|
guint8 *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_seasonal_stringz(tvbuff_t *tvb, const gint offset, gint *lengthp)
|
2009-03-27 19:40:23 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
guint size;
|
2009-03-27 19:40:23 +00:00
|
|
|
guint8 *strptr;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
size = tvb_strsize(tvb, offset);
|
2009-03-27 19:40:23 +00:00
|
|
|
strptr = se_alloc(size);
|
|
|
|
tvb_memcpy(tvb, strptr, offset, size);
|
2009-11-23 22:02:12 +00:00
|
|
|
if (lengthp)
|
|
|
|
*lengthp = size;
|
2009-03-27 19:40:23 +00:00
|
|
|
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.
|
2005-08-17 23:10:28 +00:00
|
|
|
* In this way, it acts like g_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
|
2011-12-22 18:13:18 +00:00
|
|
|
_tvb_get_nstringz(tvbuff_t *tvb, const gint offset, const guint bufsize, guint8* buffer, gint *bytes_copied)
|
2000-08-30 02:50:18 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gint stringlen;
|
|
|
|
guint abs_offset, junk_length;
|
|
|
|
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
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
check_offset_length(tvb->length, tvb->reported_length, offset, 0, &abs_offset, &junk_length);
|
2000-08-30 02:50:18 +00:00
|
|
|
|
2003-08-08 08:19:50 +00:00
|
|
|
/* There must at least be room for the terminating NUL. */
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_ASSERT(bufsize != 0);
|
2003-08-08 08:19:50 +00:00
|
|
|
|
|
|
|
/* 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.
|
|
|
|
*/
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_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.
|
|
|
|
*/
|
2005-09-23 18:27:30 +00:00
|
|
|
DISSECTOR_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.
|
2005-08-17 23:10:28 +00:00
|
|
|
* In this way, it acts like g_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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_nstringz(tvbuff_t *tvb, const gint offset, const 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;
|
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_get_nstringz0(tvbuff_t *tvb, const gint offset, const 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
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(tvb && tvb->initialized);
|
|
|
|
|
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
|
2009-09-20 07:35:39 +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
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb_find_line_end(tvbuff_t *tvb, const gint offset, int len, gint *next_offset, const gboolean desegment)
|
2000-11-09 10:56:33 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gint eob_offset;
|
|
|
|
gint eol_offset;
|
|
|
|
int linelen;
|
2010-03-08 20:45:13 +00:00
|
|
|
guchar found_needle = 0;
|
2000-11-09 10:56:33 +00:00
|
|
|
|
|
|
|
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.
|
|
|
|
*/
|
2012-04-18 12:35:36 +00:00
|
|
|
eol_offset = tvb_pbrk_guint8(tvb, offset, len, "\r\n", &found_needle);
|
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;
|
2009-11-23 22:02:12 +00:00
|
|
|
if (next_offset)
|
|
|
|
*next_offset = eob_offset;
|
2002-07-17 06:55:29 +00:00
|
|
|
}
|
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?
|
2010-10-30 18:18:12 +00:00
|
|
|
*/
|
2010-03-08 20:45:13 +00:00
|
|
|
if (found_needle == '\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
|
|
|
*/
|
2009-11-23 22:02:12 +00:00
|
|
|
if (next_offset)
|
|
|
|
*next_offset = eol_offset + 1;
|
2000-11-10 06:50:37 +00:00
|
|
|
}
|
|
|
|
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
|
2011-12-22 18:13:18 +00:00
|
|
|
tvb_find_line_end_unquoted(tvbuff_t *tvb, const gint offset, int len, gint *next_offset)
|
2000-11-10 06:50:37 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gint cur_offset, char_offset;
|
2000-11-10 06:50:37 +00:00
|
|
|
gboolean is_quoted;
|
2011-12-22 18:13:18 +00:00
|
|
|
guchar c = 0;
|
|
|
|
gint eob_offset;
|
|
|
|
int linelen;
|
2000-11-10 06:50:37 +00:00
|
|
|
|
|
|
|
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;
|
2011-12-22 18:13:18 +00:00
|
|
|
is_quoted = FALSE;
|
2000-11-10 06:50:37 +00:00
|
|
|
for (;;) {
|
2009-09-20 07:35:39 +00:00
|
|
|
/*
|
2000-11-10 06:50:37 +00:00
|
|
|
* 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,
|
2009-09-20 07:35:39 +00:00
|
|
|
'"');
|
2000-11-10 06:50:37 +00:00
|
|
|
} 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
|
|
|
*/
|
2012-04-18 12:35:36 +00:00
|
|
|
char_offset = tvb_pbrk_guint8(tvb, cur_offset, len, "\r\n\"", &c);
|
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;
|
2009-11-23 22:02:12 +00:00
|
|
|
if (next_offset)
|
|
|
|
*next_offset = eob_offset;
|
2000-11-10 06:50:37 +00:00
|
|
|
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?
|
|
|
|
*/
|
|
|
|
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 &&
|
2009-09-20 07:35:39 +00:00
|
|
|
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
|
|
|
*/
|
2009-11-23 22:02:12 +00:00
|
|
|
if (next_offset)
|
|
|
|
*next_offset = char_offset + 1;
|
2000-11-10 06:50:37 +00:00
|
|
|
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;
|
2009-11-23 22:02:12 +00:00
|
|
|
if (next_offset)
|
|
|
|
*next_offset = eob_offset;
|
2000-11-10 06:50:37 +00:00
|
|
|
break;
|
|
|
|
}
|
2000-11-09 10:56:33 +00:00
|
|
|
}
|
|
|
|
return linelen;
|
|
|
|
}
|
2000-11-13 07:19:37 +00:00
|
|
|
|
2007-12-09 17:41:16 +00:00
|
|
|
/*
|
|
|
|
* Copied from the mgcp dissector. (This function should be moved to /epan )
|
|
|
|
* tvb_skip_wsp - Returns the position in tvb of the first non-whitespace
|
2009-09-20 07:35:39 +00:00
|
|
|
* character following offset or offset + maxlength -1 whichever
|
|
|
|
* is smaller.
|
2007-12-09 17:41:16 +00:00
|
|
|
*
|
|
|
|
* Parameters:
|
|
|
|
* tvb - The tvbuff in which we are skipping whitespace.
|
|
|
|
* offset - The offset in tvb from which we begin trying to skip whitespace.
|
|
|
|
* maxlength - The maximum distance from offset that we may try to skip
|
|
|
|
* whitespace.
|
|
|
|
*
|
|
|
|
* Returns: The position in tvb of the first non-whitespace
|
2009-09-20 07:35:39 +00:00
|
|
|
* character following offset or offset + maxlength -1 whichever
|
|
|
|
* is smaller.
|
2007-12-09 17:41:16 +00:00
|
|
|
*/
|
2011-12-22 18:13:18 +00:00
|
|
|
gint
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_skip_wsp(tvbuff_t *tvb, const gint offset, const gint maxlength)
|
2007-12-09 17:41:16 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gint counter = offset;
|
|
|
|
gint end, tvb_len;
|
2007-12-09 17:41:16 +00:00
|
|
|
guint8 tempchar;
|
|
|
|
|
|
|
|
/* Get the length remaining */
|
|
|
|
tvb_len = tvb_length(tvb);
|
2011-12-22 18:13:18 +00:00
|
|
|
end = offset + maxlength;
|
2007-12-09 17:41:16 +00:00
|
|
|
if (end >= tvb_len)
|
|
|
|
{
|
|
|
|
end = tvb_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip past spaces, tabs, CRs and LFs until run out or meet something else */
|
|
|
|
for (counter = offset;
|
2009-09-20 07:35:39 +00:00
|
|
|
counter < end &&
|
|
|
|
((tempchar = tvb_get_guint8(tvb,counter)) == ' ' ||
|
|
|
|
tempchar == '\t' || tempchar == '\r' || tempchar == '\n');
|
|
|
|
counter++);
|
2007-12-09 17:41:16 +00:00
|
|
|
|
|
|
|
return (counter);
|
|
|
|
}
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
gint
|
2012-12-16 16:49:52 +00:00
|
|
|
tvb_skip_wsp_return(tvbuff_t *tvb, const gint offset) {
|
2011-12-22 18:13:18 +00:00
|
|
|
gint counter = offset;
|
|
|
|
gint end;
|
2007-12-09 17:41:16 +00:00
|
|
|
guint8 tempchar;
|
2011-12-22 18:13:18 +00:00
|
|
|
end = 0;
|
2007-12-09 17:41:16 +00:00
|
|
|
|
|
|
|
for(counter = offset; counter > end &&
|
|
|
|
((tempchar = tvb_get_guint8(tvb,counter)) == ' ' ||
|
|
|
|
tempchar == '\t' || tempchar == '\n' || tempchar == '\r'); counter--);
|
|
|
|
counter++;
|
|
|
|
return (counter);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-12-30 23:47:52 +00:00
|
|
|
/*
|
|
|
|
* Format a bunch of data from a tvbuff as bytes, returning a pointer
|
|
|
|
* to the string with the formatted data, with "punct" as a byte
|
|
|
|
* separator.
|
|
|
|
*/
|
|
|
|
gchar *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_bytes_to_str_punct(tvbuff_t *tvb, const gint offset, const gint len, const gchar punct)
|
2004-12-30 23:47:52 +00:00
|
|
|
{
|
2011-01-12 20:25:36 +00:00
|
|
|
return bytes_to_str_punct(ensure_contiguous(tvb, offset, len), len, punct);
|
2004-12-30 23:47:52 +00:00
|
|
|
}
|
|
|
|
|
2010-12-28 12:36:26 +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
|
2011-01-12 02:25:08 +00:00
|
|
|
* tvbuff"), fetch BCD encoded digits from a tvbuff starting from either
|
|
|
|
* the low or high half byte, formating the digits according to an input digit set,
|
2010-12-28 12:36:26 +00:00
|
|
|
* if NUll a default digit set of 0-9 returning "?" for overdecadic digits will be used.
|
|
|
|
* A pointer to the EP allocated string will be returned.
|
|
|
|
* Note a tvbuff content of 0xf is considered a 'filler' and will end the conversion.
|
|
|
|
*/
|
|
|
|
static dgt_set_t Dgt1_9_bcd = {
|
2011-12-22 18:13:18 +00:00
|
|
|
{
|
|
|
|
/* 0 1 2 3 4 5 6 7 8 9 a b c d e */
|
|
|
|
'0','1','2','3','4','5','6','7','8','9','?','?','?','?','?'
|
|
|
|
}
|
2010-12-28 12:36:26 +00:00
|
|
|
};
|
2011-06-16 18:34:17 +00:00
|
|
|
const gchar *
|
2010-12-28 12:36:26 +00:00
|
|
|
tvb_bcd_dig_to_ep_str(tvbuff_t *tvb, const gint offset, const gint len, dgt_set_t *dgt, gboolean skip_first)
|
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
int length;
|
|
|
|
guint8 octet;
|
|
|
|
int i = 0;
|
|
|
|
char *digit_str;
|
|
|
|
gint t_offset = offset;
|
2010-12-28 12:36:26 +00:00
|
|
|
|
|
|
|
if (!dgt)
|
|
|
|
dgt = &Dgt1_9_bcd;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (len == -1) {
|
2010-12-28 12:36:26 +00:00
|
|
|
length = tvb_length(tvb);
|
2011-12-22 18:13:18 +00:00
|
|
|
if (length < offset) {
|
2010-12-28 12:36:26 +00:00
|
|
|
return "";
|
|
|
|
}
|
2011-12-22 18:13:18 +00:00
|
|
|
} else {
|
2010-12-28 12:36:26 +00:00
|
|
|
length = offset + len;
|
|
|
|
}
|
|
|
|
digit_str = ep_alloc((length - offset)*2+1);
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
while (t_offset < length) {
|
2010-12-28 12:36:26 +00:00
|
|
|
|
|
|
|
octet = tvb_get_guint8(tvb,t_offset);
|
2011-12-22 18:13:18 +00:00
|
|
|
if (!skip_first) {
|
2011-01-12 02:25:08 +00:00
|
|
|
digit_str[i] = dgt->out[octet & 0x0f];
|
2010-12-28 12:36:26 +00:00
|
|
|
i++;
|
|
|
|
}
|
|
|
|
skip_first = FALSE;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* unpack second value in byte
|
|
|
|
*/
|
|
|
|
octet = octet >> 4;
|
|
|
|
|
|
|
|
if (octet == 0x0f) /* odd number bytes - hit filler */
|
|
|
|
break;
|
|
|
|
|
2011-01-12 02:25:08 +00:00
|
|
|
digit_str[i] = dgt->out[octet & 0x0f];
|
2010-12-28 12:36:26 +00:00
|
|
|
i++;
|
|
|
|
t_offset++;
|
|
|
|
|
|
|
|
}
|
|
|
|
digit_str[i]= '\0';
|
|
|
|
return digit_str;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
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 *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_bytes_to_str(tvbuff_t *tvb, const gint offset, const gint len)
|
2000-11-13 07:19:37 +00:00
|
|
|
{
|
2011-01-12 20:25:36 +00:00
|
|
|
return bytes_to_str(ensure_contiguous(tvb, offset, len), len);
|
2000-11-13 07:19:37 +00:00
|
|
|
}
|
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
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_find_tvb(tvbuff_t *haystack_tvb, tvbuff_t *needle_tvb, const gint haystack_offset)
|
2003-08-27 15:23:11 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
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-08-27 15:23:11 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
DISSECTOR_ASSERT(haystack_tvb && haystack_tvb->initialized);
|
|
|
|
|
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. */
|
2011-01-12 20:25:36 +00:00
|
|
|
haystack_data = ensure_contiguous(haystack_tvb, 0, -1);
|
2011-12-22 18:13:18 +00:00
|
|
|
needle_data = ensure_contiguous(needle_tvb, 0, -1);
|
2003-08-27 15:23:11 +00:00
|
|
|
|
2009-08-16 08:18:17 +00:00
|
|
|
check_offset_length(haystack_tvb->length, haystack_tvb->reported_length, haystack_offset, -1,
|
2003-08-27 15:23:11 +00:00
|
|
|
&haystack_abs_offset, &haystack_abs_length);
|
|
|
|
|
|
|
|
location = epan_memmem(haystack_data + haystack_abs_offset, haystack_abs_length,
|
|
|
|
needle_data, needle_len);
|
|
|
|
|
|
|
|
if (location) {
|
2009-04-03 15:30:38 +00:00
|
|
|
return (gint) (location - haystack_data);
|
2003-08-27 15:23:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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 *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_uncompress(tvbuff_t *tvb, const int offset, int comprlen)
|
2004-05-05 06:55:09 +00:00
|
|
|
{
|
2011-12-22 18:13:18 +00:00
|
|
|
gint err = Z_OK;
|
|
|
|
guint bytes_out = 0;
|
|
|
|
guint8 *compr = NULL;
|
|
|
|
guint8 *uncompr = NULL;
|
|
|
|
tvbuff_t *uncompr_tvb = NULL;
|
|
|
|
z_streamp strm = NULL;
|
|
|
|
Bytef *strmbuf = NULL;
|
|
|
|
guint inits_done = 0;
|
|
|
|
gint wbits = MAX_WBITS;
|
|
|
|
guint8 *next = NULL;
|
|
|
|
guint bufsiz = TVB_Z_MIN_BUFSIZ;
|
2004-05-10 22:14:07 +00:00
|
|
|
#ifdef TVB_Z_DEBUG
|
2011-12-22 18:13:18 +00:00
|
|
|
guint inflate_passes = 0;
|
|
|
|
guint bytes_in = tvb_length_remaining(tvb, offset);
|
2004-05-10 22:14:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (tvb == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
compr = tvb_memdup(tvb, offset, comprlen);
|
|
|
|
|
2009-10-04 06:20:32 +00:00
|
|
|
if (!compr)
|
2004-05-05 06:55:09 +00:00
|
|
|
return NULL;
|
|
|
|
|
2006-07-05 18:47:21 +00:00
|
|
|
/*
|
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;
|
2009-10-04 06:28:50 +00:00
|
|
|
bufsiz = CLAMP(bufsiz, TVB_Z_MIN_BUFSIZ, TVB_Z_MAX_BUFSIZ);
|
2004-05-10 22:14:07 +00:00
|
|
|
|
|
|
|
#ifdef TVB_Z_DEBUG
|
|
|
|
printf("bufsiz: %u bytes\n", bufsiz);
|
|
|
|
#endif
|
|
|
|
|
2004-05-05 06:55:09 +00:00
|
|
|
next = compr;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
strm = g_new0(z_stream, 1);
|
|
|
|
strm->next_in = next;
|
|
|
|
strm->avail_in = comprlen;
|
2004-05-05 06:55:09 +00:00
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
strmbuf = g_malloc0(bufsiz);
|
|
|
|
strm->next_out = strmbuf;
|
2004-05-10 22:14:07 +00:00
|
|
|
strm->avail_out = bufsiz;
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
err = inflateInit2(strm, wbits);
|
|
|
|
inits_done = 1;
|
|
|
|
if (err != Z_OK) {
|
2006-01-07 03:36:37 +00:00
|
|
|
inflateEnd(strm);
|
2004-05-05 06:55:09 +00:00
|
|
|
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);
|
2011-12-22 18:13:18 +00:00
|
|
|
strm->next_out = strmbuf;
|
2004-05-10 22:14:07 +00:00
|
|
|
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) {
|
2012-04-04 21:54:22 +00:00
|
|
|
/*
|
2012-03-31 12:33:10 +00:00
|
|
|
* This is ugly workaround for bug #6480
|
|
|
|
* (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6480)
|
|
|
|
*
|
|
|
|
* g_memdup(..., 0) returns NULL (g_malloc(0) also)
|
2012-04-04 21:54:22 +00:00
|
|
|
* when uncompr is NULL logic below doesn't create tvb
|
2012-03-31 12:33:10 +00:00
|
|
|
* which is later interpreted as decompression failed.
|
|
|
|
*/
|
2012-03-31 12:35:07 +00:00
|
|
|
uncompr = (bytes_pass || err != Z_STREAM_END) ?
|
2012-03-31 12:33:10 +00:00
|
|
|
g_memdup(strmbuf, bytes_pass) :
|
|
|
|
g_strdup("");
|
2004-05-05 06:55:09 +00:00
|
|
|
} else {
|
2009-10-04 06:12:31 +00:00
|
|
|
guint8 *new_data = g_malloc0(bytes_out + bytes_pass);
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2012-03-31 12:35:07 +00:00
|
|
|
memcpy(new_data, uncompr, bytes_out);
|
|
|
|
memcpy(new_data + bytes_out, strmbuf, bytes_pass);
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
g_free(uncompr);
|
|
|
|
uncompr = new_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
bytes_out += bytes_pass;
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
if (err == Z_STREAM_END) {
|
2004-05-05 06:55:09 +00:00
|
|
|
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.
|
|
|
|
*/
|
2006-01-07 03:36:37 +00:00
|
|
|
inflateEnd(strm);
|
2004-05-05 06:55:09 +00:00
|
|
|
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;
|
|
|
|
}
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2004-05-05 06:55:09 +00:00
|
|
|
} else if (err == Z_DATA_ERROR && inits_done == 1
|
2009-09-20 07:35:39 +00:00
|
|
|
&& uncompr == NULL && (*compr == 0x1f) &&
|
|
|
|
(*(compr + 1) == 0x8b)) {
|
2004-05-05 06:55:09 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
2011-12-22 18:13:18 +00:00
|
|
|
Bytef *c = compr + 2;
|
|
|
|
Bytef flags = 0;
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
if (*c == Z_DEFLATED) {
|
|
|
|
c++;
|
|
|
|
} else {
|
2006-01-07 03:36:37 +00:00
|
|
|
inflateEnd(strm);
|
2004-05-05 06:55:09 +00:00
|
|
|
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 |
|
2009-09-20 07:35:39 +00:00
|
|
|
(*(c + 1) << 8));
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
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 */
|
|
|
|
|
2008-07-08 20:04:11 +00:00
|
|
|
while ((c - compr) < comprlen && *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 */
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2008-07-08 20:04:11 +00:00
|
|
|
while ((c - compr) < comprlen && *c != '\0') {
|
2004-05-05 06:55:09 +00:00
|
|
|
c++;
|
|
|
|
}
|
|
|
|
|
|
|
|
c++;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
inflateReset(strm);
|
|
|
|
next = c;
|
|
|
|
strm->next_in = next;
|
2005-07-21 21:40:57 +00:00
|
|
|
if (c - compr > comprlen) {
|
2006-01-07 03:36:37 +00:00
|
|
|
inflateEnd(strm);
|
2005-07-21 21:40:57 +00:00
|
|
|
g_free(strm);
|
|
|
|
g_free(compr);
|
|
|
|
g_free(strmbuf);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-04-03 15:30:38 +00:00
|
|
|
comprlen -= (int) (c - compr);
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2006-01-07 03:36:37 +00:00
|
|
|
inflateEnd(strm);
|
2012-01-13 16:36:07 +00:00
|
|
|
inflateInit2(strm, wbits);
|
2004-05-05 06:55:09 +00:00
|
|
|
inits_done++;
|
|
|
|
} else if (err == Z_DATA_ERROR && uncompr == NULL &&
|
2009-09-20 07:35:39 +00:00
|
|
|
inits_done <= 3) {
|
2006-07-05 18:47:21 +00:00
|
|
|
|
|
|
|
/*
|
2004-05-05 06:55:09 +00:00
|
|
|
* 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);
|
|
|
|
|
2011-12-22 18:13:18 +00:00
|
|
|
strm->next_in = next;
|
|
|
|
strm->avail_in = comprlen;
|
2004-05-05 06:55:09 +00:00
|
|
|
|
2008-03-04 22:56:26 +00:00
|
|
|
inflateEnd(strm);
|
2004-05-10 22:14:07 +00:00
|
|
|
memset(strmbuf, '\0', bufsiz);
|
2011-12-22 18:13:18 +00:00
|
|
|
strm->next_out = strmbuf;
|
2004-05-10 22:14:07 +00:00
|
|
|
strm->avail_out = bufsiz;
|
2004-05-05 06:55:09 +00:00
|
|
|
|
|
|
|
err = inflateInit2(strm, wbits);
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2004-05-05 06:55:09 +00:00
|
|
|
inits_done++;
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2004-05-05 06:55:09 +00:00
|
|
|
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 {
|
2006-01-07 03:36:37 +00:00
|
|
|
inflateEnd(strm);
|
2004-05-05 06:55:09 +00:00
|
|
|
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) {
|
2011-05-12 16:31:42 +00:00
|
|
|
g_free(compr);
|
2004-05-05 06:55:09 +00:00
|
|
|
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
|
2006-07-05 18:47:21 +00:00
|
|
|
|
2004-05-05 06:55:09 +00:00
|
|
|
if (uncompr != NULL) {
|
2011-12-22 18:13:18 +00:00
|
|
|
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 *
|
2010-04-03 18:18:50 +00:00
|
|
|
tvb_uncompress(tvbuff_t *tvb _U_, const int offset _U_, int comprlen _U_)
|
2004-05-05 06:55:09 +00:00
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-05-27 03:06:50 +00:00
|
|
|
tvbuff_t *
|
|
|
|
tvb_child_uncompress(tvbuff_t *parent, tvbuff_t *tvb, const int offset, int comprlen)
|
2009-04-01 16:22:51 +00:00
|
|
|
{
|
|
|
|
tvbuff_t *new_tvb = tvb_uncompress(tvb, offset, comprlen);
|
|
|
|
if (new_tvb)
|
|
|
|
tvb_set_child_real_data_tvbuff (parent, new_tvb);
|
|
|
|
return new_tvb;
|
|
|
|
}
|
|
|
|
|
2011-05-27 03:06:50 +00:00
|
|
|
gint
|
|
|
|
tvb_raw_offset(tvbuff_t *tvb)
|
|
|
|
{
|
|
|
|
return ((tvb->raw_offset==-1)?(tvb->raw_offset = tvb_offset_from_real_beginning(tvb)):tvb->raw_offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct tvbuff *
|
|
|
|
tvb_get_ds_tvb(tvbuff_t *tvb)
|
|
|
|
{
|
|
|
|
return(tvb->ds_tvb);
|
|
|
|
}
|