Added new feature to get PPP/ISDN support:

enum {
	GLIBTOP_PPP_STATE_UNKNOWN = 0,
	GLIBTOP_PPP_STATE_HANGUP,
	GLIBTOP_PPP_STATE_ONLINE
};

struct _glibtop_ppp
{
	u_int64_t	flags,
		state,			/* GLIBTOP_PPP_STATE		*/
		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
};

Currently only implemented in the FreeBSD port with ISDN via I4B. - Martin

5 files changed, 93 insertions, 4 deletions

diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am
index 329b8db0..95558e52 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
+			  inodedb.h sysinfo.h ppp.h
diff --git a/include/glibtop/command.h b/include/glibtop/command.h
index a2ec780a..f543b842 100644
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -52,8 +52,9 @@ __BEGIN_DECLS
 
 #define GLIBTOP_CMND_MOUNTLIST		19
 #define GLIBTOP_CMND_FSUSAGE		20
+#define GLIBTOP_CMND_PPP		21
 
-#define GLIBTOP_MAX_CMND		21
+#define GLIBTOP_MAX_CMND		22
 
 #define _GLIBTOP_PARAM_SIZE		16
 
diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h
new file mode 100644
index 00000000..981d27d9
--- /dev/null
+++ b/include/glibtop/ppp.h
@@ -0,0 +1,83 @@
+/* $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_PPP_H__
+#define __GLIBTOP_PPP_H__
+
+#include <glibtop.h>
+#include <glibtop/global.h>
+
+__BEGIN_DECLS
+
+#define GLIBTOP_PPP_STATE	0
+#define GLIBTOP_PPP_BYTES_IN	1	
+#define GLIBTOP_PPP_BYTES_OUT	2
+
+#define GLIBTOP_MAX_PPP		3
+
+typedef struct _glibtop_ppp	glibtop_ppp;
+
+enum {
+	GLIBTOP_PPP_STATE_UNKNOWN = 0,
+	GLIBTOP_PPP_STATE_HANGUP,
+	GLIBTOP_PPP_STATE_ONLINE
+};
+
+struct _glibtop_ppp
+{
+	u_int64_t	flags,
+		state,			/* GLIBTOP_PPP_STATE		*/
+		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
+		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
+};
+
+#define glibtop_get_ppp(ppp,device)	glibtop_get_ppp_l(glibtop_global_server, ppp, device)
+
+#if GLIBTOP_SUID_PPP
+#define glibtop_get_ppp_r	glibtop_get_ppp_p
+#else
+#define glibtop_get_ppp_r	glibtop_get_ppp_s
+#endif
+
+extern void glibtop_get_ppp_l __P((glibtop *, glibtop_ppp *, unsigned short));
+
+#if GLIBTOP_SUID_PPP
+extern void glibtop_init_ppp_p __P((glibtop *));
+extern void glibtop_get_ppp_p __P((glibtop *, glibtop_ppp *, unsigned short));
+#else
+extern void glibtop_init_ppp_s __P((glibtop *));
+extern void glibtop_get_ppp_s __P((glibtop *, glibtop_ppp *, unsigned short));
+#endif
+
+#ifdef GLIBTOP_NAMES
+
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_ppp [];
+extern const unsigned glibtop_types_ppp [];
+extern const char *glibtop_labels_ppp [];
+extern const char *glibtop_descriptions_ppp [];
+
+#endif
+
+__END_DECLS
+
+#endif
diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h
index ad94f5d5..1d94bbab 100644
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -46,8 +46,9 @@ __BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_PROC_MAP	17
 #define GLIBTOP_SYSDEPS_MOUNTLIST	18
 #define GLIBTOP_SYSDEPS_FSUSAGE		19
+#define GLIBTOP_SYSDEPS_PPP		20
 
-#define GLIBTOP_MAX_SYSDEPS		20
+#define GLIBTOP_MAX_SYSDEPS		21
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
@@ -79,7 +80,8 @@ struct _glibtop_sysdeps
 		proc_segment,		/* glibtop_proc_segment	*/
 		proc_map,		/* glibtop_proc_map	*/
 		mountlist,		/* glibtop_mountlist	*/
-		fsusage;		/* glibtop_fsusage	*/
+		fsusage,		/* glibtop_fsusage	*/
+		ppp;			/* glibtop_ppp		*/
 };
 
 #define glibtop_get_sysdeps(sysdeps)	glibtop_get_sysdeps_r(glibtop_global_server,sysdeps)
diff --git a/include/glibtop/union.h b/include/glibtop/union.h
index 6a3f7c85..aa420f2f 100644
--- a/include/glibtop/union.h
+++ b/include/glibtop/union.h
@@ -44,6 +44,8 @@
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
 
+#include <glibtop/ppp.h>
+
 __BEGIN_DECLS
 
 typedef union _glibtop_union	glibtop_union;
@@ -69,6 +71,7 @@ union _glibtop_union
 	glibtop_proc_map	proc_map;
 	glibtop_mountlist	mountlist;
 	glibtop_fsusage		fsusage;
+	glibtop_ppp		ppp;
 };
 
 __END_DECLS