Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added transport' and protocol' argument to specify transport method and

Browse Source 
1999-11-28  Martin Baulig  <martin@home-of-linux.org>

	* include/glibtop/netload.h (glibtop_get_netload): Added
	`transport' and `protocol' argument to specify transport method
	and protocol.

	* include/glibtop/netinfo.h (glibtop_get_netinfo): Added
	`transport' argument to specify the transport method.
This commit is contained in:
Martin Baulig
1999-11-28 19:03:05 +00:00
committed by Martin Baulig
parent d58748ac66
commit f850409d45
8 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
1999-11-28 Martin Baulig <martin@home-of-linux.org>
* include/glibtop/netload.h (glibtop_get_netload): Added
`transport' and `protocol' argument to specify transport method
and protocol.
* include/glibtop/netinfo.h (glibtop_get_netinfo): Added
`transport' argument to specify the transport method.
1999-11-28 Martin Baulig <martin@home-of-linux.org> 1999-11-28 Martin Baulig <martin@home-of-linux.org>
* include/glibtop/netinfo.h (glibtop_netinfo): Added `transport' * include/glibtop/netinfo.h (glibtop_netinfo): Added `transport'

4
features.def
View File

@@ -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) glibtop_mountentry *|@mountlist|ulong(number,size,total)|int(all_fs)
retval|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string(mount_dir) retval|@fsusage|ulong(blocks,bfree,bavail,files,ffree)|string(mount_dir)
char *|interface_names|ulong(size)|unsigned(interface,number,instance,strategy) char *|interface_names|ulong(size)|unsigned(interface,number,instance,strategy)
retval|netinfo|ulong(if_flags,transport,mtu,subnet,address)|string(interface) retval|netinfo|ulong(if_flags,transport,mtu,subnet,address)|string(interface):unsigned(transport)
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|netload|ulong(packets_in,packets_out,packets_total,bytes_in,bytes_out,bytes_total,errors_in,errors_out,errors_total,collisions)|string(interface):unsigned(transport,protocol)
retval|ppp|ulong(state,bytes_in,bytes_out)|ushort(device) retval|ppp|ulong(state,bytes_in,bytes_out)|ushort(device)

8
include/glibtop/netinfo.h
View File

@@ -72,7 +72,7 @@ struct _glibtop_netinfo
address; /* GLIBTOP_NETINFO_ADDRESS */ address; /* GLIBTOP_NETINFO_ADDRESS */
}; };
#define glibtop_get_netinfo(netinfo,interface) glibtop_get_netinfo_l(glibtop_global_server, netinfo, interface) #define glibtop_get_netinfo(netinfo,interface,transport) glibtop_get_netinfo_l(glibtop_global_server, netinfo, interface, transport)
#if GLIBTOP_SUID_NETINFO #if GLIBTOP_SUID_NETINFO
#define glibtop_get_netinfo_r glibtop_get_netinfo_p #define glibtop_get_netinfo_r glibtop_get_netinfo_p
@@ -80,14 +80,14 @@ struct _glibtop_netinfo
#define glibtop_get_netinfo_r glibtop_get_netinfo_s #define glibtop_get_netinfo_r glibtop_get_netinfo_s
#endif #endif
int glibtop_get_netinfo_l (glibtop *server, glibtop_netinfo *buf, const char *interface); int glibtop_get_netinfo_l (glibtop *server, glibtop_netinfo *buf, const char *interface, unsigned transport);
#if GLIBTOP_SUID_NETINFO #if GLIBTOP_SUID_NETINFO
int glibtop_init_netinfo_p (glibtop *server); int glibtop_init_netinfo_p (glibtop *server);
int glibtop_get_netinfo_p (glibtop *server, glibtop_netinfo *buf, const char *interface); int glibtop_get_netinfo_p (glibtop *server, glibtop_netinfo *buf, const char *interface, unsigned transport);
#else #else
int glibtop_init_netinfo_s (glibtop *server); int glibtop_init_netinfo_s (glibtop *server);
int glibtop_get_netinfo_s (glibtop *server, glibtop_netinfo *buf, const char *interface); int glibtop_get_netinfo_s (glibtop *server, glibtop_netinfo *buf, const char *interface, unsigned transport);
#endif #endif
#ifdef GLIBTOP_NAMES #ifdef GLIBTOP_NAMES

8
include/glibtop/netload.h
View File

