6 files changed, 22 insertions(+), 19 deletions(-)

M gnot/stream.c
M port/proc.c
M power/boot.c
M power/boot.h
M power/dat.h
M power/errno.h

@@ 97,7 97,7 @@ dumpqueues(void)
 		print("  W n %d l %d f %ux r %ux\n", WR(q)->nb, WR(q)->len, WR(q)->flag,
 			&(WR(q)->r));
 		dumpblocks(q, 'R');
-		dumpblocks(q, 'W');
+		dumpblocks(WR(q), 'W');
 	}
 	print("\n");
 	for(bcp=bclass; bcp<&bclass[Nclass]; bcp++){

@@ 561,8 561,8 @@ DEBUG()
 	for(i=0; i<conf.nproc; i++){
 		p = procalloc.arena+i;
 		if(p->state != Dead){
-			print("%d:%s upc %lux %s ut %ld st %ld r %lux\n",
-				p->pid, p->text, p->pc, statename[p->state],
+			print("%d:%s %s upc %lux %s ut %ld st %ld r %lux\n",
+				p->pid, p->text, p->pgrp->user, p->pc, statename[p->state],
 				p->time[0], p->time[1], p->r);
 		}
 	}

@@ 152,14 152,14 @@ boot(int ask)
 	/*
 	 *  grab a nonet channel and call up the ross file server
 	 */
-	fd = open("#n/1/data", 2);
+	fd = open("#n/2/data", 2);
 	if(fd < 0) {
-		prerror("opening #n/1/data");
+		prerror("opening #n/2/data");
 		return;
 	}
-	cfd = open("#n/1/ctl", 2);
+	cfd = open("#n/2/ctl", 2);
 	if(cfd < 0){
-		prerror("opening #n/1/ctl");
+		prerror("opening #n/2/ctl");
 		return;
 	}
 	if(write(cfd, scmd, strlen(scmd))<0){

@@ 4406,18 4406,18 @@ ulong bootcode[]={
 	0x0206e6f65,
 	0x074686572,
 	0x000236e2f,
-	0x0312f6461,
+	0x0322f6461,
 	0x07461006f,
 	0x070656e69,
 	0x06e672023,
-	0x06e2f312f,
+	0x06e2f322f,
 	0x064617461,
 	0x000236e2f,
-	0x0312f6374,
+	0x0322f6374,
 	0x06c006f70,
 	0x0656e696e,
 	0x06720236e,
-	0x02f312f63,
+	0x02f322f63,
 	0x0746c006e,
 	0x06f702e2e,
 	0x02e006e20,

@@ 495,10 495,11 @@ struct Nohdr {
 	uchar	remain[2];	/* count of remaing bytes of data */
 	uchar	sum[2];		/* checksum (0 means none) */
 };
-#define HDRSIZE 10
-#define NEWCALL	0x1		/* flag bit marking a new circuit */
-#define HANGUP 0x2		/* flag bit requesting hangup */
-#define ACKME 0x4		/* acknowledge this message */
+#define NO_HDRSIZE 10
+#define NO_NEWCALL	0x1	/* flag bit marking a new circuit */
+#define NO_HANGUP	0x2	/* flag bit requesting hangup */
+#define NO_ACKME	0x4	/* acknowledge this message */
+#define NO_SERVICE	0x8	/* message includes a service name */
 
 /*
  *  a buffer describing a nonet message


@@ 542,7 543,9 @@ struct Noconv {
 
 	Noifc	*ifc;
 	int	kstarted;
-	char	raddr[64];	/* remote address */
+	char	raddr[NAMELEN];	/* remote address */
+	char	ruser[NAMELEN];	/* remote user */
+	char	addr[NAMELEN];	/* local address */
 	int	rexmit;		/* statistics */
 	int	retry;
 	int	bad;


@@ 555,7 558,7 @@ struct Noconv {
  */
 struct Nocall {
 	Block	*msg;
-	char	raddr[64];
+	char	raddr[NAMELEN];
 	long	circuit;
 };
 


@@ 566,7 569,7 @@ struct Nocall {
 struct Noifc {
 	Lock;
 	int	ref;
-	char	name[64];	/* interface name */		
+	char	name[NAMELEN];	/* interface name */		
 	Queue	*wq;		/* interface output queue */
 	Noconv	*conv;
 

@@ 38,7 38,7 @@ enum{
 	Ebadnet,	/* illegal network address */
 	Enoifc,		/* no free interface slots */
 	Enodev,		/* no free devices */
-	Ebadctl,	/* bad process control request */
+	Ebadctl,	/* bad process or stream control request */
 	Enonote,	/* note overflow */
 	Eintr,		/* interrupted */
 	Edestbusy,	/* datakit destination busy */