SCCS-vsn: sys/sys/socketvar.h 4.8
SCCS-vsn: sys/sys/systm.h 4.21
SCCS-vsn: sys/vax/uba/ubavar.h 4.22
SCCS-vsn: sys/vax/vax/conf.c 4.44
SCCS-vsn: sys/vax/mba/mba.c 4.23
SCCS-vsn: sys/vax/uba/uba.c 4.38
SCCS-vsn: sys/vax/if/if_en.c 4.11
SCCS-vsn: sys/netinet/in_pcb.c 4.6
SCCS-vsn: sys/netinet/ip_icmp.c 4.6
SCCS-vsn: sys/netinet/ip_output.c 1.16
SCCS-vsn: sys/netinet/tcp_usrreq.c 1.32
SCCS-vsn: sys/vax/vax/Locore.c 4.15
SCCS-vsn: sys/kern/kern_clock.c 4.27
SCCS-vsn: sys/kern/uipc_syscalls.c 4.7
SCCS-vsn: sys/vax/vax/machdep.c 4.46
SCCS-vsn: sys/kern/uipc_mbuf.c 1.13
SCCS-vsn: sys/kern/subr_prf.c 4.19
SCCS-vsn: sys/kern/tty_subr.c 4.13
SCCS-vsn: sys/kern/uipc_socket.c 4.8
SCCS-vsn: sys/kern/subr_xxx.c 4.9
SCCS-vsn: sys/kern/kern_proc.c 4.16
SCCS-vsn: sys/vax/vax/trap.c 4.11
22 files changed:
-/* kern_clock.c 4.26 81/10/16 */
+/* kern_clock.c 4.27 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
* interrupts compressed into one (due to excessive interrupt load),
* but that hardclock interrupts should never be lost.
*/
* interrupts compressed into one (due to excessive interrupt load),
* but that hardclock interrupts should never be lost.
*/
/*ARGSUSED*/
hardclock(pc, ps)
/*ARGSUSED*/
hardclock(pc, ps)
else
cpstate = CP_USER;
} else {
else
cpstate = CP_USER;
} else {
-int k = ((int)pc & 0x7fffffff) / 8;
-if (k < 20000)
- kcounts[k]++;
+#ifdef KPROF
+ int k = ((int)pc & 0x7fffffff) / 8;
+ if (k < 20000)
+ kcounts[k]++;
+#endif
cpstate = CP_SYS;
if (noproc)
cpstate = CP_IDLE;
cpstate = CP_SYS;
if (noproc)
cpstate = CP_IDLE;
-/* kern_proc.c 4.15 81/11/18 */
+/* kern_proc.c 4.16 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
u.u_segflg = 0;
if (u.u_error)
goto bad;
u.u_segflg = 0;
if (u.u_error)
goto bad;
- if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A)
- && u.u_exdata.ux_shell[0] != '#') {
+#if 0
+ if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A))
+#endif
+ if (u.u_exdata.ux_shell[0] != '#') {
u.u_error = ENOEXEC;
goto bad;
}
u.u_error = ENOEXEC;
goto bad;
}
-/* subr_prf.c 4.19 81/08/31 */
+/* subr_prf.c 4.19 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
if (tp && (tp->t_state&CARR_ON)) {
register s = spl6();
if (c == '\n')
if (tp && (tp->t_state&CARR_ON)) {
register s = spl6();
if (c == '\n')
- ttyoutput('\r', tp);
- ttyoutput(c, tp);
+ (void) ttyoutput('\r', tp);
+ (void) ttyoutput(c, tp);
-/* subr_xxx.c 4.8 81/08/31 */
+/* subr_xxx.c 4.9 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
/*
* Pick up and return the next character from the user's
* write call at location u_base;
/*
* Pick up and return the next character from the user's
* write call at location u_base;
u.u_base++;
return(c&0377);
}
u.u_base++;
return(c&0377);
}
/*
* Routine which sets a user error; placed in
/*
* Routine which sets a user error; placed in
-/* tty_subr.c 4.12 81/10/11 */
+/* tty_subr.c 4.13 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
/*
* copy clist to buffer.
* return number of bytes moved.
/*
* copy clist to buffer.
* return number of bytes moved.
splx(s);
return(cp-acp);
}
splx(s);
return(cp-acp);
}
/*
* Return count of contiguous characters
/*
* Return count of contiguous characters
putw(c, p)
register struct clist *p;
{
putw(c, p)
register struct clist *p;
{
-/* uipc_mbuf.c 1.12 81/11/20 */
+/* uipc_mbuf.c 1.13 81/11/20 */
#include "../h/param.h"
#include "../h/dir.h"
#include "../h/param.h"
#include "../h/dir.h"
vmaccess(&Mbmap[0], (caddr_t)m, 2);
for (i=0; i < NMBPG; i++) {
m->m_off = 0;
vmaccess(&Mbmap[0], (caddr_t)m, 2);
for (i=0; i < NMBPG; i++) {
m->m_off = 0;
m++;
}
(void) pg_alloc(3);
m++;
}
(void) pg_alloc(3);
s = splimp();
for (j=0; j < bufs; j++) {
m->m_off = 0;
s = splimp();
for (j=0; j < bufs; j++) {
m->m_off = 0;
-/* uipc_socket.c 4.7 81/11/20 */
+/* uipc_socket.c 4.8 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
(*prp->pr_usrreq)(so, PRU_ATTACH, 0, asa);
if (so->so_error) {
error = so->so_error;
(*prp->pr_usrreq)(so, PRU_ATTACH, 0, asa);
if (so->so_error) {
error = so->so_error;
+ (void) m_free(dtom(so));
return (error);
}
*aso = so;
return (error);
}
*aso = so;
return;
sbrelease(&so->so_snd);
sbrelease(&so->so_rcv);
return;
sbrelease(&so->so_snd);
sbrelease(&so->so_rcv);
+ (void) m_free(dtom(so));
if (so->so_options & SO_NBIO)
rcverr (EWOULDBLOCK);
sbunlock(&so->so_rcv);
if (so->so_options & SO_NBIO)
rcverr (EWOULDBLOCK);
sbunlock(&so->so_rcv);
- sleep((caddr_t)&so->so_rcv.sb_cc, PZERO+1);
goto restart;
}
m = so->so_rcv.sb_mb;
goto restart;
}
m = so->so_rcv.sb_mb;
-/* uipc_syscalls.c 4.6 81/11/20 */
+/* uipc_syscalls.c 4.7 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
u.u_error = ENOTSOCK;
return;
}
u.u_error = ENOTSOCK;
return;
}
- copyout(fp->f_socket->f_
+ if (copyout((caddr_t)&fp->f_socket->so_addr, (caddr_t)uap->asa,
+ sizeof (struct sockaddr))) {
+ u.u_error = EFAULT;
+ return;
+ }
+}
-/* in_pcb.c 4.5 81/11/20 */
+/* in_pcb.c 4.6 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
bad2:
sbrelease(&so->so_snd);
bad:
bad2:
sbrelease(&so->so_snd);
bad:
-/* ip_icmp.c 4.5 81/11/18 */
+/* ip_icmp.c 4.6 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
iptime()
{
int s = spl6();
iptime()
{
int s = spl6();
t = (time % SECDAY) * 1000 + lbolt * hz;
splx(s);
t = (time % SECDAY) * 1000 + lbolt * hz;
splx(s);
-/* ip_output.c 1.15 81/11/20 */
+/* ip_output.c 1.16 81/11/20 */
#include "../h/param.h"
#include "../h/mbuf.h"
#include "../h/param.h"
#include "../h/mbuf.h"
}
mh->m_next = m_copy(m, off, len);
if (mh->m_next == 0) {
}
mh->m_next = m_copy(m, off, len);
if (mh->m_next == 0) {
goto bad;
}
ip_send(mhip);
goto bad;
}
ip_send(mhip);
-/* tcp_usrreq.c 1.31 81/11/20 */
+/* tcp_usrreq.c 1.32 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
}
error = in_pcballoc(so, &tcb, 2048, 2048, (struct sockaddr_in *)addr);
if (error) {
}
error = in_pcballoc(so, &tcb, 2048, 2048, (struct sockaddr_in *)addr);
if (error) {
+ (void) m_free(dtom(tp));
break;
}
inp = (struct inpcb *)so->so_pcb;
break;
}
inp = (struct inpcb *)so->so_pcb;
-/* socketvar.h 4.7 81/11/20 */
+/* socketvar.h 4.8 81/11/20 */
/*
* Kernel structure per socket.
/*
* Kernel structure per socket.
struct proc *sb_sel; /* process selecting read/write */
short sb_flags; /* flags, see below */
} so_rcv, so_snd;
struct proc *sb_sel; /* process selecting read/write */
short sb_flags; /* flags, see below */
} so_rcv, so_snd;
-#define SB_LOCK 0x01 /* lock on data queue (so_rcv only) */ #define SB_WANT 0x02 /* someone is waiting to lock */
+#define SB_LOCK 0x01 /* lock on data queue (so_rcv only) */
+#define SB_WANT 0x02 /* someone is waiting to lock */
#define SB_WAIT 0x04 /* someone is waiting for data/space */
#define SB_SEL 0x08 /* buffer is selected */
#define SB_COLL 0x10 /* collision selecting */
#define SB_WAIT 0x04 /* someone is waiting for data/space */
#define SB_SEL 0x08 /* buffer is selected */
#define SB_COLL 0x10 /* collision selecting */
-/* systm.h 4.20 81/11/18 */
+/* systm.h 4.21 81/11/20 */
/*
* Random set of variables
/*
* Random set of variables
int memall();
int uchar(), schar();
int vmemall();
int memall();
int uchar(), schar();
int vmemall();
-/* if_en.c 4.10 81/11/18 */
+/* if_en.c 4.11 81/11/20 */
enreset(uban)
int uban;
{
enreset(uban)
int uban;
{
printf("en%d ", unit);
}
}
printf("en%d ", unit);
}
}
int enlastdel = 25;
int enlastx = 0;
int enlastdel = 25;
int enlastx = 0;
}
#endif
ip = (struct ip *)((int)rpkt + L1822);
}
#endif
ip = (struct ip *)((int)rpkt + L1822);
- len = ntohs(ip->ip_len) + L1822;
+ len = ntohs((u_short *)ip->ip_len) + L1822;
if (len > sizeof(struct en_packet) || len < sizeof (struct ip)) {
printf("enrint: bad ip length %d\n", len);
goto flush;
if (len > sizeof(struct en_packet) || len < sizeof (struct ip)) {
printf("enrint: bad ip length %d\n", len);
goto flush;
-/* mba.c 4.22 81/11/07 */
+/* mba.c 4.23 81/11/20 */
#include "mba.h"
#if NMBA > 0
#include "mba.h"
#if NMBA > 0
/*
* Init and interrupt enable a massbus adapter.
*/
/*
* Init and interrupt enable a massbus adapter.
*/
mp->mba_cr = MBCR_IE;
}
#endif
mp->mba_cr = MBCR_IE;
}
#endif
-/* uba.c 4.37 81/11/18 */
+/* uba.c 4.38 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
/*
* This routine allows remapping of previously
* allocated UNIBUS bdp and map resources
/*
* This routine allows remapping of previously
* allocated UNIBUS bdp and map resources
*/
return (ubinfo | o);
}
*/
return (ubinfo | o);
}
-/* ubavar.h 4.21 81/11/07 */
+/* ubavar.h 4.22 81/11/20 */
/*
* This file contains definitions related to the kernel structures
/*
* This file contains definitions related to the kernel structures
* UBA related kernel variables
*/
int numuba; /* number of uba's */
* UBA related kernel variables
*/
int numuba; /* number of uba's */
-extern struct uba_hd uba_hd[];
/*
* Ubminit and ubdinit initialize the mass storage controller and
/*
* Ubminit and ubdinit initialize the mass storage controller and
-/* Locore.c 4.14 81/11/18 */
+/* Locore.c 4.15 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
consdout();
#if NDZ > 0
dzdma();
consdout();
#if NDZ > 0
dzdma();
+#endif
+#if NMBA > 0
+ mbintr(0);
#endif
hardclock((caddr_t)0, 0);
softclock((caddr_t)0, 0);
#endif
hardclock((caddr_t)0, 0);
softclock((caddr_t)0, 0);
-/* conf.c 4.43 81/11/18 */
+/* conf.c 4.44 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
#define dnselect selecttrue
#endif
#define dnselect selecttrue
#endif
-int ttselect(), seltrue(), selectfalse();
+int ttselect(), seltrue();
struct cdevsw cdevsw[] =
{
struct cdevsw cdevsw[] =
{
-/* machdep.c 4.45 81/11/14 */
+/* machdep.c 4.46 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
register int howto; /* r11 == how to boot */
register int devtype; /* r10 == major of root dev */
register int howto; /* r11 == how to boot */
register int devtype; /* r10 == major of root dev */
+#ifdef lint
+ printf("howto %d, devtype %d\n", howto, devtype);
+#endif
howto = arghowto;
if ((howto&RB_NOSYNC)==0 && waittime < 0 && bfreelist[0].b_forw) {
waittime = 0;
howto = arghowto;
if ((howto&RB_NOSYNC)==0 && waittime < 0 && bfreelist[0].b_forw) {
waittime = 0;
#endif
for (;;)
asm("halt");
#endif
for (;;)
asm("halt");
-#ifdef lint
- printf("howto %d, devtype %d\n", howto, devtype);
-#endif
-/* trap.c 4.10 81/07/09 */
+/* trap.c 4.11 81/11/20 */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
-
-/*
- * Ignored system call
- */
-nullsys()
-{
-
-}