42fdfc126a
field. This returns the sdl_data field to a variable-length field. More importantly, this prevents a easily-reproduceable data-corruption bug when the interface name plus the hardware address exceed the sdl_data field's original 12 byte limit. However, token-ring interfaces may still overflow the new sdl_data field's 46 byte limit if the interface name exceeds 6 characters (since 6 characters for interface name plus 6 for hardware address plus 34 for source routing = the size of sdl_data). Further refinements could overcome this limitation but would break binary compatibility; this commit only addresses fixing the bug for commonly-occuring cases without breaking binary compatibility with the intention that the functionality can be MFC'ed to -stable. See message ID's (both send to -arch): 20020421013332.F87395-100000@gateway.posi.net 20020430181359.G11009-300000@gateway.posi.net for a more thorough description of the bug addressed and how to reproduce it. Approved by: silence on -arch and -net Sponsored by: NTT Multimedia Communications Labs MFC after: 1 week
87 lines
3.5 KiB
C
87 lines
3.5 KiB
C
/*
|
|
* Copyright (c) 1990, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)if_dl.h 8.1 (Berkeley) 6/10/93
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _NET_IF_DL_H_
|
|
#define _NET_IF_DL_H_
|
|
|
|
/*
|
|
* A Link-Level Sockaddr may specify the interface in one of two
|
|
* ways: either by means of a system-provided index number (computed
|
|
* anew and possibly differently on every reboot), or by a human-readable
|
|
* string such as "il0" (for managerial convenience).
|
|
*
|
|
* Census taking actions, such as something akin to SIOCGCONF would return
|
|
* both the index and the human name.
|
|
*
|
|
* High volume transactions (such as giving a link-level ``from'' address
|
|
* in a recvfrom or recvmsg call) may be likely only to provide the indexed
|
|
* form, (which requires fewer copy operations and less space).
|
|
*
|
|
* The form and interpretation of the link-level address is purely a matter
|
|
* of convention between the device driver and its consumers; however, it is
|
|
* expected that all drivers for an interface of a given if_type will agree.
|
|
*/
|
|
|
|
/*
|
|
* Structure of a Link-Level sockaddr:
|
|
*/
|
|
struct sockaddr_dl {
|
|
u_char sdl_len; /* Total length of sockaddr */
|
|
u_char sdl_family; /* AF_LINK */
|
|
u_short sdl_index; /* if != 0, system given index for interface */
|
|
u_char sdl_type; /* interface type */
|
|
u_char sdl_nlen; /* interface name length, no trailing 0 reqd. */
|
|
u_char sdl_alen; /* link level address length */
|
|
u_char sdl_slen; /* link layer selector length */
|
|
char sdl_data[46]; /* minimum work area, can be larger;
|
|
contains both if name and ll address */
|
|
};
|
|
|
|
#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
|
|
|
|
#ifndef _KERNEL
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__BEGIN_DECLS
|
|
void link_addr(const char *, struct sockaddr_dl *);
|
|
char *link_ntoa(const struct sockaddr_dl *);
|
|
__END_DECLS
|
|
|
|
#endif /* !_KERNEL */
|
|
|
|
#endif
|