aboutsummaryrefslogtreecommitdiffstats
path: root/net/stf-6rd-kmod/files-9/patch-aa
blob: 30e24d3fb4fb871ce0f4e84a200eb5d8dd36cac8 (plain) (blame)
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
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 5e32763..33dbab9 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -1,6 +1,7 @@
 .\"     $KAME: stf.4,v 1.35 2001/05/02 06:24:49 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+.\" Copyright (c) 2010 Hiroki Sato <hrs@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -42,21 +43,11 @@ tunnel interface
 .Sh DESCRIPTION
 The
 .Nm
-interface supports
-.Dq 6to4
-IPv6 in IPv4 encapsulation.
-It can tunnel IPv6 traffic over IPv4, as specified in
-.Li RFC3056 .
-.Pp
-For ordinary nodes in 6to4 site, you do not need
-.Nm
-interface.
-The
-.Nm
-interface is necessary for site border router
-(called
-.Dq 6to4 router
-in the specification).
+interface supports IPv6 in IPv4 encapsulation by
+tunneling IPv6 traffic over IPv4, as specified in
+.Li RFC3056 Pq 6to4
+and
+.Li RFC5569 Pq 6rd .
 .Pp
 Each
 .Nm
@@ -72,12 +63,28 @@ variable in
 .Pp
 Due to the way 6to4 protocol is specified,
 .Nm
-interface requires certain configuration to work properly.
+interface requires certain configuration to work properly.  Two
+different protocols defined in RFC3056 and RFC5569 are basically the
+same as each other except for address handling, so
+.Nm
+decides its behavior based on the configured IPv6 addresses as
+explained in the following.
+The
+.Nm
+interface can be configured with multiple IPv6 addresses including
+both 6to4 and 6rd.
+.Sh RFC3056 (a.k.a. 6to4)
 Single
-(no more than 1)
-valid 6to4 address needs to be configured to the interface.
-.Dq A valid 6to4 address
-is an address which has the following properties.
+.Pq no more than 1 valid 6to4 address needs to be configured to the interface.
+.Dq a valid 6to4 address
+is an address which has the following properties.  For ordinary nodes
+in 6to4 site, you do not need
+.Nm
+interface; it is necessary only for site border router
+(called
+.Dq 6to4 router
+in the specification).
+.Pp
 If any of the following properties are not satisfied,
 .Nm
 raises runtime error on packet transmission.
@@ -110,6 +117,78 @@ you may want to configure IPv6 prefix length as
 .Nm
 interface will check the IPv4 source address on packets,
 if the IPv6 prefix length is larger than 16.
+.Sh RFC5569 (a.k.a. 6rd)
+The
+.Nm
+interface works in the 6rd mode when one or more IPv6 addresses that
+consists of an IPv6 prefix and 32-bit IPv4 part with a prefix length
+equal to or shorter than 64.  In 6rd protocol, an IPv6 address
+.Li 2001:db8:c000:205::1/32
+means the following, for example:
+.Bl -bullet
+.It
+The 6rd relay prefix is
+.Li 2001:db8::/32 .
+.It
+The 6rd router's IPv4 address is
+.Li 192.0.2.5 .
+.El
+.Pp
+As you can see the IPv4 address is embedded in the IPv6 address just
+after the prefix.  While you can choose an IPv6 prefix length other
+than 32, it must be from 0 to 32.
+.Pp
+Assuming this address is configured on the
+.Nm
+interface, it does the following:
+.Bl -bullet
+.It
+An incoming IPv6 packet on
+.Nm
+will be encapsuled in an IPv4 packet with the source address
+.Li 192.0.2.5
+and then the IPv4 packet is delivered based on the IPv4 routing table.
+The IPv4 destination address is calculated from the destination
+address of the original IPv6 packet in the same way as the source.
+.It
+An incoming IPv4 packet which encapsules an IPv6 packet whose
+destination address matches a 6rd prefix with embedded IPv4 address
+configured on the
+.Nm
+interface, the IPv6 packet will be decapsulated and delivered based on
+the IPv6 routing table.  Note that
+.Nm
+interface normally has a route which covers whole range of a 6rd relay
+prefix, the delivered IPv6 packet can return to
+.Nm
+if there is no more specific route.  In that case, the returned packet
+will be discarded silently.
+.El
+.\" XXX: example configuration will be added
+.\" .Pp
+.\" By using this interface, you can configure a 6rd domain.  For simplicity,
+.\" we assume the following here:
+.\" .Bl -bullet
+.\" .It
+.\" A 6rd Customer, who has an IPv6/IPv4 LAN and an IPv4-only access
+.\" toward network of his Internet Service Provider.  The Customer has
+.\" a router called
+.\" .Dq CE Pq Customer Edge
+.\" Router, which can communicate between his LAN and the ISP over IPv4
+.\" and encapsulate  
+.\" his networks.
+.\" .It
+.\" A 6rd Provider, who provides IPv6 Internet reachability by using 6rd
+.\" protocol.  The Provider offers access to a router called
+.\" .Dq PE Pq Provider Edge
+.\" Router, which can communicate with 
+.\" .El
+.\" .Pp
+.\" A 6rd customer
+.\" needs to configure
+.\" .Nm
+.\" on his CE (Customer Edge) router.
+.Sh Other Functionality of the Interface
 .Pp
 .Nm
 can be configured to be ECN friendly.
@@ -147,9 +226,6 @@ Packets with IPv4 multicast address as outer IPv4 source/destination
 Packets with limited broadcast address as outer IPv4 source/destination
 .Pq Li 255.0.0.0/8
 .It
-Packets with private address as outer IPv4 source/destination
-.Pq Li 10.0.0.0/8 , 172.16.0.0/12 , 192.168.0.0/16
-.It
 Packets with subnet broadcast address as outer IPv4 source/destination.
 The check is made against subnet broadcast addresses for
 all of the directly connected subnets.
@@ -164,6 +240,11 @@ The same set of rules are applied against the IPv4 address embedded into
 inner IPv6 address, if the IPv6 address matches 6to4 prefix.
 .El
 .Pp
