Deleted Added
full compact
in_gif.c (79106) in_gif.c (82884)
1/* $FreeBSD: head/sys/netinet/in_gif.c 79106 2001-07-02 21:02:09Z brooks $ */
1/* $FreeBSD: head/sys/netinet/in_gif.c 82884 2001-09-03 20:03:55Z julian $ */
2/* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 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

--- 187 unchanged lines hidden (view full) ---

197#endif
198 }
199
200 error = ip_output(m, NULL, &sc->gif_ro, 0, NULL);
201 return(error);
202}
203
204void
2/* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 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

--- 187 unchanged lines hidden (view full) ---

197#endif
198 }
199
200 error = ip_output(m, NULL, &sc->gif_ro, 0, NULL);
201 return(error);
202}
203
204void
205in_gif_input(m, off, proto)
205in_gif_input(m, off)
206 struct mbuf *m;
207 int off;
206 struct mbuf *m;
207 int off;
208 int proto;
209{
210 struct ifnet *gifp = NULL;
211 struct ip *ip;
212 int af;
213 u_int8_t otos;
208{
209 struct ifnet *gifp = NULL;
210 struct ip *ip;
211 int af;
212 u_int8_t otos;
213 int proto;
214
215 ip = mtod(m, struct ip *);
214
215 ip = mtod(m, struct ip *);
216 proto = ip->ip_p;
216
217 gifp = (struct ifnet *)encap_getarg(m);
218
219 if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) {
220 m_freem(m);
221 ipstat.ips_nogif++;
222 return;
223 }

--- 130 unchanged lines hidden ---
217
218 gifp = (struct ifnet *)encap_getarg(m);
219
220 if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) {
221 m_freem(m);
222 ipstat.ips_nogif++;
223 return;
224 }

--- 130 unchanged lines hidden ---