New version 0.2.0pre5
Fixed problems on all operating systems that require initialization and removed superfluous call of init_netload() function. (Old svn revision: 307)master
parent
36f8ddc12a
commit
eaaaa9c2e3
|
@ -1,5 +1,14 @@
|
||||||
|
2003-08-31 Bernhard Wale
|
||||||
|
* Fixed problem with unnecessary calls of init_netload().
|
||||||
|
* Call init_osspecific() on the right place. This caused the plugin not to
|
||||||
|
work on (at least) NetBSD.
|
||||||
|
* Tested successfully on NetBSD and Solaris 8 (thanks to Benedikt Meurer and
|
||||||
|
Sourceforge Compile Farm).
|
||||||
|
* Released 0.2.0pre5.
|
||||||
|
|
||||||
2003-08-27 Bernhard Walle
|
2003-08-27 Bernhard Walle
|
||||||
* Fixed compile problem on NetBSD and OpenBSD.
|
* Fixed compile problem on NetBSD and OpenBSD.
|
||||||
|
* Released 0.2.0pre4.
|
||||||
|
|
||||||
2003-08-26 Bernhard Walle
|
2003-08-26 Bernhard Walle
|
||||||
* Implemented configurable update interval.
|
* Implemented configurable update interval.
|
||||||
|
|
|
@ -1748,7 +1748,7 @@ fi
|
||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE=xfce4-netload-plugin
|
PACKAGE=xfce4-netload-plugin
|
||||||
VERSION=0.2.0pre4
|
VERSION=0.2.0pre5
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
|
|
@ -9,7 +9,7 @@ AC_INIT([panel-plugin/netload.c])
|
||||||
|
|
||||||
AM_CONFIG_HEADER([config.h])
|
AM_CONFIG_HEADER([config.h])
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.0pre4])
|
AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.0pre5])
|
||||||
|
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ plugindir = @XFCE4_PANEL_PLUGINSDIR@
|
||||||
LIBS = @LIBS@ @SOLLIBS@
|
LIBS = @LIBS@ @SOLLIBS@
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
wormulon
|
wormulon commandline.c
|
||||||
|
|
||||||
plugin_LTLIBRARIES = \
|
plugin_LTLIBRARIES = \
|
||||||
libnetload.la
|
libnetload.la
|
||||||
|
|
|
@ -159,7 +159,7 @@ target_alias = @target_alias@
|
||||||
plugindir = @XFCE4_PANEL_PLUGINSDIR@
|
plugindir = @XFCE4_PANEL_PLUGINSDIR@
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
wormulon
|
wormulon commandline.c
|
||||||
|
|
||||||
|
|
||||||
plugin_LTLIBRARIES = \
|
plugin_LTLIBRARIES = \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* XFce 4 - Netload Plugin
|
/* XFce 4 - Netload Plugin
|
||||||
* Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
|
* Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
|
||||||
*
|
*
|
||||||
* Id: $Id: net.c,v 1.3 2003/08/26 20:34:46 bwalle Exp $
|
* Id: $Id: net.c,v 1.4 2003/08/31 12:54:36 bwalle Exp $
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -73,6 +73,8 @@ void init_netload(netdata* data, const char* device)
|
||||||
strncpy( data->ifdata.if_name, device, 9 );
|
strncpy( data->ifdata.if_name, device, 9 );
|
||||||
data->ifdata.if_name[9] = '\0';
|
data->ifdata.if_name[9] = '\0';
|
||||||
|
|
||||||
|
init_osspecific( data );
|
||||||
|
|
||||||
if (checkinterface(data) != TRUE)
|
if (checkinterface(data) != TRUE)
|
||||||
{
|
{
|
||||||
data->correct_interface = FALSE;
|
data->correct_interface = FALSE;
|
||||||
|
@ -86,7 +88,9 @@ void init_netload(netdata* data, const char* device)
|
||||||
|
|
||||||
data->correct_interface = TRUE;
|
data->correct_interface = TRUE;
|
||||||
|
|
||||||
init_osspecific( data );
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "The netload plugin was initialized for '%s'.\n", device );
|
||||||
|
#endif /* DEBUG */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -118,20 +122,20 @@ void get_current_netload(netdata* data, unsigned long *in, unsigned long *out, u
|
||||||
get_stat(data);
|
get_stat(data);
|
||||||
if (data->backup_in > data->stats.rx_bytes)
|
if (data->backup_in > data->stats.rx_bytes)
|
||||||
{
|
{
|
||||||
data->cur_in = (int) data->stats.rx_bytes / delta_t;
|
data->cur_in = (int)( data->stats.rx_bytes / delta_t + 0.5);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
data->cur_in = (int) (data->stats.rx_bytes - data->backup_in) / delta_t;
|
data->cur_in = (int)( (data->stats.rx_bytes - data->backup_in) / delta_t + 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data->backup_out > data->stats.tx_bytes)
|
if (data->backup_out > data->stats.tx_bytes)
|
||||||
{
|
{
|
||||||
data->cur_out = (int) data->stats.tx_bytes / delta_t;
|
data->cur_out = (int)( data->stats.tx_bytes / delta_t + 0.5);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
data->cur_out = (int) (data->stats.tx_bytes - data->backup_out) / delta_t;
|
data->cur_out = (int)( (data->stats.tx_bytes - data->backup_out) / delta_t + 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
if( in != NULL && out != NULL && tot != NULL )
|
if( in != NULL && out != NULL && tot != NULL )
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* XFce 4 - Netload Plugin
|
/* XFce 4 - Netload Plugin
|
||||||
* Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
|
* Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
|
||||||
*
|
*
|
||||||
* Id: $Id: net.h,v 1.4 2003/08/25 21:08:58 bwalle Exp $
|
* Id: $Id: net.h,v 1.5 2003/08/31 12:54:36 bwalle Exp $
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -41,6 +41,7 @@
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
char old_interface[9];
|
||||||
double backup_in;
|
double backup_in;
|
||||||
double backup_out;
|
double backup_out;
|
||||||
double cur_in;
|
double cur_in;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* XFce 4 - Netload Plugin
|
/* XFce 4 - Netload Plugin
|
||||||
* Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
|
* Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
|
||||||
*
|
*
|
||||||
* Id: $Id: netload.c,v 1.6 2003/08/28 19:38:38 bwalle Exp $
|
* Id: $Id: netload.c,v 1.7 2003/08/31 12:54:36 bwalle Exp $
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -71,6 +71,7 @@ typedef struct
|
||||||
GdkColor color[SUM];
|
GdkColor color[SUM];
|
||||||
gchar *label_text;
|
gchar *label_text;
|
||||||
gchar *network_device;
|
gchar *network_device;
|
||||||
|
gchar *old_network_device;
|
||||||
} t_monitor_options;
|
} t_monitor_options;
|
||||||
|
|
||||||
|
|
||||||
|
@ -178,7 +179,7 @@ static gboolean update_monitors(t_global_monitor *global)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
switch( in )
|
switch( i )
|
||||||
{
|
{
|
||||||
case IN:
|
case IN:
|
||||||
fprintf( stderr, "input: Max = %lu\n", global->monitor->net_max[i] );
|
fprintf( stderr, "input: Max = %lu\n", global->monitor->net_max[i] );
|
||||||
|
@ -256,6 +257,7 @@ static t_global_monitor * monitor_new(void)
|
||||||
global->monitor = g_new(t_monitor, 1);
|
global->monitor = g_new(t_monitor, 1);
|
||||||
global->monitor->options.label_text = g_strdup(DEFAULT_TEXT);
|
global->monitor->options.label_text = g_strdup(DEFAULT_TEXT);
|
||||||
global->monitor->options.network_device = g_strdup(DEFAULT_DEVICE);
|
global->monitor->options.network_device = g_strdup(DEFAULT_DEVICE);
|
||||||
|
global->monitor->options.old_network_device = g_strdup("");
|
||||||
global->monitor->options.use_label = TRUE;
|
global->monitor->options.use_label = TRUE;
|
||||||
global->monitor->options.auto_max = TRUE;
|
global->monitor->options.auto_max = TRUE;
|
||||||
global->monitor->options.update_interval = UPDATE_TIMEOUT;
|
global->monitor->options.update_interval = UPDATE_TIMEOUT;
|
||||||
|
@ -392,10 +394,12 @@ static void monitor_set_orientation (Control * ctrl, int orientation)
|
||||||
for (i = 0; i < SUM; i++)
|
for (i = 0; i < SUM; i++)
|
||||||
{
|
{
|
||||||
rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
|
rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
|
||||||
if (!rc) {
|
if (!rc)
|
||||||
|
{
|
||||||
rc = gtk_rc_style_new();
|
rc = gtk_rc_style_new();
|
||||||
}
|
}
|
||||||
if (rc) {
|
else
|
||||||
|
{
|
||||||
rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
|
rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
|
||||||
rc->bg[GTK_STATE_PRELIGHT] =
|
rc->bg[GTK_STATE_PRELIGHT] =
|
||||||
global->monitor->options.color[i];
|
global->monitor->options.color[i];
|
||||||
|
@ -502,7 +506,16 @@ static void setup_monitor(t_global_monitor *global)
|
||||||
gtk_widget_show(global->monitor->label);
|
gtk_widget_show(global->monitor->label);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!strcmp(global->monitor->options.network_device,
|
||||||
|
global->monitor->options.old_network_device) == 0)
|
||||||
|
{
|
||||||
init_netload( &(global->monitor->data), global->monitor->options.network_device);
|
init_netload( &(global->monitor->data), global->monitor->options.network_device);
|
||||||
|
if (global->monitor->options.old_network_device)
|
||||||
|
{
|
||||||
|
g_free(global->monitor->options.old_network_device);
|
||||||
|
}
|
||||||
|
global->monitor->options.old_network_device = g_strdup(global->monitor->options.network_device);
|
||||||
|
}
|
||||||
|
|
||||||
run_update( global );
|
run_update( global );
|
||||||
|
|
||||||
|
@ -759,8 +772,7 @@ static void network_changed(GtkWidget *button, t_global_monitor *global)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void label_toggled(GtkWidget *check_button, t_global_monitor *global)
|
||||||
label_toggled(GtkWidget *check_button, t_global_monitor *global)
|
|
||||||
{
|
{
|
||||||
global->monitor->options.use_label =
|
global->monitor->options.use_label =
|
||||||
!global->monitor->options.use_label;
|
!global->monitor->options.use_label;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: freebsd.c,v 1.2 2003/08/25 21:08:58 bwalle Exp $ */
|
/* $Id: freebsd.c,v 1.3 2003/08/31 12:54:36 bwalle Exp $ */
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
|
@ -12,6 +12,10 @@
|
||||||
void init_osspecific(netdata* data)
|
void init_osspecific(netdata* data)
|
||||||
{
|
{
|
||||||
data->watchif = -1;
|
data->watchif = -1;
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "The netload plugin was initialized for FreeBSD.\n" );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -33,6 +37,11 @@ int checkinterface(netdata* data)
|
||||||
int name[6];
|
int name[6];
|
||||||
struct ifmibdata ifmd;
|
struct ifmibdata ifmd;
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "Checking the interface '%s' now ...\n", data->ifdata.if_name );
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
len = sizeof(num_iface);
|
len = sizeof(num_iface);
|
||||||
sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0);
|
sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0);
|
||||||
for (i=1; i <= num_iface; i++)
|
for (i=1; i <= num_iface; i++)
|
||||||
|
@ -103,9 +112,18 @@ int get_stat(netdata* data)
|
||||||
if (strcmp(ifmd.ifmd_name, (char *)data->ifdata.if_name) == 0)
|
if (strcmp(ifmd.ifmd_name, (char *)data->ifdata.if_name) == 0)
|
||||||
{
|
{
|
||||||
/* got the right interface */
|
/* got the right interface */
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "Got the right interface.\n");
|
||||||
|
#endif
|
||||||
data->watchif = i;
|
data->watchif = i;
|
||||||
data->dev_opened++;
|
data->dev_opened++;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "Got NOT the right interface.\n");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* in any case read the struct and record statistics */
|
/* in any case read the struct and record statistics */
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
|
|
||||||
#include "net.h"
|
#ifndef FREEBSD_H
|
||||||
|
#define FREEBSD_H
|
||||||
|
|
||||||
|
#include "../net.h"
|
||||||
|
|
||||||
void init_osspecific(netdata* data);
|
void init_osspecific(netdata* data);
|
||||||
int checkinterface(netdata* data);
|
int checkinterface(netdata* data);
|
||||||
int get_stat(netdata* data);
|
int get_stat(netdata* data);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include <netio.h>
|
#include <netio.h>
|
||||||
#define WAIT_PCKS_COUNTER 15
|
#define WAIT_PCKS_COUNTER 15
|
||||||
|
|
||||||
/* $Id: hpux.c,v 1.2 2003/08/25 21:08:58 bwalle Exp $ */
|
/* $Id: hpux.c,v 1.3 2003/08/31 12:54:36 bwalle Exp $ */
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
|
@ -15,6 +15,11 @@
|
||||||
void init_osspecific(netdata* data)
|
void init_osspecific(netdata* data)
|
||||||
{
|
{
|
||||||
wait_pcks_counter = WAIT_PCKS_COUNTER+1;
|
wait_pcks_counter = WAIT_PCKS_COUNTER+1;
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "The netload plugin was initialized for HP_UX.\n" );
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
#ifndef _HPUX_H_
|
#ifndef HPUX_H
|
||||||
#define _HPUX_H_
|
#define HPUX_H
|
||||||
|
|
||||||
|
#include "../net.h"
|
||||||
|
|
||||||
void init_osspecific(netdata* data);
|
void init_osspecific(netdata* data);
|
||||||
int checkinterface(netdata* data);
|
int checkinterface(netdata* data);
|
||||||
int get_stat(netdata* data);
|
int get_stat(netdata* data);
|
||||||
#endif
|
|
||||||
|
#endif /* HPUX_H */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: linux.c,v 1.2 2003/08/25 21:08:58 bwalle Exp $ */
|
/* $Id: linux.c,v 1.3 2003/08/31 12:54:36 bwalle Exp $ */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,7 +12,9 @@
|
||||||
|
|
||||||
void init_osspecific(netdata* data)
|
void init_osspecific(netdata* data)
|
||||||
{
|
{
|
||||||
/* nothing */
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "The netload plugin was initialized for Linux.\n" );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,6 +33,11 @@ int checkinterface(netdata* data)
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
struct if_nameindex *ifs;
|
struct if_nameindex *ifs;
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "Checking the interface '%s' now ...\n", data->ifdata.if_name );
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
if ((ifs = if_nameindex()) == NULL)
|
if ((ifs = if_nameindex()) == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
|
#ifndef LINUX_H
|
||||||
|
#define LINUX_H
|
||||||
|
|
||||||
#include "net.h"
|
#include "../net.h"
|
||||||
|
|
||||||
void init_osspecific(netdata* data);
|
void init_osspecific(netdata* data);
|
||||||
int checkinterface(netdata* data);
|
int checkinterface(netdata* data);
|
||||||
|
@ -7,4 +9,6 @@ int get_stat(netdata* data);
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#define BUFSIZE 256
|
#define BUFSIZE 256
|
||||||
#endif
|
#endif /* _linux_ */
|
||||||
|
|
||||||
|
#endif /* LINUX_H */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: netbsd.c,v 1.3 2003/08/27 18:26:50 bwalle Exp $ */
|
/* $Id: netbsd.c,v 1.4 2003/08/31 12:54:36 bwalle Exp $ */
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
|
@ -24,6 +24,10 @@ void init_osspecific(netdata* data)
|
||||||
data->mib_name2[3] = 0;
|
data->mib_name2[3] = 0;
|
||||||
data->mib_name2[4] = NET_RT_IFLIST;
|
data->mib_name2[4] = NET_RT_IFLIST;
|
||||||
data->mib_name2[5] = 0;
|
data->mib_name2[5] = 0;
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "The netload plugin was initialized for NetBSD.\n" );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
|
#ifndef NETBSD_H
|
||||||
|
#define NETBSD_H
|
||||||
|
|
||||||
|
#include "../net.h"
|
||||||
|
|
||||||
void init_osspecific(netdata* data);
|
void init_osspecific(netdata* data);
|
||||||
int checkinterface(netdata* data);
|
int checkinterface(netdata* data);
|
||||||
int get_stat(netdata* data);
|
int get_stat(netdata* data);
|
||||||
|
|
||||||
|
#endif /* NETBSD_H */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: openbsd.c,v 1.3 2003/08/27 18:26:50 bwalle Exp $ */
|
/* $Id: openbsd.c,v 1.4 2003/08/31 12:54:36 bwalle Exp $ */
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
|
@ -24,6 +24,10 @@ void init_osspecific(netdata* data)
|
||||||
data->mib_name2[3] = 0;
|
data->mib_name2[3] = 0;
|
||||||
data->mib_name2[4] = NET_RT_IFLIST;
|
data->mib_name2[4] = NET_RT_IFLIST;
|
||||||
data->mib_name2[5] = 0;
|
data->mib_name2[5] = 0;
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "The netload plugin was initialized for OpenBSD.\n" );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
#ifndef OPENBSD_H
|
||||||
|
#define OPENBSD_H
|
||||||
|
|
||||||
|
#include "../net.h"
|
||||||
|
|
||||||
void init_osspecific(netdata* data);
|
void init_osspecific(netdata* data);
|
||||||
int checkinterface(netdata* data);
|
int checkinterface(netdata* data);
|
||||||
int get_stat(netdata* data);
|
int get_stat(netdata* data);
|
||||||
|
|
||||||
|
#endif /* OPENBSD_H */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: solaris.c,v 1.2 2003/08/25 21:08:58 bwalle Exp $ */
|
/* $Id: solaris.c,v 1.3 2003/08/31 12:54:36 bwalle Exp $ */
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
|
@ -12,6 +12,11 @@
|
||||||
void init_osspecific(netdata* data)
|
void init_osspecific(netdata* data)
|
||||||
{
|
{
|
||||||
/* nothing */
|
/* nothing */
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf( stderr, "The netload plugin was initialized for Sun Solaris.\n" );
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
|
#ifndef SOLARIS_H
|
||||||
|
#define SOLARIS_H
|
||||||
|
|
||||||
|
#include "../net.h"
|
||||||
|
|
||||||
void init_osspecific(netdata* data);
|
void init_osspecific(netdata* data);
|
||||||
int checkinterface(netdata* data);
|
int checkinterface(netdata* data);
|
||||||
int get_stat(netdata* data);
|
int get_stat(netdata* data);
|
||||||
|
|
||||||
|
#endif /* SOLARIS_H */
|
||||||
|
|
28
po/ca.po
28
po/ca.po
|
@ -6,7 +6,7 @@
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: XFce 4\n"
|
"Project-Id-Version: XFce 4\n"
|
||||||
"POT-Creation-Date: 2003-08-27 20:23+0200\n"
|
"POT-Creation-Date: 2003-08-31 14:41+0200\n"
|
||||||
"PO-Revision-Date: 2003-08-26 23:58+0100\n"
|
"PO-Revision-Date: 2003-08-26 23:58+0100\n"
|
||||||
"Last-Translator: Carles Mu-oz Gorriz <carlesmu@internautas.org>\n"
|
"Last-Translator: Carles Mu-oz Gorriz <carlesmu@internautas.org>\n"
|
||||||
"Language-Team: ca <LL@li.org>\n"
|
"Language-Team: ca <LL@li.org>\n"
|
||||||
|
@ -14,7 +14,7 @@ msgstr ""
|
||||||
"Content-Type: text/plain; charset=utf-8\n"
|
"Content-Type: text/plain; charset=utf-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:202
|
#: panel-plugin/netload.c:216
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Average of last %d measures:\n"
|
"Average of last %d measures:\n"
|
||||||
|
@ -27,50 +27,50 @@ msgstr ""
|
||||||
"Sortint: %s kBytes/s\n"
|
"Sortint: %s kBytes/s\n"
|
||||||
"Total: %s kBytes/s"
|
"Total: %s kBytes/s"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:813
|
#: panel-plugin/netload.c:834
|
||||||
msgid "Select color"
|
msgid "Select color"
|
||||||
msgstr "Seleccioneu el color"
|
msgstr "Seleccioneu el color"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:866
|
#: panel-plugin/netload.c:887
|
||||||
msgid "Bar color (incoming):"
|
msgid "Bar color (incoming):"
|
||||||
msgstr "Color de la barra (entrant):"
|
msgstr "Color de la barra (entrant):"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:867
|
#: panel-plugin/netload.c:888
|
||||||
msgid "Bar color (outgoing):"
|
msgid "Bar color (outgoing):"
|
||||||
msgstr "Color de la barra (sortint):"
|
msgstr "Color de la barra (sortint):"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:870
|
#: panel-plugin/netload.c:891
|
||||||
msgid "Maximum (incoming):"
|
msgid "Maximum (incoming):"
|
||||||
msgstr "Màxim (entrant):"
|
msgstr "Màxim (entrant):"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:871
|
#: panel-plugin/netload.c:892
|
||||||
msgid "Maximum (outgoing):"
|
msgid "Maximum (outgoing):"
|
||||||
msgstr "Màxim (sortint):"
|
msgstr "Màxim (sortint):"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:895
|
#: panel-plugin/netload.c:916
|
||||||
msgid "Text to display:"
|
msgid "Text to display:"
|
||||||
msgstr "Text a mostrar:"
|
msgstr "Text a mostrar:"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:926
|
#: panel-plugin/netload.c:947
|
||||||
msgid "Network device:"
|
msgid "Network device:"
|
||||||
msgstr "Dispositiu de xarxa:"
|
msgstr "Dispositiu de xarxa:"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:952
|
#: panel-plugin/netload.c:973
|
||||||
msgid "Update interval:"
|
msgid "Update interval:"
|
||||||
msgstr "Interval d'actualització:"
|
msgstr "Interval d'actualització:"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:963
|
#: panel-plugin/netload.c:984
|
||||||
msgid "ms"
|
msgid "ms"
|
||||||
msgstr "ms"
|
msgstr "ms"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:976
|
#: panel-plugin/netload.c:997
|
||||||
msgid "Automatic maximum"
|
msgid "Automatic maximum"
|
||||||
msgstr "Màxim automatitzat"
|
msgstr "Màxim automatitzat"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:1008
|
#: panel-plugin/netload.c:1029
|
||||||
msgid "kByte/s"
|
msgid "kByte/s"
|
||||||
msgstr "kBytes/s"
|
msgstr "kBytes/s"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:1096
|
#: panel-plugin/netload.c:1117
|
||||||
msgid "Netload"
|
msgid "Netload"
|
||||||
msgstr "Càrrega de red"
|
msgstr "Càrrega de red"
|
||||||
|
|
28
po/de.po
28
po/de.po
|
@ -3,7 +3,7 @@
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: de\n"
|
"Project-Id-Version: de\n"
|
||||||
"POT-Creation-Date: 2003-08-27 20:23+0200\n"
|
"POT-Creation-Date: 2003-08-31 14:41+0200\n"
|
||||||
"PO-Revision-Date: 2003-08-10 19:35+0200\n"
|
"PO-Revision-Date: 2003-08-10 19:35+0200\n"
|
||||||
"Last-Translator: Bernhard Walle <bernhard.walle@gmx.de>\n"
|
"Last-Translator: Bernhard Walle <bernhard.walle@gmx.de>\n"
|
||||||
"Language-Team: Deutsch <www.xfce.org>\n"
|
"Language-Team: Deutsch <www.xfce.org>\n"
|
||||||
|
@ -11,7 +11,7 @@ msgstr ""
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"X-Generator: KBabel 1.0.2\n"
|
"X-Generator: KBabel 1.0.2\n"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:202
|
#: panel-plugin/netload.c:216
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Average of last %d measures:\n"
|
"Average of last %d measures:\n"
|
||||||
|
@ -24,50 +24,50 @@ msgstr ""
|
||||||
"Ausgehend: %s kByte/s\n"
|
"Ausgehend: %s kByte/s\n"
|
||||||
"Gesamt: %s kByte/s"
|
"Gesamt: %s kByte/s"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:813
|
#: panel-plugin/netload.c:834
|
||||||
msgid "Select color"
|
msgid "Select color"
|
||||||
msgstr "Farbe auswählen"
|
msgstr "Farbe auswählen"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:866
|
#: panel-plugin/netload.c:887
|
||||||
msgid "Bar color (incoming):"
|
msgid "Bar color (incoming):"
|
||||||
msgstr "Balkenfarbe (eingehend):"
|
msgstr "Balkenfarbe (eingehend):"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:867
|
#: panel-plugin/netload.c:888
|
||||||
msgid "Bar color (outgoing):"
|
msgid "Bar color (outgoing):"
|
||||||
msgstr "Balkenfarbe (ausgehend):"
|
msgstr "Balkenfarbe (ausgehend):"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:870
|
#: panel-plugin/netload.c:891
|
||||||
msgid "Maximum (incoming):"
|
msgid "Maximum (incoming):"
|
||||||
msgstr "Maximum (eingehend):"
|
msgstr "Maximum (eingehend):"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:871
|
#: panel-plugin/netload.c:892
|
||||||
msgid "Maximum (outgoing):"
|
msgid "Maximum (outgoing):"
|
||||||
msgstr "Maximum (ausgehend):"
|
msgstr "Maximum (ausgehend):"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:895
|
#: panel-plugin/netload.c:916
|
||||||
msgid "Text to display:"
|
msgid "Text to display:"
|
||||||
msgstr "Angezeigter Text:"
|
msgstr "Angezeigter Text:"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:926
|
#: panel-plugin/netload.c:947
|
||||||
msgid "Network device:"
|
msgid "Network device:"
|
||||||
msgstr "Netzwerkschnittstelle:"
|
msgstr "Netzwerkschnittstelle:"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:952
|
#: panel-plugin/netload.c:973
|
||||||
msgid "Update interval:"
|
msgid "Update interval:"
|
||||||
msgstr "Aktualisierungsintervall:"
|
msgstr "Aktualisierungsintervall:"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:963
|
#: panel-plugin/netload.c:984
|
||||||
msgid "ms"
|
msgid "ms"
|
||||||
msgstr "ms"
|
msgstr "ms"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:976
|
#: panel-plugin/netload.c:997
|
||||||
msgid "Automatic maximum"
|
msgid "Automatic maximum"
|
||||||
msgstr "Automatisches Maximum"
|
msgstr "Automatisches Maximum"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:1008
|
#: panel-plugin/netload.c:1029
|
||||||
msgid "kByte/s"
|
msgid "kByte/s"
|
||||||
msgstr "kByte/s"
|
msgstr "kByte/s"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:1096
|
#: panel-plugin/netload.c:1117
|
||||||
msgid "Netload"
|
msgid "Netload"
|
||||||
msgstr "Netzlast"
|
msgstr "Netzlast"
|
||||||
|
|
28
po/lt.po
28
po/lt.po
|
@ -6,7 +6,7 @@
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: xfce4-netload 1.0\n"
|
"Project-Id-Version: xfce4-netload 1.0\n"
|
||||||
"POT-Creation-Date: 2003-08-27 20:23+0200\n"
|
"POT-Creation-Date: 2003-08-31 14:41+0200\n"
|
||||||
"PO-Revision-Date: 2003-08-15 11:08+0300\n"
|
"PO-Revision-Date: 2003-08-15 11:08+0300\n"
|
||||||
"Last-Translator: Mantas <zaz@xxx.lt>\n"
|
"Last-Translator: Mantas <zaz@xxx.lt>\n"
|
||||||
"Language-Team: <komp_lt@konferencijos.lt>\n"
|
"Language-Team: <komp_lt@konferencijos.lt>\n"
|
||||||
|
@ -14,7 +14,7 @@ msgstr ""
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:202
|
#: panel-plugin/netload.c:216
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Average of last %d measures:\n"
|
"Average of last %d measures:\n"
|
||||||
|
@ -26,52 +26,52 @@ msgstr ""
|
||||||
"Siunčiami: %lld bitų/s\n"
|
"Siunčiami: %lld bitų/s\n"
|
||||||
"Viso: %lld bitų/s"
|
"Viso: %lld bitų/s"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:813
|
#: panel-plugin/netload.c:834
|
||||||
msgid "Select color"
|
msgid "Select color"
|
||||||
msgstr "Pasirinkite spalvą"
|
msgstr "Pasirinkite spalvą"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:866
|
#: panel-plugin/netload.c:887
|
||||||
msgid "Bar color (incoming):"
|
msgid "Bar color (incoming):"
|
||||||
msgstr "Juostos spalva (gaunami duomenys)"
|
msgstr "Juostos spalva (gaunami duomenys)"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:867
|
#: panel-plugin/netload.c:888
|
||||||
msgid "Bar color (outgoing):"
|
msgid "Bar color (outgoing):"
|
||||||
msgstr "Juostos spalva (siunčiami duomenys)"
|
msgstr "Juostos spalva (siunčiami duomenys)"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:870
|
#: panel-plugin/netload.c:891
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Maximum (incoming):"
|
msgid "Maximum (incoming):"
|
||||||
msgstr "Juostos spalva (gaunami duomenys)"
|
msgstr "Juostos spalva (gaunami duomenys)"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:871
|
#: panel-plugin/netload.c:892
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Maximum (outgoing):"
|
msgid "Maximum (outgoing):"
|
||||||
msgstr "Juostos spalva (siunčiami duomenys)"
|
msgstr "Juostos spalva (siunčiami duomenys)"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:895
|
#: panel-plugin/netload.c:916
|
||||||
msgid "Text to display:"
|
msgid "Text to display:"
|
||||||
msgstr "Rodomas tekstas:"
|
msgstr "Rodomas tekstas:"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:926
|
#: panel-plugin/netload.c:947
|
||||||
msgid "Network device:"
|
msgid "Network device:"
|
||||||
msgstr "Tinklo įrenginys"
|
msgstr "Tinklo įrenginys"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:952
|
#: panel-plugin/netload.c:973
|
||||||
msgid "Update interval:"
|
msgid "Update interval:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:963
|
#: panel-plugin/netload.c:984
|
||||||
msgid "ms"
|
msgid "ms"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:976
|
#: panel-plugin/netload.c:997
|
||||||
msgid "Automatic maximum"
|
msgid "Automatic maximum"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:1008
|
#: panel-plugin/netload.c:1029
|
||||||
msgid "kByte/s"
|
msgid "kByte/s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:1096
|
#: panel-plugin/netload.c:1117
|
||||||
msgid "Netload"
|
msgid "Netload"
|
||||||
msgstr "Tinklo apkrovimas"
|
msgstr "Tinklo apkrovimas"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"POT-Creation-Date: 2003-08-27 20:23+0200\n"
|
"POT-Creation-Date: 2003-08-31 14:41+0200\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
@ -15,7 +15,7 @@ msgstr ""
|
||||||
"Content-Type: text/plain; charset=CHARSET\n"
|
"Content-Type: text/plain; charset=CHARSET\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
#: panel-plugin/netload.c:202
|
#: panel-plugin/netload.c:216
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Average of last %d measures:\n"
|
"Average of last %d measures:\n"
|
||||||
|
@ -24,50 +24,50 @@ msgid ""
|
||||||
"Total: %s kByte/s"
|
"Total: %s kByte/s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:813
|
#: panel-plugin/netload.c:834
|
||||||
msgid "Select color"
|
msgid "Select color"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:866
|
#: panel-plugin/netload.c:887
|
||||||
msgid "Bar color (incoming):"
|
msgid "Bar color (incoming):"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:867
|
#: panel-plugin/netload.c:888
|
||||||
msgid "Bar color (outgoing):"
|
msgid "Bar color (outgoing):"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:870
|
#: panel-plugin/netload.c:891
|
||||||
msgid "Maximum (incoming):"
|
msgid "Maximum (incoming):"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:871
|
#: panel-plugin/netload.c:892
|
||||||
msgid "Maximum (outgoing):"
|
msgid "Maximum (outgoing):"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:895
|
#: panel-plugin/netload.c:916
|
||||||
msgid "Text to display:"
|
msgid "Text to display:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:926
|
#: panel-plugin/netload.c:947
|
||||||
msgid "Network device:"
|
msgid "Network device:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:952
|
#: panel-plugin/netload.c:973
|
||||||
msgid "Update interval:"
|
msgid "Update interval:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:963
|
#: panel-plugin/netload.c:984
|
||||||
msgid "ms"
|
msgid "ms"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:976
|
#: panel-plugin/netload.c:997
|
||||||
msgid "Automatic maximum"
|
msgid "Automatic maximum"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:1008
|
#: panel-plugin/netload.c:1029
|
||||||
msgid "kByte/s"
|
msgid "kByte/s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: panel-plugin/netload.c:1096
|
#: panel-plugin/netload.c:1117
|
||||||
msgid "Netload"
|
msgid "Netload"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
Loading…
Reference in New Issue