Revamped naming for socket streams.

* socket.c (struct dgram_stream): New member, addr.
(make_dgram_sock_stream): Initialize addr to nil.
(dgram_print): Instead of printing the numeric fd, print the
stream description, obtained from the name_k property.
(dgram_mark): Mark the addr member.
(dgram_get_prop): Calculate a descriptive string from the
dgram stream state for the name_k property.
(dgram_set_prop): New static function.
(dgram_strm_ops): Name change to dgram-sock. Wire in
dgram_set_prop function.
(sock_bind): Set the addr_k property of the stream
to the local address that was just bound.

* stream.c (addr_k): New keyword symbol variable.
(stdio_handle): New member, addr.
(stdio_stream_print): Obtain descr by calling get_prop
method rather than directly from h->descr, in case it is
dynamically computed. Use ~a rather than ~s for incorporating
string properties into printed form, to eliminate quotes.
(stdio_stream_mark): Mark new addr member.
(sock_get_prop, sock_set_prop): New static functions.
(stdio_set_sock_peer): Invalidate h->descr by setting
it to nil.
(make_stdio_stream_common): Initialize h->addr to nil.
(make_sock_stream): Specify description as nil rather
than "socket".
(stream_init): Intern the addr keyword, and initialize
the addr_k variable.
Set the name of stdio_sock_ops to "stream-sock"
rather than leaving it inherited as "file-stream".
Wire in the sock_get_prop and sock_set_prop functions into
stdio_sock_ops.

* stream.h (addr_k): Declared.

3 files changed, 88 insertions, 10 deletions

diff --git a/socket.c b/socket.c
index c7660536..e04c222c 100644
--- a/socket.c
+++ b/socket.c
@@ -55,6 +55,7 @@ struct dgram_stream {
   val stream;
   val family;
   val peer;
+  val addr;
   val unget_c;
   utf8_decoder_t ud;
   struct sockaddr_storage peer_addr;
@@ -265,7 +266,7 @@ static val make_dgram_sock_stream(int fd, val family, val peer,
   strm_base_init(&d->a);
   d->stream = nil;
   d->fd = fd;
-  d->family = d->peer = d->unget_c = nil;
+  d->family = d->peer = d->addr = d->unget_c = nil;
   d->err = 0;
   d->rx_buf = dgram;
   d->rx_size = dgram_size;
@@ -285,13 +286,13 @@ static val make_dgram_sock_stream(int fd, val family, val peer,
 
 static void dgram_print(val stream, val out, val pretty)
 {
-  struct dgram_stream *d = coerce(struct dgram_stream *, stream->co.handle);
   struct strm_ops *ops = coerce(struct strm_ops *, stream->co.ops);
   val name = static_str(ops->name);
+  val descr = ops->get_prop(stream, name_k);
 
   (void) pretty;
 
-  format(out, lit("#<~a ~s ~p>"), name, num(d->fd), stream, nao);
+  format(out, lit("#<~a ~a ~p>"), name, descr, stream, nao);
 }
 
 static void dgram_mark(val stream)
@@ -301,6 +302,7 @@ static void dgram_mark(val stream)
   /* h->stream == stream and so no need to mark h->stream */
   gc_mark(d->family);
   gc_mark(d->peer);
+  gc_mark(d->addr);
   gc_mark(d->unget_c);
 }
 
@@ -502,6 +504,30 @@ static val dgram_get_prop(val stream, val ind)
   if (ind == fd_k)
     return num(d->fd);
 
+  if (ind == name_k) {
+    if (d->fd == -1)
+      return lit("closed");
+
+    if (d->addr)
+      return format(nil, lit("passive ~s"), d->addr, nao);
+
+    if (d->peer)
+      return format(nil, lit("connected ~s"), d->peer, nao);
+
+    return lit("disconnected");
+  }
+
+  return nil;
+}
+
+static val dgram_set_prop(val stream, val ind, val prop)
+{
+  if (ind == addr_k) {
+    struct dgram_stream *d = coerce(struct dgram_stream *, stream->co.handle);
+    set(mkloc(d->addr, stream), prop);
+    return t;
+  }
+
   return nil;
 }
 
@@ -573,7 +599,7 @@ static_def(struct strm_ops dgram_strm_ops =
                               dgram_destroy,
                               dgram_mark,
                               cobj_hash_op),
-                wli("dgram-stream"),
+                wli("dgram-sock"),
                 dgram_put_string,
                 dgram_put_char,
                 dgram_put_byte,
@@ -587,7 +613,7 @@ static_def(struct strm_ops dgram_strm_ops =
                 0,
                 0,
                 dgram_get_prop,
-                0,
+                dgram_set_prop,
                 dgram_get_error,
                 dgram_get_error_str,
                 dgram_clear_error,
@@ -609,6 +635,7 @@ static val sock_bind(val sock, val sockaddr)
     uw_throwf(socket_error_s, lit("sock-bind failed: ~d/~s"),
               num(errno), string_utf8(strerror(errno)), nao);
 
+  stream_set_prop(sock, addr_k, sockaddr);
   return t;
 }
 
diff --git a/stream.c b/stream.c
index 90fbae8e..0bed866a 100644
--- a/stream.c
+++ b/stream.c
@@ -71,7 +71,7 @@ val print_flo_precision_s, print_flo_digits_s, print_flo_format_s;
 val print_base_s;
 
 val from_start_k, from_current_k, from_end_k;
-val real_time_k, name_k, fd_k;
+val real_time_k, name_k, addr_k, fd_k;
 val format_s;
 
 val stdio_stream_s;
@@ -367,6 +367,7 @@ struct stdio_handle {
   val family;
   val type;
   val peer;
+  val addr;
 #endif
 };
 
@@ -375,13 +376,14 @@ static void stdio_stream_print(val stream, val out, val pretty)
   struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle);
   struct strm_ops *ops = coerce(struct strm_ops *, stream->co.ops);
   val name = static_str(ops->name);
