3 files changed, 48 insertions, 0 deletions
diff --git a/otherlibs/unix/getpeername.c b/otherlibs/unix/getpeername.c
new file mode 100644
index 000000000..9d2e36736
--- /dev/null
+++ b/otherlibs/unix/getpeername.c
@@ -0,0 +1,23 @@
+#include <mlvalues.h>
+#include "unix.h"
+
+#ifdef HAS_SOCKETS
+
+#include "socketaddr.h"
+
+value unix_getpeername(sock)          /* ML */
+     value sock;
+{
+  int retcode;
+
+  sock_addr_len = sizeof(sock_addr);
+  retcode = getpeername(Int_val(sock), &sock_addr.s_gen, &sock_addr_len);
+  if (retcode == -1) uerror("getpeername", Nothing);
+  return alloc_sockaddr();
+}
+
+#else
+
+value unix_getpeername() { invalid_argument("getpeername not implemented"); }
+  
+#endif
diff --git a/otherlibs/unix/getsockname.c b/otherlibs/unix/getsockname.c
new file mode 100644
index 000000000..40cc1a663
--- /dev/null
+++ b/otherlibs/unix/getsockname.c
@@ -0,0 +1,23 @@
+#include <mlvalues.h>
+#include "unix.h"
+
+#ifdef HAS_SOCKETS
+
+#include "socketaddr.h"
+
+value unix_getsockname(sock)          /* ML */
+     value sock;
+{
+  int retcode;
+
+  sock_addr_len = sizeof(sock_addr);
+  retcode = getsockname(Int_val(sock), &sock_addr.s_gen, &sock_addr_len);
+  if (retcode == -1) uerror("getsockname", Nothing);
+  return alloc_sockaddr();
+}
+
+#else
+
+value unix_getsockname() { invalid_argument("getsockname not implemented"); }
+  
+#endif
diff --git a/otherlibs/unix/unix.ml b/otherlibs/unix/unix.ml
index 729105ca1..b17baefdb 100644
--- a/otherlibs/unix/unix.ml
+++ b/otherlibs/unix/unix.ml
@@ -332,6 +332,8 @@ external bind : file_descr -> sockaddr -> unit = "unix_bind"
 external connect : file_descr -> sockaddr -> unit = "unix_connect"
 external listen : file_descr -> int -> unit = "unix_listen"
 external shutdown : file_descr -> shutdown_command -> unit = "unix_shutdown" 
+external getsockname : file_descr -> sockaddr = "unix_getsockname"
+external getpeername : file_descr -> sockaddr = "unix_getpeername"
 external recv : file_descr -> string -> int -> int -> msg_flag list -> int
                                   = "unix_recv"
 external recvfrom :