procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Teach net-utils more iproute2 and nl80211 tools

Browse source 
* lisp/net/net-utils.el (iwconfig-program): Add iw(8).
(iwconfig-program-options): Add "dev" argument for iw.  Another useful
option is "phy"; beyond that one needs to know the interface name.
(netstat-program): Add ss(8).
(route-program): Add ip(8).
(route-program-options): Add "route" argument for ip.
This commit is contained in:
Mark Oteiza 2016-06-25 10:31:04 -04:00
parent 852507f147
commit d6930356ca
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lisp/net/net-utils.el
View file

@ -112,22 +112,31 @@ These options can be used to limit how many ICMP packets are emitted."
:group 'net-utils
:type '(repeat string))
(defcustom iwconfig-program "iwconfig"
(defcustom iwconfig-program
(cond ((executable-find "iwconfig") "iwconfig")
((net-utils--executable-find-sbin "iw") "iw")
(t "iw"))
"Program to print wireless network configuration information."
:group 'net-utils
:type 'string
:version "23.1")
:version "25.2")
(defcustom iwconfig-program-options nil
(defcustom iwconfig-program-options
(cond ((string-match-p "iw\\'" iwconfig-program) (list "dev"))
(t nil))
"Options for the iwconfig program."
:group 'net-utils
:type '(repeat string)
:version "23.1")
:version "25.2")
(defcustom netstat-program "netstat"
(defcustom netstat-program
(cond ((executable-find "netstat") "netstat")
((net-utils--executable-find-sbin "ss"))
(t "ss"))
"Program to print network statistics."
:group 'net-utils
:type 'string)
:type 'string
:version "25.2")
(defcustom netstat-program-options
(list "-a")
@ -147,20 +156,25 @@ These options can be used to limit how many ICMP packets are emitted."
:type '(repeat string))
(defcustom route-program
(if (eq system-type 'windows-nt)
"route"
"netstat")
(cond ((eq system-type 'windows-nt) "route")
((executable-find "netstat") "netstat")
((net-utils--executable-find-sbin "netstat"))
((executable-find "ip") "ip")
((net-utils--executable-find-sbin "ip"))
(t "ip"))
"Program to print routing tables."
:group 'net-utils
:type 'string)
:type 'string
:version "25.2")
(defcustom route-program-options
(if (eq system-type 'windows-nt)
(list "print")
(list "-r"))
(cond ((eq system-type 'windows-nt) (list "print"))
((string-match-p "netstat\\'" route-program) (list "-r"))
(t (list "route")))
"Options for the route program."
:group 'net-utils
:type '(repeat string))
:type '(repeat string)
:version "25.2")
(defcustom nslookup-program "nslookup"
"Program to interactively query DNS information."