Deleted Added
full compact
ip_carp.c (160164) ip_carp.c (160195)
1/* $FreeBSD: head/sys/netinet/ip_carp.c 160164 2006-07-08 00:01:01Z mlaier $ */
1/* $FreeBSD: head/sys/netinet/ip_carp.c 160195 2006-07-09 06:04:01Z sam $ */
2
3/*
4 * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
5 * Copyright (c) 2003 Ryan McBride. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

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

184
185static void carp_hmac_prepare(struct carp_softc *);
186static void carp_hmac_generate(struct carp_softc *, u_int32_t *,
187 unsigned char *);
188static int carp_hmac_verify(struct carp_softc *, u_int32_t *,
189 unsigned char *);
190static void carp_setroute(struct carp_softc *, int);
191static void carp_input_c(struct mbuf *, struct carp_header *, sa_family_t);
2
3/*
4 * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
5 * Copyright (c) 2003 Ryan McBride. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

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

184
185static void carp_hmac_prepare(struct carp_softc *);
186static void carp_hmac_generate(struct carp_softc *, u_int32_t *,
187 unsigned char *);
188static int carp_hmac_verify(struct carp_softc *, u_int32_t *,
189 unsigned char *);
190static void carp_setroute(struct carp_softc *, int);
191static void carp_input_c(struct mbuf *, struct carp_header *, sa_family_t);
192static int carp_clone_create(struct if_clone *, int);
192static int carp_clone_create(struct if_clone *, int, caddr_t);
193static void carp_clone_destroy(struct ifnet *);
194static void carpdetach(struct carp_softc *);
195static int carp_prepare_ad(struct mbuf *, struct carp_softc *,
196 struct carp_header *);
197static void carp_send_ad_all(void);
198static void carp_send_ad(void *);
199static void carp_send_ad_locked(struct carp_softc *);
200static void carp_send_arp(struct carp_softc *);

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

347 in6_ifremloop(ifa);
348 }
349#endif /* INET6 */
350 }
351 splx(s);
352}
353
354static int
193static void carp_clone_destroy(struct ifnet *);
194static void carpdetach(struct carp_softc *);
195static int carp_prepare_ad(struct mbuf *, struct carp_softc *,
196 struct carp_header *);
197static void carp_send_ad_all(void);
198static void carp_send_ad(void *);
199static void carp_send_ad_locked(struct carp_softc *);
200static void carp_send_arp(struct carp_softc *);

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

347 in6_ifremloop(ifa);
348 }
349#endif /* INET6 */
350 }
351 splx(s);
352}
353
354static int
355carp_clone_create(struct if_clone *ifc, int unit)
355carp_clone_create(struct if_clone *ifc, int unit, caddr_t params)
356{
357
358 struct carp_softc *sc;
359 struct ifnet *ifp;
360
361 MALLOC(sc, struct carp_softc *, sizeof(*sc), M_CARP, M_WAITOK|M_ZERO);
362 ifp = SC2IFP(sc) = if_alloc(IFT_ETHER);
363 if (ifp == NULL) {

--- 1824 unchanged lines hidden ---
356{
357
358 struct carp_softc *sc;
359 struct ifnet *ifp;
360
361 MALLOC(sc, struct carp_softc *, sizeof(*sc), M_CARP, M_WAITOK|M_ZERO);
362 ifp = SC2IFP(sc) = if_alloc(IFT_ETHER);
363 if (ifp == NULL) {

--- 1824 unchanged lines hidden ---