|
1 diff -r -u Makefile.in Makefile.in |
|
2 --- Makefile.in |
|
3 +++ Makefile.in |
|
4 @@ -147,6 +147,8 @@ |
|
5 IOCTL_METHOD = @IOCTL_METHOD@ |
|
6 IPFORWARD = @IPFORWARD@ |
|
7 ISISD = @ISISD@ |
|
8 +ISIS_LIBS = @ISIS_LIBS@ |
|
9 +ISIS_TARGETS = @ISIS_TARGETS@ |
|
10 ISIS_TOPOLOGY_DIR = @ISIS_TOPOLOGY_DIR@ |
|
11 ISIS_TOPOLOGY_INCLUDES = @ISIS_TOPOLOGY_INCLUDES@ |
|
12 ISIS_TOPOLOGY_LIB = @ISIS_TOPOLOGY_LIB@ |
|
13 diff -r -u config.h.in config.h.in |
|
14 --- config.h.in |
|
15 +++ config.h.in |
|
16 @@ -512,6 +512,9 @@ |
|
17 /* Define to 1 if you have the <time.h> header file. */ |
|
18 #undef HAVE_TIME_H |
|
19 |
|
20 +/* Enable TRILL support */ |
|
21 +#undef HAVE_TRILL |
|
22 + |
|
23 /* Define to 1 if you have the <ucontext.h> header file. */ |
|
24 #undef HAVE_UCONTEXT_H |
|
25 |
|
26 diff -r -u configure configure |
|
27 --- configure |
|
28 +++ configure |
|
29 @@ -658,6 +658,8 @@ |
|
30 enable_vty_group |
|
31 enable_group |
|
32 enable_user |
|
33 +ISIS_LIBS |
|
34 +ISIS_TARGETS |
|
35 ISIS_TOPOLOGY_LIB |
|
36 ISIS_TOPOLOGY_DIR |
|
37 ISIS_TOPOLOGY_INCLUDES |
|
38 @@ -801,6 +803,7 @@ |
|
39 enable_ospf6d |
|
40 enable_watchquagga |
|
41 enable_isisd |
|
42 +enable_trill |
|
43 enable_solaris |
|
44 enable_bgp_announce |
|
45 enable_netlink |
|
46 @@ -1482,6 +1485,7 @@ |
|
47 --disable-ospf6d do not build ospf6d |
|
48 --disable-watchquagga do not build watchquagga |
|
49 --enable-isisd build isisd |
|
50 + --enable-trill include trill support |
|
51 --enable-solaris build solaris |
|
52 --disable-bgp-announce, turn off BGP route announcement |
|
53 --enable-netlink force to use Linux netlink interface |
|
54 @@ -12125,6 +12129,11 @@ |
|
55 enableval=$enable_isisd; |
|
56 fi |
|
57 |
|
58 +# Check whether --enable-trill was given. |
|
59 +if test "${enable_trill+set}" = set; then : |
|
60 + enableval=$enable_trill; |
|
61 +fi |
|
62 + |
|
63 # Check whether --enable-solaris was given. |
|
64 if test "${enable_solaris+set}" = set; then : |
|
65 enableval=$enable_solaris; |
|
66 @@ -12362,6 +12371,80 @@ |
|
67 |
|
68 |
|
69 |
|
70 +if test "${enable_trill}" = "yes"; then |
|
71 + ac_fn_c_check_header_mongrel "$LINENO" "net/trill.h" "ac_cv_header_net_trill_h" "$ac_includes_default" |
|
72 +if test "x$ac_cv_header_net_trill_h" = xyes; then : |
|
73 + |
|
74 +fi |
|
75 + |
|
76 + |
|
77 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladm_valid_bridgename in -ldladm" >&5 |
|
78 +$as_echo_n "checking for dladm_valid_bridgename in -ldladm... " >&6; } |
|
79 +if ${ac_cv_lib_dladm_dladm_valid_bridgename+:} false; then : |
|
80 + $as_echo_n "(cached) " >&6 |
|
81 +else |
|
82 + ac_check_lib_save_LIBS=$LIBS |
|
83 +LIBS="-ldladm $LIBS" |
|
84 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
85 +/* end confdefs.h. */ |
|
86 + |
|
87 +/* Override any GCC internal prototype to avoid an error. |
|
88 + Use char because int might match the return type of a GCC |
|
89 + builtin and then its argument prototype would still apply. */ |
|
90 +#ifdef __cplusplus |
|
91 +extern "C" |
|
92 +#endif |
|
93 +char dladm_valid_bridgename (); |
|
94 +int |
|
95 +main () |
|
96 +{ |
|
97 +return dladm_valid_bridgename (); |
|
98 + ; |
|
99 + return 0; |
|
100 +} |
|
101 +_ACEOF |
|
102 +if ac_fn_c_try_link "$LINENO"; then : |
|
103 + ac_cv_lib_dladm_dladm_valid_bridgename=yes |
|
104 +else |
|
105 + ac_cv_lib_dladm_dladm_valid_bridgename=no |
|
106 +fi |
|
107 +rm -f core conftest.err conftest.$ac_objext \ |
|
108 + conftest$ac_exeext conftest.$ac_ext |
|
109 +LIBS=$ac_check_lib_save_LIBS |
|
110 +fi |
|
111 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dladm_dladm_valid_bridgename" >&5 |
|
112 +$as_echo "$ac_cv_lib_dladm_dladm_valid_bridgename" >&6; } |
|
113 +if test "x$ac_cv_lib_dladm_dladm_valid_bridgename" = xyes; then : |
|
114 + libdladm=yes |
|
115 +fi |
|
116 + |
|
117 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking TRILL IS-IS support" >&5 |
|
118 +$as_echo_n "checking TRILL IS-IS support... " >&6; } |
|
119 + if test $ac_cv_header_net_trill_h = no || \ |
|
120 + test $ac_cv_lib_dladm_dladm_valid_bridgename = no; then |
|
121 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 |
|
122 +$as_echo "none" >&6; } |
|
123 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TRILL IS-IS support will not be built ***" >&5 |
|
124 +$as_echo "$as_me: WARNING: *** TRILL IS-IS support will not be built ***" >&2;} |
|
125 + enable_trill=no |
|
126 + else |
|
127 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
|
128 +$as_echo "yes" >&6; } |
|
129 + |
|
130 +$as_echo "#define HAVE_TRILL /**/" >>confdefs.h |
|
131 + |
|
132 + fi |
|
133 +fi |
|
134 +if test "${enable_trill}" = "yes"; then |
|
135 + ISIS_TARGETS="isisd trilld" |
|
136 + ISIS_LIBS=-ldladm |
|
137 +else |
|
138 + ISIS_TARGETS="isisd" |
|
139 + ISIS_LIBS= |
|
140 +fi |
|
141 + |
|
142 + |
|
143 + |
|
144 if test "${enable_user}" = "yes" || test x"${enable_user}" = x""; then |
|
145 enable_user="quagga" |
|
146 elif test "${enable_user}" = "no"; then |
|
147 @@ -15985,45 +16068,48 @@ |
|
148 |
|
149 $as_echo "#define ISIS_METHOD_BPF 3" >>confdefs.h |
|
150 |
|
151 -ac_fn_c_check_header_mongrel "$LINENO" "net/bpf.h" "ac_cv_header_net_bpf_h" "$ac_includes_default" |
|
152 +if test "${enable_isisd}" = "yes"; then |
|
153 + ISIS_METHOD_MACRO= |
|
154 + ac_fn_c_check_header_mongrel "$LINENO" "net/bpf.h" "ac_cv_header_net_bpf_h" "$ac_includes_default" |
|
155 if test "x$ac_cv_header_net_bpf_h" = xyes; then : |
|
156 |
|
157 fi |
|
158 |
|
159 |
|
160 -ac_fn_c_check_header_mongrel "$LINENO" "sys/dlpi.h" "ac_cv_header_sys_dlpi_h" "$ac_includes_default" |
|
161 + ac_fn_c_check_header_mongrel "$LINENO" "sys/dlpi.h" "ac_cv_header_sys_dlpi_h" "$ac_includes_default" |
|
162 if test "x$ac_cv_header_sys_dlpi_h" = xyes; then : |
|
163 |
|
164 fi |
|
165 |
|
166 |
|
167 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking zebra IS-IS I/O method" >&5 |
|
168 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking zebra IS-IS I/O method" >&5 |
|
169 $as_echo_n "checking zebra IS-IS I/O method... " >&6; } |
|
170 -if test x"$opsys" = x"gnu-linux"; then |
|
171 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pfpacket" >&5 |
|
172 + if test x"$opsys" = x"gnu-linux"; then |
|
173 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: pfpacket" >&5 |
|
174 $as_echo "pfpacket" >&6; } |
|
175 - ISIS_METHOD_MACRO="ISIS_METHOD_PFPACKET" |
|
176 -elif test x"$opsys" = x"sol2-6" -o x"$opsys" = x"sol8"; then |
|
177 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: DLPI" >&5 |
|
178 + ISIS_METHOD_MACRO="ISIS_METHOD_PFPACKET" |
|
179 + elif test x"$opsys" = x"sol2-6" -o x"$opsys" = x"sol8"; then |
|
180 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: DLPI" >&5 |
|
181 $as_echo "DLPI" >&6; } |
|
182 - ISIS_METHOD_MACRO="ISIS_METHOD_DLPI" |
|
183 -else |
|
184 - if test $ac_cv_header_net_bpf_h = no; then |
|
185 - if test $ac_cv_header_sys_dlpi_h = no; then |
|
186 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 |
|
187 + ISIS_METHOD_MACRO="ISIS_METHOD_DLPI" |
|
188 + else |
|
189 + if test $ac_cv_header_net_bpf_h = no; then |
|
190 + if test $ac_cv_header_sys_dlpi_h = no; then |
|
191 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 |
|
192 $as_echo "none" >&6; } |
|
193 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** IS-IS support will not be built ***" >&5 |
|
194 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** IS-IS support will not be built ***" >&5 |
|
195 $as_echo "$as_me: WARNING: *** IS-IS support will not be built ***" >&2;} |
|
196 - ISISD="" |
|
197 - else |
|
198 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: DLPI" >&5 |
|
199 + ISISD="" |
|
200 + else |
|
201 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: DLPI" >&5 |
|
202 $as_echo "DLPI" >&6; } |
|
203 - fi |
|
204 - ISIS_METHOD_MACRO="ISIS_METHOD_DLPI" |
|
205 - else |
|
206 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: BPF" >&5 |
|
207 + fi |
|
208 + ISIS_METHOD_MACRO="ISIS_METHOD_DLPI" |
|
209 + else |
|
210 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: BPF" >&5 |
|
211 $as_echo "BPF" >&6; } |
|
212 - ISIS_METHOD_MACRO="ISIS_METHOD_BPF" |
|
213 + ISIS_METHOD_MACRO="ISIS_METHOD_BPF" |
|
214 + fi |
|
215 fi |
|
216 fi |
|
217 |
|
218 diff -r -u isisd/Makefile.in isisd/Makefile.in |
|
219 --- isisd/Makefile.in |
|
220 +++ isisd/Makefile.in |
|
221 @@ -38,7 +38,7 @@ |
|
222 build_triplet = @build@ |
|
223 host_triplet = @host@ |
|
224 target_triplet = @target@ |
|
225 -sbin_PROGRAMS = isisd$(EXEEXT) |
|
226 +EXTRA_PROGRAMS = isisd$(EXEEXT) trilld$(EXEEXT) |
|
227 subdir = isisd |
|
228 DIST_COMMON = README $(dist_examples_DATA) $(noinst_HEADERS) \ |
|
229 $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS |
|
230 @@ -75,9 +75,15 @@ |
|
231 isis_events.$(OBJEXT) isis_spf.$(OBJEXT) isis_route.$(OBJEXT) \ |
|
232 isis_routemap.$(OBJEXT) |
|
233 am_isisd_OBJECTS = isis_main.$(OBJEXT) $(am__objects_1) \ |
|
234 - isis_bpf.$(OBJEXT) isis_dlpi.$(OBJEXT) isis_pfpacket.$(OBJEXT) |
|
235 + isis_bpf.$(OBJEXT) isis_dlpi.$(OBJEXT) isis_pfpacket.$(OBJEXT) \ |
|
236 + isis_trilldummy.$(OBJEXT) |
|
237 isisd_OBJECTS = $(am_isisd_OBJECTS) |
|
238 isisd_DEPENDENCIES = ../lib/libzebra.la |
|
239 +am_trilld_OBJECTS = isis_main.$(OBJEXT) $(am__objects_1) \ |
|
240 + isis_trill.$(OBJEXT) isis_trillio.$(OBJEXT) \ |
|
241 + isis_trillvlans.$(OBJEXT) isis_trillbpdu.$(OBJEXT) |
|
242 +trilld_OBJECTS = $(am_trilld_OBJECTS) |
|
243 +trilld_DEPENDENCIES = ../lib/libzebra.la |
|
244 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
|
245 depcomp = $(SHELL) $(top_srcdir)/depcomp |
|
246 am__depfiles_maybe = depfiles |
|
247 @@ -91,8 +97,8 @@ |
|
248 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
|
249 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
|
250 $(LDFLAGS) -o $@ |
|
251 -SOURCES = $(libisis_a_SOURCES) $(isisd_SOURCES) |
|
252 -DIST_SOURCES = $(libisis_a_SOURCES) $(isisd_SOURCES) |
|
253 +SOURCES = $(libisis_a_SOURCES) $(isisd_SOURCES) $(trilld_SOURCES) |
|
254 +DIST_SOURCES = $(libisis_a_SOURCES) $(isisd_SOURCES) $(trilld_SOURCES) |
|
255 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
|
256 html-recursive info-recursive install-data-recursive \ |
|
257 install-dvi-recursive install-exec-recursive \ |
|
258 @@ -201,6 +207,8 @@ |
|
259 IOCTL_METHOD = @IOCTL_METHOD@ |
|
260 IPFORWARD = @IPFORWARD@ |
|
261 ISISD = @ISISD@ |
|
262 +ISIS_LIBS = @ISIS_LIBS@ |
|
263 +ISIS_TARGETS = @ISIS_TARGETS@ |
|
264 ISIS_TOPOLOGY_DIR = @ISIS_TOPOLOGY_DIR@ |
|
265 ISIS_TOPOLOGY_INCLUDES = @ISIS_TOPOLOGY_INCLUDES@ |
|
266 ISIS_TOPOLOGY_LIB = @ISIS_TOPOLOGY_LIB@ |
|
267 @@ -212,7 +220,7 @@ |
|
268 LIBOBJS = @LIBOBJS@ |
|
269 LIBPAM = @LIBPAM@ |
|
270 LIBREADLINE = @LIBREADLINE@ |
|
271 -LIBS = @LIBS@ |
|
272 +LIBS = @LIBS@ @ISIS_LIBS@ |
|
273 LIBTOOL = @LIBTOOL@ |
|
274 LIB_IPV6 = @LIB_IPV6@ |
|
275 LIB_REGEX = @LIB_REGEX@ |
|
276 @@ -327,6 +335,7 @@ |
|
277 AM_CFLAGS = $(PICFLAGS) |
|
278 AM_LDFLAGS = $(PILDFLAGS) |
|
279 noinst_LIBRARIES = libisis.a |
|
280 +sbin_PROGRAMS = @ISIS_TARGETS@ |
|
281 SUBDIRS = topology |
|
282 libisis_a_SOURCES = \ |
|
283 isis_adjacency.c isis_lsp.c dict.c isis_circuit.c isis_pdu.c \ |
|
284 @@ -339,13 +348,22 @@ |
|
285 isis_lsp.h dict.h isis_circuit.h isis_misc.h isis_network.h \ |
|
286 isis_zebra.h isis_dr.h isis_flags.h isis_dynhn.h isis_common.h \ |
|
287 iso_checksum.h isis_csm.h isis_events.h isis_spf.h isis_route.h \ |
|
288 + isis_trill.h \ |
|
289 include-netbsd/clnp.h include-netbsd/esis.h include-netbsd/iso.h |
|
290 |
|
291 isisd_SOURCES = \ |
|
292 isis_main.c $(libisis_a_SOURCES) \ |
|
293 - isis_bpf.c isis_dlpi.c isis_pfpacket.c |
|
294 + isis_bpf.c isis_dlpi.c isis_pfpacket.c isis_trilldummy.c |
|
295 |
|
296 -isisd_LDADD = @ISIS_TOPOLOGY_LIB@ ../lib/libzebra.la @LIBCAP@ |
|
297 +isisd_LDADD = @ISIS_TOPOLOGY_LIB@ ../lib/libzebra.la @LIBCAP@ @LIBM@ |
|
298 +trilld_SOURCES = \ |
|
299 + isis_main.c $(libisis_a_SOURCES) isis_trill.c isis_trillio.c \ |
|
300 + isis_trillvlans.c isis_trillbpdu.c |
|
301 + |
|
302 +trilld_LDADD = @ISIS_TOPOLOGY_LIB@ ../lib/libzebra.la @LIBCAP@ @LIBM@ |
|
303 +EXTRA_DIST = isis_bpf.c isis_dlpi.c isis_pfpacket.c isis_trill.c \ |
|
304 + isis_trillio.c isis_trillvlans.c isis_trillbpdu.c |
|
305 + |
|
306 examplesdir = $(exampledir) |
|
307 dist_examples_DATA = isisd.conf.sample |
|
308 all: all-recursive |
|
309 @@ -435,6 +453,9 @@ |
|
310 isisd$(EXEEXT): $(isisd_OBJECTS) $(isisd_DEPENDENCIES) |
|
311 @rm -f isisd$(EXEEXT) |
|
312 $(LINK) $(isisd_OBJECTS) $(isisd_LDADD) $(LIBS) |
|
313 +trilld$(EXEEXT): $(trilld_OBJECTS) $(trilld_DEPENDENCIES) |
|
314 + @rm -f trilld$(EXEEXT) |
|
315 + $(LINK) $(trilld_OBJECTS) $(trilld_LDADD) $(LIBS) |
|
316 |
|
317 mostlyclean-compile: |
|
318 -rm -f *.$(OBJEXT) |
|
319 @@ -461,6 +482,11 @@ |
|
320 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_routemap.Po@am__quote@ |
|
321 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_spf.Po@am__quote@ |
|
322 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_tlv.Po@am__quote@ |
|
323 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_trill.Po@am__quote@ |
|
324 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_trillbpdu.Po@am__quote@ |
|
325 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_trilldummy.Po@am__quote@ |
|
326 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_trillio.Po@am__quote@ |
|
327 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_trillvlans.Po@am__quote@ |
|
328 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isis_zebra.Po@am__quote@ |
|
329 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isisd.Po@am__quote@ |
|
330 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iso_checksum.Po@am__quote@ |
|
331 diff -r -u solaris/Makefile.in solaris/Makefile.in |
|
332 --- solaris/Makefile.in |
|
333 +++ solaris/Makefile.in |
|
334 @@ -97,6 +97,8 @@ |
|
335 IOCTL_METHOD = @IOCTL_METHOD@ |
|
336 IPFORWARD = @IPFORWARD@ |
|
337 ISISD = @ISISD@ |
|
338 +ISIS_LIBS = @ISIS_LIBS@ |
|
339 +ISIS_TARGETS = @ISIS_TARGETS@ |
|
340 ISIS_TOPOLOGY_DIR = @ISIS_TOPOLOGY_DIR@ |
|
341 ISIS_TOPOLOGY_INCLUDES = @ISIS_TOPOLOGY_INCLUDES@ |
|
342 ISIS_TOPOLOGY_LIB = @ISIS_TOPOLOGY_LIB@ |
|
343 @@ -229,7 +231,7 @@ |
|
344 pkg_packages = $(pkg_names:%=@PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg) |
|
345 pkg_pkginfos = $(pkg_names:%=pkginfo.%.full) |
|
346 pkg_prototypes = $(pkg_names:%=prototype.%) |
|
347 -pkg_manifests = quagga.xml |
|
348 +pkg_manifests = quagga.xml trill.xml |
|
349 |
|
350 # pkgmk variable substitutions wont grok ${variable} in prototype |
|
351 # file, so we cant let autoconf generate the file sadly |