diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-07-25 11:46:31 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-07-25 14:43:44 +0200 |
commit | b89e74054ee54b3afc8aed99fe9be89e8e05890b (patch) | |
tree | 427fde8fcd8fde2012ceb5a656d34a993c09d8c4 /guix/build | |
parent | 53de532f287d49627e4fcaaa3991a6e87810a98a (diff) | |
download | gnu-guix-b89e74054ee54b3afc8aed99fe9be89e8e05890b.tar gnu-guix-b89e74054ee54b3afc8aed99fe9be89e8e05890b.tar.gz |
syscalls: Rename 'network-interfaces' and 'all-network-interfaces'.
* guix/build/syscalls.scm (network-interfaces): Rename to...
(network-interface-names): ... this.
(all-network-interfaces): Rename to...
(all-network-interface-names): ... this.
* gnu/services/networking.scm (dhcp-client-service): Adjust accordingly.
* tests/syscalls.scm ("all-network-interfaces"): Rename to...
("all-network-interface-names"): ... this, and adjust accordingly.
("network-interfaces"): Rename to...
("network-interface-names"): ... this, and adjust accordingly.
Diffstat (limited to 'guix/build')
-rw-r--r-- | guix/build/syscalls.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index b7c0f7e745..ae5b2ed112 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -60,8 +60,8 @@ IFF_UP IFF_BROADCAST IFF_LOOPBACK - all-network-interfaces - network-interfaces + all-network-interface-names + network-interface-names network-interface-flags loopback-network-interface? network-interface-address @@ -533,8 +533,8 @@ most LEN bytes from BV." (take-while (negate zero?) bytes))) result)))))) -(define* (network-interfaces #:optional sock) - "Return the list of existing network interfaces. This is typically limited +(define* (network-interface-names #:optional sock) + "Return the names of existing network interfaces. This is typically limited to interfaces that are currently up." (let* ((close? (not sock)) (sock (or sock (socket SOCK_STREAM AF_INET 0))) @@ -559,9 +559,9 @@ to interfaces that are currently up." ;; Regexp matching an interface line in Linux's /proc/net/dev. (make-regexp "^[[:blank:]]*([[:alnum:]]+):.*$")) -(define (all-network-interfaces) - "Return all the registered network interfaces, including those that are not -up." +(define (all-network-interface-names) + "Return all the names of the registered network interfaces, including those +that are not up." (call-with-input-file "/proc/net/dev" ;XXX: Linux-specific (lambda (port) (let loop ((interfaces '())) |