← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/decnet/dn_route.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/decnet/dn_route.c
112
112
static struct dst_entry *dn_dst_check(struct dst_entry *, __u32);
113
113
static unsigned int dn_dst_default_advmss(const struct dst_entry *dst);
114
114
static unsigned int dn_dst_default_mtu(const struct dst_entry *dst);
 
115
static void dn_dst_destroy(struct dst_entry *);
115
116
static struct dst_entry *dn_dst_negative_advice(struct dst_entry *);
116
117
static void dn_dst_link_failure(struct sk_buff *);
117
118
static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu);
133
134
        .check =                dn_dst_check,
134
135
        .default_advmss =       dn_dst_default_advmss,
135
136
        .default_mtu =          dn_dst_default_mtu,
 
137
        .cow_metrics =          dst_cow_metrics_generic,
 
138
        .destroy =              dn_dst_destroy,
136
139
        .negative_advice =      dn_dst_negative_advice,
137
140
        .link_failure =         dn_dst_link_failure,
138
141
        .update_pmtu =          dn_dst_update_pmtu,
139
142
};
140
143
 
 
144
static void dn_dst_destroy(struct dst_entry *dst)
 
145
{
 
146
        dst_destroy_metrics_generic(dst);
 
147
}
 
148
 
141
149
static __inline__ unsigned dn_hash(__le16 src, __le16 dst)
142
150
{
143
151
        __u16 tmp = (__u16 __force)(src ^ dst);
274
282
{
275
283
}
276
284
 
277
 
static inline int compare_keys(struct flowi *fl1, struct flowi *fl2)
 
285
static inline int compare_keys(struct flowidn *fl1, struct flowidn *fl2)
278
286
{
279
 
        return ((fl1->fld_dst ^ fl2->fld_dst) |
280
 
                (fl1->fld_src ^ fl2->fld_src) |
281
 
                (fl1->mark ^ fl2->mark) |
282
 
                (fl1->fld_scope ^ fl2->fld_scope) |
283
 
                (fl1->oif ^ fl2->oif) |
284
 
                (fl1->iif ^ fl2->iif)) == 0;
 
287
        return ((fl1->daddr ^ fl2->daddr) |
 
288
                (fl1->saddr ^ fl2->saddr) |
 
289
                (fl1->flowidn_mark ^ fl2->flowidn_mark) |
 
290
                (fl1->flowidn_scope ^ fl2->flowidn_scope) |
 
291
                (fl1->flowidn_oif ^ fl2->flowidn_oif) |
 
292
                (fl1->flowidn_iif ^ fl2->flowidn_iif)) == 0;
285
293
}
286
294
 
287
295
static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route **rp)
295
303
        spin_lock_bh(&dn_rt_hash_table[hash].lock);
