[Olsr-cvs] olsrd-current/src/linux kernel_routes.c,1.24,1.25

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/src/linux
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21820/src/linux

Modified Files:
	kernel_routes.c 
Log Message:
* applied 102-olsrd-rt-refactoring-fixes.patch from Sven-Ola Tuecke <(spam-protected)>

Index: kernel_routes.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/linux/kernel_routes.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** kernel_routes.c	5 Sep 2007 16:11:11 -0000	1.24
--- kernel_routes.c	5 Sep 2007 16:17:36 -0000	1.25
***************
*** 92,96 ****
     * Set interface
     */
!   kernel_route.rt_dev = rt->rt_best->rtp_nexthop.iface->int_name;
  
    /* delete existing default route before ? */
--- 92,96 ----
     * Set interface
     */
!   kernel_route.rt_dev = if_ifwithindex_name(rt->rt_best->rtp_nexthop.iif_index);
  
    /* delete existing default route before ? */
***************
*** 109,113 ****
      ipc_route_send_rtentry(&rt->rt_dst.prefix, &rt->rt_best->rtp_nexthop.gateway,
                             rt->rt_best->rtp_metric.hops, 1,
!                            rt->rt_best->rtp_nexthop.iface->int_name);
    }
  
--- 109,113 ----
      ipc_route_send_rtentry(&rt->rt_dst.prefix, &rt->rt_best->rtp_nexthop.gateway,
                             rt->rt_best->rtp_metric.hops, 1,
!                            if_ifwithindex_name(rt->rt_best->rtp_nexthop.iif_index));
    }
  
***************
*** 145,149 ****
     * set interface
     */
!   kernel_route.rtmsg_ifindex = rt->rt_best->rtp_nexthop.iface->if_index;
    
    /* XXX delete 0/0 route before ? */
--- 145,149 ----
     * set interface
     */
!   kernel_route.rtmsg_ifindex = rt->rt_best->rtp_nexthop.iif_index;
    
    /* XXX delete 0/0 route before ? */
***************
*** 156,160 ****
      ipc_route_send_rtentry(&rt->rt_dst.prefix, &rt->rt_best->rtp_nexthop.gateway, 
                             rt->rt_best->rtp_metric.hops, 1,
!                            rt->rt_best->rtp_nexthop.iface->int_name);
    }
  
--- 156,160 ----
      ipc_route_send_rtentry(&rt->rt_dst.prefix, &rt->rt_best->rtp_nexthop.gateway, 
                             rt->rt_best->rtp_metric.hops, 1,
!                            if_ifwithindex_name(rt->rt_best->rtp_nexthop.iif_index));
    }