net: implement tsleep() and comment out SO_LINGER handling

bsd/porting/synch.cc

@@ -141,6 +141,11 @@ extern "C" int msleep(void *chan, struct mtx *mtx, int priority, const char *wme
     return (synch_port::instance()->msleep(chan, mtx, priority, wmesg, timo));
 }
 
+extern "C" int tsleep(void *chan, int priority, const char *wmesg, int timo)
+{
+    return (msleep(chan, 0, priority, wmesg, timo));
+}
+
 extern "C" void wakeup(void* chan)
 {
     synch_port::instance()->wakeup(chan);

bsd/porting/synch.h

@@ -8,6 +8,8 @@
 int msleep(void *chan, struct mtx *mtx, int priority, const char *wmesg,
      int timo);
 
+int tsleep(void *chan, int priority, const char *wmesg, int timo);
+
 void wakeup(void* chan);
 
 void wakeup_one(void* chan);

bsd/sys/kern/uipc_socket.c

@@ -608,20 +608,17 @@ soclose(struct socket *so)
 				goto drop;
 			}
 		}
-		/* FIXME: OSv -SO_LINGER is not supported */
-#if 0
 		if (so->so_options & SO_LINGER) {
 			if ((so->so_state & SS_ISDISCONNECTING) &&
 			    (so->so_state & SS_NBIO))
 				goto drop;
 			while (so->so_state & SS_ISCONNECTED) {
 				error = tsleep(&so->so_timeo,
-				    PSOCK | PCATCH, "soclos", so->so_linger * hz);
+				    0, "soclos", so->so_linger * hz);
 				if (error)
 					break;
 			}
 		}
-#endif
 	}
 
 drop: