%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Summary: PlanetLab Network Configuration library
Name: %{name}
Requires: python >= 2.4
BuildRequires: python, python-devel
+BuildArch: noarch
%description
pyplnet is used to write the network configuration files based on the
%install
rm -rf $RPM_BUILD_ROOT
python setup.py install --skip-build --root "$RPM_BUILD_ROOT"
-chmod +x $RPM_BUILD_ROOT/%{python_sitearch}/plnet.py
+chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/plnet.py
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-ln -s %{python_sitearch}/plnet.py $RPM_BUILD_ROOT/%{_bindir}/plnet
+ln -s %{python_sitelib}/plnet.py $RPM_BUILD_ROOT/%{_bindir}/plnet
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/plnet
-%{python_sitearch}/*
+%{python_sitelib}/*
%changelog
* Tue Dec 2 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - pyplnet-4.3-1
+++ /dev/null
-/*
- * Extension to gather information about network interfaces
- *
- * Mark Huang <mlhuang@cs.princeton.edu>
- * Copyright (C) 2006 The Trustees of Princeton University
- *
- * $Id$
- */
-
-#include <Python.h>
-
-/* struct ifreq */
-#include <net/if.h>
-
-/* socket() */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-/* ioctl() */
-#include <sys/ioctl.h>
-
-/* inet_ntoa() */
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/* ARPHRD_ETHER */
-#include <net/if_arp.h>
-
-/* ETH_ALEN */
-#include <net/ethernet.h>
-
-static PyObject *
-gifconf(PyObject *self, PyObject *args)
-{
- struct ifconf ifc;
- int len;
- int s;
- PyObject *addrs;
- void *buf;
- struct ifreq *ifr;
- struct sockaddr_in *sin;
-
- if ((s = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
- return PyErr_SetFromErrno(PyExc_OSError);
-
- len = sizeof(struct ifreq);
- ifc.ifc_len = 0;
- ifc.ifc_req = NULL;
-
- do {
- len *= 2;
- buf = realloc(ifc.ifc_req, len);
- if (!buf)
- break;
- ifc.ifc_len = len;
- ifc.ifc_req = buf;
- if (ioctl(s, SIOCGIFCONF, &ifc) < 0)
- break;
- } while (ifc.ifc_len >= len);
-
- close(s);
-
- addrs = Py_BuildValue("{}");
-
- for (ifr = ifc.ifc_req, len = ifc.ifc_len; len > 0; ifr++, len -= sizeof(struct ifreq)) {
- sin = (struct sockaddr_in *) &ifr->ifr_addr;
- PyDict_SetItem(addrs,
- Py_BuildValue("s", ifr->ifr_name),
- Py_BuildValue("s", inet_ntoa(sin->sin_addr)));
- }
-
- if (ifc.ifc_req)
- free(ifc.ifc_req);
-
- return addrs;
-}
-
-static PyObject *
-gifaddr(PyObject *self, PyObject *args)
-{
- const char *name;
- struct ifreq ifr;
- int s;
- struct sockaddr_in *sin;
-
- if (!PyArg_ParseTuple(args, "s", &name))
- return NULL;
-
- memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, name, IFNAMSIZ);
-
- if ((s = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
- return PyErr_SetFromErrno(PyExc_OSError);
-
- if (ioctl(s, SIOCGIFADDR, &ifr) < 0) {
- close(s);
- return PyErr_SetFromErrno(PyExc_OSError);
- }
-
- close(s);
-
- sin = (struct sockaddr_in *) &ifr.ifr_addr;
- return Py_BuildValue("s", inet_ntoa(sin->sin_addr));
-}
-
-static PyObject *
-gifhwaddr(PyObject *self, PyObject *args)
-{
- const char *name;
- struct ifreq ifr;
- int s;
- char mac[sizeof(ifr.ifr_hwaddr.sa_data) * 3], *c;
- int len, i;
-
- if (!PyArg_ParseTuple(args, "s", &name))
- return NULL;
-
- memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, name, IFNAMSIZ);
-
- if ((s = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
- return PyErr_SetFromErrno(PyExc_OSError);
-
- if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0) {
- close(s);
- return PyErr_SetFromErrno(PyExc_OSError);
- }
-
- close(s);
-
- switch (ifr.ifr_hwaddr.sa_family) {
- case ARPHRD_ETHER:
- len = ETH_ALEN;
- break;
- default:
- len = sizeof(ifr.ifr_hwaddr.sa_data);
- break;
- }
-
- for (i = 0, c = mac; i < len; i++) {
- if (i)
- c += sprintf(c, ":");
- c += sprintf(c, "%02X", (unsigned char)(ifr.ifr_hwaddr.sa_data[i] & 0xFF));
- }
-
- return Py_BuildValue("s", mac);
-}
-
-static PyMethodDef methods[] = {
- { "gifconf", gifconf, METH_VARARGS, "Get all interface addresses" },
- { "gifaddr", gifaddr, METH_VARARGS, "Get interface address" },
- { "gifhwaddr", gifhwaddr, METH_VARARGS, "Get interface hardware address" },
- { NULL, NULL, 0, NULL }
-};
-
-PyMODINIT_FUNC
-initsioc(void)
-{
- Py_InitModule("sioc", methods);
-}
--- /dev/null
+# $Id$
+# vim:set ts=4 sw=4 expandtab:
+# (c) Copyright 2008 The Trustees of Princeton University
+
+import os
+import socket
+import fcntl
+import struct
+
+SIOCGIFADDR = 0x8915
+SIOCGIFADDR_struct = "16xH2xI8x"
+SIOCGIFHWADDR = 0x8927
+SIOCGIFHWADDR_struct = "16x2x6B8x"
+
+def _format_ip(nip):
+ ip = socket.ntohl(nip)
+ return "%d.%d.%d.%d" % ((ip & 0xff000000) >> 24,
+ (ip & 0x00ff0000) >> 16,
+ (ip & 0x0000ff00) >> 8,
+ (ip & 0x000000ff))
+
+def gifaddr(interface):
+ s = None
+ try:
+ s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
+ ifreq = fcntl.ioctl(s.fileno(), SIOCGIFADDR, struct.pack("16s16x", interface))
+ (family, ip) = struct.unpack(SIOCGIFADDR_struct, ifreq)
+ if family == socket.AF_INET:
+ return _format_ip(ip)
+ finally:
+ if s is not None:
+ s.close()
+ return None
+
+def gifconf():
+ interfaces = os.listdir("/sys/class/net")
+ s = None
+ ret = {}
+ try:
+ s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
+ for interface in interfaces:
+ try:
+ ifreq = fcntl.ioctl(s.fileno(), SIOCGIFADDR,
+ struct.pack("16sH14x", interface, socket.AF_INET))
+ (family, ip) = struct.unpack(SIOCGIFADDR_struct, ifreq)
+ if family == socket.AF_INET:
+ ret[interface] = _format_ip(ip)
+ else:
+ raise Exception
+ except:
+ ret[interface] = "0.0.0.0"
+ finally:
+ if s is not None:
+ s.close()
+ return ret
+
+def gifhwaddr(interface):
+ s = None
+ try:
+ s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
+ ifreq = fcntl.ioctl(s.fileno(), SIOCGIFHWADDR, struct.pack("16s16x", interface))
+ mac = struct.unpack(SIOCGIFHWADDR_struct, ifreq)
+ return "%02x:%02x:%02x:%02x:%02x:%02x" % mac
+ finally:
+ s.close()
+ return None
git://git.onelab.eu / pyplnet.git / commitdiff