From beae2baf496f956dd7997bfe667def4097634bb9 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 30 Oct 1997 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1997-10-30

---
 ip/devip.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ip/devip.c b/ip/devip.c
index d9a0e9c3b80729c6ced9749986b04d6a16e687b2..4d62db65abc9c8155ca6c9bdaca8d50ad228ebf7 100644
--- a/ip/devip.c
+++ b/ip/devip.c
@@ -539,7 +539,7 @@ setlport(Conv* c)
 }
 
 static void
-setladdrport(Conv* c, char* str)
+setladdrport(Conv* c, char* str, int nodefault)
 {
 	char *p;
 	uchar addr[IPaddrlen];
@@ -547,7 +547,10 @@ setladdrport(Conv* c, char* str)
 	p = strchr(str, '!');
 	if(p == nil) {
 		p = str;
-		c->laddr = 0;
+		if(nodefault)
+			setladdr(c);
+		else
+			c->laddr = 0;
 	}
 	else {
 		*p++ = 0;
@@ -946,8 +949,7 @@ Fsstdconnect(Conv *c, char *argv[], int argc)
 		p = setraddrport(c, argv[1]);
 		if(p != nil)
 			return p;
-		setladdr(c);
-		c->lport = atoi(argv[2]);
+		setladdrport(c, argv[2], 1);
 		break;
 	}
 	return nil;
@@ -960,7 +962,7 @@ Fsstdannounce(Conv* c, char* argv[], int argc)
 	default:
 		return "bad args to announce";
 	case 2:
-		setladdrport(c, argv[1]);
+		setladdrport(c, argv[1], 0);
 		break;
 	}
 	return nil;