@@ -63,7 +63,7 @@ struct _glibtop_netload
collisions; /* GLIBTOP_NETLOAD_COLLISIONS */ collisions; /* GLIBTOP_NETLOAD_COLLISIONS */
}; };
#define glibtop_get_netload(netload,interface) glibtop_get_netload_l(glibtop_global_server, netload, interface) #define glibtop_get_netload(netload,interface,transport,protocol) glibtop_get_netload_l(glibtop_global_server, netload, interface, transport, protocol)
#if GLIBTOP_SUID_NETLOAD #if GLIBTOP_SUID_NETLOAD
#define glibtop_get_netload_r glibtop_get_netload_p #define glibtop_get_netload_r glibtop_get_netload_p
@@ -71,14 +71,14 @@ struct _glibtop_netload
#define glibtop_get_netload_r glibtop_get_netload_s #define glibtop_get_netload_r glibtop_get_netload_s
#endif #endif
int glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface); int glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
#if GLIBTOP_SUID_NETLOAD #if GLIBTOP_SUID_NETLOAD
int glibtop_init_netload_p (glibtop *server); int glibtop_init_netload_p (glibtop *server);
int glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface); int glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
#else #else
int glibtop_init_netload_s (glibtop *server); int glibtop_init_netload_s (glibtop *server);
int glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface); int glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface, unsigned transport, unsigned protocol);
#endif #endif
#ifdef GLIBTOP_NAMES #ifdef GLIBTOP_NAMES

6
src/daemon/main.c
View File

@@ -50,6 +50,8 @@ handle_parent_connection (int s)
u_int64_t number G_GNUC_UNUSED; u_int64_t number G_GNUC_UNUSED;
u_int64_t instance G_GNUC_UNUSED; u_int64_t instance G_GNUC_UNUSED;
u_int64_t strategy G_GNUC_UNUSED; u_int64_t strategy G_GNUC_UNUSED;
u_int64_t transport G_GNUC_UNUSED;
u_int64_t protocol G_GNUC_UNUSED;
glibtop_send_version (glibtop_global_server, s); glibtop_send_version (glibtop_global_server, s);
@@ -233,13 +235,13 @@ handle_parent_connection (int s)
break; break;
case GLIBTOP_CMND_NETINFO: case GLIBTOP_CMND_NETINFO:
retval = glibtop_get_netinfo_l retval = glibtop_get_netinfo_l
(server, &resp->u.data.netinfo, parameter); (server, &resp->u.data.netinfo, parameter, 0);
do_output (s, resp, _offset_data (netinfo), do_output (s, resp, _offset_data (netinfo),
0, NULL, retval); 0, NULL, retval);
break; break;
case GLIBTOP_CMND_NETLOAD: case GLIBTOP_CMND_NETLOAD:
retval = glibtop_get_netload_l retval = glibtop_get_netload_l
(server, &resp->u.data.netload, parameter); (server, &resp->u.data.netload, parameter, 0, 0);
do_output (s, resp, _offset_data (netload), do_output (s, resp, _offset_data (netload),
0, NULL, retval); 0, NULL, retval);
break; break;

2
src/daemon/slave.c
View File

@@ -35,6 +35,8 @@ handle_slave_connection (int input, int output)
u_int64_t number G_GNUC_UNUSED; u_int64_t number G_GNUC_UNUSED;
u_int64_t instance G_GNUC_UNUSED; u_int64_t instance G_GNUC_UNUSED;
u_int64_t strategy G_GNUC_UNUSED; u_int64_t strategy G_GNUC_UNUSED;
u_int64_t transport G_GNUC_UNUSED;
u_int64_t protocol G_GNUC_UNUSED;
unsigned short max_len G_GNUC_UNUSED; unsigned short max_len G_GNUC_UNUSED;
pid_t pid G_GNUC_UNUSED; pid_t pid G_GNUC_UNUSED;

2
sysdeps/linux/netinfo.c
View File

@@ -66,7 +66,7 @@ glibtop_init_netinfo_s (glibtop *server)
int int
glibtop_get_netinfo_s (glibtop *server, glibtop_netinfo *buf, glibtop_get_netinfo_s (glibtop *server, glibtop_netinfo *buf,
const char *interface) const char *interface, unsigned transport)
{ {
int skfd; int skfd;

3
sysdeps/linux/netload.c
View File

@@ -97,7 +97,8 @@ glibtop_init_netload_s (glibtop *server)
int int
glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, glibtop_get_netload_s (glibtop *server, glibtop_netload *buf,
const char *interface) const char *interface, unsigned transport,
unsigned protocol)
{ {
char buffer [BUFSIZ], *p; char buffer [BUFSIZ], *p;
int have_bytes, fields; int have_bytes, fields;