diff options
| author | Robert Pluim | 2019-11-15 11:11:30 +0100 |
|---|---|---|
| committer | Robert Pluim | 2019-11-26 08:46:13 +0100 |
| commit | 650a514e996287106f9a9525b6f27068ec2a0cbf (patch) | |
| tree | 188170aae76f32d894d8df1baa7f435fbfe99d88 /src/process.h | |
| parent | 5c3d0cf7910afa6b3fbdba24ac5c5817f268eb0e (diff) | |
| download | emacs-650a514e996287106f9a9525b6f27068ec2a0cbf.tar.gz emacs-650a514e996287106f9a9525b6f27068ec2a0cbf.zip | |
Extend network-interface-list to return IPv6 and network info
Bug#38218
* src/process.c (Fnetwork_interface_list): Extend argument list to
allow requesting full network info and/or IPv4/IPv6 info.
(network_interface_list) [HAVE_GETIFADDRS]: Use getifaddrs to retrieve
interface IP addresses.
* src/process.h: Update prototype of network_interface_list.
* src/w32.c (g_b_init_get_adapters_addresses): New init flag.
(globals_of_w32): Initialize it.
(GetAdaptersAddresses_Proc): New function typedef.
(get_adapters_addresses): New wrapper function.
(init_winsock): Load htonl and ntohl.
(sys_htonl, sys_ntohl): New wrapper functions.
(network_interface_list): Implement in terms of
get_adapters_addresses.
* nt/inc/sys/socket.h: Add sys_htonl and sys_ntohl prototypes.
* etc/NEWS: Announce IPv4/IPv6 changes in network-interface-list.
* doc/lispref/processes.texi (Misc Network): Document updated arglist
and return values for network-interface-list.
Diffstat (limited to 'src/process.h')
| -rw-r--r-- | src/process.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.h b/src/process.h index 5e957c4298e..bf15317eb4f 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -291,7 +291,7 @@ extern void catch_child_signal (void); | |||
| 291 | extern void restore_nofile_limit (void); | 291 | extern void restore_nofile_limit (void); |
| 292 | 292 | ||
| 293 | #ifdef WINDOWSNT | 293 | #ifdef WINDOWSNT |
| 294 | extern Lisp_Object network_interface_list (void); | 294 | extern Lisp_Object network_interface_list (bool full, unsigned short match); |
| 295 | extern Lisp_Object network_interface_info (Lisp_Object); | 295 | extern Lisp_Object network_interface_info (Lisp_Object); |
| 296 | #endif | 296 | #endif |
| 297 | 297 | ||