+  val descr = ops->get_prop(stream, name_k);
 
   (void) pretty;
 
   if (h->pid)
-    format(out, lit("#<~a ~s ~s ~p>"), name, h->descr, num(h->pid), stream, nao);
+    format(out, lit("#<~a ~a ~a ~p>"), name, descr, num(h->pid), stream, nao);
   else
-    format(out, lit("#<~a ~s ~p>"), name, h->descr, stream, nao);
+    format(out, lit("#<~a ~a ~p>"), name, descr, stream, nao);
 }
 
 static void stdio_stream_destroy(val stream)
@@ -403,6 +405,7 @@ static void stdio_stream_mark(val stream)
   gc_mark(h->family);
   gc_mark(h->type);
   gc_mark(h->peer);
+  gc_mark(h->addr);
 #endif
 }
 
@@ -749,6 +752,48 @@ static val stdio_truncate(val stream, val len)
 
 #if HAVE_SOCKETS
 
+static val sock_get_prop(val stream, val ind)
+{
+  if (ind == addr_k) {
+    struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle);
+    return h->addr;
+  }
+
+  if (ind == name_k) {
+    struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle);
+
+    if (!h->f)
+      return h->descr = lit("closed");
+
+    if (h->descr)
+      return h->descr;
+
+    if (h->addr)
+      return set(mkloc(h->descr, stream),
+                 format(nil, lit("passive ~s"), h->addr, nao));
+
+    if (h->peer)
+      return set(mkloc(h->descr, stream),
+                 format(nil, lit("active ~s"), h->peer, nao));
+
+    return h->descr = lit("disconnected");
+  }
+
+  return stdio_get_prop(stream, ind);
+}
+
+static val sock_set_prop(val stream, val ind, val prop)
+{
+  if (ind == addr_k) {
+    struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle);
+    set(mkloc(h->addr, stream), prop);
+    h->descr = nil;
+    return t;
+  }
+
+  return stdio_set_prop(stream, ind, prop);
+}
+
 static val stdio_get_sock_family(val stream)
 {
   struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle);
@@ -770,6 +815,7 @@ static val stdio_get_sock_peer(val stream)
 static val stdio_set_sock_peer(val stream, val peer)
 {
   struct stdio_handle *h = coerce(struct stdio_handle *, stream->co.handle);
+  h->descr = nil;
   return set(mkloc(h->peer, stream), peer);
 }
 
@@ -1211,6 +1257,7 @@ static val make_stdio_stream_common(FILE *f, val descr, struct cobj_ops *ops)
   h->family = nil;
   h->type = nil;
   h->peer = nil;
+  h->addr = nil;
 #endif
   return stream;
 }
@@ -1235,7 +1282,7 @@ val make_pipe_stream(FILE *f, val descr)
 #if HAVE_SOCKETS
 val make_sock_stream(FILE *f, val family, val type)
 {
-  val s = make_stdio_stream_common(f, lit("socket"), &stdio_sock_ops.cobj_ops);
+  val s = make_stdio_stream_common(f, nil, &stdio_sock_ops.cobj_ops);
   struct stdio_handle *h = coerce(struct stdio_handle *, s->co.handle);
   h->family = family;
   h->type = type;
@@ -3625,6 +3672,7 @@ void stream_init(void)
   from_end_k = intern(lit("from-end"), keyword_package);
   real_time_k = intern(lit("real-time"), keyword_package);
   name_k = intern(lit("name"), keyword_package);
+  addr_k = intern(lit("addr"), keyword_package);
   fd_k = intern(lit("fd"), keyword_package);
   format_s = intern(lit("format"), user_package);
   stdio_stream_s = intern(lit("stdio-stream"), user_package);
@@ -3747,6 +3795,9 @@ void stream_init(void)
 
 #if HAVE_SOCKETS
   stdio_sock_ops = stdio_ops;
+  stdio_sock_ops.name = wli("stream-sock");
+  stdio_sock_ops.get_prop = sock_get_prop;
+  stdio_sock_ops.set_prop = sock_set_prop;
   stdio_sock_ops.get_sock_family = stdio_get_sock_family;
   stdio_sock_ops.get_sock_type = stdio_get_sock_type;
   stdio_sock_ops.get_sock_peer = stdio_get_sock_peer;
diff --git a/stream.h b/stream.h
index 011fcb38..b96a0ae6 100644
--- a/stream.h
+++ b/stream.h
@@ -102,7 +102,7 @@ struct stdio_mode {
 loc lookup_var_l(val env, val sym);
 
 extern val from_start_k, from_current_k, from_end_k;
-extern val real_time_k, name_k, fd_k;
+extern val real_time_k, name_k, addr_k, fd_k;
 extern val format_s;
 
 extern val stdio_stream_s;