diff options
| author | Martin Baulig <martin@home-of-linux.org> | 1999-11-28 17:53:34 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 1999-11-28 17:53:34 +0000 |
| commit | 53f9d03e30425a6d9f709d6db1a9c9e15eb86306 (patch) | |
| tree | 891fbb60630425c14ae1515c2421cd0044aa09e1 /src | |
| parent | 776b6965fba644be21ddfa1a0d6b739e52c011cc (diff) | |
| download | libgtop-53f9d03e30425a6d9f709d6db1a9c9e15eb86306.tar.gz | |
Added `instance' argument.
1999-11-28 Martin Baulig <martin@home-of-linux.org>
* include/glibtop/interfaces.h (glibtop_get_interface_names):
Added `instance' argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/main.c | 8 | ||||
| -rw-r--r-- | src/daemon/slave.c | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 7ef7af10..db16269c 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -48,6 +48,7 @@ handle_parent_connection (int s) u_int64_t interface G_GNUC_UNUSED; u_int64_t number G_GNUC_UNUSED; + u_int64_t instance G_GNUC_UNUSED; u_int64_t strategy G_GNUC_UNUSED; glibtop_send_version (glibtop_global_server, s); @@ -240,11 +241,14 @@ handle_parent_connection (int s) memcpy (&interface, parameter, sizeof (u_int64_t)); memcpy (&number, parameter + sizeof (u_int64_t), sizeof (u_int64_t)); - memcpy (&strategy, parameter + 2 * sizeof (u_int64_t), + memcpy (&instance, parameter + 2 * sizeof (u_int64_t), + sizeof (u_int64_t)); + memcpy (&strategy, parameter + 3 * sizeof (u_int64_t), sizeof (u_int64_t)); ptr = glibtop_get_interface_names_l (server, &resp->u.data.interface_names, - interface, number, strategy); + interface, number, instance, + strategy); do_output (s, resp, _offset_data (interface_names), ptr ? resp->u.data.interface_names.size+1 : 0, ptr, (ptr != NULL) ? 0 : -1); diff --git a/src/daemon/slave.c b/src/daemon/slave.c index f25adebc..82bee6e9 100644 --- a/src/daemon/slave.c +++ b/src/daemon/slave.c @@ -33,6 +33,7 @@ handle_slave_connection (int input, int output) u_int64_t interface G_GNUC_UNUSED; u_int64_t number G_GNUC_UNUSED; + u_int64_t instance G_GNUC_UNUSED; u_int64_t strategy G_GNUC_UNUSED; unsigned short max_len G_GNUC_UNUSED; @@ -118,11 +119,13 @@ handle_slave_connection (int input, int output) memcpy (&interface, parameter, sizeof (u_int64_t)); memcpy (&number, parameter + sizeof (u_int64_t), sizeof (u_int64_t)); - memcpy (&strategy, parameter + 2 * sizeof (u_int64_t), + memcpy (&instance, parameter + 2 * sizeof (u_int64_t), + sizeof (u_int64_t)); + memcpy (&strategy, parameter + 3 * sizeof (u_int64_t), sizeof (u_int64_t)); ptr = glibtop_get_proc_args_p (server, &resp->u.data.interface_names, - interface, number, strategy); + interface, number, instance, strategy); do_output (output, resp, _offset_data (interface_names), ptr ? resp->u.data.interface_names.size+1 : 0, ptr, (ptr != NULL) ? 0 : -1); |