Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Simon McVittie
17 years ago
commit
d93122bf5e
@ -0,0 +1 @@
|
||||
data/sugar.xml.in
|
||||
@ -0,0 +1,4 @@
|
||||
sugardir = $(pkgdatadir)/services/console/interface/network
|
||||
sugar_PYTHON = \
|
||||
__init__.py \
|
||||
network.py
|
||||
@ -0,0 +1 @@
|
||||
from network import Interface
|
||||
@ -0,0 +1,103 @@
|
||||
# Copyright (C) 2007, Eduardo Silva <edsiper@gmail.com>
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This 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
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the
|
||||
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
# Boston, MA 02111-1307, USA.
|
||||
|
||||
import gobject
|
||||
from net.device import Device
|
||||
from ui.treeview import TreeView
|
||||
|
||||
class NetworkView(TreeView):
|
||||
def __init__(self):
|
||||
col_names = []
|
||||
col_names.append({'index': 0, 'name': 'Interface'})
|
||||
col_names.append({'index': 1, 'name': 'IP Address'})
|
||||
col_names.append({'index': 2, 'name': 'NetMask'})
|
||||
col_names.append({'index': 3, 'name': 'MAC Address'})
|
||||
col_names.append({'index': 4, 'name': 'Bytes Recv'})
|
||||
col_names.append({'index': 5, 'name': 'Bytes Sent'})
|
||||
col_names.append({'index': 6, 'name': 'Packets Recv'})
|
||||
col_names.append({'index': 7, 'name': 'Packets Sent'})
|
||||
|
||||
self._iface_iter = []
|
||||
cols_type = [str, str, str, str, str, str, str, str]
|
||||
TreeView.__init__(self, cols_type, col_names)
|
||||
|
||||
self._dev = Device()
|
||||
self.show_all()
|
||||
gobject.timeout_add(1500, self._update_data)
|
||||
|
||||
def _update_data(self):
|
||||
interfaces = self._dev.get_interfaces()
|
||||
for iface in interfaces:
|
||||
info = self._dev.get_iface_info(iface['interface'])
|
||||
row = []
|
||||
row.append({'index':0, 'info': iface['interface']})
|
||||
|
||||
if info[0]:
|
||||
row.append({'index':1, 'info': info[0]})
|
||||
if info[1]:
|
||||
row.append({'index':2, 'info': info[1]})
|
||||
if info[2]:
|
||||
row.append({'index':3, 'info': info[2]})
|
||||
|
||||
row.append({'index': 4, 'info': iface['bytes_sent']})
|
||||
row.append({'index': 5, 'info': iface['packets_sent']})
|
||||
row.append({'index': 6, 'info': iface['bytes_recv']})
|
||||
row.append({'index': 7, 'info': iface['packets_recv']})
|
||||
|
||||
iter = self._get_iface_iter(iface['interface'])
|
||||
if not iter:
|
||||
iter = self.add_row(row)
|
||||
self._set_iface_iter(iter, iface['interface'])
|
||||
else:
|
||||
self.update_row(iter, row)
|
||||
|
||||
self._clear_down_interfaces(interfaces)
|
||||
return True
|
||||
|
||||
def _set_iface_iter(self, iter, iface):
|
||||
self._iface_iter.append([iter, iface])
|
||||
|
||||
def _remove_iface_iter(self, search_iter):
|
||||
i = 0
|
||||
for [iter, interface] in self._iface_iter:
|
||||
if iter == search_iter:
|
||||
del self._iface_iter[i]
|
||||
return
|
||||
i+=1
|
||||
|
||||
def _get_iface_iter(self, iface):
|
||||
for [iter, interface] in self._iface_iter:
|
||||
if iface == interface:
|
||||
return iter
|
||||
|
||||
return None
|
||||
|
||||
def _clear_down_interfaces(self, interfaces):
|
||||
for [iter, iface] in self._iface_iter:
|
||||
found = False
|
||||
for dev in interfaces:
|
||||
if dev['interface']==iface:
|
||||
found = True
|
||||
break
|
||||
|
||||
if not found:
|
||||
self.remove_row(iter)
|
||||
self._remove_iface_iter(iter)
|
||||
|
||||
class Interface(object):
|
||||
def __init__(self):
|
||||
self.widget = NetworkView()
|
||||
@ -1,4 +1,4 @@
|
||||
SUBDIRS = procmem graphics
|
||||
SUBDIRS = procmem graphics net ui
|
||||
|
||||
sugardir = $(pkgdatadir)/shell/console/lib
|
||||
sugar_PYTHON =
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
|
||||
sugardir = $(pkgdatadir)/services/console/lib/net
|
||||
|
||||
sugar_PYTHON = \
|
||||
__init__.py \
|
||||
device.py
|
||||
|
||||
@ -0,0 +1,91 @@
|
||||
# Copyright (C) 2007, Eduardo Silva <edsiper@gmail.com>
|
||||
#
|
||||
# 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
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program 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 General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
import socket
|
||||
import fcntl
|
||||
import struct
|
||||
import string
|
||||
|
||||
class Device:
|
||||
def __init__(self):
|
||||
self._dev = self.get_interfaces()
|
||||
|
||||
def get_interfaces(self):
|
||||
netdevfile = "/proc/net/dev"
|
||||
dev = []
|
||||
|
||||
try:
|
||||
infile = file(netdevfile, "r")
|
||||
except:
|
||||
print "Error trying " + netdevfile
|
||||
|
||||
skip = 0
|
||||
for line in infile:
|
||||
# Skip first two lines
|
||||
skip += 1
|
||||
if skip <= 2:
|
||||
continue
|
||||
|
||||
iface = string.split(line, ":",1)
|
||||
arr = string.split(iface[1])
|
||||
|
||||
info = {'interface': iface[0].strip(), \
|
||||
'bytes_recv': arr[0],\
|
||||
'bytes_sent': arr[8],\
|
||||
'packets_recv': arr[1],
|
||||
'packets_sent': arr[9]}
|
||||
|
||||
dev.append(info)
|
||||
return dev
|
||||
|
||||
def get_iface_info(self, ifname):
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||
hwaddr = []
|
||||
try:
|
||||
ip = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, \
|
||||
struct.pack('256s', ifname[:15]))[20:24])
|
||||
except:
|
||||
ip = None
|
||||
|
||||
try:
|
||||
netmask = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x891b, \
|
||||
struct.pack('256s', ifname[:15]))[20:24])
|
||||
except:
|
||||
netmask = None
|
||||
|
||||
try:
|
||||
mac = []
|
||||
info = fcntl.ioctl(s.fileno(), 0x8927, \
|
||||
struct.pack('256s', ifname[:15]))
|
||||
for char in info[18:24]:
|
||||
hdigit = hex(ord(char))[2:]
|
||||
if len(hdigit):
|
||||
mac.append(hdigit)
|
||||
except:
|
||||
mac = None
|
||||
|
||||
mac_string = self.mac_to_string(mac)
|
||||
return [ip, netmask, mac_string]
|
||||
|
||||
def mac_to_string(self, hexa):
|
||||
string = ''
|
||||
for value in hexa:
|
||||
if len(string)==0:
|
||||
string = value
|
||||
else:
|
||||
string += ':'+value
|
||||
|
||||
return string
|
||||
@ -0,0 +1,5 @@
|
||||
sugardir = $(pkgdatadir)/services/console/lib/ui
|
||||
|
||||
sugar_PYTHON = \
|
||||
__init__.py \
|
||||
treeview.py
|
||||
@ -0,0 +1,73 @@
|
||||
# Copyright (C) 2007, Eduardo Silva <edsiper@gmail.com>
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This 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
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the
|
||||
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
# Boston, MA 02111-1307, USA.
|
||||
|
||||
import gtk
|
||||
|
||||
class TreeView(gtk.ScrolledWindow):
|
||||
iters = [] # Iters index
|
||||
|
||||
# Create a window with a treeview object
|
||||
#
|
||||
# cols = List of dicts, ex:
|
||||
#
|
||||
# cols = []
|
||||
# cols.append({'index': integer_index_position, 'name': string_col_name})
|
||||
def __init__(self, cols_def, cols_name):
|
||||
gtk.ScrolledWindow.__init__(self)
|
||||
|
||||
self._iters = []
|
||||
self._treeview = gtk.TreeView()
|
||||
|
||||
# Creating column data types
|
||||
self._store = gtk.TreeStore(*cols_def)
|
||||
|
||||
# Columns definition
|
||||
cell = gtk.CellRendererText()
|
||||
tv_cols = []
|
||||
|
||||
i=0
|
||||
for col in cols_name:
|
||||
col_tv = gtk.TreeViewColumn(col['name'], cell, text=i)
|
||||
col_tv.set_reorderable(True)
|
||||
col_tv.set_resizable(True)
|
||||
tv_cols.append(col_tv)
|
||||
i+=1
|
||||
|
||||
# Setting treeview properties
|
||||
self._treeview.set_model(self._store)
|
||||
self._treeview.set_enable_search(True)
|
||||
self._treeview.set_rules_hint(True)
|
||||
|
||||
for col in tv_cols:
|
||||
self._treeview.append_column(col)
|
||||
self.add(self._treeview)
|
||||
|
||||
def add_row(self, cols_data):
|
||||
iter = self._store.insert_after(None, None)
|
||||
for col in cols_data:
|
||||
print col['index'],col['info']
|
||||
self._store.set_value(iter, int(col['index']) , col['info'])
|
||||
|
||||
self.iters.append(iter)
|
||||
return iter
|
||||
|
||||
def update_row(self, iter, cols_data):
|
||||
for col in cols_data:
|
||||
self._store.set_value(iter, int(col['index']) , str(col['info']))
|
||||
|
||||
def remove_row(self, iter):
|
||||
self._store.remove(iter)
|
||||
Loading…
Reference in New Issue