* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: osi-utils.c,v 1.14 2003/11/20 19:05:40 guy Exp $
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <stdio.h>
#include <string.h>
#include <glib.h>
+#include "tvbuff.h"
#include "osi-utils.h"
+#include "address.h"
+#include "address_types.h"
+static void print_nsap_net_buf( const guint8 *, int, gchar *, int);
+static void print_area_buf ( const guint8 *, int, gchar *, int);
+static void print_address_prefix_buf ( const guint8 *, int, gchar *, int);
+
+/*
+ * XXX - shouldn't there be a centralized routine for dissecting NSAPs?
+ * See also "dissect_atm_nsap()" in epan/dissectors/packet-arp.c and
+ * "dissect_nsap()" in epan/dissectors/packet-isup.c.
+ */
gchar *
-print_nsap_net( const guint8 *ad, int length )
+print_nsap_net( tvbuff_t *tvb, const gint offset, int length )
{
- static gchar str[MAX_NSAP_LEN * 3 + 50]; /* reserve space for nice layout */
gchar *cur;
- cur = str;
- print_nsap_net_buf( ad, length, cur );
+ cur = (gchar *)wmem_alloc(wmem_packet_scope(), MAX_NSAP_LEN * 3 + 50);
+ print_nsap_net_buf( tvb_get_ptr(tvb, offset, length), length, cur, MAX_NSAP_LEN * 3 + 50);
return( cur );
}
-void
-print_nsap_net_buf( const guint8 *ad, int length, gchar *buf )
+static void
+print_nsap_net_buf( const guint8 *ad, int length, gchar *buf, int buf_len)
{
gchar *cur;
/* to do : NSAP / NET decoding */
if ( (length <= 0 ) || ( length > MAX_NSAP_LEN ) ) {
- sprintf( buf, "<Invalid length of NSAP>");
+ g_strlcpy(buf, "<Invalid length of NSAP>", buf_len);
return;
}
cur = buf;
if ( ( length == RFC1237_NSAP_LEN ) || ( length == RFC1237_NSAP_LEN + 1 ) ) {
- print_area_buf( ad, RFC1237_FULLAREA_LEN, cur );
+ print_area_buf(ad, RFC1237_FULLAREA_LEN, cur, buf_len);
cur += strlen( cur );
- print_system_id_buf( ad + RFC1237_FULLAREA_LEN, RFC1237_SYSTEMID_LEN, cur );
+ print_system_id_buf( ad + RFC1237_FULLAREA_LEN, RFC1237_SYSTEMID_LEN, cur, (int) (buf_len-(cur-buf)));
cur += strlen( cur );
- cur += sprintf( cur, "[%02x]",
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "[%02x]",
ad[ RFC1237_FULLAREA_LEN + RFC1237_SYSTEMID_LEN ] );
if ( length == RFC1237_NSAP_LEN + 1 ) {
- cur += sprintf( cur, "-%02x", ad[ length -1 ] );
+ g_snprintf(cur, (int) (buf_len-(cur-buf)), "-%02x", ad[ length -1 ] );
}
}
else { /* probably format as standard */
- print_area_buf( ad, length, buf );
+ print_area_buf( ad, length, buf, buf_len);
}
} /* print_nsap */
gchar *
-print_system_id( const guint8 *ad, int length )
+print_system_id(wmem_allocator_t* scope, const guint8 *ad, int length )
{
- static gchar str[MAX_SYSTEMID_LEN * 3 + 5]; /* Don't trust exact matching */
gchar *cur;
- cur = str;
- print_system_id_buf(ad, length, cur );
+ cur = (gchar *)wmem_alloc(scope, MAX_SYSTEMID_LEN * 3 + 5);
+ print_system_id_buf(ad, length, cur, MAX_SYSTEMID_LEN * 3 + 5);
return( cur );
}
+gchar *
+tvb_print_system_id( tvbuff_t *tvb, const gint offset, int length )
+{
+ return( print_system_id(wmem_packet_scope(), tvb_get_ptr(tvb, offset, length), length) );
+}
+
void
-print_system_id_buf( const guint8 *ad, int length, gchar *buf )
+print_system_id_buf( const guint8 *ad, int length, gchar *buf, int buf_len)
{
gchar *cur;
int tmp;
if ( ( length <= 0 ) || ( length > MAX_SYSTEMID_LEN ) ) {
- sprintf( buf, "<Invalid length of SYSTEM ID>");
+ g_strlcpy(buf, "<Invalid length of SYSTEM ID>", buf_len);
return;
}
if ( ( 6 == length ) || /* System-ID */
( 7 == length ) || /* LAN-ID */
( 8 == length )) { /* LSP-ID */
- cur += sprintf(cur, "%02x%02x.%02x%02x.%02x%02x", ad[0], ad[1],
+ cur += g_snprintf(cur, buf_len, "%02x%02x.%02x%02x.%02x%02x", ad[0], ad[1],
ad[2], ad[3], ad[4], ad[5] );
if ( ( 7 == length ) ||
( 8 == length )) {
- cur += sprintf( cur, ".%02x", ad[6] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), ".%02x", ad[6] );
}
if ( 8 == length ) {
- cur += sprintf( cur, "-%02x", ad[7] );
+ g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "-%02x", ad[7] );
}
}
else {
tmp = 0;
while ( tmp < length / 4 ) { /* 16 / 4 == 4 > four Octets left to print */
- cur += sprintf( cur, "%02x", ad[tmp++] );
- cur += sprintf( cur, "%02x", ad[tmp++] );
- cur += sprintf( cur, "%02x", ad[tmp++] );
- cur += sprintf( cur, "%02x.", ad[tmp++] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x.", ad[tmp++] );
}
if ( 1 == tmp ) { /* Special case for Designated IS */
- sprintf( --cur, ".%02x", ad[tmp] );
+ cur--;
+ g_snprintf(cur, (gulong) (buf_len-(cur-buf)), ".%02x", ad[tmp] );
}
else {
for ( ; tmp < length; ) { /* print the rest without dot */
- cur += sprintf( cur, "%02x", ad[tmp++] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] );
}
}
}
}
gchar *
-print_area(const guint8 *ad, int length)
+print_area(tvbuff_t *tvb, const gint offset, int length)
{
- static gchar str[MAX_AREA_LEN * 3 + 20]; /* reserve space for nice layout */
gchar *cur;
- cur = str;
- print_area_buf( ad, length, cur );
+ cur = (gchar *)wmem_alloc(wmem_packet_scope(), MAX_AREA_LEN * 3 + 20);
+ print_area_buf(tvb_get_ptr(tvb, offset, length), length, cur, MAX_AREA_LEN * 3 + 20);
return cur;
}
-void
-print_area_buf(const guint8 *ad, int length, gchar *buf)
+/*
+ * Note: length is in units of half-octets.
+ */
+gchar *
+print_address_prefix(tvbuff_t *tvb, const gint offset, int length)
+{
+ gchar *cur;
+
+ cur = (gchar *)wmem_alloc(wmem_packet_scope(), MAX_AREA_LEN * 3 + 20);
+ print_address_prefix_buf(tvb_get_ptr(tvb, offset, (length+1)/2), length, cur, MAX_AREA_LEN * 3 + 20);
+ return cur;
+}
+
+/*
+ * Note: length is in units of octets.
+ */
+static void
+print_area_buf(const guint8 *ad, int length, gchar *buf, int buf_len)
+{
+ print_address_prefix_buf(ad, length*2, buf, buf_len);
+}
+
+/*
+ * Note: length is in units of half-octets.
+ */
+static void
+print_address_prefix_buf(const guint8 *ad, int length, gchar *buf, int buf_len)
{
gchar *cur;
int tmp = 0;
/* to do : all real area decoding now: NET is assumed if id len is 1 more byte
- * and take away all these stupid resource consuming local statics
*/
- if (length <= 0 || length > MAX_AREA_LEN) {
- sprintf( buf, "<Invalid length of AREA>");
+ if (length <= 0 || length > MAX_AREA_LEN*2) {
+ g_strlcpy(buf, "<Invalid length of AREA>", buf_len);
return;
}
cur = buf;
- if ( ( ( NSAP_IDI_ISODCC == *ad )
- || ( NSAP_IDI_GOSIP2 == *ad )
+ if ( ( ( NSAP_IDI_ISO_DCC_BIN == *ad )
+ || ( NSAP_IDI_ISO_6523_ICD_BIN == *ad )
)
&&
- ( ( RFC1237_FULLAREA_LEN == length )
- || ( RFC1237_FULLAREA_LEN + 1 == length )
+ ( ( RFC1237_FULLAREA_LEN*2 == length )
+ || ( (RFC1237_FULLAREA_LEN + 1)*2 == length )
)
) { /* AFI is good and length is long enough */
- if ( length > RFC1237_FULLAREA_LEN + 1 ) { /* Special Case Designated IS */
- sprintf( buf, "<Invalid length of AREA for DCC / GOSIP AFI>");
- return;
- }
+ /* there used to be a check for (length > RFC1237_FULLAREA_LEN + 1) here,
+ * in order to report an invalied length of AREA for DCC / ISO 6523 AFI,
+ * but that can *never* be the case because the if() test above explicitly
+ * tests for (length == RFC1237_FULLAREA_LEN) or (length == RFC1237_FULLAREA_LEN + 1)
+ */
- cur += sprintf( cur, "[%02x|%02x:%02x][%02x|%02x:%02x:%02x|%02x:%02x]",
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "[%02x|%02x:%02x][%02x|%02x:%02x:%02x|%02x:%02x]",
ad[0], ad[1], ad[2], ad[3], ad[4],
ad[5], ad[6], ad[7], ad[8] );
- cur += sprintf( cur, "[%02x:%02x|%02x:%02x]",
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "[%02x:%02x|%02x:%02x]",
ad[9], ad[10], ad[11], ad[12] );
- if ( RFC1237_FULLAREA_LEN + 1 == length )
- sprintf( cur, "-[%02x]", ad[20] );
+ if ( (RFC1237_FULLAREA_LEN + 1)*2 == length )
+ g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "-[%02x]", ad[20] );
}
else { /* print standard format */
- if ( length == RFC1237_AREA_LEN ) {
- sprintf( buf, "%02x.%02x%02x", ad[0], ad[1], ad[2] );
+ if ( length == RFC1237_AREA_LEN*2 ) {
+ g_snprintf(buf, buf_len, "%02x.%02x%02x", ad[0], ad[1], ad[2] );
return;
}
- if ( 4 < length ) {
- while ( tmp < length / 4 ) { /* 16/4==4 > four Octets left to print */
- cur += sprintf( cur, "%02x", ad[tmp++] );
- cur += sprintf( cur, "%02x", ad[tmp++] );
- cur += sprintf( cur, "%02x", ad[tmp++] );
- cur += sprintf( cur, "%02x.", ad[tmp++] );
- }
- if ( 1 == tmp ) { /* Special case for Designated IS */
- sprintf( --cur, "-%02x", ad[tmp] );
+ if ( length == 4*2 ) {
+ g_snprintf(buf, buf_len, "%02x%02x%02x%02x", ad[0], ad[1], ad[2], ad[3] );
+ return;
+ }
+ while ( tmp < length / 8 ) { /* 32/8==4 > four Octets left to print */
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] );
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x.", ad[tmp++] );
+ }
+ if ( 2 == tmp ) { /* Special case for Designated IS */
+ cur--;
+ g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "-%02x", ad[tmp] );
+ }
+ else {
+ for ( ; tmp < length / 2; ) { /* print the rest without dot or dash */
+ cur += g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%02x", ad[tmp++] );
}
- else {
- for ( ; tmp < length; ) { /* print the rest without dot */
- cur += sprintf( cur, "%02x", ad[tmp++] );
- }
+ /* Odd half-octet? */
+ if (length & 1) {
+ /* Yes - print it (it's the upper half-octet) */
+ g_snprintf(cur, (gulong) (buf_len-(cur-buf)), "%x", (ad[tmp] & 0xF0)>>4 );
}
}
}
-} /* print_area_buf */
+} /* print_address_prefix_buf */
+
+/******************************************************************************
+ * OSI Address Type
+ ******************************************************************************/
+static int osi_address_type = -1;
+
+static int osi_address_to_str(const address* addr, gchar *buf, int buf_len)
+{
+ print_nsap_net_buf((const guint8 *)addr->data, addr->len, buf, buf_len);
+ return (int)strlen(buf)+1;
+}
+
+static int osi_address_str_len(const address* addr _U_)
+{
+ return MAX_NSAP_LEN * 3 + 50;
+}
+int get_osi_address_type(void)
+{
+ return osi_address_type;
+}
+
+void register_osi_address_type(void)
+{
+ if (osi_address_type != -1)
+ return;
+
+ osi_address_type = address_type_dissector_register("AT_OSI", "OSI Address", osi_address_to_str, osi_address_str_len, NULL, NULL, NULL, NULL, NULL);
+}
+
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff