linux.git/net/ipv4/ipmr.c, branch v2.6.30

ipmr: use goto to common label instead of opencoding

2009-02-07T07:46:51+00:00

Signed-off-by: Ilpo Järvinen 
Signed-off-by: David S. Miller

netns: ipmr: enable namespace support in ipv4 multicast routing code

2009-01-22T21:57:41+00:00

This last patch makes the appropriate changes to use and propagate the
network namespace where needed in IPv4 multicast routing code.

This consists mainly in replacing all the remaining init_net occurences
with current netns pointer retrieved from sockets, net devices or
mfc_caches depending on the routines' contexts.

Some routines receive a new 'struct net' parameter to propagate the current
netns:
* vif_add/vif_delete
* ipmr_new_tunnel
* mroute_clean_tables
* ipmr_cache_find
* ipmr_cache_report
* ipmr_cache_unresolved
* ipmr_mfc_add/ipmr_mfc_delete
* ipmr_get_route
* rt_fill_info (in route.c)

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller

netns: ipmr: declare ipmr /proc/net entries per-namespace

2009-01-22T21:57:41+00:00

Declare IPv4 multicast forwarding /proc/net entries per-namespace:
/proc/net/ip_mr_vif
/proc/net/ip_mr_cache

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller

netns: ipmr: declare reg_vif_num per-namespace

2009-01-22T21:57:40+00:00

Preliminary work to make IPv4 multicast routing netns-aware.

Declare variable 'reg_vif_num' per-namespace, move into struct netns_ipv4.

At the moment, this variable is only referenced in init_net.

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller

netns: ipmr: declare mroute_do_assert and mroute_do_pim per-namespace

2009-01-22T21:57:40+00:00

Preliminary work to make IPv4 multicast routing netns-aware.

Declare IPv multicast routing variables 'mroute_do_assert' and
'mroute_do_pim' per-namespace in struct netns_ipv4.

At the moment, these variables are only referenced in init_net.

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller

netns: ipmr: declare counter cache_resolve_queue_len per-namespace

2009-01-22T21:57:39+00:00

Preliminary work to make IPv4 multicast routing netns-aware.

Declare variable cache_resolve_queue_len per-namespace: move it into
struct netns_ipv4.

This variable counts the number of unresolved cache entries queued in the
list mfc_unres_queue. This list is kept global to all netns as the number
of entries per namespace is limited to 10 (hardcoded in routine
ipmr_cache_unresolved).
Entries belonging to different namespaces in mfc_unres_queue will be
identified by matching the mfc_net member introduced previously in
struct mfc_cache.

Keeping this list global to all netns, also allows us to keep a single
timer (ipmr_expire_timer) to handle their expiration.
In some places cache_resolve_queue_len value was tested for arming
or deleting the timer. These tests were equivalent to testing
mfc_unres_queue value instead and are replaced in this patch.

At the moment, cache_resolve_queue_len is only referenced in init_net.

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller

netns: ipmr: dynamically allocate mfc_cache_array

2009-01-22T21:57:38+00:00

Preliminary work to make IPv4 multicast routing netns-aware.

Dynamically allocate IPv4 multicast forwarding cache, mfc_cache_array,
and move it to struct netns_ipv4.

At the moment, mfc_cache_array is only referenced in init_net.

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller

netns: ipmr: store netns in struct mfc_cache

2009-01-22T21:57:36+00:00

This patch stores into struct mfc_cache the network namespace each
mfc_cache belongs to. The new member is mfc_net.

mfc_net is assigned at cache allocation and doesn't change during
the rest of the cache entry life.
A new net parameter is added to ipmr_cache_alloc/ipmr_cache_alloc_unres.

This will help to retrieve the current netns around the IPv4 multicast
routing code.

At the moment, all mfc_cache are allocated in init_net.

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller

netns: ipmr: dynamically allocate vif_table

2009-01-22T21:57:34+00:00

Preliminary work to make IPv6 multicast routing netns-aware.

Dynamically allocate interface table vif_table and move it to
struct netns_ipv4, and update MIF_EXISTS() macro.

At the moment, vif_table is only referenced in init_net.

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller

netns: ipmr: allocate mroute_socket per-namespace.

2009-01-22T21:57:34+00:00

Preliminary work to make IPv4 multicast routing netns-aware.

Make IPv4 multicast routing mroute_socket per-namespace,
moves it into struct netns_ipv4.

At the moment, mroute_socket is only referenced in init_net.

Signed-off-by: Benjamin Thery 
Signed-off-by: David S. Miller