forked from Juniper/contrail-third-party
/
bind_patch1.diff
1071 lines (1016 loc) · 32.9 KB
/
bind_patch1.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/third_party/bind-9.9.2-P1/bin/named/client.c b/third_party/bind-9.9.2-P1/bin/named/client.c
index e8654cb..c0e4e0a 100644
--- a/third_party/bind-9.9.2-P1/bin/named/client.c
+++ b/third_party/bind-9.9.2-P1/bin/named/client.c
@@ -1300,6 +1300,35 @@ allowed(isc_netaddr_t *addr, dns_name_t *signer, dns_acl_t *acl) {
return (ISC_FALSE);
}
+#ifdef CONTRAIL_DNS
+
+#define TXT_VIEW_TAG "view="
+#define TXT_VIEW_TAG_LEN strlen(TXT_VIEW_TAG)
+#define DEFAULT_VIEW_NAME "_default_view_"
+#define DEFAULT_VIEW_LEN strlen(DEFAULT_VIEW_NAME)
+
+static inline isc_boolean_t
+allowed_view_name(dns_rdata_t *view_rdata, char *name) {
+ if (view_rdata == NULL) {
+ if (strlen(name) == DEFAULT_VIEW_LEN &&
+ memcmp(name, DEFAULT_VIEW_NAME, DEFAULT_VIEW_LEN) == 0)
+ return (ISC_TRUE);
+ else
+ return (ISC_FALSE);
+ }
+
+ unsigned char *data = view_rdata->data;
+ if ((data == NULL) ||
+ (strlen(name) != view_rdata->length - TXT_VIEW_TAG_LEN - 1) ||
+ (memcmp(&data[1], TXT_VIEW_TAG, TXT_VIEW_TAG_LEN) != 0) ||
+ (memcmp(&data[TXT_VIEW_TAG_LEN + 1], name, strlen(name)) != 0))
+ return (ISC_FALSE);
+
+ return (ISC_TRUE);
+}
+
+#endif
+
/*
* Callback to see if a non-recursive query coming from 'srcaddr' to
* 'destaddr', with optional key 'mykey' for class 'rdclass' would be
@@ -1719,6 +1748,17 @@ client_request(isc_task_t *task, isc_event_t *event) {
if (client->message->rdclass == view->rdclass ||
client->message->rdclass == dns_rdataclass_any)
{
+#ifdef CONTRAIL_DNS
+ /*
+ * If there was a TXT record in the request, match the view
+ * based on the domain provided
+ */
+ if (allowed_view_name(client->message->view_rdata, view->name))
+ {
+ dns_view_attach(view, &client->view);
+ break;
+ }
+#else
dns_name_t *tsig = NULL;
sigresult = dns_message_rechecksig(client->message,
@@ -1735,6 +1775,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
dns_view_attach(view, &client->view);
break;
}
+#endif
}
}
diff --git a/third_party/bind-9.9.2-P1/bin/named/include/named/query.h b/third_party/bind-9.9.2-P1/bin/named/include/named/query.h
index 6dfe96b..7b8f2de 100644
--- a/third_party/bind-9.9.2-P1/bin/named/include/named/query.h
+++ b/third_party/bind-9.9.2-P1/bin/named/include/named/query.h
@@ -32,6 +32,13 @@
#include <named/types.h>
+#ifdef CONTRAIL_DNS
+typedef struct visited_views {
+ dns_view_t *view;
+ ISC_LINK(struct visited_views) link;
+} visited_views_t;
+#endif
+
/*% nameserver database version structure */
typedef struct ns_dbversion {
dns_db_t *db;
@@ -45,6 +52,10 @@ typedef struct ns_dbversion {
struct ns_query {
unsigned int attributes;
unsigned int restarts;
+#ifdef CONTRAIL_DNS
+ unsigned int vdns_restarts; /* count query restarts for next virtual dns server */
+ ISC_LIST(visited_views_t) visited_view_list;
+#endif
isc_boolean_t timerset;
dns_name_t * qname;
dns_name_t * origqname;
diff --git a/third_party/bind-9.9.2-P1/bin/named/query.c b/third_party/bind-9.9.2-P1/bin/named/query.c
index 1b2a815..7ef0c9f 100644
--- a/third_party/bind-9.9.2-P1/bin/named/query.c
+++ b/third_party/bind-9.9.2-P1/bin/named/query.c
@@ -289,6 +289,9 @@ static inline void
query_reset(ns_client_t *client, isc_boolean_t everything) {
isc_buffer_t *dbuf, *dbuf_next;
ns_dbversion_t *dbversion, *dbversion_next;
+#ifdef CONTRAIL_DNS
+ visited_views_t *visited_view, *next_view;
+#endif
/*%
* Reset the query state of a client to its default state.
@@ -355,6 +358,16 @@ query_reset(ns_client_t *client, isc_boolean_t everything) {
NS_QUERYATTR_CACHEOK |
NS_QUERYATTR_SECURE);
client->query.restarts = 0;
+#ifdef CONTRAIL_DNS
+ client->query.vdns_restarts = 0;
+ for (visited_view = ISC_LIST_HEAD(client->query.visited_view_list);
+ visited_view != NULL;
+ visited_view = next_view) {
+ next_view = ISC_LIST_NEXT(visited_view, link);
+ isc_mem_put(client->mctx, visited_view, sizeof(*visited_view));
+ }
+ ISC_LIST_INIT(client->query.visited_view_list);
+#endif
client->query.timerset = ISC_FALSE;
if (client->query.rpz_st != NULL) {
rpz_st_clear(client);
@@ -580,6 +593,10 @@ ns_query_init(ns_client_t *client) {
ISC_LIST_INIT(client->query.activeversions);
ISC_LIST_INIT(client->query.freeversions);
client->query.restarts = 0;
+#ifdef CONTRAIL_DNS
+ client->query.vdns_restarts = 0;
+ ISC_LIST_INIT(client->query.visited_view_list);
+#endif
client->query.timerset = ISC_FALSE;
client->query.rpz_st = NULL;
client->query.qname = NULL;
@@ -608,6 +625,49 @@ ns_query_init(ns_client_t *client) {
return (result);
}
+#ifdef CONTRAIL_DNS
+static inline isc_boolean_t
+is_view_valid(dns_view_t *check_view)
+{
+ dns_view_t *view;
+ for (view = ISC_LIST_HEAD(ns_g_server->viewlist);
+ view != NULL;
+ view = ISC_LIST_NEXT(view, link)) {
+ if (check_view == view)
+ return ISC_TRUE;
+ }
+ return ISC_FALSE;
+}
+
+static inline isc_boolean_t
+is_view_visited(ns_client_t *client, dns_view_t *view)
+{
+ visited_views_t *visited_view;
+ for (visited_view = ISC_LIST_HEAD(client->query.visited_view_list);
+ visited_view != NULL;
+ visited_view = ISC_LIST_NEXT(visited_view, link)) {
+ if (visited_view->view == view)
+ return ISC_TRUE;
+ }
+ return ISC_FALSE;
+}
+
+static inline isc_result_t
+add_view_visited(ns_client_t *client, dns_view_t *view)
+{
+ visited_views_t *visited_view =
+ isc_mem_get(client->mctx, sizeof(*visited_view));
+ if (visited_view == NULL) {
+ return (ISC_R_NOMEMORY);
+ }
+
+ visited_view->view = view;
+ ISC_LIST_INITANDAPPEND(client->query.visited_view_list,
+ visited_view, link);
+ return (ISC_R_SUCCESS);
+}
+#endif
+
static inline ns_dbversion_t *
query_findversion(ns_client_t *client, dns_db_t *db)
{
@@ -5451,6 +5511,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdatasetiter_t *rdsiter;
isc_boolean_t want_restart, authoritative, is_zone, need_wildcardproof;
+#ifdef CONTRAIL_DNS
+ isc_boolean_t want_vdns_restart, static_stub_vdns_zone;
+ isc_result_t db_find_result;
+#endif
isc_boolean_t is_staticstub_zone;
unsigned int n, nlabels;
dns_namereln_t namereln;
@@ -5503,6 +5567,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
resuming = ISC_FALSE;
is_zone = ISC_FALSE;
is_staticstub_zone = ISC_FALSE;
+#ifdef CONTRAIL_DNS
+ static_stub_vdns_zone = ISC_FALSE;
+#endif
dns_clientinfomethods_init(&cm, ns_client_sourceip);
dns_clientinfo_init(&ci, client);
@@ -5513,6 +5580,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
* and resume.
*/
want_restart = ISC_FALSE;
+#ifdef CONTRAIL_DNS
+ want_vdns_restart = ISC_FALSE;
+#endif
rpz_st = client->query.rpz_st;
if (rpz_st != NULL &&
@@ -5612,6 +5682,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
restart:
CTRACE("query_find: restart");
want_restart = ISC_FALSE;
+#ifdef CONTRAIL_DNS
+ want_vdns_restart = ISC_FALSE;
+#endif
authoritative = ISC_FALSE;
version = NULL;
need_wildcardproof = ISC_FALSE;
@@ -5694,13 +5767,37 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
is_staticstub_zone = ISC_FALSE;
if (is_zone) {
+#ifdef CONTRAIL_DNS
+ /*
+ * If zone has a virtual forwarder, attach to the indicated view
+ */
+ dns_view_t *next_virtual_dns = dns_zone_getnextview(zone);
+ if (zone != NULL &&
+ dns_zone_gettype(zone) == dns_zone_staticstub &&
+ next_virtual_dns && is_view_valid(next_virtual_dns) &&
+ !is_view_visited(client, next_virtual_dns)) {
+ dns_view_detach(&client->view);
+ dns_view_attach(next_virtual_dns, &client->view);
+ if (add_view_visited(client, next_virtual_dns) != ISC_R_SUCCESS)
+ goto cleanup;
+ static_stub_vdns_zone = ISC_TRUE;
+ want_vdns_restart = ISC_TRUE;
+ goto cleanup;
+ }
+#endif
authoritative = ISC_TRUE;
if (zone != NULL &&
dns_zone_gettype(zone) == dns_zone_staticstub)
is_staticstub_zone = ISC_TRUE;
}
- if (event == NULL && client->query.restarts == 0) {
+#ifdef CONTRAIL_DNS
+ if (event == NULL && client->query.restarts == 0 &&
+ client->query.vdns_restarts == 0)
+#else
+ if (event == NULL && client->query.restarts == 0)
+#endif
+ {
if (is_zone) {
if (zone != NULL) {
/*
@@ -5744,7 +5841,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
result = dns_db_findext(db, client->query.qname, version, type,
client->query.dboptions, client->now,
&node, fname, &cm, &ci, rdataset, sigrdataset);
-
+#ifdef CONTRAIL_DNS
+ db_find_result = result;
+#endif
resume:
CTRACE("query_find: resume");
@@ -5940,6 +6039,19 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
* recurse anyway.
*/
if (RECURSIONOK(client)) {
+#ifdef CONTRAIL_DNS
+ dns_view_t *next_virtual_dns = client->view->next_virtual_dns;
+ if (next_virtual_dns && is_view_valid(next_virtual_dns) &&
+ !is_view_visited(client, next_virtual_dns)) {
+ dns_view_detach(&client->view);
+ dns_view_attach(next_virtual_dns, &client->view);
+ if (add_view_visited(client, next_virtual_dns) != ISC_R_SUCCESS)
+ goto cleanup;
+ want_vdns_restart = ISC_TRUE;
+ goto cleanup;
+ }
+ static_stub_vdns_zone = ISC_FALSE;
+#endif
result = query_recurse(client, qtype,
client->query.qname,
NULL, NULL, resuming);
@@ -5966,6 +6078,38 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
*/
/* FALLTHROUGH */
case DNS_R_DELEGATION:
+#ifdef CONTRAIL_DNS
+ /*
+ * If it is an NS record, check if it is for a virtual DNS server,
+ * served by the same server. If it is, attach to the new view and
+ * restart query. Otherwise, continue with the normal processing.
+ */
+ if (db_find_result == DNS_R_DELEGATION) {
+ char view_name[DNS_NAME_FORMATSIZE];
+ if (dns_rdataset_first(rdataset) == ISC_R_SUCCESS) {
+ /* Extract the name from the NS record. */
+ dns_rdata_t rdata = DNS_RDATA_INIT;
+ dns_rdata_ns_t ns;
+ dns_rdataset_current(rdataset, &rdata);
+ if (dns_rdata_tostruct(&rdata, &ns, NULL) == ISC_R_SUCCESS) {
+ dns_view_t *view;
+ dns_name_format(&ns.name, view_name, DNS_NAME_FORMATSIZE);
+ for (view = ISC_LIST_HEAD(ns_g_server->viewlist);
+ view != NULL; view = ISC_LIST_NEXT(view, link)) {
+ if (strlen(view->name) == strlen(view_name) &&
+ memcmp(view->name, view_name, strlen(view_name)) == 0) {
+ /* Found the view, attach to it */
+ dns_view_detach(&client->view);
+ dns_view_attach(view, &client->view);
+ want_vdns_restart = ISC_TRUE;
+ goto cleanup;
+ }
+ }
+ }
+ }
+ }
+ static_stub_vdns_zone = ISC_FALSE;
+#endif
authoritative = ISC_FALSE;
if (is_zone) {
/*
@@ -6128,6 +6272,23 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
}
if (RECURSIONOK(client)) {
+#ifdef CONTRAIL_DNS
+ /*
+ * We are ready to recurse; if next_virtual_dns is configured,
+ * change to that view and restart search
+ */
+ dns_view_t *next_virtual_dns = client->view->next_virtual_dns;
+ if (next_virtual_dns && is_view_valid(next_virtual_dns) &&
+ !is_view_visited(client, next_virtual_dns)) {
+ dns_view_detach(&client->view);
+ dns_view_attach(next_virtual_dns, &client->view);
+ if (add_view_visited(client, next_virtual_dns) != ISC_R_SUCCESS)
+ goto cleanup;
+ want_vdns_restart = ISC_TRUE;
+ goto cleanup;
+ }
+ static_stub_vdns_zone = ISC_FALSE;
+#endif
/*
* Recurse!
*/
@@ -7150,6 +7311,11 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
if (event != NULL)
isc_event_free(ISC_EVENT_PTR(&event));
+#ifdef CONTRAIL_DNS
+ if (static_stub_vdns_zone)
+ authoritative = ISC_TRUE;
+#endif
+
/*
* AA bit.
*/
@@ -7164,6 +7330,13 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
/*
* Restart the query?
*/
+#ifdef CONTRAIL_DNS
+ if (want_vdns_restart && client->query.vdns_restarts < MAX_RESTARTS) {
+ client->query.vdns_restarts++;
+ goto restart;
+ }
+#endif
+
if (want_restart && client->query.restarts < MAX_RESTARTS) {
client->query.restarts++;
goto restart;
diff --git a/third_party/bind-9.9.2-P1/bin/named/server.c b/third_party/bind-9.9.2-P1/bin/named/server.c
index 4083ce8..fadc608 100644
--- a/third_party/bind-9.9.2-P1/bin/named/server.c
+++ b/third_party/bind-9.9.2-P1/bin/named/server.c
@@ -296,6 +296,14 @@ static isc_result_t
configure_forward(const cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
const cfg_obj_t *forwarders, const cfg_obj_t *forwardtype);
+#ifdef CONTRAIL_DNS
+static isc_result_t
+configure_view_virtual_forward(dns_view_t *view);
+
+static isc_result_t
+configure_zone_virtual_forward(dns_view_t *view);
+#endif
+
static isc_result_t
configure_alternates(const cfg_obj_t *config, dns_view_t *view,
const cfg_obj_t *alternates);
@@ -1581,6 +1589,9 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
const cfg_obj_t *voptions = NULL;
const cfg_obj_t *forwardtype;
const cfg_obj_t *forwarders;
+#ifdef CONTRAIL_DNS
+ const cfg_obj_t *virtual_forwarder;
+#endif
const cfg_obj_t *alternates;
const cfg_obj_t *zonelist;
const cfg_obj_t *dlz;
@@ -2275,6 +2286,15 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
CHECK(configure_forward(config, view, dns_rootname,
forwarders, forwardtype));
+#ifdef CONTRAIL_DNS
+ virtual_forwarder = NULL;
+ (void)ns_config_get(maps, "virtual-forwarder", &virtual_forwarder);
+ if (virtual_forwarder != NULL) {
+ view->next_vdns_name = isc_mem_strdup(view->mctx,
+ cfg_obj_asstring(virtual_forwarder));
+ }
+#endif
+
/*
* Dual Stack Servers.
*/
@@ -3160,6 +3180,40 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, dns_name_t *origin,
return (result);
}
+#ifdef CONTRAIL_DNS
+static isc_result_t
+configure_view_virtual_forward(dns_view_t *view)
+{
+ isc_result_t result;
+ dns_view_t *pview = NULL;
+
+ if (view->next_vdns_name == NULL)
+ return ISC_R_SUCCESS;
+
+ result = dns_viewlist_find(&ns_g_server->viewlist, view->next_vdns_name,
+ view->rdclass, &pview);
+ if (result == ISC_R_SUCCESS) {
+ view->next_virtual_dns = pview;
+ }
+ else if (result == ISC_R_NOTFOUND) {
+ /* If not found, next_virtual_dns will get updated when */
+ /* view is configured */
+ result = ISC_R_SUCCESS;
+ }
+
+ if (pview != NULL)
+ dns_view_detach(&pview);
+
+ return (result);
+}
+
+static isc_result_t
+configure_zone_virtual_forward(dns_view_t *view)
+{
+ return dns_zt_setzonenextview(view, &ns_g_server->viewlist);
+}
+#endif
+
static isc_result_t
get_viewinfo(const cfg_obj_t *vconfig, const char **namep,
dns_rdataclass_t *classp)
@@ -3278,6 +3332,9 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
const char *zname;
dns_rdataclass_t zclass;
const char *ztypestr;
+#ifdef CONTRAIL_DNS
+ const cfg_obj_t *virtual_server;
+#endif
options = NULL;
(void)cfg_map_get(config, "options", &options);
@@ -3493,6 +3550,20 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
forwardtype));
}
+#ifdef CONTRAIL_DNS
+ /*
+ * If the zone is static-stub type, copy the virtual forwarder if defined
+ */
+ if (strcasecmp(ztypestr, "static-stub") == 0) {
+ virtual_server = NULL;
+ (void)cfg_map_get(zoptions, "virtual-server-name", &virtual_server);
+ if (virtual_server != NULL) {
+ dns_zone_setnextvdnsname(zone,
+ cfg_obj_asstring(virtual_server));
+ }
+ }
+#endif
+
/*
* Stub and forward zones may also refer to delegation only points.
*/
@@ -4940,9 +5011,16 @@ load_configuration(const char *filename, ns_server_t *server,
view = ISC_LIST_HEAD(server->viewlist);
while (view != NULL) {
view->viewlist = &server->viewlist;
+#ifdef CONTRAIL_DNS
+ /* Update the next virtual forwarder for all the views */
+ /* This cannot be done in configure_view as all the views arent ready */
+ CHECK(configure_view_virtual_forward(view));
+ CHECK(configure_zone_virtual_forward(view));
+#endif
view = ISC_LIST_NEXT(view, link);
}
+
/* Swap our new cache list with the production one. */
tmpcachelist = server->cachelist;
server->cachelist = cachelist;
diff --git a/third_party/bind-9.9.2-P1/bin/python/Makefile.in b/third_party/bind-9.9.2-P1/bin/python/Makefile.in
index 5b8b041..072d53c 100644
--- a/third_party/bind-9.9.2-P1/bin/python/Makefile.in
+++ b/third_party/bind-9.9.2-P1/bin/python/Makefile.in
@@ -29,7 +29,7 @@ MANOBJS = ${MANPAGES} ${HTMLPAGES}
@BIND9_MAKE_RULES@
-dnssec-checkds: ${srcdir}/dnssec-checkds.py
+dnssec-checkds: ${top_builddir}/bin/python/dnssec-checkds.py
doc man:: ${MANOBJS}
diff --git a/third_party/bind-9.9.2-P1/bin/rndc/Makefile.in b/third_party/bind-9.9.2-P1/bin/rndc/Makefile.in
index f6100df..93c780c 100644
--- a/third_party/bind-9.9.2-P1/bin/rndc/Makefile.in
+++ b/third_party/bind-9.9.2-P1/bin/rndc/Makefile.in
@@ -51,7 +51,7 @@ CONFDEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
SRCS= rndc.c
-TARGETS = rndc@EXEEXT@
+TARGETS = rndc@EXEEXT@ librndc.@A@
MANPAGES = rndc.8 rndc.conf.5
@@ -68,23 +68,37 @@ rndc.@O@: rndc.c
-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \
-c ${srcdir}/rndc.c
+librndc.@O@: rndc.c
+ ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
+ -DVERSION=\"${VERSION}\" \
+ -DJUNIPER_RNDC \
+ -DRNDC_CONFFILE=\"/etc/contrail/rndc.conf\" \
+ -DRNDC_KEYFILE=\"/etc/contrail/rndc.key\" \
+ -c ${srcdir}/rndc.c -o librndc.o
+
rndc@EXEEXT@: rndc.@O@ util.@O@ ${RNDCDEPLIBS}
export BASEOBJS="rndc.@O@ util.@O@"; \
export LIBS0="${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS}"; \
${FINALBUILDCMD}
+librndc.@SA@: librndc.@O@ util.@O@ ${RNDCDEPLIBS}
+ ${AR} ${ARFLAGS} $@ librndc.@O@ util.@O@ ${UOBJS}
+ ${RANLIB} $@
+
doc man:: ${MANOBJS}
docclean manclean maintainer-clean::
rm -f ${MANOBJS}
installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
-install:: rndc@EXEEXT@ installdirs
+install:: rndc@EXEEXT@ librndc.@A@ installdirs
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} rndc@EXEEXT@ ${DESTDIR}${sbindir}
+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} librndc.@A@ ${DESTDIR}${libdir}
${INSTALL_DATA} ${srcdir}/rndc.8 ${DESTDIR}${mandir}/man8
${INSTALL_DATA} ${srcdir}/rndc.conf.5 ${DESTDIR}${mandir}/man5
diff --git a/third_party/bind-9.9.2-P1/bin/rndc/rndc.c b/third_party/bind-9.9.2-P1/bin/rndc/rndc.c
index d65fc78..fb5e500 100644
--- a/third_party/bind-9.9.2-P1/bin/rndc/rndc.c
+++ b/third_party/bind-9.9.2-P1/bin/rndc/rndc.c
@@ -61,6 +61,15 @@
#define SERVERADDRS 10
+#ifdef JUNIPER_RNDC
+int rndc_main(int argc, char** argv);
+void rndc_reconfig();
+void *dnsd_rndc_start(void *arg);
+
+int pipefd[2];
+static char *rndc_args[] = { "rndc", "-c", "/etc/contrail/rndc.conf", "-p", "11223", "reconfig" };
+#endif
+
const char *progname;
isc_boolean_t verbose;
@@ -700,8 +709,31 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname,
*configp = config;
}
-int
-main(int argc, char **argv) {
+#ifdef JUNIPER_RNDC
+void *dnsd_rndc_start(void *arg) {
+ // socket_server();
+ char buf[32];
+ if (pipe(pipefd))
+ exit(-1);
+ while (1) {
+ if (read(pipefd[0], buf, 4096) > 0) {
+ rndc_main(6, rndc_args);
+ }
+ }
+ return NULL;
+}
+
+void rndc_reconfig() {
+ char buf[32];
+ write(pipefd[1], buf, 1);
+}
+#endif
+
+#ifndef JUNIPER_RNDC
+int main(int argc, char **argv) {
+#else
+int rndc_main(int argc, char **argv) {
+#endif
isc_boolean_t show_final_mem = ISC_FALSE;
isc_result_t result = ISC_R_SUCCESS;
isc_taskmgr_t *taskmgr = NULL;
diff --git a/third_party/bind-9.9.2-P1/bin/rndc/rndc.h b/third_party/bind-9.9.2-P1/bin/rndc/rndc.h
new file mode 100644
index 0000000..d600c32
--- /dev/null
+++ b/third_party/bind-9.9.2-P1/bin/rndc/rndc.h
@@ -0,0 +1,21 @@
+#ifndef RNDC_H
+#define RNDC_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+struct rndc_params {
+ const char *domain_name;
+ const char *view_name;
+ const char *zone_filename;
+ const char *forwarder_ip;
+ int8_t allow_update;
+};
+extern void rndc_add_zone(struct rndc_params *params);
+extern void rndc_del_zone(const char *zone, const char *view);
+extern void rndc_reconfig(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* RNDC_H */
diff --git a/third_party/bind-9.9.2-P1/configure b/third_party/bind-9.9.2-P1/configure
index c8aa88d..a12804a 100755
--- a/third_party/bind-9.9.2-P1/configure
+++ b/third_party/bind-9.9.2-P1/configure
@@ -3539,6 +3539,7 @@ fi
## Main body of script. ##
## -------------------- ##
+CFLAGS=$CFLAGS\ -DCONTRAIL_DNS
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/third_party/bind-9.9.2-P1/lib/bind9/check.c b/third_party/bind-9.9.2-P1/lib/bind9/check.c
index 9cbcf24..7b9a151 100644
--- a/third_party/bind-9.9.2-P1/lib/bind9/check.c
+++ b/third_party/bind-9.9.2-P1/lib/bind9/check.c
@@ -248,6 +248,16 @@ check_forward(const cfg_obj_t *options, const cfg_obj_t *global,
return (ISC_R_SUCCESS);
}
+#ifdef CONTRAIL_DNS
+static isc_result_t
+check_virtual_forward(const cfg_obj_t *options, isc_log_t *logctx)
+{
+ const cfg_obj_t *virtual_forwarder = NULL;
+ (void)cfg_map_get(options, "virtual-forwarder", &virtual_forwarder);
+ return (ISC_R_SUCCESS);
+}
+#endif
+
static isc_result_t
disabled_algorithms(const cfg_obj_t *disabled, isc_log_t *logctx) {
isc_result_t result = ISC_R_SUCCESS;
@@ -1376,6 +1386,9 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
{ "try-tcp-refresh", SLAVEZONE | STREDIRECTZONE },
{ "server-addresses", STATICSTUBZONE },
{ "server-names", STATICSTUBZONE },
+#ifdef CONTRAIL_DNS
+ { "virtual-server-name", STATICSTUBZONE },
+#endif
};
static optionstable dialups[] = {
@@ -1734,6 +1747,13 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
}
}
+#ifdef CONTRAIL_DNS
+ if (ztype == STATICSTUBZONE) {
+ const cfg_obj_t *virtual_server = NULL;
+ (void)cfg_map_get(zoptions, "virtual-server-name", &virtual_server);
+ }
+#endif
+
/*
* Check various options.
*/
@@ -2234,6 +2254,13 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions,
result = ISC_R_FAILURE;
}
+#ifdef CONTRAIL_DNS
+ if (voptions != NULL) {
+ if (check_virtual_forward(voptions, logctx) != ISC_R_SUCCESS)
+ result = ISC_R_FAILURE;
+ }
+#endif
+
/*
* Check non-zero options at the global and view levels.
*/
diff --git a/third_party/bind-9.9.2-P1/lib/dns/include/dns/message.h b/third_party/bind-9.9.2-P1/lib/dns/include/dns/message.h
index 3bc734d..23041ff 100644
--- a/third_party/bind-9.9.2-P1/lib/dns/include/dns/message.h
+++ b/third_party/bind-9.9.2-P1/lib/dns/include/dns/message.h
@@ -249,6 +249,9 @@ struct dns_message {
dns_rdatasetorderfunc_t order;
const void * order_arg;
+#ifdef CONTRAIL_DNS
+ dns_rdata_t * view_rdata;
+#endif
};
/***
diff --git a/third_party/bind-9.9.2-P1/lib/dns/include/dns/view.h b/third_party/bind-9.9.2-P1/lib/dns/include/dns/view.h
index 16f8d7a..3b2a6b4 100644
--- a/third_party/bind-9.9.2-P1/lib/dns/include/dns/view.h
+++ b/third_party/bind-9.9.2-P1/lib/dns/include/dns/view.h
@@ -173,6 +173,10 @@ struct dns_view {
dns_acl_t * matchclients;
dns_acl_t * matchdestinations;
isc_boolean_t matchrecursiveonly;
+#ifdef CONTRAIL_DNS
+ char * next_vdns_name;
+ dns_view_t * next_virtual_dns; /* next virtual dns server */
+#endif
/* Locked by themselves. */
isc_refcount_t references;
diff --git a/third_party/bind-9.9.2-P1/lib/dns/include/dns/zone.h b/third_party/bind-9.9.2-P1/lib/dns/include/dns/zone.h
index 8f32bae..e90af30 100644
--- a/third_party/bind-9.9.2-P1/lib/dns/include/dns/zone.h
+++ b/third_party/bind-9.9.2-P1/lib/dns/include/dns/zone.h
@@ -219,6 +219,44 @@ dns_zone_getview(dns_zone_t *zone);
*\li 'zone' to be a valid zone.
*/
+#ifdef CONTRAIL_DNS
+char *
+dns_zone_getnextvdnsname(dns_zone_t *zone);
+/*%<
+ * Returns the zone's next virtual forwarder name
+ *
+ * Requires:
+ *\li 'zone' to be a valid zone.
+ */
+
+void
+dns_zone_setnextvdnsname(dns_zone_t *zone, const char *name);
+/*%<
+ * Configures the zone's next virtual forwarder name
+ *
+ * Requires:
+ *\li 'zone' to be a valid zone.
+ */
+
+dns_view_t *
+dns_zone_getnextview(dns_zone_t *zone);
+/*%<
+ * Returns the zone's next view (associated virtual forwarder of the zone).
+ *
+ * Requires:
+ *\li 'zone' to be a valid zone.
+ */
+
+isc_result_t
+dns_zone_setnextview(dns_zone_t *zone, dns_viewlist_t *viewlist);
+/*%<
+ * Updates the zone's next view (associated virtual forwarder of the zone).
+ *
+ * Requires:
+ *\li 'zone' to be a valid zone.
+ */
+#endif
+
isc_result_t
dns_zone_setorigin(dns_zone_t *zone, const dns_name_t *origin);
/*%<
diff --git a/third_party/bind-9.9.2-P1/lib/dns/include/dns/zt.h b/third_party/bind-9.9.2-P1/lib/dns/include/dns/zt.h
index f91d7e8..9604a8f 100644
--- a/third_party/bind-9.9.2-P1/lib/dns/include/dns/zt.h
+++ b/third_party/bind-9.9.2-P1/lib/dns/include/dns/zt.h
@@ -200,6 +200,17 @@ dns_zt_apply2(dns_zt_t *zt, isc_boolean_t stop, isc_result_t *sub,
* any error code from 'action'.
*/
+#ifdef CONTRAIL_DNS
+isc_result_t
+dns_zt_setzonenextview(dns_view_t *view, dns_viewlist_t *viewlist);
+/*%<
+ * Updates the next view of all zones in the view
+ *
+ * Returns:
+ *\li #ISC_R_SUCCESS
+ */
+#endif
+
isc_boolean_t
dns_zt_loadspending(dns_zt_t *zt);
/*%<
diff --git a/third_party/bind-9.9.2-P1/lib/dns/message.c b/third_party/bind-9.9.2-P1/lib/dns/message.c
index 2b65f0e..3cfc0aa 100644
--- a/third_party/bind-9.9.2-P1/lib/dns/message.c
+++ b/third_party/bind-9.9.2-P1/lib/dns/message.c
@@ -1252,6 +1252,9 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
&& rdtype != dns_rdatatype_dnskey /* in a TKEY query */
&& rdtype != dns_rdatatype_sig /* SIG(0) */
&& rdtype != dns_rdatatype_tkey /* Win2000 TKEY */
+#ifdef CONTRAIL_DNS
+ && rdtype != dns_rdatatype_txt /* TXT */
+#endif
&& msg->rdclass != dns_rdataclass_any
&& msg->rdclass != rdclass)
DO_FORMERR;
@@ -1497,6 +1500,17 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
dns_rdatalist_fromrdataset(rdataset, &rdatalist);
ISC_LIST_APPEND(rdatalist->rdata, rdata, link);
+#ifdef CONTRAIL_DNS
+ /*
+ * We get the domain name in a TXT record in the additional section
+ * in the DNS packets. Identify such rdata and keep a reference to it.
+ */
+ if (rdtype == dns_rdatatype_txt &&
+ sectionid == DNS_SECTION_ADDITIONAL) {
+ msg->view_rdata = rdata;
+ }
+#endif
+
/*
* If this is an OPT record, remember it. Also, set
* the extended rcode. Note that msg->opt will only be set
@@ -1601,6 +1615,9 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source,
msg->counts[DNS_SECTION_ADDITIONAL] = isc_buffer_getuint16(source);
msg->header_ok = 1;
+#ifdef CONTRAIL_DNS
+ msg->view_rdata = NULL;
+#endif
/*
* -1 means no EDNS.
diff --git a/third_party/bind-9.9.2-P1/lib/dns/view.c b/third_party/bind-9.9.2-P1/lib/dns/view.c
index 0a9727c..c715b7e 100644
--- a/third_party/bind-9.9.2-P1/lib/dns/view.c
+++ b/third_party/bind-9.9.2-P1/lib/dns/view.c
@@ -140,6 +140,10 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
view->matchclients = NULL;
view->matchdestinations = NULL;
view->matchrecursiveonly = ISC_FALSE;
+#ifdef CONTRAIL_DNS
+ view->next_vdns_name = NULL;
+ view->next_virtual_dns = NULL;
+#endif
result = dns_tsigkeyring_create(view->mctx, &view->dynamickeys);
if (result != ISC_R_SUCCESS)
goto cleanup_references;
@@ -351,6 +355,12 @@ destroy(dns_view_t *view) {
dns_acl_detach(&view->matchclients);
if (view->matchdestinations != NULL)
dns_acl_detach(&view->matchdestinations);
+#ifdef CONTRAIL_DNS
+ if (view->next_vdns_name != NULL)
+ isc_mem_free(view->mctx, view->next_vdns_name);
+ view->next_vdns_name = NULL;
+ view->next_virtual_dns = NULL;
+#endif
if (view->cacheacl != NULL)
dns_acl_detach(&view->cacheacl);
if (view->cacheonacl != NULL)
diff --git a/third_party/bind-9.9.2-P1/lib/dns/zone.c b/third_party/bind-9.9.2-P1/lib/dns/zone.c
index 5dd0b76..455c1da 100644
--- a/third_party/bind-9.9.2-P1/lib/dns/zone.c
+++ b/third_party/bind-9.9.2-P1/lib/dns/zone.c
@@ -288,6 +288,11 @@ struct dns_zone {
dns_checkmxfunc_t checkmx;
dns_checksrvfunc_t checksrv;
dns_checknsfunc_t checkns;
+#ifdef CONTRAIL_DNS
+ /* the next view to use when virtual forwarder is configured */
+ char *next_vdns_name;
+ dns_view_t *zone_next_view;
+#endif
/*%
* Zones in certain states such as "waiting for zone transfer"
* or "zone transfer in progress" are kept on per-state linked lists
@@ -885,6 +890,10 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
zone->checkmx = NULL;
zone->checksrv = NULL;
zone->checkns = NULL;
+#ifdef CONTRAIL_DNS
+ zone->next_vdns_name = NULL;
+ zone->zone_next_view = NULL;
+#endif
ISC_LINK_INIT(zone, statelink);
zone->statelist = NULL;
zone->stats = NULL;
@@ -1031,6 +1040,12 @@ zone_free(dns_zone_t *zone) {
isc_mem_free(zone->mctx, zone->strviewname);
if (zone->ssutable != NULL)
dns_ssutable_detach(&zone->ssutable);
+#ifdef CONTRAIL_DNS
+ if (zone->next_vdns_name != NULL)
+ isc_mem_free(zone->mctx, zone->next_vdns_name);
+ zone->next_vdns_name = NULL;
+ zone->zone_next_view = NULL;
+#endif
/* last stuff */
ZONEDB_DESTROYLOCK(&zone->dblock);
@@ -1042,6 +1057,50 @@ zone_free(dns_zone_t *zone) {
isc_mem_detach(&mctx);
}
+#ifdef CONTRAIL_DNS
+char *
+dns_zone_getnextvdnsname(dns_zone_t *zone) {
+ REQUIRE(DNS_ZONE_VALID(zone));
+ return (zone->next_vdns_name);
+}
+
+void
+dns_zone_setnextvdnsname(dns_zone_t *zone, const char *name) {
+ REQUIRE(DNS_ZONE_VALID(zone));
+ zone->next_vdns_name = isc_mem_strdup(zone->mctx, name);
+}
+
+dns_view_t *
+dns_zone_getnextview(dns_zone_t *zone) {
+ REQUIRE(DNS_ZONE_VALID(zone));
+ return (zone->zone_next_view);
+}
+
+isc_result_t
+dns_zone_setnextview(dns_zone_t *zone, dns_viewlist_t *viewlist)
+{
+ REQUIRE(DNS_ZONE_VALID(zone));
+ isc_result_t result;
+ if (zone->next_vdns_name != NULL) {
+ dns_view_t *pview = NULL;
+ result = dns_viewlist_find(viewlist, zone->next_vdns_name,
+ zone->view->rdclass, &pview);
+ if (result == ISC_R_SUCCESS) {
+ zone->zone_next_view = pview;
+ }
+ else if (result == ISC_R_NOTFOUND) {
+ /* If not found, zone_next_view will get updated when */
+ /* view is configured */
+ result = ISC_R_SUCCESS;
+ }
+
+ if (pview != NULL)
+ dns_view_detach(&pview);
+ }
+ return (result);
+}
+#endif
+
/*
* Returns ISC_TRUE iff this the signed side of an inline-signing zone
*/
diff --git a/third_party/bind-9.9.2-P1/lib/dns/zt.c b/third_party/bind-9.9.2-P1/lib/dns/zt.c