X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserverimpl.c;h=17d1482a36672451d93471de0c7059dbc48e3acc;hb=df6666ed5ab57b500cdd0a0f3ef610025fa10b4f;hp=5e4d491cd80e76963495070a8349a7bb9c5ea828;hpb=52a498200c211e6329d5d8a15f1a6942a286952d;p=util-vserver.git diff --git a/python/vserverimpl.c b/python/vserverimpl.c index 5e4d491..17d1482 100644 --- a/python/vserverimpl.c +++ b/python/vserverimpl.c @@ -39,6 +39,10 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include +#include +#include +#include #include "config.h" #include "pathconfig.h" @@ -267,8 +271,16 @@ vserver_unset_dlimit(PyObject *self, PyObject *args) static PyObject * vserver_killall(PyObject *self, PyObject *args) { - xid_t ctx; - int sig; + xid_t ctx; + int sig; + struct vc_ctx_flags cflags = { + .flagword = 0, + .mask = VC_VXF_PERSISTENT + }; + struct vc_net_flags nflags = { + .flagword = 0, + .mask = VC_NXF_PERSISTENT + }; if (!PyArg_ParseTuple(args, "Ii", &ctx, &sig)) return NULL; @@ -276,6 +288,12 @@ vserver_killall(PyObject *self, PyObject *args) if (vc_ctx_kill(ctx, 0, sig) && errno != ESRCH) return PyErr_SetFromErrno(PyExc_OSError); + if (vc_set_cflags(ctx, &cflags) && errno != ESRCH) + return PyErr_SetFromErrno(PyExc_OSError); + + if (vc_set_nflags(ctx, &nflags) && errno != ESRCH) + return PyErr_SetFromErrno(PyExc_OSError); + return NONE; } @@ -307,8 +325,7 @@ vserver_text2bcaps(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "s#", &list, &len)) return NULL; - if (vc_list2bcap(list, len, &err, &caps) == -1) - return NULL; + vc_list2bcap(list, len, &err, &caps); return Py_BuildValue("K", caps.bcaps); } @@ -355,6 +372,144 @@ vserver_bcaps2text(PyObject *self, PyObject *args) return list; } +static const struct AF_to_vcNET { + int af; + vc_net_nx_type vc_net; + size_t len; + size_t offset; +} converter[] = { + { AF_INET, vcNET_IPV4, sizeof(struct in_addr), offsetof(struct sockaddr_in, sin_addr.s_addr) }, + { AF_INET6, vcNET_IPV6, sizeof(struct in6_addr), offsetof(struct sockaddr_in6, sin6_addr.s6_addr) }, + { 0, 0 } +}; + +static inline int +convert_address(const char *str, vc_net_nx_type *type, void *dst) +{ + const struct AF_to_vcNET *i; + for (i = converter; i->af; i++) { + if (inet_pton(i->af, str, dst)) { + *type = i->vc_net; + return 0; + } + } + return -1; +} + +static int +get_mask(struct vc_net_nx *addr) +{ + const struct AF_to_vcNET *i; + struct ifaddrs *head, *ifa; + int ret = 0; + + for (i = converter; i->af; i++) { + if (i->vc_net == addr->type) + break; + } + if (!i) { + errno = EINVAL; + return -1; + } + + if (getifaddrs(&head) == -1) + return -1; + for (ifa = head; ifa; ifa = ifa->ifa_next) { + if (ifa->ifa_addr->sa_family == i->af && + memcmp((char *) ifa->ifa_addr + i->offset, addr->ip, i->len) == 0) { + switch (addr->type) { + case vcNET_IPV4: + memcpy(&addr->mask[0], ifa->ifa_netmask + i->offset, i->len); + break; + case vcNET_IPV6: { + uint32_t *m = ((struct sockaddr_in6 *) ifa->ifa_netmask)->sin6_addr.s6_addr32; + /* optimization for the common case */ + if ((m[1] & 1) == 1 && (m[2] & 0x80000000) == 0) + addr->mask[0] = 64; + else { + addr->mask[0] = 0; + while (m[addr->mask[0] / 32] & (addr->mask[0] % 32)) + addr->mask[0]++; + } + break; + } + ret = 1; + break; + } + } + /* no match, use a default */ + if (!ret) { + switch (addr->type) { + case vcNET_IPV4: addr->mask[0] = htonl(0xffffff00); break; + case vcNET_IPV6: addr->mask[0] = 64; break; + default: addr->mask[0] = 0; break; + } + } + freeifaddrs(head); + return ret; +} + +/* XXX These two functions are really similar */ +static PyObject * +vserver_net_add(PyObject *self, PyObject *args) +{ + struct vc_net_nx addr; + nid_t nid; + const char *ip; + + if (!PyArg_ParseTuple(args, "Is", &nid, &ip)) + return NULL; + + if (convert_address(ip, &addr.type, &addr.ip) == -1) + return PyErr_Format(PyExc_ValueError, "%s is not a valid IP address", ip); + + switch (get_mask(&addr)) { + case -1: + return PyErr_SetFromErrno(PyExc_OSError); + case 0: + /* XXX error here? */ + break; + } + addr.count = 1; + + if (vc_net_add(nid, &addr) == -1 && errno != ESRCH) + return PyErr_SetFromErrno(PyExc_OSError); + + return NONE; +} + +static PyObject * +vserver_net_remove(PyObject *self, PyObject *args) +{ + struct vc_net_nx addr; + nid_t nid; + const char *ip; + + if (!PyArg_ParseTuple(args, "Is", &nid, &ip)) + return NULL; + + if (strcmp(ip, "all") == 0) + addr.type = vcNET_ANY; + else if (strcmp(ip, "all4") == 0) + addr.type = vcNET_IPV4A; + else if (strcmp(ip, "all6") == 0) + addr.type = vcNET_IPV6A; + else + if (convert_address(ip, &addr.type, &addr.ip) == -1) + return PyErr_Format(PyExc_ValueError, "%s is not a valid IP address", ip); + + switch (get_mask(&addr)) { + case -1: + return PyErr_SetFromErrno(PyExc_OSError); + } + addr.count = 1; + + if (vc_net_remove(nid, &addr) == -1 && errno != ESRCH) + return PyErr_SetFromErrno(PyExc_OSError); + + return NONE; +} + static PyMethodDef methods[] = { { "chcontext", vserver_chcontext, METH_VARARGS, "chcontext to vserver with provided flags" }, @@ -384,6 +539,10 @@ static PyMethodDef methods[] = { "Translate a string of capabilities to a bitmap" }, { "bcaps2text", vserver_bcaps2text, METH_VARARGS, "Translate a capability-bitmap into a string" }, + { "netadd", vserver_net_add, METH_VARARGS, + "Assign an IP address to a context" }, + { "netremove", vserver_net_remove, METH_VARARGS, + "Remove IP address(es) from a context" }, { NULL, NULL, 0, NULL } };