aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-08-27 10:42:52 -0700
committerRoland McGrath <roland@hack.frob.com>2013-08-27 10:42:52 -0700
commit5d1f0a09f3634b29d9cbbd7c7337d546502363cb (patch)
tree4b5a365a903adfad0f1df3d7064998cd71ccb477
parent6fcf28b352c435ee3d1a975619c5ae31923c44eb (diff)
downloadglibc-5d1f0a09f3634b29d9cbbd7c7337d546502363cb.tar
glibc-5d1f0a09f3634b29d9cbbd7c7337d546502363cb.tar.gz
glibc-5d1f0a09f3634b29d9cbbd7c7337d546502363cb.tar.bz2
glibc-5d1f0a09f3634b29d9cbbd7c7337d546502363cb.zip
True stub __ifreq.
-rw-r--r--ChangeLog4
-rw-r--r--inet/ifreq.c61
-rw-r--r--sysdeps/unix/ifreq.c79
3 files changed, 87 insertions, 57 deletions
diff --git a/ChangeLog b/ChangeLog
index 91f99b6858..4c31935f6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-08-27 Roland McGrath <roland@hack.frob.com>
+ * inet/ifreq.c: Moved to ...
+ * sysdeps/unix/ifreq.c: ... here.
+ * inet/ifreq.c: New file, true stub version.
+
* socket/sa_len.c: New file.
* socket/Makefile (aux): Add it.
* sysdeps/unix/sysv/linux/Makefile
diff --git a/inet/ifreq.c b/inet/ifreq.c
index 2db6d0c300..d94d339c67 100644
--- a/inet/ifreq.c
+++ b/inet/ifreq.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
+/* Collect network interface list. Stub version.
+ Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Andreas Jaeger <aj@suse.de>.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -18,62 +18,9 @@
#include "ifreq.h"
-
void
__ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
{
- int fd = sockfd;
- struct ifconf ifc;
- int rq_len;
- int nifs;
-# define RQ_IFS 4
-
- if (fd < 0)
- fd = __opensock ();
- if (fd < 0)
- {
- *num_ifs = 0;
- *ifreqs = NULL;
- return;
- }
-
- ifc.ifc_buf = NULL;
- rq_len = RQ_IFS * sizeof (struct ifreq) / 2; /* Doubled in the loop. */
- do
- {
- ifc.ifc_len = rq_len *= 2;
- void *newp = realloc (ifc.ifc_buf, ifc.ifc_len);
- if (newp == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0)
- {
- free (ifc.ifc_buf);
-
- if (fd != sockfd)
- __close (fd);
- *num_ifs = 0;
- *ifreqs = NULL;
- return;
- }
- ifc.ifc_buf = newp;
- }
- while (rq_len < sizeof (struct ifreq) + ifc.ifc_len);
-
- if (fd != sockfd)
- __close (fd);
-
-#ifdef _HAVE_SA_LEN
- struct ifreq *ifr = *ifreqs;
- nifs = 0;
- while ((char *) ifr < ifc.ifc_buf + ifc.ifc_len)
- {
- ++nifs;
- ifr = __if_nextreq (ifr);
- if (ifr == NULL)
- break;
- }
-#else
- nifs = ifc.ifc_len / sizeof (struct ifreq);
-#endif
-
- *num_ifs = nifs;
- *ifreqs = realloc (ifc.ifc_buf, nifs * sizeof (struct ifreq));
+ *num_ifs = 0;
+ *ifreqs = NULL;
}
diff --git a/sysdeps/unix/ifreq.c b/sysdeps/unix/ifreq.c
new file mode 100644
index 0000000000..2db6d0c300
--- /dev/null
+++ b/sysdeps/unix/ifreq.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Andreas Jaeger <aj@suse.de>.
+
+ The GNU C 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.1 of the License, or (at your option) any later version.
+
+ The GNU C 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 the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include "ifreq.h"
+
+
+void
+__ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
+{
+ int fd = sockfd;
+ struct ifconf ifc;
+ int rq_len;
+ int nifs;
+# define RQ_IFS 4
+
+ if (fd < 0)
+ fd = __opensock ();
+ if (fd < 0)
+ {
+ *num_ifs = 0;
+ *ifreqs = NULL;
+ return;
+ }
+
+ ifc.ifc_buf = NULL;
+ rq_len = RQ_IFS * sizeof (struct ifreq) / 2; /* Doubled in the loop. */
+ do
+ {
+ ifc.ifc_len = rq_len *= 2;
+ void *newp = realloc (ifc.ifc_buf, ifc.ifc_len);
+ if (newp == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0)
+ {
+ free (ifc.ifc_buf);
+
+ if (fd != sockfd)
+ __close (fd);
+ *num_ifs = 0;
+ *ifreqs = NULL;
+ return;
+ }
+ ifc.ifc_buf = newp;
+ }
+ while (rq_len < sizeof (struct ifreq) + ifc.ifc_len);
+
+ if (fd != sockfd)
+ __close (fd);
+
+#ifdef _HAVE_SA_LEN
+ struct ifreq *ifr = *ifreqs;
+ nifs = 0;
+ while ((char *) ifr < ifc.ifc_buf + ifc.ifc_len)
+ {
+ ++nifs;
+ ifr = __if_nextreq (ifr);
+ if (ifr == NULL)
+ break;
+ }
+#else
+ nifs = ifc.ifc_len / sizeof (struct ifreq);
+#endif
+
+ *num_ifs = nifs;
+ *ifreqs = realloc (ifc.ifc_buf, nifs * sizeof (struct ifreq));
+}