dgram: Provide `dgram-socket sockname S'.

Closes:#865451.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index c859f2912e86ad8a9c067b86018cb995e5913bec..1c3415df7f97c0d634c3d524e3ecb247b7bf0324 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ chiark-tcl (1.2.2~) unstable; urgency=medium
   * Fix IPv6 PTR (reverse) lookups, and compilation with GCC-8.
     Closes:#891544.
 
   * Fix IPv6 PTR (reverse) lookups, and compilation with GCC-8.
     Closes:#891544.
 

+  dgram:
+  * Provide `dgram-socket sockname S'.  Closes:#865451.
+

   tcmdifgen:
   * Turn on warnings and `use strict' and fix everything.
   * Replace deprecated `use IO;' with `use IO::File'.
   tcmdifgen:
   * Turn on warnings and `use strict' and fix everything.
   * Replace deprecated `use IO;' with `use IO::File'.

diff --git a/dgram/dgram.c b/dgram/dgram.c
index 24c5446c0b1625528f98fbb5ce4dceb664845f28..5ffe91ff5ae584ee17424c05e787f96b8540824a 100644 (file)
--- a/dgram/dgram.c
+++ b/dgram/dgram.c
@@ -134,6 +134,18 @@ x_rc:
     Tcl_BackgroundError(ip);
 }
 
     Tcl_BackgroundError(ip);
 }
 

+int cht_do_dgramsocket_sockname(ClientData cd, Tcl_Interp *ip,
+                               void *sock_v, SockAddr_Value *result) {
+  DgramSocket *sock= sock_v;
+  int r;
+
+  socklen_t salen = sock->addr_buflen;
+  r= getsockname(sock->fd, sock->addr_buf, &salen);
+  if (r) return cht_posixerr(ip,errno,"getsockname");
+  cht_sockaddr_create(result, sock->addr_buf, salen);
+  return TCL_OK;
+}
+

 int cht_do_dgramsocket_on_receive(ClientData cd, Tcl_Interp *ip,
                               void *sock_v, Tcl_Obj *newscript) {
   DgramSocket *sock= sock_v;
 int cht_do_dgramsocket_on_receive(ClientData cd, Tcl_Interp *ip,
                               void *sock_v, Tcl_Obj *newscript) {
   DgramSocket *sock= sock_v;

diff --git a/dgram/dgram.tct b/dgram/dgram.tct
index 119e3542675ffc2fe029f1ae6c846a3a49a3f160..938d0a3bf9a8f3f67a5dd8530cb92ce66480300e 100644 (file)
--- a/dgram/dgram.tct
+++ b/dgram/dgram.tct
@@ -32,6 +32,9 @@ Table dgramsocket DgramSocket_SubCommand
                sock    iddata(&cht_dgram_socks)
                data    hb
                remote  sockaddr
                sock    iddata(&cht_dgram_socks)
                data    hb
                remote  sockaddr

+       sockname
+               sock    iddata(&cht_dgram_socks)
+               =>      sockaddr

        on-receive
                sock    iddata(&cht_dgram_socks)
                ?script obj
        on-receive
                sock    iddata(&cht_dgram_socks)
                ?script obj