osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use "u_int" and "u_char", as they're not defined in <sys/types.h> 

on Windows, so we'd have to drag in <winsock.h> to define them.

svn path=/trunk/; revision=3246
This commit is contained in:
Guy Harris 2001-04-02 10:41:19 +00:00
parent 9b99fdd7ab
commit 393b1b3e8d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/osi-utils.c
View File

@ -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.1 2001/04/01 05:48:15 hagbard Exp $
* $Id: osi-utils.c,v 1.2 2001/04/02 10:41:19 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@ -44,7 +44,7 @@
#include "osi-utils.h"
gchar *print_nsap_net( const u_char *buffer, int length)
gchar *print_nsap_net( const guint8 *buffer, int length)
{
/* to do : NSAP / NET decoding */
@ -74,9 +74,9 @@ gchar *print_nsap_net( const u_char *buffer, int length)
} /* print_nsap */
gchar *print_system_id( const u_char *buffer, int length ) {
gchar *print_system_id( const guint8 *buffer, int length ) {
int tmp;
u_char *cur;
gchar *cur;
static gchar str[MAX_SYSTEMID_LEN * 3 + 5]; /* Don't trust exact matching */
if ( ( length <= 0 ) || ( length > MAX_SYSTEMID_LEN ) ) {
@ -110,7 +110,7 @@ gchar *print_system_id( const u_char *buffer, int length ) {
return( str );
}
gchar *print_area(const u_char *buffer, int length)
gchar *print_area(const guint8 *buffer, int length)
{
/* 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
@ -118,7 +118,7 @@ gchar *print_area(const u_char *buffer, int length)
static gchar str[MAX_AREA_LEN * 3 + 20]; /* reserve space for nice layout */
gchar *cur;
u_int tmp = 0;
int tmp = 0;
cur = str;

8
epan/osi-utils.h
View File

@ -1,6 +1,6 @@
/* osi-utils.h
*
* $Id: osi-utils.h,v 1.2 2001/04/01 07:06:23 hagbard Exp $
* $Id: osi-utils.h,v 1.3 2001/04/02 10:41:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -48,9 +48,9 @@
#define NSAP_IDI_ISODCC 0x39
#define NSAP_IDI_GOSIP2 0x47
gchar* print_nsap_net ( const u_char *, int );
gchar* print_area ( const u_char *, int );
gchar* print_system_id( const u_char *, int );
gchar* print_nsap_net ( const guint8 *, int );
gchar* print_area ( const guint8 *, int );
gchar* print_system_id( const guint8 *, int );
#endif /* __OSI_UTILS_H__ */