+In addition to them, packets with private address as outer IPv4
+source/destination
+.Pq Li 10.0.0.0/8 , 172.16.0.0/12 , 192.168.0.0/16
+are filtered out only in the 6to4 mode.
+.Pp
 It is recommended to filter/audit
 incoming IPv4 packet with IP protocol number 41, as necessary.
 It is also recommended to filter/audit encapsulated IPv6 packets as well.
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index b4195bf..9630a86 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -3,6 +3,7 @@
 
 /*-
  * Copyright (C) 2000 WIDE Project.
+ * Copyright (c) 2010 Hiroki Sato <hrs@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,7 +32,7 @@
  */
 
 /*
- * 6to4 interface, based on RFC3056.
+ * 6to4 interface, based on RFC3056 + 6rd (RFC5569) support.
  *
  * 6to4 interface is NOT capable of link-layer (I mean, IPv4) multicasting.
  * There is no address mapping defined from IPv6 multicast address to IPv4
@@ -60,7 +61,7 @@
  * ICMPv6:
  * - Redirects cannot be used due to the lack of link-local address.
  *
- * stf interface does not have, and will not need, a link-local address.  
+ * stf interface does not have, and will not need, a link-local address.
  * It seems to have no real benefit and does not help the above symptoms much.
  * Even if we assign link-locals to interface, we cannot really
  * use link-local unicast/multicast on top of 6to4 cloud (since there's no
@@ -72,6 +73,12 @@
  * http://playground.iijlab.net/i-d/draft-itojun-ipv6-transition-abuse-00.txt
  * for details.  The code tries to filter out some of malicious packets.
  * Note that there is no way to be 100% secure.
+ *
+ * 6rd (RFC5569) extension is enabled when an IPv6 GUA other than
+ * 2002::/16 is assigned.  The stf(4) recognizes a 32-bit just after
+ * prefixlen as the IPv4 address of the 6rd customer site.  The
+ * prefixlen must be shorter than 32.
+ *
  */
 
 #include "opt_inet.h"
@@ -120,12 +127,39 @@
 
 #include <security/mac/mac_framework.h>
 
+#define    STF_DEBUG 1
+#define ip_sprintf(buf, a)                     \
+   sprintf(buf, "%d.%d.%d.%d",                 \
+       (ntohl((a)->s_addr)>>24)&0xFF,              \
+       (ntohl((a)->s_addr)>>16)&0xFF,              \
+       (ntohl((a)->s_addr)>>8)&0xFF,               \
+       (ntohl((a)->s_addr))&0xFF);
+#if STF_DEBUG
+#define DEBUG_PRINTF(a, ...)                       \
+   do {                                \
+       if (V_stf_debug >= a)                   \
+           printf(__VA_ARGS__);                \
+   } while (0)
+#else
+#define DEBUG_PRINTF(a, ...)
+#endif
+
 SYSCTL_DECL(_net_link);
 static SYSCTL_NODE(_net_link, IFT_STF, stf, CTLFLAG_RW, 0, "6to4 Interface");
 
-static int stf_route_cache = 1;
-SYSCTL_INT(_net_link_stf, OID_AUTO, route_cache, CTLFLAG_RW,
-    &stf_route_cache, 0, "Caching of IPv4 routes for 6to4 Output");
+static VNET_DEFINE(int, stf_route_cache) = 1;
+#define V_stf_route_cache  VNET(stf_route_cache)
+SYSCTL_VNET_INT(_net_link_stf, OID_AUTO, route_cache, CTLFLAG_RW,
+    &VNET_NAME(stf_route_cache), 0,
+    "Enable caching of IPv4 routes for 6to4 output.");
+
+#if STF_DEBUG
+static VNET_DEFINE(int, stf_debug) = 0;
+#define V_stf_debug    VNET(stf_debug)
+SYSCTL_VNET_INT(_net_link_stf, OID_AUTO, stf_debug, CTLFLAG_RW,
+    &VNET_NAME(stf_debug), 0,
+    "Enable displaying verbose debug message of stf interfaces");
+#endif
 
 static int stf_permit_rfc1918 = 0;
 TUNABLE_INT("net.link.stf.permit_rfc1918", &stf_permit_rfc1918);
@@ -133,7 +167,6 @@ SYSCTL_INT(_net_link_stf, OID_AUTO, permit_rfc1918, CTLFLAG_RW | CTLFLAG_TUN,
     &stf_permit_rfc1918, 0, "Permit the use of private IPv4 addresses");
 
 #define STFNAME        "stf"
-#define STFUNIT        0
 
 #define IN6_IS_ADDR_6TO4(x)    (ntohs((x)->s6_addr16[0]) == 0x2002)
 
@@ -150,17 +183,26 @@ struct stf_softc {
        struct route_in6 __sc_ro6; /* just for safety */
    } __sc_ro46;
 #define sc_ro  __sc_ro46.__sc_ro4
-   struct mtx  sc_ro_mtx;
+   struct mtx  sc_mtx;
    u_int   sc_fibnum;
    const struct encaptab *encap_cookie;
+   u_int   sc_flags;
+   LIST_ENTRY(stf_softc) stf_list;
 };
 #define STF2IFP(sc)    ((sc)->sc_ifp)
 
-/*
- * Note that mutable fields in the softc are not currently locked.
- * We do lock sc_ro in stf_output though.
- */
+static struct mtx stf_mtx;
 static MALLOC_DEFINE(M_STF, STFNAME, "6to4 Tunnel Interface");
+static VNET_DEFINE(LIST_HEAD(, stf_softc), stf_softc_list);
+#define V_stf_softc_list   VNET(stf_softc_list)
+
+#define STF_LOCK_INIT(sc)  mtx_init(&(sc)->sc_mtx, "stf softc",    \
+                   NULL, MTX_DEF);
+#define STF_LOCK_DESTROY(sc)   mtx_destroy(&(sc)->sc_mtx)
+#define STF_LOCK(sc)       mtx_lock(&(sc)->sc_mtx)
+#define STF_UNLOCK(sc)     mtx_unlock(&(sc)->sc_mtx)
+#define STF_LOCK_ASSERT(sc)    mtx_assert(&(sc)->sc_mtx, MA_OWNED)
+
 static const int ip_stf_ttl = 40;
 
 extern  struct domain inetdomain;
@@ -175,8 +217,6 @@ struct protosw in_stf_protosw = {
    .pr_usrreqs =       &rip_usrreqs
 };
 
-static char *stfnames[] = {"stf0", "stf", "6to4", NULL};
-
 static int stfmodevent(module_t, int, void *);
 static int stf_encapcheck(const struct mbuf *, int, int, void *);
 static struct in6_ifaddr *stf_getsrcifa6(struct ifnet *);
@@ -189,68 +229,45 @@ static int stf_checkaddr6(struct stf_softc *, struct in6_addr *,
    struct ifnet *);
 static void stf_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
 static int stf_ioctl(struct ifnet *, u_long, caddr_t);
-
-static int stf_clone_match(struct if_clone *, const char *);
-static int stf_clone_create(struct if_clone *, char *, size_t, caddr_t);
-static int stf_clone_destroy(struct if_clone *, struct ifnet *);
-struct if_clone stf_cloner = IFC_CLONE_INITIALIZER(STFNAME, NULL, 0,
-    NULL, stf_clone_match, stf_clone_create, stf_clone_destroy);
+static int stf_is_up(struct ifnet *);
+
+#define STF_GETIN4_USE_CACHE   1
+static struct sockaddr_in *stf_getin4addr(struct sockaddr_in *,
+                     struct ifaddr *,
+                     int);
+static struct sockaddr_in *stf_getin4addr_in6(struct sockaddr_in *,
+                         struct ifaddr *,
+                         struct in6_addr *);
+static struct sockaddr_in *stf_getin4addr_sin6(struct sockaddr_in *,
+                          struct ifaddr *,
+                          struct sockaddr_in6 *);
+static int stf_clone_create(struct if_clone *, int, caddr_t);
+static void stf_clone_destroy(struct ifnet *);
+
+IFC_SIMPLE_DECLARE(stf, 0);
 
 static int
