Added new features to get network load:

typedef struct _glibtop_netload	glibtop_netload;

struct _glibtop_netload
{
	u_int64_t	flags,
		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
		address,		/* GLIBTOP_NETLOAD_ADDRESS	*/
		packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
		packets_out,		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
		bytes_in,		/* GLIBTOP_NETLOAD_BYTES_IN	*/
		bytes_out,		/* GLIBTOP_NETLOAD_BYTES_OUT	*/
		errors_in,		/* GLIBTOP_NETLOAD_ERRORS_IN	*/
		errors_out,		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
		collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
};

Returns network load of the given interface, it is specified as string
like `isppp' or `ippp0':

extern void glibtop_get_netload_l __P((glibtop *, glibtop_netload *, const char *));

5 files changed, 98 insertions, 5 deletions

diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am
index 35ef25dd..1b89e905 100644
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -7,4 +7,4 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  procsegment.h read.h sysdeps.h xmalloc.h global.h \
 			  procsignal.h read_data.h union.h types.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  inodedb.h sysinfo.h ppp.h procargs.h
+			  inodedb.h sysinfo.h ppp.h procargs.h netload.h
diff --git a/include/glibtop/command.h b/include/glibtop/command.h
index 9064e3df..a087e6f8 100644
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -53,9 +53,10 @@ __BEGIN_DECLS
 
 #define GLIBTOP_CMND_MOUNTLIST		20
 #define GLIBTOP_CMND_FSUSAGE		21
-#define GLIBTOP_CMND_PPP		22
+#define GLIBTOP_CMND_NETLOAD		22
+#define GLIBTOP_CMND_PPP		23
 
-#define GLIBTOP_MAX_CMND		23
+#define GLIBTOP_MAX_CMND		24
 
 #define _GLIBTOP_PARAM_SIZE		16
 
diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h
new file mode 100644
index 00000000..2f4de21f
--- /dev/null
+++ b/include/glibtop/netload.h
@@ -0,0 +1,88 @@
+/* $Id$ */
+
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the Gnome Top Library.
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   The Gnome Top Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Top Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef __GLIBTOP_NETLOAD_H__
+#define __GLIBTOP_NETLOAD_H__
+
+#include <glibtop.h>
+#include <glibtop/global.h>
+
+__BEGIN_DECLS
+
+#define GLIBTOP_NETLOAD_MTU		0
+#define GLIBTOP_NETLOAD_PACKETS_IN	1
+#define GLIBTOP_NETLOAD_PACKETS_OUT	2
+#define GLIBTOP_NETLOAD_BYTES_IN	3
+#define GLIBTOP_NETLOAD_BYTES_OUT	4
+#define GLIBTOP_NETLOAD_ERRORS_IN	5
+#define GLIBTOP_NETLOAD_ERRORS_OUT	6
+#define GLIBTOP_NETLOAD_COLLISIONS	7
+
+#define GLIBTOP_MAX_NETLOAD		8
+
+typedef struct _glibtop_netload	glibtop_netload;
+
+struct _glibtop_netload
+{
+	u_int64_t	flags,
+		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
+		address,		/* GLIBTOP_NETLOAD_ADDRESS	*/
+		packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
+		packets_out,		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
+		bytes_in,		/* GLIBTOP_NETLOAD_BYTES_IN	*/
+		bytes_out,		/* GLIBTOP_NETLOAD_BYTES_OUT	*/
+		errors_in,		/* GLIBTOP_NETLOAD_ERRORS_IN	*/
+		errors_out,		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
+		collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
+};
+
+#define glibtop_get_netload(netload,interface)	glibtop_get_netload_l(glibtop_global_server, netload, interface)
+
+#if GLIBTOP_SUID_NETLOAD
+#define glibtop_get_netload_r	glibtop_get_netload_p
+#else
+#define glibtop_get_netload_r	glibtop_get_netload_s
+#endif
+
+extern void glibtop_get_netload_l __P((glibtop *, glibtop_netload *, const char *));
+
+#if GLIBTOP_SUID_NETLOAD
+extern void glibtop_init_netload_p __P((glibtop *));
+extern void glibtop_get_netload_p __P((glibtop *, glibtop_netload *, const char *));
+#else
+extern void glibtop_init_netload_s __P((glibtop *));
+extern void glibtop_get_netload_s __P((glibtop *, glibtop_netload *, const char *));
+#endif
+
+#ifdef GLIBTOP_NAMES
+
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_netload [];
+extern const unsigned glibtop_types_netload [];
+extern const char *glibtop_labels_netload [];
+extern const char *glibtop_descriptions_netload [];
+
+#endif
+
+__END_DECLS
+
+#endif
diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h
index 9ec277b9..c0461b7c 100644
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -47,9 +47,10 @@ __BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_PROC_MAP	18
 #define GLIBTOP_SYSDEPS_MOUNTLIST	19
 #define GLIBTOP_SYSDEPS_FSUSAGE		20
-#define GLIBTOP_SYSDEPS_PPP		21
+#define GLIBTOP_SYSDEPS_NETLOAD		21
+#define GLIBTOP_SYSDEPS_PPP		22
 
-#define GLIBTOP_MAX_SYSDEPS		22
+#define GLIBTOP_MAX_SYSDEPS		23
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
@@ -83,6 +84,7 @@ struct _glibtop_sysdeps
 		proc_map,		/* glibtop_proc_map	*/
 		mountlist,		/* glibtop_mountlist	*/
 		fsusage,		/* glibtop_fsusage	*/
+		netload,		/* glibtop_netload	*/
 		ppp;			/* glibtop_ppp		*/
 };
 
diff --git a/include/glibtop/union.h b/include/glibtop/union.h
index 68e30e2e..28f4bd41 100644
--- a/include/glibtop/union.h
+++ b/include/glibtop/union.h
@@ -45,6 +45,7 @@
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
 
+#include <glibtop/netload.h>
 #include <glibtop/ppp.h>
 
 __BEGIN_DECLS
@@ -73,6 +74,7 @@ union _glibtop_union
 	glibtop_proc_map	proc_map;
 	glibtop_mountlist	mountlist;
 	glibtop_fsusage		fsusage;
+	glibtop_netload		netload;
 	glibtop_ppp		ppp;
 };