restore sk_getport

network.h

@@ -147,6 +147,8 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
 Socket sk_newlistener(const char *srcaddr, int port, Plug plug,
                       int local_host_only, int address_family);
 
+int sk_getport(Socket s);
+
 #define sk_plug(s,p) (((*s)->plug) (s, p))
 #define sk_close(s) (((*s)->close) (s))
 #define sk_write(s,buf,len) (((*s)->write) (s, buf, len))

windows/winnet.c

@@ -194,6 +194,9 @@ DECL_WINDOWS_FUNCTION(static, int, WSAIoctl,
 		      (SOCKET, DWORD, LPVOID, DWORD, LPVOID, DWORD,
 		       LPDWORD, LPWSAOVERLAPPED,
 		       LPWSAOVERLAPPED_COMPLETION_ROUTINE));
+DECL_WINDOWS_FUNCTION(static, int, getsockname,
+    (SOCKET, const struct sockaddr FAR *, int FAR *));
+
 #ifndef NO_IPV6
 DECL_WINDOWS_FUNCTION(static, int, getaddrinfo,
 		      (const char *nodename, const char *servname,
@@ -323,6 +326,7 @@ void sk_init(void)
     GET_WINDOWS_FUNCTION(winsock_module, getpeername);
     GET_WINDOWS_FUNCTION(winsock_module, recv);
     GET_WINDOWS_FUNCTION(winsock_module, WSAIoctl);
+    GET_WINDOWS_FUNCTION(winsock_module, getsockname);
 
     /* Try to get the best WinSock version we can get */
     if (!sk_startup(2,2) &&
@@ -1430,6 +1434,25 @@ Socket sk_newlistener(const char *srcaddr, int port, Plug plug,
     return (Socket) ret;
 }
 
+int sk_getport(Socket sock)
+{
+    /* I won't even try to get IPv6 working here since it is apparently borken
+     * in this release of PuTTY */
+    SOCKADDR_IN a;
+    socklen_t salen;
+    int retcode;
+    Actual_Socket s = (Actual_Socket)sock;
+
+    salen = sizeof(a);
+    retcode = p_getsockname(s->s, (struct sockaddr *) &a, &salen);
+
+    if (retcode != 0)
+       return -1;
+
+    return p_ntohs(a.sin_port);
+}
+
+
 static void sk_tcp_close(Socket sock)
 {
     extern char *do_select(SOCKET skt, int startup);