Use malloc(9) for sockaddrs instead of pool(9), and remove dom_sa_pool
and dom_sa_len members from struct domain. Pools of fixed-size
objects are too rigid for sockaddr_dls, whose size can vary over
a wide range.
Return sockaddr_dl to its "historical" size. Now that I'm using
malloc(9) instead of pool(9) to allocate sockaddr_dl, I can create
a sockaddr_dl of any size in the kernel, so expanding sockaddr_dl
is useless.
Avoid using sizeof(struct sockaddr_dl) in the kernel.
Introduce sockaddr_dl_alloc() for allocating & initializing an
arbitrary sockaddr_dl on the heap.
Add an argument, the sockaddr length, to sockaddr_alloc(),
sockaddr_copy(), and sockaddr_dl_setaddr().
Constify: LLADDR() -> CLLADDR().
Where the kernel overwrites LLADDR(), use sockaddr_dl_setaddr(),
instead. Used properly, sockaddr_dl_setaddr() will not overrun
the end of the sockaddr.
2007-08-30 06:17:34 +04:00
|
|
|
/* $NetBSD: at_var.h,v 1.7 2007/08/30 02:17:36 dyoung Exp $ */
|
1997-04-03 01:31:01 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 1990,1991 Regents of The University of Michigan.
|
|
|
|
* All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, and distribute this software and
|
|
|
|
* its documentation for any purpose and without fee is hereby granted,
|
|
|
|
* provided that the above copyright notice appears in all copies and
|
|
|
|
* that both that copyright notice and this permission notice appear
|
|
|
|
* in supporting documentation, and that the name of The University
|
|
|
|
* of Michigan not be used in advertising or publicity pertaining to
|
|
|
|
* distribution of the software without specific, written prior
|
|
|
|
* permission. This software is supplied as is without expressed or
|
|
|
|
* implied warranties of any kind.
|
|
|
|
*
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
*
|
|
|
|
* Research Systems Unix Group
|
|
|
|
* The University of Michigan
|
|
|
|
* c/o Wesley Craig
|
|
|
|
* 535 W. William Street
|
|
|
|
* Ann Arbor, Michigan
|
|
|
|
* +1-313-764-2278
|
|
|
|
* netatalk@umich.edu
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _NETATALK_AT_VAR_H_
|
2005-12-11 02:21:38 +03:00
|
|
|
#define _NETATALK_AT_VAR_H_
|
2000-03-23 10:01:25 +03:00
|
|
|
|
|
|
|
#include <sys/callout.h>
|
|
|
|
|
1997-04-03 01:31:01 +04:00
|
|
|
/*
|
|
|
|
* For phase2, we need to keep not only our address on an interface,
|
|
|
|
* but also the legal networks on the interface.
|
|
|
|
*/
|
|
|
|
struct at_ifaddr {
|
|
|
|
struct ifaddr aa_ifa;
|
|
|
|
#define aa_ifp aa_ifa.ifa_ifp
|
|
|
|
struct sockaddr_at aa_addr;
|
|
|
|
struct sockaddr_at aa_broadaddr;
|
|
|
|
#define aa_dstaddr aa_broadaddr;
|
|
|
|
struct sockaddr_at aa_netmask;
|
|
|
|
int aa_flags;
|
|
|
|
u_short aa_firstnet, aa_lastnet;
|
|
|
|
int aa_probcnt;
|
|
|
|
TAILQ_ENTRY(at_ifaddr) aa_list; /* list of appletalk addresses */
|
2000-03-23 10:01:25 +03:00
|
|
|
struct callout aa_probe_ch; /* for aarpprobe() */
|
1997-04-03 01:31:01 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
struct at_aliasreq {
|
|
|
|
char ifra_name[IFNAMSIZ];
|
|
|
|
struct sockaddr_at ifra_addr;
|
|
|
|
struct sockaddr_at ifra_broadaddr;
|
|
|
|
#define ifra_dstaddr ifra_broadaddr
|
|
|
|
struct sockaddr_at ifra_mask;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define AA_SAT(aa) \
|
|
|
|
(&(aa->aa_addr))
|
|
|
|
#define satosat(sa) ((struct sockaddr_at *)(sa))
|
KNF: de-__P, bzero -> memset, bcmp -> memcmp. Remove extraneous
parentheses in return statements.
Cosmetic: don't open-code TAILQ_FOREACH().
Cosmetic: change types of variables to avoid oodles of casts: in
in6_src.c, avoid casts by changing several route_in6 pointers
to struct route pointers. Remove unnecessary casts to caddr_t
elsewhere.
Pave the way for eliminating address family-specific route caches:
soon, struct route will not embed a sockaddr, but it will hold
a reference to an external sockaddr, instead. We will set the
destination sockaddr using rtcache_setdst(). (I created a stub
for it, but it isn't used anywhere, yet.) rtcache_free() will
free the sockaddr. I have extracted from rtcache_free() a helper
subroutine, rtcache_clear(). rtcache_clear() will "forget" a
cached route, but it will not forget the destination by releasing
the sockaddr. I use rtcache_clear() instead of rtcache_free()
in rtcache_update(), because rtcache_update() is not supposed
to forget the destination.
Constify:
1 Introduce const accessor for route->ro_dst, rtcache_getdst().
2 Constify the 'dst' argument to ifnet->if_output(). This
led me to constify a lot of code called by output routines.
3 Constify the sockaddr argument to protosw->pr_ctlinput. This
led me to constify a lot of code called by ctlinput routines.
4 Introduce const macros for converting from a generic sockaddr
to family-specific sockaddrs, e.g., sockaddr_in: satocsin6,
satocsin, et cetera.
2007-02-18 01:34:07 +03:00
|
|
|
#define satocsat(sa) ((const struct sockaddr_at *)(sa))
|
1997-04-03 01:31:01 +04:00
|
|
|
|
|
|
|
#define AFA_ROUTE 0x0001
|
|
|
|
#define AFA_PROBING 0x0002
|
|
|
|
#define AFA_PHASE2 0x0004
|
|
|
|
|
|
|
|
#ifdef _KERNEL
|
Eliminate address family-specific route caches (struct route, struct
route_in6, struct route_iso), replacing all caches with a struct
route.
The principle benefit of this change is that all of the protocol
families can benefit from route cache-invalidation, which is
necessary for correct routing. Route-cache invalidation fixes an
ancient PR, kern/3508, at long last; it fixes various other PRs,
also.
Discussions with and ideas from Joerg Sonnenberger influenced this
work tremendously. Of course, all design oversights and bugs are
mine.
DETAILS
1 I added to each address family a pool of sockaddrs. I have
introduced routines for allocating, copying, and duplicating,
and freeing sockaddrs:
struct sockaddr *sockaddr_alloc(sa_family_t af, int flags);
struct sockaddr *sockaddr_copy(struct sockaddr *dst,
const struct sockaddr *src);
struct sockaddr *sockaddr_dup(const struct sockaddr *src, int flags);
void sockaddr_free(struct sockaddr *sa);
sockaddr_alloc() returns either a sockaddr from the pool belonging
to the specified family, or NULL if the pool is exhausted. The
returned sockaddr has the right size for that family; sa_family
and sa_len fields are initialized to the family and sockaddr
length---e.g., sa_family = AF_INET and sa_len = sizeof(struct
sockaddr_in). sockaddr_free() puts the given sockaddr back into
its family's pool.
sockaddr_dup() and sockaddr_copy() work analogously to strdup()
and strcpy(), respectively. sockaddr_copy() KASSERTs that the
family of the destination and source sockaddrs are alike.
The 'flags' argumet for sockaddr_alloc() and sockaddr_dup() is
passed directly to pool_get(9).
2 I added routines for initializing sockaddrs in each address
family, sockaddr_in_init(), sockaddr_in6_init(), sockaddr_iso_init(),
etc. They are fairly self-explanatory.
3 structs route_in6 and route_iso are no more. All protocol families
use struct route. I have changed the route cache, 'struct route',
so that it does not contain storage space for a sockaddr. Instead,
struct route points to a sockaddr coming from the pool the sockaddr
belongs to. I added a new method to struct route, rtcache_setdst(),
for setting the cache destination:
int rtcache_setdst(struct route *, const struct sockaddr *);
rtcache_setdst() returns 0 on success, or ENOMEM if no memory is
available to create the sockaddr storage.
It is now possible for rtcache_getdst() to return NULL if, say,
rtcache_setdst() failed. I check the return value for NULL
everywhere in the kernel.
4 Each routing domain (struct domain) has a list of live route
caches, dom_rtcache. rtflushall(sa_family_t af) looks up the
domain indicated by 'af', walks the domain's list of route caches
and invalidates each one.
2007-05-03 00:40:22 +04:00
|
|
|
int sockaddr_at_cmp(const struct sockaddr *, const struct sockaddr *);
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
sockaddr_at_init1(struct sockaddr_at *sat, const struct at_addr *addr,
|
|
|
|
uint8_t port)
|
|
|
|
{
|
|
|
|
sat->sat_port = port;
|
|
|
|
sat->sat_addr = *addr;
|
|
|
|
memset(&sat->sat_range, 0, sizeof(sat->sat_range));
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
sockaddr_at_init(struct sockaddr_at *sat, const struct at_addr *addr,
|
|
|
|
uint8_t port)
|
|
|
|
{
|
|
|
|
sat->sat_family = AF_APPLETALK;
|
|
|
|
sat->sat_len = sizeof(*sat);
|
|
|
|
sockaddr_at_init1(sat, addr, port);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct sockaddr *
|
|
|
|
sockaddr_at_alloc(const struct at_addr *addr, uint8_t port, int flags)
|
|
|
|
{
|
|
|
|
struct sockaddr *sa;
|
|
|
|
|
Use malloc(9) for sockaddrs instead of pool(9), and remove dom_sa_pool
and dom_sa_len members from struct domain. Pools of fixed-size
objects are too rigid for sockaddr_dls, whose size can vary over
a wide range.
Return sockaddr_dl to its "historical" size. Now that I'm using
malloc(9) instead of pool(9) to allocate sockaddr_dl, I can create
a sockaddr_dl of any size in the kernel, so expanding sockaddr_dl
is useless.
Avoid using sizeof(struct sockaddr_dl) in the kernel.
Introduce sockaddr_dl_alloc() for allocating & initializing an
arbitrary sockaddr_dl on the heap.
Add an argument, the sockaddr length, to sockaddr_alloc(),
sockaddr_copy(), and sockaddr_dl_setaddr().
Constify: LLADDR() -> CLLADDR().
Where the kernel overwrites LLADDR(), use sockaddr_dl_setaddr(),
instead. Used properly, sockaddr_dl_setaddr() will not overrun
the end of the sockaddr.
2007-08-30 06:17:34 +04:00
|
|
|
sa = sockaddr_alloc(AF_APPLETALK, sizeof(struct sockaddr_at), flags);
|
|
|
|
|
|
|
|
if (sa == NULL)
|
Eliminate address family-specific route caches (struct route, struct
route_in6, struct route_iso), replacing all caches with a struct
route.
The principle benefit of this change is that all of the protocol
families can benefit from route cache-invalidation, which is
necessary for correct routing. Route-cache invalidation fixes an
ancient PR, kern/3508, at long last; it fixes various other PRs,
also.
Discussions with and ideas from Joerg Sonnenberger influenced this
work tremendously. Of course, all design oversights and bugs are
mine.
DETAILS
1 I added to each address family a pool of sockaddrs. I have
introduced routines for allocating, copying, and duplicating,
and freeing sockaddrs:
struct sockaddr *sockaddr_alloc(sa_family_t af, int flags);
struct sockaddr *sockaddr_copy(struct sockaddr *dst,
const struct sockaddr *src);
struct sockaddr *sockaddr_dup(const struct sockaddr *src, int flags);
void sockaddr_free(struct sockaddr *sa);
sockaddr_alloc() returns either a sockaddr from the pool belonging
to the specified family, or NULL if the pool is exhausted. The
returned sockaddr has the right size for that family; sa_family
and sa_len fields are initialized to the family and sockaddr
length---e.g., sa_family = AF_INET and sa_len = sizeof(struct
sockaddr_in). sockaddr_free() puts the given sockaddr back into
its family's pool.
sockaddr_dup() and sockaddr_copy() work analogously to strdup()
and strcpy(), respectively. sockaddr_copy() KASSERTs that the
family of the destination and source sockaddrs are alike.
The 'flags' argumet for sockaddr_alloc() and sockaddr_dup() is
passed directly to pool_get(9).
2 I added routines for initializing sockaddrs in each address
family, sockaddr_in_init(), sockaddr_in6_init(), sockaddr_iso_init(),
etc. They are fairly self-explanatory.
3 structs route_in6 and route_iso are no more. All protocol families
use struct route. I have changed the route cache, 'struct route',
so that it does not contain storage space for a sockaddr. Instead,
struct route points to a sockaddr coming from the pool the sockaddr
belongs to. I added a new method to struct route, rtcache_setdst(),
for setting the cache destination:
int rtcache_setdst(struct route *, const struct sockaddr *);
rtcache_setdst() returns 0 on success, or ENOMEM if no memory is
available to create the sockaddr storage.
It is now possible for rtcache_getdst() to return NULL if, say,
rtcache_setdst() failed. I check the return value for NULL
everywhere in the kernel.
4 Each routing domain (struct domain) has a list of live route
caches, dom_rtcache. rtflushall(sa_family_t af) looks up the
domain indicated by 'af', walks the domain's list of route caches
and invalidates each one.
2007-05-03 00:40:22 +04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
sockaddr_at_init1(satosat(sa), addr, port);
|
|
|
|
|
|
|
|
return sa;
|
|
|
|
}
|
1997-04-03 01:31:01 +04:00
|
|
|
TAILQ_HEAD(at_ifaddrhead, at_ifaddr);
|
|
|
|
extern struct at_ifaddrhead at_ifaddr;
|
2002-05-13 01:43:23 +04:00
|
|
|
extern struct ifqueue atintrq1, atintrq2;
|
1997-04-03 01:31:01 +04:00
|
|
|
#endif
|
|
|
|
|
2005-12-11 02:21:38 +03:00
|
|
|
#endif /* !_NETATALK_AT_VAR_H_ */
|