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

[1] add new rxso passing structure to if_atm.h 

[2] modify atm_output to handle native mode atm output mbufs
This commit is contained in:
chuck 1996-06-26 04:22:54 +00:00
parent a08c95305d
commit 4ac1ba7fe7
2 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/if_atm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_atm.h,v 1.1 1996/06/22 01:47:35 chuck Exp $ */
/* $NetBSD: if_atm.h,v 1.2 1996/06/26 04:22:54 chuck Exp $ */
/*
*
@ -63,8 +63,14 @@ struct atm_pseudohdr {
to comer */
/* pseudo ioctl */
#define SIOCATMENA _IOWR('a', 122, struct atm_pseudohdr) /* enable */
#define SIOCATMDIS _IOWR('a', 123, struct atm_pseudohdr) /* disable */
struct atm_pseudoioctl {
struct atm_pseudohdr aph;
struct socket *asock;
};
#define SIOCATMENA _IOWR('a', 122, struct atm_pseudoioctl) /* enable */
#define SIOCATMDIS _IOWR('a', 123, struct atm_pseudoioctl) /* disable */
/*
* XXX forget all the garbage in if_llc.h and do it the easy way

74
sys/net/if_atmsubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_atmsubr.c,v 1.1 1996/06/22 01:47:37 chuck Exp $ */
/* $NetBSD: if_atmsubr.c,v 1.2 1996/06/26 04:22:56 chuck Exp $ */
/*
*
@ -72,6 +72,11 @@
* "dst" = the sockaddr to send to (either IP addr, or raw VPI/VCI)
* "rt0" = the route to use
* returns: error code [0 == ok]
*
* note: special semantic: if (dst == NULL) then we assume "m" already
* has an atm_pseudohdr on it and just send it directly.
* [for native mode ATM output] if dst is null, then
* rt0 must also be NULL.
*/
int
@ -119,38 +124,49 @@ atm_output(ifp, m0, dst, rt0)
/* XXX: put RTF_REJECT code here if doing ATMARP */
}
switch (dst->sa_family) {
/*
* check for non-native ATM traffic (dst != NULL)
*/
if (dst) {
switch (dst->sa_family) {
#ifdef INET
case AF_INET:
if (!atmresolve(rt, m, dst, &atmdst)) {
m = NULL; /* XXX: atmresolve already free'd it */
senderr(EHOSTUNREACH);
/* XXX: ATMARP stuff here, watch who frees m on fail */
}
etype = htons(ETHERTYPE_IP);
break;
case AF_INET:
if (!atmresolve(rt, m, dst, &atmdst)) {
m = NULL;
/* XXX: atmresolve already free'd it */
senderr(EHOSTUNREACH);
/* XXX: put ATMARP stuff here */
/* XXX: watch who frees m on failure */
}
etype = htons(ETHERTYPE_IP);
break;
#endif
/* case AF_ATM: XXX: need raw ATM handle here? */
default:
printf("%s: can't handle af%d\n", ifp->if_xname,
dst->sa_family);
senderr(EAFNOSUPPORT);
}
default:
printf("%s: can't handle af%d\n", ifp->if_xname,
dst->sa_family);
senderr(EAFNOSUPPORT);
}
sz = sizeof(atmdst);
atm_flags = ATM_PH_FLAGS(&atmdst);
if (atm_flags & ATM_PH_LLCSNAP) sz += 8; /* sizeof snap == 8 */
M_PREPEND(m, sz, M_DONTWAIT);
if (m == 0)
senderr(ENOBUFS);
ad = mtod(m, struct atm_pseudohdr *);
*ad = atmdst;
if (atm_flags & ATM_PH_LLCSNAP) {
atmllc = (struct atmllc *)(ad + 1);
bcopy(ATMLLC_HDR, atmllc->llchdr, sizeof(atmllc->llchdr));
ATM_LLC_SETTYPE(atmllc, etype); /* already in network order */
/*
* must add atm_pseudohdr to data
*/
sz = sizeof(atmdst);
atm_flags = ATM_PH_FLAGS(&atmdst);
if (atm_flags & ATM_PH_LLCSNAP) sz += 8; /* sizeof snap == 8 */
M_PREPEND(m, sz, M_DONTWAIT);
if (m == 0)
senderr(ENOBUFS);
ad = mtod(m, struct atm_pseudohdr *);
*ad = atmdst;
if (atm_flags & ATM_PH_LLCSNAP) {
atmllc = (struct atmllc *)(ad + 1);
bcopy(ATMLLC_HDR, atmllc->llchdr,
sizeof(atmllc->llchdr));
ATM_LLC_SETTYPE(atmllc, etype);
/* note: already in network order */
}
}
/*