Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: Source Address Selection
[vpp.git]
/
src
/
vnet
/
fib
/
fib_path.c
diff --git
a/src/vnet/fib/fib_path.c
b/src/vnet/fib/fib_path.c
index
f8950fa
..
2a4e6ab
100644
(file)
--- a/
src/vnet/fib/fib_path.c
+++ b/
src/vnet/fib/fib_path.c
@@
-106,17
+106,8
@@
typedef enum fib_path_type_t_ {
* via a DVR.
*/
FIB_PATH_TYPE_DVR,
* via a DVR.
*/
FIB_PATH_TYPE_DVR,
- /**
- * Marker. Add new types before this one, then update it.
- */
- FIB_PATH_TYPE_LAST = FIB_PATH_TYPE_BIER_FMASK,
} __attribute__ ((packed)) fib_path_type_t;
} __attribute__ ((packed)) fib_path_type_t;
-/**
- * The maximum number of path_types
- */
-#define FIB_PATH_TYPE_MAX (FIB_PATH_TYPE_LAST + 1)
-
#define FIB_PATH_TYPES { \
[FIB_PATH_TYPE_ATTACHED_NEXT_HOP] = "attached-nexthop", \
[FIB_PATH_TYPE_ATTACHED] = "attached", \
#define FIB_PATH_TYPES { \
[FIB_PATH_TYPE_ATTACHED_NEXT_HOP] = "attached-nexthop", \
[FIB_PATH_TYPE_ATTACHED] = "attached", \
@@
-133,11
+124,6
@@
typedef enum fib_path_type_t_ {
[FIB_PATH_TYPE_DVR] = "dvr", \
}
[FIB_PATH_TYPE_DVR] = "dvr", \
}
-#define FOR_EACH_FIB_PATH_TYPE(_item) \
- for (_item = FIB_PATH_TYPE_FIRST; \
- _item <= FIB_PATH_TYPE_LAST; \
- _item++)
-
/**
* Enurmeration of path operational (i.e. derived) attributes
*/
/**
* Enurmeration of path operational (i.e. derived) attributes
*/
@@
-259,6
+245,10
@@
typedef struct fib_path_t_ {
u32 fp_interface;
} attached_next_hop;
struct {
u32 fp_interface;
} attached_next_hop;
struct {
+ /**
+ * The Connected local address
+ */
+ fib_prefix_t fp_connected;
/**
* The interface
*/
/**
* The interface
*/
@@
-645,14
+635,16
@@
fib_path_last_lock_gone (fib_node_t *node)
ASSERT(0);
}
ASSERT(0);
}
-static
void
+static
fib_path_t*
fib_path_attached_next_hop_get_adj (fib_path_t *path,
vnet_link_t link,
dpo_id_t *dpo)
{
fib_path_attached_next_hop_get_adj (fib_path_t *path,
vnet_link_t link,
dpo_id_t *dpo)
{
+ fib_node_index_t fib_path_index;
fib_protocol_t nh_proto;
adj_index_t ai;
fib_protocol_t nh_proto;
adj_index_t ai;
+ fib_path_index = fib_path_get_index(path);
nh_proto = dpo_proto_to_fib(path->fp_nh_proto);
if (vnet_sw_interface_is_p2p(vnet_get_main(),
nh_proto = dpo_proto_to_fib(path->fp_nh_proto);
if (vnet_sw_interface_is_p2p(vnet_get_main(),
@@
-676,6
+668,8
@@
fib_path_attached_next_hop_get_adj (fib_path_t *path,
dpo_set(dpo, DPO_ADJACENCY, vnet_link_to_dpo_proto(link), ai);
adj_unlock(ai);
dpo_set(dpo, DPO_ADJACENCY, vnet_link_to_dpo_proto(link), ai);
adj_unlock(ai);
+
+ return (fib_path_get(fib_path_index));
}
static void
}
static void
@@
-685,9
+679,9
@@
fib_path_attached_next_hop_set (fib_path_t *path)
* resolve directly via the adjacency discribed by the
* interface and next-hop
*/
* resolve directly via the adjacency discribed by the
* interface and next-hop
*/
- fib_path_attached_next_hop_get_adj(path,
- dpo_proto_to_link(path->fp_nh_proto),
- &path->fp_dpo);
+
path =
fib_path_attached_next_hop_get_adj(path,
+
dpo_proto_to_link(path->fp_nh_proto),
+
&path->fp_dpo);
ASSERT(dpo_is_adj(&path->fp_dpo));
ASSERT(dpo_is_adj(&path->fp_dpo));
@@
-742,7
+736,7
@@
fib_path_attached_get_adj (fib_path_t *path,
ai = adj_glean_add_or_lock(nh_proto, link,
path->attached.fp_interface,
ai = adj_glean_add_or_lock(nh_proto, link,
path->attached.fp_interface,
-
NULL
);
+
&path->attached.fp_connected
);
dpo_set(dpo, DPO_ADJACENCY_GLEAN, vnet_link_to_dpo_proto(link), ai);
adj_unlock(ai);
}
dpo_set(dpo, DPO_ADJACENCY_GLEAN, vnet_link_to_dpo_proto(link), ai);
adj_unlock(ai);
}
@@
-1111,7
+1105,7
@@
FIXME comment
vnet_get_main(),
path->attached_next_hop.fp_interface);
vnet_get_main(),
path->attached_next_hop.fp_interface);
- fib_path_attached_next_hop_get_adj(
+
path =
fib_path_attached_next_hop_get_adj(
path,
dpo_proto_to_link(path->fp_nh_proto),
&path->fp_dpo);
path,
dpo_proto_to_link(path->fp_nh_proto),
&path->fp_dpo);
@@
-1272,6
+1266,8
@@
fib_path_route_flags_to_cfg_flags (const fib_route_path_t *rpath)
cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_UNREACH;
if (rpath->frp_flags & FIB_ROUTE_PATH_ICMP_PROHIBIT)
cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_PROHIBIT;
cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_UNREACH;
if (rpath->frp_flags & FIB_ROUTE_PATH_ICMP_PROHIBIT)
cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_PROHIBIT;
+ if (rpath->frp_flags & FIB_ROUTE_PATH_GLEAN)
+ cfg_flags |= FIB_PATH_CFG_FLAG_GLEAN;
return (cfg_flags);
}
return (cfg_flags);
}
@@
-1375,6
+1371,12
@@
fib_path_create (fib_node_index_t pl_index,
path->fp_type = FIB_PATH_TYPE_SPECIAL;
path->classify.fp_classify_table_id = rpath->frp_classify_table_id;
}
path->fp_type = FIB_PATH_TYPE_SPECIAL;
path->classify.fp_classify_table_id = rpath->frp_classify_table_id;
}
+ else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_GLEAN)
+ {
+ path->fp_type = FIB_PATH_TYPE_ATTACHED;
+ path->attached.fp_interface = rpath->frp_sw_if_index;
+ path->attached.fp_connected = rpath->frp_connected;
+ }
else if (~0 != rpath->frp_sw_if_index)
{
if (ip46_address_is_zero(&rpath->frp_addr))
else if (~0 != rpath->frp_sw_if_index)
{
if (ip46_address_is_zero(&rpath->frp_addr))
@@
-2115,7
+2117,7
@@
fib_path_resolve (fib_node_index_t path_index)
break;
}
case FIB_PATH_TYPE_DVR:
break;
}
case FIB_PATH_TYPE_DVR:
- dvr_dpo_add_or_lock(path->
attached
.fp_interface,
+ dvr_dpo_add_or_lock(path->
dvr
.fp_interface,
path->fp_nh_proto,
&path->fp_dpo);
break;
path->fp_nh_proto,
&path->fp_dpo);
break;
@@
-2447,10
+2449,10
@@
fib_path_contribute_forwarding (fib_node_index_t path_index,
case FIB_FORW_CHAIN_TYPE_NSH:
case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
case FIB_FORW_CHAIN_TYPE_NSH:
case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
- fib_path_attached_next_hop_get_adj(
-
path,
-
fib_forw_chain_type_to_link_type(fct),
-
dpo);
+
path =
fib_path_attached_next_hop_get_adj(
+ path,
+ fib_forw_chain_type_to_link_type(fct),
+ dpo);
break;
case FIB_FORW_CHAIN_TYPE_BIER:
break;
break;
case FIB_FORW_CHAIN_TYPE_BIER:
break;