| if_gif.c (159174) | if_gif.c (159180) |
|---|---|
| 1/* $FreeBSD: head/sys/net/if_gif.c 159174 2006-06-02 14:10:52Z glebius $ */ | 1/* $FreeBSD: head/sys/net/if_gif.c 159180 2006-06-02 19:59:33Z csjp $ */ |
| 2/* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ 3 4/*- 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 410 unchanged lines hidden (view full) --- 420 421 /* BPF writes need to be handled specially. */ 422 if (dst->sa_family == AF_UNSPEC) { 423 bcopy(dst->sa_data, &af, sizeof(af)); 424 dst->sa_family = af; 425 } 426 427 af = dst->sa_family; | 2/* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ 3 4/*- 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 410 unchanged lines hidden (view full) --- 420 421 /* BPF writes need to be handled specially. */ 422 if (dst->sa_family == AF_UNSPEC) { 423 bcopy(dst->sa_data, &af, sizeof(af)); 424 dst->sa_family = af; 425 } 426 427 af = dst->sa_family; |
| 428 if (ifp->if_bpf) { 429 bpf_mtap2(ifp->if_bpf, &af, sizeof(af), m); 430 } | 428 BPF_MTAP2(ifp, &af, sizeof(af), m); |
| 431 ifp->if_opackets++; 432 ifp->if_obytes += m->m_pkthdr.len; 433 434 /* override to IPPROTO_ETHERIP for bridged traffic */ 435 if (ifp->if_bridge) 436 af = AF_LINK; 437 438 /* inner AF-specific encapsulation */ --- 40 unchanged lines hidden (view full) --- 479 } 480 481 m->m_pkthdr.rcvif = ifp; 482 483#ifdef MAC 484 mac_create_mbuf_from_ifnet(ifp, m); 485#endif 486 | 429 ifp->if_opackets++; 430 ifp->if_obytes += m->m_pkthdr.len; 431 432 /* override to IPPROTO_ETHERIP for bridged traffic */ 433 if (ifp->if_bridge) 434 af = AF_LINK; 435 436 /* inner AF-specific encapsulation */ --- 40 unchanged lines hidden (view full) --- 477 } 478 479 m->m_pkthdr.rcvif = ifp; 480 481#ifdef MAC 482 mac_create_mbuf_from_ifnet(ifp, m); 483#endif 484 |
| 487 if (ifp->if_bpf) { | 485 if (bpf_peers_present(ifp->if_bpf)) { |
| 488 u_int32_t af1 = af; 489 bpf_mtap2(ifp->if_bpf, &af1, sizeof(af1), m); 490 } 491 492 if (ng_gif_input_p != NULL) { 493 (*ng_gif_input_p)(ifp, &m, af); 494 if (m == NULL) 495 return; --- 468 unchanged lines hidden --- | 486 u_int32_t af1 = af; 487 bpf_mtap2(ifp->if_bpf, &af1, sizeof(af1), m); 488 } 489 490 if (ng_gif_input_p != NULL) { 491 (*ng_gif_input_p)(ifp, &m, af); 492 if (m == NULL) 493 return; --- 468 unchanged lines hidden --- |