summaryrefslogtreecommitdiff
path: root/sys/netnatm/natm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netnatm/natm.c')
-rw-r--r--sys/netnatm/natm.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index e7fca3d84b485..8bc971d636aab 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -144,6 +144,7 @@ natm_usr_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
struct natmpcb *npcb;
struct sockaddr_natm *snatm;
struct atm_pseudoioctl api;
+ struct atm_pseudohdr *aph;
struct ifnet *ifp;
int error = 0;
int s2, s = SPLSOFTNET();
@@ -225,10 +226,13 @@ static int
natm_usr_disconnect(struct socket *so)
{
struct natmpcb *npcb;
+ struct sockaddr_natm *snatm;
struct atm_pseudoioctl api;
+ struct atm_pseudohdr *aph;
struct ifnet *ifp;
int error = 0;
int s2, s = SPLSOFTNET();
+ int proto = so->so_proto->pr_protocol;
npcb = (struct natmpcb *) so->so_pcb;
if (npcb == NULL) {
@@ -333,8 +337,8 @@ natm_usr_peeraddr(struct socket *so, struct sockaddr **nam)
bzero(snatm, sizeof(*snatm));
snatm->snatm_len = sizeof(*snatm);
snatm->snatm_family = AF_NATM;
- snprintf(snatm->snatm_if, sizeof(snatm->snatm_if),
- "%s%d", npcb->npcb_ifp->if_name, npcb->npcb_ifp->if_unit);
+ sprintf(snatm->snatm_if, "%s%d", npcb->npcb_ifp->if_name,
+ npcb->npcb_ifp->if_unit);
snatm->snatm_vci = npcb->npcb_vci;
snatm->snatm_vpi = npcb->npcb_vpi;
*nam = dup_sockaddr((struct sockaddr *)snatm, 0);
@@ -623,8 +627,8 @@ struct proc *p;
#if defined(__NetBSD__) || defined(__OpenBSD__)
bcopy(npcb->npcb_ifp->if_xname, snatm->snatm_if, sizeof(snatm->snatm_if));
#elif defined(__FreeBSD__)
- snprintf(snatm->snatm_if, sizeof(snatm->snatm_if),
- "%s%d", npcb->npcb_ifp->if_name, npcb->npcb_ifp->if_unit);
+ sprintf(snatm->snatm_if, "%s%d", npcb->npcb_ifp->if_name,
+ npcb->npcb_ifp->if_unit);
#endif
snatm->snatm_vci = npcb->npcb_vci;
snatm->snatm_vpi = npcb->npcb_vpi;