]>
Commit | Line | Data |
---|---|---|
1031bcee ML |
1 | diff -Naur a/doc/arpd.sgml b/doc/arpd.sgml |
2 | --- a/doc/arpd.sgml | |
3 | +++ b/doc/arpd.sgml | |
4 | @@ -1,130 +0,0 @@ | |
5 | -<!doctype linuxdoc system> | |
6 | - | |
7 | -<article> | |
8 | - | |
9 | -<title>ARPD Daemon | |
10 | -<author>Alexey Kuznetsov, <tt/kuznet@ms2.inr.ac.ru/ | |
11 | -<date>some_negative_number, 20 Sep 2001 | |
12 | -<abstract> | |
13 | -<tt/arpd/ is daemon collecting gratuitous ARP information, saving | |
14 | -it on local disk and feeding it to kernel on demand to avoid | |
15 | -redundant broadcasting due to limited size of kernel ARP cache. | |
16 | -</abstract> | |
17 | - | |
18 | - | |
19 | -<p><bf/Description/ | |
20 | - | |
21 | -<p>The format of the command is: | |
22 | - | |
23 | -<tscreen><verb> | |
24 | - arpd OPTIONS [ INTERFACE [ INTERFACE ... ] ] | |
25 | -</verb></tscreen> | |
26 | - | |
27 | -<p> <tt/OPTIONS/ are: | |
28 | - | |
29 | -<itemize> | |
30 | - | |
31 | -<item><tt/-l/ - dump <tt/arpd/ database to stdout and exit. Output consists | |
32 | -of three columns: interface index, IP address and MAC address. | |
33 | -Negative entries for dead hosts are also shown, in this case MAC address | |
34 | -is replaced by word <tt/FAILED/ followed by colon and time when the fact | |
35 | -that host is dead was proven the last time. | |
36 | - | |
37 | -<item><tt/-f FILE/ - read and load <tt/arpd/ database from <tt/FILE/ | |
38 | -in text format similar dumped by option <tt/-l/. Exit after load, | |
39 | -probably listing resulting database, if option <tt/-l/ is also given. | |
40 | -If <tt/FILE/ is <tt/-/, <tt/stdin/ is read to get ARP table. | |
41 | - | |
42 | -<item><tt/-b DATABASE/ - location of database file. Default location is | |
43 | -<tt>/var/lib/arpd/arpd.db</tt>. | |
44 | - | |
45 | -<item><tt/-a NUMBER/ - <tt/arpd/ not only passively listens ARP on wire, but | |
46 | -also send brodcast queries itself. <tt/NUMBER/ is number of such queries | |
47 | -to make before destination is considered as dead. When <tt/arpd/ is started | |
48 | -as kernel helper (i.e. with <tt/app_solicit/ enabled in <tt/sysctl/ | |
49 | -or even with option <tt/-k/) without this option and still did not learn enough | |
50 | -information, you can observe 1 second gaps in service. Not fatal, but | |
51 | -not good. | |
52 | - | |
53 | -<item><tt/-k/ - suppress sending broadcast queries by kernel. It takes | |
54 | -sense together with option <tt/-a/. | |
55 | - | |
56 | -<item><tt/-n TIME/ - timeout of negative cache. When resolution fails <tt/arpd/ | |
57 | -suppresses further attempts to resolve for this period. It makes sense | |
58 | -only together with option <tt/-k/. This timeout should not be too much | |
59 | -longer than boot time of a typical host not supporting gratuitous ARP. | |
60 | -Default value is 60 seconds. | |
61 | - | |
62 | -<item><tt/-R RATE/ - maximal steady rate of broadcasts sent by <tt/arpd/ | |
63 | -in packets per second. Default value is 1. | |
64 | - | |
65 | -<item><tt/-B NUMBER/ - number of broadcasts sent by <tt/arpd/ back to back. | |
66 | -Default value is 3. Together with option <tt/-R/ this option allows | |
67 | -to police broadcasting not to exceed <tt/B+R*T/ over any interval | |
68 | -of time <tt/T/. | |
69 | - | |
70 | -</itemize> | |
71 | - | |
72 | -<p><tt/INTERFACE/ is name of networking inteface to watch. | |
73 | -If no interfaces given, <tt/arpd/ monitors all the interfaces. | |
74 | -In this case <tt/arpd/ does not adjust <tt/sysctl/ parameters, | |
75 | -it is supposed user does this himself after <tt/arpd/ is started. | |
76 | - | |
77 | - | |
78 | -<p> Signals | |
79 | - | |
80 | -<p> <tt/arpd/ exits gracefully syncing database and restoring adjusted | |
81 | -<tt/sysctl/ parameters, when receives <tt/SIGINT/ or <tt/SIGTERM/. | |
82 | -<tt/SIGHUP/ syncs database to disk. <tt/SIGUSR1/ sends some statistics | |
83 | -to <tt/syslog/. Effect of another signals is undefined, they may corrupt | |
84 | -database and leave <tt/sysctl/ parameters in an unpredictable state. | |
85 | - | |
86 | -<p> Note | |
87 | - | |
88 | -<p> In order to <tt/arpd/ be able to serve as ARP resolver, kernel must be | |
89 | -compiled with the option <tt/CONFIG_ARPD/ and, in the case when interface list | |
90 | -is not given on command line, variable <tt/app_solicit/ | |
91 | -on interfaces of interest should be set in <tt>/proc/sys/net/ipv4/neigh/*</tt>. | |
92 | -If this is not made <tt/arpd/ still collects gratuitous ARP information | |
93 | -in its database. | |
94 | - | |
95 | -<p> Examples | |
96 | - | |
97 | -<enum> | |
98 | -<item> Start <tt/arpd/ to collect gratuitous ARP, but not messing | |
99 | -with kernel functionality: | |
100 | - | |
101 | -<tscreen><verb> | |
102 | - arpd -b /var/tmp/arpd.db | |
103 | -</verb></tscreen> | |
104 | - | |
105 | -<item> Look at result after some time: | |
106 | - | |
107 | -<tscreen><verb> | |
108 | - killall arpd | |
109 | - arpd -l -b /var/tmp/arpd.db | |
110 | -</verb></tscreen> | |
111 | - | |
112 | -<item> To enable kernel helper, leaving leading role to kernel: | |
113 | - | |
114 | -<tscreen><verb> | |
115 | - arpd -b /var/tmp/arpd.db -a 1 eth0 eth1 | |
116 | -</verb></tscreen> | |
117 | - | |
118 | -<item> Completely replace kernel resolution on interfaces <tt/eth0/ | |
119 | -and <tt/eth1/. In this case kernel still does unicast probing to | |
120 | -validate entries, but all the broadcast activity is suppressed | |
121 | -and made under authority of <tt/arpd/: | |
122 | - | |
123 | -<tscreen><verb> | |
124 | - arpd -b /var/tmp/arpd.db -a 3 -k eth0 eth1 | |
125 | -</verb></tscreen> | |
126 | - | |
127 | -This is mode which <tt/arpd/ is supposed to work normally. | |
128 | -It is not default just to prevent occasional enabling of too aggressive | |
129 | -mode occasionally. | |
130 | - | |
131 | -</enum> | |
132 | - | |
133 | -</article> | |
134 | - | |
135 | diff -Naur a/Makefile b/Makefile | |
136 | --- a/Makefile | |
137 | +++ b/Makefile | |
138 | @@ -9,7 +9,6 @@ | |
139 | DATADIR?=$(PREFIX)/share | |
140 | DOCDIR?=$(DATADIR)/doc/iproute2 | |
141 | MANDIR?=$(DATADIR)/man | |
142 | -ARPDDIR?=/var/lib/arpd | |
143 | KERNEL_INCLUDE?=/usr/include | |
144 | BASH_COMPDIR?=$(DATADIR)/bash-completion/completions | |
145 | ||
146 | @@ -62,7 +61,6 @@ | |
147 | install: all | |
148 | install -m 0755 -d $(DESTDIR)$(SBINDIR) | |
149 | install -m 0755 -d $(DESTDIR)$(CONFDIR) | |
150 | - install -m 0755 -d $(DESTDIR)$(ARPDDIR) | |
151 | install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples | |
152 | install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv | |
153 | install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \ | |
154 | diff -Naur a/man/man8/Makefile b/man/man8/Makefile | |
155 | --- a/man/man8/Makefile | |
156 | +++ b/man/man8/Makefile | |
157 | @@ -1,6 +1,6 @@ | |
158 | TARGETS = ip-address.8 ip-link.8 ip-route.8 | |
159 | ||
160 | -MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnstat.8 routel.8 rtacct.8 rtmon.8 rtpr.8 ss.8 \ | |
161 | +MAN8PAGES = $(TARGETS) ip.8 lnstat.8 routel.8 rtacct.8 rtmon.8 rtpr.8 ss.8 \ | |
162 | tc.8 tc-bfifo.8 tc-bpf.8 tc-cbq.8 tc-cbq-details.8 tc-choke.8 tc-codel.8 \ | |
163 | tc-fq.8 \ | |
164 | tc-drr.8 tc-ematch.8 tc-fq_codel.8 tc-hfsc.8 tc-htb.8 tc-pie.8 \ | |
165 | diff -Naur a/tc/Makefile b/tc/Makefile | |
166 | --- a/tc/Makefile | |
167 | +++ b/tc/Makefile | |
168 | @@ -89,7 +89,7 @@ | |
169 | CFLAGS += -DTC_CONFIG_XT_H | |
170 | TCSO += m_xt_old.so | |
171 | else | |
172 | - TCMODULES += m_ipt.o | |
173 | + TCMODULES += | |
174 | endif | |
175 | endif | |
176 | endif |