new file mode 100644
--- /dev/null
+++ b/packages/net/common/current/tests/ipv6_server_test.c
@@ -0,0 +1,145 @@
+//==========================================================================
+//
+//      tests/ipv6_server_test.c
+//
+//      Simple TCP 'server' test - modified for IPv6
+//
+//==========================================================================
+//####BSDCOPYRIGHTBEGIN####
+//
+// -------------------------------------------
+//
+// Portions of this software may have been derived from OpenBSD or other sources,
+// and are covered by the appropriate copyright disclaimers included herein.
+//
+// -------------------------------------------
+//
+//####BSDCOPYRIGHTEND####
+//==========================================================================
+//#####DESCRIPTIONBEGIN####
+//
+// Author(s):    gthomas
+// Contributors: gthomas
+// Date:         2000-01-10
+// Purpose:      
+// Description:  
+//              
+//
+//####DESCRIPTIONEND####
+//
+//==========================================================================
+// Network server test code
+#include <stdio.h>
+#include <stdlib.h>
+#include <network.h>
+
+#ifndef CYGPKG_LIBC_STDIO
+#define perror(s) diag_printf(#s ": %s\n", strerror(errno))
+#endif
+
+#define STACK_SIZE (CYGNUM_HAL_STACK_SIZE_TYPICAL + 0x1000)
+static char stack[STACK_SIZE];
+static cyg_thread thread_data;
+static cyg_handle_t thread_handle;
+
+extern void
+cyg_test_exit(void);
+
+void
+pexit(char *s)
+{
+    perror(s);
+    cyg_test_exit();
+}
+
+static void
+server_test(struct bootp *bp)
+{
+    int s, client, client_len;
+    struct sockaddr_in6 client_addr, local;
+    char buf[256], addr_buf[256];
+    int one = 1;
+    fd_set in_fds;
+    int num, len;
+    struct timeval tv;
+
+    s = socket(AF_INET6, SOCK_STREAM, 0);
+    if (s < 0) {
+        pexit("stream socket");
+    }
+    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) {
+        pexit("setsockopt SO_REUSEADDR");
+    }
+    if (setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one))) {
+        pexit("setsockopt SO_REUSEPORT");
+    }
+    memset(&local, 0, sizeof(local));
+    local.sin6_family = AF_INET6;
+    local.sin6_len = sizeof(local);
+    local.sin6_port = htons(7734);
+    local.sin6_addr = in6addr_any;
+    if(bind(s, (struct sockaddr *) &local, sizeof(local)) < 0) {
+        pexit("bind error");
+    }
+    listen(s, SOMAXCONN);
+    while (true) {
+        client_len = sizeof(client_addr);
+        if ((client = accept(s, (struct sockaddr *)&client_addr, &client_len)) < 0) {
+            pexit("accept");
+        }
+        client_len = sizeof(client_addr);
+        getpeername(client, (struct sockaddr *)&client_addr, &client_len);
+        inet_ntop(AF_INET6, (char *)&client_addr.sin6_addr, addr_buf, sizeof(addr_buf));
+        diag_printf("connection from %s:%d\n", addr_buf, ntohs(client_addr.sin6_port));
+        diag_sprintf(buf, "Hello %s:%d\n", addr_buf, ntohs(client_addr.sin6_port));
+        write(client, buf, strlen(buf));
+        tv.tv_sec = 5;
+        tv.tv_usec = 0;
+        FD_ZERO(&in_fds);
+        FD_SET(client, &in_fds);
+        num = select(client+1, &in_fds, 0, 0, &tv);
+        if (num > 0) {
+            len = read(client, buf, sizeof(buf)-1);
+            buf[len] = '\0';
+            diag_printf("buf = '%s'\n", buf);
+        } else if (num == 0) {
+            diag_printf("No reply - timed out\n");
+        } else {
+            perror("select");
+        }
+        sprintf(buf, "Thanks, bye now!\n");
+        write(client, buf, strlen(buf));
+        close(client);
+    }
+    close(s);
+}
+
+void
+net_test(cyg_addrword_t param)
+{
+    diag_printf("Start SERVER test\n");
+    init_all_network_interfaces();
+#ifdef CYGHWR_NET_DRIVER_ETH0
+    if (eth0_up) {
+        server_test(&eth0_bootp_data);
+    }
+#endif
+    cyg_test_exit();
+}
+
+void
+cyg_start(void)
+{
+    // Create a main thread, so we can run the scheduler and have time 'pass'
+    cyg_thread_create(10,                // Priority - just a number
+                      net_test,          // entry
+                      0,                 // entry parameter
+                      "Network test",    // Name
+                      &stack[0],         // Stack
+                      STACK_SIZE,        // Size
+                      &thread_handle,    // Handle
+                      &thread_data       // Thread data structure
+            );
+    cyg_thread_resume(thread_handle);  // Start it
+    cyg_scheduler_start();
+}