20c20
< * $FreeBSD: head/sys/netinet/ip_mroute.c 133720 2004-08-14 15:32:40Z dwmalone $
---
> * $FreeBSD: head/sys/netinet/ip_mroute.c 133874 2004-08-16 18:32:07Z rwatson $
134c134
< * tbftable -> each vif has one of these for storing info
---
> * tbftable -> each vif has one of these for storing info
164c164
< ENCAP_TTL, ENCAP_PROTO,
---
> ENCAP_TTL, ENCAP_PROTO,
223c223
< 0, /* frag offset */
---
> 0, /* frag offset */
955c955
< if_initname(&multicast_decap_if[i], "mdecap", i);
---
> if_initname(&multicast_decap_if[i], "mdecap", i);
1028c1028
< vifcp->vifc_vifi,
---
> vifcp->vifc_vifi,
1033c1033
< vifcp->vifc_rate_limit);
---
> vifcp->vifc_rate_limit);
1168c1168
< /*
---
> /*
1177c1177
<
---
>
1218c1218
<
---
>
1236c1236
<
---
>
1240c1240
<
---
>
1258,1262c1258,1262
< struct in_addr origin;
< struct in_addr mcastgrp;
< struct mfc *rt;
< struct mfc **nptr;
< u_long hash;
---
> struct in_addr origin;
> struct in_addr mcastgrp;
> struct mfc *rt;
> struct mfc **nptr;
> u_long hash;
1489,1490c1489,1490
< /*
< * Send message to routing daemon to install
---
> /*
> * Send message to routing daemon to install
1493c1493
<
---
>
1562,1563c1562,1563
< rte->m = mb0;
< rte->ifp = ifp;
---
> rte->m = mb0;
> rte->ifp = ifp;
1570c1570
< }
---
> }
1668c1668
< else
---
> else
1682c1682
< (void *)ifp, vifi, (void *)viftable[vifi].v_ifp);
---
> (void *)ifp, vifi, (void *)viftable[vifi].v_ifp);
1953c1953
< /*
---
> /*
1980c1980
< /*
---
> /*
2017c2017
< if (ip_mrouter == NULL)
---
> if (ip_mrouter == NULL)
2089c2089
< log(LOG_DEBUG, "phyint_send on vif %d err %d\n",
---
> log(LOG_DEBUG, "phyint_send on vif %d err %d\n",
2161c2161
< * End of token bucket filter modifications
---
> * End of token bucket filter modifications
2175c2175
<
---
>
2348c2348
<
---
>
2351c2351
<
---
>
2364c2364
<
---
>
2367c2367
<
---
>
2376c2376
<
---
>
2380c2380
<
---
>
2402c2402
<
---
>
2409c2409
<
---
>
2421c2421
<
---
>
2428c2428
<
---
>
2452c2452
<
---
>
2455c2455
<
---
>
2467c2467
<
---
>
2515c2515
<
---
>
2520c2520
<
---
>
2532c2532
<
---
>
2536c2536
<
---
>
2540c2540
< if (!(x->bm_flags & BW_METER_UPCALL_DELIVERED)) {
---
> if (!(x->bm_flags & BW_METER_UPCALL_DELIVERED)) {
2571c2571
<
---
>
2575c2575
<
---
>
2608c2608
<
---
>
2610c2610
<
---
>
2612c2612
< * Compute the measured time interval
---
> * Compute the measured time interval
2616c2616
<
---
>
2622c2622
<
---
>
2663c2663
<
---
>
2670c2670
<
---
>
2680c2680
<
---
>
2684c2684
<
---
>
2718c2718
<
---
>
2723c2723
<
---
>
2731c2731
<
---
>
2750c2750
<
---
>
2755c2755
<
---
>
2762c2762
<
---
>
2767c2767
<
---
>
2770c2770
<
---
>
2775c2775
<
---
>
2798c2798
<
---
>
2816c2816
<
---
>
2819c2819
<
---
>
2823c2823
<
---
>
2828c2828
<
---
>
2835c2835
<
---
>
2848c2848
<
---
>
2851c2851
<
---
>
2862c2862
<
---
>
2869c2869
<
---
>
2885c2885
<
---
>
2899c2899
<
---
>
2917c2917
<
---
>
2919,2920c2919,2920
< log(LOG_DEBUG, "pim_register_send: ");
<
---
> log(LOG_DEBUG, "pim_register_send: ");
>
2924c2924
<
---
>
2943c2943
<
---
>
2957c2957
<
---
>
2974c2974
<
---
>
2978c2978
<
---
>
2981c2981
<
---
>
3009c3009
<
---
>
3024c3024
<
---
>
3032c3032
<
---
>
3034c3034
<
---
>
3036c3036
<
---
>
3044c3044
<
---
>
3048c3048
<
---
>
3064c3064
<
---
>
3066c3066
<
---
>
3071c3071
<
---
>
3085c3085
<
---
>
3108c3108
<
---
>
3112c3112
<
---
>
3117c3117
<
---
>
3121c3121
<
---
>
3142c3142
<
---
>
3146c3146
<
---
>
3157c3157
<
---
>
3162c3162
< *
---
> *
3179c3179
<
---
>
3184c3184
<
---
>
3210c3210
<
---
>
3214c3214
<
---
>
3226c3226
<
---
>
3239c3239
<
---
>
3252c3252
<
---
>
3255c3255
<
---
>
3263c3263
<
---
>
3274c3274
<
---
>
3298c3298
<
---
>
3302c3302
<
---
>
3305c3305
<
---
>
3313c3313
< * as a normal multicast packet. Also, make a copy of the
---
> * as a normal multicast packet. Also, make a copy of the
3326c3326
<
---
>
3331c3331
<
---
>
3336c3336
<
---
>
3347c3347
<
---
>
3352c3352
< pim_input_to_daemon:
---
> pim_input_to_daemon: