sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

pyglue: don't return 127.0.0.0/8 IPs in interface_ips()

Browse Source 
We don't generally want loopback addresses in the python code
This commit is contained in:
Andrew Tridgell
2010-02-25 16:29:47 +11:00
parent 781ad038c9
commit af70728b51
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source4/scripting/python/pyglue.c
View File

@ -491,6 +491,8 @@ static PyObject *py_dsdb_load_partition_usn(PyObject *self, PyObject *args)
/* /*
return the list of interface IPs we have configured return the list of interface IPs we have configured
takes an loadparm context, returns a list of IPs in string form takes an loadparm context, returns a list of IPs in string form
Does not return addresses on 127.0.0.0/8
*/ */
static PyObject *py_interface_ips(PyObject *self, PyObject *args) static PyObject *py_interface_ips(PyObject *self, PyObject *args)
{ {
@ -500,7 +502,7 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args)
PyObject *py_lp_ctx; PyObject *py_lp_ctx;
struct loadparm_context *lp_ctx; struct loadparm_context *lp_ctx;
struct interface *ifaces; struct interface *ifaces;
int i; int i, ifcount;
if (!PyArg_ParseTuple(args, "O", &py_lp_ctx)) if (!PyArg_ParseTuple(args, "O", &py_lp_ctx))
return NULL; return NULL;
@ -517,10 +519,21 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args)
count = iface_count(ifaces); count = iface_count(ifaces);
pylist = PyList_New(count); /* first count how many are not loopback addresses */
for (i = 0; i<count; i++) { for (ifcount = i = 0; i<count; i++) {
PyList_SetItem(pylist, i, const char *ip = iface_n_ip(ifaces, i);
PyString_FromString(iface_n_ip(ifaces, i))); if (!iface_same_net(ip, "127.0.0.1", "255.0.0.0")) {
ifcount++;
}
}
pylist = PyList_New(ifcount);
for (ifcount = i = 0; i<count; i++) {
const char *ip = iface_n_ip(ifaces, i);
if (!iface_same_net(ip, "127.0.0.1", "255.0.0.0")) {
PyList_SetItem(pylist, ifcount, PyString_FromString(ip));
ifcount++;
}
} }
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
return pylist; return pylist;