-stf_clone_match(struct if_clone *ifc, const char *name)
+stf_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 {
-   int i;
-
-   for(i = 0; stfnames[i] != NULL; i++) {
-       if (strcmp(stfnames[i], name) == 0)
-           return (1);
-   }
-
-   return (0);
-}
-
-static int
-stf_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params)
-{
-   int err, unit;
    struct stf_softc *sc;
    struct ifnet *ifp;
 
-   /*
-    * We can only have one unit, but since unit allocation is
-    * already locked, we use it to keep from allocating extra
-    * interfaces.
-    */
-   unit = STFUNIT;
-   err = ifc_alloc_unit(ifc, &unit);
-   if (err != 0)
-       return (err);
-
    sc = malloc(sizeof(struct stf_softc), M_STF, M_WAITOK | M_ZERO);
+   sc->sc_fibnum = curthread->td_proc->p_fibnum;
    ifp = STF2IFP(sc) = if_alloc(IFT_STF);
-   if (ifp == NULL) {
+   if (sc->sc_ifp == NULL) {
        free(sc, M_STF);
-       ifc_free_unit(ifc, unit);
-       return (ENOSPC);
+       return (ENOMEM);
    }
+   STF_LOCK_INIT(sc);
    ifp->if_softc = sc;
-   sc->sc_fibnum = curthread->td_proc->p_fibnum;
+   if_initname(ifp, ifc->ifc_name, unit);
 
-   /*
-    * Set the name manually rather then using if_initname because
-    * we don't conform to the default naming convention for interfaces.
-    */
-   strlcpy(ifp->if_xname, name, IFNAMSIZ);
-   ifp->if_dname = ifc->ifc_name;
-   ifp->if_dunit = IF_DUNIT_NONE;
-
-   mtx_init(&(sc)->sc_ro_mtx, "stf ro", NULL, MTX_DEF);
    sc->encap_cookie = encap_attach_func(AF_INET, IPPROTO_IPV6,
        stf_encapcheck, &in_stf_protosw, sc);
    if (sc->encap_cookie == NULL) {
        if_printf(ifp, "attach failed\n");
        free(sc, M_STF);
-       ifc_free_unit(ifc, unit);
        return (ENOMEM);
    }
 
@@ -260,41 +277,57 @@ stf_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params)
    ifp->if_snd.ifq_maxlen = ifqmaxlen;
    if_attach(ifp);
    bpfattach(ifp, DLT_NULL, sizeof(u_int32_t));
+
+   mtx_lock(&stf_mtx);
+   LIST_INSERT_HEAD(&V_stf_softc_list, sc, stf_list);
+   mtx_unlock(&stf_mtx);
+
    return (0);
 }
 
-static int
-stf_clone_destroy(struct if_clone *ifc, struct ifnet *ifp)
+static void
+stf_clone_destroy(struct ifnet *ifp)
 {
    struct stf_softc *sc = ifp->if_softc;
    int err;
 
+   mtx_lock(&stf_mtx);
+   LIST_REMOVE(sc, stf_list);
+   mtx_unlock(&stf_mtx);
+
    err = encap_detach(sc->encap_cookie);
    KASSERT(err == 0, ("Unexpected error detaching encap_cookie"));
-   mtx_destroy(&(sc)->sc_ro_mtx);
    bpfdetach(ifp);
    if_detach(ifp);
    if_free(ifp);
 
+   STF_LOCK_DESTROY(sc);
    free(sc, M_STF);
-   ifc_free_unit(ifc, STFUNIT);
 
-   return (0);
+   return;
+}
+
+static void
+vnet_stf_init(const void *unused __unused)
+{
+
+   LIST_INIT(&V_stf_softc_list);
 }
+VNET_SYSINIT(vnet_stf_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, vnet_stf_init,
+    NULL);
 
 static int
