Isolate PCB-specific ethertalk DDP functions in ddp_pcb.c, removing them

from ddp_usrreq.c.  Functions moved are:

  at_pcballoc()
  at_pcbconnect()
  at_pcbdetach()
  at_pcbdisconnect()
  at_pcbsetaddr()
  at_sockaddr()

Also moved are ddp_ports and ddpcb, global variables associated with DDP
pcbs.  This makes PCB implementation more parallel to inet, inet6, and
ipx.

1 files changed, 7 insertions, 264 deletions

diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index a827407..77d937c 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -19,207 +19,19 @@
 #include <netatalk/at.h>
 #include <netatalk/at_var.h>
 #include <netatalk/ddp_var.h>
+#include <netatalk/ddp_pcb.h>
 #include <netatalk/at_extern.h>
 
-static void at_pcbdisconnect( struct ddpcb *ddp );
-static void at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr);
-static int at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr,
-			  struct thread *td);
-static int at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, 
-			 struct thread *td);
-static void at_pcbdetach(struct socket *so, struct ddpcb *ddp);
-static int at_pcballoc(struct socket *so);
-
 static struct ddpcb	*ddp_ports[ ATPORT_LAST ];
 struct ddpcb	*ddpcb = NULL;
-static u_long	ddp_sendspace = DDP_MAXSZ; /* Max ddp size + 1 (ddp_type) */
-static u_long	ddp_recvspace = 10 * ( 587 + sizeof( struct sockaddr_at ));
-
-static struct ifqueue atintrq1, atintrq2, aarpintrq;
-
-static int
-ddp_attach(struct socket *so, int proto, struct thread *td)
-{
-	struct ddpcb	*ddp;
-	int		error = 0;
-	int		s;
-	
-
-	ddp = sotoddpcb( so );
-	if ( ddp != NULL ) {
-	    return( EINVAL);
-	}
-
-	s = splnet();
-	error = at_pcballoc( so );
-	splx(s);
-	if (error) {
-	    return (error);
-	}
-	return (soreserve( so, ddp_sendspace, ddp_recvspace ));
-}
-
-static int
-ddp_detach(struct socket *so)
-{
-	struct ddpcb	*ddp;
-	int		s;
-	
-	ddp = sotoddpcb( so );
-	if ( ddp == NULL ) {
-	    return( EINVAL);
-	}
-	s = splnet();
-	at_pcbdetach( so, ddp );
-	splx(s);
-	return(0);
-}
-
-static int      
-ddp_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
-{
-	struct ddpcb	*ddp;
-	int		error = 0;
-	int		s;
-	
-	ddp = sotoddpcb( so );
-	if ( ddp == NULL ) {
-	    return( EINVAL);
-	}
-	s = splnet();
-	error = at_pcbsetaddr(ddp, nam, td);
-	splx(s);
-	return (error);
-}
-    
-static int
-ddp_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
-{
-	struct ddpcb	*ddp;
-	int		error = 0;
-	int		s;
-	
-	ddp = sotoddpcb( so );
-	if ( ddp == NULL ) {
-	    return( EINVAL);
-	}
-
-	if ( ddp->ddp_fsat.sat_port != ATADDR_ANYPORT ) {
-	    return(EISCONN);
-	}
-
-	s = splnet();
-	error = at_pcbconnect( ddp, nam, td );
-	splx(s);
-	if ( error == 0 )
-	    soisconnected( so );
-	return(error);
-}
-
-static int
-ddp_disconnect(struct socket *so)
-{
-
-	struct ddpcb	*ddp;
-	int		s;
-	
-	ddp = sotoddpcb( so );
-	if ( ddp == NULL ) {
-	    return( EINVAL);
-	}
-	if ( ddp->ddp_fsat.sat_addr.s_node == ATADDR_ANYNODE ) {
-	    return(ENOTCONN);
-	}
-
-	s = splnet();
-	at_pcbdisconnect( ddp );
-	ddp->ddp_fsat.sat_addr.s_node = ATADDR_ANYNODE;
-	splx(s);
-	soisdisconnected( so );
-	return(0);
-}
-
-static int
-ddp_shutdown(struct socket *so)
-{
-	struct ddpcb	*ddp;
-
-	ddp = sotoddpcb( so );
-	if ( ddp == NULL ) {
-		return( EINVAL);
-	}
-	socantsendmore( so );
-	return(0);
-}
 
-static int
-ddp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
-            struct mbuf *control, struct thread *td)
-{
-	struct ddpcb	*ddp;
-	int		error = 0;
-	int		s;
-	
-	ddp = sotoddpcb( so );
-	if ( ddp == NULL ) {
-		return(EINVAL);
-	}
-
-    	if ( control && control->m_len ) {
-		return(EINVAL);
-    	}
-
-	if ( addr ) {
-		if ( ddp->ddp_fsat.sat_port != ATADDR_ANYPORT ) {
-			return(EISCONN);
-		}
-
-		s = splnet();
-		error = at_pcbconnect(ddp, addr, td);
-		splx( s );
-		if ( error ) {
-			return(error);
-		}
-	} else {
-		if ( ddp->ddp_fsat.sat_port == ATADDR_ANYPORT ) {
-			return(ENOTCONN);
-		}
-	}
-
-	s = splnet();
-	error = ddp_output( m, so );
-	if ( addr ) {
-	    at_pcbdisconnect( ddp );
-	}
-	splx(s);
-	return(error);
-}
-
-static int
-ddp_abort(struct socket *so)
-{
-	struct ddpcb	*ddp;
-	int		s;
-	
-	ddp = sotoddpcb( so );
-	if ( ddp == NULL ) {
-		return(EINVAL);
-	}
-	soisdisconnected( so );
-	s = splnet();
-	at_pcbdetach( so, ddp );
-	splx(s);
-	return(0);
-}
-
-
-static void
+void
 at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr)
 {
     *addr = sodupsockaddr((struct sockaddr *)&ddp->ddp_lsat, M_NOWAIT);
 }
 
-static int 
+int 
 at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
 {
     struct sockaddr_at	lsat, *sat;
@@ -313,7 +125,7 @@ at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
     return( 0 );
 }
 
-static int
+int
 at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
 {
     struct sockaddr_at	*sat = (struct sockaddr_at *)addr;
@@ -408,7 +220,7 @@ at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
     return( 0 );
 }
 
-static void 
+void 
 at_pcbdisconnect( struct ddpcb	*ddp )
 {
     ddp->ddp_fsat.sat_addr.s_net = ATADDR_ANYNET;
@@ -416,7 +228,7 @@ at_pcbdisconnect( struct ddpcb	*ddp )
     ddp->ddp_fsat.sat_port = ATADDR_ANYPORT;
 }
 
-static int
+int
 at_pcballoc( struct socket *so )
 {
 	struct ddpcb	*ddp;
@@ -438,7 +250,7 @@ at_pcballoc( struct socket *so )
 	return(0);
 }
 
-static void
+void
 at_pcbdetach( struct socket *so, struct ddpcb *ddp)
 {
     soisdisconnected( so );
@@ -524,72 +336,3 @@ ddp_search( struct sockaddr_at *from, struct sockaddr_at *to,
     }
     return( ddp );
 }
-static int
-at_setpeeraddr(struct socket *so, struct sockaddr **nam)
-{
-	return(EOPNOTSUPP);
-}
-
-static int
-at_setsockaddr(struct socket *so, struct sockaddr **nam)
-{
-	struct ddpcb	*ddp;
-
-	ddp = sotoddpcb( so );
-	if ( ddp == NULL ) {
-	    return( EINVAL);
-	}
-	at_sockaddr( ddp, nam );
-	return(0);
-}
-
-void 
-ddp_init(void)
-{
-
-	atintrq1.ifq_maxlen = IFQ_MAXLEN;
-	atintrq2.ifq_maxlen = IFQ_MAXLEN;
-	aarpintrq.ifq_maxlen = IFQ_MAXLEN;
-	mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF);
-	mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF);
-	mtx_init(&aarpintrq.ifq_mtx, "aarp_inq", NULL, MTX_DEF);
-	netisr_register(NETISR_ATALK1, at1intr, &atintrq1, 0);
-	netisr_register(NETISR_ATALK2, at2intr, &atintrq2, 0);
-	netisr_register(NETISR_AARP, aarpintr, &aarpintrq, 0);
-}
-
-#if 0
-static void 
-ddp_clean(void )
-{
-    struct ddpcb	*ddp;
-
-    for ( ddp = ddpcb; ddp; ddp = ddp->ddp_next ) {
-	at_pcbdetach( ddp->ddp_socket, ddp );
-    }
-}
-#endif
-
-struct pr_usrreqs ddp_usrreqs = {
-	ddp_abort,
-	pru_accept_notsupp,
-	ddp_attach,
-	ddp_bind,
-	ddp_connect,
-	pru_connect2_notsupp,
-	at_control,
-	ddp_detach,
-	ddp_disconnect,
-	pru_listen_notsupp,
-	at_setpeeraddr,
-	pru_rcvd_notsupp,
-	pru_rcvoob_notsupp,
-	ddp_send,
-	pru_sense_null,
-	ddp_shutdown,
-	at_setsockaddr,
-	sosend,
-	soreceive,
-	sopoll,
-	pru_sosetlabel_null
-};