X-Git-Url: http://git.thejh.net/?p=libjh.git;a=blobdiff_plain;f=net.c;h=a5d5b50ef50e107ea676b2428d50332a064bb813;hp=8d67e71be62b551f4eed403da97de9b992cf3690;hb=refs%2Fheads%2Fmaster;hpb=ae33d7fe92d8dd8593e7a2b938d1f42d2aa60896

diff --git a/net.c b/net.c
index 8d67e71..a5d5b50 100644
--- a/net.c
+++ b/net.c
@@ -40,20 +40,42 @@ err_socket:
   return EAI_SYSTEM;
 }
 
-// err points to where the error from netopen() should be stored
-PUBLIC_FN FILE *fnetopen(const char *node, const char *service, const struct addrinfo *hints, int *err) {
-  int rval = netopen(node, service, hints);
-  if (rval < 0) goto err;
+PUBLIC_FN int fnetopen(FILE **in, FILE **out, const char *node, const char *service, const struct addrinfo *hints) {
+  int fd = netopen(node, service, hints);
+  if (fd < 0) return EAI_SYSTEM;
+  int ret = fopen_bistream(in, out, fd, 0);
+  if (ret) close(fd);
+  return ret;
+}
+
+HEADER // negative return value for error, else a socket
+PUBLIC_FN int netopen_server(const char *node /*NULL for ANY*/, const char *service, const struct addrinfo *hints) {
+  struct addrinfo hints_;
+  if (hints == &libjh_tcp_hints) {
+    hints_ = *hints;
+    hints_.ai_flags |= AI_PASSIVE;
+    hints_.ai_flags &= ~AI_ADDRCONFIG;
+    hints = &hints_;
+  }
+
+  struct addrinfo *addrs;
+  int gai_res = getaddrinfo(node, service, hints, &addrs);
+  if (gai_res) return gai_res;
+
+  int s = socket(addrs[0].ai_family, addrs[0].ai_socktype, addrs[0].ai_protocol);
+  if (s == -1) goto err_socket;
 
-  FILE *res = fdopen(rval, "r+");
-  if (res) return res;
+  if (bind(s, addrs[0].ai_addr, addrs[0].ai_addrlen)) goto err_bind_n_listen;
+  if (listen(s, 16)) goto err_bind_n_listen;
 
+  freeaddrinfo(addrs);
+  return s;
+
+err_bind_n_listen:;
   int errno_ = errno;
-  close(rval);
+  close(s);
   errno = errno_;
-  rval = EAI_SYSTEM;
-
-err:
-  if (err) *err = rval;
-  return NULL;
-}
\ No newline at end of file
+err_socket:
+  freeaddrinfo(addrs);
+  return EAI_SYSTEM;
+}