BSD 4_4 release

[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 cb0c32b..93f8d1c 100644 (file)
--- a/usr/src/sys/netiso/cltp_usrreq.c
+++ b/usr/src/sys/netiso/cltp_usrreq.c
@@ -1,45 +1,57 @@
 /*
 /*

- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  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 AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.

  *
  *

- *     @(#)cltp_usrreq.c       7.5 (Berkeley) 6/28/90
+ * 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.
+ *
+ *     @(#)cltp_usrreq.c       8.1 (Berkeley) 6/10/93

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

-#include "param.h"
-#include "user.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "errno.h"
-#include "stat.h"
-
-#include "../net/if.h"
-#include "../net/route.h"
-
-#include "argo_debug.h"
-#include "iso.h"
-#include "iso_pcb.h"
-#include "iso_var.h"
-#include "clnp.h"
-#include "cltp_var.h"
+#include <sys/param.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/errno.h>
+#include <sys/stat.h>
+
+#include <net/if.h>
+#include <net/route.h>
+
+#include <netiso/argo_debug.h>
+#include <netiso/iso.h>
+#include <netiso/iso_pcb.h>
+#include <netiso/iso_var.h>
+#include <netiso/clnp.h>
+#include <netiso/cltp_var.h>

 #endif
 
 /*
 #endif
 
 /*


@@ -237,12 +249,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 */


@@ -254,7 +260,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)


@@ -358,11 +364,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: