From d58748ac6604ee27039385a44b368dd63c7d378f Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Sun, 28 Nov 1999 18:41:45 +0000 Subject: [PATCH] Added `transport' field for the transport method. 1999-11-28 Martin Baulig * include/glibtop/netinfo.h (glibtop_netinfo): Added `transport' field for the transport method. --- ChangeLog | 5 +++++ features.def | 2 +- include/glibtop/netinfo.h | 10 ++++++---- sysdeps/names/netinfo.c | 6 ++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54cd8b72..28a81c63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-11-28 Martin Baulig + + * include/glibtop/netinfo.h (glibtop_netinfo): Added `transport' + field for the transport method. + 1999-11-28 Martin Baulig Split netload into netload and netinfo. diff --git a/features.def b/features.def index 4e7727d5..04c52c25 100644 --- a/features.def +++ b/features.def @@ -19,6 +19,6 @@ glibtop_map_entry *|proc_map|ulong(number,size,total)|pid_t(pid) glibtop_mountentry *|@mountlist|ulong(number,size,total)|int(all_fs) retval|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string(mount_dir) char *|interface_names|ulong(size)|unsigned(interface,number,instance,strategy) -retval|netinfo|ulong(if_flags,mtu,subnet,address)|string(interface) +retval|netinfo|ulong(if_flags,transport,mtu,subnet,address)|string(interface) retval|netload|ulong(packets_in,packets_out,packets_total,bytes_in,bytes_out,bytes_total,errors_in,errors_out,errors_total,collisions)|string(interface) retval|ppp|ulong(state,bytes_in,bytes_out)|ushort(device) diff --git a/include/glibtop/netinfo.h b/include/glibtop/netinfo.h index afc2c5ab..b53d6370 100644 --- a/include/glibtop/netinfo.h +++ b/include/glibtop/netinfo.h @@ -32,11 +32,12 @@ BEGIN_LIBGTOP_DECLS #define GLIBTOP_NETINFO_IF_FLAGS 0 -#define GLIBTOP_NETINFO_MTU 1 -#define GLIBTOP_NETINFO_SUBNET 2 -#define GLIBTOP_NETINFO_ADDRESS 3 +#define GLIBTOP_NETINFO_TRANSPORT 1 +#define GLIBTOP_NETINFO_MTU 2 +#define GLIBTOP_NETINFO_SUBNET 3 +#define GLIBTOP_NETINFO_ADDRESS 4 -#define GLIBTOP_MAX_NETINFO 4 +#define GLIBTOP_MAX_NETINFO 5 typedef struct _glibtop_netinfo glibtop_netinfo; @@ -65,6 +66,7 @@ struct _glibtop_netinfo { u_int64_t flags, if_flags, /* GLIBTOP_NETINFO_IF_FLAGS */ + transport, /* GLIBTOP_NETINFO_TRANSPORT */ mtu, /* GLIBTOP_NETINFO_MTU */ subnet, /* GLIBTOP_NETINFO_SUBNET */ address; /* GLIBTOP_NETINFO_ADDRESS */ diff --git a/sysdeps/names/netinfo.c b/sysdeps/names/netinfo.c index 63930c1d..ebf47722 100644 --- a/sysdeps/names/netinfo.c +++ b/sysdeps/names/netinfo.c @@ -27,18 +27,19 @@ const char *glibtop_names_netinfo[GLIBTOP_MAX_NETINFO] = { - "if_flags", "mtu", "subnet", "address" + "if_flags", "transport", "mtu", "subnet", "address" }; const unsigned glibtop_types_netinfo[GLIBTOP_MAX_NETINFO] = { GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, - GLIBTOP_TYPE_ULONG + GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG }; const char *glibtop_labels_netinfo[GLIBTOP_MAX_NETINFO] = { N_ ("Interface Flags"), + N_ ("Transport Method"), N_ ("MTU"), N_ ("Subnet"), N_ ("Address"), @@ -47,6 +48,7 @@ const char *glibtop_labels_netinfo[GLIBTOP_MAX_NETINFO] = const char *glibtop_descriptions_netinfo[GLIBTOP_MAX_NETINFO] = { N_ ("Interface Flags"), + N_ ("Transport Method"), N_ ("Maximum Transfer Unit"), N_ ("Subnet"), N_ ("Address"),