[Olsr-cvs] olsrd-current/src/win32 kernel_routes.c,1.21,1.22

[Bernd Petrovitsch]

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

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/win32/kernel_routes.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** kernel_routes.c	5 Sep 2007 16:11:11 -0000	1.21
--- kernel_routes.c	5 Sep 2007 16:17:36 -0000	1.22
***************
*** 80,84 ****
    Row.dwForwardPolicy = 0;
    Row.dwForwardNextHop = rt->rt_best->rtp_nexthop.gateway.v4;
!   Row.dwForwardIfIndex = rt->rt_best->rtp_nexthop.iface->if_index;
    // MIB_IPROUTE_TYPE_DIRECT and MIB_IPROUTE_TYPE_INDIRECT
    Row.dwForwardType = (rt->rt_dst.prefix.v4 == rt->rt_best->rtp_nexthop.gateway.v4) ? 3 : 4;
--- 80,84 ----
    Row.dwForwardPolicy = 0;
    Row.dwForwardNextHop = rt->rt_best->rtp_nexthop.gateway.v4;
!   Row.dwForwardIfIndex = rt->rt_best->rtp_nexthop.iif_index;
    // MIB_IPROUTE_TYPE_DIRECT and MIB_IPROUTE_TYPE_INDIRECT
    Row.dwForwardType = (rt->rt_dst.prefix.v4 == rt->rt_best->rtp_nexthop.gateway.v4) ? 3 : 4;
***************
*** 119,123 ****
      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);
    }
  
--- 119,123 ----
      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_name));
    }
  
***************
*** 159,163 ****
    Row.dwForwardPolicy = 0;
    Row.dwForwardNextHop = rt->rt_nexthop.gateway.v4;
!   Row.dwForwardIfIndex = rt->rt_nexthop.iface->if_index;
    // MIB_IPROUTE_TYPE_DIRECT and MIB_IPROUTE_TYPE_INDIRECT
    Row.dwForwardType = (rt->rt_dst.prefix.v4 == rt->rt_nexthop.gateway.v4) ? 3 : 4;
--- 159,163 ----
    Row.dwForwardPolicy = 0;
    Row.dwForwardNextHop = rt->rt_nexthop.gateway.v4;
!   Row.dwForwardIfIndex = rt->rt_nexthop.iif_index;
    // MIB_IPROUTE_TYPE_DIRECT and MIB_IPROUTE_TYPE_INDIRECT
    Row.dwForwardType = (rt->rt_dst.prefix.v4 == rt->rt_nexthop.gateway.v4) ? 3 : 4;