296
304
        while ((rth = rcu_dereference_protected(*rthp,
297
305
                                                lockdep_is_held(&dn_rt_hash_table[hash].lock))) != NULL) {
298
 
                if (compare_keys(&rth->fl, &rt->fl)) {
 
306
                if (compare_keys(&rth->fld, &rt->fld)) {
299
307
                        /* Put it first */
300
308
                        *rthp = rth->dst.dn_next;
301
309
                        rcu_assign_pointer(rth->dst.dn_next,
814
822
{
815
823
        struct dn_fib_info *fi = res->fi;
816
824
        struct net_device *dev = rt->dst.dev;
 
825
        unsigned int mss_metric;
817
826
        struct neighbour *n;
818
 
        unsigned int metric;
819
827
 
820
828
        if (fi) {
821
829
                if (DN_FIB_RES_GW(*res) &&
822
830
                    DN_FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
823
831
                        rt->rt_gateway = DN_FIB_RES_GW(*res);
824
 
                dst_import_metrics(&rt->dst, fi->fib_metrics);
 
832
                dst_init_metrics(&rt->dst, fi->fib_metrics, true);
825
833
        }
826
834
        rt->rt_type = res->type;
827
835
 
834
842
 
835
843
        if (dst_metric(&rt->dst, RTAX_MTU) > rt->dst.dev->mtu)
836
844
                dst_metric_set(&rt->dst, RTAX_MTU, rt->dst.dev->mtu);
837
 
        metric = dst_metric_raw(&rt->dst, RTAX_ADVMSS);
838
 
        if (metric) {
 
845
        mss_metric = dst_metric_raw(&rt->dst, RTAX_ADVMSS);
 
846
        if (mss_metric) {
839
847
                unsigned int mss = dn_mss_from_pmtu(dev, dst_mtu(&rt->dst));
840
 
                if (metric > mss)
 
848
                if (mss_metric > mss)
841
849
                        dst_metric_set(&rt->dst, RTAX_ADVMSS, mss);
842
850
        }
843
851
        return 0;
895
903
        return (daddr&~mask)|res->fi->fib_nh->nh_gw;
896
904
}
897
905
 
898
 
static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *oldflp, int try_hard)
 
906
static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *oldflp, int try_hard)
899
907
{
900
 
        struct flowi fl = { .fld_dst = oldflp->fld_dst,
901
 
                            .fld_src = oldflp->fld_src,
902
 
                            .fld_scope = RT_SCOPE_UNIVERSE,
903
 
                            .mark = oldflp->mark,
904
 
                            .iif = init_net.loopback_dev->ifindex,
905
 
                            .oif = oldflp->oif };
 
908
        struct flowidn fld = {
 
909
                .daddr = oldflp->daddr,
 
910
                .saddr = oldflp->saddr,
 
911
                .flowidn_scope = RT_SCOPE_UNIVERSE,
 
912
                .flowidn_mark = oldflp->flowidn_mark,
 
913
                .flowidn_iif = init_net.loopback_dev->ifindex,
 
914
                .flowidn_oif = oldflp->flowidn_oif,
 
915
        };
906
916
        struct dn_route *rt = NULL;
907
917
        struct net_device *dev_out = NULL, *dev;
908
918
        struct neighbour *neigh = NULL;
916
926
        if (decnet_debug_level & 16)
917
927
                printk(KERN_DEBUG
918
928
                       "dn_route_output_slow: dst=%04x src=%04x mark=%d"
919
 
                       " iif=%d oif=%d\n", le16_to_cpu(oldflp->fld_dst),
920
 
                       le16_to_cpu(oldflp->fld_src),
921
 
                       oldflp->mark, init_net.loopback_dev->ifindex, oldflp->oif);
 
929
                       " iif=%d oif=%d\n", le16_to_cpu(oldflp->daddr),
 
930
                       le16_to_cpu(oldflp->saddr),
 
931
                       oldflp->flowidn_mark, init_net.loopback_dev->ifindex,
 
932
                       oldflp->flowidn_oif);
922
933
 
923
934
        /* If we have an output interface, verify its a DECnet device */
924
 
        if (oldflp->oif) {
925
 
                dev_out = dev_get_by_index(&init_net, oldflp->oif);
 
935
        if (oldflp->flowidn_oif) {
 
936
                dev_out = dev_get_by_index(&init_net, oldflp->flowidn_oif);
926
937
                err = -ENODEV;
927
938
                if (dev_out && dev_out->dn_ptr == NULL) {
928
939
                        dev_put(dev_out);
933
944
        }
934
945
 
935
946
        /* If we have a source address, verify that its a local address */
936
 
        if (oldflp->fld_src) {
 
947
        if (oldflp->saddr) {
937
948
                err = -EADDRNOTAVAIL;
938
949
 
939
950
                if (dev_out) {
940
 
                        if (dn_dev_islocal(dev_out, oldflp->fld_src))
 
951
                        if (dn_dev_islocal(dev_out, oldflp->saddr))
941
952
                                goto source_ok;
942
953
                        dev_put(dev_out);
943
954
                        goto out;
946
957
                for_each_netdev_rcu(&init_net, dev) {
947
958
                        if (!dev->dn_ptr)
948
959
                                continue;
949
 
                        if (!dn_dev_islocal(dev, oldflp->fld_src))
 
960
                        if (!dn_dev_islocal(dev, oldflp->saddr))
950
961
                                continue;
951
962
                        if ((dev->flags & IFF_LOOPBACK) &&
952
 
                            oldflp->fld_dst &&
953
 
                            !dn_dev_islocal(dev, oldflp->fld_dst))
 
963
                            oldflp->daddr &&
 
964
                            !dn_dev_islocal(dev, oldflp->daddr))
954
965
                                continue;
955
966
 
956
967
                        dev_out = dev;
965
976
        }
966
977
 
967
978
        /* No destination? Assume its local */
968
 
        if (!fl.fld_dst) {
969
 
                fl.fld_dst = fl.fld_src;
 
979
        if (!fld.daddr) {
 
980
                fld.daddr = fld.saddr;
970
981
 
971
982
                err = -EADDRNOTAVAIL;
972
983
                if (dev_out)
973
984
                        dev_put(dev_out);
974
985
                dev_out = init_net.loopback_dev;
975
986
                dev_hold(dev_out);
976
 
                if (!fl.fld_dst) {
977
 
                        fl.fld_dst =
978
 
                        fl.fld_src = dnet_select_source(dev_out, 0,
 
987
                if (!fld.daddr) {
 
988
                        fld.daddr =
 
989
                        fld.saddr = dnet_select_source(dev_out, 0,
979
990
                                                       RT_SCOPE_HOST);
980
 
                        if (!fl.fld_dst)
 
991
                        if (!fld.daddr)
981
992
                                goto out;
982
993
                }
983
 
                fl.oif = init_net.loopback_dev->ifindex;
 
994
                fld.flowidn_oif = init_net.loopback_dev->ifindex;
984
995
                res.type = RTN_LOCAL;
985
996
                goto make_route;
986
997
        }
989
1000
                printk(KERN_DEBUG
990
1001
                       "dn_route_output_slow: initial checks complete."
991
1002
                       " dst=%o4x src=%04x oif=%d try_hard=%d\n",
992
 
                       le16_to_cpu(fl.fld_dst), le16_to_cpu(fl.fld_src),
993
 
                       fl.oif, try_hard);
 
1003
                       le16_to_cpu(fld.daddr), le16_to_cpu(fld.saddr),
 
1004
                       fld.flowidn_oif, try_hard);
994
1005
 
995
1006
        /*
996
1007
         * N.B. If the kernel is compiled without router support then
998
1009
         * will always be executed.
999
1010
         */
1000
1011
        err = -ESRCH;
1001
 
        if (try_hard || (err = dn_fib_lookup(&fl, &res)) != 0) {
 
1012
        if (try_hard || (err = dn_fib_lookup(&fld, &res)) != 0) {
1002
1013
                struct dn_dev *dn_db;
1003
1014
                if (err != -ESRCH)
1004
1015
                        goto out;
1013
1024
                 * here
1014
1025
                 */
1015
1026
                if (!try_hard) {
1016
 
                        neigh = neigh_lookup_nodev(&dn_neigh_table, &init_net, &fl.fld_dst);
 
1027
                        neigh = neigh_lookup_nodev(&dn_neigh_table, &init_net, &fld.daddr);
1017
1028
                        if (neigh) {
1018
 
                                if ((oldflp->oif &&
1019
 
                                    (neigh->dev->ifindex != oldflp->oif)) ||
1020
 
                                    (oldflp->fld_src &&
 
1029
                                if ((oldflp->flowidn_oif &&
 
1030
                                    (neigh->dev->ifindex != oldflp->flowidn_oif)) ||
 
1031
                                    (oldflp->saddr &&
1021
1032
                                    (!dn_dev_islocal(neigh->dev,
1022
 
                                                      oldflp->fld_src)))) {
 
1033
                                                     oldflp->saddr)))) {
1023
1034
                                        neigh_release(neigh);
1024
1035
                                        neigh = NULL;
1025
1036
                                } else {
1026
1037
                                        if (dev_out)
1027
1038
                                                dev_put(dev_out);
1028
 
                                        if (dn_dev_islocal(neigh->dev, fl.fld_dst)) {
 
1039
                                        if (dn_dev_islocal(neigh->dev, fld.daddr)) {
1029
1040
                                                dev_out = init_net.loopback_dev;
1030
1041
                                                res.type = RTN_LOCAL;
1031
1042
                                        } else {
1045
1056
                        goto out;
1046
1057
                dn_db = rcu_dereference_raw(dev_out->dn_ptr);
1047
1058
                /* Possible improvement - check all devices for local addr */
1048
 
                if (dn_dev_islocal(dev_out, fl.fld_dst)) {
 
1059
                if (dn_dev_islocal(dev_out, fld.daddr)) {
1049
1060
                        dev_put(dev_out);
1050
1061
                        dev_out = init_net.loopback_dev;
1051
1062
                        dev_hold(dev_out);
1061
1072
                if (neigh)
1062
1073
                        gateway = ((struct dn_neigh *)neigh)->addr;
1063
1074
                if (gateway == 0)
1064
 
                        gateway = fl.fld_dst;
1065
 
                if (fl.fld_src == 0) {
1066
 
                        fl.fld_src = dnet_select_source(dev_out, gateway,
1067
 
                                                         res.type == RTN_LOCAL ?
1068
 
                                                         RT_SCOPE_HOST :
1069
 
                                                         RT_SCOPE_LINK);
1070
 
                        if (fl.fld_src == 0 && res.type != RTN_LOCAL)
 
1075
                        gateway = fld.daddr;
 
1076
                if (fld.saddr == 0) {
 
1077
                        fld.saddr = dnet_select_source(dev_out, gateway,
 
1078
                                                       res.type == RTN_LOCAL ?
 
1079
                                                       RT_SCOPE_HOST :
 
1080
                                                       RT_SCOPE_LINK);
 
1081
                        if (fld.saddr == 0 && res.type != RTN_LOCAL)
1071
1082
                                goto e_addr;
1072
1083
                }
1073
 
                fl.oif = dev_out->ifindex;
 
1084
                fld.flowidn_oif = dev_out->ifindex;
1074
1085
                goto make_route;
1075
1086
        }
1076
1087
        free_res = 1;
1079
1090
                goto e_inval;
1080
1091
 
1081
1092
        if (res.type == RTN_LOCAL) {
1082
 
                if (!fl.fld_src)
1083
 
                        fl.fld_src = fl.fld_dst;
 
1093
                if (!fld.saddr)
 
1094
                        fld.saddr = fld.daddr;
1084
1095
                if (dev_out)
1085
1096
                        dev_put(dev_out);
1086
1097
                dev_out = init_net.loopback_dev;
1087
1098
                dev_hold(dev_out);
1088
 
                fl.oif = dev_out->ifindex;
 
1099
                fld.flowidn_oif = dev_out->ifindex;
1089
1100
                if (res.fi)
1090
1101
                        dn_fib_info_put(res.fi);
1091
1102
                res.fi = NULL;
1092
1103
                goto make_route;
1093
1104
        }
1094
1105
 
1095
 
        if (res.fi->fib_nhs > 1 && fl.oif == 0)
1096
 
                dn_fib_select_multipath(&fl, &res);
 
1106
        if (res.fi->fib_nhs > 1 && fld.flowidn_oif == 0)
 
1107
                dn_fib_select_multipath(&fld, &res);
1097
1108
 
1098
1109
        /*
1099
1110
         * We could add some logic to deal with default routes here and
1100
1111
         * get rid of some of the special casing above.
1101
1112
         */
1102
1113
 
1103
 
        if (!fl.fld_src)
1104
 
                fl.fld_src = DN_FIB_RES_PREFSRC(res);
 
1114
        if (!fld.saddr)
 
1115
                fld.saddr = DN_FIB_RES_PREFSRC(res);
1105
1116
 
1106
1117
        if (dev_out)
1107
1118
                dev_put(dev_out);
1108
1119
        dev_out = DN_FIB_RES_DEV(res);
1109
1120
        dev_hold(dev_out);
1110
 
        fl.oif = dev_out->ifindex;
 
1121
        fld.flowidn_oif = dev_out->ifindex;
1111
1122
        gateway = DN_FIB_RES_GW(res);
1112
1123
 
1113
1124
make_route:
1114
1125
        if (dev_out->flags & IFF_LOOPBACK)
1115
1126
                flags |= RTCF_LOCAL;
1116
1127
 
1117
 
        rt = dst_alloc(&dn_dst_ops);
 
1128
        rt = dst_alloc(&dn_dst_ops, dev_out, 1, 0, DST_HOST);
1118
1129
        if (rt == NULL)
1119
1130
                goto e_nobufs;
1120
1131
 
1121
 
        atomic_set(&rt->dst.__refcnt, 1);
1122
 
        rt->dst.flags   = DST_HOST;
1123
 
 
1124
 
        rt->fl.fld_src    = oldflp->fld_src;
1125
 
        rt->fl.fld_dst    = oldflp->fld_dst;
1126
 
        rt->fl.oif        = oldflp->oif;
1127
 
        rt->fl.iif        = 0;
1128
 
        rt->fl.mark       = oldflp->mark;
1129
 
 
1130
 
        rt->rt_saddr      = fl.fld_src;
1131
 
        rt->rt_daddr      = fl.fld_dst;
1132
 
        rt->rt_gateway    = gateway ? gateway : fl.fld_dst;
1133
 
        rt->rt_local_src  = fl.fld_src;
1134
 
 
1135
 
        rt->rt_dst_map    = fl.fld_dst;
1136
 
        rt->rt_src_map    = fl.fld_src;
1137
 
 
1138
 
        rt->dst.dev = dev_out;
1139
 
        dev_hold(dev_out);
 
1132
        memset(&rt->fld, 0, sizeof(rt->fld));
 
1133
        rt->fld.saddr        = oldflp->saddr;
 
1134
        rt->fld.daddr        = oldflp->daddr;
 
1135
        rt->fld.flowidn_oif  = oldflp->flowidn_oif;
 
1136
        rt->fld.flowidn_iif  = 0;
 
1137
        rt->fld.flowidn_mark = oldflp->flowidn_mark;
 
1138
 
 
1139
        rt->rt_saddr      = fld.saddr;
 
1140
        rt->rt_daddr      = fld.daddr;
 
1141
        rt->rt_gateway    = gateway ? gateway : fld.daddr;
 
1142
        rt->rt_local_src  = fld.saddr;
 
1143
 
 
1144
        rt->rt_dst_map    = fld.daddr;
 
1145
        rt->rt_src_map    = fld.saddr;
 
1146
 
1140
1147
        rt->dst.neighbour = neigh;
1141
1148
        neigh = NULL;
1142
1149
 
1151
1158
        if (err)
1152
1159
                goto e_neighbour;
1153
1160
 
1154
 
        hash = dn_hash(rt->fl.fld_src, rt->fl.fld_dst);
 
1161
        hash = dn_hash(rt->fld.saddr, rt->fld.daddr);
1155
1162
        dn_insert_route(rt, hash, (struct dn_route **)pprt);
1156
1163
 
1157
1164
done:
1182
1189
/*
1183
1190
 * N.B. The flags may be moved into the flowi at some future stage.
1184
1191
 */
1185
 
static int __dn_route_output_key(struct dst_entry **pprt, const struct flowi *flp, int flags)
 
1192
static int __dn_route_output_key(struct dst_entry **pprt, const struct flowidn *flp, int flags)
1186
1193
{
1187
 
        unsigned hash = dn_hash(flp->fld_src, flp->fld_dst);
 
1194
        unsigned hash = dn_hash(flp->saddr, flp->daddr);
1188
1195
        struct dn_route *rt = NULL;
1189
1196
 
1190
1197
        if (!(flags & MSG_TRYHARD)) {
1191
1198
                rcu_read_lock_bh();
1192
1199
                for (rt = rcu_dereference_bh(dn_rt_hash_table[hash].chain); rt;
1193
1200
                        rt = rcu_dereference_bh(rt->dst.dn_next)) {
1194
 
                        if ((flp->fld_dst == rt->fl.fld_dst) &&
1195
 
                            (flp->fld_src == rt->fl.fld_src) &&
1196
 
                            (flp->mark == rt->fl.mark) &&
 
1201
                        if ((flp->daddr == rt->fld.daddr) &&
 
1202
                            (flp->saddr == rt->fld.saddr) &&
 
1203
                            (flp->flowidn_mark == rt->fld.flowidn_mark) &&
1197
1204
                            dn_is_output_route(rt) &&
1198
 
                            (rt->fl.oif == flp->oif)) {
 
1205
                            (rt->fld.flowidn_oif == flp->flowidn_oif)) {
1199
1206
                                dst_use(&rt->dst, jiffies);
1200
1207
                                rcu_read_unlock_bh();
1201
1208
                                *pprt = &rt->dst;
1208
1215
        return dn_route_output_slow(pprt, flp, flags);
1209
1216
}
1210
1217
 
1211
 
static int dn_route_output_key(struct dst_entry **pprt, struct flowi *flp, int flags)
 
1218
static int dn_route_output_key(struct dst_entry **pprt, struct flowidn *flp, int flags)
1212
1219
{
1213
1220
        int err;
1214
1221
 
1215
1222
        err = __dn_route_output_key(pprt, flp, flags);
1216
 
        if (err == 0 && flp->proto) {
1217
 
                err = xfrm_lookup(&init_net, pprt, flp, NULL, 0);
 
1223
        if (err == 0 && flp->flowidn_proto) {
 
1224
                *pprt = xfrm_lookup(&init_net, *pprt,
 
1225
                                    flowidn_to_flowi(flp), NULL, 0);
 
1226
                if (IS_ERR(*pprt)) {
 
1227
                        err = PTR_ERR(*pprt);
 
1228
                        *pprt = NULL;
 
1229
                }
1218
1230
        }
1219
1231
        return err;
1220
1232
}
1221
1233
 
1222
 
int dn_route_output_sock(struct dst_entry **pprt, struct flowi *fl, struct sock *sk, int flags)
 
1234
int dn_route_output_sock(struct dst_entry **pprt, struct flowidn *fl, struct sock *sk, int flags)
1223
1235
{
1224
1236
        int err;
1225
1237
 
1226
1238
        err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);
1227
 
        if (err == 0 && fl->proto) {
1228
 
                err = xfrm_lookup(&init_net, pprt, fl, sk,
1229
 
                                 (flags & MSG_DONTWAIT) ? 0 : XFRM_LOOKUP_WAIT);
 
1239
        if (err == 0 && fl->flowidn_proto) {
 
1240
                if (!(flags & MSG_DONTWAIT))
 
1241
                        fl->flowidn_flags |= FLOWI_FLAG_CAN_SLEEP;
 
1242
                *pprt = xfrm_lookup(&init_net, *pprt,
 
1243
                                    flowidn_to_flowi(fl), sk, 0);
 
1244
                if (IS_ERR(*pprt)) {
 
1245
                        err = PTR_ERR(*pprt);
 
1246
                        *pprt = NULL;
 
1247
                }
1230
1248
        }
1231
1249
        return err;
1232
1250
}
1243
1261
        int flags = 0;
1244
1262
        __le16 gateway = 0;
1245
1263
        __le16 local_src = 0;
1246
 
        struct flowi fl = { .fld_dst = cb->dst,
1247
 
                            .fld_src = cb->src,
1248
 
                            .fld_scope = RT_SCOPE_UNIVERSE,
1249
 
                            .mark = skb->mark,
1250
 
                            .iif = skb->dev->ifindex };
 
1264
        struct flowidn fld = {
 
1265
                .daddr = cb->dst,
 
1266
                .saddr = cb->src,
 
1267
                .flowidn_scope = RT_SCOPE_UNIVERSE,
 
1268
                .flowidn_mark = skb->mark,
 
1269
                .flowidn_iif = skb->dev->ifindex,
 
1270
        };
1251
1271
        struct dn_fib_res res = { .fi = NULL, .type = RTN_UNREACHABLE };
1252
1272
        int err = -EINVAL;
1253
1273
        int free_res = 0;
1258
1278
                goto out;
1259
1279
 
1260
1280
        /* Zero source addresses are not allowed */
1261
 
        if (fl.fld_src == 0)
 
1281
        if (fld.saddr == 0)
1262
1282
                goto out;
1263
1283
 
1264
1284
        /*
1272
1292
        if (dn_dev_islocal(in_dev, cb->src))
1273
1293
                goto out;
1274
1294
 
1275
 
        err = dn_fib_lookup(&fl, &res);
 
1295
        err = dn_fib_lookup(&fld, &res);
1276
1296
        if (err) {
1277
1297
                if (err != -ESRCH)
1278
1298
                        goto out;
1284
1304
 
1285
1305
                res.type = RTN_LOCAL;
1286
1306
        } else {
1287
 
                __le16 src_map = fl.fld_src;
 
1307
                __le16 src_map = fld.saddr;
1288
1308
                free_res = 1;
1289
1309
 
1290
1310
                out_dev = DN_FIB_RES_DEV(res);
1297
1317
                dev_hold(out_dev);
1298
1318
 
1299
1319
                if (res.r)
1300
 
                        src_map = fl.fld_src; /* no NAT support for now */
 
1320
                        src_map = fld.saddr; /* no NAT support for now */
1301
1321
 
1302
1322
                gateway = DN_FIB_RES_GW(res);
1303
1323
                if (res.type == RTN_NAT) {
1304
 
                        fl.fld_dst = dn_fib_rules_map_destination(fl.fld_dst, &res);
 
1324
                        fld.daddr = dn_fib_rules_map_destination(fld.daddr, &res);
1305
1325
                        dn_fib_res_put(&res);
1306
1326
                        free_res = 0;
1307
 
                        if (dn_fib_lookup(&fl, &res))
 
1327
                        if (dn_fib_lookup(&fld, &res))
1308
1328
                                goto e_inval;
1309
1329
                        free_res = 1;
1310
1330
                        if (res.type != RTN_UNICAST)
1311
1331
                                goto e_inval;
1312
1332
                        flags |= RTCF_DNAT;
1313
 
                        gateway = fl.fld_dst;
 
1333
                        gateway = fld.daddr;
1314
1334
                }
1315
 
                fl.fld_src = src_map;
 
1335
                fld.saddr = src_map;
1316
1336
        }
1317
1337
 
1318
1338
        switch(res.type) {
1326
1346
                if (dn_db->parms.forwarding == 0)
1327
1347
                        goto e_inval;
1328
1348
 
1329
 
                if (res.fi->fib_nhs > 1 && fl.oif == 0)
1330
 
                        dn_fib_select_multipath(&fl, &res);
 
1349
                if (res.fi->fib_nhs > 1 && fld.flowidn_oif == 0)
 
1350
                        dn_fib_select_multipath(&fld, &res);
1331
1351
 
1332
1352
                /*
1333
1353
                 * Check for out_dev == in_dev. We use the RTCF_DOREDIRECT
1345
1365
                break;
1346
1366
        case RTN_LOCAL:
1347
1367
                flags |= RTCF_LOCAL;
1348
 
                fl.fld_src = cb->dst;
1349
 
                fl.fld_dst = cb->src;
 
1368
                fld.saddr = cb->dst;
 
1369
                fld.daddr = cb->src;
1350
1370
 
1351
1371
                /* Routing tables gave us a gateway */
1352
1372
                if (gateway)
1375
1395
        }
1376
1396
 
1377
1397
make_route:
1378
 
        rt = dst_alloc(&dn_dst_ops);
 
1398
        rt = dst_alloc(&dn_dst_ops, out_dev, 0, 0, DST_HOST);
1379
1399
        if (rt == NULL)
1380
1400
                goto e_nobufs;
1381
1401
 
1382
 
        rt->rt_saddr      = fl.fld_src;
1383
 
        rt->rt_daddr      = fl.fld_dst;
1384
 
        rt->rt_gateway    = fl.fld_dst;
 
1402
        memset(&rt->fld, 0, sizeof(rt->fld));
 
1403
        rt->rt_saddr      = fld.saddr;
 
1404
        rt->rt_daddr      = fld.daddr;
 
1405
        rt->rt_gateway    = fld.daddr;
1385
1406
        if (gateway)
1386
1407
                rt->rt_gateway = gateway;
1387
1408
        rt->rt_local_src  = local_src ? local_src : rt->rt_saddr;
1388
1409
 
1389
 
        rt->rt_dst_map    = fl.fld_dst;
1390
 
        rt->rt_src_map    = fl.fld_src;
1391
 
 
1392
 
        rt->fl.fld_src    = cb->src;
1393
 
        rt->fl.fld_dst    = cb->dst;
1394
 
        rt->fl.oif        = 0;
1395
 
        rt->fl.iif        = in_dev->ifindex;
1396
 
        rt->fl.mark       = fl.mark;
1397
 
 
1398
 
        rt->dst.flags = DST_HOST;
 
1410
        rt->rt_dst_map    = fld.daddr;
 
1411
        rt->rt_src_map    = fld.saddr;
 
1412
 
 
1413
        rt->fld.saddr        = cb->src;
 
1414
        rt->fld.daddr        = cb->dst;
 
1415
        rt->fld.flowidn_oif  = 0;
 
1416
        rt->fld.flowidn_iif  = in_dev->ifindex;
 
1417
        rt->fld.flowidn_mark = fld.flowidn_mark;
 
1418
 
1399
1419
        rt->dst.neighbour = neigh;
1400
 
        rt->dst.dev = out_dev;
1401
1420
        rt->dst.lastuse = jiffies;
1402
1421
        rt->dst.output = dn_rt_bug;
1403
1422
        switch(res.type) {
1416
1435
                        rt->dst.input = dst_discard;
1417
1436
        }
1418
1437
        rt->rt_flags = flags;
1419
 
        if (rt->dst.dev)
1420
 
                dev_hold(rt->dst.dev);
1421
1438
 
1422
1439
        err = dn_rt_set_next_hop(rt, &res);
1423
1440
        if (err)
1424
1441
                goto e_neighbour;
1425
1442
 
1426
 
        hash = dn_hash(rt->fl.fld_src, rt->fl.fld_dst);
 
1443
        hash = dn_hash(rt->fld.saddr, rt->fld.daddr);
1427
1444
        dn_insert_route(rt, hash, &rt);
1428
1445
        skb_dst_set(skb, &rt->dst);
1429
1446
 
1463
1480
        rcu_read_lock();
1464
1481
        for(rt = rcu_dereference(dn_rt_hash_table[hash].chain); rt != NULL;
1465
1482
            rt = rcu_dereference(rt->dst.dn_next)) {
1466
 
                if ((rt->fl.fld_src == cb->src) &&
1467
 
                    (rt->fl.fld_dst == cb->dst) &&
1468
 
                    (rt->fl.oif == 0) &&
1469
 
                    (rt->fl.mark == skb->mark) &&
1470
 
                    (rt->fl.iif == cb->iif)) {
 
1483
                if ((rt->fld.saddr == cb->src) &&
 
1484
                    (rt->fld.daddr == cb->dst) &&
 
1485
                    (rt->fld.flowidn_oif == 0) &&
 
1486
                    (rt->fld.flowidn_mark == skb->mark) &&
 
1487
                    (rt->fld.flowidn_iif == cb->iif)) {
1471
1488
                        dst_use(&rt->dst, jiffies);
1472
1489
                        rcu_read_unlock();
1473
1490
                        skb_dst_set(skb, (struct dst_entry *)rt);
1503
1520
        if (rt->rt_flags & RTCF_NOTIFY)
1504
1521
                r->rtm_flags |= RTM_F_NOTIFY;
1505
1522
        RTA_PUT(skb, RTA_DST, 2, &rt->rt_daddr);
1506
 
        if (rt->fl.fld_src) {
 
1523
        if (rt->fld.saddr) {
1507
1524
                r->rtm_src_len = 16;
1508
 
                RTA_PUT(skb, RTA_SRC, 2, &rt->fl.fld_src);
 
1525
                RTA_PUT(skb, RTA_SRC, 2, &rt->fld.saddr);
1509
1526
        }
1510
1527
        if (rt->dst.dev)
1511
1528
                RTA_PUT(skb, RTA_OIF, sizeof(int), &rt->dst.dev->ifindex);
1524
1541
                               rt->dst.error) < 0)
1525
1542
                goto rtattr_failure;
1526
1543
        if (dn_is_input_route(rt))
1527
 
                RTA_PUT(skb, RTA_IIF, sizeof(int), &rt->fl.iif);
 
1544
                RTA_PUT(skb, RTA_IIF, sizeof(int), &rt->fld.flowidn_iif);
1528
1545
 
1529
1546
        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
1530
1547
        return skb->len;
1547
1564
        struct dn_skb_cb *cb;
1548
1565
        int err;
1549
1566
        struct sk_buff *skb;
1550
 
        struct flowi fl;
 
1567
        struct flowidn fld;
1551
1568
 
1552
1569
        if (!net_eq(net, &init_net))
1553
1570
                return -EINVAL;
1554
1571
 
1555
 
        memset(&fl, 0, sizeof(fl));
1556
 
        fl.proto = DNPROTO_NSP;
 
1572
        memset(&fld, 0, sizeof(fld));
 
1573
        fld.flowidn_proto = DNPROTO_NSP;
1557
1574
 
1558
1575
        skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
1559
1576
        if (skb == NULL)
1562
1579
        cb = DN_SKB_CB(skb);
1563
1580
 
1564
1581
        if (rta[RTA_SRC-1])
1565
 
                memcpy(&fl.fld_src, RTA_DATA(rta[RTA_SRC-1]), 2);
 
1582
                memcpy(&fld.saddr, RTA_DATA(rta[RTA_SRC-1]), 2);
1566
1583
        if (rta[RTA_DST-1])
1567
 
                memcpy(&fl.fld_dst, RTA_DATA(rta[RTA_DST-1]), 2);
 
1584
                memcpy(&fld.daddr, RTA_DATA(rta[RTA_DST-1]), 2);
1568
1585
        if (rta[RTA_IIF-1])
1569
 
                memcpy(&fl.iif, RTA_DATA(rta[RTA_IIF-1]), sizeof(int));
 
1586
                memcpy(&fld.flowidn_iif, RTA_DATA(rta[RTA_IIF-1]), sizeof(int));
1570
1587
 
1571
 
        if (fl.iif) {
 
1588
        if (fld.flowidn_iif) {
1572
1589
                struct net_device *dev;
1573
 
                if ((dev = dev_get_by_index(&init_net, fl.iif)) == NULL) {
 
1590
                if ((dev = dev_get_by_index(&init_net, fld.flowidn_iif)) == NULL) {
1574
1591
                        kfree_skb(skb);
1575
1592
                        return -ENODEV;
1576
1593
                }
1581
1598
                }
1582
1599
                skb->protocol = htons(ETH_P_DNA_RT);
1583
1600
                skb->dev = dev;
1584
 
                cb->src = fl.fld_src;
1585
 
                cb->dst = fl.fld_dst;
 
1601
                cb->src = fld.saddr;
 
1602
                cb->dst = fld.daddr;
1586
1603
                local_bh_disable();
1587
1604
                err = dn_route_input(skb);
1588
1605
                local_bh_enable();
1594
1611
                int oif = 0;
1595
1612
                if (rta[RTA_OIF - 1])
1596
1613
                        memcpy(&oif, RTA_DATA(rta[RTA_OIF - 1]), sizeof(int));
1597
 
                fl.oif = oif;
1598
 
                err = dn_route_output_key((struct dst_entry **)&rt, &fl, 0);
 
1614
                fld.flowidn_oif = oif;
 
1615
                err = dn_route_output_key((struct dst_entry **)&rt, &fld, 0);
1599
1616
        }
1600
1617
 
1601
1618
        if (skb->dev)