aboutsummaryrefslogtreecommitdiffstats
path: root/epan/osi-utils.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-04-16 10:04:33 +0000
committerGuy Harris <guy@alum.mit.edu>2001-04-16 10:04:33 +0000
commit77789be82e07e04c592b3d92bf057b1858e99f6c (patch)
treebb3bfeb289d92e59456cbdce615a387fd01f1f61 /epan/osi-utils.c
parent846213236a59fc082c038e9d5e13efb4bfd81c36 (diff)
Assorted ISIS enhancements from Hannes Gredler.
When dissecting the ISIS NLPID CLV, use the "nlpid_vals" array to convert NLPID values to protocol names. svn path=/trunk/; revision=3308
Diffstat (limited to 'epan/osi-utils.c')
-rw-r--r--epan/osi-utils.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index 887265df7d..5c916ac9ad 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: osi-utils.c,v 1.2 2001/04/02 10:41:19 guy Exp $
+ * $Id: osi-utils.c,v 1.3 2001/04/16 10:04:33 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -86,7 +86,7 @@ gchar *print_system_id( const guint8 *buffer, int length ) {
cur = str;
if ( ( 6 == length ) || ( 7 == length ) ) { /* Special case, print as MAC */
- cur += sprintf(str, "[%02x:%02x:%02x_%02x:%02x:%02x]", buffer[0], buffer[1],
+ cur += sprintf(str, "%02x%02x.%02x%02x.%02x%02x", buffer[0], buffer[1],
buffer[2], buffer[3], buffer[4], buffer[5] );
if ( 7 == length ) {
sprintf( cur, "-%02x", buffer[6] );
@@ -152,6 +152,11 @@ gchar *print_area(const guint8 *buffer, int length)
return str;
}
else { /* print standard format */
+ if ( length == RFC1237_AREA_LEN ) {
+ sprintf( str, "%02x.%02x%02x", buffer[0], buffer[1],
+ buffer[2] );
+ return( str );
+ }
if ( 4 < length ) {
while ( tmp < length / 4 ) { /* 16/4==4 four Octets left to print */
cur += sprintf( str, "%02x%02x%02x%02x.", buffer[tmp++], buffer[tmp++],