include file for per-architecture Makefiles

[unix-history] / usr / src / sys / netiso / cltp_usrreq.c

diff --git a/usr/src/sys/netiso/cltp_usrreq.c b/usr/src/sys/netiso/cltp_usrreq.c
index 6f7df09..01f56f6 100644 (file)
--- a/usr/src/sys/netiso/cltp_usrreq.c
+++ b/usr/src/sys/netiso/cltp_usrreq.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cltp_usrreq.c       7.6 (Berkeley) %G%
+ *     @(#)cltp_usrreq.c       7.8 (Berkeley) %G%

  */
 
 #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */
  */
 
 #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */


@@ -223,12 +223,6 @@ bad:
        return (error);
 }
 
        return (error);
 }
 

-#ifndef TP_LOCAL
-/* XXXX should go in iso.h maybe? from tp_param.h, in any case */
-#define                TP_LOCAL                                22
-#define                TP_FOREIGN                              33
-#endif
-

 u_long cltp_sendspace = 9216;          /* really max datagram size */
 u_long cltp_recvspace = 40 * (1024 + sizeof(struct sockaddr_iso));
                                        /* 40 1K datagrams */
 u_long cltp_sendspace = 9216;          /* really max datagram size */
 u_long cltp_recvspace = 40 * (1024 + sizeof(struct sockaddr_iso));
                                        /* 40 1K datagrams */


@@ -240,7 +234,7 @@ cltp_usrreq(so, req, m, nam, control)
        int req;
        struct mbuf *m, *nam, *control;
 {
        int req;
        struct mbuf *m, *nam, *control;
 {

-       struct isopcb *isop = sotoisopcb(so);
+       register struct isopcb *isop = sotoisopcb(so);

        int s, error = 0;
 
        if (req == PRU_CONTROL)
        int s, error = 0;
 
        if (req == PRU_CONTROL)


@@ -344,11 +338,15 @@ cltp_usrreq(so, req, m, nam, control)
                break;
 
        case PRU_SOCKADDR:
                break;
 
        case PRU_SOCKADDR:

-               iso_getnetaddr(isop, nam, TP_LOCAL);
+               if (isop->isop_laddr)
+                       bcopy((caddr_t)isop->isop_laddr, mtod(m, caddr_t),
+                               nam->m_len = isop->isop_laddr->siso_len);

                break;
 
        case PRU_PEERADDR:
                break;
 
        case PRU_PEERADDR:

-               iso_getnetaddr(isop, nam, TP_FOREIGN);
+               if (isop->isop_faddr)
+                       bcopy((caddr_t)isop->isop_faddr, mtod(m, caddr_t),
+                               nam->m_len = isop->isop_faddr->siso_len);

                break;
 
        case PRU_SENSE:
                break;
 
        case PRU_SENSE: