3 files changed, 6 insertions(+), 5 deletions(-)

M ip/devip.c
M ip/gre.c
M pc/devvga.c

@@ 408,7 408,8 @@ ipclose(Chan* c)
 	default:
 		break;
 	case Qipifc:
-		closeifcconv(c->aux);
+		if(c->flag & COPEN)
+			closeifcconv(c->aux);
 		c->aux = nil;
 		break;
 	case Qlog:

@@ 142,11 142,11 @@ grekick(Conv *c, int l)
 
 	ghp = (GREhdr *)(bp->rp);
 
-	raddr = nhgetl(ghp->src);
-	laddr = nhgetl(ghp->dst);
+	raddr = nhgetl(ghp->dst);
+	laddr = nhgetl(ghp->src);
 	if(raddr == 0)
 		raddr = c->raddr;
-	if(laddr == 0 || Mediaforme(ghp->dst) <= 0)
+	if(laddr == 0 || Mediaforme(ghp->src) <= 0)
 		laddr = c->laddr;
 
 	ghp->proto = IP_GREPROTO;

@@ 331,7 331,7 @@ vgactl(char *arg)
 		}
 
 		/* grab new space */
-		if(align == 0){
+		if(align == 0 || (screenmem % (align-1)) == 0){
 			if(footprint >= size)
 				return;
 		} else {