* netload.c: (hwaddress_format_for_display), (main): Updated.
This commit is contained in:
Benoît Dejean
2004-11-15 16:07:23 +00:00
parent 1d6debfa56
commit 160bdeaecd
2 changed files with 68 additions and 30 deletions

View File

@@ -1,3 +1,7 @@
2004-11-15 Benoît Dejean <tazforever@dlfp.org>
* netload.c: (hwaddress_format_for_display), (main): Updated.
2004-11-13 Benoît Dejean <tazforever@dlfp.org> 2004-11-13 Benoît Dejean <tazforever@dlfp.org>
* pprint.c: (pprint_get_fsusage), (pprint_get_mountlist), * pprint.c: (pprint_get_fsusage), (pprint_get_mountlist),

View File

@@ -40,6 +40,24 @@
#define PROFILE_COUNT 1 #define PROFILE_COUNT 1
#endif #endif
static char* hwaddress_format_for_display(glibtop_netload *buf)
{
unsigned i;
GString *repr = g_string_new("");
char *str;
for(i = 0; i < sizeof buf->hwaddress; ++i)
g_string_append_printf(repr, "%02X:",
(unsigned) ((char*)buf->hwaddress)[i]);
repr->str [ repr->len - 1] = ' ';
str = g_string_free(repr, FALSE);
g_strstrip(str);
return str;
}
int int
main (int argc, char *argv []) main (int argc, char *argv [])
{ {
@@ -47,6 +65,8 @@ main (int argc, char *argv [])
unsigned method, count, port; unsigned method, count, port;
struct in_addr addr, subnet; struct in_addr addr, subnet;
char *address_string, *subnet_string; char *address_string, *subnet_string;
char address6_string[INET6_ADDRSTRLEN], prefix6_string[INET6_ADDRSTRLEN];
char *hwaddress_string;
char buffer [BUFSIZ]; char buffer [BUFSIZ];
count = PROFILE_COUNT; count = PROFILE_COUNT;
@@ -86,36 +106,50 @@ main (int argc, char *argv [])
address_string = g_strdup (inet_ntoa (addr)); address_string = g_strdup (inet_ntoa (addr));
subnet_string = g_strdup (inet_ntoa (subnet)); subnet_string = g_strdup (inet_ntoa (subnet));
printf ("Network Load (0x%08lx):\n\n" inet_ntop (AF_INET6, netload.address6, address6_string, INET6_ADDRSTRLEN);
"\tInterface Flags:\t0x%08lx\n" inet_ntop (AF_INET6, netload.prefix6, prefix6_string, INET6_ADDRSTRLEN);
"\tAddress:\t\t0x%08lx - %s\n"
"\tSubnet:\t\t\t0x%08lx - %s\n\n" hwaddress_string = hwaddress_format_for_display(&netload);
"\tMTU:\t\t\t%ld\n"
"\tCollisions:\t\t%ld\n\n" printf ("Network Load (0x%016llx):\n\n"
"\tPackets In:\t\t%ld\n" "\tInterface Flags:\t0x%016llx\n"
"\tPackets Out:\t\t%ld\n" "\tAddress:\t\t0x%08x - %s\n"
"\tPackets Total:\t\t%ld\n\n" "\tSubnet:\t\t\t0x%08x - %s\n\n"
"\tBytes In:\t\t%ld\n" "\tMTU:\t\t\t%d\n"
"\tBytes Out:\t\t%ld\n" "\tCollisions:\t\t%llu\n\n"
"\tBytes Total:\t\t%ld\n\n" "\tPackets In:\t\t%llu\n"
"\tErrors In:\t\t%ld\n" "\tPackets Out:\t\t%llu\n"
"\tErrors Out:\t\t%ld\n" "\tPackets Total:\t\t%llu\n\n"
"\tErrors Total:\t\t%ld\n\n", "\tBytes In:\t\t%llu\n"
(unsigned long) netload.flags, "\tBytes Out:\t\t%llu\n"
(unsigned long) netload.if_flags, "\tBytes Total:\t\t%llu\n\n"
(unsigned long) netload.address, address_string, "\tErrors In:\t\t%llu\n"
(unsigned long) netload.subnet, subnet_string, "\tErrors Out:\t\t%llu\n"
(unsigned long) netload.mtu, "\tErrors Total:\t\t%llu\n\n"
(unsigned long) netload.collisions, "\tAddress6:\t\t%s\n"
(unsigned long) netload.packets_in, "\tPrefix6:\t\t%s\n"
(unsigned long) netload.packets_out, "\tScope6:\t\t\t%#03x\n\n"
(unsigned long) netload.packets_total, "\tHarware Address:\t%s\n\n",
(unsigned long) netload.bytes_in, netload.flags,
(unsigned long) netload.bytes_out, netload.if_flags,
(unsigned long) netload.bytes_total, (guint32) netload.address, address_string,
(unsigned long) netload.errors_in, (guint32) netload.subnet, subnet_string,
(unsigned long) netload.errors_out, netload.mtu,
(unsigned long) netload.errors_total); netload.collisions,
netload.packets_in,
netload.packets_out,
netload.packets_total,
netload.bytes_in,
netload.bytes_out,
netload.bytes_total,
netload.errors_in,
netload.errors_out,
netload.errors_total,
address6_string,
prefix6_string,
(int) netload.scope6,
hwaddress_string);
g_free (address_string); g_free (address_string);
g_free (subnet_string); g_free (subnet_string);