-stfmodevent(mod, type, data)
-   module_t mod;
-   int type;
-   void *data;
+stfmodevent(module_t mod, int type, void *data)
 {
 
    switch (type) {
    case MOD_LOAD:
+       mtx_init(&stf_mtx, "stf_mtx", NULL, MTX_DEF);
        if_clone_attach(&stf_cloner);
        break;
    case MOD_UNLOAD:
        if_clone_detach(&stf_cloner);
+       mtx_destroy(&stf_mtx);
        break;
    default:
        return (EOPNOTSUPP);
@@ -310,28 +343,31 @@ static moduledata_t stf_mod = {
 };
 
 DECLARE_MODULE(if_stf, stf_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
+MODULE_VERSION(if_stf, 1);
 
 static int
-stf_encapcheck(m, off, proto, arg)
-   const struct mbuf *m;
-   int off;
-   int proto;
-   void *arg;
+stf_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
 {
    struct ip ip;
    struct in6_ifaddr *ia6;
+   struct sockaddr_in ia6_in4addr;
+   struct sockaddr_in ia6_in4mask;
+   struct sockaddr_in *sin;
    struct stf_softc *sc;
-   struct in_addr a, b, mask;
+   struct ifnet *ifp;
+   int ret = 0;
 
+   DEBUG_PRINTF(1, "%s: enter\n", __func__);
    sc = (struct stf_softc *)arg;
    if (sc == NULL)
        return 0;
+   ifp = STF2IFP(sc);
 
-   if ((STF2IFP(sc)->if_flags & IFF_UP) == 0)
+   if ((ifp->if_flags & IFF_UP) == 0)
        return 0;
 
    /* IFF_LINK0 means "no decapsulation" */
-   if ((STF2IFP(sc)->if_flags & IFF_LINK0) != 0)
+   if ((ifp->if_flags & IFF_LINK0) != 0)
        return 0;
 
    if (proto != IPPROTO_IPV6)
@@ -343,86 +379,162 @@ stf_encapcheck(m, off, proto, arg)
    if (ip.ip_v != 4)
        return 0;
 
-   ia6 = stf_getsrcifa6(STF2IFP(sc));
+   /* Lookup an ia6 whose IPv4 addr encoded in the IPv6 addr is valid. */
+   ia6 = stf_getsrcifa6(ifp);
    if (ia6 == NULL)
        return 0;
+   sin = stf_getin4addr(&ia6_in4addr, &ia6->ia_ifa, STF_GETIN4_USE_CACHE);
+   if (sin == NULL)
+       return 0;
 
+#if STF_DEBUG
+   {
+       char buf[INET6_ADDRSTRLEN + 1];
+       memset(&buf, 0, sizeof(buf));
+
+       ip6_sprintf(buf, &satosin6(ia6->ia_ifa.ifa_addr)->sin6_addr);
+       DEBUG_PRINTF(1, "%s: ia6->ia_ifa.ifa_addr = %s\n", __func__, buf);
+       ip6_sprintf(buf, &ia6->ia_addr.sin6_addr);
+       DEBUG_PRINTF(1, "%s: ia6->ia_addr = %s\n", __func__, buf);
+       ip6_sprintf(buf, &satosin6(ia6->ia_ifa.ifa_netmask)->sin6_addr);
+       DEBUG_PRINTF(1, "%s: ia6->ia_ifa.ifa_netmask = %s\n", __func__, buf);
+       ip6_sprintf(buf, &ia6->ia_prefixmask.sin6_addr);
+       DEBUG_PRINTF(1, "%s: ia6->ia_prefixmask = %s\n", __func__, buf);
+
+       ip_sprintf(buf, &ia6_in4addr.sin_addr);
+       DEBUG_PRINTF(1, "%s: ia6_in4addr.sin_addr = %s\n", __func__, buf);
+       ip_sprintf(buf, &ip.ip_src);
+       DEBUG_PRINTF(1, "%s: ip.ip_src = %s\n", __func__, buf);
+       ip_sprintf(buf, &ip.ip_dst);
+       DEBUG_PRINTF(1, "%s: ip.ip_dst = %s\n", __func__, buf);
+   }
+#endif
    /*
     * check if IPv4 dst matches the IPv4 address derived from the
     * local 6to4 address.
     * success on: dst = 10.1.1.1, ia6->ia_addr = 2002:0a01:0101:...
     */
-   if (bcmp(GET_V4(&ia6->ia_addr.sin6_addr), &ip.ip_dst,
-       sizeof(ip.ip_dst)) != 0) {
-       ifa_free(&ia6->ia_ifa);
-       return 0;
+   DEBUG_PRINTF(1, "%s: check1: ia6_in4addr.sin_addr == ip.ip_dst?\n", __func__);
+   if (ia6_in4addr.sin_addr.s_addr != ip.ip_dst.s_addr) {
+       DEBUG_PRINTF(1, "%s: check1: false.  Ignore this packet.\n", __func__);
+       goto freeit;
    }
 
-   /*
-    * check if IPv4 src matches the IPv4 address derived from the
-    * local 6to4 address masked by prefixmask.
-    * success on: src = 10.1.1.1, ia6->ia_addr = 2002:0a00:.../24
-    * fail on: src = 10.1.1.1, ia6->ia_addr = 2002:0b00:.../24
-    */
-   bzero(&a, sizeof(a));
-   bcopy(GET_V4(&ia6->ia_addr.sin6_addr), &a, sizeof(a));
-   bcopy(GET_V4(&ia6->ia_prefixmask.sin6_addr), &mask, sizeof(mask));
-   ifa_free(&ia6->ia_ifa);
-   a.s_addr &= mask.s_addr;
-   b = ip.ip_src;
-   b.s_addr &= mask.s_addr;
-   if (a.s_addr != b.s_addr)
-       return 0;
+   DEBUG_PRINTF(1, "%s: check2: ia6->ia_addr is 2002::/16?\n", __func__);
+   if (IN6_IS_ADDR_6TO4(&ia6->ia_addr.sin6_addr)) {
+       /* 6to4 (RFC 3056) */
+       /*
+        * check if IPv4 src matches the IPv4 address derived
+        * from the local 6to4 address masked by prefixmask.
+        * success on: src = 10.1.1.1, ia6->ia_addr = 2002:0a00:.../24
+        * fail on: src = 10.1.1.1, ia6->ia_addr = 2002:0b00:.../24
+        */
+       DEBUG_PRINTF(1, "%s: check2: true.\n", __func__);
+
+       memcpy(&ia6_in4mask.sin_addr,
+              GET_V4(&ia6->ia_prefixmask.sin6_addr),
+              sizeof(ia6_in4mask));
+#if STF_DEBUG
+       {
+           char buf[INET6_ADDRSTRLEN + 1];
+           memset(&buf, 0, sizeof(buf));
+
+           ip_sprintf(buf, &ia6_in4addr.sin_addr);
+           DEBUG_PRINTF(1, "%s: ia6->ia_addr = %s\n",
+                    __func__, buf);
+           ip_sprintf(buf, &ip.ip_src);
+           DEBUG_PRINTF(1, "%s: ip.ip_src = %s\n",
+                    __func__, buf);
+           ip_sprintf(buf, &ia6_in4mask.sin_addr);
+           DEBUG_PRINTF(1, "%s: ia6->ia_prefixmask = %s\n",
+                    __func__, buf);
+
+           DEBUG_PRINTF(1, "%s: check3: ia6_in4addr.sin_addr & mask == ip.ip_src & mask\n",
+                    __func__);
+       }
+#endif
 
+       if ((ia6_in4addr.sin_addr.s_addr & ia6_in4mask.sin_addr.s_addr) !=
+           (ip.ip_src.s_addr & ia6_in4mask.sin_addr.s_addr)) {
+           DEBUG_PRINTF(1, "%s: check3: false.  Ignore this packet.\n",
+                    __func__);
+           goto freeit;
+       }
+   } else {
+       /* 6rd (RFC 5569) */
+       DEBUG_PRINTF(1, "%s: check2: false.  6rd.\n", __func__);
+       /*
+        * No restriction on the src address in the case of
+        * 6rd because the stf(4) interface always has a
+        * prefix which covers whole of IPv4 src address
+        * range.  So, stf_output() will catch all of
+        * 6rd-capsuled IPv4 traffic with suspicious inner dst
+        * IPv4 address (i.e. the IPv6 destination address is
+        * one the admin does not like to route to outside),
+        * and then it discard them silently.
+        */
+   }
+   DEBUG_PRINTF(1, "%s: all clear!\n", __func__);
    /* stf interface makes single side match only */
-   return 32;
+   ret = 32;
+freeit:
+   ifa_free(&ia6->ia_ifa);
+
+   return (ret);
 }
 
 static struct in6_ifaddr *
-stf_getsrcifa6(ifp)
-   struct ifnet *ifp;
+stf_getsrcifa6(struct ifnet *ifp)
 {
-   struct ifaddr *ia;
+   struct ifaddr *ifa;
    struct in_ifaddr *ia4;
-   struct sockaddr_in6 *sin6;
-   struct in_addr in;
+   struct sockaddr_in *sin;
+   struct sockaddr_in in4;
 
    if_addr_rlock(ifp);
-   TAILQ_FOREACH(ia, &ifp->if_addrhead, ifa_link) {
-       if (ia->ifa_addr->sa_family != AF_INET6)
+   TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
+       if (ifa->ifa_addr->sa_family != AF_INET6)
            continue;
-       sin6 = (struct sockaddr_in6 *)ia->ifa_addr;
-       if (!IN6_IS_ADDR_6TO4(&sin6->sin6_addr))
+       if ((sin = stf_getin4addr(&in4, ifa,
+                     STF_GETIN4_USE_CACHE)) == NULL)
            continue;
-
-       bcopy(GET_V4(&sin6->sin6_addr), &in, sizeof(in));
-       LIST_FOREACH(ia4, INADDR_HASH(in.s_addr), ia_hash)
-           if (ia4->ia_addr.sin_addr.s_addr == in.s_addr)
+       LIST_FOREACH(ia4, INADDR_HASH(sin->sin_addr.s_addr), ia_hash)
+           if (ia4->ia_addr.sin_addr.s_addr == sin->sin_addr.s_addr)
                break;
        if (ia4 == NULL)
            continue;
 
-       ifa_ref(ia);
+#if STF_DEBUG
+       {
+           char buf[INET6_ADDRSTRLEN + 1];
+           memset(&buf, 0, sizeof(buf));
+
+           ip6_sprintf(buf, &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr);
+           DEBUG_PRINTF(1, "%s: ifa->ifa_addr->sin6_addr = %s\n",
+                    __func__, buf);
+           ip_sprintf(buf, &ia4->ia_addr.sin_addr);
+           DEBUG_PRINTF(1, "%s: ia4->ia_addr.sin_addr = %s\n",
+                    __func__, buf);
+       }
+#endif
+       ifa_ref(ifa);
        if_addr_runlock(ifp);
-       return (struct in6_ifaddr *)ia;
+       return (ifatoia6(ifa));
    }
    if_addr_runlock(ifp);
 
+
    return NULL;
 }
 
 static int
-stf_output(ifp, m, dst, ro)
-   struct ifnet *ifp;
-   struct mbuf *m;
-   struct sockaddr *dst;
-   struct route *ro;
+stf_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct route *ro)
 {
    struct stf_softc *sc;
    struct sockaddr_in6 *dst6;
    struct route *cached_route;
-   struct in_addr in4;
-   caddr_t ptr;
+   struct sockaddr_in *sin;
+   struct sockaddr_in in4;
    struct sockaddr_in *dst4;
    u_int8_t tos;
    struct ip *ip;
@@ -484,20 +596,28 @@ stf_output(ifp, m, dst, ro)
    /*
     * Pickup the right outer dst addr from the list of candidates.
     * ip6_dst has priority as it may be able to give us shorter IPv4 hops.
+    *   ip6_dst: destination addr in the packet header.
+    *   dst6: destination addr specified in function argument.
     */
-   ptr = NULL;
-   if (IN6_IS_ADDR_6TO4(&ip6->ip6_dst))
-       ptr = GET_V4(&ip6->ip6_dst);
-   else if (IN6_IS_ADDR_6TO4(&dst6->sin6_addr))
-       ptr = GET_V4(&dst6->sin6_addr);
-   else {
+   DEBUG_PRINTF(1, "%s: dst addr selection\n", __func__);
+   sin = stf_getin4addr_in6(&in4, &ia6->ia_ifa, &ip6->ip6_dst);
+   if (sin == NULL)
+       sin = stf_getin4addr_in6(&in4, &ia6->ia_ifa, &dst6->sin6_addr);
+   if (sin == NULL) {
        ifa_free(&ia6->ia_ifa);
        m_freem(m);
        ifp->if_oerrors++;
        return ENETUNREACH;
    }
-   bcopy(ptr, &in4, sizeof(in4));
+#if STF_DEBUG
+   {
+       char buf[INET6_ADDRSTRLEN + 1];
+       memset(&buf, 0, sizeof(buf));
 
+       ip_sprintf(buf, &sin->sin_addr);
+       DEBUG_PRINTF(1, "%s: ip_dst = %s\n", __func__, buf);
+   }
+#endif
    if (bpf_peers_present(ifp->if_bpf)) {
        /*
         * We need to prepend the address family as
@@ -521,11 +641,26 @@ stf_output(ifp, m, dst, ro)
    ip = mtod(m, struct ip *);
 
    bzero(ip, sizeof(*ip));
+   bcopy(&in4.sin_addr, &ip->ip_dst, sizeof(ip->ip_dst));
+
+   sin = stf_getin4addr_sin6(&in4, &ia6->ia_ifa, &ia6->ia_addr);
+   if (sin == NULL) {
+       ifa_free(&ia6->ia_ifa);
+       m_freem(m);
+       ifp->if_oerrors++;
+       return ENETUNREACH;
+   }
+   bcopy(&in4.sin_addr, &ip->ip_src, sizeof(ip->ip_src));
+#if STF_DEBUG
+   {
+       char buf[INET6_ADDRSTRLEN + 1];
+       memset(&buf, 0, sizeof(buf));
 
-   bcopy(GET_V4(&((struct sockaddr_in6 *)&ia6->ia_addr)->sin6_addr),
-       &ip->ip_src, sizeof(ip->ip_src));
+       ip_sprintf(buf, &ip->ip_src);
+       DEBUG_PRINTF(1, "%s: ip_src = %s\n", __func__, buf);
+   }
+#endif
    ifa_free(&ia6->ia_ifa);
-   bcopy(&in4, &ip->ip_dst, sizeof(ip->ip_dst));
    ip->ip_p = IPPROTO_IPV6;
    ip->ip_ttl = ip_stf_ttl;
    ip->ip_len = m->m_pkthdr.len;   /*host order*/
@@ -534,7 +669,7 @@ stf_output(ifp, m, dst, ro)
    else
        ip_ecn_ingress(ECN_NOCARE, &ip->ip_tos, &tos);
 
-   if (!stf_route_cache) {
+   if (!V_stf_route_cache) {
        cached_route = NULL;
        goto sendit;
    }
@@ -542,7 +677,7 @@ stf_output(ifp, m, dst, ro)
    /*
     * Do we have a cached route?
     */
-   mtx_lock(&(sc)->sc_ro_mtx);
+   STF_LOCK(sc);
    dst4 = (struct sockaddr_in *)&sc->sc_ro.ro_dst;
    if (dst4->sin_family != AF_INET ||
        bcmp(&dst4->sin_addr, &ip->ip_dst, sizeof(ip->ip_dst)) != 0) {
@@ -560,8 +695,15 @@ stf_output(ifp, m, dst, ro)
        rtalloc_fib(&sc->sc_ro, sc->sc_fibnum);
        if (sc->sc_ro.ro_rt == NULL) {
            m_freem(m);
-           mtx_unlock(&(sc)->sc_ro_mtx);
            ifp->if_oerrors++;
+           STF_UNLOCK(sc);
+           return ENETUNREACH;
+       }
+       if (sc->sc_ro.ro_rt->rt_ifp == ifp) {
+           /* infinite loop detection */
+           m_free(m);
+           ifp->if_oerrors++;
+           STF_UNLOCK(sc);
            return ENETUNREACH;
        }
    }
@@ -570,35 +712,32 @@ stf_output(ifp, m, dst, ro)
 sendit:
    M_SETFIB(m, sc->sc_fibnum);
    ifp->if_opackets++;
+   DEBUG_PRINTF(1, "%s: ip_output dispatch.\n", __func__);
    error = ip_output(m, NULL, cached_route, 0, NULL, NULL);
 
    if (cached_route != NULL)
-       mtx_unlock(&(sc)->sc_ro_mtx);
+       STF_UNLOCK(sc);
    return error;
 }
 
 static int
-isrfc1918addr(in)
-   struct in_addr *in;
+isrfc1918addr(struct in_addr *in)
 {
    /*
     * returns 1 if private address range:
     * 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16
     */
    if (stf_permit_rfc1918 == 0 && (
-       (ntohl(in->s_addr) & 0xff000000) >> 24 == 10 ||
-       (ntohl(in->s_addr) & 0xfff00000) >> 16 == 172 * 256 + 16 ||
-       (ntohl(in->s_addr) & 0xffff0000) >> 16 == 192 * 256 + 168))
+       (ntohl(in->s_addr) & 0xff000000) == 10 << 24 ||
+       (ntohl(in->s_addr) & 0xfff00000) == (172 * 256 + 16) << 16 ||
+       (ntohl(in->s_addr) & 0xffff0000) == (192 * 256 + 168) << 16 ))
        return 1;
 
    return 0;
 }
 
 static int
-stf_checkaddr4(sc, in, inifp)
-   struct stf_softc *sc;
-   struct in_addr *in;
-   struct ifnet *inifp;    /* incoming interface */
+stf_checkaddr4(struct stf_softc *sc, struct in_addr *in, struct ifnet *inifp)
 {
    struct in_ifaddr *ia4;
 
@@ -614,20 +753,10 @@ stf_checkaddr4(sc, in, inifp)
    }
 
    /*
-    * reject packets with private address range.
-    * (requirement from RFC3056 section 2 1st paragraph)
-    */
-   if (isrfc1918addr(in))
-       return -1;
-
-   /*
     * reject packets with broadcast
     */
    IN_IFADDR_RLOCK();
-   for (ia4 = TAILQ_FIRST(&V_in_ifaddrhead);
-        ia4;
-        ia4 = TAILQ_NEXT(ia4, ia_link))
-   {
+   TAILQ_FOREACH(ia4, &V_in_ifaddrhead, ia_link) {
        if ((ia4->ia_ifa.ifa_ifp->if_flags & IFF_BROADCAST) == 0)
            continue;
        if (in->s_addr == ia4->ia_broadaddr.sin_addr.s_addr) {
@@ -646,7 +775,7 @@ stf_checkaddr4(sc, in, inifp)
 
        bzero(&sin, sizeof(sin));
        sin.sin_family = AF_INET;
-       sin.sin_len = sizeof(struct sockaddr_in);
+       sin.sin_len = sizeof(sin);
        sin.sin_addr = *in;
        rt = rtalloc1_fib((struct sockaddr *)&sin, 0,
            0UL, sc->sc_fibnum);
@@ -667,10 +796,7 @@ stf_checkaddr4(sc, in, inifp)
 }
 
 static int
-stf_checkaddr6(sc, in6, inifp)
-   struct stf_softc *sc;
-   struct in6_addr *in6;
-   struct ifnet *inifp;    /* incoming interface */
+stf_checkaddr6(struct stf_softc *sc, struct in6_addr *in6, struct ifnet *inifp)
 {
    /*
     * check 6to4 addresses
@@ -694,9 +820,7 @@ stf_checkaddr6(sc, in6, inifp)
 }
 
 void
-in_stf_input(m, off)
-   struct mbuf *m;
-   int off;
+in_stf_input(struct mbuf *m, int off)
 {
    int proto;
    struct stf_softc *sc;
@@ -704,6 +828,7 @@ in_stf_input(m, off)
    struct ip6_hdr *ip6;
    u_int8_t otos, itos;
    struct ifnet *ifp;
+   struct route_in6 rin6;
 
    proto = mtod(m, struct ip *)->ip_p;
 
@@ -727,6 +852,17 @@ in_stf_input(m, off)
    mac_ifnet_create_mbuf(ifp, m);
 #endif
 
+#if STF_DEBUG
+   {
+       char buf[INET6_ADDRSTRLEN + 1];
+       memset(&buf, 0, sizeof(buf));
+
+       ip_sprintf(buf, &ip->ip_dst);
+       DEBUG_PRINTF(1, "%s: ip->ip_dst = %s\n", __func__, buf);
+       ip_sprintf(buf, &ip->ip_src);
+       DEBUG_PRINTF(1, "%s: ip->ip_src = %s\n", __func__, buf);
+   }
+#endif
    /*
     * perform sanity check against outer src/dst.
     * for source, perform ingress filter as well.
@@ -747,6 +883,17 @@ in_stf_input(m, off)
    }
    ip6 = mtod(m, struct ip6_hdr *);
 
+#if STF_DEBUG
+   {
+       char buf[INET6_ADDRSTRLEN + 1];
+       memset(&buf, 0, sizeof(buf));
+
+       ip6_sprintf(buf, &ip6->ip6_dst);
+       DEBUG_PRINTF(1, "%s: ip6->ip6_dst = %s\n", __func__, buf);
+       ip6_sprintf(buf, &ip6->ip6_src);
+       DEBUG_PRINTF(1, "%s: ip6->ip6_src = %s\n", __func__, buf);
+   }
+#endif
    /*
     * perform sanity check against inner src/dst.
     * for source, perform ingress filter as well.
@@ -757,6 +904,41 @@ in_stf_input(m, off)
        return;
    }
 
+   /*
+    * reject packets with private address range.
+    * (requirement from RFC3056 section 2 1st paragraph)
+    */
+   if ((IN6_IS_ADDR_6TO4(&ip6->ip6_src) && isrfc1918addr(&ip->ip_src)) ||
+       (IN6_IS_ADDR_6TO4(&ip6->ip6_dst) && isrfc1918addr(&ip->ip_dst))) {
+       m_freem(m);
+       return;
+   }
+
+   /*
+    * Ignore if the destination is the same stf interface because
+    * all of valid IPv6 outgoing traffic should go interfaces
+    * except for it.
+    */
+   memset(&rin6, 0, sizeof(rin6));
+   rin6.ro_dst.sin6_len = sizeof(rin6.ro_dst);
+   rin6.ro_dst.sin6_family = AF_INET6;
+   memcpy(&rin6.ro_dst.sin6_addr, &ip6->ip6_dst,
+          sizeof(rin6.ro_dst.sin6_addr));
+   rtalloc((struct route *)&rin6);
+   if (rin6.ro_rt == NULL) {
+       DEBUG_PRINTF(1, "%s: no IPv6 dst.  Ignored.\n", __func__);
+       m_free(m);
+       return;
+   }
+   if ((rin6.ro_rt->rt_ifp == ifp) &&
+       (!IN6_ARE_ADDR_EQUAL(&ip6->ip6_src, &rin6.ro_dst.sin6_addr))) {
+       DEBUG_PRINTF(1, "%s: IPv6 dst is the same stf.  Ignored.\n", __func__);
+       RTFREE(rin6.ro_rt);
+       m_free(m);
+       return;
+   }
+   RTFREE(rin6.ro_rt);
+
    itos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
    if ((ifp->if_flags & IFF_LINK1) != 0)
        ip_ecn_egress(ECN_ALLOWED, &otos, &itos);
@@ -766,7 +948,7 @@ in_stf_input(m, off)
    ip6->ip6_flow |= htonl((u_int32_t)itos << 20);
 
    m->m_pkthdr.rcvif = ifp;
-   
+
    if (bpf_peers_present(ifp->if_bpf)) {
        /*
         * We need to prepend the address family as
@@ -779,6 +961,7 @@ in_stf_input(m, off)
        bpf_mtap2(ifp->if_bpf, &af, sizeof(af), m);
    }
 
+   DEBUG_PRINTF(1, "%s: netisr_dispatch(NETISR_IPV6)\n", __func__);
    /*
     * Put the packet to the network layer input queue according to the
     * specified address family.
@@ -793,27 +976,277 @@ in_stf_input(m, off)
 
 /* ARGSUSED */
 static void
-stf_rtrequest(cmd, rt, info)
-   int cmd;
-   struct rtentry *rt;
-   struct rt_addrinfo *info;
+stf_rtrequest(int cmd, struct rtentry *rt, struct rt_addrinfo *info)
 {
+
    RT_LOCK_ASSERT(rt);
    rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
 }
 
+/* Check whether we have at least one instance with IFF_UP. */
 static int
-stf_ioctl(ifp, cmd, data)
-   struct ifnet *ifp;
-   u_long cmd;
-   caddr_t data;
+stf_is_up(struct ifnet *ifp)
+{
+   struct stf_softc *scp;
+   struct stf_softc *sc_cur;
+   struct stf_softc *sc_is_up;
+
+   sc_is_up = NULL;
+   if ((sc_cur = ifp->if_softc) == NULL)
+       return (EINVAL);
+
+   mtx_lock(&stf_mtx);
+   LIST_FOREACH(scp, &V_stf_softc_list, stf_list) {
+       if (scp == sc_cur)
+           continue;
+       if ((STF2IFP(scp)->if_flags & IFF_UP) != 0) {
+           sc_is_up = scp;
+           break;
+       }
+   }
+   mtx_unlock(&stf_mtx);
+
+   /* We already has at least one instance with IFF_UP. */
+   if (stf_is_up != NULL)
+       return (ENOSPC);
+
+   return (0);
+}
+
+static struct sockaddr_in *
+stf_getin4addr_in6(struct sockaddr_in *sin,
+          struct ifaddr *ifa,
+          struct in6_addr *in6)
+{
+   struct sockaddr_in6 sin6;
+
+   DEBUG_PRINTF(1, "%s: enter.\n", __func__);
+   if (ifa == NULL || in6 == NULL)
+       return NULL;
+
+   memset(&sin6, 0, sizeof(sin6));
+   memcpy(&sin6.sin6_addr, in6, sizeof(sin6.sin6_addr));
+   sin6.sin6_len = sizeof(sin6);
+   sin6.sin6_family = AF_INET6;
+
+   return(stf_getin4addr_sin6(sin, ifa, &sin6));
+}
+
+static struct sockaddr_in *
+stf_getin4addr_sin6(struct sockaddr_in *sin,
+           struct ifaddr *ifa,
+           struct sockaddr_in6 *sin6)
+{
+   struct in6_ifaddr ia6;
+   int i;
+
+   DEBUG_PRINTF(1, "%s: enter.\n", __func__);
+   if (ifa == NULL || sin6 == NULL)
+       return NULL;
+
+   memset(&ia6, 0, sizeof(ia6));
+   memcpy(&ia6, ifatoia6(ifa), sizeof(ia6));
+
+   /*
+    * Use prefixmask information from ifa, and
+    * address information from sin6.
+    */
+   ia6.ia_addr.sin6_family = AF_INET6;
+   ia6.ia_ifa.ifa_addr = (struct sockaddr *)&ia6.ia_addr;
+   ia6.ia_ifa.ifa_dstaddr = NULL;
+   ia6.ia_ifa.ifa_netmask = (struct sockaddr *)&ia6.ia_prefixmask;
+
+#if STF_DEBUG
+   {
+       char buf[INET6_ADDRSTRLEN + 1];
+       memset(&buf, 0, sizeof(buf));
+
+       ip6_sprintf(buf, &sin6->sin6_addr);
+       DEBUG_PRINTF(1, "%s: sin6->sin6_addr = %s\n", __func__, buf);
+       ip6_sprintf(buf, &ia6.ia_addr.sin6_addr);
+       DEBUG_PRINTF(1, "%s: ia6.ia_addr.sin6_addr = %s\n", __func__, buf);
+       ip6_sprintf(buf, &ia6.ia_prefixmask.sin6_addr);
+       DEBUG_PRINTF(1, "%s: ia6.ia_prefixmask.sin6_addr = %s\n", __func__, buf);
+   }
+#endif
+
+   /*
+    * When (src addr & src mask) != (dst (sin6) addr & src mask),
+    * the dst is not in the 6rd domain.  The IPv4 address must
+    * not be used.
+    */
+   for (i = 0; i < sizeof(ia6.ia_addr.sin6_addr); i++) {
+       if ((((u_char *)&ia6.ia_addr.sin6_addr)[i] &
+            ((u_char *)&ia6.ia_prefixmask.sin6_addr)[i])
+           !=
+           (((u_char *)&sin6->sin6_addr)[i] &
+            ((u_char *)&ia6.ia_prefixmask.sin6_addr)[i]))
+           return NULL;
+   }
+
+   /* After the mask check, overwrite ia6.ia_addr with sin6. */
+   memcpy(&ia6.ia_addr, sin6, sizeof(ia6.ia_addr));
+   return(stf_getin4addr(sin, (struct ifaddr *)&ia6, 0));
+}
+
+static struct sockaddr_in *
+stf_getin4addr(struct sockaddr_in *sin,
+          struct ifaddr *ifa,
+          int flags)
+{
+   struct in_addr *in;
+   struct sockaddr_in6 *sin6;
+   struct in6_ifaddr *ia6;
+
+   DEBUG_PRINTF(1, "%s: enter.\n", __func__);
+   if (ifa == NULL ||
+       ifa->ifa_addr == NULL ||
+       ifa->ifa_addr->sa_family != AF_INET6)
+       return NULL;
+
+   sin6 = satosin6(ifa->ifa_addr);
+   ia6 = ifatoia6(ifa);
+
+   if ((flags & STF_GETIN4_USE_CACHE) &&
+       (ifa->ifa_dstaddr != NULL) &&
+       (ifa->ifa_dstaddr->sa_family == AF_INET)) {
+       /*
+        * XXX: ifa_dstaddr is used as a cache of the
+        * extracted IPv4 address.
+        */
+       memcpy(sin, satosin(ifa->ifa_dstaddr), sizeof(*sin));
+#if STF_DEBUG
+       {
+           char buf[INET6_ADDRSTRLEN + 1];
+           memset(&buf, 0, sizeof(buf));
+
+           ip_sprintf(buf, &sin->sin_addr);
+           DEBUG_PRINTF(1, "%s: cached address was used = %s\n", __func__, buf);
+       }
+#endif
+       return (sin);
+   }
+   memset(sin, 0, sizeof(*sin));
+   in = &sin->sin_addr;
+
+#if STF_DEBUG
+   {
+       char buf[INET6_ADDRSTRLEN + 1];
+       memset(&buf, 0, sizeof(buf));
+
+       ip6_sprintf(buf, &sin6->sin6_addr);
+       DEBUG_PRINTF(1, "%s: sin6->sin6_addr = %s\n", __func__, buf);
+   }
+#endif
+
+   if (IN6_IS_ADDR_6TO4(&sin6->sin6_addr)) {
+       /* 6to4 (RFC 3056) */
+       bcopy(GET_V4(&sin6->sin6_addr), in, sizeof(*in));
+       if (isrfc1918addr(in))
+           return NULL;
+   } else {
+       /* 6rd (RFC 5569) */
+       struct in6_addr buf;
+       u_char *p = (u_char *)&buf;
+       u_char *q = (u_char *)in;
+       u_int residue = 0;
+       u_char mask;
+       int i;
+       u_int plen;
+
+       /*
+        * 6rd-relays IPv6 prefix is located at a 32-bit just
+        * after the prefix edge.
+        */
+       plen = in6_mask2len(&satosin6(ifa->ifa_netmask)->sin6_addr, NULL);
+       if (32 < plen)
+           return NULL;
+
+       memcpy(&buf, &sin6->sin6_addr, sizeof(buf));
+       p += plen / 8;
+       residue = plen % 8;
+       mask = ~((u_char)(-1) >> residue);
+
+       /*
+        * The p points head of the IPv4 address part in
+        * bytes.  The residue is a bit-shift factor when
+        * prefixlen is not a multiple of 8.
+        */
+       for (i = 0; i < 4; i++) {
+           DEBUG_PRINTF(2, "p[%d] = %d\n", i, p[i]);
+           DEBUG_PRINTF(2, "residue = %d\n", residue);
+           if (residue) {
+               p[i] <<= residue;
+               DEBUG_PRINTF(2, "p[%d] << residue = %d\n",
+                        i, p[i]);
+               DEBUG_PRINTF(2, "mask = %x\n",
+                        mask);
+               DEBUG_PRINTF(2, "p[%d + 1] & mask = %d\n",
+                        i, p[i + 1] & mask);
+               DEBUG_PRINTF(2, "p[%d + 1] & mask >> (8 - residue) = %d\n",
+                        i, (p[i + 1] & mask) >> (8-residue));
+               p[i] |= ((p[i+1] & mask) >> (8 - residue));
+           }
+           q[i] = p[i];
+       }
+   }
+#if STF_DEBUG
+   {
+       char buf[INET6_ADDRSTRLEN + 1];
+       memset(&buf, 0, sizeof(buf));
+
+       ip_sprintf(buf, in);
+       DEBUG_PRINTF(1, "%s: in->in_addr = %s\n", __func__, buf);
+       DEBUG_PRINTF(1, "%s: leave\n", __func__);
+   }
+#endif
+   if (flags & STF_GETIN4_USE_CACHE) {
+       DEBUG_PRINTF(1, "%s: try to access ifa->ifa_dstaddr.\n", __func__);
+       ifa->ifa_dstaddr = (struct sockaddr *)&ia6->ia_dstaddr;
+       DEBUG_PRINTF(1, "%s: try to memset 0 to ia_dstaddr.\n", __func__);
+       memset(&ia6->ia_dstaddr, 0, sizeof(ia6->ia_dstaddr));
+       DEBUG_PRINTF(1, "%s: try to memcpy ifa->ifa_dstaddr.\n", __func__);
+       memcpy((struct sockaddr_in *)ifa->ifa_dstaddr,
+              sin, sizeof(struct sockaddr_in));
+       DEBUG_PRINTF(1, "%s: try to set sa_family.\n", __func__);
+       ifa->ifa_dstaddr->sa_family = AF_INET;
+       DEBUG_PRINTF(1, "%s: in->in_addr is stored in ifa_dstaddr.\n",
+                __func__);
+   }
+   return (sin);
+}
+
+static int
+stf_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
    struct ifaddr *ifa;
    struct ifreq *ifr;
-   struct sockaddr_in6 *sin6;
-   struct in_addr addr;
+   struct sockaddr_in in4;
    int error, mtu;
 
+   /*
+    * Sanity check: if more than two interfaces have IFF_UP, do
+    * if_down() for all of them except for the specified one.
+    */
+   if (ifp->if_flags & IFF_UP) {
+       struct stf_softc *sc_cur = ifp->if_softc;
+       struct stf_softc *sc;
+
+       mtx_lock(&stf_mtx);
+       LIST_FOREACH(sc, &V_stf_softc_list, stf_list) {
+           if (sc == sc_cur)
+               continue;
+           if ((STF2IFP(sc)->if_flags & IFF_UP) != 0) {
+               if_printf(STF2IFP(sc),
+                     "marked as DOWN because at least "
+                     "one instance of stf(4) is already "
+                     "working.\n");
+               if_down(STF2IFP(sc));
+           }
+       }
+       mtx_unlock(&stf_mtx);
+   }
+
    error = 0;
    switch (cmd) {
    case SIOCSIFADDR:
@@ -822,17 +1255,16 @@ stf_ioctl(ifp, cmd, data)
            error = EAFNOSUPPORT;
            break;
        }
-       sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
-       if (!IN6_IS_ADDR_6TO4(&sin6->sin6_addr)) {
+       if (stf_getin4addr(&in4, ifa, 0) == NULL) {
            error = EINVAL;
            break;
        }
-       bcopy(GET_V4(&sin6->sin6_addr), &addr, sizeof(addr));
-       if (isrfc1918addr(&addr)) {
-           error = EINVAL;
-           break;
-       }
-
+       /*
+        * XXX: ifa_dstaddr is used as a cache of the
+        * extracted IPv4 address.
+        */
+       if (ifa->ifa_dstaddr != NULL)
+           ifa->ifa_dstaddr->sa_family = AF_UNSPEC;
        ifa->ifa_rtrequest = stf_rtrequest;
        ifp->if_flags |= IFF_UP;
        break;