Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save some lines of code, use sockaddr_dup(), sockaddr_free(),

Browse Source 
sockaddr_cmp().  No functional change intended.

Bug fix: pass M_WAITOK, not M_WAIT, to malloc(9).
This commit is contained in:
dyoung 2007-09-16 18:09:51 +00:00
parent 6418bbd280
commit 306b542543
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/net/if_gif.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gif.c,v 1.70 2007/07/14 21:02:40 ad Exp $ */
/* $NetBSD: if_gif.c,v 1.71 2007/09/16 18:09:51 dyoung Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.70 2007/07/14 21:02:40 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.71 2007/09/16 18:09:51 dyoung Exp $");
#include "opt_inet.h"
#include "opt_iso.h"
@ -135,7 +135,7 @@ gif_clone_create(struct if_clone *ifc, int unit)
{
struct gif_softc *sc;
sc = malloc(sizeof(struct gif_softc), M_DEVBUF, M_WAIT);
sc = malloc(sizeof(struct gif_softc), M_DEVBUF, M_WAITOK);
memset(sc, 0, sizeof(struct gif_softc));
snprintf(sc->gif_if.if_xname, sizeof(sc->gif_if.if_xname), "%s%d",
@ -745,7 +745,7 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
{
struct gif_softc *sc = (struct gif_softc *)ifp;
struct gif_softc *sc2;
struct sockaddr *osrc, *odst, *sa;
struct sockaddr *osrc, *odst;
int s;
int error;
@ -756,14 +756,9 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
continue;
if (!sc2->gif_pdst || !sc2->gif_psrc)
continue;
if (sc2->gif_pdst->sa_family != dst->sa_family ||
sc2->gif_pdst->sa_len != dst->sa_len ||
sc2->gif_psrc->sa_family != src->sa_family ||
sc2->gif_psrc->sa_len != src->sa_len)
continue;
/* can't configure same pair of address onto two gifs */
if (memcmp(sc2->gif_pdst, dst, dst->sa_len) == 0 &&
memcmp(sc2->gif_psrc, src, src->sa_len) == 0) {
if (sockaddr_cmp(sc2->gif_pdst, dst) == 0 &&
sockaddr_cmp(sc2->gif_psrc, src) == 0) {
error = EADDRNOTAVAIL;
goto bad;
}
@ -798,14 +793,10 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
}
osrc = sc->gif_psrc;
sa = (struct sockaddr *)malloc(src->sa_len, M_IFADDR, M_WAITOK);
memcpy(sa, src, src->sa_len);
sc->gif_psrc = sa;
sc->gif_psrc = sockaddr_dup(src, M_WAITOK);
odst = sc->gif_pdst;
sa = (struct sockaddr *)malloc(dst->sa_len, M_IFADDR, M_WAITOK);
memcpy(sa, dst, dst->sa_len);
sc->gif_pdst = sa;
sc->gif_pdst = sockaddr_dup(dst, M_WAITOK);
switch (sc->gif_psrc->sa_family) {
#ifdef INET
@ -824,17 +815,17 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
}
if (error) {
/* rollback */
free((void *)sc->gif_psrc, M_IFADDR);
free((void *)sc->gif_pdst, M_IFADDR);
sockaddr_free(sc->gif_psrc);
sockaddr_free(sc->gif_pdst);
sc->gif_psrc = osrc;
sc->gif_pdst = odst;
goto bad;
}
if (osrc)
free((void *)osrc, M_IFADDR);
sockaddr_free(osrc);
if (odst)
free((void *)odst, M_IFADDR);
sockaddr_free(odst);
if (sc->gif_psrc && sc->gif_pdst)
ifp->if_flags |= IFF_RUNNING;
@ -871,11 +862,11 @@ gif_delete_tunnel(struct ifnet *ifp)
sc->gif_si = NULL;
}
if (sc->gif_psrc) {
free((void *)sc->gif_psrc, M_IFADDR);
sockaddr_free(sc->gif_psrc);
sc->gif_psrc = NULL;
}
if (sc->gif_pdst) {
free((void *)sc->gif_pdst, M_IFADDR);
sockaddr_free(sc->gif_pdst);
sc->gif_pdst = NULL;
}
/* it is safe to detach from both */