d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- style(9) fixes for 'return'.

Browse Source 
- retire RTALLOC1 and ARPRESOLVE macros.
- use IFP2AC to hide discracting casts.
This commit is contained in:
Matthew N. Dodd 2002-03-29 08:04:36 +00:00
parent 28c9592779
commit 7fc55739a7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=93369
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sys/net/if_fddisubr.c
View File

@ -93,8 +93,6 @@ extern u_char aarp_org_code[ 3 ];
static int fddi_resolvemulti(struct ifnet *, struct sockaddr **, static int fddi_resolvemulti(struct ifnet *, struct sockaddr **,
struct sockaddr *); struct sockaddr *);
#define senderr(e) { error = (e); goto bad;}
/* /*
* This really should be defined in if_llc.h but in case it isn't. * This really should be defined in if_llc.h but in case it isn't.
*/ */
@ -102,8 +100,9 @@ static int fddi_resolvemulti(struct ifnet *, struct sockaddr **,
#define llc_snap llc_un.type_snap #define llc_snap llc_un.type_snap
#endif #endif
#define RTALLOC1(a, b) rtalloc1(a, b, 0UL) #define IFP2AC(IFP) ((struct arpcom *)IFP)
#define ARPRESOLVE(a, b, c, d, e, f) arpresolve(a, b, c, d, e, f) #define senderr(e) { error = (e); goto bad; }
/* /*
* FDDI output routine. * FDDI output routine.
* Encapsulate a packet of type family for the local net. * Encapsulate a packet of type family for the local net.
@ -123,14 +122,14 @@ fddi_output(ifp, m, dst, rt0)
u_char esrc[6], edst[6]; u_char esrc[6], edst[6];
struct rtentry *rt; struct rtentry *rt;
struct fddi_header *fh; struct fddi_header *fh;
struct arpcom *ac = (struct arpcom *)ifp; struct arpcom *ac = IFP2AC(ifp);
if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
senderr(ENETDOWN); senderr(ENETDOWN);
getmicrotime(&ifp->if_lastchange); getmicrotime(&ifp->if_lastchange);
if ((rt = rt0) != NULL) { if ((rt = rt0) != NULL) {
if ((rt->rt_flags & RTF_UP) == 0) { if ((rt->rt_flags & RTF_UP) == 0) {
if ((rt0 = rt = RTALLOC1(dst, 1)) != NULL) if ((rt0 = rt = rtalloc1(dst, 1, 0UL)) != NULL)
rt->rt_refcnt--; rt->rt_refcnt--;
else else
senderr(EHOSTUNREACH); senderr(EHOSTUNREACH);
@ -140,7 +139,7 @@ fddi_output(ifp, m, dst, rt0)
goto lookup; goto lookup;
if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) { if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
rtfree(rt); rt = rt0; rtfree(rt); rt = rt0;
lookup: rt->rt_gwroute = RTALLOC1(rt->rt_gateway, 1); lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1, 0UL);
if ((rt = rt->rt_gwroute) == 0) if ((rt = rt->rt_gwroute) == 0)
senderr(EHOSTUNREACH); senderr(EHOSTUNREACH);
} }
@ -154,7 +153,7 @@ fddi_output(ifp, m, dst, rt0)
#ifdef INET #ifdef INET
case AF_INET: { case AF_INET: {
if (!ARPRESOLVE(ifp, rt, m, dst, edst, rt0)) if (!arpresolve(ifp, rt, m, dst, edst, rt0))
return (0); /* if not yet resolved */ return (0); /* if not yet resolved */
type = htons(ETHERTYPE_IP); type = htons(ETHERTYPE_IP);
break; break;
@ -164,7 +163,7 @@ fddi_output(ifp, m, dst, rt0)
case AF_INET6: case AF_INET6:
if (!nd6_storelladdr(&ac->ac_if, rt, m, dst, (u_char *)edst)) { if (!nd6_storelladdr(&ac->ac_if, rt, m, dst, (u_char *)edst)) {
/* Something bad happened */ /* Something bad happened */
return(0); return (0);
} }
type = htons(ETHERTYPE_IPV6); type = htons(ETHERTYPE_IPV6);
break; break;
@ -328,7 +327,7 @@ fddi_output(ifp, m, dst, rt0)
fh->fddi_shost, sizeof(fh->fddi_shost)) == 0) { fh->fddi_shost, sizeof(fh->fddi_shost)) == 0) {
(void) if_simloop(ifp, (void) if_simloop(ifp,
m, dst->sa_family, sizeof(struct fddi_header)); m, dst->sa_family, sizeof(struct fddi_header));
return(0); /* XXX */ return (0); /* XXX */
} }
} }
@ -370,7 +369,7 @@ fddi_input(ifp, fh, m)
m->m_flags |= M_MCAST; m->m_flags |= M_MCAST;
ifp->if_imcasts++; ifp->if_imcasts++;
} else if ((ifp->if_flags & IFF_PROMISC) } else if ((ifp->if_flags & IFF_PROMISC)
&& bcmp(((struct arpcom *)ifp)->ac_enaddr, (caddr_t)fh->fddi_dhost, && bcmp(IFP2AC(ifp)->ac_enaddr, (caddr_t)fh->fddi_dhost,
sizeof(fh->fddi_dhost)) != 0) { sizeof(fh->fddi_dhost)) != 0) {
m_freem(m); m_freem(m);
return; return;
@ -408,7 +407,7 @@ fddi_input(ifp, fh, m)
sizeof(aarp_org_code)) == 0 && sizeof(aarp_org_code)) == 0 &&
ntohs(l->llc_snap_ether_type) == ETHERTYPE_AARP) { ntohs(l->llc_snap_ether_type) == ETHERTYPE_AARP) {
m_adj( m, sizeof( struct llc )); m_adj( m, sizeof( struct llc ));
aarpinput((struct arpcom *)ifp, m); /* XXX */ aarpinput(IFP2AC(ifp), m); /* XXX */
return; return;
} }
#endif /* NETATALK */ #endif /* NETATALK */
@ -463,7 +462,7 @@ fddi_input(ifp, fh, m)
break; break;
case ETHERTYPE_AARP: case ETHERTYPE_AARP:
/* probably this should be done with a NETISR as well */ /* probably this should be done with a NETISR as well */
aarpinput((struct arpcom *)ifp, m); /* XXX */ aarpinput(IFP2AC(ifp), m); /* XXX */
return; return;
#endif /* NETATALK */ #endif /* NETATALK */
default: default:
@ -510,7 +509,7 @@ fddi_ifattach(ifp)
sdl = (struct sockaddr_dl *)ifa->ifa_addr; sdl = (struct sockaddr_dl *)ifa->ifa_addr;
sdl->sdl_type = IFT_FDDI; sdl->sdl_type = IFT_FDDI;
sdl->sdl_alen = ifp->if_addrlen; sdl->sdl_alen = ifp->if_addrlen;
bcopy(((struct arpcom *)ifp)->ac_enaddr, LLADDR(sdl), ifp->if_addrlen); bcopy(IFP2AC(ifp)->ac_enaddr, LLADDR(sdl), ifp->if_addrlen);
} }
static int static int
@ -534,15 +533,15 @@ fddi_resolvemulti(ifp, llsa, sa)
sdl = (struct sockaddr_dl *)sa; sdl = (struct sockaddr_dl *)sa;
e_addr = LLADDR(sdl); e_addr = LLADDR(sdl);
if ((e_addr[0] & 1) != 1) if ((e_addr[0] & 1) != 1)
return EADDRNOTAVAIL; return (EADDRNOTAVAIL);
*llsa = 0; *llsa = 0;
return 0; return (0);
#ifdef INET #ifdef INET
case AF_INET: case AF_INET:
sin = (struct sockaddr_in *)sa; sin = (struct sockaddr_in *)sa;
if (!IN_MULTICAST(ntohl(sin->sin_addr.s_addr))) if (!IN_MULTICAST(ntohl(sin->sin_addr.s_addr)))
return EADDRNOTAVAIL; return (EADDRNOTAVAIL);
MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR, MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
M_WAITOK); M_WAITOK);
sdl->sdl_len = sizeof *sdl; sdl->sdl_len = sizeof *sdl;
@ -555,7 +554,7 @@ fddi_resolvemulti(ifp, llsa, sa)
e_addr = LLADDR(sdl); e_addr = LLADDR(sdl);
ETHER_MAP_IP_MULTICAST(&sin->sin_addr, e_addr); ETHER_MAP_IP_MULTICAST(&sin->sin_addr, e_addr);
*llsa = (struct sockaddr *)sdl; *llsa = (struct sockaddr *)sdl;
return 0; return (0);
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6:
@ -568,10 +567,10 @@ fddi_resolvemulti(ifp, llsa, sa)
*/ */
ifp->if_flags |= IFF_ALLMULTI; ifp->if_flags |= IFF_ALLMULTI;
*llsa = 0; *llsa = 0;
return 0; return (0);
} }
if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
return EADDRNOTAVAIL; return (EADDRNOTAVAIL);
MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR, MALLOC(sdl, struct sockaddr_dl *, sizeof *sdl, M_IFMADDR,
M_WAITOK); M_WAITOK);
sdl->sdl_len = sizeof *sdl; sdl->sdl_len = sizeof *sdl;
@ -584,7 +583,7 @@ fddi_resolvemulti(ifp, llsa, sa)
e_addr = LLADDR(sdl); e_addr = LLADDR(sdl);
ETHER_MAP_IPV6_MULTICAST(&sin6->sin6_addr, e_addr); ETHER_MAP_IPV6_MULTICAST(&sin6->sin6_addr, e_addr);
*llsa = (struct sockaddr *)sdl; *llsa = (struct sockaddr *)sdl;
return 0; return (0);
#endif #endif
default: default:
@ -592,6 +591,6 @@ fddi_resolvemulti(ifp, llsa, sa)
* Well, the text isn't quite right, but it's the name * Well, the text isn't quite right, but it's the name
* that counts... * that counts...
*/ */
return EAFNOSUPPORT; return (EAFNOSUPPORT);
} }
} }